@abaplint/core 2.119.29 → 2.119.30

package/build/abaplint.d.ts

@@ -2546,7 +2546,7 @@ declare namespace Expressions {
         ReduceBody,
         ReduceNext,
         ReportName,
-        SelectLoop_2 as SelectLoop,
+        SelectCTE,
         Select_3 as Select,
         SimpleFieldChain,
         SimpleFieldChain2,
@@ -2590,9 +2590,11 @@ declare namespace Expressions {
         SQLIn,
         SQLIntoList,
         SQLIntoStructure,
+        SQLFieldListLoopGreedy,
         SQLIntoTable,
         SQLJoin,
         SQLOptions,
+        SQLPackageSize,
         SQLOrderBy,
         SQLOver,
         SQLPath,
@@ -5902,6 +5904,7 @@ declare class Result {
     private nodes;
     constructor(tokens: readonly Token[], tokenIndex: number, nodes?: (ExpressionNode | TokenNode)[]);
     peek(): Token;
+    peekAt(offset: number): Token | undefined;
     shift(node: ExpressionNode | TokenNode): Result;
     popNode(): ExpressionNode | TokenNode | undefined;
     getNodes(): (ExpressionNode | TokenNode)[];
@@ -6066,6 +6069,10 @@ declare class Select_3 extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class SelectCTE extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class SelectionScreen implements IStatement {
     getMatcher(): IStatementRunnable;
 }
@@ -6074,10 +6081,6 @@ declare class SelectLoop implements IStatement {
     getMatcher(): IStatementRunnable;
 }
 
-declare class SelectLoop_2 extends Expression {
-    getRunnable(): IStatementRunnable;
-}
-
 declare class SelectOption implements IStatement {
     getMatcher(): IStatementRunnable;
 }
@@ -6414,6 +6417,10 @@ declare class SQLFieldListLoop extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class SQLFieldListLoopGreedy extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class SQLFieldName extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -6490,6 +6497,10 @@ declare class SQLOver extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class SQLPackageSize extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class SQLPath extends Expression {
     getRunnable(): IStatementRunnable;
 }

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

@@ -0,0 +1,163 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reclassifySelect = reclassifySelect;
+const Statements = __importStar(require("./statements"));
+const Expressions = __importStar(require("./expressions"));
+const nodes_1 = require("../nodes");
+const nodes_2 = require("../nodes");
+const expression_node_1 = require("../nodes/expression_node");
+function containsAggregation(children) {
+    for (const child of children) {
+        if (!(child instanceof expression_node_1.ExpressionNode)) {
+            continue;
+        }
+        if (child.get() instanceof Expressions.SQLAggregation) {
+            return true;
+        }
+        if (child.get() instanceof Expressions.SQLSetOpGroup) {
+            continue;
+        }
+        if (containsAggregation(child.getChildren())) {
+            return true;
+        }
+    }
+    return false;
+}
+function isCountAllPattern(children) {
+    for (const child of children) {
+        if (!(child instanceof expression_node_1.ExpressionNode)) {
+            continue;
+        }
+        const e = child.get();
+        if (e instanceof Expressions.SQLGroupBy ||
+            e instanceof Expressions.SQLHaving ||
+            e instanceof Expressions.SQLOrderBy) {
+            return false;
+        }
+    }
+    return containsAggregation(children);
+}
+function scanForExprTypes(children, found, targets) {
+    for (const child of children) {
+        if (found.size === targets.length) {
+            return;
+        }
+        if (!(child instanceof expression_node_1.ExpressionNode)) {
+            continue;
+        }
+        const e = child.get();
+        if (e instanceof Expressions.SQLSetOpGroup) {
+            continue;
+        }
+        for (const t of targets) {
+            if (e instanceof t) {
+                found.add(t);
+                break;
+            }
+        }
+        scanForExprTypes(child.getChildren(), found, targets);
+    }
+}
+function isSelectLoop(node) {
+    const selectExpr = node.findDirectExpression(Expressions.Select);
+    const top = selectExpr ? selectExpr.getChildren() : [];
+    if (top.some(c => c instanceof nodes_2.TokenNode && c.get().getStr().toUpperCase() === "SINGLE")) {
+        return false;
+    }
+    const targets = [
+        Expressions.SQLSetOp, Expressions.SQLPackageSize, Expressions.SQLIntoTable,
+        Expressions.SQLIntoStructure, Expressions.SQLIntoList, Expressions.SQLGroupBy,
+    ];
+    const found = new Set();
+    scanForExprTypes(top, found, targets);
+    const has = (t) => found.has(t);
+    if (has(Expressions.SQLPackageSize)) {
+        return true;
+    }
+    if (has(Expressions.SQLIntoTable)) {
+        return false;
+    }
+    const hasInto = has(Expressions.SQLIntoTable) || has(Expressions.SQLIntoStructure) || has(Expressions.SQLIntoList);
+    if (!hasInto && isCountAllPattern(top)) {
+        return false;
+    }
+    if (has(Expressions.SQLSetOp)) {
+        return true;
+    }
+    if (!has(Expressions.SQLGroupBy) && containsAggregation(top)) {
+        return false;
+    }
+    return true;
+}
+function isWithLoop(node) {
+    const selectExpr = node.findDirectExpression(Expressions.Select);
+    if (!selectExpr) {
+        return true;
+    }
+    const targets = [Expressions.SQLPackageSize, Expressions.SQLIntoTable];
+    const found = new Set();
+    scanForExprTypes(selectExpr.getChildren(), found, targets);
+    if (found.has(Expressions.SQLPackageSize)) {
+        return true;
+    }
+    if (found.has(Expressions.SQLIntoTable)) {
+        return false;
+    }
+    return true;
+}
+function reclassifySelect(node, stmt, pragmas) {
+    const children = [...node.getChildren()];
+    if (stmt instanceof Statements.Select || stmt instanceof Statements.SelectLoop) {
+        const loop = isSelectLoop(node);
+        if (loop && stmt instanceof Statements.Select) {
+            return new nodes_1.StatementNode(new Statements.SelectLoop(), node.getColon(), pragmas).setChildren(children);
+        }
+        else if (!loop && stmt instanceof Statements.SelectLoop) {
+            return new nodes_1.StatementNode(new Statements.Select(), node.getColon(), pragmas).setChildren(children);
+        }
+    }
+    else if (stmt instanceof Statements.With || stmt instanceof Statements.WithLoop) {
+        const loop = isWithLoop(node);
+        if (loop && stmt instanceof Statements.With) {
+            return new nodes_1.StatementNode(new Statements.WithLoop(), node.getColon(), pragmas).setChildren(children);
+        }
+        else if (!loop && stmt instanceof Statements.WithLoop) {
+            return new nodes_1.StatementNode(new Statements.With(), node.getColon(), pragmas).setChildren(children);
+        }
+    }
+    return node;
+}
+//# sourceMappingURL=_select_reclassify.js.map

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

@@ -51,6 +51,7 @@ exports.ver = ver;
 exports.verNot = verNot;
 exports.failCombinator = failCombinator;
 exports.failStar = failStar;
+exports.stopBefore = stopBefore;
 const Tokens = __importStar(require("../1_lexer/tokens"));
 const nodes_1 = require("../nodes");
 const version_1 = require("../../version");
@@ -943,4 +944,34 @@ function failCombinator() {
 function failStar() {
     return new FailStar();
 }
+// Passes through results where the next two tokens do NOT match t1 followed by t2.
+class StopBefore2 {
+    constructor(t1, t2) {
+        this.t1 = t1.toUpperCase();
+        this.t2 = t2.toUpperCase();
+    }
+    listKeywords() { return []; }
+    getUsing() { return []; }
+    run(r) {
+        var _a;
+        const result = [];
+        for (const input of r) {
+            const next = input.peek();
+            if (next === undefined) {
+                continue;
+            }
+            if (next.getUpperStr() === this.t1 && ((_a = input.peekAt(1)) === null || _a === void 0 ? void 0 : _a.getUpperStr()) === this.t2) {
+                continue;
+            }
+            result.push(input);
+        }
+        return result;
+    }
+    railroad() { return "Railroad.Terminal('stopBefore(" + this.t1 + " " + this.t2 + ")')"; }
+    toStr() { return "stopBefore(" + this.t1 + "," + this.t2 + ")"; }
+    first() { return [""]; }
+}
+function stopBefore(t1, t2) {
+    return new StopBefore2(t1, t2);
+}
 //# sourceMappingURL=combi.js.map

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

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildSelectCore = buildSelectCore;
+const combi_1 = require("../combi");
+const _1 = require(".");
+const version_1 = require("../../../version");
+const sql_group_by_1 = require("./sql_group_by");
+const sql_into_structure_1 = require("./sql_into_structure");
+const sql_up_to_1 = require("./sql_up_to");
+function buildSelectCore(into, 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 fieldList = (0, combi_1.optPrio)(_1.SQLFieldList);
+    const client = (0, combi_1.optPrio)(_1.SQLClient);
+    const byp = (0, combi_1.optPrio)(_1.SQLBypassingBuffer);
+    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 intoSingle = (0, combi_1.altPrio)(sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList);
+    const intoAny = into ? (0, combi_1.altPrio)(into, intoSingle) : intoSingle;
+    const intoForPackSize = _1.SQLIntoTable;
+    if (!into) {
+        const afterFromNoInto = (0, combi_1.seq)(_1.SQLFrom, client, byp, (0, combi_1.altPrio)((0, combi_1.seq)(sqlFields, fae, whereClause, groupHaving, ...orderUpOff, trailingOpts), (0, combi_1.seq)(fae, whereClause, groupHaving, ...orderUpOff, trailingOpts)));
+        const singleBody = (0, combi_1.seq)(_1.SQLFrom, client, byp, whereClause, groupHaving, trailingOpts);
+        return (0, combi_1.seq)("SELECT", (0, combi_1.altPrio)((0, combi_1.seq)("SINGLE", (0, combi_1.optPrio)("FOR UPDATE"), fieldList, singleBody), (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));
+    const trailingInto = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.seq)(intoForPackSize, (0, combi_1.optPrio)(_1.SQLPackageSize), (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(_1.SQLOrderBy), (0, combi_1.optPrio)(_1.SQLOptions))), (0, combi_1.optPrio)((0, combi_1.seq)(intoSingle, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (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)(sqlFields, fae, whereClause, groupHaving, ...orderUpOff, trailingOpts, trailingInto), (0, combi_1.seq)(intoForPackSize, (0, combi_1.optPrio)(_1.SQLPackageSize), (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, fae, whereClause, groupHaving, ...orderUpOff, trailingOpts, (0, combi_1.optPrio)(_1.SQLOptions)), (0, combi_1.seq)(intoSingle, byp, fae, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, whereClause, groupHaving, ...orderUpOff, trailingOpts, (0, combi_1.optPrio)(_1.SQLOptions)), (0, combi_1.seq)(fae, whereClause, groupHaving, ...orderUpOff, trailingOpts, trailingInto)));
+    const selectTableIntoThenFrom = (0, combi_1.seq)(intoForPackSize, (0, combi_1.optPrio)(_1.SQLPackageSize), (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), afterFromWithInto);
+    const selectOtherIntoThenFrom = (0, combi_1.seq)(intoAny, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, 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.altPrio)(selectTableIntoThenFrom, selectOtherIntoThenFrom, afterFromWithInto));
+    const singleAfterFrom = (0, combi_1.seq)(_1.SQLFrom, client, byp, (0, combi_1.altPrio)((0, combi_1.seq)(sqlFields, whereClause, groupHaving, trailingOpts, (0, combi_1.optPrio)(intoSingle)), (0, combi_1.seq)(intoSingle, byp, whereClause, groupHaving, trailingOpts), (0, combi_1.seq)(whereClause, groupHaving, trailingOpts, (0, combi_1.optPrio)(intoSingle))));
+    const singleIntoBeforeFrom = (0, combi_1.seq)(intoSingle, _1.SQLFrom, client, byp, whereClause, groupHaving, trailingOpts);
+    return (0, combi_1.seq)("SELECT", (0, combi_1.altPrio)((0, combi_1.seq)("SINGLE", (0, combi_1.optPrio)("FOR UPDATE"), fieldList, byp, (0, combi_1.altPrio)(singleIntoBeforeFrom, singleAfterFrom)), nonSingleBody));
+}
+//# sourceMappingURL=_select_core.js.map

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

@@ -159,7 +159,7 @@ __exportStar(require("./redefinition"), exports);
 __exportStar(require("./reduce_body"), exports);
 __exportStar(require("./reduce_next"), exports);
 __exportStar(require("./report_name"), exports);
-__exportStar(require("./select_loop"), exports);
+__exportStar(require("./select_cte"), exports);
 __exportStar(require("./select"), exports);
 __exportStar(require("./simple_field_chain"), exports);
 __exportStar(require("./simple_field_chain2"), exports);
@@ -203,9 +203,11 @@ __exportStar(require("./sql_hints"), exports);
 __exportStar(require("./sql_in"), exports);
 __exportStar(require("./sql_into_list"), exports);
 __exportStar(require("./sql_into_structure"), exports);
+__exportStar(require("./sql_field_list_loop_greedy"), exports);
 __exportStar(require("./sql_into_table"), exports);
 __exportStar(require("./sql_join"), exports);
 __exportStar(require("./sql_options"), exports);
+__exportStar(require("./sql_package_size"), exports);
 __exportStar(require("./sql_order_by"), exports);
 __exportStar(require("./sql_over"), exports);
 __exportStar(require("./sql_over"), exports);

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

@@ -5,13 +5,13 @@ const combi_1 = require("../combi");
 const _1 = require(".");
 const version_1 = require("../../../version");
 const sql_into_structure_1 = require("./sql_into_structure");
-const select_core_1 = require("./select_core");
+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, select_core_1.buildSelectCore)(into);
+        const standalone = (0, _select_core_1.buildSelectCore)(into);
         const unionTail = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.plusPrio)(_1.SQLSetOp), version_1.Version.OpenABAP);
-        const chained = (0, combi_1.seq)((0, select_core_1.buildSelectCore)(undefined, false), unionTail, (0, combi_1.optPrio)(_1.SQLOrderBy), (0, combi_1.optPrio)(into));
+        const chained = (0, combi_1.seq)((0, _select_core_1.buildSelectCore)(undefined, false), unionTail, (0, combi_1.optPrio)(_1.SQLOrderBy), (0, combi_1.optPrio)(into));
         return (0, combi_1.altPrio)(chained, standalone);
     }
 }

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

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SelectCTE = void 0;
+const combi_1 = require("../combi");
+const _1 = require(".");
+const version_1 = require("../../../version");
+const sql_field_list_loop_greedy_1 = require("./sql_field_list_loop_greedy");
+const sql_fields_loop_1 = require("./sql_fields_loop");
+const sql_up_to_1 = require("./sql_up_to");
+const sql_source_1 = require("./sql_source");
+const sql_set_op_group_1 = require("./sql_set_op_group");
+class SelectCTE extends combi_1.Expression {
+    getRunnable() {
+        const where = (0, combi_1.seq)("WHERE", _1.SQLCond);
+        const bypass = "BYPASSING BUFFER";
+        const privileged = (0, combi_1.ver)(version_1.Version.v758, _1.SQLPrivilegedAccess);
+        const offset = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("OFFSET", sql_source_1.SQLSource));
+        const groupHaving = (0, combi_1.seq)((0, combi_1.optPrio)(_1.SQLGroupBy), (0, combi_1.optPrio)(_1.SQLHaving));
+        const tail = (0, combi_1.seq)(groupHaving, (0, combi_1.optPrio)((0, combi_1.seq)(_1.SQLOrderBy, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), (0, combi_1.optPrio)(offset))), (0, combi_1.optPrio)(_1.SQLHints), (0, combi_1.optPrio)(privileged), (0, combi_1.optPrio)(_1.SQLOptions), (0, combi_1.optPrio)(_1.DatabaseConnection));
+        const sqlStyle = (0, combi_1.seq)(_1.SQLFrom, (0, combi_1.optPrio)(_1.SQLClient), (0, combi_1.optPrio)(bypass), (0, combi_1.ver)(version_1.Version.v750, sql_fields_loop_1.SQLFieldsLoop, version_1.Version.OpenABAP), (0, combi_1.optPrio)(_1.SQLForAllEntries), (0, combi_1.optPrio)(where), tail);
+        const abapStyle = (0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), sql_field_list_loop_greedy_1.SQLFieldListLoopGreedy, _1.SQLFrom, (0, combi_1.optPrio)(_1.SQLClient), (0, combi_1.optPrio)(bypass), (0, combi_1.optPrio)(_1.SQLForAllEntries), (0, combi_1.optPrio)(where), tail);
+        const union = (0, combi_1.seq)("UNION", (0, combi_1.optPrio)((0, combi_1.altPrio)("DISTINCT", "ALL")));
+        const intersectExcept = (0, combi_1.altPrio)((0, combi_1.seq)("INTERSECT", (0, combi_1.optPrio)("DISTINCT")), (0, combi_1.seq)("EXCEPT", (0, combi_1.optPrio)("DISTINCT")));
+        const setOp = (0, combi_1.altPrio)((0, combi_1.ver)(version_1.Version.v750, union, version_1.Version.OpenABAP), (0, combi_1.ver)(version_1.Version.v756, intersectExcept));
+        const operandSql = (0, combi_1.seq)(_1.SQLFrom, (0, combi_1.optPrio)(_1.SQLClient), (0, combi_1.optPrio)(bypass), (0, combi_1.ver)(version_1.Version.v750, sql_fields_loop_1.SQLFieldsLoop, version_1.Version.OpenABAP), (0, combi_1.optPrio)(_1.SQLForAllEntries), (0, combi_1.optPrio)(where), groupHaving);
+        const operandAbap = (0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), sql_field_list_loop_greedy_1.SQLFieldListLoopGreedy, _1.SQLFrom, (0, combi_1.optPrio)(_1.SQLClient), (0, combi_1.optPrio)(bypass), (0, combi_1.optPrio)(_1.SQLForAllEntries), (0, combi_1.optPrio)(where), groupHaving);
+        const operandCore = (0, combi_1.altPrio)(operandSql, operandAbap);
+        const unionOperand = (0, combi_1.altPrio)(sql_set_op_group_1.SQLSetOpGroup, (0, combi_1.seq)("SELECT", operandCore));
+        const unionTail = (0, combi_1.starPrio)((0, combi_1.seq)(setOp, unionOperand));
+        const selectBody = (0, combi_1.seq)("SELECT", (0, combi_1.altPrio)(sqlStyle, abapStyle));
+        return (0, combi_1.seq)(selectBody, unionTail);
+    }
+}
+exports.SelectCTE = SelectCTE;
+//# sourceMappingURL=select_cte.js.map

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

