@abaplint/core 2.93.21 → 2.93.23

package/build/src/abap/2_statements/expressions/loop_group_by_component.js

@@ -7,7 +7,8 @@ const component_compare_simple_1 = require("./component_compare_simple");
 class LoopGroupByComponent extends combi_1.Expression {
     getRunnable() {
         const groupSize = (0, combi_1.seq)(component_name_1.ComponentName, "=", "GROUP SIZE");
-        const components = (0, combi_1.alt)(component_compare_simple_1.ComponentCompareSimple, groupSize);
+        const groupIndex = (0, combi_1.seq)(component_name_1.ComponentName, "=", "GROUP INDEX");
+        const components = (0, combi_1.alt)(component_compare_simple_1.ComponentCompareSimple, groupSize, groupIndex);
         return components;
     }
 }

package/build/src/abap/5_syntax/statements/insert_internal.js

@@ -7,6 +7,7 @@ const source_1 = require("../expressions/source");
 const target_1 = require("../expressions/target");
 const fstarget_1 = require("../expressions/fstarget");
 const basic_1 = require("../../types/basic");
+const inline_data_1 = require("../expressions/inline_data");
 class InsertInternal {
     runSyntax(node, scope, filename) {
         let targetType;
@@ -16,13 +17,13 @@ class InsertInternal {
         if (targetType instanceof basic_1.TableType) {
             targetType = targetType.getRowType();
         }
+        let source = node.findDirectExpression(Expressions.SimpleSource4);
+        if (source === undefined) {
+            source = node.findDirectExpression(Expressions.Source);
+        }
+        const sourceType = source ? new source_1.Source().runSyntax(source, scope, filename, targetType) : targetType;
         const afterAssigning = node.findExpressionAfterToken("ASSIGNING");
         if ((afterAssigning === null || afterAssigning === void 0 ? void 0 : afterAssigning.get()) instanceof Expressions.FSTarget) {
-            let source = node.findDirectExpression(Expressions.SimpleSource4);
-            if (source === undefined) {
-                source = node.findDirectExpression(Expressions.Source);
-            }
-            const sourceType = source ? new source_1.Source().runSyntax(source, scope, filename, targetType) : targetType;
             const inlinefs = afterAssigning === null || afterAssigning === void 0 ? void 0 : afterAssigning.findDirectExpression(Expressions.InlineFS);
             if (inlinefs) {
                 new inline_fs_1.InlineFS().runSyntax(inlinefs, scope, filename, sourceType);
@@ -31,6 +32,16 @@ class InsertInternal {
                 new fstarget_1.FSTarget().runSyntax(afterAssigning, scope, filename, sourceType);
             }
         }
+        const afterInto = node.findExpressionAfterToken("INTO");
+        if ((afterInto === null || afterInto === void 0 ? void 0 : afterInto.get()) instanceof Expressions.Target && sourceType) {
+            const inline = afterInto.findDirectExpression(Expressions.InlineData);
+            if (inline) {
+                new inline_data_1.InlineData().runSyntax(afterInto, scope, filename, new basic_1.DataReference(sourceType));
+            }
+            else {
+                new target_1.Target().runSyntax(afterInto, scope, filename);
+            }
+        }
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename, targetType);
         }

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.93.21";
+        return "2.93.23";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/downport.js

@@ -921,7 +921,7 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, simple REF move", this.getMetadata().key, this.conf.severity, fix);
     }
     downportLoopGroup(high, lowFile, highSyntax, highFile) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         if (!(high.get() instanceof Statements.Loop)) {
             return undefined;
         }
@@ -950,6 +950,7 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         let code = `TYPES: BEGIN OF ${groupTargetName}type,\n`;
         let condition = "";
         let groupCountName = undefined;
+        let groupIndexName = undefined;
         for (const c of group.findAllExpressions(Expressions.LoopGroupByComponent)) {
             const name = c.findFirstExpression(Expressions.ComponentName);
             let type = ((_h = c.findFirstExpression(Expressions.Source)) === null || _h === void 0 ? void 0 : _h.concatTokens()) || "todo";
@@ -957,6 +958,10 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
                 type = "i";
                 groupCountName = name === null || name === void 0 ? void 0 : name.concatTokens();
             }
+            else if ((_k = c.concatTokens()) === null || _k === void 0 ? void 0 : _k.toUpperCase().endsWith(" = GROUP INDEX")) {
+                type = "i";
+                groupIndexName = name === null || name === void 0 ? void 0 : name.concatTokens();
+            }
             else {
                 condition += c.concatTokens();
                 type = type.replace(loopTargetName, loopSourceRowType);
@@ -976,12 +981,16 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         }
         const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
         const uniqueFS = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const uniqueNameIndex = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
         code += `         items LIKE ${loopSourceName},
        END OF ${groupTargetName}type.
 DATA ${groupTargetName}tab TYPE STANDARD TABLE OF ${groupTargetName}type WITH DEFAULT KEY.
 DATA ${uniqueName} LIKE LINE OF ${groupTargetName}tab.
-LOOP AT ${loopSourceName} ${(_k = high.findFirstExpression(Expressions.LoopTarget)) === null || _k === void 0 ? void 0 : _k.concatTokens()}.
-READ TABLE ${groupTargetName}tab ASSIGNING FIELD-SYMBOL(<${uniqueFS}>) WITH KEY ${condition}.
+LOOP AT ${loopSourceName} ${(_l = high.findFirstExpression(Expressions.LoopTarget)) === null || _l === void 0 ? void 0 : _l.concatTokens()}.\n`;
+        if (groupIndexName !== undefined) {
+            code += `DATA(${uniqueNameIndex}) = sy-tabix.\n`;
+        }
+        code += `READ TABLE ${groupTargetName}tab ASSIGNING FIELD-SYMBOL(<${uniqueFS}>) WITH KEY ${condition}.
 IF sy-subrc = 0.\n`;
         if (groupCountName !== undefined) {
             code += `  <${uniqueFS}>-${groupCountName} = <${uniqueFS}>-${groupCountName} + 1.\n`;
@@ -990,7 +999,13 @@ IF sy-subrc = 0.\n`;
 ELSE.\n`;
         code += `  CLEAR ${uniqueName}.\n`;
         for (const c of group.findAllExpressions(Expressions.LoopGroupByComponent)) {
-            code += `  ${uniqueName}-${c.concatTokens().replace("GROUP SIZE", "1")}.\n`;
+            const concat = c.concatTokens();
+            if (concat.endsWith(" GROUP INDEX")) {
+                code += `  ${uniqueName}-${groupIndexName} = ${uniqueNameIndex}.\n`;
+            }
+            else {
+                code += `  ${uniqueName}-${concat.replace("GROUP SIZE", "1")}.\n`;
+            }
         }
         if (singleName !== "") {
             code += `  ${uniqueName}-${singleName} = ${loopTargetName}-${singleName}.\n`;
@@ -1001,13 +1016,13 @@ ELSE.\n`;
 ENDLOOP.
 LOOP AT ${groupTargetName}tab ${groupTarget}.`;
         let fix = edit_helper_1.EditHelper.replaceRange(lowFile, high.getFirstToken().getStart(), high.getLastToken().getEnd(), code);
-        for (const l of ((_l = highFile.getStructure()) === null || _l === void 0 ? void 0 : _l.findAllStructures(Structures.Loop)) || []) {
+        for (const l of ((_m = highFile.getStructure()) === null || _m === void 0 ? void 0 : _m.findAllStructures(Structures.Loop)) || []) {
             // make sure to find the correct/current loop statement
             if (l.findDirectStatement(Statements.Loop) !== high) {
                 continue;
             }
             for (const loop of l.findAllStatements(Statements.Loop)) {
-                if ((_m = loop.concatTokens()) === null || _m === void 0 ? void 0 : _m.toUpperCase().startsWith("LOOP AT GROUP ")) {
+                if ((_o = loop.concatTokens()) === null || _o === void 0 ? void 0 : _o.toUpperCase().startsWith("LOOP AT GROUP ")) {
                     const subLoopSource = loop.findFirstExpression(Expressions.SimpleSource2);
                     if (subLoopSource === undefined) {
                         continue;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.93.21",
+    "version": "2.93.23",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",