@abaplint/transpiler 2.3.28 → 2.3.29

package/build/src/statements/end_do.js

@@ -8,7 +8,7 @@ class EndDoTranspiler {
     }
     transpile(node, traversal) {
         return new chunk_1.Chunk().append(`}
-abap.builtin.sy.get().index.set(${this.syIndexBackup});`, node, traversal);
+abap.builtin.sy.get().index.set(${this.syIndexBackup});\n`, node, traversal);
     }
 }
 exports.EndDoTranspiler = EndDoTranspiler;

package/build/src/statements/end_while.js

@@ -8,7 +8,7 @@ class EndWhileTranspiler {
     }
     transpile(node, traversal) {
         return new chunk_1.Chunk().append(`}
-abap.builtin.sy.get().index.set(${this.syIndexBackup});`, node, traversal);
+abap.builtin.sy.get().index.set(${this.syIndexBackup});\n`, node, traversal);
     }
 }
 exports.EndWhileTranspiler = EndWhileTranspiler;

package/build/src/statements/form.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const unique_identifier_1 = require("../unique_identifier");
 class FormTranspiler {
     transpile(node) {
+        unique_identifier_1.UniqueIdentifier.resetIndexBackup();
         const name = node.findFirstExpression(abaplint.Expressions.FormName).getFirstToken().getStr();
         return new chunk_1.Chunk("async function " + name + "() {");
     }

package/build/src/statements/method_implementation.js

@@ -6,6 +6,7 @@ const transpile_types_1 = require("../transpile_types");
 const traversal_1 = require("../traversal");
 const expressions_1 = require("../expressions");
 const chunk_1 = require("../chunk");
+const unique_identifier_1 = require("../unique_identifier");
 class MethodImplementationTranspiler {
     transpile(node, traversal) {
         var _a, _b;
@@ -100,9 +101,11 @@ class MethodImplementationTranspiler {
                 "return " + traversal_1.Traversal.escapeClassName(className) + "." + traversal_1.Traversal.escapeClassName(methodName) + "(" + unique + ");\n" +
                 "}\n" + "static ";
         }
+        unique_identifier_1.UniqueIdentifier.resetIndexBackup();
         const str = staticMethod + "async " + traversal_1.Traversal.escapeClassName(methodName) + "(" + unique + ") {" + after;
         return new chunk_1.Chunk().append(str, node, traversal);
     }
+    /////////////////////////////
     findMethod(name, cdef, traversal) {
         var _a, _b;
         if (cdef === undefined) {

package/build/src/statements/return.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReturnTranspiler = void 0;
 const chunk_1 = require("../chunk");
+const unique_identifier_1 = require("../unique_identifier");
 class ReturnTranspiler {
     transpile(node, traversal) {
         let extra = "";
@@ -13,7 +14,11 @@ class ReturnTranspiler {
                 extra = " " + n.toLowerCase();
             }
         }
-        return new chunk_1.Chunk().append("return" + extra + ";", node, traversal);
+        let pre = "";
+        if (traversal.isInsideDoOrWhile(node)) {
+            pre = `abap.builtin.sy.get().index.set(${unique_identifier_1.UniqueIdentifier.getIndexBackup1()});\n`;
+        }
+        return new chunk_1.Chunk().append(pre + "return" + extra + ";", node, traversal);
     }
 }
 exports.ReturnTranspiler = ReturnTranspiler;

package/build/src/structures/do.js

@@ -8,7 +8,7 @@ const unique_identifier_1 = require("../unique_identifier");
 class DoTranspiler {
     transpile(node, traversal) {
         const ret = new chunk_1.Chunk();
-        const syIndexBackup = unique_identifier_1.UniqueIdentifier.get();
+        const syIndexBackup = unique_identifier_1.UniqueIdentifier.getIndexBackup();
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.Do) {
                 ret.appendChunk(new statements_1.DoTranspiler(syIndexBackup).transpile(c, traversal));

package/build/src/structures/function_module.js

@@ -5,6 +5,7 @@ const abaplint = require("@abaplint/core");
 const traversal_1 = require("../traversal");
 const chunk_1 = require("../chunk");
 const transpile_types_1 = require("../transpile_types");
+const unique_identifier_1 = require("../unique_identifier");
 class FunctionModuleTranspiler {
     transpile(node, traversal) {
         var _a;
@@ -27,6 +28,7 @@ class FunctionModuleTranspiler {
                 r += traversal.traverse(c).getCode();
             }
         }
+        unique_identifier_1.UniqueIdentifier.resetIndexBackup();
         return new chunk_1.Chunk(r);
     }
     //////////////////////

package/build/src/structures/while.js

@@ -8,7 +8,7 @@ const unique_identifier_1 = require("../unique_identifier");
 class WhileTranspiler {
     transpile(node, traversal) {
         const ret = new chunk_1.Chunk();
-        const syIndexBackup = unique_identifier_1.UniqueIdentifier.get();
+        const syIndexBackup = unique_identifier_1.UniqueIdentifier.getIndexBackup();
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.While) {
                 ret.appendChunk(new statements_1.WhileTranspiler(syIndexBackup).transpile(c, traversal));

package/build/src/traversal.d.ts

@@ -38,6 +38,7 @@ export declare class Traversal {
     private dataFromInterfaces;
     determineType(node: abaplint.Nodes.ExpressionNode | abaplint.Nodes.StatementNode, scope: abaplint.ISpaghettiScopeNode | undefined): abaplint.AbstractType | undefined;
     isInsideLoop(node: abaplint.Nodes.StatementNode): boolean;
+    isInsideDoOrWhile(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

@@ -373,6 +373,24 @@ class Traversal {
         }
         return stack.length > 0;
     }
+    isInsideDoOrWhile(node) {
+        const stack = [];
+        for (const statement of this.getFile().getStatements()) {
+            const get = statement.get();
+            if (get instanceof abaplint.Statements.While
+                || get instanceof abaplint.Statements.Do) {
+                stack.push(statement);
+            }
+            else if (get instanceof abaplint.Statements.EndWhile
+                || get instanceof abaplint.Statements.EndDo) {
+                stack.pop();
+            }
+            if (statement === node) {
+                break;
+            }
+        }
+        return stack.length > 0;
+    }
     registerClassOrInterface(def) {
         if (def === undefined) {
             return "";

package/build/src/unique_identifier.d.ts

@@ -1,5 +1,9 @@
 export declare class UniqueIdentifier {
-    static counter: number;
+    private static counter;
+    private static indexBackup;
     static reset(): void;
     static get(): string;
+    static resetIndexBackup(): void;
+    static getIndexBackup(): string;
+    static getIndexBackup1(): string;
 }

package/build/src/unique_identifier.js

@@ -11,7 +11,18 @@ class UniqueIdentifier {
         this.counter++;
         return "unique" + this.counter;
     }
+    static resetIndexBackup() {
+        this.indexBackup = 0;
+    }
+    static getIndexBackup() {
+        this.indexBackup++;
+        return "indexBackup" + this.indexBackup;
+    }
+    static getIndexBackup1() {
+        return "indexBackup1";
+    }
 }
 exports.UniqueIdentifier = UniqueIdentifier;
 UniqueIdentifier.counter = 0;
+UniqueIdentifier.indexBackup = 0;
 //# sourceMappingURL=unique_identifier.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.3.28",
+  "version": "2.3.29",
   "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.57",
+    "@abaplint/core": "^2.93.58",
     "source-map": "^0.7.4"
   },
   "devDependencies": {