@abaplint/core 2.115.14 → 2.115.16

package/build/abaplint.d.ts

@@ -2870,12 +2870,14 @@ declare class FunctionModuleDefinition {
     private name;
     private description;
     private parameters;
+    private globalParameters;
     private moduleType;
     constructor(data: any);
     getParameters(): readonly IFunctionModuleParameter[];
     getModuleType(): FunctionModuleType | undefined;
     getDescription(): string | undefined;
     getName(): string;
+    isGlobalParameters(): boolean;
     private parse;
 }
 

package/build/src/abap/5_syntax/_procedural.js

@@ -72,8 +72,25 @@ class Procedural {
         }
         return undefined;
     }
+    findFunctionGroupScope(fg) {
+        var _a, _b, _c;
+        for (const module of fg.getModules()) {
+            if (module.isGlobalParameters() === false) {
+                continue;
+            }
+            // console.dir(fg.getSequencedFiles());
+            const fmFile = fg.getSequencedFiles().find((f) => { return f.getFilename().endsWith(".fugr." + module.getName().toLowerCase().replace(/\//g, "#") + ".abap"); });
+            if (fmFile === undefined) {
+                continue;
+            }
+            const nameToken = (_c = (_b = (_a = fmFile.getStructure()) === null || _a === void 0 ? void 0 : _a.findFirstStatement(Statements.FunctionModule)) === null || _b === void 0 ? void 0 : _b.findFirstExpression(Expressions.Field)) === null || _c === void 0 ? void 0 : _c.getFirstToken();
+            if (nameToken === undefined) {
+                continue;
+            }
+            this.addFunctionScope(module, nameToken, fmFile.getFilename(), true);
+        }
+    }
     findFunctionScope(obj, node, filename) {
-        var _a, _b, _c, _d, _e;
         if (!(obj instanceof objects_1.FunctionGroup)) {
             throw new Error("findFunctionScope, expected function group input");
         }
@@ -84,6 +101,13 @@ class Procedural {
         if (definition === undefined) {
             throw new Error("Function module definition \"" + name + "\" not found");
         }
+        if (definition.isGlobalParameters() === true) {
+            return; // already added at global level
+        }
+        this.addFunctionScope(definition, nameToken, filename);
+    }
+    addFunctionScope(definition, nameToken, filename, ignoreIfAlreadyExists = false) {
+        var _a, _b, _c, _d, _e;
         const ddic = new ddic_1.DDIC(this.reg);
         const allNames = new Set();
         for (const param of definition.getParameters()) {
@@ -169,7 +193,15 @@ class Procedural {
             }
             else {
                 const type = new _typed_identifier_1.TypedIdentifier(nameToken, filename, found);
-                this.scope.addNamedIdentifier(param.name, type);
+                if (ignoreIfAlreadyExists === true) {
+                    const exists = this.scope.findVariable(param.name);
+                    if (exists === undefined) {
+                        this.scope.addNamedIdentifier(param.name, type);
+                    }
+                }
+                else {
+                    this.scope.addNamedIdentifier(param.name, type);
+                }
                 allNames.add(param.name.toUpperCase());
             }
         }

package/build/src/abap/5_syntax/_type_utils.js

@@ -214,6 +214,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) {
@@ -243,6 +259,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;

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

@@ -5,10 +5,14 @@ const Expressions = require("../../2_statements/expressions");
 const source_1 = require("./source");
 const method_call_chain_1 = require("./method_call_chain");
 const source_field_symbol_1 = require("./source_field_symbol");
+const _syntax_input_1 = require("../_syntax_input");
+const _type_utils_1 = require("../_type_utils");
 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);
@@ -16,6 +20,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;

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

@@ -1,53 +1,84 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StringTemplate = void 0;
+const nodes_1 = require("../../nodes");
 const basic_1 = require("../../types/basic");
 const Expressions = require("../../2_statements/expressions");
 const source_1 = require("./source");
 const _type_utils_1 = require("../_type_utils");
 const _syntax_input_1 = require("../_syntax_input");
+const Tokens = require("../../1_lexer/tokens");
 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);
+        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);
+                }
             }
-            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 = 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

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

@@ -40,7 +40,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;

package/build/src/abap/5_syntax/syntax.js

@@ -338,6 +338,9 @@ class SyntaxLogic {
                     stype = _scope_type_1.ScopeType.FunctionGroup;
                 }
                 this.scope.push(stype, this.object.getName(), new position_1.Position(1, 1), main.getFilename());
+                if (this.object instanceof objects_1.FunctionGroup) {
+                    this.helpers.proc.findFunctionGroupScope(this.object);
+                }
             }
         }
         else if (this.object instanceof objects_1.TypePool) {

package/build/src/abap/types/function_module_definition.js

@@ -31,6 +31,9 @@ class FunctionModuleDefinition {
     getName() {
         return this.name;
     }
+    isGlobalParameters() {
+        return this.globalParameters;
+    }
     ///////////////
     parse(data) {
         if (data.FUNCNAME === undefined) {
@@ -39,6 +42,7 @@ class FunctionModuleDefinition {
         this.name = data.FUNCNAME;
         this.description = data.SHORT_TEXT;
         this.parameters = [];
+        this.globalParameters = data.GLOBAL_FLAG === "X";
         this.moduleType = FunctionModuleType.regular;
         if (data.REMOTE_CALL === "R") {
             this.moduleType = FunctionModuleType.remote;

package/build/src/registry.js

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

package/build/src/rules/fm_global_parameters_obsolete.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FMGlobalParametersObsolete = exports.FMGlobalParametersObsoleteConf = void 0;
+const issue_1 = require("../issue");
+const Objects = require("../objects");
+const _basic_rule_config_1 = require("./_basic_rule_config");
+const position_1 = require("../position");
+class FMGlobalParametersObsoleteConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.FMGlobalParametersObsoleteConf = FMGlobalParametersObsoleteConf;
+class FMGlobalParametersObsolete {
+    constructor() {
+        this.conf = new FMGlobalParametersObsoleteConf();
+    }
+    getMetadata() {
+        return {
+            key: "fm_global_parameters_obsolete",
+            title: "FM Global Parameters Obsolete",
+            shortDescription: `Check for function modules with global parameteers`,
+            extendedInformation: `https://help.sap.com/doc/abapdocu_750_index_htm/7.50/en-US/abenglobal_parameters_obsolete.htm`,
+            tags: [],
+        };
+    }
+    initialize(_reg) {
+        return this;
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    run(obj) {
+        if (!(obj instanceof Objects.FunctionGroup)) {
+            return [];
+        }
+        const issues = [];
+        for (const module of obj.getModules()) {
+            if (module.isGlobalParameters() === true) {
+                const file = obj.getMainABAPFile();
+                if (file === undefined) {
+                    continue;
+                }
+                const message = `Function Module "${module.getName()}" uses obsolete global parameters`;
+                issues.push(issue_1.Issue.atPosition(file, new position_1.Position(1, 1), message, this.getMetadata().key, this.conf.severity));
+            }
+        }
+        return issues;
+    }
+}
+exports.FMGlobalParametersObsolete = FMGlobalParametersObsolete;
+//# sourceMappingURL=fm_global_parameters_obsolete.js.map

package/build/src/rules/index.js

@@ -65,6 +65,7 @@ __exportStar(require("./empty_structure"), exports);
 __exportStar(require("./exit_or_check"), exports);
 __exportStar(require("./expand_macros"), exports);
 __exportStar(require("./exporting"), exports);
+__exportStar(require("./fm_global_parameters_obsolete"), exports);
 __exportStar(require("./forbidden_identifier"), exports);
 __exportStar(require("./forbidden_pseudo_and_pragma"), exports);
 __exportStar(require("./forbidden_void_type"), exports);
@@ -78,6 +79,7 @@ __exportStar(require("./identical_conditions"), exports);
 __exportStar(require("./identical_contents"), exports);
 __exportStar(require("./identical_descriptions"), exports);
 __exportStar(require("./identical_form_names"), exports);
+__exportStar(require("./identical_move"), exports);
 __exportStar(require("./if_in_if"), exports);
 __exportStar(require("./implement_methods"), exports);
 __exportStar(require("./implicit_start_of_selection"), exports);
@@ -89,7 +91,6 @@ __exportStar(require("./intf_referencing_clas"), exports);
 __exportStar(require("./invalid_table_index"), exports);
 __exportStar(require("./keep_single_parameter_on_one_line"), exports);
 __exportStar(require("./keyword_case"), exports);
-__exportStar(require("./identical_move"), exports);
 __exportStar(require("./line_break_multiple_parameters"), exports);
 __exportStar(require("./line_break_style"), exports);
 __exportStar(require("./line_length"), exports);

package/package.json

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