@@ -12,12 +12,12 @@ class SQLCompare extends combi_1.Expression {
         const between = (0, combi_1.seq)("BETWEEN", _1.SQLSource, "AND", _1.SQLSource);
         const like = (0, combi_1.seq)("LIKE", _1.SQLSource, (0, combi_1.optPrio)((0, combi_1.seq)("ESCAPE", _1.SQLSource)));
         const nul = (0, combi_1.seq)("IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("NULL", (0, combi_1.ver)(version_1.Version.v753, "INITIAL")));
-        const source = new _1.SQLSource();
         const sub = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("ALL", "ANY", "SOME")), subSelect);
+        const source = new _1.SQLSource();
         const arith = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/"), _1.SQLFieldName)), version_1.Version.OpenABAP);
         const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), _1.Source, (0, combi_1.tok)(tokens_1.WParenRightW));
         const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.altPrio)(_1.SimpleSource3, paren)), version_1.Version.OpenABAP);
-        const rett = (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLAggregation, _1.SQLFunction, _1.ConstantString, (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLPath, _1.SQLFieldName), (0, combi_1.optPrio)(arith)), at), (0, combi_1.altPrio)((0, combi_1.seq)(_1.SQLCompareOperator, (0, combi_1.altPrio)(sub, _1.SQLAggregation, _1.SQLFunction, source)), (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(_1.SQLIn, like, between)), nul));
+        const rett = (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLCase, _1.SQLAggregation, _1.SQLFunction, _1.ConstantString, (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLPath, _1.SQLFieldName), (0, combi_1.optPrio)(arith)), at), (0, combi_1.altPrio)((0, combi_1.seq)(_1.SQLCompareOperator, (0, combi_1.altPrio)(sub, _1.SQLCase, _1.SQLAggregation, _1.SQLFunction, (0, combi_1.seq)(source, (0, combi_1.optPrio)(arith)))), (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(_1.SQLIn, like, between)), nul));
         const exists = (0, combi_1.seq)("EXISTS", subSelect);
         return (0, combi_1.altPrio)(exists, _1.Dynamic, rett);
     }

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

