@abaplint/transpiler 2.3.13 → 2.3.15

package/build/src/expressions/constant.js

@@ -11,12 +11,11 @@ class ConstantTranspiler {
         const int = node.findFirstExpression(core_1.Expressions.Integer);
         if (int) {
             const concat = int.concatTokens().trim();
-            const post = concat.startsWith("-") ? "minus_" : "";
-            let ret = "constant_" + post + int.getLastToken().getStr();
+            let code = `new abap.types.Integer().set(${concat})`;
             if (this.addGet === true) {
-                ret += ".get()";
+                code += ".get()";
             }
-            return new chunk_1.Chunk().append(ret, node, traversal);
+            return new chunk_1.Chunk().append(code, node, traversal);
         }
         let str = node.findDirectExpression(core_1.Expressions.ConstantString);
         if (str === undefined) {

package/build/src/expressions/field_chain.js

@@ -42,11 +42,20 @@ class FieldChainTranspiler {
                 ret.append(".getPointer()", c, traversal);
             }
             else if (c.get() instanceof core_1.Expressions.ComponentName) {
-                ret.append(c.getFirstToken().getStr().toLowerCase(), c, traversal);
+                const name = c.getFirstToken().getStr().toLowerCase();
+                if (name.match(/^\d/)) {
+                    ret.append(`["` + name + `"]`, c, traversal);
+                }
+                else {
+                    ret.append(`.` + name, c, traversal);
+                }
             }
             else if (c instanceof core_1.Nodes.TokenNode) {
                 const str = c.getFirstToken().getStr();
-                if (str === "-" || str === "->") {
+                if (str === "-") {
+                    ret.append(".get()", c, traversal);
+                }
+                else if (str === "->") {
                     ret.append(".get().", c, traversal);
                 }
             }

package/build/src/expressions/target.js

@@ -22,7 +22,13 @@ class TargetTranspiler {
                 ret.append(name, c, traversal);
             }
             else if (c.get() instanceof core_1.Expressions.ComponentName) {
-                ret.append(c.getFirstToken().getStr().toLowerCase(), c, traversal);
+                const name = c.getFirstToken().getStr().toLowerCase();
+                if (name.match(/^\d/)) {
+                    ret.append(`["` + name + `"]`, c, traversal);
+                }
+                else {
+                    ret.append(`.` + name, c, traversal);
+                }
             }
             else if (c.get() instanceof core_1.Expressions.AttributeName) {
                 const intf = traversal.isInterfaceAttribute(c.getFirstToken());
@@ -42,7 +48,7 @@ class TargetTranspiler {
                 ret.appendChunk(new _1.FieldSymbolTranspiler().transpile(c, traversal));
             }
             else if (c.getFirstToken().getStr() === "-") {
-                ret.append(".get().", c, traversal);
+                ret.append(".get()", c, traversal);
             }
             else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.Dereference) {
                 ret.append(".getPointer()", c, traversal);

package/build/src/handlers/handle_abap.d.ts

@@ -9,6 +9,4 @@ export declare class HandleABAP {
     private rearrangeClassLocals;
     protected addImportsAndExports(output: IOutputFile): Chunk;
     protected findExports(node: abaplint.Nodes.StructureNode | undefined): string[];
-    protected handleConstants(obj: abaplint.ABAPObject, file: abaplint.ABAPFile, reg: abaplint.IRegistry): string;
-    protected findConstants(obj: abaplint.ABAPObject, file: abaplint.ABAPFile, reg: abaplint.IRegistry): Set<string>;
 }

package/build/src/handlers/handle_abap.js

@@ -19,7 +19,6 @@ class HandleABAP {
             if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.addFilenames) === true) {
                 chunk.appendString("// " + file.getFilename() + "\n");
             }
-            chunk.appendString(this.handleConstants(obj, file, reg));
             const rearranged = new rearranger_1.Rearranger().run(obj.getType(), file.getStructure());
             const contents = new traversal_1.Traversal(spaghetti, file, obj, reg, ((_b = this.options) === null || _b === void 0 ? void 0 : _b.unknownTypes) === "runtimeError").traverse(rearranged);
             chunk.appendChunk(contents);
@@ -137,37 +136,6 @@ class HandleABAP {
         }
         return res;
     }
-    handleConstants(obj, file, reg) {
-        var _a, _b;
-        let result = "";
-        const constants = this.findConstants(obj, file, reg);
-        if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.skipConstants) === false || ((_b = this.options) === null || _b === void 0 ? void 0 : _b.skipConstants) === undefined) {
-            for (const concat of Array.from(constants).sort()) {
-                const post = concat.startsWith("-") ? "minus_" : "";
-                result += `const constant_${post}${concat.replace("-", "")} = new abap.types.Integer().set(${concat});\n`;
-            }
-        }
-        return result;
-    }
-    findConstants(obj, file, reg) {
-        var _a, _b;
-        let constants = new Set();
-        for (const i of ((_a = file.getStructure()) === null || _a === void 0 ? void 0 : _a.findAllExpressions(abaplint.Expressions.Integer)) || []) {
-            constants.add(i.concatTokens().replace(" ", ""));
-        }
-        // extra constants from interfaces, used for default values
-        if (obj.getType() === "CLAS") {
-            const clas = obj;
-            for (const i of ((_b = clas.getClassDefinition()) === null || _b === void 0 ? void 0 : _b.interfaces) || []) {
-                const intf = reg.getObject("INTF", i.name);
-                const main = intf === null || intf === void 0 ? void 0 : intf.getMainABAPFile();
-                if (intf && main) {
-                    constants = new Set([...constants, ...this.findConstants(intf, main, reg).values()]);
-                }
-            }
-        }
-        return constants;
-    }
 }
 exports.HandleABAP = HandleABAP;
 //# sourceMappingURL=handle_abap.js.map

package/build/src/transpile_types.js

@@ -64,7 +64,12 @@ class TranspileTypes {
             resolved = "Structure";
             const list = [];
             for (const c of type.getComponents()) {
-                list.push(c.name.toLowerCase() + ": " + this.toType(c.type));
+                if (c.name.toLowerCase().startsWith("0")) {
+                    list.push(`"` + c.name.toLowerCase() + `": ` + this.toType(c.type));
+                }
+                else {
+                    list.push(c.name.toLowerCase() + ": " + this.toType(c.type));
+                }
             }
             extra = "{" + list.join(", ") + "}";
             if (type.getQualifiedName() !== undefined) {

package/build/src/validation.js

@@ -59,7 +59,7 @@ exports.config = {
                 "^throw$", "^throws$", "^transient$", "^true$",
                 "^try$", "^typeof$", "^var$", "^void$",
                 "^volatile$", "^while$", "^yield$",
-                "^unique\\d+$", "^constant_\\d+$"
+                "^unique\\d+$"
             ],
         },
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.3.13",
+  "version": "2.3.15",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -28,7 +28,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.93.48",
+    "@abaplint/core": "^2.93.50",
     "source-map": "^0.7.4"
   },
   "devDependencies": {