@abaplint/core 2.93.19 → 2.93.21

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

@@ -5,18 +5,10 @@ const Expressions = require("../../2_statements/expressions");
 const basic_1 = require("../../types/basic");
 const component_compare_1 = require("./component_compare");
 const inline_data_1 = require("./inline_data");
-const inline_fs_1 = require("./inline_fs");
+const fstarget_1 = require("./fstarget");
 const target_1 = require("./target");
 class LoopGroupBy {
     runSyntax(node, scope, filename) {
-        const components = [];
-        for (const c of node.findDirectExpressions(Expressions.LoopGroupByComponent)) {
-            components.push({ name: c.getFirstToken().getStr(), type: new basic_1.VoidType("todoGroupBy") });
-        }
-        if (components.length === 0) {
-            return;
-        }
-        const sourceType = new basic_1.StructureType(components);
         for (const t of node.findAllExpressions(Expressions.Target)) {
             const inline = t.findDirectExpression(Expressions.InlineData);
             if (inline) {
@@ -26,10 +18,19 @@ class LoopGroupBy {
                 new target_1.Target().runSyntax(t, scope, filename);
             }
         }
-        const inlinefs = node.findFirstExpression(Expressions.InlineFS);
-        if (inlinefs) {
-            new inline_fs_1.InlineFS().runSyntax(inlinefs, scope, filename, sourceType);
+        for (const t of node.findAllExpressions(Expressions.FSTarget)) {
+            new fstarget_1.FSTarget().runSyntax(t, scope, filename, new basic_1.VoidType("todoGroupBy"));
+        }
+        /*
+        const components: IStructureComponent[] = [];
+        for (const c of node.findDirectExpressions(Expressions.LoopGroupByComponent)) {
+          components.push({name: c.getFirstToken().getStr(), type: new VoidType("todoGroupBy")});
+        }
+        if (components.length === 0) {
+          return;
         }
+        */
+        //    const sourceType = new StructureType(components);
         for (const c of node.findDirectExpressions(Expressions.LoopGroupByComponent)) {
             for (const t of c.findDirectExpressions(Expressions.ComponentCompareSimple)) {
                 new component_compare_1.ComponentCompare().runSyntax(t, scope, filename);

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.93.19";
+        return "2.93.21";
     }
     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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         if (!(high.get() instanceof Statements.Loop)) {
             return undefined;
         }
@@ -929,11 +929,15 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         if (group === undefined) {
             return undefined;
         }
-        const groupTargetName = ((_a = group.findFirstExpression(Expressions.TargetField)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "nameNotFound";
-        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 ");
+        const groupTargetName = ((_a = group.findFirstExpression(Expressions.TargetField)) === null || _a === void 0 ? void 0 : _a.concatTokens())
+            || ((_b = group.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _b === void 0 ? void 0 : _b.concatTokens().replace("<", "_").replace(">", "_"))
+            || "nameNotFound";
+        const loopSourceName = ((_c = high.findFirstExpression(Expressions.SimpleSource2)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "nameNotFound";
+        const loopTargetName = ((_d = high.findFirstExpression(Expressions.TargetField)) === null || _d === void 0 ? void 0 : _d.concatTokens())
+            || ((_e = high.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _e === void 0 ? void 0 : _e.concatTokens())
+            || "nameNotFound";
+        const groupTarget = ((_f = group.findDirectExpression(Expressions.LoopGroupByTarget)) === null || _f === void 0 ? void 0 : _f.concatTokens()) || "";
+        const isReference = (_g = high.findFirstExpression(Expressions.LoopTarget)) === null || _g === void 0 ? void 0 : _g.concatTokens().toUpperCase().startsWith("REFERENCE INTO ");
         let loopSourceRowType = "typeNotFound";
         const spag = highSyntax.spaghetti.lookupPosition(high.getFirstToken().getStart(), lowFile.getFilename());
         if (spag !== undefined) {
@@ -948,8 +952,8 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         let groupCountName = undefined;
         for (const c of group.findAllExpressions(Expressions.LoopGroupByComponent)) {
             const name = c.findFirstExpression(Expressions.ComponentName);
-            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")) {
+            let type = ((_h = c.findFirstExpression(Expressions.Source)) === null || _h === void 0 ? void 0 : _h.concatTokens()) || "todo";
+            if ((_j = c.concatTokens()) === null || _j === void 0 ? void 0 : _j.toUpperCase().endsWith(" = GROUP SIZE")) {
                 type = "i";
                 groupCountName = name === null || name === void 0 ? void 0 : name.concatTokens();
             }
@@ -960,13 +964,23 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
             }
             code += `         ${name === null || name === void 0 ? void 0 : name.concatTokens()} TYPE ${type},\n`;
         }
+        const s = group.findDirectExpression(Expressions.Source);
+        let singleName = "";
+        if (s) {
+            let type = s.concatTokens();
+            type = type.replace(loopTargetName, loopSourceRowType);
+            type = type.replace("->", "-");
+            singleName = s.concatTokens().split("-")[1];
+            code += `         ${singleName} TYPE ${type},\n`;
+            condition = singleName + " = " + s.concatTokens();
+        }
         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} ${(_h = high.findFirstExpression(Expressions.LoopTarget)) === null || _h === void 0 ? void 0 : _h.concatTokens()}.
+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}.
 IF sy-subrc = 0.\n`;
         if (groupCountName !== undefined) {
@@ -978,25 +992,28 @@ ELSE.\n`;
         for (const c of group.findAllExpressions(Expressions.LoopGroupByComponent)) {
             code += `  ${uniqueName}-${c.concatTokens().replace("GROUP SIZE", "1")}.\n`;
         }
+        if (singleName !== "") {
+            code += `  ${uniqueName}-${singleName} = ${loopTargetName}-${singleName}.\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 ((_j = highFile.getStructure()) === null || _j === void 0 ? void 0 : _j.findAllStructures(Structures.Loop)) || []) {
+        for (const l of ((_l = highFile.getStructure()) === null || _l === void 0 ? void 0 : _l.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 ((_k = loop.concatTokens()) === null || _k === void 0 ? void 0 : _k.toUpperCase().startsWith("LOOP AT GROUP ")) {
+                if ((_m = loop.concatTokens()) === null || _m === void 0 ? void 0 : _m.toUpperCase().startsWith("LOOP AT GROUP ")) {
                     const subLoopSource = loop.findFirstExpression(Expressions.SimpleSource2);
                     if (subLoopSource === undefined) {
                         continue;
                     }
                     const subLoopSourceName = (subLoopSource === null || subLoopSource === void 0 ? void 0 : subLoopSource.concatTokens()) || "nameNotFound";
-                    const subCode = `LOOP AT ${subLoopSourceName}->items`;
+                    const subCode = `LOOP AT ${subLoopSourceName}${isReference ? "->" : "-"}items`;
                     const subFix = edit_helper_1.EditHelper.replaceRange(lowFile, loop.getFirstToken().getStart(), subLoopSource.getLastToken().getEnd(), subCode);
                     fix = edit_helper_1.EditHelper.merge(subFix, fix);
                 }
@@ -1085,17 +1102,24 @@ LOOP AT ${groupTargetName}tab ${groupTarget}.`;
             return;
         }
         const valueBody = source.findDirectExpression(Expressions.ValueBody);
-        if (valueBody === undefined || valueBody.getChildren().length !== 1) {
+        if (valueBody === undefined) {
+            return;
+        }
+        const fieldAssignments = valueBody.findDirectExpressions(Expressions.FieldAssignment);
+        if (fieldAssignments.length === 0) {
             return;
         }
-        const fieldAssignment = valueBody.findDirectExpression(Expressions.FieldAssignment);
-        if (fieldAssignment === undefined) {
+        else if (fieldAssignments.length !== valueBody.getChildren().length) {
             return;
         }
         const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
-        const code = `CLEAR ${target.concatTokens()}.\n` + indentation + target.concatTokens() + "-" + fieldAssignment.concatTokens();
+        let code = `CLEAR ${target.concatTokens()}.\n`;
+        for (const fieldAssignment of fieldAssignments) {
+            code += indentation + target.concatTokens() + "-" + fieldAssignment.concatTokens() + `.\n`;
+        }
+        code = code.trimEnd();
         const start = high.getFirstToken().getStart();
-        const end = high.getLastToken().getStart();
+        const end = high.getLastToken().getEnd();
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, simple move", this.getMetadata().key, this.conf.severity, fix);
     }
@@ -1322,7 +1346,9 @@ ${indentation}    output = ${topTarget}.`;
             return undefined;
         }
         const concat = node.concatTokens().toUpperCase();
-        if (concat.includes(" REFERENCE INTO ")) {
+        if (concat.includes(" REFERENCE INTO ")
+            || concat.includes(" GROUP BY ")
+            || concat.startsWith("LOOP AT GROUP ")) {
             return undefined;
         }
         const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
@@ -1789,7 +1815,8 @@ ${indentation}    output = ${topTarget}.`;
     }
     outlineFS(low, high, lowFile, highSyntax) {
         var _a, _b;
-        if (!(low.get() instanceof _statement_1.Unknown)) {
+        if (!(low.get() instanceof _statement_1.Unknown)
+            || (high.get() instanceof Statements.Loop)) {
             return undefined;
         }
         for (const i of high.findAllExpressionsRecursive(Expressions.InlineFS)) {

package/package.json

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