@abaplint/core 2.85.46 → 2.85.49

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

@@ -4,9 +4,11 @@ exports.ReduceNext = void 0;
 const combi_1 = require("../combi");
 const _1 = require(".");
 const tokens_1 = require("../../1_lexer/tokens");
+const version_1 = require("../../../version");
 class ReduceNext extends combi_1.Expression {
     getRunnable() {
-        const fields = (0, combi_1.seq)(_1.Field, (0, combi_1.altPrio)("=", (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WPlus), "=")), _1.Source);
+        const calcAssign = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.WPlus), "="), (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WDash), "="), "/=", "*=", "&&="));
+        const fields = (0, combi_1.seq)(_1.Field, (0, combi_1.altPrio)("=", calcAssign), _1.Source);
         return (0, combi_1.seq)("NEXT", (0, combi_1.plus)(fields));
     }
 }

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -710,7 +710,7 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         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, Reduce statement", this.getMetadata().key, this.conf.severity, fix);
+        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, simple move", this.getMetadata().key, this.conf.severity, fix);
     }
     moveWithTableTarget(node, high, lowFile, highSyntax) {
         if (!(high.get() instanceof Statements.Move)) {
@@ -733,7 +733,7 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         const tName = target.concatTokens().split("[")[0];
         const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
         const code = `FIELD-SYMBOLS ${uniqueName} LIKE LINE OF ${tName}.
-${indentation}READ TABLE ${tName} INDEX ${index === null || index === void 0 ? void 0 : index.concatTokens()} ASSIGNING <temp1>.
+${indentation}READ TABLE ${tName} INDEX ${index === null || index === void 0 ? void 0 : index.concatTokens()} ASSIGNING ${uniqueName}.
 ${indentation}IF sy-subrc <> 0.
 ${indentation}  RAISE EXCEPTION TYPE cx_sy_itab_line_not_found.
 ${indentation}ENDIF.
@@ -741,7 +741,7 @@ ${indentation}ENDIF.
         const start = target.getFirstToken().getStart();
         const end = target.getLastToken().getEnd();
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
-        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, Reduce statement", this.getMetadata().key, this.conf.severity, fix);
+        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, move with table target", this.getMetadata().key, this.conf.severity, fix);
     }
     moveWithOperator(high, lowFile) {
         var _a, _b, _c;
@@ -896,8 +896,8 @@ ${indentation}    output = ${topTarget}.`;
             const cond = forLoop.findFirstExpression(Expressions.Cond);
             body += indentation + `WHILE NOT ${cond === null || cond === void 0 ? void 0 : cond.concatTokens()}.\n`;
             const field = (_e = (_d = forLoop.findDirectExpression(Expressions.InlineFieldDefinition)) === null || _d === void 0 ? void 0 : _d.findFirstExpression(Expressions.Field)) === null || _e === void 0 ? void 0 : _e.concatTokens();
-            body += indentation + `  ${field} = ${field} + 1.\n`;
-            end = "ENDWHILE";
+            end += `  ${field} = ${field} + 1.\n`;
+            end += indentation + "ENDWHILE";
         }
         else if (forLoop.findDirectTokenByText("WHILE")) {
             const name = (_f = forLoop.findFirstExpression(Expressions.Field)) === null || _f === void 0 ? void 0 : _f.concatTokens();
@@ -905,8 +905,8 @@ ${indentation}    output = ${topTarget}.`;
             const cond = forLoop.findFirstExpression(Expressions.Cond);
             body += indentation + `WHILE ${cond === null || cond === void 0 ? void 0 : cond.concatTokens()}.\n`;
             const field = (_h = (_g = forLoop.findDirectExpression(Expressions.InlineFieldDefinition)) === null || _g === void 0 ? void 0 : _g.findFirstExpression(Expressions.Field)) === null || _h === void 0 ? void 0 : _h.concatTokens();
-            body += indentation + `  ${field} = ${field} + 1.\n`;
-            end = "ENDWHILE";
+            end += `  ${field} = ${field} + 1.\n`;
+            end += indentation + "ENDWHILE";
         }
         else if (loopTargetField) {
             body += indentation + `LOOP AT ${loopSource} INTO DATA(${loopTargetField}).\n`;
@@ -1014,17 +1014,18 @@ ${indentation}    output = ${topTarget}.`;
                 continue;
             }
             for (const n of next.getChildren()) {
-                if (n.concatTokens().toUpperCase() === "NEXT") {
+                const concat = n.concatTokens();
+                if (concat.toUpperCase() === "NEXT") {
                     continue;
                 }
-                else if (n.concatTokens() === "=") {
-                    body += " = ";
-                }
                 else if (n.get() instanceof Expressions.Field) {
-                    body += indentation + "  " + n.concatTokens();
+                    body += indentation + "  " + concat + " ";
                 }
                 else if (n.get() instanceof Expressions.Source) {
-                    body += n.concatTokens() + ".\n";
+                    body += " " + concat + ".\n";
+                }
+                else {
+                    body += concat;
                 }
             }
             body += indentation + outlineFor.end + `.\n`;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.85.46",
+    "version": "2.85.49",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,7 +48,7 @@
         "@microsoft/api-extractor": "^7.19.5",
         "@types/chai": "^4.3.0",
         "@types/mocha": "^9.1.0",
-        "@types/node": "^17.0.22",
+        "@types/node": "^17.0.23",
         "chai": "^4.3.6",
         "eslint": "^8.11.0",
         "mocha": "^9.2.2",