|
@@ -8,21 +8,27 @@ export function toInt (str) {
|
|
|
}
|
|
|
|
|
|
export function toString (str) {
|
|
|
- let value = str.replace(/^"/, '');
|
|
|
- value = value.replace(/"$/, '');
|
|
|
+ let value = str.replace(/^"/, "");
|
|
|
+ value = value.replace(/"$/, "");
|
|
|
value = value.replace(/\\b/g, "\b");
|
|
|
value = value.replace(/\\t/g, "\t");
|
|
|
value = value.replace(/\\n/g, "\n");
|
|
|
value = value.replace(/\\r/g, "\r");
|
|
|
- value = value.replace(/\\"/g, "\"");
|
|
|
- value = value.replace(/\\'/g, '\'');
|
|
|
+ value = value.replace(/\\"/g, '"');
|
|
|
+ value = value.replace(/\\'/g, "'");
|
|
|
value = value.replace(/\\\\/g, "\\");
|
|
|
return value;
|
|
|
}
|
|
|
|
|
|
export function toChar (str) {
|
|
|
- let value = str.replace(/^'/, '');
|
|
|
- value = value.replace(/'$/, '');
|
|
|
+ let value = str.replace(/^'/, "");
|
|
|
+ value = value.replace(/'$/, "");
|
|
|
+ value = value.replace(/\\b/g, "\b");
|
|
|
+ value = value.replace(/\\t/g, "\t");
|
|
|
+ value = value.replace(/\\n/g, "\n");
|
|
|
+ value = value.replace(/\\r/g, "\r");
|
|
|
+ value = value.replace(/\\"/g, '"');
|
|
|
+ value = value.replace(/\\'/g, "'");
|
|
|
return value;
|
|
|
}
|
|
|
|
|
@@ -53,16 +59,16 @@ export function convertBoolToString (bool) {
|
|
|
} else {
|
|
|
result = instance.literalNames[lexer.RK_FALSE];
|
|
|
}
|
|
|
- return result.replace(/'/g,"");
|
|
|
+ return result.replace(/'/g, "");
|
|
|
}
|
|
|
|
|
|
-export function convertToString(value, type) {
|
|
|
+export function convertToString (value, type) {
|
|
|
switch (type.ord) {
|
|
|
case Types.INTEGER.ord:
|
|
|
return value.toString();
|
|
|
case Types.REAL.ord: {
|
|
|
if (value.dp() <= 0) {
|
|
|
- return value.toFixed(1);
|
|
|
+ return value.toFixed(1);
|
|
|
} else {
|
|
|
return value.toFixed(Config.decimalPlaces);
|
|
|
}
|
|
@@ -72,4 +78,5 @@ export function convertToString(value, type) {
|
|
|
default:
|
|
|
return value;
|
|
|
}
|
|
|
-}
|
|
|
+}
|
|
|
+
|