@abaplint/transpiler 2.13.38 → 2.13.40

package/build/src/statements/concatenate.js

@@ -53,6 +53,9 @@ class ConcatenateTranspiler {
         if (concat.includes(" RESPECTING BLANKS")) {
             extra += ", respectingBlanks: true";
         }
+        if (concat.includes(" IN BYTE MODE")) {
+            extra += ", byteMode: true";
+        }
         const target = traversal.traverse(node.findDirectExpression(abaplint.Expressions.Target));
         return new chunk_1.Chunk()
             .append("abap.statements.concatenate({source: [", node, traversal)

package/build/src/statements/return.js

@@ -37,7 +37,6 @@ exports.ReturnTranspiler = void 0;
 const abaplint = __importStar(require("@abaplint/core"));
 const traversal_1 = require("../traversal");
 const chunk_1 = require("../chunk");
-const unique_identifier_1 = require("../unique_identifier");
 class ReturnTranspiler {
     transpile(node, traversal) {
         const source = node.findDirectExpression(abaplint.Expressions.Source);
@@ -51,8 +50,9 @@ class ReturnTranspiler {
             }
         }
         let pre = "";
-        if (traversal.isInsideDoOrWhile(node)) {
-            pre = `abap.builtin.sy.get().index.set(${unique_identifier_1.UniqueIdentifier.getIndexBackup1()});\n`;
+        const syIndexBackup = traversal.findCurrentDoOrWhileIndexBackup(node);
+        if (syIndexBackup !== undefined) {
+            pre = `abap.builtin.sy.get().index.set(${syIndexBackup});\n`;
         }
         if (scope?.getIdentifier().stype === abaplint.ScopeType.Method
             && scope?.getIdentifier().sname.toLowerCase() === "constructor") {

package/build/src/structures/do.js

@@ -44,6 +44,7 @@ class DoTranspiler {
         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) {
+                traversal.registerDoOrWhileIndexBackup(c, syIndexBackup);
                 ret.appendChunk(new statements_1.DoTranspiler(syIndexBackup).transpile(c, traversal));
                 ret.appendString("\n");
             }

package/build/src/structures/while.js

@@ -44,6 +44,7 @@ class WhileTranspiler {
         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) {
+                traversal.registerDoOrWhileIndexBackup(c, syIndexBackup);
                 ret.appendChunk(new statements_1.WhileTranspiler(syIndexBackup).transpile(c, traversal));
                 ret.appendString("\n");
             }

package/build/src/traversal.d.ts

@@ -6,6 +6,7 @@ export declare class Traversal {
     private readonly file;
     private readonly obj;
     private sqlInferredType;
+    private readonly doOrWhileIndexBackups;
     readonly reg: abaplint.IRegistry;
     readonly options: ITranspilerOptions | undefined;
     constructor(spaghetti: abaplint.ISpaghettiScope, file: abaplint.ABAPFile, obj: abaplint.ABAPObject, reg: abaplint.IRegistry, options?: ITranspilerOptions);
@@ -58,6 +59,8 @@ export declare class Traversal {
     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;
+    registerDoOrWhileIndexBackup(node: abaplint.Nodes.StatementNode, name: string): void;
+    findCurrentDoOrWhileIndexBackup(node: abaplint.Nodes.StatementNode): string | undefined;
     registerClassOrInterface(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined): string;
     setValues(identifier: abaplint.TypedIdentifier, name: string): string;
     static setValues(identifier: abaplint.TypedIdentifier, name: string): string;

package/build/src/traversal.js

@@ -47,6 +47,7 @@ class Traversal {
     file;
     obj;
     sqlInferredType;
+    doOrWhileIndexBackups = new Map();
     reg;
     options;
     constructor(spaghetti, file, obj, reg, options) {
@@ -779,12 +780,18 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         return stack.length > 0;
     }
     isInsideDoOrWhile(node) {
+        return this.findCurrentDoOrWhileIndexBackup(node) !== undefined;
+    }
+    registerDoOrWhileIndexBackup(node, name) {
+        this.doOrWhileIndexBackups.set(node, name);
+    }
+    findCurrentDoOrWhileIndexBackup(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);
+                stack.push(this.doOrWhileIndexBackups.get(statement));
             }
             else if (get instanceof abaplint.Statements.EndWhile
                 || get instanceof abaplint.Statements.EndDo) {
@@ -794,7 +801,7 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
                 break;
             }
         }
-        return stack.length > 0;
+        return stack[stack.length - 1];
     }
     registerClassOrInterface(def) {
         if (def === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.13.38",
+  "version": "2.13.40",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,7 +29,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.119.59",
+    "@abaplint/core": "^2.119.65",
     "source-map": "^0.7.6"
   },
   "devDependencies": {