@abaplint/transpiler 2.13.72 → 2.13.74

package/build/src/expressions/field_length.js

@@ -15,7 +15,11 @@ class FieldLengthTranspiler {
             }
             else if (c instanceof core_1.Nodes.TokenNode) {
                 if (c.get() instanceof core_1.Tokens.Identifier) {
-                    ret += c.getFirstToken().getStr();
+                    let value = c.getFirstToken().getStr();
+                    if (/^0+\d+$/.test(value)) {
+                        value = value.replace(/^0+/, "") || "0";
+                    }
+                    ret += value;
                 }
             }
         }

package/build/src/expressions/field_offset.js

@@ -15,7 +15,11 @@ class FieldOffsetTranspiler {
             }
             else if (c instanceof core_1.Nodes.TokenNode) {
                 if (c.get() instanceof core_1.Tokens.Identifier) {
-                    ret += c.getFirstToken().getStr().toLowerCase();
+                    let value = c.getFirstToken().getStr().toLowerCase();
+                    if (/^0+\d+$/.test(value)) {
+                        value = value.replace(/^0+/, "") || "0";
+                    }
+                    ret += value;
                 }
             }
         }

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

@@ -6,9 +6,11 @@ export declare class LoopTranspiler implements IStatementTranspiler {
     private unique;
     private readonly injectFrom;
     private readonly skipInto;
+    private readonly atLast;
     constructor(options?: {
         injectFrom?: string;
         skipInto?: boolean;
+        atLast?: string;
     });
     getTarget(): string;
     private determineInto;

package/build/src/statements/loop.js

@@ -42,9 +42,11 @@ class LoopTranspiler {
     unique = "";
     injectFrom = undefined;
     skipInto = undefined;
+    atLast = undefined;
     constructor(options) {
         this.injectFrom = options?.injectFrom;
         this.skipInto = options?.skipInto;
+        this.atLast = options?.atLast;
     }
     getTarget() {
         return this.unique;
@@ -142,6 +144,9 @@ class LoopTranspiler {
             }
             extra.push(`dynamicWhere: {condition: ${code}, evaluate: (name) => {try { return eval(name);} catch {}}}`);
         }
+        if (this.atLast !== undefined) {
+            extra.push(`atLast: (last) => { ${this.atLast} = last; }`);
+        }
         const topEquals = {};
         for (const compare of whereNode?.findDirectExpressions(abaplint.Expressions.ComponentCompare) || []) {
             const op = compare.findDirectExpression(abaplint.Expressions.CompareOperator)?.concatTokens().toUpperCase();

package/build/src/structures/loop.js

@@ -41,12 +41,14 @@ const at_last_1 = require("./at_last");
 const unique_identifier_1 = require("../unique_identifier");
 const statements_1 = require("../statements");
 const at_1 = require("./at");
+const inline_1 = require("../inline");
 class LoopTranspiler {
     transpile(node, traversal) {
         const ret = new chunk_1.Chunk();
         let pre = "";
         let atFirst = undefined;
         let atLast = undefined;
+        let atLastFlag = "";
         let loopStatement = undefined;
         let previous = "";
         let tabix = "";
@@ -58,6 +60,18 @@ class LoopTranspiler {
                 break;
             }
         }
+        const hasAtLast = (node.findDirectStructure(abaplint.Structures.Body)
+            ?.findDirectStructures(abaplint.Structures.Normal) || [])
+            .some(n => n.findDirectStructure(abaplint.Structures.AtLast) !== undefined);
+        const scope = traversal.findCurrentScopeByToken(node.getFirstToken());
+        if (scope?.getIdentifier().stype === abaplint.ScopeType.Program
+            || scope?.getIdentifier().stype === abaplint.ScopeType.SelectionEvent) {
+            ret.appendString(inline_1.InlineDeclarations.buildDeclarations(node, traversal));
+        }
+        if (hasAtLast) {
+            atLastFlag = unique_identifier_1.UniqueIdentifier.get();
+            ret.appendString(`let ${atLastFlag} = false;\n`);
+        }
         if (node.findDirectStatement(abaplint.Statements.Loop)?.findDirectTokenByText("GROUP") !== undefined) {
             return new chunk_1.Chunk(`throw new Error("transpiler todo, GROUP BY");`);
         }
@@ -76,6 +90,9 @@ class LoopTranspiler {
                         }
                         else if (n instanceof abaplint.Nodes.StructureNode && n.get() instanceof abaplint.Structures.AtLast) {
                             atLast = new at_last_1.AtLastTranspiler().transpile(n, traversal);
+                            ret.appendString(`if (${atLastFlag}) {\n`);
+                            ret.appendChunk(atLast);
+                            ret.appendString("}\n");
                         }
                         else if (n instanceof abaplint.Nodes.StructureNode && n.get() instanceof abaplint.Structures.At) {
                             ret.appendChunk(new at_1.AtTranspiler().transpile(n, traversal, previous, loopTarget, tabix, loopStatement));
@@ -93,7 +110,7 @@ class LoopTranspiler {
                     ret.appendString(`let ${previous} = undefined;\n`);
                     ret.appendString(`let ${tabix} = undefined;\n`);
                 }
-                const loop = new statements_1.LoopTranspiler();
+                const loop = new statements_1.LoopTranspiler({ atLast: atLastFlag || undefined });
                 // LoopStatementTranspiler maps its own head, so no ensureStartMapping needed here
                 ret.appendChunk(loop.transpile(c, traversal));
                 ret.appendString("\n");
@@ -118,11 +135,6 @@ class LoopTranspiler {
             atted.appendString(pre);
         }
         atted.appendChunk(ret);
-        if (atLast) {
-            atted.appendString("if (abap.builtin.sy.get().subrc.get() === 0) {\n");
-            atted.appendChunk(atLast);
-            atted.appendString("}\n");
-        }
         return atted;
     }
 }

package/package.json

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