@abaplint/core 2.112.0 → 2.112.2

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

@@ -36,7 +36,7 @@ class AttributeChain {
         }
         if (context === undefined) {
             const message = "Attribute or constant \"" + name + "\" not found in \"" + def.getName() + "\"";
-            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, nameToken, message));
             return new void_type_1.VoidType(_syntax_input_1.CheckSyntaxKey);
         }
         for (const t of type) {

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

@@ -55,7 +55,7 @@ class Cast {
             else if (tt === undefined) {
                 // todo, this should be an UnknownType instead?
                 const message = "Type \"" + typeName + "\" not found in scope, Cast";
-                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, typeExpression.getFirstToken(), message));
                 return new basic_1.VoidType(_syntax_input_1.CheckSyntaxKey);
             }
         }

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

@@ -28,21 +28,21 @@ class ComponentChain {
                 if (concat === "-") {
                     if (!(context instanceof structure_type_1.StructureType)) {
                         const message = "ComponentChain, not a structure";
-                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, child.getFirstToken(), message));
                         return new void_type_1.VoidType(_syntax_input_1.CheckSyntaxKey);
                     }
                 }
                 else if (concat === "=>") {
                     if (!(context instanceof basic_1.ObjectReferenceType)) {
                         const message = "ComponentChain, not a reference";
-                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, child.getFirstToken(), message));
                         return new void_type_1.VoidType(_syntax_input_1.CheckSyntaxKey);
                     }
                 }
                 else if (concat === "->") {
                     if (!(context instanceof basic_1.ObjectReferenceType) && !(context instanceof basic_1.DataReference)) {
                         const message = "ComponentChain, not a reference";
-                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, child.getFirstToken(), message));
                         return new void_type_1.VoidType(_syntax_input_1.CheckSyntaxKey);
                     }
                 }
@@ -59,7 +59,7 @@ class ComponentChain {
                     context = context.getComponentByName(name);
                     if (context === undefined) {
                         const message = "Component \"" + name + "\" not found in structure";
-                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, child.getFirstToken(), message));
                         return new void_type_1.VoidType(_syntax_input_1.CheckSyntaxKey);
                     }
                 }
@@ -68,7 +68,7 @@ class ComponentChain {
                     const def = input.scope.findObjectDefinition(id.getName());
                     if (def === undefined) {
                         const message = id.getName() + " not found in scope";
-                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, child.getFirstToken(), message));
                         return new void_type_1.VoidType(_syntax_input_1.CheckSyntaxKey);
                     }
                     const helper = new _object_oriented_1.ObjectOriented(input.scope);
@@ -76,7 +76,7 @@ class ComponentChain {
                     context = found === null || found === void 0 ? void 0 : found.getType();
                     if (context === undefined) {
                         const message = "Attribute \"" + name + "\" not found";
-                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, child.getFirstToken(), message));
                         return new void_type_1.VoidType(_syntax_input_1.CheckSyntaxKey);
                     }
                     else {
@@ -89,7 +89,7 @@ class ComponentChain {
                 }
                 else {
                     const message = "ComponentChain, not a structure, " + (context === null || context === void 0 ? void 0 : context.constructor.name);
-                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, child.getFirstToken(), message));
                     return new void_type_1.VoidType(_syntax_input_1.CheckSyntaxKey);
                 }
             }

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

@@ -53,7 +53,7 @@ class MethodCallChain {
                 else {
                     if (previous && previous.getFirstToken().getStr() === "=>" && (method === null || method === void 0 ? void 0 : method.isStatic()) === false) {
                         const message = "Method \"" + methodName + "\" not static";
-                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, message));
                         return new basic_1.VoidType(_syntax_input_1.CheckSyntaxKey);
                     }
                     const extra = {
@@ -74,7 +74,7 @@ class MethodCallChain {
                 }
                 else if (method === undefined && !(context instanceof basic_1.VoidType)) {
                     const message = "Method \"" + methodName + "\" not found, methodCallChain";
-                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, message));
                     return new basic_1.VoidType(_syntax_input_1.CheckSyntaxKey);
                 }
                 else if (method) {

package/build/src/abap/5_syntax/structures/data.js

@@ -74,7 +74,7 @@ class Data {
                 }
                 if (!(found instanceof Basic.StructureType)) {
                     const message = "not structured, " + typeName;
-                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, typeToken, message));
                     return new _typed_identifier_1.TypedIdentifier(name, input.filename, new Basic.VoidType(_syntax_input_1.CheckSyntaxKey));
                 }
                 for (const c of found.getComponents()) {

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

@@ -65,6 +65,7 @@ class InterfaceDefinition extends _identifier_1.Identifier {
         this.typeDefinitions = this.attributes.getTypes();
         this.aliases = new aliases_1.Aliases(node, this.filename, input.scope);
         // todo, cleanup aliases, vs "object_oriented.ts" vs "class_implementation.ts"
+        // this adds the aliased types to scope?
         for (const a of this.aliases.getAll()) {
             const [objName, fieldName] = a.getComponent().split("~");
             const idef = input.scope.findInterfaceDefinition(objName);
@@ -84,10 +85,6 @@ class InterfaceDefinition extends _identifier_1.Identifier {
                 }
             }
         }
-        this.methodDefinitions = new method_definitions_1.MethodDefinitions(node, input);
-        if (this.methodDefinitions.getByName("CONSTRUCTOR") !== undefined) {
-            throw new Error("Interfaces cannot have constructor methods");
-        }
         const events = node.findAllStatements(Statements.Events);
         for (const e of events) {
             this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, input));
