@abaplint/cli 2.113.229 → 2.113.231

package/build/cli.js

@@ -4547,9 +4547,11 @@ exports.ComponentCompareSimple = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const component_chain_simple_1 = __webpack_require__(/*! ./component_chain_simple */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_chain_simple.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 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);
     }
 }
@@ -10748,7 +10750,7 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 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);
     }
 }
@@ -16307,11 +16309,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;
@@ -24168,6 +24171,9 @@ class BasicTypes {
         if (chain === undefined) {
             chain = node.findFirstExpression(Expressions.SimpleFieldChain);
         }
+        if (chain === undefined) {
+            chain = node.findFirstExpression(Expressions.SimpleFieldChain2);
+        }
         if (chain === undefined) {
             throw new Error("resolveLikeName, chain undefined");
         }
@@ -25452,7 +25458,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";
@@ -26022,7 +26028,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, ""));
@@ -31154,7 +31160,7 @@ class Controls {
         }
         if (node.findDirectTokenByText("TABLEVIEW") && token) {
             const cols = new basic_1.StructureType([
-                { name: "SCREEN", type: new basic_1.CharacterType(1) }, // todo
+                { name: "SCREEN", type: basic_1.VoidType.get("TABLEVIEW-SCREEN") }, // todo
                 { name: "INDEX", type: basic_1.IntegerType.get() },
                 { name: "SELECTED", type: new basic_1.CharacterType(1) },
                 { name: "VISLENGTH", type: basic_1.IntegerType.get() },
@@ -33843,7 +33849,7 @@ class Ranges {
         if (typeExpression === undefined) {
             throw new assert_error_1.AssertError("Ranges, unexpected node");
         }
-        const found = new basic_types_1.BasicTypes(input).parseType(typeExpression);
+        const found = new basic_types_1.BasicTypes(input).resolveLikeName(typeExpression);
         if (found && nameToken) {
             const structure = new basic_1.StructureType([
                 { name: "sign", type: new basic_1.CharacterType(1) },
@@ -33948,11 +33954,8 @@ const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modu
 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";
@@ -35596,7 +35599,7 @@ class Data {
     static runSyntax(node, input) {
         var _a;
         const fouth = (_a = node.getFirstChild()) === null || _a === void 0 ? void 0 : _a.getChildren()[3];
-        const isCommonPart = fouth instanceof nodes_1.TokenNode && fouth.concatTokens() === "COMMON";
+        const isCommonPart = fouth instanceof nodes_1.TokenNode && fouth.concatTokens().toUpperCase() === "COMMON";
         if (isCommonPart) {
             this.runCommonPartSyntax(node, input);
             return undefined;
@@ -37194,6 +37197,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()) {
@@ -54724,7 +54736,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.229";
+        return "2.113.231";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.229",
+    "version": "2.113.231",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.113.229",
+        "@abaplint/core": "^2.113.231",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",