@abaplint/core 2.119.42 → 2.119.44

package/build/abaplint.d.ts

@@ -28,7 +28,7 @@ export declare abstract class ABAPObject extends AbstractObject {
     abstract getDescription(): string | undefined;
     constructor(name: string);
     static is(x: any): x is ABAPObject;
-    parse(version: Version, globalMacros?: readonly string[], reg?: IRegistry): IParseResult;
+    parse(release: ABAPRelease, globalMacros?: readonly string[], reg?: IRegistry, languageVersion?: LanguageVersion, openABAP?: boolean): IParseResult;
     setDirty(): void;
     private getParsedXML;
     getABAPFiles(): readonly ABAPFile[];
@@ -59,6 +59,27 @@ declare class ABAPQueryQuery extends AbstractObject {
     getDescription(): string | undefined;
 }
 
+/**
+ * A single row in the release table.
+ *
+ * abap   — SAP_BASIS / ABAP release name as SAP calls it (e.g. "740SP05", "7.90", "9.16")
+ * kernel — SAP kernel release number that ships this ABAP release
+ * op     — on-premise release number (e.g. 758, 816), null for cloud-only releases
+ * cloud  — cloud release number (e.g. 793, 916), null for pre-cloud releases
+ * ce     — SAP BTP / S/4HANA Cloud Public Edition shipment quarter (YYMM, e.g. 2308),
+ *           null if never shipped to customers on cloud
+ * ordinal — chronological index (set at build time from array position), used for ordering
+ */
+export declare interface ABAPRelease {
+    readonly name: string;
+    readonly abap: string | null;
+    readonly kernel: number | null;
+    readonly op: number | null;
+    readonly cloud: number | null;
+    readonly ce: number | null;
+    readonly ordinal: number;
+}
+
 declare class Abstract extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -101,7 +122,7 @@ declare abstract class AbstractObject implements IObject {
     abstract getDescription(): string | undefined;
     constructor(name: string);
     getParsingIssues(): readonly Issue[];
-    parse(_version?: Version, _globalMacros?: readonly string[], _reg?: IRegistry): IParseResult;
+    parse(_release?: ABAPRelease, _globalMacros?: readonly string[], _reg?: IRegistry, _languageVersion?: LanguageVersion, _openABAP?: boolean): IParseResult;
     getName(): string;
     setDirty(): void;
     addFile(file: IFile): void;
@@ -1442,7 +1463,7 @@ declare class CondSub extends Expression {
 
 export declare class Config implements IConfiguration {
     private readonly config;
-    static getDefault(ver?: Version): Config;
+    static getDefault(ver?: Version, langVer?: LanguageVersion, openABAP?: boolean): Config;
     getEnabledRules(): IRule[];
     constructor(json: string);
     get(): IConfig;
@@ -1450,7 +1471,10 @@ export declare class Config implements IConfiguration {
     readByRule(rule: string): any;
     getGlobal(): IGlobalConfig;
     getSyntaxSetttings(): ISyntaxSettings;
+    getRelease(): ABAPRelease;
+    getOpenABAP(): boolean;
     getVersion(): Version;
+    getLanguageVersion(): LanguageVersion;
     private checkVersion;
 }
 
@@ -1547,7 +1571,10 @@ export declare class CurrentScope {
     static buildDefault(reg: IRegistry, obj: IObject): CurrentScope;
     private static addBuiltIn;
     private constructor();
+    getRelease(): ABAPRelease;
     getVersion(): Version;
+    getLanguageVersion(): LanguageVersion;
+    getOpenABAP(): boolean;
     getRegistry(): IRegistry;
     addType(type: TypedIdentifier | undefined): void;
     addTypeNamed(name: string, type: TypedIdentifier | undefined): void;
@@ -2381,6 +2408,7 @@ declare abstract class Expression implements IStatementRunnable {
 declare class ExpressionNode extends AbstractNode<ExpressionNode | TokenNode> {
     private readonly expression;
     constructor(expression: IStatementRunnable);
+    addChild(_n: ExpressionNode | TokenNode): void;
     get(): IStatementRunnable;
     countTokens(): number;
     getFirstToken(): Token;
@@ -2594,7 +2622,20 @@ declare namespace Expressions {
         SQLFromSource,
         SQLFrom,
         SQLFunctionInput,
+        sqlFunctionDefs,
+        sqlNamedFunctionDefs,
+        sqlSpatialFunctionDefs,
+        sqlSpatialAggregateDefs,
         SQLFunction,
+        SQLRegexprPattern,
+        SQLRegexprFrom,
+        SQLRegexprOccurrence,
+        SQLRegexprGroup,
+        SQLReplaceRegexpr,
+        SQLOccurrencesRegexpr,
+        SQLSubstringRegexpr,
+        SQLLocateRegexpr,
+        SQLLikeRegexpr,
         SQLGroupBy,
         SQLHaving,
         SQLHints,
@@ -3316,7 +3357,7 @@ declare interface IBuiltinMethod {
     optional?: {
         [key: string]: AbstractType;
     };
-    version?: Version;
+    release?: ABAPRelease;
     predicate?: boolean;
     return: AbstractType;
     cache?: BuiltInMethod | undefined;
@@ -3380,7 +3421,11 @@ export declare interface IConfiguration {
     getEnabledRules(): IRule[];
     get(): IConfig;
     getGlobal(): IGlobalConfig;
+    /** @deprecated Use getRelease() instead. */
     getVersion(): Version;
+    getRelease(): ABAPRelease;
+    getLanguageVersion(): LanguageVersion;
+    getOpenABAP(): boolean;
     getSyntaxSetttings(): ISyntaxSettings;
     readByRule(rule: string): any;
     readByKey(rule: string, key: string): any;
@@ -4013,7 +4058,7 @@ export declare interface IObject extends IArtifact {
     /** returns true if the object was parsed, false if no changes since last parse
      * registry for global cross object macros
      */
-    parse(version?: Version, globalMacros?: readonly string[], reg?: IRegistry): IParseResult;
+    parse(release?: ABAPRelease, globalMacros?: readonly string[], reg?: IRegistry, languageVersion?: LanguageVersion, openABAP?: boolean): IParseResult;
     getParsingIssues(): readonly Issue[];
     getFiles(): readonly IFile[];
     addFile(file: IFile): void;
@@ -4305,8 +4350,11 @@ declare interface ISyntaxResult {
 }
 
 declare interface ISyntaxSettings {
-    /** ABAP language version */
+    /** ABAP release to parse against, e.g. `"v758"`, `"Newest"`, `"Cloud"`. */
     version?: Version;
+    languageVersion?: LanguageVersion;
+    /** Use the OpenABAP dialect (v702 base + a set of additional language features). */
+    openABAP?: boolean;
     /** Report error for objects in this regex namespace. Types not in namespace will be void. Case insensitive */
     errorNamespace: string;
     /** List of full named global constants (regex not possible)
@@ -4424,6 +4472,21 @@ declare namespace LanguageServerTypes {
 }
 export { LanguageServerTypes }
 
+/**
+ * Dialect / flavor axis, orthogonal to the on-prem/cloud release track.
+ *
+ * `Normal`  = full ABAP, no restrictions.
+ * `Cloud`   = restricted ABAP for Cloud, syntactic and semantic restrictions apply.
+ * `KeyUser` = stricter still (KeyUser Extensibility), strict subset of Cloud.
+ *
+ * Ordering: KeyUser(0) &lt; Cloud(1) &lt; Normal(2) — lower = more restrictive.
+ */
+export declare enum LanguageVersion {
+    Normal = "Normal",
+    KeyUser = "KeyUser",
+    Cloud = "Cloud"
+}
+
 declare class Leave implements IStatement {
     getMatcher(): IStatementRunnable;
 }
@@ -5676,7 +5739,7 @@ declare class ProxyObject extends AbstractObject {
     };
     getDescription(): string | undefined;
     setDirty(): void;
-    parse(_version?: Version, _globalMacros?: readonly string[], reg?: IRegistry): {
+    parse(_release?: ABAPRelease, _globalMacros?: readonly string[], reg?: IRegistry): {
         updated: boolean;
         runtime: number;
     };
@@ -5875,6 +5938,18 @@ declare class Reject implements IStatement {
     getMatcher(): IStatementRunnable;
 }
 
+/** Lookup table keyed by release name (e.g. `Release.v740sp05`, `Release.Newest`). */
+export declare const Release: {
+    readonly [name: string]: ABAPRelease;
+};
+
+/**
+ * Is `running` at least as new as `required`?
+ * Comparison is purely by ordinal (declaration order in ReleaseList).
+ * Newest (last entry) satisfies any required release.
+ */
+export declare function releaseAtLeast(running: ABAPRelease, required: ABAPRelease): boolean;
+
 export declare class Rename {
     private readonly reg;
     constructor(reg: IRegistry);
@@ -5934,6 +6009,8 @@ declare class Result {
     popNode(): ExpressionNode | TokenNode | undefined;
     getNodes(): (ExpressionNode | TokenNode)[];
     setNodes(n: (ExpressionNode | TokenNode)[]): void;
+    getTokens(): readonly Token[];
+    getTokenIndex(): number;
     remainingLength(): number;
 }
 
@@ -6490,6 +6567,10 @@ declare class SQLFunction extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare type SQLFunctionDef = [string, number, ABAPRelease];
+
+declare const sqlFunctionDefs: SQLFunctionDef[];
+
 declare class SQLFunctionInput extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -6542,6 +6623,30 @@ declare class SQLJoinSource extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class SQLLikeRegexpr extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class SQLLocateRegexpr extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare type SQLNamedFunctionDef = [string, ABAPRelease, SQLNamedParam[]];
+
+declare const sqlNamedFunctionDefs: SQLNamedFunctionDef[];
+
+declare type SQLNamedParam = {
+    name: string;
+    value: SQLNamedParamValue;
+    optional?: true;
+};
+
+declare type SQLNamedParamValue = "any" | "abap_only";
+
+declare class SQLOccurrencesRegexpr extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class SQLOptions extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -6584,6 +6689,26 @@ declare class SQLPrivilegedAccess extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class SQLRegexprFrom extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class SQLRegexprGroup extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class SQLRegexprOccurrence extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class SQLRegexprPattern extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class SQLReplaceRegexpr extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class SQLSetOp extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -6604,6 +6729,14 @@ declare class SQLSourceSimple extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare const sqlSpatialAggregateDefs: SQLFunctionDef[];
+
+declare const sqlSpatialFunctionDefs: SQLFunctionDef[];
+
+declare class SQLSubstringRegexpr extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class SQLTarget extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -7754,6 +7887,7 @@ declare class VerificationMessage implements IStatement {
     getMatcher(): IStatementRunnable;
 }
 
+/** @deprecated Use ABAPRelease and Release instead */
 export declare enum Version {
     OpenABAP = "open-abap",// as 702, but with some extra new language features
     v700 = "v700",
@@ -7770,9 +7904,19 @@ export declare enum Version {
     v756 = "v756",
     v757 = "v757",
     v758 = "v758",
-    Cloud = "Cloud"
+    v816 = "v816",
+    /**
+     * Steampunk / SAP BTP ABAP Environment. This was never a release identity —
+     * it always meant "latest available release, parsed under cloud-language
+     * restrictions". It expands into the explicit
+     * Release.Newest + {@link LanguageVersion.Cloud} pair.
+     */
+    Cloud = "Cloud",
+    Newest = "Newest"
 }
 
+export declare function versionToABAPRelease(v: Version): ABAPRelease;
+
 declare class View extends AbstractObject {
     private parsedData;
     getType(): string;

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,8 +10,8 @@ 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);
@@ -29,9 +29,9 @@ function buildSelectSingleCore(allowInto = false) {
 }
 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);

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

@@ -10,7 +10,7 @@ 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 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);
         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)))));

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);
     }