@abaplint/transpiler-cli 2.13.37 → 2.13.39

package/build/bundle.js

@@ -445,6 +445,37 @@ const ModeStr = 3;
 const ModeTemplate = 4;
 const ModeComment = 5;
 const ModePragma = 6;
+// character codes, used for integer comparisons in the hot loop
+const EOF = -1; // no character (start/end of file)
+const CH_TAB = 9; // "\t"
+const CH_NL = 10; // "\n"
+const CH_SPACE = 32; // " "
+const CH_DQUOTE = 34; // "\""
+const CH_HASH = 35; // "#"
+const CH_QUOTE = 39; // "'"
+const CH_STAR = 42; // "*"
+const CH_DASH = 45; // "-"
+const CH_COMMA = 44; // ","
+const CH_DOT = 46; // "."
+const CH_COLON = 58; // ":"
+const CH_EQUALS = 61; // "="
+const CH_GT = 62; // ">"
+const CH_AT = 64; // "@"
+const CH_BACKSLASH = 92; // "\\"
+const CH_BACKTICK = 96; // "`"
+const CH_LBRACE = 123; // "{"
+const CH_PIPE = 124; // "|"
+const CH_RBRACE = 125; // "}"
+// characters that terminate the current token
+const SPLITS = new Set([
+    CH_SPACE, CH_COLON, CH_DOT, CH_COMMA, CH_DASH, 43 /* + */, 40 /* ( */,
+    41 /* ) */, 91 /* [ */, 93 /* ] */, CH_BACKSLASH, CH_TAB, CH_NL
+]);
+// single characters that are emitted as their own token
+const BUFS = new Set([
+    CH_DOT, CH_COMMA, CH_COLON, 40 /* ( */, 41 /* ) */, 91 /* [ */,
+    93 /* ] */, 43 /* + */, CH_AT
+]);
 class Lexer {
     run(file, virtual) {
         this.virtual = virtual;
@@ -459,15 +490,17 @@ class Lexer {
             const col = this.stream.getCol();
             const row = this.stream.getRow();
             let whiteBefore = false;
-            if (this.stream.getOffset() - s.length >= 0) {
-                const prev = this.stream.getRaw().substr(this.stream.getOffset() - s.length, 1);
-                if (prev === " " || prev === "\n" || prev === "\t" || prev === ":") {
+            const beforeOffset = this.stream.getOffset() - s.length;
+            if (beforeOffset >= 0) {
+                const prev = this.stream.charCodeAt(beforeOffset);
+                if (prev === CH_SPACE || prev === CH_NL || prev === CH_TAB || prev === CH_COLON) {
                     whiteBefore = true;
                 }
             }
             let whiteAfter = false;
             const next = this.stream.nextChar();
-            if (next === " " || next === "\n" || next === "\t" || next === ":" || next === "," || next === "." || next === "" || next === "\"") {
+            if (next === CH_SPACE || next === CH_NL || next === CH_TAB || next === CH_COLON
+                || next === CH_COMMA || next === CH_DOT || next === EOF || next === CH_DQUOTE) {
                 whiteAfter = true;
             }
             let pos = new position_1.Position(row, col - s.length);
@@ -637,10 +670,10 @@ class Lexer {
                 }
             }
             if (tok === undefined && this.m === ModeNormal && s.charAt(0) === "\\") {
-                const adj = this.stream.nextChar() === "" ? 1 : 0;
+                const adj = this.stream.nextChar() === EOF ? 1 : 0;
                 const prevOffset = this.stream.getOffset() - s.length - adj;
-                const prevChar = prevOffset >= 0 ? this.stream.getRaw().substr(prevOffset, 1) : "";
-                const whiteBeforeBackslash = prevChar === " " || prevChar === "\n" || prevChar === "\t" || prevChar === ":";
+                const prevChar = this.stream.charCodeAt(prevOffset);
+                const whiteBeforeBackslash = prevChar === CH_SPACE || prevChar === CH_NL || prevChar === CH_TAB || prevChar === CH_COLON;
                 if (!whiteBeforeBackslash) {
                     tok = new tokens_1.AssociationName(pos, s);
                 }
@@ -653,100 +686,77 @@ class Lexer {
         this.buffer.clear();
     }
     process(raw) {
-        this.stream = new lexer_stream_1.LexerStream(raw.replace(/\r/g, ""));
-        this.buffer = new lexer_buffer_1.LexerBuffer();
-        const splits = {};
-        splits[" "] = true;
-        splits[":"] = true;
-        splits["."] = true;
-        splits[","] = true;
-        splits["-"] = true;
-        splits["+"] = true;
-        splits["("] = true;
-        splits[")"] = true;
-        splits["["] = true;
-        splits["]"] = true;
-        splits["\\"] = true;
-        splits["\t"] = true;
-        splits["\n"] = true;
-        const bufs = {};
-        bufs["."] = true;
-        bufs[","] = true;
-        bufs[":"] = true;
-        bufs["("] = true;
-        bufs[")"] = true;
-        bufs["["] = true;
-        bufs["]"] = true;
-        bufs["+"] = true;
-        bufs["@"] = true;
+        const stream = new lexer_stream_1.LexerStream(raw.replace(/\r/g, ""));
+        this.stream = stream;
+        this.buffer = new lexer_buffer_1.LexerBuffer(stream.getRaw());
         for (;;) {
-            const current = this.stream.currentChar();
-            const buf = this.buffer.add(current);
-            const ahead = this.stream.nextChar();
-            const aahead = this.stream.nextNextChar();
+            const current = stream.currentChar();
+            this.buffer.add(stream.getOffset());
+            const ahead = stream.nextChar();
+            const aahead = stream.nextNextChar();
             if (this.m === ModeNormal) {
-                if (splits[ahead]) {
+                if (SPLITS.has(ahead)) {
                     this.add();
                 }
-                else if (ahead === "'") {
+                else if (ahead === CH_QUOTE) {
                     // start string
                     this.add();
                     this.m = ModeStr;
                 }
-                else if (ahead === "|" || ahead === "}") {
+                else if (ahead === CH_PIPE || ahead === CH_RBRACE) {
                     // start template
                     this.add();
                     this.m = ModeTemplate;
                 }
-                else if (ahead === "`") {
+                else if (ahead === CH_BACKTICK) {
                     // start ping
                     this.add();
                     this.m = ModePing;
                 }
-                else if (aahead === "##") {
+                else if (ahead === CH_HASH && aahead === CH_HASH) {
                     // start pragma
                     this.add();
                     this.m = ModePragma;
                 }
-                else if (ahead === "\""
-                    || (ahead === "*" && current === "\n")) {
+                else if (ahead === CH_DQUOTE
+                    || (ahead === CH_STAR && current === CH_NL)) {
                     // start comment
                     this.add();
                     this.m = ModeComment;
                 }
-                else if (ahead === "@" && buf.trim().length === 0) {
+                else if (ahead === CH_AT && this.buffer.get().trim().length === 0) {
                     this.add();
                 }
-                else if (aahead === "->"
-                    || aahead === "=>") {
+                else if ((ahead === CH_DASH || ahead === CH_EQUALS) && aahead === CH_GT) {
                     this.add();
                 }
-                else if (current === ">"
-                    && ahead !== " "
-                    && (this.stream.prevChar() === "-" || this.stream.prevChar() === "=")) {
+                else if (current === CH_GT
+                    && ahead !== CH_SPACE
+                    && (stream.prevChar() === CH_DASH || stream.prevChar() === CH_EQUALS)) {
                     // arrows
                     this.add();
                 }
-                else if (buf.length === 1
-                    && (bufs[buf]
-                        || (buf === "-" && ahead !== ">"))) {
+                else if (this.buffer.length() === 1
+                    && (BUFS.has(current)
+                        || (current === CH_DASH && ahead !== CH_GT))) {
                     this.add();
                 }
             }
-            else if (this.m === ModePragma && (ahead === "," || ahead === ":" || ahead === "." || ahead === " " || ahead === "\n")) {
+            else if (this.m === ModePragma && (ahead === CH_COMMA || ahead === CH_COLON
+                || ahead === CH_DOT || ahead === CH_SPACE || ahead === CH_NL)) {
                 // end of pragma
                 this.add();
                 this.m = ModeNormal;
             }
             else if (this.m === ModePing
-                && buf.length > 1
-                && current === "`"
-                && aahead !== "``"
-                && ahead !== "`"
-                && this.buffer.countIsEven("`")) {
+                && this.buffer.length() > 1
+                && current === CH_BACKTICK
+                && !(ahead === CH_BACKTICK && aahead === CH_BACKTICK)
+                && ahead !== CH_BACKTICK
+                && this.buffer.countIsEven(CH_BACKTICK)) {
                 // end of ping
                 this.add();
-                if (ahead === `"`) {
+                if (ahead === CH_DQUOTE) {
                     this.m = ModeComment;
                 }
                 else {
@@ -754,41 +764,41 @@ class Lexer {
                 }
             }
             else if (this.m === ModeTemplate
-                && buf.length > 1
-                && (current === "|" || current === "{")
-                && (this.stream.prevChar() !== "\\" || this.stream.prevPrevChar() === "\\\\")) {
+                && this.buffer.length() > 1
+                && (current === CH_PIPE || current === CH_LBRACE)
+                && (stream.prevChar() !== CH_BACKSLASH || (stream.prevPrevChar() === CH_BACKSLASH && stream.prevChar() === CH_BACKSLASH))) {
                 // end of template
                 this.add();
                 this.m = ModeNormal;
             }
             else if (this.m === ModeTemplate
-                && ahead === "}"
-                && current !== "\\") {
+                && ahead === CH_RBRACE
+                && current !== CH_BACKSLASH) {
                 this.add();
             }
             else if (this.m === ModeStr
-                && current === "'"
-                && buf.length > 1
-                && aahead !== "''"
-                && ahead !== "'"
-                && this.buffer.countIsEven("'")) {
+                && current === CH_QUOTE
+                && this.buffer.length() > 1
+                && !(ahead === CH_QUOTE && aahead === CH_QUOTE)
+                && ahead !== CH_QUOTE
+                && this.buffer.countIsEven(CH_QUOTE)) {
                 // end of string
                 this.add();
-                if (ahead === "\"") {
+                if (ahead === CH_DQUOTE) {
                     this.m = ModeComment;
                 }
                 else {
                     this.m = ModeNormal;
                 }
             }
-            else if (ahead === "\n" && this.m !== ModeTemplate) {
+            else if (ahead === CH_NL && this.m !== ModeTemplate) {
                 this.add();
                 this.m = ModeNormal;
             }
-            else if (this.m === ModeTemplate && current === "\n") {
+            else if (this.m === ModeTemplate && current === CH_NL) {
                 this.add();
             }
-            if (!this.stream.advance()) {
+            if (!stream.advance()) {
                 break;
             }
         }
@@ -810,24 +820,38 @@ exports.Lexer = Lexer;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.LexerBuffer = void 0;
+// The buffer holds a reference to the raw input and tracks the [start, end)
+// offset range of the current token, so the token string can be sliced out with
+// a single substring() instead of being concatenated one character at a time.
 class LexerBuffer {
-    constructor() {
-        this.buf = "";
+    constructor(raw) {
+        this.raw = raw;
+        this.start = 0;
+        this.end = 0;
+        this.empty = true;
     }
-    add(s) {
-        this.buf = this.buf + s;
-        return this.buf;
+    add(offset) {
+        if (this.empty === true) {
+            this.start = offset < 0 ? 0 : offset;
+            this.empty = false;
+        }
+        this.end = offset + 1;
     }
     get() {
-        return this.buf;
+        return this.raw.substring(this.start, this.end);
+    }
+    length() {
+        return this.end - this.start;
     }
     clear() {
-        this.buf = "";
+        this.start = 0;
+        this.end = 0;
+        this.empty = true;
     }
     countIsEven(char) {
         let count = 0;
-        for (let i = 0; i < this.buf.length; i += 1) {
-            if (this.buf.charAt(i) === char) {
+        for (let i = this.start; i < this.end; i += 1) {
+            if (this.raw.charCodeAt(i) === char) {
                 count += 1;
             }
         }
@@ -849,6 +873,8 @@ exports.LexerBuffer = LexerBuffer;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.LexerStream = void 0;
+const NL = 10; // "\n"
+const EOF = -1; // no character (start/end of file)
 class LexerStream {
     constructor(raw) {
         this.offset = -1;
@@ -857,7 +883,7 @@ class LexerStream {
         this.col = 0;
     }
     advance() {
-        if (this.currentChar() === "\n") {
+        if (this.currentChar() === NL) {
             this.col = 1;
             this.row = this.row + 1;
         }
@@ -875,38 +901,51 @@ class LexerStream {
     getRow() {
         return this.row;
     }
+    // the *Char() accessors return character codes (charCodeAt) rather than
+    // single character strings, to avoid allocating a string per input character
+    // in the lexer hot loop. EOF (-1) is returned when the offset is out of range.
     prevChar() {
-        if (this.offset - 1 < 0) {
-            return "";
+        const o = this.offset - 1;
+        if (o < 0) {
+            return EOF;
         }
-        return this.raw.substr(this.offset - 1, 1);
+        return this.raw.charCodeAt(o);
     }
     prevPrevChar() {
-        if (this.offset - 2 < 0) {
-            return "";
+        const o = this.offset - 2;
+        if (o < 0) {
+            return EOF;
         }
-        return this.raw.substr(this.offset - 2, 2);
+        return this.raw.charCodeAt(o);
     }
     currentChar() {
         if (this.offset < 0) {
-            return "\n"; // simulate newline at start of file to handle star(*) comments
+            return NL; // simulate newline at start of file to handle star(*) comments
         }
         else if (this.offset >= this.raw.length) {
-            return "";
+            return EOF;
         }
-        return this.raw.substr(this.offset, 1);
+        return this.raw.charCodeAt(this.offset);
     }
     nextChar() {
-        if (this.offset + 2 > this.raw.length) {
-            return "";
+        const o = this.offset + 1;
+        if (o >= this.raw.length) {
+            return EOF;
         }
-        return this.raw.substr(this.offset + 1, 1);
+        return this.raw.charCodeAt(o);
     }
     nextNextChar() {
-        if (this.offset + 3 > this.raw.length) {
-            return this.nextChar();
+        const o = this.offset + 2;
+        if (o >= this.raw.length) {
+            return EOF;
+        }
+        return this.raw.charCodeAt(o);
+    }
+    charCodeAt(o) {
+        if (o < 0 || o >= this.raw.length) {
+            return EOF;
         }
-        return this.raw.substr(this.offset + 1, 2);
+        return this.raw.charCodeAt(o);
     }
     getRaw() {
         return this.raw;
@@ -2234,6 +2273,7 @@ exports.verNotLang = verNotLang;
 exports.failCombinator = failCombinator;
 exports.failStar = failStar;
 exports.stopBefore = stopBefore;
+exports.stopBefore1 = stopBefore1;
 const Tokens = __importStar(__webpack_require__(/*! ../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js"));
 const nodes_1 = __webpack_require__(/*! ../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
 const version_1 = __webpack_require__(/*! ../../version */ "./node_modules/@abaplint/core/build/src/version.js");
@@ -2303,8 +2343,9 @@ class Word {
     }
 }
 class Token {
-    constructor(s) {
-        this.name = s;
+    constructor(t) {
+        this.tokenType = t;
+        this.name = t.name;
     }
     listKeywords() {
         return [];
@@ -2316,7 +2357,7 @@ class Token {
         const result = [];
         for (const input of r) {
             if (input.remainingLength() !== 0
-                && input.peek().constructor.name === this.name) {
+                && input.peek().constructor === this.tokenType) {
                 result.push(input.shift(new nodes_1.TokenNode(input.peek())));
             }
         }
@@ -2512,7 +2553,12 @@ class Optional {
         for (const input of r) {
             result.push(input);
             const res = this.optional.run([input]);
-            result.push(...res);
+            if (res.length === 1) {
+                result.push(res[0]);
+            }
+            else {
+                result.push(...res);
+            }
         }
         return result;
     }
@@ -2551,6 +2597,9 @@ class Star {
                     // avoid stack overflow
                     result = result.concat(res);
                 }
+                else if (res.length === 1) {
+                    result.push(res[0]);
+                }
                 else {
                     result.push(...res);
                 }
@@ -2702,6 +2751,9 @@ class Sequence {
                     // avoid stack overflow
                     result = result.concat(temp);
                 }
+                else if (temp.length === 1) {
+                    result.push(temp[0]);
+                }
                 else {
                     result.push(...temp);
                 }
@@ -2767,24 +2819,14 @@ class Expression {
         for (const input of r) {
             const temp = this.runnable.run([input]);
             for (const t of temp) {
-                let consumed = input.remainingLength() - t.remainingLength();
+                const consumed = input.remainingLength() - t.remainingLength();
                 if (consumed > 0) {
-                    const originalLength = t.getNodes().length;
-                    const children = [];
-                    while (consumed > 0) {
-                        const sub = t.popNode();
-                        if (sub) {
-                            children.push(sub);
-                            consumed = consumed - sub.countTokens();
-                        }
-                    }
                     const re = new nodes_1.ExpressionNode(this);
-                    re.setChildren(children.reverse());
-                    const n = t.getNodes().slice(0, originalLength - consumed);
-                    n.push(re);
-                    t.setNodes(n);
+                    results.push(t.wrapConsumed(consumed, re));
+                }
+                else {
+                    results.push(t);
                 }
-                results.push(t);
             }
         }
         //    console.dir(results);
@@ -2926,7 +2968,12 @@ class Alternative {
         const result = [];
         for (const sequ of this.list) {
             const temp = sequ.run(r);
-            result.push(...temp);
+            if (temp.length === 1) {
+                result.push(temp[0]);
+            }
+            else {
+                result.push(...temp);
+            }
         }
         return result;
     }
@@ -2984,7 +3031,12 @@ class AlternativePriority {
             //      console.log(seq.toStr());
             const temp = sequ.run(r);
             if (temp.length > 0) {
-                result.push(...temp);
+                if (temp.length === 1) {
+                    result.push(temp[0]);
+                }
+                else {
+                    result.push(...temp);
+                }
                 break;
             }
         }
@@ -3100,7 +3152,7 @@ function regex(r) {
     return new Regex(r);
 }
 function tok(t) {
-    return new Token(t.name);
+    return new Token(t);
 }
 const expressionSingletons = {};
 const stringSingletons = {};
@@ -3214,6 +3266,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
 
 /***/ },
@@ -4243,8 +4318,8 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/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;
     }
 }
@@ -7186,7 +7261,7 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/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;
@@ -11277,10 +11352,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;
     }
 }
@@ -11349,7 +11424,7 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/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))));
     }
@@ -11478,11 +11553,17 @@ class Result {
         // nodes: matched tokens
         this.tokens = tokens;
         this.tokenIndex = tokenIndex;
-        this.nodes = nodes;
-        if (this.nodes === undefined) {
-            this.nodes = [];
+        this.nodeCount = 0;
+        if (nodes !== undefined) {
+            this.setNodes(nodes);
         }
     }
+    static fromChain(tokens, tokenIndex, nodes, nodeCount) {
+        const ret = new Result(tokens, tokenIndex);
+        ret.nodes = nodes;
+        ret.nodeCount = nodeCount;
+        return ret;
+    }
     peek() {
         return this.tokens[this.tokenIndex];
     }
@@ -11490,18 +11571,54 @@ class Result {
         return this.tokens[this.tokenIndex + offset];
     }
     shift(node) {
-        const cp = this.nodes.slice();
-        cp.push(node);
-        return new Result(this.tokens, this.tokenIndex + 1, cp);
+        return Result.fromChain(this.tokens, this.tokenIndex + 1, { node, previous: this.nodes }, this.nodeCount + 1);
+    }
+    wrapConsumed(consumedTokens, node) {
+        let current = this.nodes;
+        let currentCount = this.nodeCount;
+        const children = [];
+        while (consumedTokens > 0) {
+            if (current === undefined) {
+                break;
+            }
+            children.push(current.node);
+            consumedTokens = consumedTokens - current.node.countTokens();
+            current = current.previous;
+            currentCount--;
+        }
+        node.setChildren(children.reverse());
+        this.nodes = { node, previous: current };
+        this.nodeCount = currentCount + 1;
+        return this;
     }
     popNode() {
-        return this.nodes.pop();
+        if (this.nodes === undefined) {
+            return undefined;
+        }
+        const ret = this.nodes.node;
+        this.nodes = this.nodes.previous;
+        this.nodeCount--;
+        return ret;
     }
     getNodes() {
-        return this.nodes;
+        const ret = new Array(this.nodeCount);
+        let current = this.nodes;
+        for (let index = this.nodeCount - 1; index >= 0; index--) {
+            if (current === undefined) {
+                break;
+            }
+            ret[index] = current.node;
+            current = current.previous;
+        }
+        return ret;
     }
     setNodes(n) {
-        this.nodes = n;
+        this.nodes = undefined;
+        this.nodeCount = 0;
+        for (const node of n) {
+            this.nodes = { node, previous: this.nodes };
+            this.nodeCount++;
+        }
     }
     getTokens() {
         return this.tokens;
@@ -11573,6 +11690,7 @@ const expand_macros_1 = __webpack_require__(/*! ./expand_macros */ "./node_modul
 const tokens_1 = __webpack_require__(/*! ../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 const _select_reclassify_1 = __webpack_require__(/*! ./_select_reclassify */ "./node_modules/@abaplint/core/build/src/abap/2_statements/_select_reclassify.js");
 exports.STATEMENT_MAX_TOKENS = 20000;
+const EMPTY_PRAGMAS = Object.freeze([]);
 class StatementMap {
     constructor() {
         this.map = {};
@@ -11765,15 +11883,27 @@ class StatementParser {
                 statement = input;
             }
             else if (length === 1 && lastToken instanceof tokens_1.Pragma) {
-                statement = new nodes_1.StatementNode(new _statement_1.Empty(), undefined, [lastToken]);
+                // special case, everything crashes if StatementNodes doesnt have children
+                statement = new nodes_1.StatementNode(new _statement_1.Empty(), undefined, [lastToken])
+                    .setChildren(this.tokensToNodes([lastToken]));
             }
         }
         return statement;
     }
     removePragma(tokens) {
+        let hasPragma = false;
+        // skip the last token as it is the punctuation
+        for (let i = 0; i < tokens.length - 1; i++) {
+            if (tokens[i] instanceof Tokens.Pragma) {
+                hasPragma = true;
+                break;
+            }
+        }
+        if (hasPragma === false) {
+            return { tokens: tokens.slice(0, tokens.length - 1), pragmas: EMPTY_PRAGMAS };
+        }
         const result = [];
         const pragmas = [];
-        // skip the last token as it is the punctuation
         for (let i = 0; i < tokens.length - 1; i++) {
             const t = tokens[i];
             if (t instanceof Tokens.Pragma) {
@@ -20144,7 +20274,7 @@ class TypeMesh {
         const on = (0, combi_1.seq)("ON", expressions_1.NamespaceSimpleName, "=", expressions_1.NamespaceSimpleName, (0, combi_1.star)((0, combi_1.seq)("AND", expressions_1.NamespaceSimpleName, "=", expressions_1.NamespaceSimpleName)));
         const using = (0, combi_1.seq)("USING KEY", expressions_1.NamespaceSimpleName);
         const association = (0, combi_1.seq)("ASSOCIATION", expressions_1.NamespaceSimpleName, "TO", expressions_1.NamespaceSimpleName, (0, combi_1.plus)(on));
-        const ret = (0, combi_1.ver)(version_1.Release.v751, (0, combi_1.seq)("TYPES", expressions_1.NamespaceSimpleName, "TYPE", (0, combi_1.opt)("REF TO"), expressions_1.TypeName, (0, combi_1.plus)(association), (0, combi_1.opt)(using)));
+        const ret = (0, combi_1.ver)(version_1.Release.v740sp05, (0, combi_1.seq)("TYPES", expressions_1.NamespaceSimpleName, "TYPE", (0, combi_1.opt)("REF TO"), expressions_1.TypeName, (0, combi_1.plus)(association), (0, combi_1.opt)(using)));
         return ret;
     }
 }
@@ -25147,16 +25277,20 @@ class BuiltIn {
         return def.predicate;
     }
     getTypes() {
-        const ret = this.buildSY();
-        {
-            const id = new tokens_1.Identifier(new position_1.Position(1, 1), "abap_bool");
-            ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, new basic_1.CharacterType(1, { qualifiedName: "ABAP_BOOL", ddicName: "ABAP_BOOL" })));
-        }
-        {
-            const id = new tokens_1.Identifier(new position_1.Position(1, 1), "cursor");
-            ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, basic_1.IntegerType.get({ qualifiedName: "CURSOR", ddicName: "CURSOR" })));
+        // the identifiers are identical for every object, share them to reduce memory usage
+        if (BuiltIn.typesCache === undefined) {
+            const ret = this.buildSY();
+            {
+                const id = new tokens_1.Identifier(new position_1.Position(1, 1), "abap_bool");
+                ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, new basic_1.CharacterType(1, { qualifiedName: "ABAP_BOOL", ddicName: "ABAP_BOOL" })));
+            }
+            {
+                const id = new tokens_1.Identifier(new position_1.Position(1, 1), "cursor");
+                ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, basic_1.IntegerType.get({ qualifiedName: "CURSOR", ddicName: "CURSOR" })));
+            }
+            BuiltIn.typesCache = ret;
         }
-        return ret;
+        return BuiltIn.typesCache;
     }
     get(extras) {
         const ret = [];
@@ -25189,10 +25323,17 @@ class BuiltIn {
             BuiltIn.getCache.push(this.buildConstant("space", new basic_1.CharacterType(1, { derivedFromConstant: true }), "' '"));
         }
         ret.push(...BuiltIn.getCache);
-        for (const e of extras) {
-            const id = new tokens_1.Identifier(new position_1.Position(this.row++, 1), e);
-            ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, basic_1.VoidType.get(e), ["read_only" /* IdentifierMeta.ReadOnly */, "built-in" /* IdentifierMeta.BuiltIn */], "'?'"));
+        // the extras are identical for every object, share them to reduce memory usage
+        const key = extras.join("|");
+        if (key !== BuiltIn.extrasCacheKey) {
+            BuiltIn.extrasCacheKey = key;
+            BuiltIn.extrasCache = [];
+            for (const e of extras) {
+                const id = new tokens_1.Identifier(new position_1.Position(this.row++, 1), e);
+                BuiltIn.extrasCache.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, basic_1.VoidType.get(e), ["read_only" /* IdentifierMeta.ReadOnly */, "built-in" /* IdentifierMeta.BuiltIn */], "'?'"));
+            }
         }
+        ret.push(...BuiltIn.extrasCache);
         return ret;
     }
     /////////////////////////////
@@ -25401,6 +25542,9 @@ exports.BuiltIn = BuiltIn;
 BuiltIn.filename = "_builtin.prog.abap";
 BuiltIn.counter = 1;
 BuiltIn.getCache = [];
+BuiltIn.typesCache = undefined;
+BuiltIn.extrasCacheKey = undefined;
+BuiltIn.extrasCache = [];
 // todo: "pcre" vs "regex", only one of these parameters are allowed
 // todo: "pcre", only possible from 755
 BuiltIn.methods = {
@@ -26532,7 +26676,7 @@ class CurrentScope {
     }
     findTypePoolConstant(name) {
         var _a;
-        if (name === undefined || name.includes("_") === undefined) {
+        if (name === undefined || name.includes("_") === false) {
             return undefined;
         }
         const typePoolName = name.split("_")[0];
@@ -26554,7 +26698,7 @@ class CurrentScope {
     }
     findTypePoolType(name) {
         var _a;
-        if (name.includes("_") === undefined) {
+        if (name.includes("_") === false) {
             return undefined;
         }
         const typePoolName = name.split("_")[0];
@@ -26868,11 +27012,9 @@ class ObjectOriented {
     findMethodInInterface(interfaceName, methodName) {
         const idef = this.scope.findInterfaceDefinition(interfaceName);
         if (idef) {
-            const methods = idef.getMethodDefinitions().getAll();
-            for (const method of methods) {
-                if (method.getName().toUpperCase() === methodName.toUpperCase()) {
-                    return { method, def: idef };
-                }
+            const method = idef.getMethodDefinitions().getByName(methodName);
+            if (method) {
+                return { method, def: idef };
             }
             return this.findMethodViaAlias(methodName, idef);
         }
@@ -27094,17 +27236,14 @@ class ObjectOriented {
         if (defs === undefined) {
             return undefined;
         }
-        for (const method of defs.getAll()) {
-            if (method.getName().toUpperCase() === methodName.toUpperCase()) {
-                if (method.isRedefinition()) {
-                    return this.findMethodInSuper(def, methodName);
-                }
-                else {
-                    return method;
-                }
-            }
+        const method = defs.getByName(methodName);
+        if (method === undefined) {
+            return undefined;
         }
-        return undefined;
+        if (method.isRedefinition()) {
+            return this.findMethodInSuper(def, methodName);
+        }
+        return method;
     }
     findMethodInSuper(child, methodName) {
         let sup = child.getSuperClass();
@@ -29690,6 +29829,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 === "-") {
@@ -34465,6 +34613,9 @@ class Source {
         if (context instanceof basic_1.FloatType && found instanceof basic_1.IntegerType) {
             return context;
         }
+        else if (context instanceof basic_1.IntegerType && found instanceof basic_1.HexType) {
+            return context;
+        }
         else if ((context instanceof basic_1.IntegerType || context instanceof basic_1.FloatType) && (found === null || found === void 0 ? void 0 : found.isGeneric())) {
             return context;
         }
@@ -39259,18 +39410,25 @@ class DeleteInternal {
         let targetType = undefined;
         const target = node.findDirectExpression(Expressions.Target);
         if (target) {
+            const targetName = target.concatTokens();
             let tabl = undefined;
-            const localVariable = input.scope.findVariable(target.concatTokens());
+            const localVariable = input.scope.findVariable(targetName);
             if (localVariable === undefined && node.getChildren().length === 5 && node.getChildren()[2].concatTokens().toUpperCase() === "FROM") {
                 // it might be a database table
-                const found = (_a = input.scope.getDDIC()) === null || _a === void 0 ? void 0 : _a.lookupTableOrView(target.concatTokens());
+                const found = (_a = input.scope.getDDIC()) === null || _a === void 0 ? void 0 : _a.lookupTableOrView(targetName);
                 if ((found === null || found === void 0 ? void 0 : found.object) !== undefined) {
                     tabl = found;
                     input.scope.getDDICReferences().addUsing(input.scope.getParentObj(), { object: tabl.object });
                 }
             }
             if (tabl === undefined) {
-                targetType = target_1.Target.runSyntax(target, input);
+                const ambigiousVoids = input.scope.getRegistry().getConfig().getSyntaxSetttings().ambigiousVoids || [];
+                if (ambigiousVoids.some(name => name.toUpperCase() === targetName.toUpperCase())) {
+                    targetType = basic_1.VoidType.get(targetName);
+                }
+                else {
+                    targetType = target_1.Target.runSyntax(target, input);
+                }
                 if (node.findDirectTokenByText("TABLE") === undefined
                     && node.findDirectTokenByText("ADJACENT") === undefined
                     && (node.findDirectTokenByText("FROM") || node.findDirectTokenByText("INDEX"))
@@ -48257,15 +48415,21 @@ exports.CrossIncludeMacros = CrossIncludeMacros;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AbstractNode = void 0;
+// shared constant, so nodes without children don't waste memory on empty arrays
+const EMPTY = Object.freeze([]);
 class AbstractNode {
     constructor() {
-        this.children = [];
+        this.children = EMPTY;
     }
     addChild(n) {
+        if (this.children === EMPTY) {
+            this.children = [];
+        }
         this.children.push(n);
     }
     setChildren(children) {
-        this.children = children;
+        // copy, input arrays are built via push() and carry over-allocated backing stores
+        this.children = children.slice();
     }
     getChildren() {
         return this.children;
@@ -48298,6 +48462,7 @@ const _abstract_node_1 = __webpack_require__(/*! ./_abstract_node */ "./node_mod
 class ExpressionNode extends _abstract_node_1.AbstractNode {
     constructor(expression) {
         super();
+        this.tokenCount = 0;
         this.expression = expression;
     }
     addChild(_n) {
@@ -48306,12 +48471,15 @@ class ExpressionNode extends _abstract_node_1.AbstractNode {
     get() {
         return this.expression;
     }
-    countTokens() {
-        let ret = 0;
-        for (const c of this.getChildren()) {
-            ret = ret + c.countTokens();
+    setChildren(children) {
+        super.setChildren(children);
+        for (const child of this.getChildren()) {
+            this.tokenCount = this.tokenCount + child.countTokens();
         }
-        return ret;
+        return this;
+    }
+    countTokens() {
+        return this.tokenCount;
     }
     getFirstToken() {
         for (const child of this.getChildren()) {
@@ -48621,17 +48789,13 @@ const string_template_middle_1 = __webpack_require__(/*! ../1_lexer/tokens/strin
 const string_template_end_1 = __webpack_require__(/*! ../1_lexer/tokens/string_template_end */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/string_template_end.js");
 const string_template_begin_1 = __webpack_require__(/*! ../1_lexer/tokens/string_template_begin */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/string_template_begin.js");
 const string_template_1 = __webpack_require__(/*! ../1_lexer/tokens/string_template */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/string_template.js");
+const EMPTY_PRAGMAS = Object.freeze([]);
 class StatementNode extends _abstract_node_1.AbstractNode {
     constructor(statement, colon, pragmas) {
         super();
         this.statement = statement;
         this.colon = colon;
-        if (pragmas) {
-            this.pragmas = pragmas;
-        }
-        else {
-            this.pragmas = [];
-        }
+        this.pragmas = pragmas !== null && pragmas !== void 0 ? pragmas : EMPTY_PRAGMAS;
     }
     get() {
         return this.statement;
@@ -48646,7 +48810,7 @@ class StatementNode extends _abstract_node_1.AbstractNode {
         if (children.length === 0) {
             throw new Error("statement: zero children");
         }
-        this.children = children;
+        super.setChildren(children);
         return this;
     }
     getStart() {
@@ -49227,6 +49391,7 @@ exports.StructureNode = StructureNode;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TokenNode = void 0;
+const EMPTY_CHILDREN = Object.freeze([]);
 class TokenNode {
     constructor(token) {
         this.token = token;
@@ -49238,7 +49403,7 @@ class TokenNode {
         throw new Error("TokenNode, Method not implemented.");
     }
     getChildren() {
-        return [];
+        return EMPTY_CHILDREN;
     }
     concatTokens() {
         return this.token.getStr();
@@ -50952,6 +51117,8 @@ class Attributes {
         this.tlist = [];
         this.filename = input.filename;
         this.parse(node, input);
+        this.all = this.static.concat(this.instance);
+        this.byName = this.buildByName();
         this.types = new type_definitions_1.TypeDefinitions(this.tlist);
     }
     getTypes() {
@@ -50964,10 +51131,7 @@ class Attributes {
         return this.aliases;
     }
     getAll() {
-        let res = [];
-        res = res.concat(this.static);
-        res = res.concat(this.instance);
-        return res;
+        return this.all;
     }
     getStaticsByVisibility(visibility) {
         const attributes = [];
@@ -51002,27 +51166,29 @@ class Attributes {
         }
         return attributes;
     }
-    // todo, optimize
     findByName(name) {
-        const upper = name.toUpperCase();
-        for (const a of this.getStatic()) {
-            if (a.getName().toUpperCase() === upper) {
-                return a;
-            }
+        return this.byName[name.toUpperCase()];
+    }
+    /////////////////////////////
+    buildByName() {
+        const ret = {};
+        for (const a of this.static) {
+            ret[a.getName().toUpperCase()] = a;
         }
-        for (const a of this.getInstance()) {
-            if (a.getName().toUpperCase() === upper) {
-                return a;
+        for (const a of this.instance) {
+            const name = a.getName().toUpperCase();
+            if (ret[name] === undefined) {
+                ret[name] = a;
             }
         }
-        for (const a of this.getConstants()) {
-            if (a.getName().toUpperCase() === upper) {
-                return a;
+        for (const a of this.constants) {
+            const name = a.getName().toUpperCase();
+            if (ret[name] === undefined) {
+                ret[name] = a;
             }
         }
-        return undefined;
+        return ret;
     }
-    /////////////////////////////
     parse(node, input) {
         var _a, _b;
         const cdef = node.findDirectStructure(Structures.ClassDefinition);
@@ -51317,6 +51483,7 @@ class ClassDefinition extends _identifier_1.Identifier {
         // perform checks after everything has been initialized
         this.checkMethodsFromSuperClasses(input);
         this.checkMethodNameLength(input);
+        this.checkClassConstructorStatic(input);
     }
     getFriends() {
         return this.friends;
@@ -51380,6 +51547,13 @@ class ClassDefinition extends _identifier_1.Identifier {
             }
         }
     }
+    checkClassConstructorStatic(input) {
+        for (const m of this.methodDefs.getAll()) {
+            if (m.getName().toUpperCase() === "CLASS_CONSTRUCTOR" && m.isStatic() === false) {
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, m.getToken(), "CLASS_CONSTRUCTOR must be static"));
+            }
+        }
+    }
     checkMethodsFromSuperClasses(input) {
         var _a;
         const scope = input.scope;
@@ -53087,8 +53261,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() {
@@ -53148,6 +53323,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") {
@@ -53194,6 +53386,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);
@@ -53608,7 +53805,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;
@@ -53642,8 +53841,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;
@@ -53900,11 +54100,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)(";"));
     }
 }
@@ -53952,10 +54150,10 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/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));
@@ -53983,7 +54181,7 @@ const cds_name_1 = __webpack_require__(/*! ./cds_name */ "./node_modules/@abapli
 class CDSDefineTableFunction extends combi_1.Expression {
     getRunnable() {
         const methodName = (0, combi_1.seq)(cds_name_1.CDSName, "=", ">", cds_name_1.CDSName);
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE TABLE FUNCTION"), cds_name_1.CDSName, (0, combi_1.optPrio)(_1.CDSWithParameters), (0, combi_1.str)("RETURNS {"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), cds_name_1.CDSName, ":", _1.CDSType, ";")), (0, combi_1.str)("} IMPLEMENTED BY METHOD"), methodName, (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE TABLE FUNCTION"), cds_name_1.CDSName, (0, combi_1.optPrio)(_1.CDSWithParameters), (0, combi_1.str)("RETURNS {"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), cds_name_1.CDSName, ":", _1.CDSType, (0, combi_1.star)(_1.CDSAnnotation), ";")), (0, combi_1.str)("} IMPLEMENTED BY METHOD"), methodName, (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineTableFunction = CDSDefineTableFunction;
@@ -54010,8 +54208,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;
@@ -54038,11 +54238,15 @@ 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));
+        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), elementBody, (0, combi_1.optPrio)(cds_as_1.CDSAs), (0, combi_1.starPrio)(_1.CDSAnnotation));
     }
 }
 exports.CDSElement = CDSElement;
@@ -54067,7 +54271,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)), "}");
@@ -54309,7 +54515,7 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node
 class CDSName extends combi_1.Expression {
     getRunnable() {
         const pre = (0, combi_1.seq)("/", (0, combi_1.regex)(/^[\w_]+$/), "/");
-        return (0, combi_1.seq)((0, combi_1.optPrio)(":"), (0, combi_1.optPrio)(pre), (0, combi_1.regex)(/^\$?#?[\w_]+$/));
+        return (0, combi_1.altPrio)((0, combi_1.regex)(/^"(?:[^"]|"")*"$/), (0, combi_1.seq)((0, combi_1.optPrio)(":"), (0, combi_1.optPrio)(pre), (0, combi_1.regex)(/^\$?#?[\w_]+$/)));
     }
 }
 exports.CDSName = CDSName;
@@ -54357,7 +54563,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)), ")");
     }
 }
@@ -54391,13 +54599,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));
     }
 }
@@ -54442,7 +54650,7 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node
 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;
@@ -54470,11 +54678,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;
@@ -54497,10 +54706,7 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node
 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);
@@ -54525,7 +54731,7 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node
 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 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);
     }
@@ -54535,6 +54741,35 @@ exports.CDSString = CDSString;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_table_field.js"
+/*!**********************************************************************************!*\
+  !*** ./node_modules/@abaplint/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__(/*! . */ "./node_modules/@abaplint/core/build/src/cds/expressions/index.js");
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/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
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_type.js"
 /*!***************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/cds/expressions/cds_type.js ***!
@@ -54666,6 +54901,7 @@ __exportStar(__webpack_require__(/*! ./cds_relation */ "./node_modules/@abaplint
 __exportStar(__webpack_require__(/*! ./cds_select */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_select.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_source */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_source.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_string */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_string.js"), exports);
+__exportStar(__webpack_require__(/*! ./cds_table_field */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_table_field.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_type */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_type.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_where */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_where.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_with_parameters */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_with_parameters.js"), exports);
@@ -54729,10 +54965,19 @@ class Config {
         for (const rule of sorted) {
             rules[rule.getMetadata().key] = rule.getConfig();
         }
-        const version = ver !== null && ver !== void 0 ? ver : {
-            release: version_1.Release.Newest.name,
-            language: langVer !== null && langVer !== void 0 ? langVer : version_1.LanguageVersion.Normal,
-        };
+        const version = langVer !== undefined
+            ? {
+                release: ver === undefined || ver === version_1.Version.Cloud
+                    ? version_1.Release.Newest.name
+                    : typeof ver === "string"
+                        ? (0, version_1.versionToABAPRelease)(ver).name
+                        : ver.release,
+                language: langVer,
+            }
+            : ver !== null && ver !== void 0 ? ver : {
+                release: version_1.Release.Newest.name,
+                language: version_1.LanguageVersion.Normal,
+            };
         // defaults: dont skip anything, report everything. The user can decide to skip stuff
         // its difficult to debug errors not being reported
         const config = {
@@ -54757,9 +55002,9 @@ class Config {
                 }],
             syntax: {
                 version,
-                languageVersion: langVer,
                 errorNamespace: "^(Z|Y|LCL\_|TY\_|LIF\_)",
                 globalConstants: [],
+                ambigiousVoids: [],
                 globalMacros: [],
             },
             rules: rules,
@@ -54810,6 +55055,12 @@ class Config {
             // remove duplicates,
             this.config.syntax.globalConstants = [...new Set(this.config.syntax.globalConstants)];
         }
+        if (this.config.syntax.ambigiousVoids === undefined) {
+            this.config.syntax.ambigiousVoids = [];
+        }
+        else {
+            this.config.syntax.ambigiousVoids = [...new Set(this.config.syntax.ambigiousVoids)];
+        }
         if (this.config.global.skipIncludesWithoutMain === undefined) {
             this.config.global.skipIncludesWithoutMain = false;
         }
@@ -54859,9 +55110,6 @@ class Config {
         return v;
     }
     getLanguageVersion() {
-        if (this.config.syntax.languageVersion !== undefined) {
-            return this.config.syntax.languageVersion;
-        }
         const v = this.config.syntax.version;
         if (v !== undefined && typeof v !== "string") {
             return v.language;
@@ -54886,7 +55134,10 @@ class Config {
             return;
         }
         if (version === version_1.Version.Cloud) {
-            this.config.syntax.languageVersion = version_1.LanguageVersion.Cloud;
+            this.config.syntax.version = {
+                release: version_1.Release.Newest.name,
+                language: version_1.LanguageVersion.Cloud,
+            };
         }
         // OpenABAP keeps its own version identity; open-abap-ness is derived from the
         // release in getOpenABAP() rather than a separate stored flag.
@@ -59814,6 +60065,7 @@ function parseDynpros(parsed) {
                 fields.push({
                     name: f.NAME,
                     type: f.TYPE,
+                    contType: f.CONT_TYPE,
                     length: parseNumber(f.LENGTH),
                     vislength: parseNumber(f.VISLENGTH),
                     line: parseNumber(f.LINE),
@@ -61701,9 +61953,8 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
             }
             if (found === undefined) {
                 // typed virtual element: VIRTUAL <name> : <type>
-                const names = e.findAllExpressions(expressions_1.CDSName);
-                if (e.findDirectTokenByText("VIRTUAL") !== undefined && names.length > 0) {
-                    found = names[0];
+                if (e.findDirectTokenByText("VIRTUAL") !== undefined) {
+                    found = e.findFirstExpression(expressions_1.CDSName);
                 }
             }
             if (found === undefined) {
@@ -68995,7 +69246,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.56";
+        return "2.119.64";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -71166,17 +71417,22 @@ class BeginEndNames extends _abap_rule_1.ABAPRule {
     test(stru, type, b, e, file) {
         const output = [];
         for (const sub of stru.findAllStructuresRecursive(type)) {
-            let begin = sub.findDirectStatements(b)[0].findFirstExpression(Expressions.NamespaceSimpleName);
+            const beginStatement = sub.findDirectStatement(b);
+            const endStatement = sub.findDirectStatement(e);
+            if (beginStatement === undefined || endStatement === undefined) {
+                continue;
+            }
+            let begin = beginStatement.findFirstExpression(Expressions.NamespaceSimpleName);
             if (begin === undefined) {
-                begin = sub.findDirectStatements(b)[0].findFirstExpression(Expressions.DefinitionName);
+                begin = beginStatement.findFirstExpression(Expressions.DefinitionName);
             }
             if (begin === undefined) {
                 continue;
             }
             const first = begin.getFirstToken();
-            let end = sub.findDirectStatements(e)[0].findFirstExpression(Expressions.NamespaceSimpleName);
+            let end = endStatement.findFirstExpression(Expressions.NamespaceSimpleName);
             if (end === undefined) {
-                end = sub.findDirectStatements(e)[0].findFirstExpression(Expressions.DefinitionName);
+                end = endStatement.findFirstExpression(Expressions.DefinitionName);
             }
             if (end === undefined) {
                 continue;
@@ -74655,6 +74911,7 @@ class DangerousStatementConf extends _basic_rule_config_1.BasicRuleConfig {
         this.insertTextpool = true;
         this.deleteDynpro = true;
         this.exportDynpro = true;
+        this.editorCallForReport = true;
         /** Finds instances of dynamic SQL: SELECT, UPDATE, DELETE, INSERT, MODIFY */
         this.dynamicSQL = true;
         /** Ignore dynamic SQL in IF_RAP_QUERY_PROVIDER~SELECT implementations */
@@ -74739,6 +74996,11 @@ dynamic SQL can potentially create SQL injection problems`,
             else if (this.conf.exportDynpro && statement instanceof Statements.ExportDynpro) {
                 message = "EXPORT DYNPRO";
             }
+            else if (this.conf.editorCallForReport
+                && statement instanceof Statements.EditorCall
+                && statementNode.findDirectTokenByText("REPORT")) {
+                message = "EDITOR-CALL FOR REPORT";
+            }
             if (message) {
                 issues.push(issue_1.Issue.atStatement(file, statementNode, this.getDescription(message), this.getMetadata().key, this.conf.severity));
             }
@@ -75740,6 +76002,7 @@ Make sure to test the downported code, it might not always be completely correct
         const lowConfig = this.lowReg.getConfig().get();
         highConfig.syntax.errorNamespace = lowConfig.syntax.errorNamespace;
         highConfig.syntax.globalConstants = lowConfig.syntax.globalConstants;
+        highConfig.syntax.ambigiousVoids = lowConfig.syntax.ambigiousVoids;
         highConfig.syntax.globalMacros = lowConfig.syntax.globalMacros;
         this.highReg = new registry_1.Registry();
         for (const o of this.lowReg.getObjects()) {
@@ -78381,7 +78644,7 @@ ${indentation}    output = ${uniqueName}.\n`;
                 }
             }
         }
-        if (fix === undefined && high.findAllExpressions(Expressions.NewObject)) {
+        if (fix === undefined) {
             const found = high.findFirstExpression(Expressions.NewObject);
             if (found === undefined) {
                 return undefined;
@@ -78555,12 +78818,13 @@ class DynproChecks {
         const ret = [];
         for (let index = 0; index < dynpro.fields.length; index++) {
             const current = dynpro.fields[index];
-            if (current.name === undefined || current.type === "FRAME") {
+            if (current.name === undefined || current.type === "FRAME" || this.hasContainerRelativeCoordinates(current)) {
                 continue;
             }
             for (let compare = index + 1; compare < dynpro.fields.length; compare++) {
                 const other = dynpro.fields[compare];
-                if (other.name === undefined || other.type === "FRAME" || this.overlaps(current, other) === false) {
+                if (other.name === undefined || other.type === "FRAME" || this.hasContainerRelativeCoordinates(other)
+                    || this.overlaps(current, other) === false) {
                     continue;
                 }
                 const message = `Screen ${dynpro.number}, ${current.type} ${current.name} and ${other.type} ${other.name} are overlapping`;
@@ -78569,6 +78833,9 @@ class DynproChecks {
         }
         return ret;
     }
+    hasContainerRelativeCoordinates(field) {
+        return field.contType === "TABLE_CTRL" || field.contType === "LOOP" || field.contType === "STRIP_CTRL";
+    }
     overlaps(first, second) {
         if (first.line === 0 || second.line === 0 || first.column === 0 || second.column === 0) {
             return false;
@@ -86018,7 +86285,6 @@ const Expressions = __importStar(__webpack_require__(/*! ../abap/2_statements/ex
 const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@abaplint/core/build/src/rules/_abap_rule.js");
 const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
 const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
-const tokens_1 = __webpack_require__(/*! ../abap/1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 const expressions_1 = __webpack_require__(/*! ../abap/2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
 class NamesNoDashConf extends _basic_rule_config_1.BasicRuleConfig {
@@ -86058,32 +86324,26 @@ class NamesNoDash extends _abap_rule_1.ABAPRule {
         if (obj.getType() !== "CLAS" && obj.getType() !== "INTF") {
             for (const form of struc.findAllStatements(Statements.Form)) {
                 const expr = form.findFirstExpression(expressions_1.FormName);
-                for (const token of expr.getTokens()) {
-                    if (token instanceof tokens_1.Dash || token instanceof tokens_1.DashW) {
-                        const issue = issue_1.Issue.atToken(file, token, this.getMessage(), this.getMetadata().key, this.conf.severity);
-                        issues.push(issue);
-                        break;
-                    }
+                const token = expr === null || expr === void 0 ? void 0 : expr.findDirectTokenByText("-");
+                if (token) {
+                    const issue = issue_1.Issue.atToken(file, token, this.getMessage(), this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
                 }
             }
             for (const form of struc.findAllStatements(Statements.Parameter)) {
                 const expr = form.findFirstExpression(Expressions.FieldSub);
-                for (const token of expr.getTokens()) {
-                    if (token instanceof tokens_1.Dash || token instanceof tokens_1.DashW) {
-                        const issue = issue_1.Issue.atToken(file, token, this.getMessage(), this.getMetadata().key, this.conf.severity);
-                        issues.push(issue);
-                        break;
-                    }
+                const token = expr === null || expr === void 0 ? void 0 : expr.findDirectTokenByText("-");
+                if (token) {
+                    const issue = issue_1.Issue.atToken(file, token, this.getMessage(), this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
                 }
             }
             for (const form of struc.findAllStatements(Statements.SelectOption)) {
                 const expr = form.findFirstExpression(Expressions.FieldSub);
-                for (const token of expr.getTokens()) {
-                    if (token instanceof tokens_1.Dash || token instanceof tokens_1.DashW) {
-                        const issue = issue_1.Issue.atToken(file, token, this.getMessage(), this.getMetadata().key, this.conf.severity);
-                        issues.push(issue);
-                        break;
-                    }
+                const token = expr === null || expr === void 0 ? void 0 : expr.findDirectTokenByText("-");
+                if (token) {
+                    const issue = issue_1.Issue.atToken(file, token, this.getMessage(), this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
                 }
             }
         }
@@ -88185,11 +88445,11 @@ ENDIF.`,
                     }
                 }
                 else {
-                    const classNameExpression = staNode.findAllExpressions(Expressions.ClassName);
-                    const methodNameExpression = staNode.findAllExpressions(Expressions.MethodName);
-                    if (classNameExpression.length !== 0 && methodNameExpression.length !== 0) {
-                        const className = classNameExpression[0].concatTokens();
-                        const methodName = methodNameExpression[0].concatTokens();
+                    const classNameExpression = staNode.findFirstExpression(Expressions.ClassName);
+                    const methodNameExpression = staNode.findFirstExpression(Expressions.MethodName);
+                    if (classNameExpression && methodNameExpression) {
+                        const className = classNameExpression.concatTokens();
+                        const methodName = methodNameExpression.concatTokens();
                         if (className === "cl_abap_regex") {
                             if (methodName === "create_posix") {
                                 const issue = issue_1.Issue.atStatement(file, staNode, "create_posix obsolete, use create_pcre", this.getMetadata().key, this.conf.severity);
@@ -92351,12 +92611,12 @@ class ShortCase extends _abap_rule_1.ABAPRule {
             return [];
         }
         for (const c of struc.findAllStructures(Structures.Case)) {
-            const clist = c.findDirectStatements(Statements.Case);
-            if (clist.length > 0 && this.conf.allow && this.conf.allow.find((e) => { return e === clist[0].getTokens()[1].getStr(); })) {
+            const caseStatement = c.findDirectStatement(Statements.Case);
+            if (caseStatement && this.conf.allow && this.conf.allow.find((e) => { return e === caseStatement.getTokens()[1].getStr(); })) {
                 continue;
             }
             if (c.findDirectStructures(Structures.When).length <= this.conf.length) {
-                if (c.findAllExpressions(Expressions.Or).length > 0) {
+                if (c.findFirstExpression(Expressions.Or)) {
                     continue;
                 }
                 const issue = issue_1.Issue.atToken(file, c.getFirstToken(), this.getMessage(), this.getMetadata().key, this.conf.severity);
@@ -94180,9 +94440,9 @@ class TryWithoutCatch extends _abap_rule_1.ABAPRule {
         }
         const tries = stru.findAllStructures(structures_1.Try);
         for (const t of tries) {
-            const clean = t.findDirectStructures(structures_1.Cleanup);
-            const c = t.findDirectStructures(structures_1.Catch);
-            if (c.length === 0 && clean.length === 0) {
+            const clean = t.findDirectStructure(structures_1.Cleanup);
+            const c = t.findDirectStructure(structures_1.Catch);
+            if (c === undefined && clean === undefined) {
                 const issue = issue_1.Issue.atToken(file, t.getFirstToken(), this.getMessage(), this.getMetadata().key, this.conf.severity);
                 issues.push(issue);
             }
@@ -95091,6 +95351,7 @@ const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./
 const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
 const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
+const tokens_1 = __webpack_require__(/*! ../abap/1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 class UnnecessaryPragmaConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -95159,6 +95420,17 @@ DATA: BEGIN OF blah ##NEEDED,
         for (let i = 0; i < statements.length; i++) {
             const statement = statements[i];
             const nextStatement = statements[i + 1];
+            if (statement.get() instanceof _statement_1.Empty
+                && statement.getChildren().length === 1) {
+                const tokens = statement.getTokens();
+                if (tokens.length === 1
+                    && tokens[0] instanceof tokens_1.Pragma) {
+                    const message = "Pragma without a statement can be removed";
+                    const fix = edit_helper_1.EditHelper.deleteToken(file, tokens[0]);
+                    issues.push(issue_1.Issue.atToken(file, tokens[0], message, this.getMetadata().key, this.conf.severity, fix));
+                    continue;
+                }
+            }
             if (statement.get() instanceof Statements.EndTry) {
                 noHandler = false;
             }
@@ -97872,9 +98144,11 @@ const include_graph_1 = __webpack_require__(/*! ./utils/include_graph */ "./node
 class SkipLogic {
     constructor(reg) {
         this.reg = reg;
+        this.includeGraph = undefined;
         this.tobj = undefined;
     }
     skip(obj) {
+        var _a;
         const global = this.reg.getConfig().getGlobal();
         if (global.skipGeneratedGatewayClasses === true
             && obj instanceof objects_1.Class
@@ -97884,9 +98158,9 @@ class SkipLogic {
         else if (global.skipIncludesWithoutMain === true
             && obj instanceof objects_1.Program
             && obj.isInclude() === true) {
-            const ig = new include_graph_1.IncludeGraph(this.reg);
+            (_a = this.includeGraph) !== null && _a !== void 0 ? _a : (this.includeGraph = new include_graph_1.IncludeGraph(this.reg));
             const file = obj.getMainABAPFile();
-            if (file && ig.listMainForInclude(file.getFilename()).length === 0) {
+            if (file && this.includeGraph.listMainForInclude(file.getFilename()).length === 0) {
                 return true;
             }
         }
@@ -114194,7 +114468,7 @@ class SelectTranspiler {
     }
     dynamicSQLClause(keyword, code) {
         return `(${code} instanceof abap.types.Table || ${code} instanceof abap.types.HashedTable`
-            + ` ? (${code}.array().length === 0 ? "" : "${keyword} " + ${code}.array().map(row => row.get()).join(" "))`
+            + ` ? (${code}.array().length === 0 ? "" : "${keyword} " + ${code}.array().map(row => row.get()).join(", "))`
             + ` : "${keyword} " + ${code}.get())`;
     }
     isWhereExpression(node, expression) {