@abaplint/core 2.113.230 → 2.113.231

package/build/abaplint.d.ts

@@ -6351,6 +6351,7 @@ declare class StatementNode extends AbstractNode<ExpressionNode | TokenNode> {
     getLastToken(): Token;
     findDirectExpression(type: new () => IStatementRunnable): ExpressionNode | undefined;
     findDirectExpressions(type: new () => IStatementRunnable): readonly ExpressionNode[];
+    findDirectExpressionsMulti(type: (new () => IStatementRunnable)[]): readonly ExpressionNode[];
     findDirectTokenByText(text: string): Token | undefined;
     findFirstExpression(type: new () => IStatementRunnable): ExpressionNode | undefined;
     findAllExpressions(type: new () => IStatementRunnable): readonly ExpressionNode[];

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

@@ -4,9 +4,11 @@ exports.ComponentCompareSimple = void 0;
 const combi_1 = require("../combi");
 const _1 = require(".");
 const component_chain_simple_1 = require("./component_chain_simple");
+const version_1 = require("../../../version");
 class ComponentCompareSimple extends combi_1.Expression {
     getRunnable() {
-        const ret = (0, combi_1.seq)((0, combi_1.altPrio)(component_chain_simple_1.ComponentChainSimple, _1.Dynamic), "=", _1.Source);
+        const source = (0, combi_1.alt)(_1.SimpleSource4, (0, combi_1.ver)(version_1.Version.v740sp02, _1.Source, version_1.Version.OpenABAP));
+        const ret = (0, combi_1.seq)((0, combi_1.altPrio)(component_chain_simple_1.ComponentChainSimple, _1.Dynamic), "=", source);
         return (0, combi_1.plus)(ret);
     }
 }

package/build/src/abap/2_statements/statements/call_badi.js

@@ -6,7 +6,7 @@ const expressions_1 = require("../expressions");
 const version_1 = require("../../../version");
 class CallBadi {
     getMatcher() {
-        const call = (0, combi_1.seq)("CALL", "BADI", expressions_1.MethodSource, expressions_1.MethodCallBody);
+        const call = (0, combi_1.seq)("CALL BADI", expressions_1.MethodSource, expressions_1.MethodCallBody);
         return (0, combi_1.verNot)(version_1.Version.Cloud, call);
     }
 }

package/build/src/abap/2_statements/statements/read_table.js

@@ -10,11 +10,12 @@ class ReadTable {
         const comparing = (0, combi_1.seq)("COMPARING", (0, combi_1.alt)((0, combi_1.plus)(expressions_1.FieldSub), (0, combi_1.plus)(expressions_1.Dynamic)));
         const index = (0, combi_1.seq)("INDEX", expressions_1.Source);
         const components = (0, combi_1.seq)((0, combi_1.alt)(expressions_1.Field, expressions_1.Dynamic), "COMPONENTS", expressions_1.ComponentCompareSimple);
-        const key = (0, combi_1.seq)((0, combi_1.altPrio)("WITH KEY", "WITH TABLE KEY"), (0, combi_1.alt)(expressions_1.ComponentCompareSimple, components, (0, combi_1.seq)((0, combi_1.optPrio)("="), expressions_1.Source)));
+        const source = (0, combi_1.alt)(expressions_1.SimpleSource2, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source, version_1.Version.OpenABAP));
+        const key = (0, combi_1.seq)((0, combi_1.altPrio)("WITH KEY", "WITH TABLE KEY"), (0, combi_1.alt)(expressions_1.ComponentCompareSimple, components, (0, combi_1.seq)((0, combi_1.optPrio)("="), source)));
         const using = (0, combi_1.seq)("USING KEY", (0, combi_1.alt)(expressions_1.Field, expressions_1.Dynamic));
-        const from = (0, combi_1.seq)("FROM", expressions_1.Source);
+        const from = (0, combi_1.seq)("FROM", source);
         const perm = (0, combi_1.per)((0, combi_1.alt)(index, key, from), expressions_1.ReadTableTarget, using, comparing, "CASTING", (0, combi_1.seq)("TRANSPORTING", (0, combi_1.altPrio)("ALL FIELDS", "NO FIELDS", transporting_fields_1.TransportingFields)), "BINARY SEARCH");
-        return (0, combi_1.seq)("READ TABLE", (0, combi_1.alt)(expressions_1.SimpleSource2, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source, version_1.Version.OpenABAP)), (0, combi_1.opt)(perm));
+        return (0, combi_1.seq)("READ TABLE", source, (0, combi_1.opt)(perm));
     }
 }
 exports.ReadTable = ReadTable;

package/build/src/abap/5_syntax/expressions/component_compare_simple.js

@@ -18,7 +18,7 @@ class ComponentCompareSimple {
                 else if (c.get() instanceof Expressions.Dynamic) {
                     targetType = undefined;
                 }
-                else if (c.get() instanceof Expressions.Source) {
+                else if (c.get() instanceof Expressions.Source || c.get() instanceof Expressions.SimpleSource4) {
                     const sourceType = source_1.Source.runSyntax(c, input, targetType);
                     if (targetType && new _type_utils_1.TypeUtils(input.scope).isAssignable(sourceType, targetType) === false) {
                         const message = "ComponentCompareSimple, incompatible types";

package/build/src/abap/5_syntax/expressions/field_chain.js

@@ -23,7 +23,7 @@ class FieldChain {
         if (((_a = node.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.SourceField
             && node.findDirectExpression(Expressions.ComponentName)) {
             // workaround for names with dashes, eg. "sy-repid"
-            const concat = node.concatTokens();
+            const concat = node.concatTokens().replace(/ /g, "");
             const offset = ((_b = node.findDirectExpression(Expressions.FieldOffset)) === null || _b === void 0 ? void 0 : _b.concatTokens()) || "";
             const length = ((_c = node.findDirectExpression(Expressions.FieldLength)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "";
             const found = input.scope.findVariable(concat.replace(offset, "").replace(length, ""));

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

@@ -13,11 +13,8 @@ const _syntax_input_1 = require("../_syntax_input");
 class ReadTable {
     runSyntax(node, input) {
         const concat = node.concatTokens().toUpperCase();
-        const sources = node.findDirectExpressions(Expressions.Source);
-        let firstSource = node.findDirectExpression(Expressions.SimpleSource2);
-        if (firstSource === undefined) {
-            firstSource = sources[0];
-        }
+        const sources = node.findDirectExpressionsMulti([Expressions.Source, Expressions.SimpleSource2]);
+        const firstSource = sources[0];
         const sourceType = firstSource ? source_1.Source.runSyntax(firstSource, input) : undefined;
         if (sourceType === undefined) {
             const message = "No source type determined, read table";

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

@@ -172,6 +172,15 @@ class StatementNode extends _abstract_node_1.AbstractNode {
         }
         return ret;
     }
+    findDirectExpressionsMulti(type) {
+        const ret = [];
+        for (const child of this.getChildren()) {
+            if (child instanceof expression_node_1.ExpressionNode && type.some(t => child.get() instanceof t)) {
+                ret.push(child);
+            }
+        }
+        return ret;
+    }
     findDirectTokenByText(text) {
         const upper = text.toUpperCase();
         for (const child of this.getChildren()) {

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.230";
+        return "2.113.231";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

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