@abaplint/cli 2.119.55 → 2.119.57

package/build/cli.js

@@ -1811,6 +1811,7 @@ exports.verNotLang = verNotLang;
 exports.failCombinator = failCombinator;
 exports.failStar = failStar;
 exports.stopBefore = stopBefore;
+exports.stopBefore1 = stopBefore1;
 const Tokens = __importStar(__webpack_require__(/*! ../1_lexer/tokens */ "../core/build/src/abap/1_lexer/tokens/index.js"));
 const nodes_1 = __webpack_require__(/*! ../nodes */ "../core/build/src/abap/nodes/index.js");
 const version_1 = __webpack_require__(/*! ../../version */ "../core/build/src/version.js");
@@ -2791,6 +2792,29 @@ class StopBefore2 {
 function stopBefore(t1, t2) {
     return new StopBefore2(t1, t2);
 }
+class StopBefore1 {
+    constructor(words) { this.words = words.map(w => w.toUpperCase()); }
+    listKeywords() { return []; }
+    getUsing() { return []; }
+    run(r) {
+        var _a;
+        const result = [];
+        for (const input of r) {
+            const next = (_a = input.peek()) === null || _a === void 0 ? void 0 : _a.getUpperStr();
+            if (next !== undefined && this.words.includes(next)) {
+                continue;
+            }
+            result.push(input);
+        }
+        return result;
+    }
+    railroad() { return "Railroad.Terminal('stopBefore(" + this.words.join("|") + ")')"; }
+    toStr() { return "stopBefore(" + this.words.join(",") + ")"; }
+    first() { return [""]; }
+}
+function stopBefore1(...words) {
+    return new StopBefore1(words);
+}
 //# sourceMappingURL=combi.js.map
 
 /***/ },
@@ -2893,6 +2917,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;
@@ -2946,7 +2973,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) {
@@ -3038,7 +3065,7 @@ class ExpandMacros {
         }
         return result;
     }
-    findName(tokens) {
+    static findName(tokens) {
         let macroName = undefined;
         let previous = undefined;
         for (const i of tokens) {
@@ -3094,40 +3121,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) {
@@ -3817,8 +3844,8 @@ const combi_1 = __webpack_require__(/*! ../combi */ "../core/build/src/abap/2_st
 const _1 = __webpack_require__(/*! . */ "../core/build/src/abap/2_statements/expressions/index.js");
 class ComponentChainSimple extends combi_1.Expression {
     getRunnable() {
-        const chain = (0, combi_1.seq)(_1.ComponentName, (0, combi_1.starPrio)((0, combi_1.seq)(_1.ArrowOrDash, _1.ComponentName)));
-        const ret = (0, combi_1.seq)(chain, (0, combi_1.optPrio)(_1.FieldOffset), (0, combi_1.optPrio)(_1.FieldLength));
+        const chain = (0, combi_1.starPrio)((0, combi_1.altPrio)(_1.Dereference, (0, combi_1.seq)(_1.ArrowOrDash, _1.ComponentName)));
+        const ret = (0, combi_1.seq)(_1.ComponentName, chain, (0, combi_1.optPrio)(_1.FieldOffset), (0, combi_1.optPrio)(_1.FieldLength));
         return ret;
     }
 }
@@ -6760,7 +6787,7 @@ const combi_1 = __webpack_require__(/*! ../combi */ "../core/build/src/abap/2_st
 const _1 = __webpack_require__(/*! . */ "../core/build/src/abap/2_statements/expressions/index.js");
 class ParameterListS extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.plus)(_1.ParameterS);
+        return (0, combi_1.plusPrio)(_1.ParameterS);
     }
 }
 exports.ParameterListS = ParameterListS;
@@ -10819,7 +10846,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));
@@ -10851,10 +10878,10 @@ class TypeTableKey extends combi_1.Expression {
         const uniqueness = (0, combi_1.alt)("NON-UNIQUE", "UNIQUE");
         const defaultKey = "DEFAULT KEY";
         const emptyKey = (0, combi_1.ver)(version_1.Release.v740sp02, "EMPTY KEY", { also: combi_1.AlsoIn.OpenABAP });
-        const components = (0, combi_1.plus)((0, combi_1.alt)((0, combi_1.seq)("WITH", (0, combi_1.failStar)()), _1.FieldSub));
+        const components = (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.stopBefore1)("WITH", "INITIAL", "WITHOUT"), (0, combi_1.stopBefore)("READ", "-"), _1.FieldSub));
         const further = (0, combi_1.seq)((0, combi_1.alt)("WITHOUT", "WITH"), "FURTHER SECONDARY KEYS");
         const alias = (0, combi_1.seq)("ALIAS", _1.Field);
