@abaplint/transpiler 2.2.12 → 2.2.14

package/build/src/expressions/component_compare.js

@@ -11,28 +11,28 @@ class ComponentCompareTranspiler {
         if (node.findDirectExpression(core_1.Expressions.CompareOperator)) {
             const compare = traversal.traverse(node.findDirectExpression(core_1.Expressions.CompareOperator)).getCode();
             const source = traversal.traverse(node.findDirectExpression(core_1.Expressions.Source)).getCode();
-            return new chunk_1.Chunk(`(i) => {return ${pre}abap.compare.${compare}(i.${component}, ${source});}`);
+            return new chunk_1.Chunk(`(I) => {return ${pre}abap.compare.${compare}(I.${component}, ${source});}`);
         }
         if ((concat.startsWith("NOT") && concat.endsWith("IS INITIAL"))
             || concat.endsWith("IS NOT INITIAL")) {
-            return new chunk_1.Chunk(`(i) => {return abap.compare.initial(i.${component}) === false;}`);
+            return new chunk_1.Chunk(`(I) => {return abap.compare.initial(I.${component}) === false;}`);
         }
         else if (concat.endsWith("IS INITIAL")) {
-            return new chunk_1.Chunk(`(i) => {return abap.compare.initial(i.${component});}`);
+            return new chunk_1.Chunk(`(I) => {return abap.compare.initial(I.${component});}`);
         }
         if ((concat.startsWith("NOT") && concat.endsWith("IS BOUND"))
             || concat.endsWith("IS NOT BOUND")) {
-            return new chunk_1.Chunk(`(i) => {return abap.compare.initial(i.${component});}`);
+            return new chunk_1.Chunk(`(I) => {return abap.compare.initial(I.${component});}`);
         }
         else if (concat.endsWith("IS BOUND")) {
-            return new chunk_1.Chunk(`(i) => {return abap.compare.initial(i.${component}) === false;}`);
+            return new chunk_1.Chunk(`(I) => {return abap.compare.initial(I.${component}) === false;}`);
         }
         if ((concat.startsWith("NOT") && concat.endsWith("IS ASSIGNED"))
             || concat.endsWith("IS NOT ASSIGNED")) {
-            return new chunk_1.Chunk(`(i) => {return abap.compare.assigned(i.${component}) === false;}`);
+            return new chunk_1.Chunk(`(I) => {return abap.compare.assigned(I.${component}) === false;}`);
         }
         else if (concat.endsWith("IS ASSIGNED")) {
-            return new chunk_1.Chunk(`(i) => {return abap.compare.assigned(i.${component});}`);
+            return new chunk_1.Chunk(`(I) => {return abap.compare.assigned(I.${component});}`);
         }
         return new chunk_1.Chunk("ComponentCompareTodo");
     }

package/build/src/expressions/component_cond.js

@@ -9,7 +9,7 @@ class ComponentCondTranspiler {
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.ExpressionNode) {
                 let cond = traversal.traverse(c).getCode();
-                cond = cond.replace(/^\(i\) => \{return /, "");
+                cond = cond.replace(/^\(I\) => \{return /, "");
                 cond = cond.replace(/;\}$/, "");
                 ret += cond;
             }
@@ -26,7 +26,7 @@ class ComponentCondTranspiler {
                 }
             }
         }
-        ret = `(i) => {return ${ret};}`;
+        ret = `(I) => {return ${ret};}`;
         return new chunk_1.Chunk(ret);
     }
 }

package/build/src/expressions/component_cond_sub.js

@@ -9,7 +9,7 @@ class ComponentCondSubTranspiler {
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.ExpressionNode) {
                 let cond = traversal.traverse(c).getCode();
-                cond = cond.replace(/^\(i\) => \{return /, "");
+                cond = cond.replace(/^\(I\) => \{return /, "");
                 cond = cond.replace(/;\}$/, "");
                 ret += cond;
             }
@@ -29,7 +29,7 @@ class ComponentCondSubTranspiler {
                 }
             }
         }
-        ret = `(i) => {return ${ret};}`;
+        ret = `(I) => {return ${ret};}`;
         return new chunk_1.Chunk(ret);
     }
 }

package/build/src/expressions/method_call_body.d.ts

@@ -1,7 +1,10 @@
+import * as abaplint from "@abaplint/core";
 import { Nodes } from "@abaplint/core";
 import { IExpressionTranspiler } from "./_expression_transpiler";
 import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class MethodCallBodyTranspiler implements IExpressionTranspiler {
+    private readonly m;
+    constructor(m?: abaplint.Types.MethodDefinition);
     transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
 }