@@ -17,16 +17,20 @@ class SQLField extends combi_1.Expression {
         const field = (0, combi_1.altPrio)(_1.SQLAggregation, fieldNoAgg);
         const parenField = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), field, (0, combi_1.tok)(tokens_1.WParenRightW));
         const parenFieldNoAgg = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), fieldNoAgg, (0, combi_1.tok)(tokens_1.WParenRightW));
-        // arithmetic without aggregates as operands: from v740sp05
+        // without aggregates: from v740sp05
         const subNoAgg = (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/", "&&"), (0, combi_1.altPrio)(parenFieldNoAgg, fieldNoAgg)));
         const arithNoAgg = (0, combi_1.ver)(version_1.Version.v740sp05, subNoAgg);
-        // arithmetic with aggregates as operands: from v754
+        // with aggregates: from v754
         const subWithAgg = (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/", "&&"), (0, combi_1.altPrio)(parenField, field)));
         const arithWithAgg = (0, combi_1.ver)(version_1.Version.v754, subWithAgg);
         const arith = (0, combi_1.altPrio)(arithWithAgg, arithNoAgg);
         const arithSequence = (0, combi_1.seq)(field, (0, combi_1.optPrio)(arith));
         const parenArithSequence = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), arithSequence, (0, combi_1.tok)(tokens_1.WParenRightW));
