@abaplint/cli 2.119.64 → 2.119.66

package/build/cli.js

@@ -27576,7 +27576,8 @@ class TypeUtils {
             console.dir(target);
             console.dir(calculated);
         */
-        if (calculated && source instanceof basic_1.StringType && target instanceof basic_1.XStringType) {
+        if (calculated && source instanceof basic_1.StringType
+            && (target instanceof basic_1.XStringType || target instanceof basic_1.XSequenceType)) {
             return false;
         }
         if (calculated) {
@@ -27597,7 +27598,7 @@ class TypeUtils {
             }
             else if (target instanceof basic_1.XStringType) {
                 if (((_c = source.getAbstractTypeData()) === null || _c === void 0 ? void 0 : _c.derivedFromConstant) === true) {
-                    return true;
+                    return (node === null || node === void 0 ? void 0 : node.concatTokens()) !== "''";
                 }
                 return false;
             }
@@ -32289,6 +32290,7 @@ const Expressions = __importStar(__webpack_require__(/*! ../../2_statements/expr
 const _typed_identifier_1 = __webpack_require__(/*! ../../types/_typed_identifier */ "../core/build/src/abap/types/_typed_identifier.js");
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "../core/build/src/abap/types/basic/index.js");
 const basic_types_1 = __webpack_require__(/*! ../basic_types */ "../core/build/src/abap/5_syntax/basic_types.js");
+const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "../core/build/src/abap/5_syntax/_syntax_input.js");
 const assert_error_1 = __webpack_require__(/*! ../assert_error */ "../core/build/src/abap/5_syntax/assert_error.js");
 class MethodDefReturning {
     static runSyntax(node, input, meta) {
@@ -32301,8 +32303,11 @@ class MethodDefReturning {
             throw new assert_error_1.AssertError("method_parameter.ts, unexpected structure");
         }
         let found = new basic_types_1.BasicTypes(input).parseType(type);
-        if ((found === null || found === void 0 ? void 0 : found.isGeneric()) === true) {
-            found = new basic_1.UnknownType("RETURNING parameter must be fully specified");
+        const message = "RETURNING parameter must be fully specified";
+        const typeText = type.concatTokens().toUpperCase();
+        if ((found === null || found === void 0 ? void 0 : found.isGeneric()) === true || typeText === "TYPE X" || typeText === "TYPE C") {
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, type.getFirstToken(), message));
+            found = new basic_1.UnknownType(message);
         }
         if (found) {
             return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), input.filename, found, meta);
@@ -37994,6 +37999,11 @@ class Concatenate {
     runSyntax(node, input) {
         const byteMode = node.findDirectTokenByText("BYTE") !== undefined;
         const linesMode = node.findDirectTokenByText("LINES") !== undefined;
+        if (node.findFirstExpression(Expressions.TableExpression) !== undefined) {
+            const message = "CONCATENATE with table expression not possible";
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+            return;
+        }
         const target = node.findFirstExpression(Expressions.Target);
         const inline = target === null || target === void 0 ? void 0 : target.findDirectExpression(Expressions.InlineData);
         if (inline) {
@@ -68823,7 +68833,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.64";
+        return "2.119.66";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -75568,6 +75578,18 @@ Make sure to test the downported code, it might not always be completely correct
                     }
                 }
             }
+            // INTO after WHERE parses as a valid SELECT in the low version, but is only allowed in
+            // strict SQL syntax, so move it also when the statement is no longer Unknown
+            if (ret.length === 0) {
+                for (let i = 0; i < lowStatements.length; i++) {
+                    const low = lowStatements[i];
+                    const high = highStatements[i];
+                    const issue = this.downportSQLMoveInto(low, high, lowFile, highSyntax);
+                    if (issue) {
+                        ret.push(issue);
+                    }
+                }
+            }
         }
         return ret;
     }
@@ -75811,10 +75833,14 @@ Make sure to test the downported code, it might not always be completely correct
         return undefined;
     }
     //////////////////////////////////////////
-    /** move INTO from after WHERE to after FROM */
+    /** move INTO from after WHERE to after FROM,
+     * note that INTO after WHERE is only valid in strict SQL syntax, so it must be moved when
+     * downporting; this can happen both while the statement is still Unknown(from the main loop)
+     * and after the @ and FIELDS have been removed, leaving a SELECT that parses in the low version */
     downportSQLMoveInto(low, high, lowFile, _highSyntax) {
         var _a;
-        if (!(low.get() instanceof _statement_1.Unknown)) {
+        if (!(high.get() instanceof Statements.Select)
+            && !(high.get() instanceof Statements.SelectLoop)) {
             return undefined;
         }
         // note: SQLCond is also used in JOIN(FROM) conditions
@@ -75822,6 +75848,7 @@ Make sure to test the downported code, it might not always be completely correct
         if (where === undefined) {
             return undefined;
         }
+        // the FIELDS list sits between FROM and WHERE, wait for it to be removed first
         if (high.findFirstExpression(Expressions.SQLFields) !== undefined) {
             return undefined;
         }

package/package.json

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