@abaplint/core 2.81.0 → 2.81.1

package/build/abaplint.d.ts

@@ -999,6 +999,8 @@ export declare class CurrentScope {
     private constructor();
     addType(type: TypedIdentifier | undefined): void;
     addTypeNamed(name: string, type: TypedIdentifier | undefined): void;
+    addExtraLikeType(type: TypedIdentifier | undefined): void;
+    addExtraLikeTypeNamed(name: string, type: TypedIdentifier | undefined): void;
     addClassDefinition(c: IClassDefinition): void;
     addFormDefinitions(f: readonly IFormDefinition[]): void;
     addInterfaceDefinition(i: IInterfaceDefinition): void;
@@ -1024,6 +1026,7 @@ export declare class CurrentScope {
     findInterfaceDefinition(name: string): IInterfaceDefinition | undefined;
     findFormDefinition(name: string): IFormDefinition | undefined;
     findType(name: string | undefined): TypedIdentifier | undefined;
+    findExtraLikeType(name: string | undefined): TypedIdentifier | undefined;
     findVariable(name: string | undefined): TypedIdentifier | undefined;
     getDDIC(): DDIC;
     getDDICReferences(): IDDICReferences;
@@ -3067,6 +3070,9 @@ declare interface IScopeData {
     types: {
         [name: string]: TypedIdentifier;
     };
+    extraLikeTypes: {
+        [name: string]: TypedIdentifier;
+    };
     deferred: Token[];
     cdefs: IClassDefinition[];
     idefs: IInterfaceDefinition[];
@@ -4312,6 +4318,7 @@ export declare enum ScopeType {
     Form = "form",
     FunctionModule = "function",
     Method = "method",
+    MethodInstance = "method_instance",
     For = "for",
     OpenSQL = "open_sql"
 }
@@ -4595,6 +4602,7 @@ export declare class SpaghettiScopeNode extends ScopeData implements ISpaghettiS
     listFormDefinitions(): IFormDefinition[];
     findInterfaceDefinition(name: string): IInterfaceDefinition | undefined;
     findType(name: string): TypedIdentifier | undefined;
+    findExtraLikeType(name: string): TypedIdentifier | undefined;
     findVariable(name: string): TypedIdentifier | undefined;
     findWriteReference(pos: Position): TypedIdentifier | undefined;
     findTableReference(pos: Position): string | undefined;

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

@@ -7,7 +7,8 @@ const tokens_1 = require("../../1_lexer/tokens");
 class SQLArithmetics extends combi_1.Expression {
     getRunnable() {
         const operator = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WPlusW), (0, combi_1.tok)(tokens_1.WDashW), "*", "/");
-        return (0, combi_1.seq)(_1.SQLFieldName, (0, combi_1.starPrio)((0, combi_1.seq)(operator, _1.SQLFieldName)));
+        const field = (0, combi_1.alt)(_1.SQLFieldName, _1.SQLFunction);
+        return (0, combi_1.seq)(field, (0, combi_1.starPrio)((0, combi_1.seq)(operator, field)));
     }
 }
 exports.SQLArithmetics = SQLArithmetics;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLFunction = void 0;
+const constant_1 = require("./constant");
 const version_1 = require("../../../version");
 const tokens_1 = require("../../1_lexer/tokens");
 const combi_1 = require("../combi");
@@ -9,15 +10,20 @@ const sql_alias_field_1 = require("./sql_alias_field");
 const sql_field_name_1 = require("./sql_field_name");
 class SQLFunction extends combi_1.Expression {
     getRunnable() {
-        const param = (0, combi_1.altPrio)(sql_field_name_1.SQLFieldName, sql_alias_field_1.SQLAliasField);
-        const uuid = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("uuid", (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const param = (0, combi_1.alt)(sql_field_name_1.SQLFieldName, sql_alias_field_1.SQLAliasField, SQLFunction, constant_1.Constant);
+        const castTypes = (0, combi_1.altPrio)((0, combi_1.seq)("CHAR", (0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)), "FLTP");
         const abs = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("abs", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const cast = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("cast", (0, combi_1.tok)(tokens_1.ParenLeftW), param, "AS", castTypes, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const ceil = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("ceil", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const floor = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("floor", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const coalesce = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("coalesce", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const concat = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("concat", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const div = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("div", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const floor = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("floor", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const length = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("length", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const mod = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("mod", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const cast = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("cast", (0, combi_1.tok)(tokens_1.ParenLeftW), param, "AS CHAR", (0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.WParenRightW)));
-        return (0, combi_1.altPrio)(uuid, abs, ceil, floor, cast, div, mod);
+        const replace = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("replace", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const uuid = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("uuid", (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.WParenRightW)));
+        return (0, combi_1.altPrio)(uuid, abs, ceil, floor, cast, div, mod, coalesce, concat, replace, length);
     }
 }
 exports.SQLFunction = SQLFunction;

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

@@ -54,6 +54,25 @@ class CurrentScope {
         }
         this.current.getData().types[upper] = type;
     }
+    addExtraLikeType(type) {
+        if (type === undefined) {
+            return;
+        }
+        this.addExtraLikeTypeNamed(type.getName(), type);
+    }
+    addExtraLikeTypeNamed(name, type) {
+        if (type === undefined) {
+            return;
+        }
+        if (this.current === undefined) {
+            return;
+        }
+        const upper = name.toUpperCase();
+        if (this.current.getData().extraLikeTypes[upper] !== undefined) {
+            throw new Error(`Type name "${name}" already defined`);
+        }
+        this.current.getData().extraLikeTypes[upper] = type;
+    }
     addClassDefinition(c) {
         var _a;
         (_a = this.current) === null || _a === void 0 ? void 0 : _a.getData().cdefs.push(c);
@@ -231,6 +250,13 @@ class CurrentScope {
         }
         return (_a = this.current) === null || _a === void 0 ? void 0 : _a.findType(name);
     }
+    findExtraLikeType(name) {
+        var _a;
+        if (name === undefined) {
+            return undefined;
+        }
+        return (_a = this.current) === null || _a === void 0 ? void 0 : _a.findExtraLikeType(name);
+    }
     findVariable(name) {
         var _a;
         if (name === undefined) {

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

@@ -14,6 +14,7 @@ var ScopeType;
     ScopeType["Form"] = "form";
     ScopeType["FunctionModule"] = "function";
     ScopeType["Method"] = "method";
+    ScopeType["MethodInstance"] = "method_instance";
     ScopeType["For"] = "for";
     ScopeType["OpenSQL"] = "open_sql";
 })(ScopeType = exports.ScopeType || (exports.ScopeType = {}));

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

@@ -79,8 +79,12 @@ class BasicTypes {
         }
         else {
             const name = children.shift().getFirstToken().getStr();
-            const found = this.scope.findVariable(name);
+            let found = this.scope.findVariable(name);
             type = found === null || found === void 0 ? void 0 : found.getType();
+            if (found === undefined) {
+                found = this.scope.findExtraLikeType(name);
+                type = found === null || found === void 0 ? void 0 : found.getType();
+            }
             if (found) {
                 this.scope.addReference(chain === null || chain === void 0 ? void 0 : chain.getFirstToken(), found, _reference_1.ReferenceType.TypeReference, this.filename);
             }

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

@@ -12,6 +12,7 @@ class ScopeData {
             idefs: [],
             forms: [],
             types: {},
+            extraLikeTypes: {},
             deferred: [],
             references: [],
         };
@@ -126,6 +127,18 @@ class SpaghettiScopeNode extends ScopeData {
         }
         return undefined;
     }
+    findExtraLikeType(name) {
+        let search = this;
+        const upper = name.toUpperCase();
+        while (search !== undefined) {
+            const data = search.getData();
+            if (data.extraLikeTypes[upper]) {
+                return data.extraLikeTypes[upper];
+            }
+            search = search.getParent();
+        }
+        return undefined;
+    }
     findVariable(name) {
         let search = this;
         const upper = name.toUpperCase();

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

@@ -28,8 +28,10 @@ class ClassImplementation {
         scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(new tokens_1.Identifier(new position_1.Position(1, 1), "me"), _builtin_1.BuiltIn.filename, new basic_1.ObjectReferenceType(classDefinition)));
         helper.addAliasedAttributes(classDefinition); // todo, this is not correct, take care of instance vs static
         scope.addList(classAttributes.getConstants());
-        scope.addList(classAttributes.getInstance()); // todo, this is not correct, take care of instance vs static
-        scope.addList(classAttributes.getStatic()); // todo, this is not correct, take care of instance vs static
+        scope.addList(classAttributes.getStatic());
+        for (const i of classAttributes.getInstance()) {
+            scope.addExtraLikeType(i);
+        }
         const implemented = helper.fromSuperClass(classDefinition);
         helper.fromInterfaces(classDefinition, implemented);
     }

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

@@ -11,17 +11,21 @@ class MethodImplementation {
         const className = scope.getName();
         const methodToken = node.findFirstExpression(Expressions.MethodName).getFirstToken();
         const methodName = methodToken === null || methodToken === void 0 ? void 0 : methodToken.getStr();
-        scope.push(_scope_type_1.ScopeType.Method, methodName, node.getFirstToken().getStart(), filename);
         const classDefinition = scope.findClassDefinition(className);
         if (classDefinition === undefined) {
-            scope.pop(node.getLastToken().getEnd());
+            //      scope.pop(node.getLastToken().getEnd());
             throw new Error("Class definition for \"" + className + "\" not found");
         }
         const { method: methodDefinition } = helper.searchMethodName(classDefinition, methodName);
         if (methodDefinition === undefined) {
-            scope.pop(node.getLastToken().getEnd());
+            //      scope.pop(node.getLastToken().getEnd());
             throw new Error("Method definition \"" + methodName + "\" not found");
         }
+        if (methodDefinition.isStatic() === false) {
+            scope.push(_scope_type_1.ScopeType.MethodInstance, methodName, node.getFirstToken().getStart(), filename);
+            scope.addList(classDefinition.getAttributes().getInstance());
+        }
+        scope.push(_scope_type_1.ScopeType.Method, methodName, node.getFirstToken().getStart(), filename);
         scope.addReference(methodToken, methodDefinition, _reference_1.ReferenceType.MethodImplementationReference, filename);
         scope.addList(methodDefinition.getParameters().getAll());
         for (const i of helper.findInterfaces(classDefinition)) {

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

@@ -412,11 +412,16 @@ class SyntaxLogic {
         }
         else if (s instanceof Statements.EndForm
             || s instanceof Statements.EndFunction
-            || s instanceof Statements.EndMethod
             || s instanceof Statements.EndClass
             || s instanceof Statements.EndInterface) {
             this.scope.pop(node.getLastToken().getEnd());
         }
+        else if (s instanceof Statements.EndMethod) {
+            this.scope.pop(node.getLastToken().getEnd());
+            if (this.scope.getType() === _scope_type_1.ScopeType.MethodInstance) {
+                this.scope.pop(node.getLastToken().getEnd());
+            }
+        }
     }
 }
 exports.SyntaxLogic = SyntaxLogic;

package/build/src/registry.js

@@ -68,7 +68,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.81.0";
+        return "2.81.1";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/no_chained_assignment.js

@@ -8,10 +8,6 @@ const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const _irule_1 = require("./_irule");
 class NoChainedAssignmentConf extends _basic_rule_config_1.BasicRuleConfig {
-    constructor() {
-        super(...arguments);
-        this.onlyConstants = false;
-    }
 }
 exports.NoChainedAssignmentConf = NoChainedAssignmentConf;
 class NoChainedAssignment extends _abap_rule_1.ABAPRule {
@@ -28,7 +24,7 @@ class NoChainedAssignment extends _abap_rule_1.ABAPRule {
             tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Styleguide],
             badExample: `var1 = var2 = var3.`,
             goodExample: `var2 = var3.
-var1 = var3.`,
+var1 = var2.`,
         };
     }
     getConfig() {

package/build/src/rules/unnecessary_chaining.js

@@ -6,10 +6,6 @@ const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const _irule_1 = require("./_irule");
 class UnnecessaryChainingConf extends _basic_rule_config_1.BasicRuleConfig {
-    constructor() {
-        super(...arguments);
-        this.onlyConstants = false;
-    }
 }
 exports.UnnecessaryChainingConf = UnnecessaryChainingConf;
 class UnnecessaryChaining extends _abap_rule_1.ABAPRule {

package/build/src/rules/unreachable_code.js

@@ -67,6 +67,10 @@ class UnreachableCode extends _abap_rule_1.ABAPRule {
             return true;
         }
         else if (s instanceof Statements.Leave && n.findFirstExpression(Expressions.AndReturn) === undefined) {
+            const concat = n.concatTokens();
+            if (concat.includes(" TO LIST-PROCESSING")) {
+                return false;
+            }
             return true;
         }
         else if (s instanceof Statements.Return

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.81.0",
+    "version": "2.81.1",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -55,7 +55,7 @@
         "c8": "^7.10.0",
         "source-map-support": "^0.5.20",
         "ts-json-schema-generator": "^0.97.0",
-        "typescript": "^4.4.4"
+        "typescript": "^4.5.2"
     },
     "dependencies": {
         "fast-xml-parser": "^3.21.1",