-        const key = (0, combi_1.seq)("WITH", (0, combi_1.opt)(uniqueness), (0, combi_1.altPrio)(defaultKey, emptyKey, (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("SORTED", "HASHED")), "KEY", (0, combi_1.alt)((0, combi_1.seq)(_1.Field, (0, combi_1.opt)(alias), "COMPONENTS", components), components))), (0, combi_1.optPrio)(further), (0, combi_1.optPrio)("READ-ONLY"));
+        const key = (0, combi_1.seq)("WITH", (0, combi_1.optPrio)(uniqueness), (0, combi_1.altPrio)(defaultKey, emptyKey, (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("SORTED", "HASHED")), "KEY", (0, combi_1.altPrio)((0, combi_1.seq)(_1.Field, (0, combi_1.opt)(alias), "COMPONENTS", components), components))), (0, combi_1.optPrio)(further), (0, combi_1.optPrio)("READ-ONLY"));
         return key;
     }
 }
@@ -10923,7 +10950,7 @@ const _1 = __webpack_require__(/*! . */ "../core/build/src/abap/2_statements/exp
 const version_1 = __webpack_require__(/*! ../../../version */ "../core/build/src/version.js");
 class ValueBody extends combi_1.Expression {
     getRunnable() {
-        const strucOrTab = (0, combi_1.seq)((0, combi_1.optPrio)(_1.Let), (0, combi_1.optPrio)(_1.ValueBase), (0, combi_1.star)(_1.For), (0, combi_1.plusPrio)((0, combi_1.altPrio)(_1.FieldAssignment, _1.ValueBodyLine)));
+        const strucOrTab = (0, combi_1.seq)((0, combi_1.optPrio)(_1.Let), (0, combi_1.optPrio)(_1.ValueBase), (0, combi_1.starPrio)(_1.For), (0, combi_1.plusPrio)((0, combi_1.altPrio)(_1.FieldAssignment, _1.ValueBodyLine)));
         const tabdef = (0, combi_1.ver)(version_1.Release.v740sp08, (0, combi_1.altPrio)("OPTIONAL", (0, combi_1.seq)("DEFAULT", _1.Source)), { also: combi_1.AlsoIn.OpenABAP });
         return (0, combi_1.optPrio)((0, combi_1.altPrio)(strucOrTab, (0, combi_1.seq)(_1.Source, (0, combi_1.optPrio)(tabdef))));
     }
@@ -29264,6 +29291,15 @@ class ComponentChain {
             if (i === 0 && child.concatTokens().toUpperCase() === "TABLE_LINE") {
                 continue;
             }
+            else if (child.get() instanceof Expressions.Dereference) {
+                if (!(context instanceof basic_1.DataReference)) {
+                    const message = "Not a data reference, cannot be dereferenced";
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, child.getFirstToken(), message));
+                    return void_type_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
+                context = context.getType();
+                continue;
+            }
             else if (child.get() instanceof Expressions.ArrowOrDash) {
                 const concat = child.concatTokens();
                 if (concat === "-") {
@@ -47722,6 +47758,105 @@ exports.ArtifactsABAP = ArtifactsABAP;
 
 /***/ },
 
+/***/ "../core/build/src/abap/cross_include_macros.js"
+/*!******************************************************!*\
+  !*** ../core/build/src/abap/cross_include_macros.js ***!
+  \******************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CrossIncludeMacros = void 0;
+const _abap_object_1 = __webpack_require__(/*! ../objects/_abap_object */ "../core/build/src/objects/_abap_object.js");
+const program_1 = __webpack_require__(/*! ../objects/program */ "../core/build/src/objects/program.js");
+const _statement_1 = __webpack_require__(/*! ./2_statements/statements/_statement */ "../core/build/src/abap/2_statements/statements/_statement.js");
+const expand_macros_1 = __webpack_require__(/*! ./2_statements/expand_macros */ "../core/build/src/abap/2_statements/expand_macros.js");
+const include_graph_1 = __webpack_require__(/*! ../utils/include_graph */ "../core/build/src/utils/include_graph.js");
+// 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
+
+/***/ },
+
 /***/ "../core/build/src/abap/nodes/_abstract_node.js"
 /*!******************************************************!*\
   !*** ../core/build/src/abap/nodes/_abstract_node.js ***!
@@ -52562,8 +52697,9 @@ var Mode;
 (function (Mode) {
     Mode[Mode["Default"] = 0] = "Default";
     Mode[Mode["String"] = 1] = "String";
-    Mode[Mode["SingleLineComment"] = 2] = "SingleLineComment";
-    Mode[Mode["MultiLineComment"] = 3] = "MultiLineComment";
+    Mode[Mode["DoubleQuoteString"] = 2] = "DoubleQuoteString";
+    Mode[Mode["SingleLineComment"] = 3] = "SingleLineComment";
+    Mode[Mode["MultiLineComment"] = 4] = "MultiLineComment";
 })(Mode || (Mode = {}));
 class Result {
     constructor() {
@@ -52623,6 +52759,23 @@ class CDSLexer {
                 }
                 continue;
             }
+            // double-quote string handling
+            if (mode === Mode.DoubleQuoteString) {
+                build += next;
+                if (next === "\\" && nextNext === "\"") {
+                    build += stream.takeNext();
+                    col++;
+                }
+                else if (next === "\"" && nextNext === "\"") {
+                    build += stream.takeNext();
+                    col++;
+                }
+                else if (next === "\"") {
+                    build = result.add(build, row, col, mode);
+                    mode = Mode.Default;
+                }
+                continue;
+            }
             // single line comment handling
             if (mode === Mode.SingleLineComment) {
                 if (next === "\n") {
@@ -52669,6 +52822,11 @@ class CDSLexer {
                     mode = Mode.String;
                     build += next;
                     break;
+                case "\"":
+                    build = result.add(build, row, col, mode);
+                    mode = Mode.DoubleQuoteString;
+                    build += next;
+                    break;
                 case " ":
                 case "\t":
                     build = result.add(build, row, col, mode);
@@ -53083,7 +53241,9 @@ class CDSAs extends combi_1.Expression {
     getRunnable() {
         const redirected = (0, combi_1.seq)(": REDIRECTED TO", (0, combi_1.optPrio)((0, combi_1.altPrio)("PARENT", "COMPOSITION CHILD")), _1.CDSName);
         const colonType = (0, combi_1.seq)(":", (0, combi_1.altPrio)(_1.CDSType, _1.CDSName, "LOCALIZED"));
-        return (0, combi_1.seq)("AS", _1.CDSName, (0, combi_1.optPrio)((0, combi_1.altPrio)(redirected, colonType)));
+        const ident = (0, combi_1.regex)(/^\w+$/);
+        const namespacedAlias = (0, combi_1.seq)(ident, "/", ident, "/", ident);
+        return (0, combi_1.seq)("AS", (0, combi_1.altPrio)(namespacedAlias, _1.CDSName), (0, combi_1.optPrio)((0, combi_1.altPrio)(redirected, colonType)));
     }
 }
 exports.CDSAs = CDSAs;
@@ -53117,8 +53277,9 @@ class CDSAssociation extends combi_1.Expression {
         // Numeric OF form: "association of [0..1] to Target on ..."
         const ofNumericForm = (0, combi_1.seq)("ASSOCIATION", "OF", numericCardinality, "TO", _1.CDSRelation, "ON", _1.CDSCondition);
         // "association [0..1] to Target as _Alias on condition" — standard form
+        const parentForm = (0, combi_1.seq)("ASSOCIATION", "TO", "PARENT", _1.CDSRelation);
         const standardForm = (0, combi_1.seq)("ASSOCIATION", (0, combi_1.optPrio)(cds_cardinality_1.CDSCardinality), "TO", (0, combi_1.opt)((0, combi_1.altPrio)(textCardinality, "PARENT")), _1.CDSRelation, "ON", _1.CDSCondition, (0, combi_1.opt)((0, combi_1.seq)("WITH", "DEFAULT", "FILTER", _1.CDSCondition)));
-        return (0, combi_1.altPrio)(ofTextForm, ofNumericForm, standardForm);
+        return (0, combi_1.altPrio)(ofTextForm, ofNumericForm, standardForm, parentForm);
     }
 }
 exports.CDSAssociation = CDSAssociation;
@@ -53375,11 +53536,9 @@ class CDSDefineHierarchy extends combi_1.Expression {
         const directory = (0, combi_1.seq)("DIRECTORY", _1.CDSName, "FILTER", "BY", _1.CDSCondition);
         // DATE PERIOD: period from <field> to <field> [valid from :p to :p]
         const datePeriod = (0, combi_1.seq)("PERIOD", "FROM", _1.CDSName, "TO", _1.CDSName, (0, combi_1.opt)((0, combi_1.seq)("VALID", "FROM", _1.CDSPrefixedName, "TO", _1.CDSPrefixedName)));
-        // DEPTH accepts an integer literal or a parameter reference (:param)
-        const depthValue = (0, combi_1.altPrio)(_1.CDSInteger, _1.CDSPrefixedName);
-        // LOAD mode: BULK, INCREMENTAL, or a parameter reference ($parameters.p_load)
+        const depthValue = (0, combi_1.altPrio)(_1.CDSString, _1.CDSInteger, _1.CDSPrefixedName);
         const loadMode = (0, combi_1.altPrio)("BULK", "INCREMENTAL", _1.CDSPrefixedName);
-        const hierarchyBody = (0, combi_1.seq)("SOURCE", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), "CHILD", "TO", "PARENT", "ASSOCIATION", _1.CDSName, (0, combi_1.opt)(directory), (0, combi_1.opt)(datePeriod), (0, combi_1.opt)((0, combi_1.seq)("START", "WHERE", _1.CDSCondition)), (0, combi_1.opt)(siblingsOrder), (0, combi_1.opt)((0, combi_1.seq)("LOAD", loadMode)), (0, combi_1.opt)((0, combi_1.seq)("NODETYPE", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("DEPTH", depthValue)), (0, combi_1.opt)((0, combi_1.seq)("MULTIPLE", "PARENTS", (0, combi_1.altPrio)("NOT ALLOWED", "ALLOWED", (0, combi_1.seq)("LEAVES", (0, combi_1.optPrio)("ONLY"))))), (0, combi_1.opt)((0, combi_1.seq)("ORPHANS", (0, combi_1.altPrio)("IGNORE", "ROOT", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("CYCLES", (0, combi_1.altPrio)("BREAKUP", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("GENERATE", "SPANTREE")), (0, combi_1.opt)((0, combi_1.seq)("CACHE", (0, combi_1.altPrio)("ON", "OFF", "FORCE"))));
+        const hierarchyBody = (0, combi_1.seq)("SOURCE", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), "CHILD", "TO", "PARENT", "ASSOCIATION", _1.CDSName, (0, combi_1.opt)(directory), (0, combi_1.opt)(datePeriod), (0, combi_1.opt)((0, combi_1.seq)("START", "WHERE", _1.CDSCondition)), (0, combi_1.opt)(siblingsOrder), (0, combi_1.opt)((0, combi_1.seq)("LOAD", loadMode)), (0, combi_1.opt)((0, combi_1.seq)("DEPTH", depthValue)), (0, combi_1.opt)((0, combi_1.seq)("NODETYPE", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("MULTIPLE", "PARENTS", (0, combi_1.altPrio)("NOT ALLOWED", "ALLOWED", (0, combi_1.seq)("LEAVES", (0, combi_1.optPrio)("ONLY"))))), (0, combi_1.opt)((0, combi_1.seq)("ORPHANS", (0, combi_1.altPrio)("IGNORE", "ROOT", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("CYCLES", (0, combi_1.altPrio)("BREAKUP", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("GENERATE", "SPANTREE")), (0, combi_1.opt)((0, combi_1.seq)("CACHE", (0, combi_1.altPrio)("ON", "OFF", "FORCE"))));
         return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", "HIERARCHY", _1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), "AS", "PARENT", "CHILD", "HIERARCHY", "(", hierarchyBody, ")", "{", (0, combi_1.seq)(field, (0, combi_1.star)((0, combi_1.seq)(",", field))), "}", (0, combi_1.opt)(";"));
     }
 }
@@ -53427,10 +53586,10 @@ const _1 = __webpack_require__(/*! . */ "../core/build/src/cds/expressions/index
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
 class CDSDefineTableEntity extends combi_1.Expression {
     getRunnable() {
-        const nullability = (0, combi_1.optPrio)((0, combi_1.alt)("NOT NULL", "NULL"));
-        const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.str)("KEY")), _1.CDSName, ":", _1.CDSType, nullability, ";");
-        const assocOrComp = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), _1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
-        const inlineBody = (0, combi_1.plus)((0, combi_1.alt)(field, assocOrComp));
+        // Inline `{ ... }` body: one or more table-field entries. Each entry is
+        // wrapped in a CDSTableField node so downstream tooling can pair each
+        // field name with its own annotations.
+        const inlineBody = (0, combi_1.plus)(_1.CDSTableField);
         const elementList = (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(","));
         const elements = (0, combi_1.seq)((0, combi_1.str)("{"), (0, combi_1.altPrio)("*", elementList), (0, combi_1.str)("}"));
         const selectBody = (0, combi_1.seq)("AS", "SELECT", "FROM", _1.CDSSource, (0, combi_1.star)(_1.CDSJoin), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSComposition, _1.CDSAssociation)), (0, combi_1.opt)(elements), (0, combi_1.optPrio)(_1.CDSWhere));
