@abaplint/core 2.119.55 → 2.119.56

package/build/src/abap/2_statements/expand_macros.js

@@ -89,6 +89,9 @@ class ExpandMacros {
         this.globalMacros = globalMacros;
         this.reg = reg;
     }
+    listMacroNames() {
+        return this.macros.listMacroNames();
+    }
     find(statements, file, clear = true) {
         var _a, _b, _c;
         let nameToken = undefined;
@@ -142,7 +145,7 @@ class ExpandMacros {
         for (const statement of statements) {
             const type = statement.get();
             if (type instanceof _statement_1.Unknown || type instanceof _statement_1.MacroCall) {
-                const macroName = this.findName(statement.getTokens());
+                const macroName = ExpandMacros.findName(statement.getTokens());
                 if (macroName && this.macros.isMacro(macroName)) {
                     const filename = this.macros.getMacroFilename(macroName);
                     if (filename) {
@@ -234,7 +237,7 @@ class ExpandMacros {
         }
         return result;
     }
-    findName(tokens) {
+    static findName(tokens) {
         let macroName = undefined;
         let previous = undefined;
         for (const i of tokens) {

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

@@ -9,40 +9,40 @@ function commonDerivedTypes() {
     const entity = (0, combi_1.alt)(_1.TypeName, _1.EntityAssociation);
     // more-specific keyword phrases (e.g. "FAILED LATE") must precede less-specific ones ("FAILED")
     return [
-        (0, combi_1.ver)(version_1.Release.v774, (0, combi_1.seq)("FAILED LATE", entity)),
-        (0, combi_1.ver)(version_1.Release.v774, (0, combi_1.seq)("MAPPED LATE", entity)),
-        (0, combi_1.ver)(version_1.Release.v774, (0, combi_1.seq)("REPORTED LATE", entity)),
-        (0, combi_1.ver)(version_1.Release.v777, (0, combi_1.seq)("FAILED EARLY", entity)),
-        (0, combi_1.ver)(version_1.Release.v777, (0, combi_1.seq)("MAPPED EARLY", entity)),
-        (0, combi_1.ver)(version_1.Release.v777, (0, combi_1.seq)("REPORTED EARLY", entity)),
-        (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("FAILED", entity)),
-        (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("MAPPED", entity)),
-        (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("REPORTED", entity)),
-        (0, combi_1.ver)(version_1.Release.v773, (0, combi_1.seq)("FUNCTION IMPORT", entity)),
-        (0, combi_1.ver)(version_1.Release.v773, (0, combi_1.seq)("FUNCTION RESULT", entity)),
-        (0, combi_1.ver)(version_1.Release.v773, (0, combi_1.seq)("ACTION RESULT", entity)),
-        (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("INSTANCE AUTHORIZATION KEY", entity)),
-        (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("INSTANCE AUTHORIZATION REQUEST", entity)),
-        (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("INSTANCE AUTHORIZATION RESULT", entity)),
-        (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("INSTANCE FEATURES KEY", entity)),
-        (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("INSTANCE FEATURES REQUEST", entity)),
-        (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("INSTANCE FEATURES RESULT", entity)),
-        (0, combi_1.ver)(version_1.Release.v780, (0, combi_1.seq)("AUTHORIZATION RESULT", entity)),
-        (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("AUTHORIZATION KEY", entity)),
-        (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("FEATURES RESULT", entity)),
-        (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("FEATURES KEY", entity)),
-        (0, combi_1.ver)(version_1.Release.v780, (0, combi_1.seq)("PERMISSIONS KEY", entity)),
+        (0, combi_1.ver)(version_1.Release.v774, (0, combi_1.seq)("FAILED LATE", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v774, (0, combi_1.seq)("MAPPED LATE", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v774, (0, combi_1.seq)("REPORTED LATE", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v777, (0, combi_1.seq)("FAILED EARLY", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v777, (0, combi_1.seq)("MAPPED EARLY", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v777, (0, combi_1.seq)("REPORTED EARLY", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("FAILED", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("MAPPED", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("REPORTED", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v773, (0, combi_1.seq)("FUNCTION IMPORT", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v773, (0, combi_1.seq)("FUNCTION RESULT", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v773, (0, combi_1.seq)("ACTION RESULT", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("INSTANCE AUTHORIZATION KEY", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("INSTANCE AUTHORIZATION REQUEST", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("INSTANCE AUTHORIZATION RESULT", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("INSTANCE FEATURES KEY", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("INSTANCE FEATURES REQUEST", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("INSTANCE FEATURES RESULT", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v780, (0, combi_1.seq)("AUTHORIZATION RESULT", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("AUTHORIZATION KEY", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("FEATURES RESULT", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("FEATURES KEY", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v780, (0, combi_1.seq)("PERMISSIONS KEY", entity), { also: combi_1.AlsoIn.OpenABAP }),
         (0, combi_1.seq)("READ IMPORT", entity),
         (0, combi_1.seq)("READ RESULT", entity),
-        (0, combi_1.ver)(version_1.Release.v915, (0, combi_1.seq)("READ CHANGES", entity)),
+        (0, combi_1.ver)(version_1.Release.v915, (0, combi_1.seq)("READ CHANGES", entity), { also: combi_1.AlsoIn.OpenABAP }),
         (0, combi_1.seq)("CREATE", entity),
         (0, combi_1.seq)("DELETE", entity),
         (0, combi_1.seq)("UPDATE", entity),
-        (0, combi_1.ver)(version_1.Release.v777, (0, combi_1.seq)("LOCK", entity)),
-        (0, combi_1.ver)(version_1.Release.v775, (0, combi_1.seq)("KEY OF", entity)),
-        (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("DETERMINATION", entity)),
-        (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("VALIDATION", entity)),
-        (0, combi_1.ver)(version_1.Release.v778, (0, combi_1.seq)("CHANGE", entity)),
+        (0, combi_1.ver)(version_1.Release.v777, (0, combi_1.seq)("LOCK", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v775, (0, combi_1.seq)("KEY OF", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("DETERMINATION", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("VALIDATION", entity), { also: combi_1.AlsoIn.OpenABAP }),
+        (0, combi_1.ver)(version_1.Release.v778, (0, combi_1.seq)("CHANGE", entity), { also: combi_1.AlsoIn.OpenABAP }),
     ];
 }
 function derivedTypesAlt(...extra) {

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

@@ -21,7 +21,7 @@ class TypeTable extends combi_1.Expression {
         const typetable = (0, combi_1.alt)(generic, (0, combi_1.seq)(normal1, (0, combi_1.alt)((0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))), (0, combi_1.seq)((0, combi_1.plus)(type_table_key_1.TypeTableKey), (0, combi_1.optPrio)(initial))), (0, combi_1.optPrio)("VALUE IS INITIAL")));
         const occurs = (0, combi_1.seq)("OCCURS", (0, combi_1.altPrio)(_1.Integer, field_chain_1.FieldChain));
         const entity = (0, combi_1.alt)(_1.TypeName, _1.EntityAssociation);
-        const derivedTypes = (0, _derived_types_1.derivedTypesAlt)((0, combi_1.ver)(version_1.Release.v773, (0, combi_1.seq)("ACTION IMPORT", entity)), (0, combi_1.ver)(version_1.Release.v774, (0, combi_1.seq)("READ LINK", entity)), (0, combi_1.ver)(version_1.Release.v787, (0, combi_1.seq)("EVENT", entity)));
+        const derivedTypes = (0, _derived_types_1.derivedTypesAlt)((0, combi_1.ver)(version_1.Release.v773, (0, combi_1.seq)("ACTION IMPORT", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.ver)(version_1.Release.v774, (0, combi_1.seq)("READ LINK", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.ver)(version_1.Release.v787, (0, combi_1.seq)("EVENT", entity), { also: combi_1.AlsoIn.OpenABAP }));
         const derived = (0, combi_1.ver)(version_1.Release.v770, (0, combi_1.seq)("TABLE FOR", derivedTypes, (0, combi_1.optPrio)("VALUE IS INITIAL")), { also: combi_1.AlsoIn.OpenABAP });
         const oldType = (0, combi_1.seq)((0, combi_1.opt)("REF TO"), _1.TypeName, (0, combi_1.alt)((0, combi_1.seq)(occurs, (0, combi_1.opt)(header)), header));
         const oldLike = (0, combi_1.seq)((0, combi_1.opt)("REF TO"), field_chain_1.FieldChain, (0, combi_1.alt)((0, combi_1.seq)(occurs, (0, combi_1.opt)(header)), header));

package/build/src/abap/cross_include_macros.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CrossIncludeMacros = void 0;
+const _abap_object_1 = require("../objects/_abap_object");
+const program_1 = require("../objects/program");
+const _statement_1 = require("./2_statements/statements/_statement");
+const expand_macros_1 = require("./2_statements/expand_macros");
+const include_graph_1 = require("../utils/include_graph");
+// Macros can be defined in one include and used in a sibling include, connected
+// via the main program. Objects are parsed in isolation, so the sibling include
+// initially ends up with Unknown statements. This second pass finds the main
+// program(s) for such includes, collects the macro definitions visible there,
+// and re-parses the include with the macro names as extra global macros.
+class CrossIncludeMacros {
+    constructor(reg) {
+        this.reg = reg;
+    }
+    run() {
+        const candidates = this.findCandidates();
+        if (candidates.length === 0) {
+            return;
+        }
+        const graph = new include_graph_1.IncludeGraph(this.reg);
+        const config = this.reg.getConfig();
+        const globalMacros = config.getSyntaxSetttings().globalMacros || [];
+        for (const prog of candidates) {
+            const mains = this.findMains(graph, prog);
+            if (mains.size === 0) {
+                continue;
+            }
+            const expand = new expand_macros_1.ExpandMacros(globalMacros, config.getRelease(), this.reg, config.getLanguageVersion());
+            for (const main of mains) {
+                for (const file of main.getABAPFiles()) {
+                    // find() follows INCLUDE statements, so this collects macros from the full include chain
+                    expand.find([...file.getStatements()], file, false);
+                }
+            }
+            const macroNames = expand.listMacroNames();
+            if (this.matchesUnknown(prog, new Set(macroNames))) {
+                prog.setDirty();
+                prog.parse(config.getRelease(), macroNames, this.reg, config.getLanguageVersion());
+            }
+        }
+    }
+    //////////////////////////////
+    findCandidates() {
+        const ret = [];
+        for (const obj of this.reg.getObjects()) {
+            if (!(obj instanceof program_1.Program) || obj.isInclude() === false) {
+                continue;
+            }
+            for (const file of obj.getABAPFiles()) {
+                if (file.getStatements().some(s => s.get() instanceof _statement_1.Unknown)) {
+                    ret.push(obj);
+                    break;
+                }
+            }
+        }
+        return ret;
+    }
+    findMains(graph, prog) {
+        var _a;
+        const ret = new Set();
+        const filename = (_a = prog.getMainABAPFile()) === null || _a === void 0 ? void 0 : _a.getFilename();
+        for (const mainFilename of graph.listMainForInclude(filename)) {
+            const file = this.reg.getFileByName(mainFilename);
+            const obj = file ? this.reg.findObjectForFile(file) : undefined;
+            if (obj instanceof _abap_object_1.ABAPObject) {
+                ret.add(obj);
+            }
+        }
+        return ret;
+    }
+    matchesUnknown(prog, macroNames) {
+        for (const file of prog.getABAPFiles()) {
+            for (const s of file.getStatements()) {
+                if (s.get() instanceof _statement_1.Unknown) {
+                    const name = expand_macros_1.ExpandMacros.findName(s.getTokens());
+                    if (name !== undefined && macroNames.has(name.toUpperCase())) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+}
+exports.CrossIncludeMacros = CrossIncludeMacros;
+//# sourceMappingURL=cross_include_macros.js.map

package/build/src/registry.js

@@ -9,6 +9,7 @@ const ddic_references_1 = require("./ddic_references");
 const rules_runner_1 = require("./rules_runner");
 const msag_references_1 = require("./msag_references");
 const macro_references_1 = require("./macro_references");
+const cross_include_macros_1 = require("./abap/cross_include_macros");
 // todo, this should really be an instance in case there are multiple Registry'ies
 class ParsingPerformance {
     static clear() {
@@ -74,7 +75,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.55";
+        return "2.119.56";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -298,6 +299,7 @@ class Registry {
         for (const o of this.getObjects()) {
             this.parsePrivate(o);
         }
+        new cross_include_macros_1.CrossIncludeMacros(this).run();
         new find_global_definitions_1.FindGlobalDefinitions(this).run();
         return this;
     }
@@ -315,6 +317,7 @@ class Registry {
         if ((input === null || input === void 0 ? void 0 : input.outputPerformance) === true) {
             ParsingPerformance.output();
         }
+        new cross_include_macros_1.CrossIncludeMacros(this).run();
         new find_global_definitions_1.FindGlobalDefinitions(this).run(input === null || input === void 0 ? void 0 : input.progress);
         return this;
     }

package/package.json

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