@abaplint/core 2.85.24 → 2.85.27

package/build/abaplint.d.ts

@@ -4996,6 +4996,7 @@ declare class StatementNode extends AbstractNode<ExpressionNode | TokenNode> {
      */
     findTokenSequencePosition(first: string, second: string): Position | undefined;
     findExpressionAfterToken(text: string): ExpressionNode | undefined;
+    findExpressionsAfterToken(text: string): ExpressionNode[];
     private toTokens;
     private toTokenNodess;
 }

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

@@ -16,9 +16,8 @@ class SQLCompare extends combi_1.Expression {
         const nul = (0, combi_1.seq)("IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("NULL", (0, combi_1.ver)(version_1.Version.v753, "INITIAL")));
         const source = new _1.SQLSource();
         const sub = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("ALL", "ANY", "SOME")), subSelect);
-        const builtin = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)((0, combi_1.altPrio)("lower", "upper"), (0, combi_1.tok)(tokens_1.ParenLeftW), _1.SQLFieldName, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const arith = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/"), _1.SQLFieldName)));
-        const rett = (0, combi_1.seq)((0, combi_1.altPrio)(builtin, (0, combi_1.seq)(_1.SQLFieldName, (0, combi_1.optPrio)(arith))), (0, combi_1.altPrio)((0, combi_1.seq)(_1.SQLCompareOperator, (0, combi_1.altPrio)(sub, source)), (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(inn, like, between)), nul));
+        const rett = (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLFunction, (0, combi_1.seq)(_1.SQLFieldName, (0, combi_1.optPrio)(arith))), (0, combi_1.altPrio)((0, combi_1.seq)(_1.SQLCompareOperator, (0, combi_1.altPrio)(sub, source)), (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(inn, like, between)), nul));
         const exists = (0, combi_1.seq)("EXISTS", subSelect);
         return (0, combi_1.altPrio)(exists, _1.Dynamic, rett);
     }

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

@@ -8,9 +8,13 @@ const combi_1 = require("../combi");
 const integer_1 = require("./integer");
 const sql_alias_field_1 = require("./sql_alias_field");
 const sql_field_name_1 = require("./sql_field_name");
+const simple_source3_1 = require("./simple_source3");
+const source_1 = require("./source");
 class SQLFunction extends combi_1.Expression {
     getRunnable() {
-        const param = (0, combi_1.alt)(sql_field_name_1.SQLFieldName, sql_alias_field_1.SQLAliasField, SQLFunction, constant_1.Constant);
+        const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), source_1.Source, (0, combi_1.tok)(tokens_1.WParenRightW));
+        const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.alt)(simple_source3_1.SimpleSource3, paren)));
+        const param = (0, combi_1.alt)(sql_field_name_1.SQLFieldName, sql_alias_field_1.SQLAliasField, SQLFunction, constant_1.Constant, at);
         const castTypes = (0, combi_1.altPrio)((0, combi_1.seq)("CHAR", (0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)), "FLTP");
         const abs = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("abs", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const cast = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("cast", (0, combi_1.tok)(tokens_1.ParenLeftW), param, "AS", castTypes, (0, combi_1.tok)(tokens_1.WParenRightW)));