package/build/src/expressions/method_call_body.js

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MethodCallBodyTranspiler = void 0;
+const abaplint = require("@abaplint/core");
 const core_1 = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const method_call_param_1 = require("./method_call_param");
 class MethodCallBodyTranspiler {
+    constructor(m) {
+        this.m = m;
+    }
     transpile(node, traversal) {
         const ret = new chunk_1.Chunk();
         for (const c of node.getChildren()) {
@@ -11,6 +16,9 @@ class MethodCallBodyTranspiler {
                 // PARAMETER-TABLE
                 continue;
             }
+            else if (c.get() instanceof abaplint.Expressions.MethodCallParam) {
+                ret.appendChunk(new method_call_param_1.MethodCallParamTranspiler(this.m).transpile(c, traversal));
+            }
             else {
                 ret.appendChunk(traversal.traverse(c));
             }

package/build/src/keywords.js

@@ -55,8 +55,12 @@ class Keywords {
         let ret = [];
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.TokenNodeRegex) {
-                if (keywords.some(k => k === c.getFirstToken().getStr().toLowerCase())) {
-                    ret.push(c.getFirstToken());
+                const token = c.getFirstToken();
+                if (keywords.some(k => k === token.getStr().toLowerCase())) {
+                    const start = token.getStart();
+                    if (!(start instanceof abaplint.VirtualPosition)) {
+                        ret.push(token);
+                    }
                 }
             }
             else if (c instanceof abaplint.Nodes.TokenNode) {

package/build/src/statements/call.js

@@ -6,7 +6,7 @@ const chunk_1 = require("../chunk");
 const expressions_1 = require("../expressions");
 class CallTranspiler {
     transpile(node, traversal) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const chain = node.findDirectExpression(abaplint.Expressions.MethodCallChain);
         if (chain) {
             let pre = "";
@@ -59,13 +59,15 @@ if (e.classic) {
         const methodSource = node.findDirectExpression(abaplint.Expressions.MethodSource);
         if (methodSource) {
             let body = "";
+            const nameToken = (_d = methodSource.getLastChild()) === null || _d === void 0 ? void 0 : _d.getFirstToken();
+            const m = nameToken ? traversal.findMethodReference(nameToken, traversal.findCurrentScopeByToken(nameToken)) : undefined;
             const methodCallBody = node.findDirectExpression(abaplint.Expressions.MethodCallBody);
             if (methodCallBody) {
-                body = traversal.traverse(methodCallBody).getCode();
+                body = new expressions_1.MethodCallBodyTranspiler(m === null || m === void 0 ? void 0 : m.def).transpile(methodCallBody, traversal).getCode();
             }
             let pre = "";
             let post = "";
-            const receiving = (_d = node.findFirstExpression(abaplint.Expressions.MethodParameters)) === null || _d === void 0 ? void 0 : _d.findExpressionAfterToken("RECEIVING");
+            const receiving = (_e = node.findFirstExpression(abaplint.Expressions.MethodParameters)) === null || _e === void 0 ? void 0 : _e.findExpressionAfterToken("RECEIVING");
             if (receiving) {
                 const target = traversal.traverse(receiving.findDirectExpression(abaplint.Expressions.Target));
                 pre = target.getCode() + ".set(";

package/build/src/statements/class_definition_load.d.ts

@@ -0,0 +1,7 @@
+import * as abaplint from "@abaplint/core";
+import { IStatementTranspiler } from "./_statement_transpiler";
+import { Traversal } from "../traversal";
+import { Chunk } from "../chunk";
+export declare class ClassDefinitionLoadTranspiler implements IStatementTranspiler {
+    transpile(_node: abaplint.Nodes.StatementNode, _traversal: Traversal): Chunk;
+}

package/build/src/statements/class_definition_load.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClassDefinitionLoadTranspiler = void 0;
+const chunk_1 = require("../chunk");
+class ClassDefinitionLoadTranspiler {
+    transpile(_node, _traversal) {
+        // for now, do nothing
+        return new chunk_1.Chunk(``);
+    }
+}
+exports.ClassDefinitionLoadTranspiler = ClassDefinitionLoadTranspiler;
+//# sourceMappingURL=class_definition_load.js.map

package/build/src/statements/index.d.ts

@@ -12,6 +12,7 @@ export * from "./call";
 export * from "./case";
 export * from "./check";
 export * from "./class_deferred";
+export * from "./class_definition_load";
 export * from "./class_implementation";
 export * from "./class_local_friends";
 export * from "./clear";

package/build/src/statements/index.js

@@ -28,6 +28,7 @@ __exportStar(require("./call"), exports);
 __exportStar(require("./case"), exports);
 __exportStar(require("./check"), exports);
 __exportStar(require("./class_deferred"), exports);
+__exportStar(require("./class_definition_load"), exports);
 __exportStar(require("./class_implementation"), exports);
 __exportStar(require("./class_local_friends"), exports);
 __exportStar(require("./clear"), exports);

package/build/src/statements/method_implementation.js

@@ -62,6 +62,9 @@ class MethodImplementationTranspiler {
                         else if (parameterDefault.getFirstToken().getStr().toLowerCase() === "abap_false") {
                             val = "abap.builtin.abap_false";
                         }
+                        else if (parameterDefault.getFirstToken().getStr().toLowerCase() === "space") {
+                            val = "abap.builtin.space";
+                        }
                         else {
                             // note: this can be difficult, the "def" might be from an interface, ie. a different scope than the method
                             val = new expressions_1.FieldChainTranspiler().transpile(parameterDefault, traversal, true, methodDef === null || methodDef === void 0 ? void 0 : methodDef.getFilename()).getCode();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.2.12",
+  "version": "2.2.14",
   "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.36",
+    "@abaplint/core": "^2.93.38",
     "source-map": "^0.7.4"
   },
   "devDependencies": {