@abaplint/core 2.113.136 → 2.113.138

package/build/abaplint.d.ts

@@ -5570,6 +5570,7 @@ export declare class Registry implements IRegistry {
     private readonly ddicReferences;
     private readonly msagReferences;
     private readonly macroReferences;
+    private errorNamespace;
     private conf;
     constructor(conf?: IConfiguration);
     static abaplintVersion(): string;
@@ -5710,6 +5711,7 @@ declare class RollbackEntities implements IStatement {
 
 export declare class RulesRunner {
     private readonly reg;
+    private readonly syntaxPerformance;
     constructor(reg: IRegistry);
     objectsToCheck(objects: Iterable<IObject>): readonly IObject[];
     runRules(objects: Iterable<IObject>, input?: IRunInput): readonly Issue[];

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

@@ -6,7 +6,7 @@ const combi_1 = require("../combi");
 class MessageClass extends combi_1.Expression {
     getRunnable() {
         // "&1" can be used for almost anything(field names, method names etc.) in macros
-        return (0, combi_1.seq)((0, combi_1.regex)(/^>?[\w\/]+#?@?\/?!?&?>?\$?\??<?$/), (0, combi_1.starPrio)((0, combi_1.tok)(tokens_1.Plus)), (0, combi_1.starPrio)((0, combi_1.tok)(tokens_1.PlusW)), (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.optPrio)((0, combi_1.regex)(/^\w+$/)))), (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.DashW)));
+        return (0, combi_1.seq)((0, combi_1.regex)(/^>?[\w\/]+#?@?\/?!?&?>?\$?\??<?§?~?$/), (0, combi_1.starPrio)((0, combi_1.tok)(tokens_1.Plus)), (0, combi_1.starPrio)((0, combi_1.tok)(tokens_1.PlusW)), (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.optPrio)((0, combi_1.regex)(/^\w+$/)))), (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.DashW)));
     }
 }
 exports.MessageClass = MessageClass;

package/build/src/abap/2_statements/statements/read_table.js

@@ -7,7 +7,7 @@ const version_1 = require("../../../version");
 const transporting_fields_1 = require("../expressions/transporting_fields");
 class ReadTable {
     getMatcher() {
-        const comparing = (0, combi_1.seq)("COMPARING", (0, combi_1.alt)((0, combi_1.plus)(expressions_1.FieldSub), expressions_1.Dynamic));
+        const comparing = (0, combi_1.seq)("COMPARING", (0, combi_1.alt)((0, combi_1.plus)(expressions_1.FieldSub), (0, combi_1.plus)(expressions_1.Dynamic)));
         const index = (0, combi_1.seq)("INDEX", expressions_1.Source);
         const components = (0, combi_1.seq)((0, combi_1.alt)(expressions_1.Field, expressions_1.Dynamic), "COMPONENTS", expressions_1.ComponentCompareSimple);
         const key = (0, combi_1.seq)((0, combi_1.altPrio)("WITH KEY", "WITH TABLE KEY"), (0, combi_1.alt)(expressions_1.ComponentCompareSimple, components, (0, combi_1.seq)((0, combi_1.optPrio)("="), expressions_1.Source)));

package/build/src/registry.js

@@ -60,14 +60,14 @@ class Registry {
         this.objects = {};
         this.objectsByType = {};
         this.dependencies = {};
-        this.conf = conf ? conf : config_1.Config.getDefault();
+        this.setConfig(conf ? conf : config_1.Config.getDefault());
         this.ddicReferences = new ddic_references_1.DDICReferences();
         this.msagReferences = new msag_references_1.MSAGReferences();
         this.macroReferences = new macro_references_1.MacroReferences();
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.136";
+        return "2.113.138";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -145,12 +145,11 @@ class Registry {
             obj.setDirty();
         }
         this.conf = conf;
+        this.errorNamespace = new RegExp(this.getConfig().getSyntaxSetttings().errorNamespace, "i");
         return this;
     }
     inErrorNamespace(name) {
-        // todo: performance? cache regexp?
-        const reg = new RegExp(this.getConfig().getSyntaxSetttings().errorNamespace, "i");
-        return reg.test(name);
+        return this.errorNamespace.test(name);
     }
     addFile(file) {
         return this.addFiles([file]);

package/build/src/rules_runner.js

@@ -6,9 +6,35 @@ const artifacts_rules_1 = require("./artifacts_rules");
 const _abap_object_1 = require("./objects/_abap_object");
 const skip_logic_1 = require("./skip_logic");
 const excludeHelper_1 = require("./utils/excludeHelper");
+class SyntaxPerformance {
+    constructor() {
+        this.results = [];
+    }
+    push(obj, runtime) {
+        if (runtime < 100) {
+            return;
+        }
+        this.results.push({
+            runtime: runtime,
+            name: obj.getType() + " " + obj.getName(),
+        });
+    }
+    output() {
+        const MAX = 10;
+        this.results.sort((a, b) => { return b.runtime - a.runtime; });
+        for (let i = 0; i < MAX; i++) {
+            const row = this.results[i];
+            if (row === undefined) {
+                break;
+            }
+            process.stderr.write(`\t${row.runtime}ms\t${row.name}\n`);
+        }
+    }
+}
 class RulesRunner {
     constructor(reg) {
         this.reg = reg;
+        this.syntaxPerformance = new SyntaxPerformance();
     }
     objectsToCheck(objects) {
         const check = [];
@@ -33,12 +59,25 @@ class RulesRunner {
         for (const obj of check) {
             (_b = input === null || input === void 0 ? void 0 : input.progress) === null || _b === void 0 ? void 0 : _b.tick("Run Syntax - " + obj.getName());
             if (obj instanceof _abap_object_1.ABAPObject) {
+                const start = Date.now();
                 new syntax_1.SyntaxLogic(this.reg, obj).run();
+                if ((input === null || input === void 0 ? void 0 : input.outputPerformance) === true) {
+                    this.syntaxPerformance.push(obj, Date.now() - start);
+                }
             }
         }
+        if ((input === null || input === void 0 ? void 0 : input.outputPerformance) === true) {
+            process.stderr.write("Syntax Performance:\n");
+            this.syntaxPerformance.output();
+        }
         (_c = input === null || input === void 0 ? void 0 : input.progress) === null || _c === void 0 ? void 0 : _c.set(rules.length, "Initialize Rules");
         for (const rule of rules) {
-            (_d = input === null || input === void 0 ? void 0 : input.progress) === null || _d === void 0 ? void 0 : _d.tick("Initialize Rules - " + rule.getMetadata().key);
+            if ((input === null || input === void 0 ? void 0 : input.outputPerformance) === true) {
+                process.stderr.write("Initializing rule " + rule.getMetadata().key + "\n");
+            }
+            else {
+                (_d = input === null || input === void 0 ? void 0 : input.progress) === null || _d === void 0 ? void 0 : _d.tick("Initialize Rules - " + rule.getMetadata().key);
+            }
             if (rule.initialize === undefined) {
                 throw new Error(rule.getMetadata().key + " missing initialize method");
             }

package/build/src/utils/include_graph.js

@@ -11,6 +11,7 @@ const _abap_object_1 = require("../objects/_abap_object");
 const severity_1 = require("../severity");
 // todo, check for cycles/circular dependencies, method findTop
 // todo, add configurable error for multiple use includes
+const FMXXINCLUDE = /^(\/\w+\/)?L.+XX$/;
 function getABAPObjects(reg) {
     const ret = [];
     for (const o of reg.getObjects()) {
@@ -22,40 +23,33 @@ function getABAPObjects(reg) {
 }
 class Graph {
     constructor() {
-        this.vertices = [];
-        this.edges = [];
+        this.verticesIncludenameIndex = {};
+        this.verticesFilenameIndex = {};
+        this.edges = {};
     }
     addVertex(vertex) {
-        this.vertices.push(vertex);
+        this.verticesIncludenameIndex[vertex.includeName.toUpperCase()] = vertex;
+        this.verticesFilenameIndex[vertex.filename.toUpperCase()] = vertex;
     }
-    findInclude(includeName) {
-        for (const v of this.vertices) {
-            if (v.includeName.toUpperCase() === includeName.toUpperCase()) {
-                return v;
-            }
-        }
-        return undefined;
+    findVertexViaIncludename(includeName) {
+        return this.verticesIncludenameIndex[includeName.toUpperCase()];
     }
-    findVertex(filename) {
-        for (const v of this.vertices) {
-            if (v.filename.toUpperCase() === filename.toUpperCase()) {
-                return v;
-            }
-        }
-        return undefined;
+    findVertexByFilename(filename) {
+        return this.verticesFilenameIndex[filename.toUpperCase()];
     }
     addEdge(from, toFilename) {
-        this.edges.push({ from: from.filename, to: toFilename });
+        if (this.edges[from.filename] === undefined) {
+            this.edges[from.filename] = [];
+        }
+        this.edges[from.filename].push(toFilename);
     }
     findTop(filename) {
         const ret = [];
-        for (const e of this.edges) {
-            if (e.from === filename) {
-                ret.push(...this.findTop(e.to));
-            }
+        for (const to of this.edges[filename] || []) {
+            ret.push(...this.findTop(to));
         }
         if (ret.length === 0) {
-            const found = this.findVertex(filename);
+            const found = this.findVertexByFilename(filename);
             if (found !== undefined) {
                 ret.push(found);
             }
@@ -99,19 +93,23 @@ class IncludeGraph {
         this.addVertices();
         for (const o of getABAPObjects(this.reg)) {
             for (const f of o.getABAPFiles()) {
+                if (f.getFilename().includes(".prog.screen_") || f.getFilename().includes(".fugr.screen_")) {
+                    // skip dynpro files
+                    continue;
+                }
                 for (const s of f.getStatements()) {
                     if (s.get() instanceof statements_1.Include) {
-                        const ifFound = s.concatTokens().toUpperCase().includes("IF FOUND");
                         const iexp = s.findFirstExpression(expressions_1.IncludeName);
                         if (iexp === undefined) {
                             throw new Error("unexpected Include node");
                         }
                         const name = iexp.getFirstToken().getStr().toUpperCase();
-                        if (name.match(/^(\/\w+\/)?L.+XX$/)) { // function module XX includes, possibily namespaced
+                        if (name.match(FMXXINCLUDE)) { // function module XX includes, possibily namespaced
                             continue;
                         }
-                        const found = this.graph.findInclude(name);
+                        const found = this.graph.findVertexViaIncludename(name);
                         if (found === undefined) {
+                            const ifFound = s.concatTokens().toUpperCase().includes("IF FOUND");
                             if (ifFound === false) {
                                 const issue = issue_1.Issue.atStatement(f, s, "Include " + name + " not found", new check_include_1.CheckInclude().getMetadata().key, severity_1.Severity.Error);
                                 this.issues.push(issue);
@@ -131,7 +129,7 @@ class IncludeGraph {
         this.findUnusedIncludes();
     }
     findUnusedIncludes() {
-        for (const v of this.graph.vertices) {
+        for (const v of Object.values(this.graph.verticesFilenameIndex)) {
             if (v.include === true) {
                 if (this.listMainForInclude(v.filename).length === 0) {
                     const f = this.reg.getFileByName(v.filename);

package/package.json

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