@abaplint/core 2.119.43 → 2.119.45

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

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Combi = exports.Expression = void 0;
+exports.Combi = exports.Expression = exports.AlsoIn = void 0;
 exports.str = str;
 exports.regex = regex;
 exports.tok = tok;
@@ -48,7 +48,8 @@ exports.starPrio = starPrio;
 exports.plus = plus;
 exports.plusPrio = plusPrio;
 exports.ver = ver;
-exports.verNot = verNot;
+exports.verLang = verLang;
+exports.verNotLang = verNotLang;
 exports.failCombinator = failCombinator;
 exports.failStar = failStar;
 exports.stopBefore = stopBefore;
@@ -158,43 +159,36 @@ class Token {
         return [""];
     }
 }
+var AlsoIn;
+(function (AlsoIn) {
+    AlsoIn["OpenABAP"] = "OpenABAP";
+})(AlsoIn || (exports.AlsoIn = AlsoIn = {}));
 class Vers {
-    constructor(version, runnable, or) {
-        this.version = version;
+    constructor(release, runnable, also) {
+        this.release = release;
         this.runnable = runnable;
-        this.or = or;
+        this.also = also;
     }
     listKeywords() {
         return this.runnable.listKeywords();
     }
     run(r) {
-        const targetVersion = Combi.getVersion();
-        if (this.or && targetVersion === this.or) {
-            return this.runnable.run(r);
-        }
-        else if (targetVersion === version_1.Version.OpenABAP) {
-            if (this.version > version_1.Version.v702) {
-                return [];
-            }
-            else {
+        if (Combi.isOpenABAP() === true) {
+            if (this.also === AlsoIn.OpenABAP) {
                 return this.runnable.run(r);
             }
+            return (0, version_1.releaseAtLeast)(version_1.Release.v702, this.release) ? this.runnable.run(r) : [];
         }
-        else if ((targetVersion !== version_1.Version.Cloud && this.version !== version_1.Version.Cloud && targetVersion >= this.version)
-            || targetVersion === version_1.Version.Cloud) {
-            return this.runnable.run(r);
-        }
-        else {
-            return [];
-        }
+        return (0, version_1.releaseAtLeast)(Combi.getRelease(), this.release) ? this.runnable.run(r) : [];
     }
     getUsing() {
         return this.runnable.getUsing();
     }
     railroad() {
-        let text = this.version;
-        if (this.or) {
-            text += " or " + this.or;
+        var _a;
+        let text = (_a = this.release.abap) !== null && _a !== void 0 ? _a : "Newest";
+        if (this.also) {
+            text += " or " + this.also;
         }
         return "Railroad.Sequence(Railroad.Comment(\"" +
             text +
@@ -209,9 +203,50 @@ class Vers {
         return this.runnable.first();
     }
 }
-class VersNot {
-    constructor(version, runnable) {
-        this.version = version;
+function langVersionOrdinal(v) {
+    switch (v) {
+        case version_1.LanguageVersion.KeyUser: return 0;
+        case version_1.LanguageVersion.Cloud: return 1;
+        case version_1.LanguageVersion.Normal: return 2;
+        default: return 2;
+    }
+}
+class LangVers {
+    constructor(langVersion, runnable) {
+        this.langVersion = langVersion;
+        this.runnable = runnable;
+    }
+    listKeywords() {
+        return this.runnable.listKeywords();
+    }
+    getUsing() {
+        return this.runnable.getUsing();
+    }
+    run(r) {
+        if (langVersionOrdinal(Combi.getLanguageVersion()) <= langVersionOrdinal(this.langVersion)) {
+            return this.runnable.run(r);
+        }
+        else {
+            return [];
+        }
+    }
+    railroad() {
+        return "Railroad.Sequence(Railroad.Comment(\"langver=" +
+            this.langVersion +
+            "\", {}), " +
+            this.runnable.railroad() +
+            ")";
+    }
+    toStr() {
+        return "LangVersion(" + this.runnable.toStr() + ")";
+    }
+    first() {
+        return this.runnable.first();
+    }
+}
+class LangVersNot {
+    constructor(langVersion, runnable) {
+        this.langVersion = langVersion;
         this.runnable = runnable;
     }
     listKeywords() {
@@ -221,7 +256,7 @@ class VersNot {
         return this.runnable.getUsing();
     }
     run(r) {
-        if (Combi.getVersion() !== this.version) {
+        if (langVersionOrdinal(Combi.getLanguageVersion()) > langVersionOrdinal(this.langVersion)) {
             return this.runnable.run(r);
         }
         else {
@@ -229,14 +264,14 @@ class VersNot {
         }
     }
     railroad() {
-        return "Railroad.Sequence(Railroad.Comment(\"not " +
-            this.version +
+        return "Railroad.Sequence(Railroad.Comment(\"not langver=" +
+            this.langVersion +
             "\", {}), " +
             this.runnable.railroad() +
             ")";
     }
     toStr() {
-        return "VersionNot(" + this.runnable.toStr() + ")";
+        return "LanguageVersionNot(" + this.runnable.toStr() + ")";
     }
     first() {
         return this.runnable.first();
@@ -825,8 +860,15 @@ class Combi {
         return res;
     }
     // assumption: no pragmas supplied in tokens input
-    static run(runnable, tokens, version) {
-        this.ver = version;
+    static run(runnable, tokens, versionOrRelease, languageVersion = version_1.LanguageVersion.Normal, openABAP = false) {
+        this.openABAP = openABAP || versionOrRelease === version_1.Version.OpenABAP;
+        this.langVer = languageVersion;
+        if (typeof versionOrRelease === "string") {
+            this.release = this.openABAP ? version_1.Release.v702 : (0, version_1.versionToABAPRelease)(versionOrRelease);
+        }
+        else {
+            this.release = this.openABAP ? version_1.Release.v702 : versionOrRelease;
+        }
         const input = new result_1.Result(tokens, 0);
         try {
             const result = runnable.run([input]);
@@ -851,11 +893,21 @@ class Combi {
         }
         return undefined;
     }
-    static getVersion() {
-        return this.ver;
+    static getRelease() {
+        return this.release;
+    }
+    static getLanguageVersion() {
+        return this.langVer;
+    }
+    static isOpenABAP() {
+        return this.openABAP;
     }
 }
 exports.Combi = Combi;
+// todo, change this class to be instantiated, constructor(runnable) ?
+Combi.release = version_1.Release.v758;
+Combi.langVer = version_1.LanguageVersion.Normal;
+Combi.openABAP = false;
 // -----------------------------------------------------------------------------
 function str(s) {
     if (s.indexOf(" ") > 0 || s.indexOf("-") > 0) {
@@ -932,11 +984,20 @@ function plus(first) {
 function plusPrio(first) {
     return new PlusPriority(mapInput(first));
 }
-function ver(version, first, or) {
-    return new Vers(version, mapInput(first), or);
+function inputToRelease(versionOrRelease) {
+    if (typeof versionOrRelease === "string") {
+        return (0, version_1.versionToABAPRelease)(versionOrRelease);
+    }
+    return versionOrRelease;
+}
+function ver(versionOrRelease, first, opts = {}) {
+    return new Vers(inputToRelease(versionOrRelease), mapInput(first), opts.also);
+}
+function verLang(langVersion, first) {
+    return new LangVers(langVersion, mapInput(first));
 }
-function verNot(version, first) {
-    return new VersNot(version, mapInput(first));
+function verNotLang(langVersion, first) {
+    return new LangVersNot(langVersion, mapInput(first));
 }
 function failCombinator() {
     return new FailCombinator();

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

@@ -40,6 +40,7 @@ const Tokens = __importStar(require("../1_lexer/tokens"));
 const _statement_1 = require("./statements/_statement");
 const statement_node_1 = require("../nodes/statement_node");
 const token_node_1 = require("../nodes/token_node");
+const version_1 = require("../../version");
 const statement_parser_1 = require("./statement_parser");
 const memory_file_1 = require("../../files/memory_file");
 const lexer_1 = require("../1_lexer/lexer");
@@ -81,9 +82,10 @@ class Macros {
 }
 class ExpandMacros {
     // "reg" must be supplied if there are cross object macros via INCLUDE
-    constructor(globalMacros, version, reg) {
+    constructor(globalMacros, release, reg, languageVersion = version_1.LanguageVersion.Normal) {
         this.macros = new Macros(globalMacros);
-        this.version = version;
+        this.release = release;
+        this.languageVersion = languageVersion;
         this.globalMacros = globalMacros;
         this.reg = reg;
     }
@@ -111,7 +113,7 @@ class ExpandMacros {
                 // todo, workaround for cyclic includes?
                 const prog = (_c = this.reg) === null || _c === void 0 ? void 0 : _c.getObject("PROG", includeName);
                 if (prog) {
-                    prog.parse(this.version, this.globalMacros, this.reg);
+                    prog.parse(this.release, this.globalMacros, this.reg, this.languageVersion);
                     const includeMainFile = prog.getMainABAPFile();
                     if (includeMainFile) {
                         // slow, this copies everything,
@@ -193,7 +195,7 @@ class ExpandMacros {
         }
         const file = new memory_file_1.MemoryFile("expand_macros.abap.prog", str);
         const lexerResult = new lexer_1.Lexer().run(file, statement.getFirstToken().getStart());
-        const result = new statement_parser_1.StatementParser(this.version, this.reg).run([lexerResult], this.macros.listMacroNames());
+        const result = new statement_parser_1.StatementParser(this.release, this.reg, this.languageVersion).run([lexerResult], this.macros.listMacroNames());
         return result[0].statements;
     }
     buildInput(statement) {

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

@@ -11,9 +11,9 @@ const dynIdent = (0, combi_1.tok)(tokens_1.ParenLeft);
 const dynClose = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenRight), (0, combi_1.tok)(tokens_1.ParenRightW));
 const dynInside = (0, combi_1.altPrio)(new field_chain_1.FieldChain(), constant_1.Constant);
 function dynComp(...inside) {
-    return (0, combi_1.ver)(version_1.Version.v757, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), dynIdent, dynInside, ...inside, dynClose));
+    return (0, combi_1.ver)(version_1.Release.v757, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), dynIdent, dynInside, ...inside, dynClose));
 }
 function dynAttr() {
-    return (0, combi_1.ver)(version_1.Version.v757, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.InstanceArrow), dynIdent, dynInside, dynClose));
+    return (0, combi_1.ver)(version_1.Release.v757, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.InstanceArrow), dynIdent, dynInside, dynClose));
 }
 //# sourceMappingURL=_dynamic_access.js.map

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

@@ -10,50 +10,52 @@ const sql_into_structure_1 = require("./sql_into_structure");
 const sql_up_to_1 = require("./sql_up_to");
 function buildSelectSingleCore(allowInto = false) {
     const where = (0, combi_1.seq)("WHERE", _1.SQLCond);
-    const sqlFields = (0, combi_1.ver)(version_1.Version.v750, _1.SQLFields, version_1.Version.OpenABAP);
-    const privileged = (0, combi_1.ver)(version_1.Version.v758, _1.SQLPrivilegedAccess);
+    const sqlFields = (0, combi_1.ver)(version_1.Release.v750, _1.SQLFields, { also: combi_1.AlsoIn.OpenABAP });
+    const privileged = (0, combi_1.ver)(version_1.Release.v758, _1.SQLPrivilegedAccess);
     const fieldList = (0, combi_1.optPrio)(_1.SQLFieldList);
     const client = (0, combi_1.optPrio)(_1.SQLClient);
     const byp = (0, combi_1.optPrio)(_1.SQLBypassingBuffer);
+    const conn = (0, combi_1.optPrio)((0, combi_1.verNotLang)(version_1.LanguageVersion.KeyUser, _1.DatabaseConnection));
     const whereClause = (0, combi_1.optPrio)(where);
     const groupHaving = (0, combi_1.seq)((0, combi_1.optPrio)(sql_group_by_1.SQLGroupBy), (0, combi_1.optPrio)(_1.SQLHaving));
-    const trailingOpts = (0, combi_1.seq)((0, combi_1.optPrio)(_1.DatabaseConnection), (0, combi_1.optPrio)(_1.SQLHints), (0, combi_1.optPrio)(privileged), (0, combi_1.optPrio)(_1.SQLOptions));
+    const trailingOpts = (0, combi_1.seq)(conn, (0, combi_1.optPrio)(_1.SQLHints), (0, combi_1.optPrio)(privileged), (0, combi_1.optPrio)(_1.SQLOptions));
     const intoSingle = (0, combi_1.altPrio)(sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList);
     if (!allowInto) {
         const singleBody = (0, combi_1.seq)(_1.SQLFrom, client, byp, whereClause, groupHaving, trailingOpts);
         return (0, combi_1.seq)(fieldList, singleBody);
     }
-    const singleAfterFrom = (0, combi_1.seq)(_1.SQLFrom, client, byp, (0, combi_1.optPrio)(_1.DatabaseConnection), (0, combi_1.altPrio)((0, combi_1.seq)(intoSingle, byp, whereClause, groupHaving, trailingOpts), (0, combi_1.seq)((0, combi_1.optPrio)(sqlFields), whereClause, groupHaving, trailingOpts, (0, combi_1.optPrio)(intoSingle), (0, combi_1.optPrio)(_1.DatabaseConnection))));
-    const singleIntoBeforeFrom = (0, combi_1.seq)(intoSingle, _1.SQLFrom, client, byp, (0, combi_1.optPrio)(_1.DatabaseConnection), whereClause, groupHaving, trailingOpts);
+    const singleAfterFrom = (0, combi_1.seq)(_1.SQLFrom, client, byp, conn, (0, combi_1.altPrio)((0, combi_1.seq)(intoSingle, byp, whereClause, groupHaving, trailingOpts), (0, combi_1.seq)((0, combi_1.optPrio)(sqlFields), whereClause, groupHaving, trailingOpts, (0, combi_1.optPrio)(intoSingle), conn)));
+    const singleIntoBeforeFrom = (0, combi_1.seq)(intoSingle, _1.SQLFrom, client, byp, conn, whereClause, groupHaving, trailingOpts);
     return (0, combi_1.seq)(fieldList, byp, (0, combi_1.altPrio)(singleIntoBeforeFrom, singleAfterFrom));
 }
 function buildSelectCore(allowInto = false, allowOrderBy = true) {
     const where = (0, combi_1.seq)("WHERE", _1.SQLCond);
-    const offset = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("OFFSET", _1.SQLSource));
-    const sqlFields = (0, combi_1.ver)(version_1.Version.v750, _1.SQLFields, version_1.Version.OpenABAP);
-    const privileged = (0, combi_1.ver)(version_1.Version.v758, _1.SQLPrivilegedAccess);
+    const offset = (0, combi_1.ver)(version_1.Release.v751, (0, combi_1.seq)("OFFSET", _1.SQLSource));
+    const sqlFields = (0, combi_1.ver)(version_1.Release.v750, _1.SQLFields, { also: combi_1.AlsoIn.OpenABAP });
+    const privileged = (0, combi_1.ver)(version_1.Release.v758, _1.SQLPrivilegedAccess);
     const fieldList = (0, combi_1.optPrio)(_1.SQLFieldList);
     const client = (0, combi_1.optPrio)(_1.SQLClient);
     const byp = (0, combi_1.optPrio)(_1.SQLBypassingBuffer);
+    const conn = (0, combi_1.optPrio)((0, combi_1.verNotLang)(version_1.LanguageVersion.KeyUser, _1.DatabaseConnection));
     const fae = (0, combi_1.optPrio)(_1.SQLForAllEntries);
     const whereClause = (0, combi_1.optPrio)(where);
     const groupHaving = (0, combi_1.seq)((0, combi_1.optPrio)(sql_group_by_1.SQLGroupBy), (0, combi_1.optPrio)(_1.SQLHaving));
     const orderUpOff = allowOrderBy
         ? [(0, combi_1.optPrio)((0, combi_1.seq)(_1.SQLOrderBy, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), (0, combi_1.optPrio)(offset)))]
         : [];
-    const trailingOpts = (0, combi_1.seq)((0, combi_1.optPrio)(_1.DatabaseConnection), (0, combi_1.optPrio)(_1.SQLHints), (0, combi_1.optPrio)(privileged), (0, combi_1.optPrio)(_1.SQLOptions));
+    const trailingOpts = (0, combi_1.seq)(conn, (0, combi_1.optPrio)(_1.SQLHints), (0, combi_1.optPrio)(privileged), (0, combi_1.optPrio)(_1.SQLOptions));
     const intoSingle = (0, combi_1.altPrio)(sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList);
     const intoForPackSize = _1.SQLIntoTable;
     if (!allowInto) {
         const afterFromNoInto = (0, combi_1.seq)(_1.SQLFrom, client, byp, (0, combi_1.seq)((0, combi_1.optPrio)(sqlFields), fae, whereClause, groupHaving, ...orderUpOff, trailingOpts));
         return (0, combi_1.altPrio)((0, combi_1.seq)("SINGLE", buildSelectSingleCore(false)), (0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), fieldList, byp, afterFromNoInto));
     }
-    const fromPackSize = (0, combi_1.seq)((0, combi_1.optPrio)(_1.SQLPackageSize), (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(_1.DatabaseConnection), (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo));
+    const fromPackSize = (0, combi_1.seq)((0, combi_1.optPrio)(_1.SQLPackageSize), (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, conn, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo));
     const trailingInto = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)(intoForPackSize, (0, combi_1.optPrio)(_1.SQLPackageSize), byp, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(offset), (0, combi_1.optPrio)(_1.SQLOrderBy)), (0, combi_1.seq)(intoSingle, byp, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(offset)))), (0, combi_1.optPrio)(_1.SQLOptions));
-    const afterFromWithInto = (0, combi_1.seq)((0, combi_1.optPrio)(_1.SQLFrom), client, byp, fromPackSize, (0, combi_1.altPrio)((0, combi_1.seq)(intoForPackSize, (0, combi_1.optPrio)(_1.SQLPackageSize), byp, (0, combi_1.optPrio)(_1.DatabaseConnection), (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(offset), fae, whereClause, groupHaving, ...orderUpOff, trailingOpts), (0, combi_1.seq)(intoSingle, byp, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, fae, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(offset), whereClause, groupHaving, ...orderUpOff, trailingOpts), (0, combi_1.seq)((0, combi_1.optPrio)(sqlFields), fae, whereClause, groupHaving, ...orderUpOff, trailingOpts, trailingInto)));
+    const afterFromWithInto = (0, combi_1.seq)((0, combi_1.optPrio)(_1.SQLFrom), client, byp, fromPackSize, (0, combi_1.altPrio)((0, combi_1.seq)(intoForPackSize, (0, combi_1.optPrio)(_1.SQLPackageSize), byp, conn, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(offset), fae, whereClause, groupHaving, ...orderUpOff, trailingOpts), (0, combi_1.seq)(intoSingle, byp, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, fae, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(offset), whereClause, groupHaving, ...orderUpOff, trailingOpts), (0, combi_1.seq)((0, combi_1.optPrio)(sqlFields), fae, whereClause, groupHaving, ...orderUpOff, trailingOpts, trailingInto)));
     const selectTableIntoThenFrom = (0, combi_1.seq)(intoForPackSize, (0, combi_1.optPrio)(_1.SQLPackageSize));
     const selectOtherIntoThenFrom = intoSingle;
-    const nonSingleBody = (0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), fieldList, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)((0, combi_1.altPrio)(selectTableIntoThenFrom, selectOtherIntoThenFrom)), (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(_1.DatabaseConnection), afterFromWithInto);
+    const nonSingleBody = (0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), fieldList, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)((0, combi_1.altPrio)(selectTableIntoThenFrom, selectOtherIntoThenFrom)), (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, conn, afterFromWithInto);
     return (0, combi_1.altPrio)((0, combi_1.seq)("SINGLE", buildSelectSingleCore(true)), nonSingleBody);
 }
 //# sourceMappingURL=_select_core.js.map

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

@@ -10,10 +10,16 @@ const simple_source3_1 = require("./simple_source3");
 const version_1 = require("../../../version");
 class AssignSource extends combi_1.Expression {
     getRunnable() {
-        const component = (0, combi_1.seq)("COMPONENT", (0, combi_1.alt)(simple_source3_1.SimpleSource3, (0, combi_1.ver)(version_1.Version.v740sp02, source_1.Source, version_1.Version.OpenABAP)), "OF STRUCTURE", source_1.Source);
-        const tableField = (0, combi_1.seq)("TABLE FIELD", (0, combi_1.alt)(source_1.Source, dynamic_1.Dynamic));
-        const arrow = (0, combi_1.alt)((0, combi_1.tok)(tokens_1.InstanceArrow), (0, combi_1.tok)(tokens_1.StaticArrow));
-        const source = (0, combi_1.alt)((0, combi_1.seq)(source_1.Source, (0, combi_1.opt)((0, combi_1.seq)(arrow, dynamic_1.Dynamic))), component, tableField, (0, combi_1.seq)(dynamic_1.Dynamic, (0, combi_1.opt)((0, combi_1.seq)(arrow, (0, combi_1.alt)(field_1.Field, dynamic_1.Dynamic)))));
+        const component = (0, combi_1.seq)("COMPONENT", (0, combi_1.alt)(simple_source3_1.SimpleSource3, (0, combi_1.ver)(version_1.Release.v740sp02, source_1.Source, { also: combi_1.AlsoIn.OpenABAP })), "OF STRUCTURE", source_1.Source);
+        // TABLE FIELD form: blocked in KeyUser
+        const tableField = (0, combi_1.verNotLang)(version_1.LanguageVersion.KeyUser, (0, combi_1.seq)("TABLE FIELD", (0, combi_1.alt)(source_1.Source, dynamic_1.Dynamic)));
+        // class=>(dyn_attr) via static arrow is blocked in KeyUser
+        // ref->(dyn_comp) via instance arrow is allowed — leave unguarded
+        const arrowDynamic = (0, combi_1.alt)((0, combi_1.tok)(tokens_1.InstanceArrow), (0, combi_1.verNotLang)(version_1.LanguageVersion.KeyUser, (0, combi_1.tok)(tokens_1.StaticArrow)));
+        const anyArrow = (0, combi_1.alt)((0, combi_1.tok)(tokens_1.InstanceArrow), (0, combi_1.tok)(tokens_1.StaticArrow));
+        const source = (0, combi_1.alt)((0, combi_1.seq)(source_1.Source, (0, combi_1.opt)((0, combi_1.seq)(arrowDynamic, dynamic_1.Dynamic))), component, tableField, 
+        // standalone dynamic symbol (dyn_sym) blocked in KeyUser
+        (0, combi_1.verNotLang)(version_1.LanguageVersion.KeyUser, (0, combi_1.seq)(dynamic_1.Dynamic, (0, combi_1.opt)((0, combi_1.seq)(anyArrow, (0, combi_1.alt)(field_1.Field, dynamic_1.Dynamic))))));
         return source;
     }
 }

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

@@ -10,7 +10,7 @@ class Cast extends combi_1.Expression {
     getRunnable() {
         const rparen = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.WParenRight));
         const cast = (0, combi_1.seq)("CAST", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.optPrio)(let_1.Let), _1.Source, rparen, (0, combi_1.opt)(_1.Dereference));
-        return (0, combi_1.ver)(version_1.Version.v740sp02, cast, version_1.Version.OpenABAP);
+        return (0, combi_1.ver)(version_1.Release.v740sp02, cast, { also: combi_1.AlsoIn.OpenABAP });
     }
 }
 exports.Cast = Cast;

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

@@ -10,11 +10,11 @@ class Compare extends combi_1.Expression {
         const val = (0, combi_1.altPrio)(_1.FieldSub, _1.Constant);
         const list = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeft), val, (0, combi_1.plus)((0, combi_1.seq)(",", val)), (0, combi_1.tok)(tokens_1.ParenRightW));
         const inn = (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), "IN", (0, combi_1.altPrio)(_1.Source, list));
-        const sopt = (0, combi_1.seq)("IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("SUPPLIED", "BOUND", (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("INSTANCE OF", _1.ClassName), version_1.Version.OpenABAP), "REQUESTED", "INITIAL"));
+        const sopt = (0, combi_1.seq)("IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("SUPPLIED", "BOUND", (0, combi_1.ver)(version_1.Release.v750, (0, combi_1.seq)("INSTANCE OF", _1.ClassName), { also: combi_1.AlsoIn.OpenABAP }), "REQUESTED", "INITIAL"));
         const between = (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), "BETWEEN", _1.Source, "AND", _1.Source);
         // https://help.sap.com/doc/abapdocu_752_index_htm/7.52/en-us/abennews-740_sp08-expressions.htm
         // but also seems to work in v740sp05, blah
-        const predicate = (0, combi_1.ver)(version_1.Version.v740sp08, _1.MethodCallChain, version_1.Version.OpenABAP);
+        const predicate = (0, combi_1.ver)(version_1.Release.v740sp08, _1.MethodCallChain, { also: combi_1.AlsoIn.OpenABAP });
         const rett = (0, combi_1.seq)(_1.Source, (0, combi_1.altPrio)((0, combi_1.seq)(_1.CompareOperator, _1.Source), inn, between, sopt));
         const fsassign = (0, combi_1.seq)(_1.SourceFieldSymbolChain, "IS", (0, combi_1.optPrio)("NOT"), "ASSIGNED");
         const ret = (0, combi_1.seq)((0, combi_1.opt)("NOT"), (0, combi_1.altPrio)(rett, predicate, fsassign));

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

@@ -10,7 +10,7 @@ class ComponentCompare extends combi_1.Expression {
         const val = (0, combi_1.alt)(_1.FieldSub, _1.Constant);
         const list = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeft), val, (0, combi_1.plus)((0, combi_1.seq)(",", val)), (0, combi_1.tok)(tokens_1.ParenRightW));
         const inn = (0, combi_1.seq)((0, combi_1.opt)("NOT"), "IN", (0, combi_1.altPrio)(_1.Source, list));
-        const sopt = (0, combi_1.seq)("IS", (0, combi_1.opt)("NOT"), (0, combi_1.altPrio)("SUPPLIED", "BOUND", (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("INSTANCE OF", _1.Source)), "REQUESTED", "ASSIGNED", "INITIAL"));
+        const sopt = (0, combi_1.seq)("IS", (0, combi_1.opt)("NOT"), (0, combi_1.altPrio)("SUPPLIED", "BOUND", (0, combi_1.ver)(version_1.Release.v750, (0, combi_1.seq)("INSTANCE OF", _1.Source)), "REQUESTED", "ASSIGNED", "INITIAL"));
         const between = (0, combi_1.seq)((0, combi_1.opt)("NOT"), "BETWEEN", _1.Source, "AND", _1.Source);
         const rett = (0, combi_1.seq)(_1.ComponentChainSimple, (0, combi_1.altPrio)((0, combi_1.seq)(_1.CompareOperator, _1.Source), inn, between, sopt));
         const ret = (0, combi_1.seq)((0, combi_1.opt)("NOT"), rett);

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

@@ -7,7 +7,7 @@ const component_chain_simple_1 = require("./component_chain_simple");
 const version_1 = require("../../../version");
 class ComponentCompareSimple extends combi_1.Expression {
     getRunnable() {
-        const source = (0, combi_1.altPrio)((0, combi_1.ver)(version_1.Version.v740sp02, _1.Source, version_1.Version.OpenABAP), _1.SimpleSource4);
+        const source = (0, combi_1.altPrio)((0, combi_1.ver)(version_1.Release.v740sp02, _1.Source, { also: combi_1.AlsoIn.OpenABAP }), _1.SimpleSource4);
         const ret = (0, combi_1.seq)((0, combi_1.altPrio)(component_chain_simple_1.ComponentChainSimple, _1.Dynamic), "=", source);
         return (0, combi_1.plus)(ret);
     }

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

@@ -7,7 +7,7 @@ const cond_sub_1 = require("./cond_sub");
 const version_1 = require("../../../version");
 class Cond extends combi_1.Expression {
     getRunnable() {
-        const operator = (0, combi_1.altPrio)("AND", "OR", (0, combi_1.ver)(version_1.Version.v702, "EQUIV"));
+        const operator = (0, combi_1.altPrio)("AND", "OR", (0, combi_1.ver)(version_1.Release.v702, "EQUIV"));
         const cnd = (0, combi_1.altPrio)(_1.Compare, cond_sub_1.CondSub);
         const ret = (0, combi_1.seq)(cnd, (0, combi_1.starPrio)((0, combi_1.seq)(operator, cnd)));
         return ret;

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

@@ -6,7 +6,7 @@ const _1 = require(".");
 const version_1 = require("../../../version");
 class CorrespondingBody extends combi_1.Expression {
     getRunnable() {
-        const discarding = (0, combi_1.ver)(version_1.Version.v751, "DISCARDING DUPLICATES");
+        const discarding = (0, combi_1.ver)(version_1.Release.v751, "DISCARDING DUPLICATES");
         return (0, combi_1.seq)((0, combi_1.optPrio)("DEEP"), (0, combi_1.optPrio)(_1.CorrespondingBodyBase), _1.Source, (0, combi_1.optPrio)(discarding), (0, combi_1.optPrio)(_1.CorrespondingBodyMapping), (0, combi_1.optPrio)("CHANGING CONTROL"), (0, combi_1.optPrio)((0, combi_1.seq)("MAPPING FROM ENTITY", (0, combi_1.optPrio)("USING CONTROL"))), // todo, version something?
         (0, combi_1.optPrio)((0, combi_1.seq)("EXCEPT", (0, combi_1.alt)((0, combi_1.plus)(_1.Field), "*"))));
     }

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

@@ -41,7 +41,7 @@ class DataDefinition extends combi_1.Expression {
     getRunnable() {
         const simple = (0, combi_1.opt)((0, combi_1.per)("READ-ONLY", Expressions.Type, Expressions.Length, Expressions.Decimals, Expressions.Value));
         const table = (0, combi_1.seq)(Expressions.TypeTable, (0, combi_1.optPrio)("READ-ONLY"));
-        const boxed = (0, combi_1.ver)(version_1.Version.v702, "BOXED");
+        const boxed = (0, combi_1.ver)(version_1.Release.v702, "BOXED");
         return (0, combi_1.seq)(Expressions.DefinitionName, (0, combi_1.optPrio)(Expressions.ConstantFieldLength), (0, combi_1.alt)(simple, table, Expressions.TypeStructure), (0, combi_1.optPrio)(boxed));
     }
 }

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

@@ -3,8 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatabaseTable = void 0;
 const combi_1 = require("../combi");
 const dynamic_1 = require("./dynamic");
+const version_1 = require("../../../version");
 class DatabaseTable extends combi_1.Expression {
+    constructor(noDynamic = false) {
+        super();
+        this.noDynamic = noDynamic;
+    }
     getRunnable() {
+        if (this.noDynamic) {
+            return (0, combi_1.altPrio)((0, combi_1.verNotLang)(version_1.LanguageVersion.KeyUser, dynamic_1.Dynamic), (0, combi_1.regex)(/^\*?(\/\w+\/)?\w+$/));
+        }
         return (0, combi_1.altPrio)(dynamic_1.Dynamic, (0, combi_1.regex)(/^\*?(\/\w+\/)?\w+$/));
     }
 }

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

@@ -5,7 +5,7 @@ const version_1 = require("../../../version");
 const combi_1 = require("../combi");
 class FindType extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.opt)((0, combi_1.alt)("REGEX", "SUBSTRING", (0, combi_1.ver)(version_1.Version.v755, "PCRE", version_1.Version.OpenABAP)));
+        return (0, combi_1.opt)((0, combi_1.alt)("REGEX", "SUBSTRING", (0, combi_1.ver)(version_1.Release.v755, "PCRE", { also: combi_1.AlsoIn.OpenABAP })));
     }
 }
 exports.FindType = FindType;

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

@@ -16,9 +16,9 @@ class For extends combi_1.Expression {
         const itera = (0, combi_1.seq)(_1.InlineFieldDefinition, (0, combi_1.opt)(then), whil);
         const groupBy = (0, combi_1.seq)("GROUP BY", (0, combi_1.alt)(field_chain_1.FieldChain, (0, combi_1.seq)("(", (0, combi_1.plus)(_1.LoopGroupByComponent), ")")), (0, combi_1.opt)((0, combi_1.seq)((0, combi_1.alt)("ASCENDING", "DESCENDING"), (0, combi_1.opt)("AS TEXT"))), (0, combi_1.opt)("WITHOUT MEMBERS"));
         const t = (0, combi_1.alt)(_1.TargetField, _1.TargetFieldSymbol);
-        const groups = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.seq)("GROUPS", t, "OF", t, "IN", _1.Source, (0, combi_1.optPrio)(groupBy)));
+        const groups = (0, combi_1.ver)(version_1.Release.v740sp08, (0, combi_1.seq)("GROUPS", t, "OF", t, "IN", _1.Source, (0, combi_1.optPrio)(groupBy)));
         const f = (0, combi_1.seq)("FOR", (0, combi_1.alt)(itera, inn, groups), (0, combi_1.optPrio)(_1.Let));
-        return (0, combi_1.ver)(version_1.Version.v740sp05, f, version_1.Version.OpenABAP);
+        return (0, combi_1.ver)(version_1.Release.v740sp05, f, { also: combi_1.AlsoIn.OpenABAP });
     }
 }
 exports.For = For;

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

@@ -8,7 +8,7 @@ const version_1 = require("../../../version");
 const simple_source3_1 = require("./simple_source3");
 class FunctionExportingParameter extends combi_1.Expression {
     getRunnable() {
-        const s = (0, combi_1.altPrio)((0, combi_1.ver)(version_1.Version.v740sp02, source_1.Source, version_1.Version.OpenABAP), simple_source3_1.SimpleSource3);
+        const s = (0, combi_1.altPrio)((0, combi_1.ver)(version_1.Release.v740sp02, source_1.Source, { also: combi_1.AlsoIn.OpenABAP }), simple_source3_1.SimpleSource3);
         const exp = (0, combi_1.seq)(parameter_name_1.ParameterName, "=", s);
         return exp;
     }

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

@@ -205,6 +205,15 @@ __exportStar(require("./sql_from_source"), exports);
 __exportStar(require("./sql_from"), exports);
 __exportStar(require("./sql_function_input"), exports);
 __exportStar(require("./sql_function"), exports);
+__exportStar(require("./sql_regexpr_pattern"), exports);
+__exportStar(require("./sql_regexpr_from"), exports);
+__exportStar(require("./sql_regexpr_occurrence"), exports);
+__exportStar(require("./sql_regexpr_group"), exports);
+__exportStar(require("./sql_replace_regexpr"), exports);
+__exportStar(require("./sql_occurrences_regexpr"), exports);
+__exportStar(require("./sql_substring_regexpr"), exports);
+__exportStar(require("./sql_locate_regexpr"), exports);
+__exportStar(require("./sql_like_regexpr"), exports);
 __exportStar(require("./sql_group_by"), exports);
 __exportStar(require("./sql_having"), exports);
 __exportStar(require("./sql_hints"), exports);

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

@@ -11,7 +11,7 @@ class InlineData extends combi_1.Expression {
         const left = (0, combi_1.tok)(tokens_1.ParenLeft);
         const data = (0, combi_1.seq)("DATA", left, _1.TargetField, right);
         const final = (0, combi_1.seq)("FINAL", left, _1.TargetField, right);
-        return (0, combi_1.altPrio)((0, combi_1.ver)(version_1.Version.v740sp02, data, version_1.Version.OpenABAP), (0, combi_1.ver)(version_1.Version.v757, final, version_1.Version.OpenABAP));
+        return (0, combi_1.altPrio)((0, combi_1.ver)(version_1.Release.v740sp02, data, { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.ver)(version_1.Release.v757, final, { also: combi_1.AlsoIn.OpenABAP }));
     }
 }
 exports.InlineData = InlineData;

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

@@ -10,7 +10,7 @@ class InlineFS extends combi_1.Expression {
         const right = (0, combi_1.tok)(tokens_1.ParenRightW);
         const left = (0, combi_1.tok)(tokens_1.ParenLeft);
         const fs = (0, combi_1.seq)("FIELD-SYMBOL", left, _1.TargetFieldSymbol, right);
-        return (0, combi_1.ver)(version_1.Version.v740sp02, fs, version_1.Version.OpenABAP);
+        return (0, combi_1.ver)(version_1.Release.v740sp02, fs, { also: combi_1.AlsoIn.OpenABAP });
     }
 }
 exports.InlineFS = InlineFS;

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

@@ -6,7 +6,7 @@ const _1 = require(".");
 const version_1 = require("../../../version");
 class LoopSource extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.alt)(_1.SimpleSource2, (0, combi_1.ver)(version_1.Version.v740sp02, _1.Source, version_1.Version.OpenABAP));
