@abaplint/transpiler 2.2.11 → 2.2.13

package/build/src/expressions/field_chain.js

@@ -28,10 +28,14 @@ class FieldChainTranspiler {
             }
             else if (c.get() instanceof core_1.Expressions.AttributeName) {
                 const interfaceName = traversal.isInterfaceAttribute(c.getFirstToken());
-                let name = traversal_1.Traversal.escapeClassName(c.getFirstToken().getStr()).replace("~", "$").toLowerCase();
+                let name = c.getFirstToken().getStr().toLowerCase();
                 if (prefix && interfaceName && name.startsWith(interfaceName) === false) {
+                    name = traversal_1.Traversal.escapeClassName(name).replace("~", "$");
                     name = traversal_1.Traversal.escapeClassName(interfaceName) + "$" + name;
                 }
+                else {
+                    name = traversal_1.Traversal.escapeClassName(name).replace("~", "$");
+                }
                 ret.append(name, c, traversal);
             }
             else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.Dereference) {

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.2.11",
+  "version": "2.2.13",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",