@@ -53485,8 +53644,10 @@ const cds_with_parameters_1 = __webpack_require__(/*! ./cds_with_parameters */ "
 class CDSDefineView extends combi_1.Expression {
     getRunnable() {
         const columnAlias = (0, combi_1.seq)("(", cds_name_1.CDSName, (0, combi_1.star)((0, combi_1.seq)(",", cds_name_1.CDSName)), ")");
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), (0, combi_1.opt)("WRITABLE"), "VIEW", (0, combi_1.ver)(__1.Release.v755, (0, combi_1.opt)("ENTITY")), cds_name_1.CDSName, (0, combi_1.opt)(columnAlias), (0, combi_1.opt)(cds_with_parameters_1.CDSWithParameters), "AS", cds_select_1.CDSSelect, (0, combi_1.opt)((0, combi_1.seq)("WITH", "HIERARCHY", cds_name_1.CDSName)), // post-select WITH HIERARCHY clause
-        (0, combi_1.opt)(";"));
+        const parenSelect = (0, combi_1.seq)("(", cds_select_1.CDSSelect, ")");
+        const unionBranch = (0, combi_1.altPrio)(parenSelect, cds_select_1.CDSSelect);
+        const topLevelSelect = (0, combi_1.altPrio)((0, combi_1.seq)(parenSelect, (0, combi_1.star)((0, combi_1.altPrio)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), unionBranch), (0, combi_1.seq)("EXCEPT", unionBranch), (0, combi_1.seq)("INTERSECT", unionBranch)))), cds_select_1.CDSSelect);
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), (0, combi_1.opt)("WRITABLE"), "VIEW", (0, combi_1.ver)(__1.Release.v755, (0, combi_1.opt)("ENTITY")), cds_name_1.CDSName, (0, combi_1.opt)(columnAlias), (0, combi_1.opt)(cds_with_parameters_1.CDSWithParameters), "AS", topLevelSelect, (0, combi_1.opt)((0, combi_1.seq)("WITH", "HIERARCHY", cds_name_1.CDSName)), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineView = CDSDefineView;
@@ -53513,9 +53674,13 @@ class CDSElement extends combi_1.Expression {
         const redirected = (0, combi_1.seq)(": REDIRECTED TO", (0, combi_1.optPrio)((0, combi_1.altPrio)("PARENT", "COMPOSITION CHILD")), _1.CDSName);
         const colonThing = (0, combi_1.seq)(":", (0, combi_1.altPrio)(_1.CDSType, _1.CDSName, "LOCALIZED"));
         const extensionWildcard = (0, combi_1.seq)("$extension", ".", "*");
-        const includeElement = (0, combi_1.seq)("INCLUDE", _1.CDSPrefixedName);
+        const excludingNames = (0, combi_1.seq)(_1.CDSName, (0, combi_1.starPrio)((0, combi_1.seq)(",", _1.CDSName)));
+        const excluding = (0, combi_1.seq)("EXCLUDING", "{", excludingNames, "}");
+        const includeElement = (0, combi_1.seq)("INCLUDE", _1.CDSPrefixedName, (0, combi_1.optPrio)(excluding), (0, combi_1.optPrio)("SIGNATURE ONLY"));
         const typedVirtual = (0, combi_1.seq)("VIRTUAL", _1.CDSName, ":", _1.CDSType);
-        const body = (0, combi_1.altPrio)(extensionWildcard, includeElement, _1.CDSArithmetics, _1.CDSAggregate, _1.CDSString, _1.CDSArithParen, _1.CDSFunction, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)("(", _1.CDSCase, ")"), (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.optPrio)(cds_as_1.CDSAs), (0, combi_1.optPrio)((0, combi_1.altPrio)(redirected, colonThing))), _1.CDSInteger);
+        const pathSegment = (0, combi_1.seq)(".", (0, combi_1.altPrio)(_1.CDSString, _1.CDSName, "*"), (0, combi_1.optPrio)((0, combi_1.altPrio)(_1.CDSParametersSelect, _1.CDSParameters)));
+        const funcWithPath = (0, combi_1.seq)(_1.CDSFunction, (0, combi_1.plusPrio)(pathSegment));
+        const body = (0, combi_1.altPrio)(extensionWildcard, includeElement, _1.CDSArithmetics, _1.CDSAggregate, _1.CDSString, _1.CDSArithParen, funcWithPath, _1.CDSFunction, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)("(", _1.CDSCase, ")"), (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.optPrio)(cds_as_1.CDSAs), (0, combi_1.optPrio)((0, combi_1.altPrio)(redirected, colonThing))), _1.CDSInteger);
         const elementBody = (0, combi_1.altPrio)(typedVirtual, (0, combi_1.seq)((0, combi_1.altPrio)("KEY", "VIRTUAL"), body), body);
         return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), elementBody, (0, combi_1.optPrio)(cds_as_1.CDSAs));
     }
