@abaplint/transpiler 1.6.69 → 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

@@ -11,19 +11,48 @@ class EndMethodTranspiler {
             throw new Error("EndMethodTranspiler, scope not found");
         }
         let returning = "";
+        returning += this.setSubrc(scope, traversal);
         const vars = scope.getData().vars;
         for (const n in vars) {
             const identifier = vars[n];
             if (identifier.getMeta().includes("returning" /* MethodReturning */)) {
-                returning = "return " + n.toLowerCase() + ";\n";
+                returning += "return " + n.toLowerCase() + ";\n";
             }
         }
         const data = scope.getIdentifier();
         if (data.stype === abaplint.ScopeType.Method && data.sname.toLowerCase() === "constructor") {
-            returning = "return this;\n";
+            returning += "return this;\n";
         }
         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

@@ -17,7 +17,7 @@ export declare class Traversal {
     findStatementInFile(pos: abaplint.Position): abaplint.Nodes.StatementNode | undefined;
     private scopeCache;
     findCurrentScopeByToken(token: abaplint.Token): abaplint.ISpaghettiScopeNode | undefined;
-    getInterfaceDefinition(token: abaplint.Token): any | undefined;
+    getInterfaceDefinition(token: abaplint.Token): abaplint.IInterfaceDefinition | undefined;
     getClassDefinition(token: abaplint.Token): abaplint.IClassDefinition | undefined;
     private isClassAttribute;
     prefixAndName(t: abaplint.Token, filename?: string): string;
@@ -31,8 +31,11 @@ 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 | undefined): string;
+    registerClassOrInterface(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined): string;
     lookupClassOrInterface(name: string | undefined, token: abaplint.Token | undefined): string;
     private buildPrefix;
     protected traverseStructure(node: abaplint.Nodes.StructureNode): Chunk;

package/build/src/traversal.js

@@ -75,7 +75,6 @@ class Traversal {
         }
         return node;
     }
-    // todo, add explicit return type,
     getInterfaceDefinition(token) {
         let scope = this.findCurrentScopeByToken(token);
         while (scope !== undefined) {
@@ -103,8 +102,12 @@ class Traversal {
             throw new Error("isClassAttribute, unable to lookup position");
         }
         const name = token.getStr();
+        if (name.toLowerCase() === "me") {
+            return true;
+        }
         const found = scope.findScopeForVariable(name);
-        if (found && found.stype === abaplint.ScopeType.ClassImplementation) {
+        if (found && (found.stype === abaplint.ScopeType.MethodInstance
+            || found.stype === abaplint.ScopeType.ClassImplementation)) {
             return true;
         }
         return false;
@@ -126,9 +129,9 @@ class Traversal {
                 }
             }
         }
-        const cla = this.isStaticClassAttribute(t);
-        if (cla) {
-            name = cla + "." + name;
+        const className = this.isStaticClassAttribute(t);
+        if (className) {
+            name = className + "." + name;
         }
         else if (name === "super") {
             return name;
@@ -142,7 +145,6 @@ class Traversal {
         return name;
     }
     isStaticClassAttribute(token) {
-        var _a;
         const scope = this.findCurrentScopeByToken(token);
         if (scope === undefined) {
             throw new Error(`isStaticClassAttribute, unable to lookup position, ${token.getStr()},${token.getRow()},${token.getCol()},` +
@@ -154,7 +156,8 @@ class Traversal {
         if (found && id
             && id.getMeta().includes("static" /* Static */)
             && found.stype === abaplint.ScopeType.ClassImplementation) {
-            return (_a = scope.getParent()) === null || _a === void 0 ? void 0 : _a.getIdentifier().sname.toLowerCase();
+            //      console.dir(found.sname);
+            return found.sname.toLowerCase();
         }
         return undefined;
     }
@@ -243,35 +246,30 @@ class Traversal {
         return undefined;
     }
     buildConstructorContents(scope, def, inputName) {
-        const vars = scope === null || scope === void 0 ? void 0 : scope.getData().vars;
+        /*
+        const vars = scope?.getData().vars;
         if (vars === undefined || Object.keys(vars).length === 0) {
-            return "";
+          return "";
         }
+        */
         let ret = "";
         if (def.getSuperClass() !== undefined) {
             // todo, more here, there might be parameters to pass
             // for now just pass the same input
             ret += `await super.constructor_(${inputName});\n`;
         }
-        for (const n in vars) {
-            const identifier = vars[n];
-            if (identifier.getMeta().includes("static" /* Static */) === true) {
-                continue;
-            }
-            const name = n.toLowerCase().replace("~", "$");
-            if (name === "super") {
-                continue; // todo, https://github.com/abaplint/transpiler/issues/133
-            }
-            // todo, better handling of variables from interfaces, it should only initialize those that are directly implemented
-            if (def.getAttributes().findByName(name) === undefined
-                && name.includes("$") === false
-                && name !== "me") {
+        ret += "this.me = new abap.types.ABAPObject();\n";
+        ret += "this.me.set(this);\n";
+        for (const a of def.getAttributes().getAll()) {
+            if (a.getMeta().includes("static" /* Static */) === true) {
                 continue;
             }
-            ret += "this." + name + " = " + new types_1.TranspileTypes().toType(identifier.getType()) + ";\n";
-            if (name === "me") {
-                ret += "this.me.set(this);\n";
-            }
+            const name = a.getName().toLowerCase();
+            ret += "this." + name + " = " + new types_1.TranspileTypes().toType(a.getType()) + ";\n";
+        }
+        // attributes from directly implemented interfaces(not interfaces implemented in super classes)
+        for (const i of def.getImplementing()) {
+            ret += this.dataFromInterfaces(i.name, scope);
         }
         // handle aliases after initialization of carrier variables
         for (const a of def.getAliases().getAll()) {
@@ -283,6 +281,37 @@ class Traversal {
         }
         return 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;
+            }
+            const n = name.toLowerCase() + "$" + a.getName().toLowerCase();
+            ret += "this." + n + " = " + new types_1.TranspileTypes().toType(a.getType()) + ";\n";
+        }
+        for (const i of (intf === null || intf === void 0 ? void 0 : intf.getImplementing()) || []) {
+            ret += this.dataFromInterfaces(i.name, scope);
+        }
+        return ret;
+    }
     determineType(node, scope) {
         var _a;
         if (scope === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "1.6.69",
+  "version": "1.7.3",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -10,6 +10,7 @@
   },
   "scripts": {
     "compile": "tsc",
+    "publish:minor": "npm --no-git-tag-version version minor && rm -rf build && npm install && npm run test && npm publish --access public",
     "publish:patch": "npm --no-git-tag-version version patch && rm -rf build && npm install && npm run test && npm publish --access public",
     "test": "npm run compile && mocha"
   },
@@ -26,7 +27,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "=2.80.10",
+    "@abaplint/core": "^2.83.17",
     "source-map": "^0.7.3"
   },
   "devDependencies": {