@abaplint/core 2.93.16 → 2.93.17

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

@@ -14,7 +14,7 @@ class For extends combi_1.Expression {
         const then = (0, combi_1.seq)("THEN", _1.Source);
         const whil = (0, combi_1.seq)((0, combi_1.altPrio)("UNTIL", "WHILE"), _1.Cond);
         const itera = (0, combi_1.seq)(_1.InlineFieldDefinition, (0, combi_1.opt)(then), whil);
-        const groupBy = (0, combi_1.seq)("GROUP BY", field_chain_1.FieldChain);
+        const groupBy = (0, combi_1.seq)("GROUP BY", (0, combi_1.alt)(field_chain_1.FieldChain, (0, combi_1.seq)("(", (0, combi_1.plus)(_1.LoopGroupByComponent), ")")));
         const groups = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.seq)("GROUPS", field_chain_1.FieldChain, "OF", _1.Target, "IN", _1.Source, (0, combi_1.optPrio)(groupBy)));
         const f = (0, combi_1.seq)("FOR", (0, combi_1.alt)(itera, inn, groups), (0, combi_1.optPrio)(_1.Let));
         return (0, combi_1.ver)(version_1.Version.v740sp05, f);

package/build/src/abap/5_syntax/expressions/for.js

@@ -10,12 +10,14 @@ const component_cond_1 = require("./component_cond");
 const cond_1 = require("./cond");
 class For {
     runSyntax(node, scope, filename) {
+        let scoped = false;
         const inlineLoop = node.findDirectExpressions(Expressions.InlineLoopDefinition);
         const inlineField = node.findAllExpressions(Expressions.InlineFieldDefinition);
         const addScope = inlineLoop.length > 0 || inlineField.length > 0;
         if (addScope) {
             // this scope is popped in parent expressions
             scope.push(_scope_type_1.ScopeType.For, "FOR", node.getFirstToken().getStart(), filename);
+            scoped = true;
         }
         for (const s of inlineLoop) {
             new inline_loop_definition_1.InlineLoopDefinition().runSyntax(s, scope, filename);
@@ -32,6 +34,7 @@ class For {
         for (const s of node.findDirectExpressions(Expressions.Cond)) {
             new cond_1.Cond().runSyntax(s, scope, filename);
         }
+        return scoped;
     }
 }
 exports.For = For;

package/build/src/abap/5_syntax/expressions/value_body.js

@@ -6,20 +6,23 @@ const for_1 = require("./for");
 const source_1 = require("./source");
 const let_1 = require("./let");
 const field_assignment_1 = require("./field_assignment");
-const _scope_type_1 = require("../_scope_type");
 const basic_1 = require("../../types/basic");
 class ValueBody {
     runSyntax(node, scope, filename, targetType) {
         if (node === undefined) {
             return targetType;
         }
+        let forScopes = 0;
         for (const forNode of node.findDirectExpressions(Expressions.For) || []) {
-            new for_1.For().runSyntax(forNode, scope, filename);
+            const scoped = new for_1.For().runSyntax(forNode, scope, filename);
+            if (scoped === true) {
+                forScopes++;
+            }
         }
-        let scoped = false;
+        let letScoped = false;
         const letNode = node.findDirectExpression(Expressions.Let);
         if (letNode) {
-            scoped = new let_1.Let().runSyntax(letNode, scope, filename);
+            letScoped = new let_1.Let().runSyntax(letNode, scope, filename);
         }
         for (const s of node.findDirectExpressions(Expressions.FieldAssignment)) {
             new field_assignment_1.FieldAssignment().runSyntax(s, scope, filename, targetType);
@@ -52,10 +55,10 @@ class ValueBody {
                 new source_1.Source().runSyntax(s, scope, filename);
             }
         }
-        if (scoped === true) {
+        if (letScoped === true) {
             scope.pop(node.getLastToken().getEnd());
         }
-        while (scope.getType() === _scope_type_1.ScopeType.For) {
+        for (let i = 0; i < forScopes; i++) {
             scope.pop(node.getLastToken().getEnd());
         }
         if ((targetType === null || targetType === void 0 ? void 0 : targetType.isGeneric()) && type) {

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -222,6 +222,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.downportCorrespondingSimple(high, lowFile);
+        if (found) {
+            return found;
+        }
         found = this.downportRef(low, high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -873,6 +877,28 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, call function parameter", this.getMetadata().key, this.conf.severity, fix);
     }
+    downportCorrespondingSimple(high, lowFile) {
+        var _a;
+        if (!(high.get() instanceof Statements.Move)
+            || high.getChildren().length !== 4
+            || high.getChildren()[2].getFirstToken().getStr().toUpperCase() !== "CORRESPONDING") {
+            return undefined;
+        }
+        const target = high.findDirectExpression(Expressions.Target);
+        if (target === undefined) {
+            console.dir("sdf1");
+            return undefined;
+        }
+        const sourceRef = (_a = high.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.findFirstExpression(Expressions.CorrespondingBody);
+        if (sourceRef === undefined || sourceRef.getChildren().length !== 1) {
+            return;
+        }
+        const code = `MOVE-CORRESPONDING ${sourceRef.concatTokens()} TO ${target.concatTokens()}`;
+        const start = high.getFirstToken().getStart();
+        const end = high.getLastToken().getStart();
+        const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
+        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, simple CORRESPONDING move", this.getMetadata().key, this.conf.severity, fix);
+    }
     downportRefSimple(high, lowFile) {
         var _a;
         if (!(high.get() instanceof Statements.Move)
@@ -895,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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         if (!(high.get() instanceof Statements.Loop)) {
             return undefined;
         }
@@ -907,6 +933,7 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         const loopSourceName = ((_b = high.findFirstExpression(Expressions.SimpleSource2)) === null || _b === void 0 ? void 0 : _b.concatTokens()) || "nameNotFound";
         const loopTargetName = ((_c = high.findFirstExpression(Expressions.TargetField)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "nameNotFound";
         const groupTarget = ((_d = group.findDirectExpression(Expressions.LoopGroupByTarget)) === null || _d === void 0 ? void 0 : _d.concatTokens()) || "";
+        const isReference = (_e = high.findFirstExpression(Expressions.LoopTarget)) === null || _e === void 0 ? void 0 : _e.concatTokens().toUpperCase().startsWith("REFERENCE INTO ");
         let loopSourceRowType = "typeNotFound";
         const spag = highSyntax.spaghetti.lookupPosition(high.getFirstToken().getStart(), lowFile.getFilename());
         if (spag !== undefined) {
@@ -921,8 +948,8 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         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")) {
+            let type = ((_f = c.findFirstExpression(Expressions.Source)) === null || _f === void 0 ? void 0 : _f.concatTokens()) || "todo";
+            if ((_g = c.concatTokens()) === null || _g === void 0 ? void 0 : _g.toUpperCase().endsWith(" = GROUP SIZE")) {
                 type = "i";
                 groupCountName = name === null || name === void 0 ? void 0 : name.concatTokens();
             }
@@ -939,29 +966,31 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
        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()}.
+LOOP AT ${loopSourceName} ${(_h = high.findFirstExpression(Expressions.LoopTarget)) === null || _h === void 0 ? void 0 : _h.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.
+IF sy-subrc = 0.\n`;
+        if (groupCountName !== undefined) {
+            code += `  <${uniqueFS}>-${groupCountName} = <${uniqueFS}>-${groupCountName} + 1.\n`;
+        }
+        code += `  INSERT ${loopTargetName}${isReference ? "->*" : ""} INTO TABLE <${uniqueFS}>-items.
 ELSE.\n`;
         code += `  CLEAR ${uniqueName}.\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 ${loopTargetName}${isReference ? "->*" : ""} 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 ((_h = highFile.getStructure()) === null || _h === void 0 ? void 0 : _h.findAllStructures(Structures.Loop)) || []) {
+        for (const l of ((_j = highFile.getStructure()) === null || _j === void 0 ? void 0 : _j.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 ((_j = loop.concatTokens()) === null || _j === void 0 ? void 0 : _j.toUpperCase().startsWith("LOOP AT GROUP ")) {
+                if ((_k = loop.concatTokens()) === null || _k === void 0 ? void 0 : _k.toUpperCase().startsWith("LOOP AT GROUP ")) {
                     const subLoopSource = loop.findFirstExpression(Expressions.SimpleSource2);
                     if (subLoopSource === undefined) {
                         continue;
@@ -1362,8 +1391,22 @@ ${indentation}    output = ${topTarget}.`;
             from = from ? " FROM " + from : "";
             let to = (_j = forLoop.findExpressionAfterToken("TO")) === null || _j === void 0 ? void 0 : _j.concatTokens();
             to = to ? " TO " + to : "";
+            let gby = "";
+            for (const lg of forLoop.findDirectExpressions(Expressions.LoopGroupByComponent)) {
+                if (gby !== "") {
+                    gby += " ";
+                }
+                gby = lg.concatTokens();
+            }
+            if (gby !== "") {
+                gby = " GROUP BY ( " + gby + " )";
+            }
+            const groups = forLoop.findExpressionAfterToken("GROUPS");
+            if (groups) {
+                gby += " INTO DATA(" + groups.concatTokens() + ")";
+            }
             // todo, also backup sy-index / sy-tabix here?
-            body += indentation + `LOOP AT ${loopSource} INTO DATA(${loopTargetField})${from}${to}${cond}.\n`;
+            body += indentation + `LOOP AT ${loopSource} INTO DATA(${loopTargetField})${from}${to}${cond}${gby}.\n`;
             if (indexInto) {
                 body += indentation + "  DATA(" + indexInto + ") = sy-tabix.\n";
             }

package/package.json

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