@@ -53542,7 +53707,9 @@ class CDSExtendView extends combi_1.Expression {
         const namedot = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", _1.CDSName)), (0, combi_1.optPrio)(_1.CDSAs));
         const valueNested = (0, combi_1.seq)("{", namedot, (0, combi_1.star)((0, combi_1.seq)(",", namedot)), "}");
         const redefineAssoc = (0, combi_1.seq)("REDEFINE", "ASSOCIATION", _1.CDSPrefixedName, (0, combi_1.optPrio)((0, combi_1.seq)("[", _1.CDSCondition, "]")), (0, combi_1.opt)(_1.CDSAs), "REDIRECTED", "TO", (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)("COMPOSITION", "CHILD"), "PARENT")), _1.CDSName);
-        const extendView = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("EXTEND VIEW"), (0, combi_1.opt)((0, combi_1.str)("ENTITY")), _1.CDSName, (0, combi_1.str)("WITH"), (0, combi_1.opt)(_1.CDSName), (0, combi_1.star)(redefineAssoc), valueNested, (0, combi_1.opt)(";"));
+        const elementList = (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(","));
+        const elementNested = (0, combi_1.seq)("{", (0, combi_1.altPrio)("*", elementList), "}");
+        const extendView = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("EXTEND VIEW"), (0, combi_1.opt)((0, combi_1.str)("ENTITY")), _1.CDSName, (0, combi_1.str)("WITH"), (0, combi_1.opt)(_1.CDSName), (0, combi_1.star)(redefineAssoc), (0, combi_1.star)(_1.CDSAssociation), (0, combi_1.altPrio)(elementNested, valueNested), (0, combi_1.opt)(";"));
         const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.str)("KEY")), _1.CDSName, ":", _1.CDSType, ";");
         const assocOrComp = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), _1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
         const entityBody = (0, combi_1.seq)("{", (0, combi_1.plus)((0, combi_1.alt)(field, assocOrComp)), "}");
