@abaplint/transpiler 1.7.2 → 1.7.3

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

@@ -4,4 +4,5 @@ import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class EndMethodTranspiler implements IStatementTranspiler {
     transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal): Chunk;
+    private setSubrc;
 }

package/build/src/statements/end_method.js

@@ -5,28 +5,13 @@ const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 class EndMethodTranspiler {
     transpile(node, traversal) {
-        var _a, _b;
         const token = node.getFirstToken();
         const scope = traversal.findCurrentScopeByToken(token);
         if (scope === undefined) {
             throw new Error("EndMethodTranspiler, scope not found");
         }
         let returning = "";
-        let methodName = undefined;
-        if ((scope === null || scope === void 0 ? void 0 : scope.getIdentifier().stype) === abaplint.ScopeType.Method) {
-            methodName = scope === null || scope === void 0 ? void 0 : scope.getIdentifier().sname;
-        }
-        let className = undefined;
-        if (((_a = scope === null || scope === void 0 ? void 0 : scope.getParent()) === null || _a === void 0 ? void 0 : _a.getIdentifier().stype) === abaplint.ScopeType.ClassImplementation) {
-            className = (_b = scope === null || scope === void 0 ? void 0 : scope.getParent()) === null || _b === void 0 ? void 0 : _b.getIdentifier().sname;
-        }
-        if (methodName && className) {
-            const classDef = scope.findClassDefinition(className);
-            const methodDef = classDef === null || classDef === void 0 ? void 0 : classDef.getMethodDefinitions().getByName(methodName);
-            if (methodDef && methodDef.getExceptions().length > 0) {
-                returning += "abap.builtin.sy.get().subrc.set(0);\n";
-            }
-        }
+        returning += this.setSubrc(scope, traversal);
         const vars = scope.getData().vars;
         for (const n in vars) {
             const identifier = vars[n];
@@ -40,6 +25,34 @@ class EndMethodTranspiler {
         }
         return new chunk_1.Chunk().append(returning + "}", node, traversal);
     }
+    setSubrc(scope, traversal) {
+        var _a, _b;
+        let methodName = undefined;
+        if ((scope === null || scope === void 0 ? void 0 : scope.getIdentifier().stype) === abaplint.ScopeType.Method) {
+            methodName = scope === null || scope === void 0 ? void 0 : scope.getIdentifier().sname;
+        }
+        let className = undefined;
+        if (((_a = scope === null || scope === void 0 ? void 0 : scope.getParent()) === null || _a === void 0 ? void 0 : _a.getIdentifier().stype) === abaplint.ScopeType.ClassImplementation) {
+            className = (_b = scope === null || scope === void 0 ? void 0 : scope.getParent()) === null || _b === void 0 ? void 0 : _b.getIdentifier().sname;
+        }
+        if (methodName === undefined || className === undefined) {
+            return "";
+        }
+        let methodDef = undefined;
+        if (methodName.includes("~")) {
+            const split = methodName.split("~");
+            const classDef = traversal.findInterfaceDefinition(split[0], scope);
+            methodDef = classDef === null || classDef === void 0 ? void 0 : classDef.getMethodDefinitions().getByName(split[1]);
+        }
+        else {
+            const classDef = traversal.findClassDefinition(className, scope);
+            methodDef = classDef === null || classDef === void 0 ? void 0 : classDef.getMethodDefinitions().getByName(methodName);
+        }
+        if (methodDef && methodDef.getExceptions().length > 0) {
+            return "abap.builtin.sy.get().subrc.set(0);\n";
+        }
+        return "";
+    }
 }
 exports.EndMethodTranspiler = EndMethodTranspiler;
 //# sourceMappingURL=end_method.js.map

package/build/src/traversal.d.ts

@@ -31,6 +31,8 @@ export declare class Traversal {
     isInterfaceAttribute(token: abaplint.Token): string | undefined;
     private findReadOrWriteReference;
     buildConstructorContents(scope: abaplint.ISpaghettiScopeNode | undefined, def: abaplint.IClassDefinition, inputName: string): string;
+    findInterfaceDefinition(name: string, scope: abaplint.ISpaghettiScopeNode | undefined): abaplint.IInterfaceDefinition | undefined;
+    findClassDefinition(name: string, scope: abaplint.ISpaghettiScopeNode | undefined): abaplint.IClassDefinition | undefined;
     private dataFromInterfaces;
     determineType(node: abaplint.Nodes.ExpressionNode | abaplint.Nodes.StatementNode, scope: abaplint.ISpaghettiScopeNode | undefined): abaplint.AbstractType | undefined;
     registerClassOrInterface(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined): string;

package/build/src/traversal.js

@@ -281,13 +281,25 @@ class Traversal {
         }
         return ret;
     }
-    dataFromInterfaces(name, scope) {
-        let ret = "";
+    findInterfaceDefinition(name, scope) {
         let intf = scope === null || scope === void 0 ? void 0 : scope.findInterfaceDefinition(name);
         if (intf === undefined) {
             const iglobal = this.reg.getObject("INTF", name);
             intf = iglobal === null || iglobal === void 0 ? void 0 : iglobal.getDefinition();
         }
+        return intf;
+    }
+    findClassDefinition(name, scope) {
+        let clas = scope === null || scope === void 0 ? void 0 : scope.findClassDefinition(name);
+        if (clas === undefined) {
+            const iglobal = this.reg.getObject("CLAS", name);
+            clas = iglobal === null || iglobal === void 0 ? void 0 : iglobal.getDefinition();
+        }
+        return clas;
+    }
+    dataFromInterfaces(name, scope) {
+        let ret = "";
+        const intf = this.findInterfaceDefinition(name, scope);
         for (const a of (intf === null || intf === void 0 ? void 0 : intf.getAttributes().getAll()) || []) {
             if (a.getMeta().includes("static" /* Static */) === true) {
                 continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -27,7 +27,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.83.16",
+    "@abaplint/core": "^2.83.17",
     "source-map": "^0.7.3"
   },
   "devDependencies": {