@abaplint/core 2.93.26 → 2.93.28

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -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) {
@@ -918,8 +936,11 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         let code = "";
         if (sourceRef.findFirstExpression(Expressions.TableExpression)) {
             const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
-            code = `DATA(${uniqueName}) = ${sourceRef.concatTokens()}.
-GET REFERENCE OF ${uniqueName} INTO ${target.concatTokens()}`;
+            code = `ASSIGN ${sourceRef.concatTokens()} TO FIELD-SYMBOL(<${uniqueName}>).
+IF sy-subrc <> 0.
+  RAISE EXCEPTION TYPE cx_sy_itab_line_not_found.
+ENDIF.
+GET REFERENCE OF <${uniqueName}> INTO ${target.concatTokens()}`;
         }
         else {
             code = `GET REFERENCE OF ${sourceRef.concatTokens()} INTO ${target.concatTokens()}`;
@@ -1455,16 +1476,36 @@ ${indentation}    output = ${topTarget}.`;
             if (gby !== "") {
                 gby = " GROUP BY ( " + gby + " )";
             }
+            const fc = forLoop.findDirectExpression(Expressions.FieldChain);
+            if (fc) {
+                gby = " GROUP BY " + fc.concatTokens();
+            }
+            if (forLoop.findDirectTokenByText("ASCENDING")) {
+                gby += " ASCENDING";
+            }
+            if (forLoop.findDirectTokenByText("DESCENDING")) {
+                gby += " DESCENDING";
+            }
             const groups = forLoop.findExpressionAfterToken("GROUPS");
             if (groups) {
-                gby += " INTO DATA(" + groups.concatTokens() + ")";
+                const concat = groups.concatTokens();
+                if (concat.startsWith("<")) {
+                    gby += " ASSIGNING FIELD-SYMBOL(" + concat + ")";
+                }
+                else {
+                    gby += " INTO DATA(" + concat + ")";
+                }
             }
             let inGroup = "";
             if (forLoop.concatTokens().toUpperCase().includes(" IN GROUP ")) {
                 inGroup = "-items";
             }
+            let into = "INTO DATA";
+            if (loopTargetField.startsWith("<")) {
+                into = "ASSIGNING FIELD-SYMBOL";
+            }
             // todo, also backup sy-index / sy-tabix here?
-            body += indentation + `LOOP AT ${loopSource}${inGroup} INTO DATA(${loopTargetField})${from}${to}${cond}${gby}.\n`;
+            body += indentation + `LOOP AT ${loopSource}${inGroup} ${into}(${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.26",
+    "version": "2.93.28",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",