@@ -53832,7 +53999,9 @@ class CDSParametersSelect extends combi_1.Expression {
     getRunnable() {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
         const value = (0, combi_1.alt)(_1.CDSInteger, name, _1.CDSString);
-        const nameValue = (0, combi_1.seq)(name, ":", value);
+        const colonPair = (0, combi_1.seq)(name, ":", value, (0, combi_1.optPrio)("DEFAULT"));
+        const arrowPair = (0, combi_1.seq)(name, "=", ">", value);
+        const nameValue = (0, combi_1.altPrio)(colonPair, arrowPair);
         return (0, combi_1.seq)("(", nameValue, (0, combi_1.star)((0, combi_1.seq)(",", nameValue)), ")");
     }
 }
@@ -53866,13 +54035,13 @@ class CDSPrefixedName extends combi_1.Expression {
         const cardinalityJoin = (0, combi_1.seq)("[", cardSpec, ":", joinType, "]");
         const cardinalityJoinWhere = (0, combi_1.seq)("[", cardSpec, ":", joinType, "WHERE", cds_condition_1.CDSCondition, "]");
         const joinWhere = (0, combi_1.seq)("[", joinType, "WHERE", cds_condition_1.CDSCondition, "]");
-        const textCard = (0, combi_1.altPrio)("TO EXACT ONE", "TO ONE", "TO MANY");
+        const textCard = (0, combi_1.altPrio)("MANY TO EXACT ONE", "MANY TO ONE", "ONE TO MANY", "ONE TO ONE", "TO EXACT ONE", "TO ONE", "TO MANY");
         const textCardFilter = (0, combi_1.seq)("[", textCard, (0, combi_1.optPrio)((0, combi_1.seq)(":", (0, combi_1.altPrio)((0, combi_1.seq)(joinType, "WHERE", cds_condition_1.CDSCondition), joinType, cds_condition_1.CDSCondition))), "]");
         const cardNum = (0, combi_1.altPrio)(cds_integer_1.CDSInteger, "*");
         const rangeCard = (0, combi_1.seq)(cds_integer_1.CDSInteger, ".", ".", cardNum);
         const rangeCardFilter = (0, combi_1.seq)("[", rangeCard, ":", cds_condition_1.CDSCondition, "]");
         const pathFilter = (0, combi_1.altPrio)(cardinalityJoinWhere, joinWhere, cardinalityJoin, joinRedirect, textCardFilter, rangeCardFilter, (0, combi_1.seq)("[", cardSpec, ":", cds_condition_1.CDSCondition, "]"), (0, combi_1.seq)("[", cds_condition_1.CDSCondition, "]"));
-        const segment = (0, combi_1.seq)(".", (0, combi_1.altPrio)(cds_string_1.CDSString, cds_name_1.CDSName), (0, combi_1.optPrio)((0, combi_1.altPrio)(cds_parameters_select_1.CDSParametersSelect, cds_parameters_1.CDSParameters)), (0, combi_1.optPrio)(pathFilter));
+        const segment = (0, combi_1.seq)(".", (0, combi_1.altPrio)(cds_string_1.CDSString, cds_name_1.CDSName, "*"), (0, combi_1.optPrio)((0, combi_1.altPrio)(cds_parameters_select_1.CDSParametersSelect, cds_parameters_1.CDSParameters)), (0, combi_1.optPrio)(pathFilter));
         return (0, combi_1.seq)(cds_name_1.CDSName, (0, combi_1.optPrio)((0, combi_1.altPrio)(cds_parameters_1.CDSParameters, cds_parameters_select_1.CDSParametersSelect)), (0, combi_1.optPrio)(pathFilter), (0, combi_1.star)(segment));
     }
 }
