@abaplint/cli 2.113.166 → 2.113.168

package/build/cli.js

@@ -4420,7 +4420,7 @@ class Compare extends combi_1.Expression {
         const between = (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), "BETWEEN", _1.Source, "AND", _1.Source);
         // https://help.sap.com/doc/abapdocu_752_index_htm/7.52/en-us/abennews-740_sp08-expressions.htm
         // but also seems to work in v740sp05, blah
-        const predicate = (0, combi_1.ver)(version_1.Version.v740sp08, _1.MethodCallChain);
+        const predicate = (0, combi_1.ver)(version_1.Version.v740sp08, _1.MethodCallChain, version_1.Version.OpenABAP);
         const rett = (0, combi_1.seq)(_1.Source, (0, combi_1.altPrio)((0, combi_1.seq)(_1.CompareOperator, _1.Source), inn, between, sopt));
         const fsassign = (0, combi_1.seq)(_1.SourceFieldSymbolChain, "IS", (0, combi_1.optPrio)("NOT"), "ASSIGNED");
         const ret = (0, combi_1.seq)((0, combi_1.opt)("NOT"), (0, combi_1.altPrio)(rett, predicate, fsassign));
@@ -5852,6 +5852,7 @@ __exportStar(__webpack_require__(/*! ./compare */ "./node_modules/@abaplint/core
 __exportStar(__webpack_require__(/*! ./component_chain_simple */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_chain_simple.js"), exports);
 __exportStar(__webpack_require__(/*! ./component_chain */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_chain.js"), exports);
 __exportStar(__webpack_require__(/*! ./component_compare_simple */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_compare_simple.js"), exports);
+__exportStar(__webpack_require__(/*! ./value_base */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/value_base.js"), exports);
 __exportStar(__webpack_require__(/*! ./component_compare_single */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_compare_single.js"), exports);
 __exportStar(__webpack_require__(/*! ./component_compare */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_compare.js"), exports);
 __exportStar(__webpack_require__(/*! ./component_cond_sub */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_cond_sub.js"), exports);
@@ -9633,6 +9634,28 @@ exports.Value = Value;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/value_base.js":
+/*!*******************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/value_base.js ***!
+  \*******************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ValueBase = 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");
+class ValueBase extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)("BASE", _1.Source);
+    }
+}
+exports.ValueBase = ValueBase;
+//# sourceMappingURL=value_base.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/value_body.js":
 /*!*******************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/value_body.js ***!
@@ -9648,8 +9671,7 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class ValueBody extends combi_1.Expression {
     getRunnable() {
-        const base = (0, combi_1.seq)("BASE", _1.Source);
-        const strucOrTab = (0, combi_1.seq)((0, combi_1.optPrio)(_1.Let), (0, combi_1.optPrio)(base), (0, combi_1.star)(_1.For), (0, combi_1.plusPrio)((0, combi_1.altPrio)(_1.FieldAssignment, _1.ValueBodyLine)));
+        const strucOrTab = (0, combi_1.seq)((0, combi_1.optPrio)(_1.Let), (0, combi_1.optPrio)(_1.ValueBase), (0, combi_1.star)(_1.For), (0, combi_1.plusPrio)((0, combi_1.altPrio)(_1.FieldAssignment, _1.ValueBodyLine)));
         const tabdef = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.altPrio)("OPTIONAL", (0, combi_1.seq)("DEFAULT", _1.Source)));
         return (0, combi_1.optPrio)((0, combi_1.altPrio)(strucOrTab, (0, combi_1.seq)(_1.Source, (0, combi_1.optPrio)(tabdef))));
     }
@@ -10251,7 +10273,7 @@ class Append {
         const fromIndex = (0, combi_1.seq)("FROM", expressions_1.Source);
         const toIndex = (0, combi_1.seq)("TO", expressions_1.Source);
         const toTarget = (0, combi_1.seq)("TO", expressions_1.Target);
-        const src = (0, combi_1.alt)(expressions_1.SimpleSource4, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source));
+        const src = (0, combi_1.alt)(expressions_1.SimpleSource4, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source, version_1.Version.OpenABAP));
         return (0, combi_1.seq)("APPEND", (0, combi_1.altPrio)("INITIAL LINE", (0, combi_1.seq)((0, combi_1.optPrio)("LINES OF"), src)), (0, combi_1.optPrio)(fromIndex), (0, combi_1.opt)((0, combi_1.alt)((0, combi_1.seq)(toIndex, toTarget), toTarget)), (0, combi_1.opt)((0, combi_1.altPrio)(assigning, reference)), (0, combi_1.optPrio)("CASTING"), (0, combi_1.optPrio)(sorted));
     }
 }
@@ -14653,7 +14675,7 @@ class InsertInternal {
         const fromTo = (0, combi_1.opt)((0, combi_1.per)(from, to));
         const foo = (0, combi_1.alt)(intoTable, (0, combi_1.seq)(into, (0, combi_1.opt)((0, combi_1.per)(index, (0, combi_1.alt)(ref, assigning)))), (0, combi_1.per)(index, (0, combi_1.alt)(ref, assigning)));
         const lines = (0, combi_1.seq)("LINES OF", target, (0, combi_1.opt)(fromTo));
-        const src = (0, combi_1.alt)(expressions_1.SimpleSource4, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source));
+        const src = (0, combi_1.alt)(expressions_1.SimpleSource4, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source, version_1.Version.OpenABAP));
         const tab = (0, combi_1.seq)("TABLE", expressions_1.Source);
         const ret = (0, combi_1.seq)("INSERT", (0, combi_1.altPrio)(tab, (0, combi_1.seq)((0, combi_1.altPrio)(initial, lines, src), foo)));
         return ret;
@@ -16168,7 +16190,7 @@ class ReadTable {
         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 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)), (0, combi_1.opt)(perm));
+        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));
     }
 }
 exports.ReadTable = ReadTable;
@@ -29148,7 +29170,7 @@ const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@ab
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
 class ValueBody {
     static runSyntax(node, input, targetType) {
-        var _a;
+        var _a, _b;
         if (node === undefined) {
             return targetType;
         }
@@ -29181,6 +29203,9 @@ class ValueBody {
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             type = source_1.Source.runSyntax(s, input, type);
         }
+        for (const s of ((_b = node.findDirectExpression(Expressions.ValueBase)) === null || _b === void 0 ? void 0 : _b.findDirectExpressions(Expressions.Source)) || []) {
+            type = source_1.Source.runSyntax(s, input, type);
+        }
         for (const foo of node.findDirectExpressions(Expressions.ValueBodyLine)) {
             if (!(targetType instanceof basic_1.TableType)
                 && !(targetType instanceof basic_1.UnknownType)
@@ -54791,7 +54816,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.166";
+        return "2.113.168";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -62126,7 +62151,7 @@ ${indentation}    output = ${uniqueName}.\n`;
         return undefined;
     }
     outlineValue(low, high, lowFile, highSyntax) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (!(low.get() instanceof _statement_1.Unknown)) {
             return undefined;
         }
@@ -62152,7 +62177,7 @@ ${indentation}    output = ${uniqueName}.\n`;
             const uniqueName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
             let indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             let body = "";
-            const base = valueBody === null || valueBody === void 0 ? void 0 : valueBody.findExpressionAfterToken("BASE");
+            const base = (_b = valueBody === null || valueBody === void 0 ? void 0 : valueBody.findDirectExpression(Expressions.ValueBase)) === null || _b === void 0 ? void 0 : _b.findExpressionAfterToken("BASE");
             if (base) {
                 body += indentation + uniqueName + " = " + base.concatTokens() + ".\n";
             }
@@ -62221,7 +62246,7 @@ ${indentation}    output = ${uniqueName}.\n`;
                     }
                 }
             }
-            if (body === "" && ((_b = valueBody === null || valueBody === void 0 ? void 0 : valueBody.getLastChild()) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr().toUpperCase()) === "OPTIONAL") {
+            if (body === "" && ((_c = valueBody === null || valueBody === void 0 ? void 0 : valueBody.getLastChild()) === null || _c === void 0 ? void 0 : _c.getFirstToken().getStr().toUpperCase()) === "OPTIONAL") {
                 const fieldChain = valueBody.findFirstExpression(Expressions.FieldChain);
                 const rowName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
                 let tableExpression = undefined;
@@ -62240,7 +62265,7 @@ ${indentation}    output = ${uniqueName}.\n`;
                 }
                 let condition = "";
                 if ((tableExpression === null || tableExpression === void 0 ? void 0 : tableExpression.getChildren().length) === 3) {
-                    condition = "INDEX " + ((_c = tableExpression === null || tableExpression === void 0 ? void 0 : tableExpression.findDirectExpression(Expressions.Source)) === null || _c === void 0 ? void 0 : _c.concatTokens());
+                    condition = "INDEX " + ((_d = tableExpression === null || tableExpression === void 0 ? void 0 : tableExpression.findDirectExpression(Expressions.Source)) === null || _d === void 0 ? void 0 : _d.concatTokens());
                 }
                 else {
                     condition = "WITH KEY " + (tableExpression === null || tableExpression === void 0 ? void 0 : tableExpression.concatTokens().replace("[ ", "").replace(" ]", ""));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.166",
+    "version": "2.113.168",
     "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.166",
+        "@abaplint/core": "^2.113.168",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",