@abaplint/core 2.85.26 → 2.85.29

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/5_syntax/expressions/method_source.js

@@ -36,10 +36,11 @@ class MethodSource {
                         ooType: "CLAS"
                     };
                     scope.addReference(last.getFirstToken(), foundMethod, _reference_1.ReferenceType.MethodReference, filename, extra);
+                    return foundMethod;
                 }
             }
             else if (context instanceof basic_1.VoidType) {
-                return;
+                return context;
             }
             else {
                 throw new Error("MethodSource, not a object reference, " + node.concatTokens());
@@ -61,6 +62,7 @@ class MethodSource {
           new Dynamic().runSyntax(d, scope, filename);
         }
         */
+        return undefined;
     }
 }
 exports.MethodSource = MethodSource;

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

@@ -17,11 +17,11 @@ class Call {
         if (methodSource === undefined) {
             throw new Error("Call, child MethodSource not found");
         }
-        new method_source_1.MethodSource().runSyntax(methodSource, scope, filename);
+        const methodDef = new method_source_1.MethodSource().runSyntax(methodSource, scope, filename);
         const body = node.findDirectExpression(Expressions.MethodCallBody);
         if (body) {
             // todo, resolve the method definition above and pass, if possible, in case of dynamic pass void
-            new method_call_body_1.MethodCallBody().runSyntax(body, scope, filename, new void_type_1.VoidType("CallTODO"));
+            new method_call_body_1.MethodCallBody().runSyntax(body, scope, filename, methodDef || new void_type_1.VoidType("CallTODO"));
         }
     }
 }

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

package/build/src/rules/downport.js

@@ -335,6 +335,12 @@ 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 if (fieldList.concatTokens().toUpperCase() === "COUNT( * )") {
+            fieldDefinition = `DATA ${name} TYPE i.`;
+        }
         else {
             for (const f of fields) {
                 const fieldName = f.concatTokens();
@@ -487,6 +493,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 +1153,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.26",
+    "version": "2.85.29",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",