@@ -53917,7 +54086,7 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../cor
 class CDSRelation extends combi_1.Expression {
     getRunnable() {
         const pre = (0, combi_1.seq)("/", (0, combi_1.regex)(/^[\w_]+$/), "/");
-        return (0, combi_1.seq)((0, combi_1.opt)(pre), (0, combi_1.regex)(/^[\w_]+$/), (0, combi_1.opt)(_1.CDSAs));
+        return (0, combi_1.seq)((0, combi_1.opt)(pre), (0, combi_1.regex)(/^[\w_]+$/), (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs));
     }
 }
 exports.CDSRelation = CDSRelation;
@@ -53945,11 +54114,12 @@ class CDSSelect extends combi_1.Expression {
         const distinct = (0, combi_1.str)("DISTINCT");
         const elementList = (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(","));
         const elements = (0, combi_1.seq)((0, combi_1.str)("{"), (0, combi_1.altPrio)("*", elementList), (0, combi_1.str)("}"));
-        const aspectBinding = (0, combi_1.seq)(_1.CDSPrefixedName, "=", ">", _1.CDSPrefixedName);
-        const bindAspect = (0, combi_1.seq)("BIND", "ASPECT", _1.CDSName, "(", aspectBinding, (0, combi_1.starPrio)((0, combi_1.seq)(",", aspectBinding)), ")");
+        const aspectValue = (0, combi_1.altPrio)(_1.CDSString, _1.CDSPrefixedName);
+        const aspectBinding = (0, combi_1.seq)(_1.CDSPrefixedName, "=", ">", aspectValue);
+        const bindAspect = (0, combi_1.seq)("BIND", "ASPECT", _1.CDSName, "(", aspectBinding, (0, combi_1.starPrio)((0, combi_1.seq)(",", aspectBinding)), ")", (0, combi_1.optPrio)((0, combi_1.seq)("AS", _1.CDSName)));
         const parenSelect = (0, combi_1.seq)("(", CDSSelect, ")");
         const unionBranch = (0, combi_1.altPrio)(parenSelect, CDSSelect);
-        return (0, combi_1.seq)("SELECT", (0, combi_1.optPrio)(distinct), (0, combi_1.opt)((0, combi_1.altPrio)("*", fields)), "FROM", _1.CDSSource, (0, combi_1.star)(cds_join_1.CDSJoin), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSComposition, cds_association_1.CDSAssociation)), (0, combi_1.optPrio)(bindAspect), (0, combi_1.opt)(elements), (0, combi_1.optPrio)(_1.CDSWhere), (0, combi_1.optPrio)(_1.CDSGroupBy), (0, combi_1.optPrio)(_1.CDSHaving), (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)("UNION", (0, combi_1.optPrio)("ALL"), unionBranch), (0, combi_1.seq)("EXCEPT", unionBranch), (0, combi_1.seq)("INTERSECT", unionBranch))));
+        return (0, combi_1.seq)("SELECT", (0, combi_1.optPrio)(distinct), (0, combi_1.opt)((0, combi_1.altPrio)("*", fields)), "FROM", _1.CDSSource, (0, combi_1.star)(cds_join_1.CDSJoin), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSComposition, cds_association_1.CDSAssociation)), (0, combi_1.starPrio)(bindAspect), (0, combi_1.opt)(elements), (0, combi_1.optPrio)(_1.CDSWhere), (0, combi_1.optPrio)(_1.CDSGroupBy), (0, combi_1.optPrio)(_1.CDSHaving), (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)("UNION", (0, combi_1.optPrio)("ALL"), unionBranch), (0, combi_1.seq)("EXCEPT", unionBranch), (0, combi_1.seq)("INTERSECT", unionBranch))));
     }
 }
 exports.CDSSelect = CDSSelect;