-        return (0, combi_1.seq)((0, combi_1.altPrio)(parenArithSequence, arithSequence), (0, combi_1.optPrio)(as));
+        // allows (a-b)*(c-d) — paren groups as operands, defined after parenArithSequence
+        const subExtWithAgg = (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/", "&&"), (0, combi_1.altPrio)(parenArithSequence, parenField, field)));
+        const subExtNoAgg = (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/", "&&"), (0, combi_1.altPrio)(parenArithSequence, parenFieldNoAgg, fieldNoAgg)));
+        const arithExt = (0, combi_1.altPrio)((0, combi_1.ver)(version_1.Version.v754, subExtWithAgg), (0, combi_1.ver)(version_1.Version.v740sp05, subExtNoAgg));
+        return (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.seq)(parenArithSequence, (0, combi_1.optPrio)(arithExt)), arithSequence), (0, combi_1.optPrio)(as));
     }
 }
 exports.SQLField = SQLField;

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

@@ -10,7 +10,7 @@ class SQLFieldList extends combi_1.Expression {
         const as = (0, combi_1.seq)("AS", _1.SQLAsName);
         const commaParenField = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), _1.SQLFieldName, (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.WParenRight)), (0, combi_1.optPrio)(as));
         const nev = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.starPrio)((0, combi_1.seq)(",", (0, combi_1.altPrio)(_1.SQLField, commaParenField))), version_1.Version.OpenABAP);
-        const old = (0, combi_1.starPrio)(_1.SQLField);
+        const old = (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.stopBefore)("UP", "TO"), _1.SQLField));
         return (0, combi_1.altPrio)("*", _1.Dynamic, (0, combi_1.seq)(_1.SQLField, (0, combi_1.alt)(nev, old)));
     }
 }

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

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLFieldListLoopGreedy = void 0;
+const combi_1 = require("../combi");
+const _1 = require(".");
+const version_1 = require("../../../version");
+const sql_path_1 = require("./sql_path");
+const tokens_1 = require("../../1_lexer/tokens");
+class SQLFieldListLoopGreedy extends combi_1.Expression {
+    getRunnable() {
+        const comma = (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp05, ",", version_1.Version.OpenABAP));
+        const as = (0, combi_1.seq)("AS", _1.SQLAsName);
+        const abap = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), _1.SimpleFieldChain2), version_1.Version.OpenABAP);
+        const entry = (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLField, abap, sql_path_1.SQLPath, _1.SQLFieldName, _1.Constant), (0, combi_1.optPrio)(as), comma);
+        const fieldList = (0, combi_1.plusPrio)(entry);
+        return (0, combi_1.altPrio)("*", _1.Dynamic, fieldList);
+    }
+}
+exports.SQLFieldListLoopGreedy = SQLFieldListLoopGreedy;
+//# sourceMappingURL=sql_field_list_loop_greedy.js.map

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

@@ -4,7 +4,7 @@ exports.SQLFieldName = void 0;
 const combi_1 = require("../combi");
 class SQLFieldName extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.regex)(/^(?!(?:SINGLE|INTO|DISTINCT|AS|WHERE|FOR|HAVING|APPENDING|UP|FROM)$)(\/\w+\/)?(\*?\w+~(\/\w+\/)?(\w+|\*)|\w+)$/i);
+        return (0, combi_1.regex)(/^(?!(?:FROM|INTO|HAVING|FOR|DISTINCT|UNION|INTERSECT|EXCEPT|NOT|WHEN|CASE|AS|APPENDING|WHERE|CONNECTION|EXISTS|INSERT|MODIFY)$)(\/\w+\/)?(\*?\w+~(\/\w+\/)?(\w+|\*)|\w+)$/i);
     }
 }
 exports.SQLFieldName = SQLFieldName;

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

