@abaplint/core 2.85.25 → 2.85.28

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.25";
+        return "2.85.28";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/downport.js

@@ -335,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();
@@ -487,6 +490,9 @@ ${indentation}`);
         else if (source.findFirstExpression(Expressions.FieldLength)) {
             return undefined;
         }
+        else if (source.findFirstExpression(Expressions.TableExpression)) {
+            return undefined;
+        }
         const targetName = (_c = target.findFirstExpression(Expressions.TargetField)) === null || _c === void 0 ? void 0 : _c.concatTokens();
         const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
         const firstToken = node.getFirstToken();
@@ -1144,7 +1150,9 @@ ${indentation}    output = ${topTarget}.`;
     uniqueName(position, filename, highSyntax) {
         const spag = highSyntax.spaghetti.lookupPosition(position, filename);
         if (spag === undefined) {
-            return "uniqueErrorSpag";
+            const name = "temprr" + this.counter;
+            this.counter++;
+            return name;
         }
         while (true) {
             const name = "temp" + this.counter;

package/build/src/rules/many_parentheses.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ManyParentheses = exports.ManyParenthesesConf = void 0;
 const Expressions = require("../abap/2_statements/expressions");
+const Statements = require("../abap/2_statements/statements");
 const issue_1 = require("../issue");
 const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
@@ -64,9 +65,25 @@ ENDIF.
                 issues.push(issue);
             }
         }
+        for (const m of structure.findAllStatements(Statements.Move)) {
+            issues.push(...this.analyzeMove(file, m));
+        }
         return issues;
     }
     ////////////////////
+    analyzeMove(file, m) {
+        const issues = [];
+        const children = m.getChildren();
+        const last = children[children.length - 2];
+        const lastChildren = last.getChildren();
+        if (lastChildren.length === 3
+            && lastChildren[0].getFirstToken().getStr() === "("
+            && lastChildren[2].getFirstToken().getStr() === ")") {
+            const issue = issue_1.Issue.atToken(file, last.getFirstToken(), "Too many parentheses", this.getMetadata().key, this.conf.severity);
+            issues.push(issue);
+        }
+        return issues;
+    }
     analyze(file, cond) {
         const issues = [];
         let comparator = "";

package/package.json

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