@@ -53972,10 +54142,7 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../cor
 class CDSSource extends combi_1.Expression {
     getRunnable() {
         const staticFilter = (0, combi_1.seq)("[", _1.CDSCondition, "]");
-        // Dotted path: T._Assoc — association path as FROM source
-        const dottedName = (0, combi_1.seq)(_1.CDSName, ".", _1.CDSName);
-        const namedSource = (0, combi_1.altPrio)(dottedName, _1.CDSName);
-        const singleSource = (0, combi_1.seq)(namedSource, (0, combi_1.optPrio)(_1.CDSParametersSelect), (0, combi_1.optPrio)(staticFilter), (0, combi_1.opt)((0, combi_1.altPrio)(_1.CDSAs, _1.CDSName)));
+        const singleSource = (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.optPrio)(_1.CDSParametersSelect), (0, combi_1.optPrio)(staticFilter), (0, combi_1.opt)((0, combi_1.altPrio)(_1.CDSAs, _1.CDSName)));
         const funcSingleSource = (0, combi_1.seq)(_1.CDSFunction, (0, combi_1.opt)((0, combi_1.altPrio)(_1.CDSAs, _1.CDSName)));
         const parenSource = (0, combi_1.seq)("(", (0, combi_1.altPrio)(CDSSource, singleSource), (0, combi_1.star)(_1.CDSJoin), ")");
         return (0, combi_1.altPrio)(parenSource, funcSingleSource, singleSource);
@@ -53999,8 +54166,8 @@ exports.CDSString = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
 class CDSString extends combi_1.Expression {
     getRunnable() {
-        const reg = (0, combi_1.regex)(/^'(?:[^'\\]|''|\\'|\\\\|\\(?!'))*'$/);
-        const abapTypeName = (0, combi_1.regex)(/^(?:int[1-9]|int8|sstring|char|numc|dats|datn|tims|timn|utcl|utclong|fltp|decfloat\d+|dec|string|rawstring|rstr|raw|xstring|clnt|lang|unit|cuky|curr|quan|geom_ewkb|d34n|d16n|d34d|d16d|d34s|d16s|d34r|d16r|d|t|p|n|c|x|f)$/i);
+        const reg = (0, combi_1.regex)(/^(?:'(?:[^'\\]|''|\\'|\\\\|\\(?!'))*'|"(?:[^"\\]|""|\\"|\\\\|\\(?!"))*")$/);
+        const abapTypeName = (0, combi_1.regex)(/^(?:int[1-9]|int8|sstring|sstr|char|numc|dats|datn|tims|timn|utcl|utclong|fltp|decfloat\d+|dec|string|rawstring|rstr|raw|xstring|clnt|lang|unit|cuky|curr|quan|geom_ewkb|d34n|d16n|d34d|d16d|d34s|d16s|d34r|d16r|d|t|p|n|c|x|f)$/i);
         const abap = (0, combi_1.seq)("abap", ".", abapTypeName, (0, combi_1.optPrio)((0, combi_1.seq)("(", (0, combi_1.regex)(/^\d+$/), ")")), reg);
         return (0, combi_1.altPrio)(abap, reg);
     }