@@ -5,7 +5,7 @@ const combi_1 = require("../combi");
 const _1 = require(".");
 class SQLFieldsLoop extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)("FIELDS", (0, combi_1.opt)("DISTINCT"), _1.SQLFieldListLoop);
+        return (0, combi_1.seq)("FIELDS", (0, combi_1.opt)("DISTINCT"), _1.SQLFieldListLoopGreedy);
     }
 }
 exports.SQLFieldsLoop = SQLFieldsLoop;

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

@@ -9,7 +9,7 @@ const sql_function_input_1 = require("./sql_function_input");
 const sql_case_1 = require("./sql_case");
 class SQLFunction extends combi_1.Expression {
     getRunnable() {
-        const castTypes = (0, combi_1.altPrio)((0, combi_1.seq)("CHAR", (0, combi_1.optPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)))), (0, combi_1.seq)("DEC", (0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, ",", integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)), (0, combi_1.seq)("NUMC", (0, combi_1.optPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)))), "DATS", "FLTP", "INT2", "INT4", "INT8");
+        const castTypes = (0, combi_1.altPrio)((0, combi_1.seq)("CHAR", (0, combi_1.optPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)))), (0, combi_1.seq)("DEC", (0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, ",", integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)), (0, combi_1.seq)("NUMC", (0, combi_1.optPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)))), "DATS", "FLTP", "INT1", "INT2", "INT4", "INT8");
         const commaParam = (0, combi_1.seq)(",", sql_function_input_1.SQLFunctionInput);
         // note: the function names are not keywords, they are usually in lower case
         const abs = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^abs$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
@@ -17,7 +17,7 @@ class SQLFunction extends combi_1.Expression {
         const castInput = (0, combi_1.altPrio)(sql_case_1.SQLCase, sql_function_input_1.SQLFunctionInput);
         const cast = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^cast$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), castInput, "AS", castTypes, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const ceil = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^ceil$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const coalesce = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^coalesce$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.optPrio)(commaParam), (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const coalesce = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^coalesce$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.starPrio)(commaParam), (0, combi_1.tok)(tokens_1.WParenRightW)));
         const concat = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^concat$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const div = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^div$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const floor = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^floor$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));

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

@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLJoin = void 0;
 const combi_1 = require("../combi");
 const _1 = require(".");
+const version_1 = require("../../../version");
 class SQLJoin extends combi_1.Expression {
     getRunnable() {
         const joinType = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("INNER", "LEFT OUTER", "LEFT", "RIGHT OUTER", "RIGHT")), "JOIN");
         const join = (0, combi_1.seq)(joinType, _1.SQLFromSource, "ON", _1.SQLCond);
-        return join;
+        const crossJoin = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("CROSS JOIN", _1.SQLFromSource), version_1.Version.OpenABAP);
+        return (0, combi_1.altPrio)(crossJoin, join);
     }
 }
 exports.SQLJoin = SQLJoin;

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLPackageSize = void 0;
+const combi_1 = require("../combi");
+const _1 = require(".");
+class SQLPackageSize extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)("PACKAGE SIZE", _1.SQLSource);
+    }
+}
+exports.SQLPackageSize = SQLPackageSize;
+//# sourceMappingURL=sql_package_size.js.map

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

@@ -4,10 +4,10 @@ exports.SQLSetOp = void 0;
 const combi_1 = require("../combi");
 const version_1 = require("../../../version");
 const sql_set_op_group_1 = require("./sql_set_op_group");
-const select_core_1 = require("./select_core");
+const _select_core_1 = require("./_select_core");
 class SQLSetOp extends combi_1.Expression {
     getRunnable() {
-        const operand = (0, combi_1.altPrio)(sql_set_op_group_1.SQLSetOpGroup, (0, select_core_1.buildSelectCore)(undefined, false));
+        const operand = (0, combi_1.altPrio)(sql_set_op_group_1.SQLSetOpGroup, (0, _select_core_1.buildSelectCore)(undefined, false));
         const union = (0, combi_1.seq)("UNION", (0, combi_1.optPrio)((0, combi_1.altPrio)("DISTINCT", "ALL")));
         const intersectExcept = (0, combi_1.altPrio)((0, combi_1.seq)("INTERSECT", (0, combi_1.optPrio)("DISTINCT")), (0, combi_1.seq)("EXCEPT", (0, combi_1.optPrio)("DISTINCT")));
         const op = (0, combi_1.altPrio)((0, combi_1.ver)(version_1.Version.v750, union, version_1.Version.OpenABAP), (0, combi_1.ver)(version_1.Version.v756, intersectExcept));

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

@@ -4,10 +4,10 @@ exports.SQLSetOpGroup = void 0;
 const combi_1 = require("../combi");
 const _1 = require(".");
 const version_1 = require("../../../version");
-const select_core_1 = require("./select_core");
+const _select_core_1 = require("./_select_core");
 class SQLSetOpGroup extends combi_1.Expression {
     getRunnable() {
-        const operand = (0, combi_1.altPrio)(SQLSetOpGroup, (0, select_core_1.buildSelectCore)(undefined, false));
+        const operand = (0, combi_1.altPrio)(SQLSetOpGroup, (0, _select_core_1.buildSelectCore)(undefined, false));
         const chain = (0, combi_1.seq)(operand, (0, combi_1.optPrio)((0, combi_1.seq)((0, combi_1.ver)(version_1.Version.v750, (0, combi_1.plusPrio)(_1.SQLSetOp), version_1.Version.OpenABAP), (0, combi_1.optPrio)(_1.SQLOrderBy))));
         return (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("(", chain, ")"), version_1.Version.OpenABAP);
     }

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

@@ -3,9 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WithName = void 0;
 const tokens_1 = require("../../1_lexer/tokens");
 const combi_1 = require("../combi");
+const sql_field_name_1 = require("./sql_field_name");
 class WithName extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WPlus), (0, combi_1.regex)(/^\w+$/));
+        // ( has no leading space, ) has leading space
+        const colList = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), sql_field_name_1.SQLFieldName, (0, combi_1.star)((0, combi_1.seq)(",", sql_field_name_1.SQLFieldName)), (0, combi_1.tok)(tokens_1.WParenRightW));
+        return (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WPlus), (0, combi_1.regex)(/^\w+$/), (0, combi_1.optPrio)(colList));
     }
 }
 exports.WithName = WithName;

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

