@abaplint/core 2.91.26 → 2.91.27

package/build/abaplint.d.ts

@@ -1869,6 +1869,7 @@ declare namespace Expressions {
         LoopGroupByComponent,
         LoopGroupByTarget,
         LoopGroupBy,
+        LoopTarget,
         MacroName,
         MessageClass_2 as MessageClass,
         MessageNumber,
@@ -3559,6 +3560,10 @@ declare class LoopGroupByTarget extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class LoopTarget extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class MacroName extends Expression {
     getRunnable(): IStatementRunnable;
 }

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

@@ -99,6 +99,7 @@ __exportStar(require("./let"), exports);
 __exportStar(require("./loop_group_by_component"), exports);
 __exportStar(require("./loop_group_by_target"), exports);
 __exportStar(require("./loop_group_by"), exports);
+__exportStar(require("./loop_target"), exports);
 __exportStar(require("./macro_name"), exports);
 __exportStar(require("./message_class"), exports);
 __exportStar(require("./message_number"), exports);

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoopTarget = void 0;
+const combi_1 = require("../combi");
+const _1 = require(".");
+class LoopTarget extends combi_1.Expression {
+    getRunnable() {
+        const into = (0, combi_1.seq)((0, combi_1.opt)("REFERENCE"), "INTO", _1.Target);
+        const assigning = (0, combi_1.seq)("ASSIGNING", _1.FSTarget);
+        const target = (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.alt)(into, assigning), (0, combi_1.optPrio)("CASTING")), "TRANSPORTING NO FIELDS");
+        return target;
+    }
+}
+exports.LoopTarget = LoopTarget;
+//# sourceMappingURL=loop_target.js.map

package/build/src/abap/2_statements/statements/loop.js

@@ -9,14 +9,11 @@ const loop_group_by_1 = require("../expressions/loop_group_by");
 class Loop {
     getMatcher() {
         const where = (0, combi_1.seq)("WHERE", (0, combi_1.alt)(expressions_1.ComponentCond, expressions_1.Dynamic));
-        const into = (0, combi_1.seq)((0, combi_1.opt)("REFERENCE"), "INTO", expressions_1.Target);
-        const assigning = (0, combi_1.seq)("ASSIGNING", expressions_1.FSTarget);
         const group = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.seq)("GROUP BY", loop_group_by_1.LoopGroupBy));
-        const target = (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.alt)(into, assigning), (0, combi_1.optPrio)("CASTING")), "TRANSPORTING NO FIELDS");
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
         const to = (0, combi_1.seq)("TO", expressions_1.Source);
         const usingKey = (0, combi_1.seq)("USING KEY", (0, combi_1.altPrio)(expressions_1.SimpleName, expressions_1.Dynamic));
-        const options = (0, combi_1.per)(target, from, to, where, usingKey, group);
+        const options = (0, combi_1.per)(expressions_1.LoopTarget, from, to, where, usingKey, group);
         const at = (0, combi_1.seq)("AT", (0, combi_1.opt)((0, combi_1.seq)("SCREEN", (0, combi_1.fail)())), (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp08, "GROUP")), (0, combi_1.alt)(simple_source2_1.SimpleSource2, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source)), (0, combi_1.opt)(options));
         return (0, combi_1.seq)("LOOP", (0, combi_1.opt)(at));
     }

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