@@ -54010,6 +54177,35 @@ exports.CDSString = CDSString;
 
 /***/ },
 
+/***/ "../core/build/src/cds/expressions/cds_table_field.js"
+/*!************************************************************!*\
+  !*** ../core/build/src/cds/expressions/cds_table_field.js ***!
+  \************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CDSTableField = void 0;
+const _1 = __webpack_require__(/*! . */ "../core/build/src/cds/expressions/index.js");
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+// A single field or association/composition inside a `define table entity { ... }`
+// inline body. Wraps annotations + name + type together so tooling can iterate
+// per-field with associated field-level annotations (matches the CDSElement
+// shape used for select-list elements).
+class CDSTableField extends combi_1.Expression {
+    getRunnable() {
+        const nullability = (0, combi_1.optPrio)((0, combi_1.alt)("NOT NULL", "NULL"));
+        const field = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.str)("KEY")), _1.CDSName, ":", _1.CDSType, nullability);
+        const assocOrComp = (0, combi_1.seq)(_1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.alt)(field, assocOrComp), ";");
+    }
+}
+exports.CDSTableField = CDSTableField;
+//# sourceMappingURL=cds_table_field.js.map
+
+/***/ },
+
 /***/ "../core/build/src/cds/expressions/cds_type.js"
 /*!*****************************************************!*\
   !*** ../core/build/src/cds/expressions/cds_type.js ***!
@@ -54141,6 +54337,7 @@ __exportStar(__webpack_require__(/*! ./cds_relation */ "../core/build/src/cds/ex
 __exportStar(__webpack_require__(/*! ./cds_select */ "../core/build/src/cds/expressions/cds_select.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_source */ "../core/build/src/cds/expressions/cds_source.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_string */ "../core/build/src/cds/expressions/cds_string.js"), exports);
+__exportStar(__webpack_require__(/*! ./cds_table_field */ "../core/build/src/cds/expressions/cds_table_field.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_type */ "../core/build/src/cds/expressions/cds_type.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_where */ "../core/build/src/cds/expressions/cds_where.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_with_parameters */ "../core/build/src/cds/expressions/cds_with_parameters.js"), exports);
@@ -68404,6 +68601,7 @@ const ddic_references_1 = __webpack_require__(/*! ./ddic_references */ "../core/
 const rules_runner_1 = __webpack_require__(/*! ./rules_runner */ "../core/build/src/rules_runner.js");
 const msag_references_1 = __webpack_require__(/*! ./msag_references */ "../core/build/src/msag_references.js");
 const macro_references_1 = __webpack_require__(/*! ./macro_references */ "../core/build/src/macro_references.js");
+const cross_include_macros_1 = __webpack_require__(/*! ./abap/cross_include_macros */ "../core/build/src/abap/cross_include_macros.js");
 // todo, this should really be an instance in case there are multiple Registry'ies
 class ParsingPerformance {
     static clear() {
@@ -68469,7 +68667,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.55";
+        return "2.119.57";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -68693,6 +68891,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;
     }
@@ -68710,6 +68909,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/cli",
-    "version": "2.119.55",
+    "version": "2.119.57",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -39,7 +39,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.119.55",
+        "@abaplint/core": "^2.119.57",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",