@@ -15,6 +15,9 @@ class Result {
     peek() {
         return this.tokens[this.tokenIndex];
     }
+    peekAt(offset) {
+        return this.tokens[this.tokenIndex + offset];
+    }
     shift(node) {
         const cp = this.nodes.slice();
         cp.push(node);

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

@@ -43,7 +43,8 @@ const combi_1 = require("./combi");
 const _statement_1 = require("./statements/_statement");
 const expand_macros_1 = require("./expand_macros");
 const tokens_1 = require("../1_lexer/tokens");
-exports.STATEMENT_MAX_TOKENS = 1000;
+const _select_reclassify_1 = require("./_select_reclassify");
+exports.STATEMENT_MAX_TOKENS = 20000;
 class StatementMap {
     constructor() {
         this.map = {};
@@ -266,7 +267,8 @@ class StatementParser {
             if (match) {
                 const last = tokens[tokens.length - 1];
                 match.push(new nodes_1.TokenNode(last));
-                return new nodes_1.StatementNode(st.statement, statement.getColon(), pragmas).setChildren(match);
+                const matched = new nodes_1.StatementNode(st.statement, statement.getColon(), pragmas).setChildren(match);
+                return (0, _select_reclassify_1.reclassifySelect)(matched, st.statement, pragmas);
             }
         }
         // next try the statements without specific keywords
@@ -275,7 +277,8 @@ class StatementParser {
             if (match) {
                 const last = tokens[tokens.length - 1];
                 match.push(new nodes_1.TokenNode(last));
-                return new nodes_1.StatementNode(st.statement, statement.getColon(), pragmas).setChildren(match);
+                const matched = new nodes_1.StatementNode(st.statement, statement.getColon(), pragmas).setChildren(match);
+                return (0, _select_reclassify_1.reclassifySelect)(matched, st.statement, pragmas);
             }
         }
         return statement;

package/build/src/abap/2_statements/statements/select_loop.js

@@ -4,7 +4,7 @@ exports.SelectLoop = void 0;
 const expressions_1 = require("../expressions");
 class SelectLoop {
     getMatcher() {
-        return new expressions_1.SelectLoop();
+        return new expressions_1.Select();
     }
 }
 exports.SelectLoop = SelectLoop;

package/build/src/abap/2_statements/statements/with.js

@@ -7,8 +7,8 @@ const expressions_1 = require("../expressions");
 const tokens_1 = require("../../1_lexer/tokens");
 class With {
     getMatcher() {
-        const as = (0, combi_1.seq)(expressions_1.WithName, "AS", (0, combi_1.tok)(tokens_1.WParenLeftW), expressions_1.SelectLoop, (0, combi_1.tok)(tokens_1.WParenRightW));
-        return (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("WITH", (0, combi_1.plus)(as), expressions_1.Select));
+        const cte = (0, combi_1.seq)(expressions_1.WithName, "AS", (0, combi_1.tok)(tokens_1.WParenLeftW), expressions_1.SelectCTE, (0, combi_1.tok)(tokens_1.WParenRightW));
+        return (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("WITH", cte, (0, combi_1.star)((0, combi_1.seq)(",", cte)), expressions_1.Select));
     }
 }
 exports.With = With;

package/build/src/abap/2_statements/statements/with_loop.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WithLoop = void 0;
-const combi_1 = require("../combi");
-const version_1 = require("../../../version");
-const tokens_1 = require("../../1_lexer/tokens");
-const expressions_1 = require("../expressions");
+const with_1 = require("./with");
 class WithLoop {
     getMatcher() {
-        const as = (0, combi_1.seq)(expressions_1.WithName, "AS", (0, combi_1.tok)(tokens_1.WParenLeftW), expressions_1.SelectLoop, (0, combi_1.tok)(tokens_1.WParenRightW));
-        return (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("WITH", (0, combi_1.plus)(as), expressions_1.SelectLoop));
+        return new with_1.With().getMatcher();
     }
 }
 exports.WithLoop = WithLoop;

package/build/src/abap/5_syntax/expressions/select.js

@@ -385,15 +385,7 @@ class Select {
         var _a, _b;
         let expr = undefined;
         const ret = [];
-        if (node.get() instanceof Expressions.SelectLoop) {
-            expr = node.findFirstExpression(Expressions.SQLFieldListLoop);
-            if (expr === undefined) {
-                expr = node;
-            }
-        }
-        else {
-            expr = node.findFirstExpression(Expressions.SQLFieldList);
-        }
+        expr = node.findFirstExpression(Expressions.SQLFieldList);
         if (((_a = expr === null || expr === void 0 ? void 0 : expr.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.Dynamic) {
             dynamic_1.Dynamic.runSyntax(expr.getFirstChild(), input);
         }

package/build/src/abap/5_syntax/statements/read_dataset.js

@@ -0,0 +1,51 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReadDataset = void 0;
+const Expressions = __importStar(require("../../2_statements/expressions"));
+const source_1 = require("../expressions/source");
+const target_1 = require("../expressions/target");
+class ReadDataset {
+    runSyntax(node, input) {
+        for (const s of node.findDirectExpressions(Expressions.Source)) {
+            source_1.Source.runSyntax(s, input);
+        }
+        for (const t of node.findDirectExpressions(Expressions.Target)) {
+            target_1.Target.runSyntax(t, input);
+        }
+    }
+}
+exports.ReadDataset = ReadDataset;
+//# sourceMappingURL=read_dataset.js.map

package/build/src/abap/5_syntax/statements/select_loop.js

@@ -35,12 +35,12 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectLoop = void 0;
 const Expressions = __importStar(require("../../2_statements/expressions"));
-const select_loop_1 = require("../expressions/select_loop");
+const select_1 = require("../expressions/select");
 class SelectLoop {
     runSyntax(node, input) {
-        const s = node.findDirectExpression(Expressions.SelectLoop);
+        const s = node.findDirectExpression(Expressions.Select);
         if (s) {
-            select_loop_1.SelectLoop.runSyntax(s, input);
+            select_1.Select.runSyntax(s, input);
         }
     }
 }

package/build/src/abap/5_syntax/statements/with.js

@@ -36,15 +36,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.With = void 0;
 const Expressions = __importStar(require("../../2_statements/expressions"));
 const select_1 = require("../expressions/select");
-const select_loop_1 = require("../expressions/select_loop");
 class With {
     runSyntax(node, input) {
         for (const s of node.findAllExpressions(Expressions.Select)) {
             select_1.Select.runSyntax(s, input);
         }
-        for (const s of node.findAllExpressions(Expressions.SelectLoop)) {
-            select_loop_1.SelectLoop.runSyntax(s, input);
-        }
     }
 }
 exports.With = With;

package/build/src/abap/5_syntax/statements/with_loop.js

@@ -36,15 +36,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WithLoop = void 0;
 const Expressions = __importStar(require("../../2_statements/expressions"));
 const select_1 = require("../expressions/select");
-const select_loop_1 = require("../expressions/select_loop");
 class WithLoop {
     runSyntax(node, input) {
         for (const s of node.findAllExpressions(Expressions.Select)) {
             select_1.Select.runSyntax(s, input);
         }
-        for (const s of node.findAllExpressions(Expressions.SelectLoop)) {
-            select_loop_1.SelectLoop.runSyntax(s, input);
-        }
     }
 }
 exports.WithLoop = WithLoop;

package/build/src/abap/5_syntax/syntax.js

@@ -183,6 +183,7 @@ const insert_field_group_1 = require("./statements/insert_field_group");
 const read_entities_1 = require("./statements/read_entities");
 const modify_entities_1 = require("./statements/modify_entities");
 const commit_entities_1 = require("./statements/commit_entities");
+const read_dataset_1 = require("./statements/read_dataset");
 const _syntax_input_1 = require("./_syntax_input");
 const assert_error_1 = require("./assert_error");
 const field_group_1 = require("./statements/field_group");
@@ -311,6 +312,7 @@ if (Object.keys(map).length === 0) {
     addToMap(new parameter_1.Parameter());
     addToMap(new fieldsymbol_1.FieldSymbol());
     addToMap(new read_entities_1.ReadEntities());
+    addToMap(new read_dataset_1.ReadDataset());
     addToMap(new modify_entities_1.ModifyEntities());
     addToMap(new commit_entities_1.CommitEntities());
     addToMap(new call_kernel_1.CallKernel());

package/build/src/registry.js

@@ -74,7 +74,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.29";
+        return "2.119.30";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/downport.js

@@ -584,6 +584,9 @@ Make sure to test the downported code, it might not always be completely correct
         if (where === undefined) {
             return undefined;
         }
+        if (high.findFirstExpression(Expressions.SQLFields) !== undefined) {
+            return undefined;
+        }
         let into = high.findFirstExpression(Expressions.SQLIntoList);
         if (into === undefined) {
             into = high.findFirstExpression(Expressions.SQLIntoStructure);

package/build/src/rules/prefix_is_current_class.js

@@ -37,11 +37,13 @@ exports.PrefixIsCurrentClass = exports.PrefixIsCurrentClassConf = void 0;
 const issue_1 = require("../issue");
 const _abap_rule_1 = require("./_abap_rule");
 const Structures = __importStar(require("../abap/3_structures/structures"));
+const Statements = __importStar(require("../abap/2_statements/statements"));
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const expressions_1 = require("../abap/2_statements/expressions");
 const position_1 = require("../position");
 const edit_helper_1 = require("../edit_helper");
 const _irule_1 = require("./_irule");
+const comment_1 = require("../abap/1_lexer/tokens/comment");
 class PrefixIsCurrentClassConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -117,11 +119,16 @@ class PrefixIsCurrentClass extends _abap_rule_1.ABAPRule {
         for (const c of classStructures) {
             const className = c.findFirstExpression(expressions_1.ClassName).getFirstToken().getStr().toUpperCase();
             const staticAccess = className + "=>";
+            const shadowed = this.buildShadowedNames(struc, c, className);
             for (const s of c.findAllStatementNodes()) {
                 const concat = s.concatTokensWithoutStringsAndComments().toUpperCase();
                 if (concat.includes(staticAccess)) {
-                    const tokenPos = s.findTokenSequencePosition(className, "=>");
-                    if (tokenPos) {
+                    // when the referenced member is shadowed by a method parameter or local
+                    // declaration, the class prefix is required and cannot be omitted, see issues #3755 and #3707
+                    const names = shadowed.get(s);
+                    const ref = this.findStaticReferences(s, className).find(r => r.member === undefined || (names === null || names === void 0 ? void 0 : names.has(r.member)) !== true);
+                    if (ref) {
+                        const tokenPos = ref.pos;
                         const end = new position_1.Position(tokenPos.getRow(), tokenPos.getCol() + className.length + 2);
                         const fix = edit_helper_1.EditHelper.deleteRange(file, tokenPos, end);
                         issues.push(issue_1.Issue.atRange(file, tokenPos, end, "Reference to current class can be omitted: \"" + staticAccess + "\"", this.getMetadata().key, this.conf.severity, fix));
@@ -141,6 +148,62 @@ class PrefixIsCurrentClass extends _abap_rule_1.ABAPRule {
         }
         return issues;
     }
+    /** finds "className=>member" references in the statement, position is the start of the class name */
+    findStaticReferences(s, className) {
+        var _a;
+        const refs = [];
+        const tokens = s.getTokens().filter(t => !(t instanceof comment_1.Comment));
+        for (let i = 0; i < tokens.length - 1; i++) {
+            if (tokens[i].getStr().toUpperCase() === className
+                && tokens[i + 1].getStr() === "=>") {
+                refs.push({
+                    pos: tokens[i].getStart(),
+                    member: (_a = tokens[i + 2]) === null || _a === void 0 ? void 0 : _a.getStr().toUpperCase(),
+                });
+            }
+        }
+        return refs;
+    }
+    /** for each statement in a method implementation: the method parameter and local
+     *  declaration names that shadow class members of the same name */
+    buildShadowedNames(struc, impl, className) {
+        var _a, _b, _c;
+        const map = new Map();
+        if (!(impl.get() instanceof Structures.ClassImplementation)) {
+            return map;
+        }
+        const definition = struc.findDirectStructures(Structures.ClassDefinition).find(d => { var _a; return ((_a = d.findFirstExpression(expressions_1.ClassName)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr().toUpperCase()) === className; });
+        for (const method of impl.findAllStructuresRecursive(Structures.Method)) {
+            const names = new Set();
+            const methodName = (_b = (_a = method.findFirstStatement(Statements.MethodImplementation)) === null || _a === void 0 ? void 0 : _a.findFirstExpression(expressions_1.MethodName)) === null || _b === void 0 ? void 0 : _b.concatTokens().toUpperCase();
+            if (definition !== undefined && methodName !== undefined) {
+                for (const def of definition.findAllStatements(Statements.MethodDef)) {
+                    if (((_c = def.findFirstExpression(expressions_1.MethodName)) === null || _c === void 0 ? void 0 : _c.concatTokens().toUpperCase()) === methodName) {
+                        for (const param of def.findAllExpressions(expressions_1.MethodParamName)) {
+                            names.add(param.concatTokens().toUpperCase());
+                        }
+                        break;
+                    }
+                }
+            }
+            for (const d of method.findAllExpressions(expressions_1.DefinitionName)) {
+                names.add(d.concatTokens().toUpperCase());
+            }
+            for (const inline of method.findAllExpressions(expressions_1.InlineData)) {
+                const field = inline.findFirstExpression(expressions_1.TargetField);
+                if (field) {
+                    names.add(field.concatTokens().toUpperCase());
+                }
+            }
+            if (names.size === 0) {
+                continue;
+            }
+            for (const statement of method.findAllStatementNodes()) {
+                map.set(statement, names);
+            }
+        }
+        return map;
+    }
 }
 exports.PrefixIsCurrentClass = PrefixIsCurrentClass;
 //# sourceMappingURL=prefix_is_current_class.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.119.29",
+    "version": "2.119.30",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",

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

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildSelectCore = buildSelectCore;
-const combi_1 = require("../combi");
-const _1 = require(".");
-const version_1 = require("../../../version");
-const sql_group_by_1 = require("./sql_group_by");
-const sql_into_structure_1 = require("./sql_into_structure");
-const sql_up_to_1 = require("./sql_up_to");
-function buildSelectCore(into, 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 bypass = (0, combi_1.str)("BYPASSING BUFFER");
-    const fields = (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 orderByItems = allowOrderBy ? [_1.SQLOrderBy, sql_up_to_1.SQLUpTo, offset] : [];
-    const permItems = [_1.SQLFrom, ...(into ? [into] : []), _1.SQLForAllEntries, where,
-        ...orderByItems, _1.SQLClient, _1.SQLHaving,
-        bypass, sql_group_by_1.SQLGroupBy, fields, _1.DatabaseConnection, _1.SQLHints, privileged, _1.SQLOptions];
-    const perm = (0, combi_1.per)(permItems[0], permItems[1], ...permItems.slice(2));
-    const intoSingle = (0, combi_1.altPrio)(sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList);
-    const permSingleItems = [_1.SQLFrom, ...(into ? [intoSingle] : []), where, _1.SQLClient,
-        bypass, sql_group_by_1.SQLGroupBy, _1.SQLHaving, fields, _1.DatabaseConnection, _1.SQLHints, privileged, _1.SQLOptions];
-    const permSingle = (0, combi_1.per)(permSingleItems[0], permSingleItems[1], ...permSingleItems.slice(2));
-    const fieldList = (0, combi_1.optPrio)(_1.SQLFieldList);
-    const single = (0, combi_1.seq)("SINGLE", (0, combi_1.optPrio)("FOR UPDATE"), fieldList, permSingle);
-    const other = (0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), fieldList, perm);
-    return (0, combi_1.seq)("SELECT", (0, combi_1.altPrio)(single, other));
-}
-//# sourceMappingURL=select_core.js.map

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

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SelectLoop = void 0;
-const combi_1 = require("../combi");
-const _1 = require(".");
-const sql_order_by_1 = require("./sql_order_by");
-const sql_having_1 = require("./sql_having");
-const sql_into_structure_1 = require("./sql_into_structure");
-const sql_hints_1 = require("./sql_hints");
-const sql_field_list_loop_1 = require("./sql_field_list_loop");
-const sql_up_to_1 = require("./sql_up_to");
-const version_1 = require("../../../version");
-const sql_fields_loop_1 = require("./sql_fields_loop");
-// note: SELECT loops are matched before single statement SELECTs
-class SelectLoop extends combi_1.Expression {
-    getRunnable() {
-        const where = (0, combi_1.seq)("WHERE", _1.SQLCond);
-        const bypass = "BYPASSING BUFFER";
-        const pack = (0, combi_1.seq)("PACKAGE SIZE", _1.SQLSource);
-        const privileged = (0, combi_1.ver)(version_1.Version.v758, _1.SQLPrivilegedAccess);
-        const tab = (0, combi_1.seq)(_1.SQLIntoTable, (0, combi_1.alt)(pack, (0, combi_1.seq)(_1.SQLFrom, pack), (0, combi_1.seq)(pack, _1.SQLFrom)));
-        const packTab = (0, combi_1.seq)(pack, _1.SQLIntoTable);
-        const into = (0, combi_1.altPrio)(sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList);
-        const perm = (0, combi_1.per)(_1.SQLFrom, where, sql_up_to_1.SQLUpTo, sql_order_by_1.SQLOrderBy, sql_having_1.SQLHaving, _1.SQLClient, bypass, _1.SQLGroupBy, _1.SQLForAllEntries, _1.DatabaseConnection, privileged, _1.SQLOptions, (0, combi_1.alt)(tab, sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList, packTab));
-        const strict = (0, combi_1.seq)(_1.SQLFrom, (0, combi_1.ver)(version_1.Version.v750, sql_fields_loop_1.SQLFieldsLoop), (0, combi_1.optPrio)(_1.SQLForAllEntries), (0, combi_1.optPrio)((0, combi_1.seq)(where, (0, combi_1.optPrio)(sql_order_by_1.SQLOrderBy), into, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo))));
-        const aggrIntoBeforeFrom = (0, combi_1.seq)((0, combi_1.plusPrio)(_1.SQLAggregation), into, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), _1.SQLFrom, (0, combi_1.optPrio)(_1.SQLClient), (0, combi_1.optPrio)(where), _1.SQLGroupBy);
-        const aggrIntoAfterFrom = (0, combi_1.seq)((0, combi_1.plusPrio)(_1.SQLAggregation), _1.SQLFrom, (0, combi_1.optPrio)(_1.SQLClient), into, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), (0, combi_1.optPrio)(where), _1.SQLGroupBy);
-        const ret = (0, combi_1.seq)("SELECT", (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), sql_field_list_loop_1.SQLFieldListLoop, perm), strict, aggrIntoBeforeFrom, aggrIntoAfterFrom), (0, combi_1.optPrio)(sql_hints_1.SQLHints), (0, combi_1.optPrio)(privileged), (0, combi_1.optPrio)(_1.SQLOptions));
-        return ret;
-    }
-}
-exports.SelectLoop = SelectLoop;
-//# sourceMappingURL=select_loop.js.map

package/build/src/abap/5_syntax/expressions/select_loop.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SelectLoop = void 0;
-const select_1 = require("./select");
-class SelectLoop {
-    static runSyntax(node, input) {
-        // try using the other Select, they should look very much the same
-        select_1.Select.runSyntax(node, input);
-    }
-}
-exports.SelectLoop = SelectLoop;
-//# sourceMappingURL=select_loop.js.map