@@ -109,6 +106,10 @@ class InterfaceDefinition extends _identifier_1.Identifier {
                 }
             }
         }
+        this.methodDefinitions = new method_definitions_1.MethodDefinitions(node, input);
+        if (this.methodDefinitions.getByName("CONSTRUCTOR") !== undefined) {
+            throw new Error("Interfaces cannot have constructor methods");
+        }
     }
 }
 exports.InterfaceDefinition = InterfaceDefinition;

package/build/src/config.js

@@ -89,6 +89,10 @@ class Config {
         if (this.config.syntax.globalConstants === undefined) {
             this.config.syntax.globalConstants = [];
         }
+        else {
+            // remove duplicates,
+            this.config.syntax.globalConstants = [...new Set(this.config.syntax.globalConstants)];
+        }
         if (this.config.global.skipIncludesWithoutMain === undefined) {
             this.config.global.skipIncludesWithoutMain = false;
         }

package/build/src/registry.js

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

package/build/src/rules/double_space.js

@@ -16,6 +16,8 @@ class DoubleSpaceConf extends _basic_rule_config_1.BasicRuleConfig {
         super(...arguments);
         /** Check for double space after keywords */
         this.keywords = true;
+        /** list of keywords to skip, case insensitive */
+        this.skipKeywords = ["CHANGING", "EXPORTING", "OTHERS"];
         /** Check for double space after start parenthesis */
         this.startParen = true;
         /** Check for double space before end parenthesis */
@@ -48,6 +50,9 @@ class DoubleSpace extends _abap_rule_1.ABAPRule {
     }
     setConfig(conf) {
         this.conf = conf;
+        if (this.conf.skipKeywords === undefined) {
+            this.conf.skipKeywords = new DoubleSpaceConf().skipKeywords;
+        }
     }
     runParsed(file) {
         let issues = [];
@@ -159,9 +164,7 @@ class DoubleSpace extends _abap_rule_1.ABAPRule {
             if (prev instanceof nodes_1.TokenNodeRegex
                 || upper === "("
                 || upper === ")"
-                || upper === "CHANGING"
-                || upper === "EXPORTING"
-                || upper === "OTHERS") {
+                || this.getConfig().skipKeywords.some(e => e.toUpperCase() === upper)) {
                 // not a keyword, continue
                 prev = n;
                 continue;

package/package.json

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

package/build/adhoc/lexer_performance.d.ts

@@ -1 +0,0 @@
-export {};

package/build/adhoc/lexer_performance.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const src_1 = require("../src");
-const lexer_1 = require("../src/abap/1_lexer/lexer");
-const fs = require("fs");
-console.log("========================");
-const file = new src_1.MemoryFile("abapgit.abap", fs.readFileSync("./lexer_performance.abap", "utf-8"));
-let total = 0;
-for (let i = 0; i < 10; i++) {
-    const before = Date.now();
-    const result = new lexer_1.Lexer().run(file);
-    const runtime = Date.now() - before;
-    console.log("Runtime: " + runtime + "ms, Tokens: " + result.tokens.length);
-    total += runtime;
-}
-console.log("Total: " + total + "ms");
-//# sourceMappingURL=lexer_performance.js.map

package/build/adhoc/parser_performance.d.ts

@@ -1 +0,0 @@
-export {};

package/build/adhoc/parser_performance.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const src_1 = require("../src");
-const lexer_1 = require("../src/abap/1_lexer/lexer");
-const fs = require("fs");
-const statement_parser_1 = require("../src/abap/2_statements/statement_parser");
-console.log("========================");
-const file = new src_1.MemoryFile("abapgit.abap", fs.readFileSync("./lexer_performance.abap", "utf-8"));
-const lexerResult = new lexer_1.Lexer().run(file);
-let total = 0;
-for (let i = 0; i < 4; i++) {
-    const before = Date.now();
-    new statement_parser_1.StatementParser(src_1.Version.v702).run([lexerResult], []);
-    const runtime = Date.now() - before;
-    total += runtime;
-}
-console.log("Total: " + total + "ms");
-//# sourceMappingURL=parser_performance.js.map

package/build/adhoc/syntax_performance.d.ts

@@ -1 +0,0 @@
-export {};

package/build/adhoc/syntax_performance.js

@@ -1,185 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const src_1 = require("../src");
-const fs = require("fs");
-console.log("========================");
-const file1 = new src_1.MemoryFile("abapgit.prog.abap", fs.readFileSync("./lexer_performance.abap", "utf-8"));
-const reg = new src_1.Registry().addFile(file1);
-reg.addFile(new src_1.MemoryFile("cx_root.clas.abap", `
-CLASS cx_root DEFINITION ABSTRACT PUBLIC.
-  PUBLIC SECTION.
-    DATA previous TYPE REF TO cx_root.
-    DATA textid   TYPE c LENGTH 32.
-
-    METHODS constructor
-      IMPORTING
-        textid   LIKE textid OPTIONAL
-        previous TYPE REF TO cx_root OPTIONAL.
-
-    METHODS get_source_position
-      EXPORTING
-        program_name TYPE string
-        include_name TYPE string
-        source_line  TYPE i.
-
-    INTERFACES if_message.
-    ALIASES get_longtext FOR if_message~get_longtext.
-    ALIASES get_text FOR if_message~get_text.
-
-ENDCLASS.
-
-CLASS cx_root IMPLEMENTATION.
-
-  METHOD constructor.
-  ENDMETHOD.
-
-  METHOD get_source_position.
-  ENDMETHOD.
-
-  METHOD if_message~get_longtext.
-  ENDMETHOD.
-
-  METHOD if_message~get_text.
-  ENDMETHOD.
-
-ENDCLASS.`));
-reg.addFile(new src_1.MemoryFile("cx_static_check.clas.abap", `
-CLASS cx_static_check DEFINITION PUBLIC INHERITING FROM cx_root.
-  PUBLIC SECTION.
-    METHODS constructor
-      IMPORTING
-        textid   LIKE textid OPTIONAL
-        previous TYPE REF TO cx_root OPTIONAL.
-ENDCLASS.
-
-CLASS cx_static_check IMPLEMENTATION.
-  METHOD constructor.
-  ENDMETHOD.
-ENDCLASS.`));
-reg.addFile(new src_1.MemoryFile("if_message.intf.abap", `
-INTERFACE if_message PUBLIC.
-  METHODS get_text RETURNING VALUE(result) TYPE string.
-
-  METHODS get_longtext
-    IMPORTING preserve_newlines TYPE abap_bool OPTIONAL
-    RETURNING VALUE(result) TYPE string.
-ENDINTERFACE.`));
-reg.addFile(new src_1.MemoryFile("if_t100_message.intf.abap", `
-INTERFACE if_t100_message PUBLIC.
-
-  DATA t100key TYPE scx_t100key.
-
-  CONSTANTS:
-    BEGIN OF default_textid,
-      msgid TYPE symsgid VALUE 'AB',
-      msgno TYPE symsgno VALUE '123',
-      attr1 TYPE scx_attrname VALUE '',
-      attr2 TYPE scx_attrname VALUE '',
-      attr3 TYPE scx_attrname VALUE '',
-      attr4 TYPE scx_attrname VALUE '',
-    END OF default_textid.
-
-ENDINTERFACE.`));
-reg.setConfig(new src_1.Config(`
-{
-  "global": {
-    "files": "/src/**/*.*"
-  },
-  "dependencies": [],
-  "syntax": {
-    "version": "v702",
-    "errorNamespace": "^(Z|Y|LCL_|TY_|LIF_)",
-    "globalConstants": [
-      "abap_func_exporting",
-      "abap_func_tables",
-      "cssf_formtype_text",
-      "icon_abap",
-      "icon_adopt",
-      "icon_change",
-      "icon_create",
-      "icon_delete",
-      "icon_display_text",
-      "icon_folder",
-      "icon_led_green",
-      "icon_led_inactive",
-      "icon_led_red",
-      "icon_led_yellow",
-      "icon_message_information",
-      "icon_okay",
-      "icon_set_state",
-      "icon_stack",
-      "icon_system_help",
-      "icon_workflow_fork",
-      "seoc_category_exception",
-      "seoc_category_webdynpro_class",
-      "seoc_exposure_private",
-      "seoc_exposure_protected",
-      "seoc_exposure_public",
-      "seoc_state_implemented",
-      "seoc_version_active",
-      "seoc_version_deleted",
-      "seoc_version_inactive",
-      "seok_access_free",
-      "seok_access_modify",
-      "seox_false",
-      "seok_pgmid_r3tr",
-      "seoo_cmptype_type",
-      "seoo_cmptype_event",
-      "seoo_cmptype_method",
-      "seoo_cmptype_attribute",
-      "seop_ext_class_locals_def",
-      "seop_ext_class_locals_imp",
-      "seop_ext_class_macros",
-      "seop_ext_class_testclasses",
-      "seop_incextapp_definition",
-      "seop_incextapp_implementation",
-      "seop_incextapp_macros",
-      "seop_incextapp_testclasses",
-      "seos_scotype_exception",
-      "seos_scotype_parameter",
-      "seox_true",
-      "sews_c_vif_version",
-      "skwfc_obtype_folder",
-      "skwfc_obtype_loio",
-      "so2_controller",
-      "icon_no_status",
-      "icon_package_standard",
-      "srext_ext_class_pool",
-      "srext_ext_interface_pool",
-      "ststc_c_type_dialog",
-      "ststc_c_type_object",
-      "ststc_c_type_parameters",
-      "ststc_c_type_report",
-      "swbm_c_op_delete_no_dialog",
-      "swbm_c_type_ddic_db_tabxinx",
-      "swbm_c_type_wdy_application",
-      "swbm_version_active",
-      "swbm_version_inactive",
-      "wbmr_c_skwf_folder_class",
-      "wdyn_limu_component_controller",
-      "wdyn_limu_component_definition",
-      "wdyn_limu_component_view"
-    ]
-  },
-  "rules": {
-    "begin_end_names": true,
-    "check_ddic": true,
-    "check_include": true,
-    "check_syntax": true,
-    "global_class": true,
-    "implement_methods": true,
-    "method_implemented_twice": true,
-    "parser_error": true,
-    "superclass_final": true,
-    "unknown_types": true,
-    "xml_consistency": true
-  }
-}`));
-reg.parse();
-console.log("run syntax logic,");
-const before = Date.now();
-const issues = reg.findIssues();
-console.dir(issues);
-const runtime = Date.now() - before;
-console.log("Total: " + runtime + "ms");
-//# sourceMappingURL=syntax_performance.js.map

package/build/adhoc/typed_array.d.ts

@@ -1,20 +0,0 @@
-declare class Token {
-    private readonly col;
-    private readonly row;
-    private readonly type;
-    private readonly str;
-    constructor(col: number, row: number, type: number, str: string);
-    get(): {
-        a: number;
-        b: number;
-        c: number;
-        d: string;
-    };
-}
-declare class TokensMemory {
-    private readonly strings;
-    private readonly memory;
-    private length;
-    add(col: number, row: number, type: number, str: string): void;
-}
-declare const count = 5000000;

package/build/adhoc/typed_array.js

@@ -1,47 +0,0 @@
-"use strict";
-class Token {
-    constructor(col, row, type, str) {
-        this.col = col;
-        this.row = row;
-        this.type = type;
-        this.str = str;
-    }
-    get() {
-        return { a: this.col, b: this.row, c: this.type, d: this.str };
-    }
-}
-class TokensMemory {
-    constructor() {
-        this.strings = [];
-        this.memory = new Int32Array();
-        this.length = 0;
-    }
-    add(col, row, type, str) {
-        this.memory[0 + this.length] = col;
-        this.memory[1 + this.length] = row;
-        this.memory[2 + this.length] = type;
-        this.memory[3 + this.length] = this.strings.length;
-        this.strings.push(str);
-        this.length++;
-    }
-}
-const count = 5000000;
-{
-    const start = Date.now();
-    const mem = new TokensMemory();
-    for (let i = 0; i < count; i++) {
-        mem.add(i, i, i, "dfs" + i);
-    }
-    const runtime = Date.now() - start;
-    console.log("Typed Array: " + runtime + "ms");
-}
-{
-    const start = Date.now();
-    const tokens = [];
-    for (let i = 0; i < count; i++) {
-        tokens.push(new Token(i, i, i, "dfs" + i));
-    }
-    const runtime = Date.now() - start;
-    console.log("Objects: " + runtime + "ms");
-}
-//# sourceMappingURL=typed_array.js.map