@abaplint/core 2.93.25 → 2.93.27

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

@@ -15,7 +15,8 @@ class For extends combi_1.Expression {
         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", (0, combi_1.alt)(field_chain_1.FieldChain, (0, combi_1.seq)("(", (0, combi_1.plus)(_1.LoopGroupByComponent), ")")), (0, combi_1.opt)((0, combi_1.seq)((0, combi_1.alt)("ASCENDING", "DESCENDING"), (0, combi_1.opt)("AS TEXT"))), (0, combi_1.opt)("WITHOUT MEMBERS"));
-        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 t = (0, combi_1.alt)(_1.TargetField, _1.TargetFieldSymbol);
+        const groups = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.seq)("GROUPS", t, "OF", t, "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

@@ -8,12 +8,17 @@ const inline_loop_definition_1 = require("./inline_loop_definition");
 const _scope_type_1 = require("../_scope_type");
 const component_cond_1 = require("./component_cond");
 const cond_1 = require("./cond");
+const basic_1 = require("../../types/basic");
+const _typed_identifier_1 = require("../../types/_typed_identifier");
+const _reference_1 = require("../_reference");
 class For {
     runSyntax(node, scope, filename) {
+        var _a;
         let scoped = false;
         const inlineLoop = node.findDirectExpressions(Expressions.InlineLoopDefinition);
         const inlineField = node.findAllExpressions(Expressions.InlineFieldDefinition);
-        const addScope = inlineLoop.length > 0 || inlineField.length > 0;
+        const groupsToken = (_a = node.findExpressionAfterToken("GROUPS")) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+        const addScope = inlineLoop.length > 0 || inlineField.length > 0 || groupsToken !== undefined;
         if (addScope) {
             // this scope is popped in parent expressions
             scope.push(_scope_type_1.ScopeType.For, "FOR", node.getFirstToken().getStart(), filename);
@@ -25,6 +30,12 @@ class For {
         for (const f of inlineField) {
             new inline_field_definition_1.InlineFieldDefinition().runSyntax(f, scope, filename);
         }
+        if (groupsToken !== undefined) {
+            const type = new basic_1.VoidType("todoGroupBy");
+            const identifier = new _typed_identifier_1.TypedIdentifier(groupsToken, filename, type, ["inline" /* IdentifierMeta.InlineDefinition */]);
+            scope.addIdentifier(identifier);
+            scope.addReference(groupsToken, identifier, _reference_1.ReferenceType.DataWriteReference, filename);
+        }
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }

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

@@ -6,7 +6,6 @@ const for_1 = require("./for");
 const source_1 = require("./source");
 const inline_field_definition_1 = require("./inline_field_definition");
 const unknown_type_1 = require("../../types/basic/unknown_type");
-const _scope_type_1 = require("../_scope_type");
 const reduce_next_1 = require("./reduce_next");
 const let_1 = require("./let");
 class ReduceBody {
@@ -26,8 +25,12 @@ class ReduceBody {
                 first = found;
             }
         }
+        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++;
+            }
         }
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
@@ -38,7 +41,7 @@ class ReduceBody {
         if (scoped === 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 (first) {

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -218,7 +218,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.downportRefSimple(high, lowFile);
+        found = this.downportRefSimple(high, lowFile, highSyntax);
         if (found) {
             return found;
         }
@@ -258,13 +258,31 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.outlineValue(low, high, lowFile, highSyntax);
-        if (found) {
-            return found;
+        let skipValue = false;
+        let skipReduce = false;
+        const valueBody = high.findFirstExpression(Expressions.ValueBody);
+        const reduceBody = high.findFirstExpression(Expressions.ReduceBody);
+        if (valueBody && reduceBody) {
+            const valueToken = valueBody.getFirstToken();
+            const reduceToken = reduceBody.getFirstToken();
+            if (valueToken.getStart().isBefore(reduceToken.getStart())) {
+                skipReduce = true;
+            }
+            else {
+                skipValue = true;
+            }
         }
-        found = this.outlineReduce(low, high, lowFile, highSyntax);
-        if (found) {
-            return found;
+        if (skipValue !== true) {
+            found = this.outlineValue(low, high, lowFile, highSyntax);
+            if (found) {
+                return found;
+            }
+        }
+        if (skipReduce !== true) {
+            found = this.outlineReduce(low, high, lowFile, highSyntax);
+            if (found) {
+                return found;
+            }
         }
         found = this.outlineSwitch(low, high, lowFile, highSyntax);
         if (found) {
@@ -899,7 +917,7 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         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) {
+    downportRefSimple(high, lowFile, highSyntax) {
         var _a;
         if (!(high.get() instanceof Statements.Move)
             || high.getChildren().length !== 4
@@ -911,10 +929,19 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
             return undefined;
         }
         const sourceRef = (_a = high.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Source);
-        if (sourceRef === undefined || sourceRef.getChildren().length !== 1) {
-            return;
+        if (sourceRef === undefined
+            || sourceRef.getChildren().length !== 1) {
+            return undefined;
+        }
+        let code = "";
+        if (sourceRef.findFirstExpression(Expressions.TableExpression)) {
+            const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+            code = `ASSIGN ${sourceRef.concatTokens()} TO FIELD-SYMBOL(<${uniqueName}>).
+GET REFERENCE OF <${uniqueName}> INTO ${target.concatTokens()}`;
+        }
+        else {
+            code = `GET REFERENCE OF ${sourceRef.concatTokens()} INTO ${target.concatTokens()}`;
         }
-        const code = `GET REFERENCE OF ${sourceRef.concatTokens()} INTO ${target.concatTokens()}`;
         const start = high.getFirstToken().getStart();
         const end = high.getLastToken().getStart();
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
@@ -1388,24 +1415,28 @@ ${indentation}    output = ${topTarget}.`;
         return undefined;
     }
     outlineFor(forLoop, indentation, lowFile, highSyntax) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         let body = "";
         let end = "";
         const loopSource = (_a = forLoop.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
         let loopTargetField = (_b = forLoop.findFirstExpression(Expressions.TargetField)) === null || _b === void 0 ? void 0 : _b.concatTokens();
-        if (((_d = (_c = forLoop.findDirectExpression(Expressions.InlineLoopDefinition)) === null || _c === void 0 ? void 0 : _c.getFirstChild()) === null || _d === void 0 ? void 0 : _d.get()) instanceof Expressions.TargetFieldSymbol) {
+        const of = (_c = forLoop.findExpressionAfterToken("OF")) === null || _c === void 0 ? void 0 : _c.concatTokens();
+        if (of !== undefined) {
+            loopTargetField = of;
+        }
+        if (((_e = (_d = forLoop.findDirectExpression(Expressions.InlineLoopDefinition)) === null || _d === void 0 ? void 0 : _d.getFirstChild()) === null || _e === void 0 ? void 0 : _e.get()) instanceof Expressions.TargetFieldSymbol) {
             loopTargetField = undefined;
         }
-        let cond = ((_e = forLoop.findDirectExpression(Expressions.ComponentCond)) === null || _e === void 0 ? void 0 : _e.concatTokens()) || "";
+        let cond = ((_f = forLoop.findDirectExpression(Expressions.ComponentCond)) === null || _f === void 0 ? void 0 : _f.concatTokens()) || "";
         if (cond !== "") {
             cond = " WHERE " + cond;
         }
         const loop = forLoop.findDirectExpression(Expressions.InlineLoopDefinition);
-        const indexInto = (_f = loop === null || loop === void 0 ? void 0 : loop.findExpressionAfterToken("INTO")) === null || _f === void 0 ? void 0 : _f.concatTokens();
+        const indexInto = (_g = loop === null || loop === void 0 ? void 0 : loop.findExpressionAfterToken("INTO")) === null || _g === void 0 ? void 0 : _g.concatTokens();
         if (forLoop.findDirectTokenByText("UNTIL")
             || forLoop.findDirectTokenByText("WHILE")) {
             const fieldDef = forLoop.findDirectExpression(Expressions.InlineFieldDefinition);
-            const field = (_g = fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.findFirstExpression(Expressions.Field)) === null || _g === void 0 ? void 0 : _g.concatTokens();
+            const field = (_h = fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.findFirstExpression(Expressions.Field)) === null || _h === void 0 ? void 0 : _h.concatTokens();
             const indexBackup = this.uniqueName(forLoop.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             body += indentation + "DATA " + field + " TYPE i.\n";
             const second = fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.getChildren()[2];
@@ -1428,9 +1459,9 @@ ${indentation}    output = ${topTarget}.`;
             end += indentation + "ENDWHILE";
         }
         else if (loopTargetField !== undefined) {
-            let from = (_h = forLoop.findExpressionAfterToken("FROM")) === null || _h === void 0 ? void 0 : _h.concatTokens();
+            let from = (_j = forLoop.findExpressionAfterToken("FROM")) === null || _j === void 0 ? void 0 : _j.concatTokens();
             from = from ? " FROM " + from : "";
-            let to = (_j = forLoop.findExpressionAfterToken("TO")) === null || _j === void 0 ? void 0 : _j.concatTokens();
+            let to = (_k = forLoop.findExpressionAfterToken("TO")) === null || _k === void 0 ? void 0 : _k.concatTokens();
             to = to ? " TO " + to : "";
             let gby = "";
             for (const lg of forLoop.findDirectExpressions(Expressions.LoopGroupByComponent)) {
@@ -1459,7 +1490,7 @@ ${indentation}    output = ${topTarget}.`;
         }
         else if (loopTargetField === undefined) {
             // todo, also backup sy-index / sy-tabix here?
-            const loopTargetFieldSymbol = (_k = forLoop.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _k === void 0 ? void 0 : _k.concatTokens();
+            const loopTargetFieldSymbol = (_l = forLoop.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _l === void 0 ? void 0 : _l.concatTokens();
             body += indentation + `LOOP AT ${loopSource} ASSIGNING FIELD-SYMBOL(${loopTargetFieldSymbol})${cond}.\n`;
             if (indexInto) {
                 body += indentation + "  DATA(" + indexInto + ") = sy-tabix.\n";

package/package.json

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