+        return (0, combi_1.alt)(_1.SimpleSource2, (0, combi_1.ver)(version_1.Release.v740sp02, _1.Source, { also: combi_1.AlsoIn.OpenABAP }));
     }
 }
 exports.LoopSource = LoopSource;

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

@@ -6,7 +6,7 @@ const _1 = require(".");
 const version_1 = require("../../../version");
 class MessageSourceSource extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp02, _1.Source, version_1.Version.OpenABAP), _1.SimpleSource3);
+        return (0, combi_1.alt)((0, combi_1.ver)(version_1.Release.v740sp02, _1.Source, { also: combi_1.AlsoIn.OpenABAP }), _1.SimpleSource3);
     }
 }
 exports.MessageSourceSource = MessageSourceSource;

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

@@ -12,7 +12,7 @@ class NewObject extends combi_1.Expression {
         const lines = (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), _1.Source, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const linesFields = (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), (0, combi_1.plus)(field_assignment_1.FieldAssignment), (0, combi_1.tok)(tokens_1.WParenRightW)));
         const neww = (0, combi_1.seq)("NEW", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.optPrio)((0, combi_1.alt)(_1.Source, _1.ParameterListS, lines, linesFields)), ")");
-        return (0, combi_1.ver)(version_1.Version.v740sp02, neww, version_1.Version.OpenABAP);
+        return (0, combi_1.ver)(version_1.Release.v740sp02, neww, { also: combi_1.AlsoIn.OpenABAP });
     }
 }
 exports.NewObject = NewObject;

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