@@ -14,7 +14,8 @@ const dynamic_1 = require("../expressions/dynamic");
 const loop_group_by_1 = require("../expressions/loop_group_by");
 class Loop {
     runSyntax(node, scope, filename) {
-        let target = node.findDirectExpression(Expressions.Target);
+        const loopTarget = node.findDirectExpression(Expressions.LoopTarget);
+        let target = loopTarget === null || loopTarget === void 0 ? void 0 : loopTarget.findDirectExpression(Expressions.Target);
         const targetType = target ? new target_1.Target().runSyntax(target, scope, filename) : undefined;
         if (target === undefined) {
             target = node.findDirectExpression(Expressions.FSTarget);
@@ -58,7 +59,7 @@ class Loop {
             new inline_fs_1.InlineFS().runSyntax(inlinefs, scope, filename, sourceType);
         }
         else {
-            const fstarget = node.findDirectExpression(Expressions.FSTarget);
+            const fstarget = loopTarget === null || loopTarget === void 0 ? void 0 : loopTarget.findDirectExpression(Expressions.FSTarget);
             if (fstarget) {
                 new fstarget_1.FSTarget().runSyntax(fstarget, scope, filename, sourceType);
             }

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Downport = exports.DownportConf = void 0;
+/* eslint-disable max-len */
 const Statements = require("../abap/2_statements/statements");
 const Expressions = require("../abap/2_statements/expressions");
 const Structures = require("../abap/3_structures/structures");
@@ -865,7 +866,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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         if (!(high.get() instanceof Statements.Loop)) {
             return undefined;
         }
@@ -886,32 +887,51 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
                 loopSourceRowType = tt.getRowType().getQualifiedName() || "typeNotFound";
             }
         }
-        let code = `TYPES: BEGIN OF ${groupTargetName}#type,\n`;
+        let code = `TYPES: BEGIN OF ${groupTargetName}type,\n`;
+        let condition = "";
+        let groupCountName = undefined;
         for (const c of group.findAllExpressions(Expressions.LoopGroupByComponent)) {
             const name = c.findFirstExpression(Expressions.ComponentName);
             let type = ((_e = c.findFirstExpression(Expressions.Source)) === null || _e === void 0 ? void 0 : _e.concatTokens()) || "todo";
             if ((_f = c.concatTokens()) === null || _f === void 0 ? void 0 : _f.toUpperCase().endsWith(" = GROUP SIZE")) {
                 type = "i";
+                groupCountName = name === null || name === void 0 ? void 0 : name.concatTokens();
             }
             else {
+                condition += c.concatTokens();
                 type = type.replace(loopTargetName, loopSourceRowType);
                 type = type.replace("->", "-");
             }
-            code += `  ${name === null || name === void 0 ? void 0 : name.concatTokens()} TYPE ${type},\n`;
+            code += `         ${name === null || name === void 0 ? void 0 : name.concatTokens()} TYPE ${type},\n`;
         }
-        code += `  items LIKE ${loopSourceName},
-END OF ${groupTargetName}#type.
-DATA ${groupTargetName}#tab TYPE STANDARD TABLE OF ${groupTargetName}#type WITH DEFAULT KEY.
-* todo, aggregation code here
-LOOP AT ${groupTargetName}#tab ${groupTarget}.`;
+        const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const uniqueFS = 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} ${(_g = high.findFirstExpression(Expressions.LoopTarget)) === null || _g === void 0 ? void 0 : _g.concatTokens()}.
+READ TABLE ${groupTargetName}tab ASSIGNING FIELD-SYMBOL(<${uniqueFS}>) WITH KEY ${condition}.
+IF sy-subrc = 0.
+  <${uniqueFS}>-${groupCountName} = <${uniqueFS}>-${groupCountName} + 1.
+  INSERT ${loopTargetName}->* INTO TABLE <${uniqueFS}>-items.
+ELSE.\n`;
+        for (const c of group.findAllExpressions(Expressions.LoopGroupByComponent)) {
+            code += `  ${uniqueName}-${c.concatTokens().replace("GROUP SIZE", "1")}.\n`;
+        }
+        code += `  INSERT ${loopTargetName}->* INTO TABLE ${uniqueName}-items.\n`;
+        code += `  INSERT ${uniqueName} INTO TABLE ${groupTargetName}tab.\n`;
+        code += `ENDIF.
+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 ((_g = highFile.getStructure()) === null || _g === void 0 ? void 0 : _g.findAllStructures(Structures.Loop)) || []) {
+        for (const l of ((_h = highFile.getStructure()) === null || _h === void 0 ? void 0 : _h.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 ((_h = loop.concatTokens()) === null || _h === void 0 ? void 0 : _h.toUpperCase().startsWith("LOOP AT GROUP ")) {
+                if ((_j = loop.concatTokens()) === null || _j === void 0 ? void 0 : _j.toUpperCase().startsWith("LOOP AT GROUP ")) {
                     const subLoopSource = loop.findFirstExpression(Expressions.SimpleSource2);
                     if (subLoopSource === undefined) {
                         continue;
@@ -1176,7 +1196,7 @@ ${indentation}    output = ${topTarget}.`;
         return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Outline LOOP input", this.getMetadata().key, this.conf.severity, fix);
     }
     outlineLoopTarget(node, lowFile, _highSyntax) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         // also allows outlining of voided types
         if (!(node.get() instanceof Statements.Loop)) {
             return undefined;
@@ -1190,18 +1210,18 @@ ${indentation}    output = ${topTarget}.`;
             return undefined;
         }
         const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
-        const dataTarget = (_b = node.findDirectExpression(Expressions.Target)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(Expressions.InlineData);
+        const dataTarget = (_c = (_b = node.findDirectExpression(Expressions.LoopTarget)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(Expressions.Target)) === null || _c === void 0 ? void 0 : _c.findDirectExpression(Expressions.InlineData);
         if (dataTarget) {
-            const targetName = ((_c = dataTarget.findDirectExpression(Expressions.TargetField)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "DOWNPORT_ERROR";
+            const targetName = ((_d = dataTarget.findDirectExpression(Expressions.TargetField)) === null || _d === void 0 ? void 0 : _d.concatTokens()) || "DOWNPORT_ERROR";
             const code = `DATA ${targetName} LIKE LINE OF ${sourceName}.\n${indentation}`;
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, dataTarget.getFirstToken().getStart(), dataTarget.getLastToken().getEnd(), targetName);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
             return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Outline LOOP data target", this.getMetadata().key, this.conf.severity, fix);
         }
-        const fsTarget = (_d = node.findDirectExpression(Expressions.FSTarget)) === null || _d === void 0 ? void 0 : _d.findDirectExpression(Expressions.InlineFS);
+        const fsTarget = (_f = (_e = node.findDirectExpression(Expressions.LoopTarget)) === null || _e === void 0 ? void 0 : _e.findDirectExpression(Expressions.FSTarget)) === null || _f === void 0 ? void 0 : _f.findDirectExpression(Expressions.InlineFS);
         if (fsTarget) {
-            const targetName = ((_e = fsTarget.findDirectExpression(Expressions.TargetFieldSymbol)) === null || _e === void 0 ? void 0 : _e.concatTokens()) || "DOWNPORT_ERROR";
+            const targetName = ((_g = fsTarget.findDirectExpression(Expressions.TargetFieldSymbol)) === null || _g === void 0 ? void 0 : _g.concatTokens()) || "DOWNPORT_ERROR";
             const code = `FIELD-SYMBOLS ${targetName} LIKE LINE OF ${sourceName}.\n${indentation}`;
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, fsTarget.getFirstToken().getStart(), fsTarget.getLastToken().getEnd(), targetName);

package/package.json

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