@abaplint/cli 2.119.51 → 2.119.52

package/build/cli.js

@@ -2618,14 +2618,13 @@ class Combi {
         return res;
     }
     // assumption: no pragmas supplied in tokens input
-    static run(runnable, tokens, versionOrRelease, languageVersion = version_1.LanguageVersion.Normal, openABAP = false) {
-        this.openABAP = openABAP || versionOrRelease === version_1.Version.OpenABAP;
+    static run(runnable, tokens, versionOrRelease, languageVersion = version_1.LanguageVersion.Normal) {
         this.langVer = languageVersion;
         if (typeof versionOrRelease === "string") {
-            this.release = this.openABAP ? version_1.Release.v702 : (0, version_1.versionToABAPRelease)(versionOrRelease);
+            this.release = (0, version_1.versionToABAPRelease)(versionOrRelease);
         }
         else {
-            this.release = this.openABAP ? version_1.Release.v702 : versionOrRelease;
+            this.release = versionOrRelease;
         }
         const input = new result_1.Result(tokens, 0);
         try {
@@ -2658,14 +2657,13 @@ class Combi {
         return this.langVer;
     }
     static isOpenABAP() {
-        return this.openABAP;
+        return this.release === version_1.Release["open-abap"];
     }
 }
 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) {
@@ -11148,13 +11146,12 @@ class WorkArea {
     }
 }
 class StatementParser {
-    constructor(release, reg, languageVersion = version_1.LanguageVersion.Normal, openABAP = false) {
+    constructor(release, reg, languageVersion = version_1.LanguageVersion.Normal) {
         if (!StatementParser.map) {
             StatementParser.map = new StatementMap();
         }
         this.release = release;
         this.languageVersion = languageVersion;
-        this.openABAP = openABAP;
         this.reg = reg;
     }
     /** input is one full object */
@@ -11311,7 +11308,7 @@ class StatementParser {
             return new nodes_1.StatementNode(new _statement_1.Empty()).setChildren(this.tokensToNodes(tokens));
         }
         for (const st of StatementParser.map.lookup(filtered[0].getStr())) {
-            const match = combi_1.Combi.run(st.matcher, filtered, this.release, this.languageVersion, this.openABAP);
+            const match = combi_1.Combi.run(st.matcher, filtered, this.release, this.languageVersion);
             if (match) {
                 const last = tokens[tokens.length - 1];
                 match.push(new nodes_1.TokenNode(last));
@@ -11321,7 +11318,7 @@ class StatementParser {
         }
         // next try the statements without specific keywords
         for (const st of StatementParser.map.lookup("")) {
-            const match = combi_1.Combi.run(st.matcher, filtered, this.release, this.languageVersion, this.openABAP);
+            const match = combi_1.Combi.run(st.matcher, filtered, this.release, this.languageVersion);
             if (match) {
                 const last = tokens[tokens.length - 1];
                 match.push(new nodes_1.TokenNode(last));
@@ -33276,10 +33273,18 @@ class Select {
         for (const s of node.findDirectExpressions(Expressions.SQLSource)) {
             sql_source_1.SQLSource.runSyntax(s, input);
         }
+        const upToWhere = node.findDirectExpression(Expressions.SQLCond);
+        const isCloud = input.scope.getLanguageVersion() === version_1.LanguageVersion.Cloud;
         for (const up of node.findDirectExpressions(Expressions.SQLUpTo)) {
+            // in classic Open SQL (INTO before WHERE) "UP TO" is allowed before INTO,
+            // in strict Open SQL (INTO after WHERE) "UP TO" must be placed after INTO
+            const intoAfterWhere = upToWhere !== undefined
+                && intoExpression !== undefined
+                && intoExpression.getFirstToken().getStart().isAfter(upToWhere.getFirstToken().getStart());
             if (intoExpression
                 && this.isStrictMode(node, input)
-                && (selectLoop === false || input.scope.getLanguageVersion() === version_1.LanguageVersion.Cloud)
+                && (isCloud || (this.upToUsesHostVariable(up) && intoAfterWhere))
+                && (selectLoop === false || isCloud)
                 && from.getFirstToken().getStart().isBefore(up.getFirstToken().getStart())
                 && up.getFirstToken().getStart().isBefore(intoExpression.getFirstToken().getStart())) {
                 const message = `The addition "UP TO n ROWS" must only be placed after the INTO/APPENDING clause.`;
@@ -33317,6 +33322,10 @@ class Select {
             input.scope.pop(node.getLastToken().getEnd());
         }
     }
+    static upToUsesHostVariable(up) {
+        var _a;
+        return ((_a = up.findFirstExpression(Expressions.SQLSource)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr()) === "@";
+    }
     static buildUpToRowsFix(node, input, up, intoExpression) {
         const tokens = node.getTokens();
         const upLast = up.getLastToken();
@@ -47399,19 +47408,17 @@ const structure_parser_1 = __webpack_require__(/*! ./3_structures/structure_pars
 const version_1 = __webpack_require__(/*! ../version */ "../core/build/src/version.js");
 class ABAPParser {
     constructor(optionsOrRelease, globalMacros, reg) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         if (optionsOrRelease === undefined || ABAPParser.isRelease(optionsOrRelease)) {
             this.release = optionsOrRelease !== null && optionsOrRelease !== void 0 ? optionsOrRelease : version_1.defaultRelease;
             this.languageVersion = version_1.LanguageVersion.Normal;
-            this.openABAP = false;
             this.globalMacros = globalMacros !== null && globalMacros !== void 0 ? globalMacros : [];
             this.reg = reg;
         }
         else {
             this.release = (_a = optionsOrRelease.release) !== null && _a !== void 0 ? _a : version_1.defaultRelease;
             this.languageVersion = (_b = optionsOrRelease.languageVersion) !== null && _b !== void 0 ? _b : version_1.LanguageVersion.Normal;
-            this.openABAP = (_c = optionsOrRelease.openABAP) !== null && _c !== void 0 ? _c : false;
-            this.globalMacros = (_d = optionsOrRelease.globalMacros) !== null && _d !== void 0 ? _d : [];
+            this.globalMacros = (_c = optionsOrRelease.globalMacros) !== null && _c !== void 0 ? _c : [];
             this.reg = optionsOrRelease.reg;
         }
     }
@@ -47429,7 +47436,7 @@ class ABAPParser {
         const lexingRuntime = Date.now() - b1;
         // 2: statements
         const b2 = Date.now();
-        const statementResult = new statement_parser_1.StatementParser(this.release, this.reg, this.languageVersion, this.openABAP)
+        const statementResult = new statement_parser_1.StatementParser(this.release, this.reg, this.languageVersion)
             .run(lexerResult, this.globalMacros);
         const statementsRuntime = Date.now() - b2;
         // 3: structures
@@ -53994,7 +54001,7 @@ const artifacts_rules_1 = __webpack_require__(/*! ./artifacts_rules */ "../core/
 const JSON5 = __importStar(__webpack_require__(/*! json5 */ "../core/node_modules/json5/dist/index.mjs"));
 // assumption: this class is immutable
 class Config {
-    static getDefault(ver, langVer, openABAP) {
+    static getDefault(ver, langVer) {
         const rules = {};
         const sorted = artifacts_rules_1.ArtifactsRules.getRules().sort((a, b) => {
             return a.getMetadata().key.localeCompare(b.getMetadata().key);
@@ -54028,7 +54035,6 @@ class Config {
             syntax: {
                 version,
                 languageVersion: langVer,
-                openABAP,
                 errorNamespace: "^(Z|Y|LCL\_|TY\_|LIF\_)",
                 globalConstants: [],
                 globalMacros: [],
@@ -54120,7 +54126,7 @@ class Config {
         return (0, version_1.versionToABAPRelease)(v);
     }
     getOpenABAP() {
-        return this.config.syntax.openABAP === true;
+        return this.getRelease() === version_1.Release["open-abap"];
     }
     getVersion() {
         const v = this.config.syntax.version;
@@ -54157,10 +54163,8 @@ class Config {
         if (version === version_1.Version.Cloud) {
             this.config.syntax.languageVersion = version_1.LanguageVersion.Cloud;
         }
-        else if (version === version_1.Version.OpenABAP) {
-            this.config.syntax.version = version_1.Version.v702;
-            this.config.syntax.openABAP = true;
-        }
+        // OpenABAP keeps its own version identity; open-abap-ness is derived from the
+        // release in getOpenABAP() rather than a separate stored flag.
     }
 }
 exports.Config = Config;
@@ -58531,12 +58535,12 @@ class ABAPObject extends _abstract_object_1.AbstractObject {
     static is(x) {
         return !!x && x instanceof ABAPObject;
     }
-    parse(release, globalMacros, reg, languageVersion = version_1.LanguageVersion.Normal, openABAP = false) {
+    parse(release, globalMacros, reg, languageVersion = version_1.LanguageVersion.Normal) {
         if (this.isDirty() === false) {
             return { updated: false, runtime: 0 };
         }
         const abapFiles = this.getFiles().filter(f => f.getFilename().endsWith(".abap"));
-        const result = new abap_parser_1.ABAPParser({ release, globalMacros, reg, languageVersion, openABAP }).parse(abapFiles);
+        const result = new abap_parser_1.ABAPParser({ release, globalMacros, reg, languageVersion }).parse(abapFiles);
         this.parsed = result.output;
         this.old = result.issues;
         this.dirty = false;
@@ -58682,7 +58686,7 @@ class AbstractObject {
     getParsingIssues() {
         return this.old;
     }
-    parse(_release, _globalMacros, _reg, _languageVersion, _openABAP) {
+    parse(_release, _globalMacros, _reg, _languageVersion) {
         return { updated: false, runtime: 0 };
     }
     getName() {
@@ -67988,7 +67992,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.51";
+        return "2.119.52";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -68236,7 +68240,7 @@ class Registry {
     // todo, refactor, this is a mess, see where-used, a lot of the code should be in this method instead
     parsePrivate(input) {
         const config = this.getConfig();
-        const result = input.parse(config.getRelease(), config.getSyntaxSetttings().globalMacros, this, config.getLanguageVersion(), config.getOpenABAP());
+        const result = input.parse(config.getRelease(), config.getSyntaxSetttings().globalMacros, this, config.getLanguageVersion());
         ParsingPerformance.push(input, result);
     }
     isDirty() {
@@ -97796,6 +97800,12 @@ const releaseDefsRaw = [
     ["v700", { abap: "700", kernel: 700, op: 700, cloud: null, ce: null }],
     ["v701", { abap: "701", kernel: 701, op: 701, cloud: null, ce: null }],
     ["v702", { abap: "702", kernel: 702, op: 702, cloud: null, ce: null }],
+    // OpenABAP: not a real SAP release. A dialect that is "702 baseline + a curated set
+    // of newer features" (opted in per-statement via AlsoIn.OpenABAP). Placed right after
+    // v702 on purpose: its ordinal must behave exactly like v702 for releaseAtLeast() gates
+    // (nothing else gates between v702 and v710), while staying a distinct identity so
+    // open-abap can be detected without a separate boolean flag.
+    ["open-abap", { abap: "open-abap", kernel: null, op: null, cloud: null, ce: null }],
     ["v710", { abap: "710", kernel: 710, op: 710, cloud: null, ce: null }],
     ["v711", { abap: "711", kernel: 711, op: 711, cloud: null, ce: null }],
     ["v720", { abap: "720", kernel: 720, op: 720, cloud: null, ce: null }],
@@ -97870,10 +97880,13 @@ const releaseDefsRaw = [
 ];
 /** All known releases in chronological order. Declaration order IS the ordering. */
 exports.ReleaseList = releaseDefsRaw.map(([name, r], i) => Object.freeze(Object.assign(Object.assign({}, r), { name, ordinal: i })));
+/** Base lookup, keyed by the raw release name (e.g. `"v762"`, `"Newest"`). */
+const byName = Object.fromEntries(releaseDefsRaw.map(([name], i) => [name, exports.ReleaseList[i]]));
 /** Lookup table keyed by release name (e.g. `Release.v740sp05`, `Release.Newest`). */
-exports.Release = Object.freeze(Object.assign(Object.assign({}, Object.fromEntries(releaseDefsRaw.map(([name], i) => [name, exports.ReleaseList[i]]))), { 
-    // Deprecated aliases: on-prem v750–v758 map to last cloud row at that op
-    v750: exports.ReleaseList[14], v751: exports.ReleaseList[17], v752: exports.ReleaseList[21], v753: exports.ReleaseList[25], v754: exports.ReleaseList[29], v755: exports.ReleaseList[33], v756: exports.ReleaseList[37], v757: exports.ReleaseList[41], v758: exports.ReleaseList[45], v816: exports.ReleaseList[53] }));
+exports.Release = Object.freeze(Object.assign(Object.assign({}, byName), { 
+    // Deprecated aliases: on-prem v750–v758 map to last cloud row at that op.
+    // Referenced by cloud name (not array index) so inserting rows can't silently repoint them.
+    v750: byName["v762"], v751: byName["v765"], v752: byName["v769"], v753: byName["v773"], v754: byName["v777"], v755: byName["v781"], v756: byName["v785"], v757: byName["v789"], v758: byName["v793"], v816: byName["v916"] }));
 /**
  * Is `running` at least as new as `required`?
  * Comparison is purely by ordinal (declaration order in ReleaseList).
@@ -97902,7 +97915,7 @@ const byDeprecated = Object.freeze({
     [Version.v758]: exports.Release["v758"],
     [Version.v816]: exports.Release["v816"],
     [Version.Cloud]: exports.Release["Newest"], // Cloud → Newest sentinel
-    [Version.OpenABAP]: exports.Release["v702"], // OpenABAP shares v702 release identity
+    [Version.OpenABAP]: exports.Release["open-abap"], // OpenABAP is its own release identity (702 baseline + curated features)
 });
 function versionToABAPRelease(v) {
     const found = byDeprecated[v];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.119.51",
+    "version": "2.119.52",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -39,7 +39,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.119.51",
+        "@abaplint/core": "^2.119.52",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",