@@ -7,7 +7,7 @@ const tokens_1 = require("../../1_lexer/tokens");
 const version_1 = require("../../../version");
 class ReduceNext extends combi_1.Expression {
     getRunnable() {
-        const calcAssign = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.WPlus), "="), (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WDash), "="), "/=", "*=", "&&="));
+        const calcAssign = (0, combi_1.ver)(version_1.Release.v754, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.WPlus), "="), (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WDash), "="), "/=", "*=", "&&="));
         const fields = (0, combi_1.seq)(_1.SimpleTarget, (0, combi_1.altPrio)("=", calcAssign), _1.Source);
         return (0, combi_1.seq)("NEXT", (0, combi_1.plus)(fields));
     }

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

@@ -9,8 +9,8 @@ const _select_core_1 = require("./_select_core");
 class Select extends combi_1.Expression {
     getRunnable() {
         const into = (0, combi_1.altPrio)(_1.SQLIntoTable, sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList);
-        const standalone = (0, combi_1.altPrio)((0, combi_1.seq)("SINGLE", (0, combi_1.optPrio)("FOR UPDATE"), (0, _select_core_1.buildSelectSingleCore)(true)), (0, _select_core_1.buildSelectCore)(true));
-        const unionTail = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.plusPrio)(_1.SQLSetOp), version_1.Version.OpenABAP);
+        const standalone = (0, combi_1.altPrio)((0, combi_1.seq)("SINGLE", (0, combi_1.optPrio)((0, combi_1.verNotLang)(version_1.LanguageVersion.KeyUser, "FOR UPDATE")), (0, _select_core_1.buildSelectSingleCore)(true)), (0, _select_core_1.buildSelectCore)(true));
+        const unionTail = (0, combi_1.ver)(version_1.Release.v750, (0, combi_1.plusPrio)(_1.SQLSetOp), { also: combi_1.AlsoIn.OpenABAP });
         const chained = (0, combi_1.seq)((0, _select_core_1.buildSelectCore)(false, false), unionTail, (0, combi_1.optPrio)(_1.SQLOrderBy), (0, combi_1.optPrio)(into));
         return (0, combi_1.seq)("SELECT", (0, combi_1.altPrio)(chained, standalone));
     }