@abaplint/core 2.119.16 → 2.119.17

package/build/src/abap/2_statements/expressions/parameter_exception.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParameterException = void 0;
 const combi_1 = require("../combi");
+const tokens_1 = require("../../1_lexer/tokens");
 const _1 = require(".");
 class ParameterException extends combi_1.Expression {
     getRunnable() {
-        const name = (0, combi_1.altPrio)("OTHERS", _1.ParameterName);
+        const name = (0, combi_1.altPrio)("OTHERS", (0, combi_1.seq)(_1.ParameterName, (0, combi_1.tok)(tokens_1.Dash), _1.ComponentName), _1.ParameterName);
         return (0, combi_1.seq)(name, (0, combi_1.optPrio)((0, combi_1.seq)("=", (0, combi_1.altPrio)(_1.Integer, _1.SimpleFieldChain), (0, combi_1.optPrio)((0, combi_1.seq)("MESSAGE", _1.Target)))));
     }
 }

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

@@ -7,6 +7,7 @@ const table_type_1 = require("../types/basic/table_type");
 const enum_type_1 = require("../types/basic/enum_type");
 const cgeneric_type_1 = require("../types/basic/cgeneric_type");
 const Expressions = require("../2_statements/expressions");
+const nodes_1 = require("../nodes");
 // todo: refactor to static? for performance
 class TypeUtils {
     constructor(scope) {
@@ -257,6 +258,18 @@ class TypeUtils {
           return false;
         }
         */
+        var _a;
+        if (node.getChildren().length === 4
+            && node.getFirstChild() instanceof nodes_1.TokenNodeRegex
+            && ((_a = node.getFirstChild()) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase()) === "BOOLC") {
+            return true;
+        }
+        if (node.getChildren().length >= 3) {
+            const second = node.getChildren()[1];
+            if (second.getFirstToken().getStr() === "&&") {
+                return true;
+            }
+        }
         const calculated = node.findFirstExpression(Expressions.MethodCallChain) !== undefined
             || node.findFirstExpression(Expressions.StringTemplate) !== undefined
             || node.findFirstExpression(Expressions.ArithOperator) !== undefined;
@@ -270,7 +283,7 @@ class TypeUtils {
         return this.isAssignable(source, target);
     }
     isAssignableStrict(source, target, node) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const calculated = node ? this.isCalculated(node) : false;
         /*
             console.dir(source);
@@ -329,16 +342,15 @@ class TypeUtils {
         else if (source instanceof basic_1.StringType) {
             if (target instanceof basic_1.StructureType && this.structureContainsString(target)) {
                 return false;
-                /*
-              } else if (target instanceof CharacterType) {
-                if (source.getAbstractTypeData()?.derivedFromConstant === true) {
-                  return true;
+            }
+            else if (target instanceof basic_1.CharacterType) {
+                if (((_g = source.getAbstractTypeData()) === null || _g === void 0 ? void 0 : _g.derivedFromConstant) === true) {
+                    return true;
                 }
                 return false;
-                */
             }
             else if (target instanceof basic_1.IntegerType) {
-                if (((_g = source.getAbstractTypeData()) === null || _g === void 0 ? void 0 : _g.derivedFromConstant) === true) {
+                if (((_h = source.getAbstractTypeData()) === null || _h === void 0 ? void 0 : _h.derivedFromConstant) === true) {
                     return true;
                 }
                 return false;
@@ -348,7 +360,7 @@ class TypeUtils {
                 return false;
             }
             else if (target instanceof basic_1.XSequenceType || target instanceof basic_1.XStringType) {
-                if (((_h = source.getAbstractTypeData()) === null || _h === void 0 ? void 0 : _h.derivedFromConstant) === true) {
+                if (((_j = source.getAbstractTypeData()) === null || _j === void 0 ? void 0 : _j.derivedFromConstant) === true) {
                     return true;
                 }
                 return false;
@@ -392,7 +404,7 @@ class TypeUtils {
                 return false;
             }
             else if (target instanceof basic_1.Integer8Type || target instanceof basic_1.PackedType) {
-                if (((_j = source.getAbstractTypeData()) === null || _j === void 0 ? void 0 : _j.derivedFromConstant) === true) {
+                if (((_k = source.getAbstractTypeData()) === null || _k === void 0 ? void 0 : _k.derivedFromConstant) === true) {
                     return true;
                 }
                 return false;

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

@@ -24,8 +24,8 @@ class FieldChain {
             && node.findDirectExpression(Expressions.ComponentName)) {
             // workaround for names with dashes, eg. "sy-repid"
             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 offset = ((_b = node.findDirectExpression(Expressions.FieldOffset)) === null || _b === void 0 ? void 0 : _b.concatTokens().replace(/ /g, "")) || "";
+            const length = ((_c = node.findDirectExpression(Expressions.FieldLength)) === null || _c === void 0 ? void 0 : _c.concatTokens().replace(/ /g, "")) || "";
             const found = input.scope.findVariable(concat.replace(offset, "").replace(length, ""));
             if (found) {
                 if (refType) {

package/build/src/registry.js

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

package/build/src/rules/parser_bad_exceptions.js

@@ -22,10 +22,6 @@ class ParserBadExceptions extends _abap_rule_1.ABAPRule {
             title: "Parser Error, bad EXCEPTIONS in CALL FUNCTION",
             shortDescription: `Checks for syntax not recognized by abaplint, related to EXCEPTIONS in CALL FUNCTION.`,
             tags: [_irule_1.RuleTag.Syntax, _irule_1.RuleTag.SingleFile],
-            /*
-            badExample: `IF ( foo = 'bar').`,
-            goodExample: `IF ( foo = 'bar' ).`,
-            */
         };
     }
     getConfig() {
@@ -40,6 +36,15 @@ class ParserBadExceptions extends _abap_rule_1.ABAPRule {
             if (!(statement.get() instanceof Statements.CallFunction)) {
                 continue;
             }
+            const exceptionTokens = this.findExceptionTokens(statement);
+            if (exceptionTokens !== undefined
+                && this.containsMixedExceptionSyntax(statement.findAllExpressions(Expressions.ParameterException))) {
+                const message = "Bad EXCEPTIONS syntax in CALL FUNCTION";
+                for (const token of exceptionTokens) {
+                    issues.push(issue_1.Issue.atToken(file, token, message, this.getMetadata().key, this.conf.severity));
+                }
+                continue;
+            }
             for (const e of statement.findAllExpressions(Expressions.ParameterException)) {
                 if (e.findDirectTokenByText("=") === undefined) {
                     const message = "Bad EXCEPTIONS syntax in CALL FUNCTION";
@@ -49,6 +54,18 @@ class ParserBadExceptions extends _abap_rule_1.ABAPRule {
         }
         return issues;
     }
+    containsMixedExceptionSyntax(exceptions) {
+        return exceptions.some(e => e.findDirectTokenByText("=") === undefined)
+            && exceptions.some(e => e.findDirectTokenByText("=") !== undefined);
+    }
+    findExceptionTokens(statement) {
+        const tokens = statement.getTokens();
+        const index = tokens.findIndex(t => t.getStr().toUpperCase() === "EXCEPTIONS");
+        if (index === -1) {
+            return undefined;
+        }
+        return tokens.slice(index).filter(t => t.getStr() !== ".");
+    }
 }
 exports.ParserBadExceptions = ParserBadExceptions;
 //# sourceMappingURL=parser_bad_exceptions.js.map

package/build/src/rules/superclass_final.js

@@ -6,6 +6,7 @@ const _abap_rule_1 = require("./_abap_rule");
 const Objects = require("../objects");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const _irule_1 = require("./_irule");
+const include_graph_1 = require("../utils/include_graph");
 class SuperclassFinalConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.SuperclassFinalConf = SuperclassFinalConf;
@@ -13,6 +14,7 @@ class SuperclassFinal extends _abap_rule_1.ABAPRule {
     constructor() {
         super(...arguments);
         this.conf = new SuperclassFinalConf();
+        this.graph = undefined;
     }
     getMetadata() {
         return {
@@ -51,6 +53,9 @@ class SuperclassFinal extends _abap_rule_1.ABAPRule {
                     }
                 }
             }
+            if (found === undefined && obj instanceof Objects.Program) {
+                found = this.findInRelatedProgramIncludes(file, sup);
+            }
             if (found === undefined) {
                 const clas = this.reg.getObject("CLAS", sup);
                 if (clas) {
@@ -70,6 +75,33 @@ class SuperclassFinal extends _abap_rule_1.ABAPRule {
         }
         return output;
     }
+    findInRelatedProgramIncludes(file, superClassName) {
+        if (this.graph === undefined) {
+            this.graph = new include_graph_1.IncludeGraph(this.reg);
+        }
+        const mainFilenames = this.graph.listMainForInclude(file.getFilename());
+        if (mainFilenames.length === 0) {
+            return undefined;
+        }
+        for (const object of this.reg.getObjectsByType("PROG")) {
+            if (!(object instanceof Objects.Program)) {
+                continue;
+            }
+            const programFile = object.getMainABAPFile();
+            if (programFile === undefined) {
+                continue;
+            }
+            const programMainFilenames = this.graph.listMainForInclude(programFile.getFilename());
+            if (mainFilenames.some(filename => programMainFilenames.includes(filename)) === false) {
+                continue;
+            }
+            const found = programFile.getInfo().getClassDefinitionByName(superClassName);
+            if (found !== undefined) {
+                return found;
+            }
+        }
+        return undefined;
+    }
 }
 exports.SuperclassFinal = SuperclassFinal;
 //# sourceMappingURL=superclass_final.js.map

package/package.json

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