@abaplint/transpiler 2.1.85 → 2.1.87

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

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

package/build/src/statements/check.js

@@ -11,7 +11,7 @@ class CheckTranspiler {
         ret.append("if (!(", node, traversal);
         ret.appendChunk(cond);
         ret.appendString(")) {\n");
-        if (this.isInsideLoop(node, traversal)) {
+        if (traversal.isInsideLoop(node)) {
             ret.appendString("continue;");
         }
         else {
@@ -20,28 +20,6 @@ class CheckTranspiler {
         ret.append("\n}", node.getLastToken(), traversal);
         return ret;
     }
-    isInsideLoop(node, traversal) {
-        const stack = [];
-        for (const statement of traversal.getFile().getStatements()) {
-            const get = statement.get();
-            if (get instanceof abaplint.Statements.Loop
-                || get instanceof abaplint.Statements.While
-                || get instanceof abaplint.Statements.SelectLoop
-                || get instanceof abaplint.Statements.Do) {
-                stack.push(statement);
-            }
-            else if (get instanceof abaplint.Statements.EndLoop
-                || get instanceof abaplint.Statements.EndWhile
-                || get instanceof abaplint.Statements.EndSelect
-                || get instanceof abaplint.Statements.EndDo) {
-                stack.pop();
-            }
-            if (statement === node) {
-                break;
-            }
-        }
-        return stack.length > 0;
-    }
 }
 exports.CheckTranspiler = CheckTranspiler;
 //# sourceMappingURL=check.js.map

package/build/src/statements/exit.js

@@ -2,9 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExitTranspiler = void 0;
 const chunk_1 = require("../chunk");
+const return_1 = require("./return");
 class ExitTranspiler {
     transpile(node, traversal) {
-        return new chunk_1.Chunk().append("break;", node, traversal);
+        if (traversal.isInsideLoop(node)) {
+            return new chunk_1.Chunk().append("break;", node, traversal);
+        }
+        else {
+            return new return_1.ReturnTranspiler().transpile(node, traversal);
+        }
     }
 }
 exports.ExitTranspiler = ExitTranspiler;

package/build/src/traversal.d.ts

@@ -37,6 +37,7 @@ export declare class Traversal {
     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;
+    isInsideLoop(node: abaplint.Nodes.StatementNode): boolean;
     registerClassOrInterface(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined): string;
     lookupClassOrInterface(name: string | undefined, token: abaplint.Token | undefined, directGlobal?: boolean): string;
     private buildPrefix;

package/build/src/traversal.js

@@ -271,7 +271,7 @@ class Traversal {
         }
         // handle aliases after initialization of carrier variables
         for (const a of def.getAliases().getAll()) {
-            ret += "this." + a.getName().toLowerCase() + " = this." + a.getComponent().replace("~", "$").toLowerCase() + ";\n";
+            ret += "this." + a.getName().toLowerCase() + " = this." + Traversal.escapeClassName(a.getComponent().replace("~", "$").toLowerCase()) + ";\n";
         }
         // constants can be accessed both statically and via reference
         for (const c of def.getAttributes().getConstants()) {
@@ -350,7 +350,28 @@ class Traversal {
         }
         return context;
     }
-    ////////////////////////////
+    isInsideLoop(node) {
+        const stack = [];
+        for (const statement of this.getFile().getStatements()) {
+            const get = statement.get();
+            if (get instanceof abaplint.Statements.Loop
+                || get instanceof abaplint.Statements.While
+                || get instanceof abaplint.Statements.SelectLoop
+                || get instanceof abaplint.Statements.Do) {
+                stack.push(statement);
+            }
+            else if (get instanceof abaplint.Statements.EndLoop
+                || get instanceof abaplint.Statements.EndWhile
+                || get instanceof abaplint.Statements.EndSelect
+                || get instanceof abaplint.Statements.EndDo) {
+                stack.pop();
+            }
+            if (statement === node) {
+                break;
+            }
+        }
+        return stack.length > 0;
+    }
     registerClassOrInterface(def) {
         if (def === undefined) {
             return "";

package/build/src/unit_test.d.ts

@@ -11,4 +11,5 @@ export declare class UnitTest {
     unitTestScriptOpen(reg: abaplint.IRegistry, _skip?: TestMethodList, _only?: TestMethodList): string;
     unitTestScript(reg: abaplint.IRegistry, skip?: TestMethodList, _only?: TestMethodList): string;
     private buildImports;
+    private hasClassConstructor;
 }

package/build/src/unit_test.js

@@ -181,7 +181,6 @@ run().then(() => {
     buildImports(reg, useImport) {
         // note: ES modules are hoised, so use the dynamic import(), due to setting of globalThis.abap
         // some sorting required: eg. a class constructor using constant from interface
-        var _a;
         const list = [];
         const late = [];
         const imp = (filename) => {
@@ -207,7 +206,7 @@ run().then(() => {
             }
             else if (obj instanceof abaplint.Objects.Class) {
                 if (obj.getName().toUpperCase() !== "CL_ABAP_CHAR_UTILITIES"
-                    && ((_a = obj.getDefinition()) === null || _a === void 0 ? void 0 : _a.getMethodDefinitions().getByName("CLASS_CONSTRUCTOR")) !== undefined) {
+                    && this.hasClassConstructor(reg, obj)) {
                     // this will not solve all problems with class constors 100%, but probably good enough
                     late.push(imp(`${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
                 }
@@ -221,6 +220,22 @@ run().then(() => {
         }
         return [...list.sort(), ...late].join("\n");
     }
+    // class constructors might make early use of eg. constants from interfaces
+    // sub classes will import() super classes and trigger a class constructor of the super
+    hasClassConstructor(reg, clas) {
+        var _a, _b;
+        if (((_a = clas.getDefinition()) === null || _a === void 0 ? void 0 : _a.getMethodDefinitions().getByName("CLASS_CONSTRUCTOR")) !== undefined) {
+            return true;
+        }
+        const sup = (_b = clas.getDefinition()) === null || _b === void 0 ? void 0 : _b.getSuperClass();
+        if (sup !== undefined) {
+            const superClass = reg.getObject("CLAS", sup);
+            if (superClass) {
+                return this.hasClassConstructor(reg, superClass);
+            }
+        }
+        return false;
+    }
 }
 exports.UnitTest = UnitTest;
 //# sourceMappingURL=unit_test.js.map

package/build/src/validation.js

@@ -30,10 +30,12 @@ exports.config = {
         "allowed_object_types": {
             "allowed": ["INTF", "CLAS", "PROG", "DEVC", "TABL", "SHLP", "XSLT", "SHMA", "SICF", "NROB", "TYPE", "DTEL", "DOMA", "TTYP", "MSAG", "FUGR"],
         },
-        "exit_or_check": {
-            "allowCheck": true,
-            "allowExit": false,
-        },
+        /*
+            "exit_or_check": {
+              "allowCheck": true,
+              "allowExit": false,
+            },
+        */
         "unknown_types": true,
         "ambiguous_statement": true,
         "implement_methods": true,

package/package.json

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