@@ -20,10 +24,12 @@ class SQLFunction extends combi_1.Expression {
         const div = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("div", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const floor = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("floor", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const length = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("length", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const lower = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("lower", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const mod = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("mod", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const replace = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("replace", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const upper = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("upper", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const uuid = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("uuid", (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.WParenRightW)));
-        return (0, combi_1.altPrio)(uuid, abs, ceil, floor, cast, div, mod, coalesce, concat, replace, length);
+        return (0, combi_1.altPrio)(uuid, abs, ceil, floor, cast, div, mod, coalesce, concat, replace, length, lower, upper);
     }
 }
 exports.SQLFunction = SQLFunction;

package/build/src/abap/5_syntax/_builtin.js

@@ -131,6 +131,7 @@ class BuiltIn {
         ret.push(this.buildConstant("col_heading", new basic_1.IntegerType(), "1"));
         ret.push(this.buildConstant("col_key", new basic_1.IntegerType(), "4"));
         ret.push(this.buildConstant("col_negative", new basic_1.IntegerType(), "6"));
+        ret.push(this.buildConstant("col_group", new basic_1.IntegerType(), "7"));
         ret.push(this.buildConstant("col_normal", new basic_1.IntegerType(), "2"));
         ret.push(this.buildConstant("col_positive", new basic_1.IntegerType(), "5"));
         ret.push(this.buildConstant("col_total", new basic_1.IntegerType(), "3"));

package/build/src/abap/5_syntax/statements/find.js

@@ -26,9 +26,11 @@ class Find {
                 this.inline(rfound, scope, filename, new basic_1.TableType(type, { withHeader: false }));
             }
         }
-        const ofound = node.findExpressionAfterToken("OFFSET");
-        if (ofound && ofound.get() instanceof Expressions.Target) {
-            this.inline(ofound, scope, filename, new basic_1.IntegerType());
+        const ofound = node.findExpressionsAfterToken("OFFSET");
+        for (const o of ofound) {
+            if (o.get() instanceof Expressions.Target) {
+                this.inline(o, scope, filename, new basic_1.IntegerType());
+            }
         }
         const lfound = node.findExpressionAfterToken("LINE");
         if (lfound && lfound.get() instanceof Expressions.Target) {
@@ -44,7 +46,10 @@ class Find {
         }
         if (node.findDirectTokenByText("SUBMATCHES")) {
             for (const t of node.findDirectExpressions(Expressions.Target)) {
-                if (t === rfound || t === ofound || t === lfound || t === cfound || t === lnfound) {
+                if (t === rfound || t === lfound || t === cfound || t === lnfound) {
+                    continue;
+                }
+                else if (ofound.indexOf(t) >= 0) {
                     continue;
                 }
                 const inline = t === null || t === void 0 ? void 0 : t.findDirectExpression(Expressions.InlineData);

package/build/src/abap/nodes/statement_node.js

@@ -255,6 +255,20 @@ class StatementNode extends _abstract_node_1.AbstractNode {
         }
         return undefined;
     }
+    findExpressionsAfterToken(text) {
+        const children = this.getChildren();
+        const ret = [];
+        for (let i = 0; i < children.length - 1; i++) {
+            const c = children[i];
+            const next = children[i + 1];
+            if (c instanceof token_node_1.TokenNode
+                && c.get().getStr().toUpperCase() === text.toUpperCase()
+                && next instanceof expression_node_1.ExpressionNode) {
+                ret.push(next);
+            }
+        }
+        return ret;
+    }
     ////////////////////////////////
     toTokens(b) {
         const tokens = [];

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -44,19 +44,21 @@ Current rules:
 * CONV is outlined
 * COND is outlined
 * REDUCE is outlined
+* SWITCH is outlined
+* APPEND expression is outlined
 * EMPTY KEY is changed to DEFAULT KEY, opposite of DEFAULT KEY in https://rules.abaplint.org/avoid_use/
 * CAST changed to ?=
 * LOOP AT method_call( ) is outlined
 * VALUE # with structure fields
 * VALUE # with internal table lines
-* Table Expressions[ index ] are outlined
+* Table Expressions are outlined
 * SELECT INTO @DATA definitions are outlined
 * Some occurrences of string template formatting option ALPHA changed to function module call
 * SELECT/INSERT/MODIFY/DELETE/UPDATE "," in field list removed, "@" in source/targets removed
 * PARTIALLY IMPLEMENTED removed, it can be quick fixed via rule implement_methods
 * RAISE EXCEPTION ... MESSAGE
-* APPEND expression is outlined
 * Moving with +=, -=, /=, *=, &&= is expanded
+* line_exists and line_index is downported to READ TABLE
 
 Only one transformation is applied to a statement at a time, so multiple steps might be required to do the full downport.`,
             tags: [_irule_1.RuleTag.Experimental, _irule_1.RuleTag.Downport, _irule_1.RuleTag.Quickfix],
@@ -192,6 +194,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.outlineSwitch(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.outlineCast(high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -224,7 +230,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.replaceLineExists(high, lowFile, highSyntax);
+        found = this.replaceLineFunctions(high, lowFile, highSyntax);
         if (found) {
             return found;
         }
@@ -329,6 +335,9 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (fields.length === 1) {
             fieldDefinition = `DATA ${name} TYPE ${tableName}-${fields[0].concatTokens()}.`;
         }
+        else if (fieldList.concatTokens() === "*") {
+            fieldDefinition = `DATA ${name} TYPE ${tableName}.`;
+        }
         else {
             for (const f of fields) {
                 const fieldName = f.concatTokens();
@@ -408,16 +417,11 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
         return undefined;
     }
     replaceTableExpression(node, lowFile, highSyntax) {
-        var _a;
         for (const fieldChain of node.findAllExpressionsRecursive(Expressions.FieldChain)) {
             const tableExpression = fieldChain.findDirectExpression(Expressions.TableExpression);
             if (tableExpression === undefined) {
                 continue;
             }
-            if (tableExpression.getChildren().length > 3) {
-                // for now, only support the INDEX scenario
-                continue;
-            }
             let pre = "";
             let startToken = undefined;
             for (const child of fieldChain.getChildren()) {
@@ -432,11 +436,24 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
             if (startToken === undefined) {
                 continue;
             }
+            let condition = "";
+            for (const c of tableExpression.getChildren() || []) {
+                if (c.getFirstToken().getStr() === "[" || c.getFirstToken().getStr() === "]") {
+                    continue;
+                }
+                else if (c.get() instanceof Expressions.ComponentChainSimple && condition === "") {
+                    condition = "WITH KEY ";
+                }
+                else if (c.get() instanceof Expressions.Source && condition === "") {
+                    condition = "INDEX ";
+                }
+                condition += c.concatTokens() + " ";
+            }
             const uniqueName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
             const firstToken = node.getFirstToken();
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), `DATA ${uniqueName} LIKE LINE OF ${pre}.
-${indentation}READ TABLE ${pre} INDEX ${(_a = tableExpression.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens()} INTO ${uniqueName}.
+${indentation}READ TABLE ${pre} ${condition}INTO ${uniqueName}.
 ${indentation}IF sy-subrc <> 0.
 ${indentation}  RAISE EXCEPTION TYPE cx_sy_itab_line_not_found.
 ${indentation}ENDIF.
@@ -735,6 +752,67 @@ ${indentation}    output = ${topTarget}.`;
         }
         return { body, end };
     }
+    outlineSwitch(node, lowFile, highSyntax) {
+        var _a, _b;
+        for (const i of node.findAllExpressionsRecursive(Expressions.Source)) {
+            const firstToken = i.getFirstToken();
+            if (firstToken.getStr().toUpperCase() !== "SWITCH") {
+                continue;
+            }
+            const type = this.findType(i, lowFile, highSyntax);
+            if (type === undefined) {
+                continue;
+            }
+            const uniqueName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
+            const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+            let body = "";
+            let name = "";
+            const switchBody = i.findDirectExpression(Expressions.SwitchBody);
+            if (switchBody === undefined) {
+                continue;
+            }
+            for (const l of ((_a = switchBody === null || switchBody === void 0 ? void 0 : switchBody.findDirectExpression(Expressions.Let)) === null || _a === void 0 ? void 0 : _a.findDirectExpressions(Expressions.InlineFieldDefinition)) || []) {
+                name = l.getFirstToken().getStr();
+                body += indentation + `DATA(${name}) = ${(_b = switchBody.findFirstExpression(Expressions.Source)) === null || _b === void 0 ? void 0 : _b.concatTokens()}.\n`;
+            }
+            body += `DATA ${uniqueName} TYPE ${type}.\n`;
+            let firstSource = false;
+            let inWhen = false;
+            for (const c of switchBody.getChildren()) {
+                if (c.get() instanceof Expressions.Source && firstSource === false) {
+                    body += indentation + `CASE ${c.concatTokens()}.`;
+                    firstSource = true;
+                }
+                else if (c instanceof nodes_1.TokenNode && c.concatTokens().toUpperCase() === "THEN") {
+                    inWhen = true;
+                    body += ".\n";
+                }
+                else if (c instanceof nodes_1.TokenNode && c.concatTokens().toUpperCase() === "WHEN") {
+                    inWhen = false;
+                    body += `\n${indentation}  WHEN `;
+                }
+                else if (c instanceof nodes_1.TokenNode && c.concatTokens().toUpperCase() === "OR") {
+                    body += ` OR `;
+                }
+                else if (c instanceof nodes_1.TokenNode && c.concatTokens().toUpperCase() === "ELSE") {
+                    inWhen = true;
+                    body += `\n${indentation}  WHEN OTHERS.\n`;
+                }
+                else if (inWhen === false) {
+                    body += c.concatTokens();
+                }
+                else {
+                    body += indentation + "    " + uniqueName + " = " + c.concatTokens() + ".";
+                }
+            }
+            body += "\n" + indentation + "ENDCASE.\n" + indentation;
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), body);
+            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, firstToken.getStart(), i.getLastToken().getEnd(), uniqueName);
+            const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+            return issue_1.Issue.atToken(lowFile, firstToken, "Downport SWITCH", this.getMetadata().key, this.conf.severity, fix);
+        }
+        return undefined;
+    }
     outlineReduce(node, lowFile, highSyntax) {
         var _a;
         for (const i of node.findAllExpressionsRecursive(Expressions.Source)) {
@@ -1101,12 +1179,13 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
-    replaceLineExists(node, lowFile, highSyntax) {
+    replaceLineFunctions(node, lowFile, highSyntax) {
         var _a, _b;
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
         for (const r of (spag === null || spag === void 0 ? void 0 : spag.getData().references) || []) {
+            const func = r.position.getName().toUpperCase();
             if (r.referenceType === _reference_1.ReferenceType.BuiltinMethodReference
-                && r.position.getName().toUpperCase() === "LINE_EXISTS") {
+                && (func === "LINE_EXISTS" || func === "LINE_INDEX")) {
                 const token = r.position.getToken();
                 const expression = this.findMethodCallExpression(node, token);
                 if (expression === undefined) {
@@ -1120,19 +1199,23 @@ ${indentation}    output = ${topTarget}.`;
                     else if (c.get() instanceof Expressions.ComponentChainSimple && condition === "") {
                         condition = "WITH KEY ";
                     }
+                    else if (c.get() instanceof Expressions.Source && condition === "") {
+                        condition = "INDEX ";
+                    }
                     condition += c.concatTokens() + " ";
                 }
                 const tableName = (_b = expression === null || expression === void 0 ? void 0 : expression.findFirstExpression(Expressions.SourceField)) === null || _b === void 0 ? void 0 : _b.concatTokens();
                 const uniqueName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
                 const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+                const sy = func === "LINE_EXISTS" ? "sy-subrc" : "sy-tabix";
                 const code = `DATA ${uniqueName} LIKE sy-subrc.\n` +
                     indentation + `READ TABLE ${tableName} ${condition}TRANSPORTING NO FIELDS.\n` +
-                    indentation + uniqueName + " = sy-subrc.\n" +
+                    indentation + uniqueName + ` = ${sy}.\n` +
                     indentation;
                 const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
                 const start = expression.getFirstToken().getStart();
                 const end = expression.getLastToken().getEnd();
-                const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, uniqueName + " = 0");
+                const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, uniqueName + (func === "LINE_EXISTS" ? " = 0" : ""));
                 const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
                 return issue_1.Issue.atToken(lowFile, token, "Use BOOLC", this.getMetadata().key, this.conf.severity, fix);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.85.24",
+    "version": "2.85.27",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,7 +50,7 @@
         "@types/mocha": "^9.1.0",
         "@types/node": "^17.0.21",
         "chai": "^4.3.6",
-        "eslint": "^8.9.0",
+        "eslint": "^8.10.0",
         "mocha": "^9.2.1",
         "c8": "^7.11.0",
         "source-map-support": "^0.5.21",