@abaplint/cli 2.115.15 → 2.115.16

package/build/cli.js

@@ -23761,6 +23761,22 @@ class TypeUtils {
         // todo
         return true;
     }
+    isCompareable(source1, source2, node1, node2) {
+        /*
+        console.dir(source1);
+        console.dir(source2);
+        */
+        if (source1 === undefined || source2 === undefined) {
+            return true;
+        }
+        if (source1 instanceof basic_1.HexType && this.isCalculated(node1) && source2 instanceof basic_1.IntegerType) {
+            return false;
+        }
+        if (source2 instanceof basic_1.HexType && this.isCalculated(node2) && source1 instanceof basic_1.IntegerType) {
+            return false;
+        }
+        return true;
+    }
     structureContainsString(structure) {
         for (const c of structure.getComponents()) {
             if (c.type instanceof basic_1.StringType) {
@@ -23790,6 +23806,13 @@ class TypeUtils {
             || node.findFirstExpression(Expressions.ArithOperator) !== undefined;
         return calculated;
     }
+    isAssignableNew(source, target, node) {
+        const calculated = (node === null || node === void 0 ? void 0 : node.findFirstExpression(Expressions.ArithOperator)) !== undefined;
+        if (calculated && source instanceof basic_1.HexType && target instanceof basic_1.IntegerType) {
+            return false;
+        }
+        return this.isAssignable(source, target);
+    }
     isAssignableStrict(source, target, node) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const calculated = node ? this.isCalculated(node) : false;
@@ -25389,10 +25412,14 @@ const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ ".
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 const method_call_chain_1 = __webpack_require__(/*! ./method_call_chain */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/method_call_chain.js");
 const source_field_symbol_1 = __webpack_require__(/*! ./source_field_symbol */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source_field_symbol.js");
+const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
+const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
 class Compare {
     static runSyntax(node, input) {
-        for (const t of node.findDirectExpressions(Expressions.Source)) {
-            source_1.Source.runSyntax(t, input);
+        const sourceTypes = [];
+        const sources = node.findDirectExpressions(Expressions.Source);
+        for (const t of sources) {
+            sourceTypes.push(source_1.Source.runSyntax(t, input));
         }
         for (const t of node.findDirectExpressions(Expressions.SourceFieldSymbolChain)) {
             source_field_symbol_1.SourceFieldSymbol.runSyntax(t, input);
@@ -25400,6 +25427,12 @@ class Compare {
         for (const t of node.findDirectExpressions(Expressions.MethodCallChain)) {
             method_call_chain_1.MethodCallChain.runSyntax(t, input);
         }
+        if (node.findDirectExpression(Expressions.CompareOperator)
+            && new _type_utils_1.TypeUtils(input.scope).isCompareable(sourceTypes[0], sourceTypes[1], sources[0], sources[1]) === false
+            && sourceTypes.length === 2) {
+            const message = "Incompatible types for comparison";
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+        }
     }
 }
 exports.Compare = Compare;
@@ -29182,53 +29215,84 @@ exports.SQLSource = SQLSource;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.StringTemplate = void 0;
+const nodes_1 = __webpack_require__(/*! ../../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
+const Tokens = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 class StringTemplate {
     static runSyntax(node, input) {
         const typeUtils = new _type_utils_1.TypeUtils(input.scope);
         const ret = basic_1.StringType.get();
-        for (const templateSource of node.findAllExpressions(Expressions.StringTemplateSource)) {
-            const s = templateSource.findDirectExpression(Expressions.Source);
-            const type = source_1.Source.runSyntax(s, input, ret);
-            if (type === undefined) {
-                const message = "No target type determined";
-                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
-                return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
-            }
-            else if ((typeUtils.isCharLike(type) === false
-                && typeUtils.isHexLike(type) === false
-                && !(type instanceof basic_1.UTCLongType))
-                || type instanceof basic_1.StructureType) {
-                const message = "String template, not character like, " + type.constructor.name;
-                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
-                return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+        for (const child of node.getChildren()) {
+            if (child instanceof nodes_1.ExpressionNode && child.get() instanceof Expressions.StringTemplateSource) {
+                const s = child.findDirectExpression(Expressions.Source);
+                const type = source_1.Source.runSyntax(s, input, ret);
+                if (type === undefined) {
+                    const message = "No target type determined";
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                    return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
+                else if ((typeUtils.isCharLike(type) === false
+                    && typeUtils.isHexLike(type) === false
+                    && !(type instanceof basic_1.UTCLongType))
+                    || type instanceof basic_1.StructureType) {
+                    const message = "String template, not character like, " + type.constructor.name;
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                    return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
+                const format = child.findDirectExpression(Expressions.StringTemplateFormatting);
+                const formatConcat = format === null || format === void 0 ? void 0 : format.concatTokens();
+                for (const formatSource of (format === null || format === void 0 ? void 0 : format.findAllExpressions(Expressions.Source)) || []) {
+                    source_1.Source.runSyntax(formatSource, input);
+                }
+                if (format
+                    && (formatConcat === null || formatConcat === void 0 ? void 0 : formatConcat.includes("ALPHA = "))
+                    && !(type instanceof basic_1.UnknownType)
+                    && !(type instanceof basic_1.VoidType)
+                    && !(type instanceof basic_1.StringType)
+                    && !(type instanceof basic_1.CLikeType)
+                    && !(type instanceof basic_1.CharacterType)
+                    && !(type instanceof basic_1.NumericGenericType)
+                    && !(type instanceof basic_1.NumericType)
+                    && !(type instanceof basic_1.AnyType)) {
+                    const message = `Cannot apply ALPHA to this type (${type.constructor.name})`;
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, format.getFirstToken(), message));
+                    return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
             }
-            const format = templateSource.findDirectExpression(Expressions.StringTemplateFormatting);
-            const formatConcat = format === null || format === void 0 ? void 0 : format.concatTokens();
-            for (const formatSource of (format === null || format === void 0 ? void 0 : format.findAllExpressions(Expressions.Source)) || []) {
-                source_1.Source.runSyntax(formatSource, input);
-            }
-            if (format
-                && (formatConcat === null || formatConcat === void 0 ? void 0 : formatConcat.includes("ALPHA = "))
-                && !(type instanceof basic_1.UnknownType)
-                && !(type instanceof basic_1.VoidType)
-                && !(type instanceof basic_1.StringType)
-                && !(type instanceof basic_1.CLikeType)
-                && !(type instanceof basic_1.CharacterType)
-                && !(type instanceof basic_1.NumericGenericType)
-                && !(type instanceof basic_1.NumericType)
-                && !(type instanceof basic_1.AnyType)) {
-                const message = `Cannot apply ALPHA to this type (${type.constructor.name})`;
-                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, format.getFirstToken(), message));
-                return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+            else if (child instanceof nodes_1.TokenNode) {
+                const token = child.get();
+                if (token instanceof Tokens.StringTemplate
+                    || token instanceof Tokens.StringTemplateBegin
+                    || token instanceof Tokens.StringTemplateMiddle
+                    || token instanceof Tokens.StringTemplateEnd) {
+                    const issue = this.validateEscapeSequences(token.getStr(), input, child);
+                    if (issue) {
+                        input.issues.push(issue);
+                        return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                    }
+                }
             }
         }
         return ret;
     }
+    static validateEscapeSequences(str, input, node) {
+        // Valid escape sequences in ABAP string templates: \|, \{, \}, \\, \n, \r, \t
+        const validEscapes = new Set(["\\|", "\\{", "\\}", "\\\\", "\\n", "\\r", "\\t"]);
+        for (let i = 0; i < str.length; i++) {
+            if (str[i] === "\\") {
+                const escape = str.substring(i, i + 2);
+                if (!validEscapes.has(escape)) {
+                    return (0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), `Invalid escape sequence "${escape}" in string template`);
+                }
+                i++; // skip the next character as it's part of the escape sequence
+            }
+        }
+        return undefined;
+    }
 }
 exports.StringTemplate = StringTemplate;
 //# sourceMappingURL=string_template.js.map
@@ -33606,7 +33670,7 @@ class Move {
                 return;
             }
         }
-        else if (new _type_utils_1.TypeUtils(input.scope).isAssignable(sourceType, targetType) === false) {
+        else if (new _type_utils_1.TypeUtils(input.scope).isAssignableNew(sourceType, targetType, source) === false) {
             const message = "Incompatible types";
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return;
@@ -55374,7 +55438,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.115.15";
+        return "2.115.16";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

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