@abaplint/cli 2.119.32 → 2.119.34

package/build/cli.js

@@ -2973,6 +2973,35 @@ exports.ExpandMacros = ExpandMacros;
 
 /***/ },
 
+/***/ "../core/build/src/abap/2_statements/expressions/_dynamic_access.js"
+/*!**************************************************************************!*\
+  !*** ../core/build/src/abap/2_statements/expressions/_dynamic_access.js ***!
+  \**************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.dynComp = dynComp;
+exports.dynAttr = dynAttr;
+const combi_1 = __webpack_require__(/*! ../combi */ "../core/build/src/abap/2_statements/combi.js");
+const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "../core/build/src/abap/1_lexer/tokens/index.js");
+const constant_1 = __webpack_require__(/*! ./constant */ "../core/build/src/abap/2_statements/expressions/constant.js");
+const field_chain_1 = __webpack_require__(/*! ./field_chain */ "../core/build/src/abap/2_statements/expressions/field_chain.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "../core/build/src/version.js");
+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));
+}
+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));
+}
+//# sourceMappingURL=_dynamic_access.js.map
+
+/***/ },
+
 /***/ "../core/build/src/abap/2_statements/expressions/_select_core.js"
 /*!***********************************************************************!*\
   !*** ../core/build/src/abap/2_statements/expressions/_select_core.js ***!
@@ -2982,6 +3011,7 @@ exports.ExpandMacros = ExpandMacros;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.buildSelectSingleCore = buildSelectSingleCore;
 exports.buildSelectCore = buildSelectCore;
 const combi_1 = __webpack_require__(/*! ../combi */ "../core/build/src/abap/2_statements/combi.js");
 const _1 = __webpack_require__(/*! . */ "../core/build/src/abap/2_statements/expressions/index.js");
@@ -2989,7 +3019,26 @@ const version_1 = __webpack_require__(/*! ../../../version */ "../core/build/src
 const sql_group_by_1 = __webpack_require__(/*! ./sql_group_by */ "../core/build/src/abap/2_statements/expressions/sql_group_by.js");
 const sql_into_structure_1 = __webpack_require__(/*! ./sql_into_structure */ "../core/build/src/abap/2_statements/expressions/sql_into_structure.js");
 const sql_up_to_1 = __webpack_require__(/*! ./sql_up_to */ "../core/build/src/abap/2_statements/expressions/sql_up_to.js");
-function buildSelectCore(into, allowOrderBy = true) {
+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 fieldList = (0, combi_1.optPrio)(_1.SQLFieldList);
+    const client = (0, combi_1.optPrio)(_1.SQLClient);
+    const byp = (0, combi_1.optPrio)(_1.SQLBypassingBuffer);
+    const whereClause = (0, combi_1.optPrio)(where);
+    const groupHaving = (0, combi_1.seq)((0, combi_1.optPrio)(sql_group_by_1.SQLGroupBy), (0, combi_1.optPrio)(_1.SQLHaving));
+    const trailingOpts = (0, combi_1.seq)((0, combi_1.optPrio)(_1.DatabaseConnection), (0, combi_1.optPrio)(_1.SQLHints), (0, combi_1.optPrio)(privileged), (0, combi_1.optPrio)(_1.SQLOptions));
+    const intoSingle = (0, combi_1.altPrio)(sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList);
+    if (!allowInto) {
+        const singleBody = (0, combi_1.seq)(_1.SQLFrom, client, byp, whereClause, groupHaving, trailingOpts);
+        return (0, combi_1.seq)(fieldList, singleBody);
+    }
+    const singleAfterFrom = (0, combi_1.seq)(_1.SQLFrom, client, byp, (0, combi_1.optPrio)(_1.DatabaseConnection), (0, combi_1.altPrio)((0, combi_1.seq)(intoSingle, byp, whereClause, groupHaving, trailingOpts), (0, combi_1.seq)((0, combi_1.optPrio)(sqlFields), whereClause, groupHaving, trailingOpts, (0, combi_1.optPrio)(intoSingle), (0, combi_1.optPrio)(_1.DatabaseConnection))));
+    const singleIntoBeforeFrom = (0, combi_1.seq)(intoSingle, _1.SQLFrom, client, byp, (0, combi_1.optPrio)(_1.DatabaseConnection), whereClause, groupHaving, trailingOpts);
+    return (0, combi_1.seq)(fieldList, byp, (0, combi_1.altPrio)(singleIntoBeforeFrom, singleAfterFrom));
+}
+function buildSelectCore(allowInto = false, allowOrderBy = true) {
     const where = (0, combi_1.seq)("WHERE", _1.SQLCond);
     const offset = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("OFFSET", _1.SQLSource));
     const sqlFields = (0, combi_1.ver)(version_1.Version.v750, _1.SQLFields, version_1.Version.OpenABAP);
@@ -3005,22 +3054,18 @@ function buildSelectCore(into, allowOrderBy = true) {
         : [];
     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)));
+    if (!allowInto) {
+        const afterFromNoInto = (0, combi_1.seq)(_1.SQLFrom, client, byp, (0, combi_1.seq)((0, combi_1.optPrio)(sqlFields), fae, whereClause, groupHaving, ...orderUpOff, trailingOpts));
+        return (0, combi_1.altPrio)((0, combi_1.seq)("SINGLE", buildSelectSingleCore(false)), (0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), fieldList, byp, afterFromNoInto));
     }
     const fromPackSize = (0, combi_1.seq)((0, combi_1.optPrio)(_1.SQLPackageSize), (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(_1.DatabaseConnection), (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo));
-    const trailingInto = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.seq)(intoForPackSize, (0, combi_1.optPrio)(_1.SQLPackageSize), byp, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(offset), (0, combi_1.optPrio)(_1.SQLOrderBy), (0, combi_1.optPrio)(_1.SQLOptions))), (0, combi_1.optPrio)((0, combi_1.seq)(intoSingle, byp, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(offset), (0, combi_1.optPrio)(_1.SQLOptions))));
-    const afterFromWithInto = (0, combi_1.seq)((0, combi_1.optPrio)(_1.SQLFrom), client, byp, fromPackSize, (0, combi_1.altPrio)((0, combi_1.seq)(sqlFields, fae, whereClause, groupHaving, ...orderUpOff, trailingOpts, trailingInto), (0, combi_1.seq)(intoForPackSize, (0, combi_1.optPrio)(_1.SQLPackageSize), byp, (0, combi_1.optPrio)(_1.DatabaseConnection), (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(offset), fae, whereClause, groupHaving, ...orderUpOff, trailingOpts, (0, combi_1.optPrio)(_1.SQLOptions)), (0, combi_1.seq)(intoSingle, byp, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, fae, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(offset), whereClause, groupHaving, ...orderUpOff, trailingOpts, (0, combi_1.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), byp, (0, combi_1.optPrio)(_1.DatabaseConnection), afterFromWithInto);
-    const selectOtherIntoThenFrom = (0, combi_1.seq)(intoAny, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(_1.DatabaseConnection), afterFromWithInto);
-    const nonSingleBody = (0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), fieldList, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.altPrio)(selectTableIntoThenFrom, selectOtherIntoThenFrom, afterFromWithInto));
-    const singleAfterFrom = (0, combi_1.seq)(_1.SQLFrom, client, byp, (0, combi_1.optPrio)(_1.DatabaseConnection), (0, combi_1.altPrio)((0, combi_1.seq)(sqlFields, whereClause, groupHaving, trailingOpts, (0, combi_1.optPrio)(intoSingle), (0, combi_1.optPrio)(_1.DatabaseConnection)), (0, combi_1.seq)(intoSingle, byp, whereClause, groupHaving, trailingOpts), (0, combi_1.seq)(whereClause, groupHaving, trailingOpts, (0, combi_1.optPrio)(intoSingle), (0, combi_1.optPrio)(_1.DatabaseConnection))));
-    const singleIntoBeforeFrom = (0, combi_1.seq)(intoSingle, _1.SQLFrom, client, byp, (0, combi_1.optPrio)(_1.DatabaseConnection), whereClause, groupHaving, trailingOpts);
-    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));
+    const trailingInto = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)(intoForPackSize, (0, combi_1.optPrio)(_1.SQLPackageSize), byp, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(offset), (0, combi_1.optPrio)(_1.SQLOrderBy)), (0, combi_1.seq)(intoSingle, byp, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(offset)))), (0, combi_1.optPrio)(_1.SQLOptions));
+    const afterFromWithInto = (0, combi_1.seq)((0, combi_1.optPrio)(_1.SQLFrom), client, byp, fromPackSize, (0, combi_1.altPrio)((0, combi_1.seq)(intoForPackSize, (0, combi_1.optPrio)(_1.SQLPackageSize), byp, (0, combi_1.optPrio)(_1.DatabaseConnection), (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(offset), fae, whereClause, groupHaving, ...orderUpOff, trailingOpts), (0, combi_1.seq)(intoSingle, byp, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, fae, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(offset), whereClause, groupHaving, ...orderUpOff, trailingOpts), (0, combi_1.seq)((0, combi_1.optPrio)(sqlFields), fae, whereClause, groupHaving, ...orderUpOff, trailingOpts, trailingInto)));
+    const selectTableIntoThenFrom = (0, combi_1.seq)(intoForPackSize, (0, combi_1.optPrio)(_1.SQLPackageSize));
+    const selectOtherIntoThenFrom = intoSingle;
+    const nonSingleBody = (0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), fieldList, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)((0, combi_1.altPrio)(selectTableIntoThenFrom, selectOtherIntoThenFrom)), (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), byp, (0, combi_1.optPrio)(_1.DatabaseConnection), afterFromWithInto);
+    return (0, combi_1.altPrio)((0, combi_1.seq)("SINGLE", buildSelectSingleCore(true)), nonSingleBody);
 }
 //# sourceMappingURL=_select_core.js.map
 
@@ -4421,11 +4466,12 @@ exports.FieldChain = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "../core/build/src/abap/2_statements/combi.js");
 const _1 = __webpack_require__(/*! . */ "../core/build/src/abap/2_statements/expressions/index.js");
 const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "../core/build/src/abap/1_lexer/tokens/index.js");
+const _dynamic_access_1 = __webpack_require__(/*! ./_dynamic_access */ "../core/build/src/abap/2_statements/expressions/_dynamic_access.js");
 class FieldChain extends combi_1.Expression {
     getRunnable() {
         const attr = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.InstanceArrow), _1.AttributeName);
         const comp = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.optPrio)(_1.ComponentName));
-        const chain = (0, combi_1.star)((0, combi_1.altPrio)(_1.Dereference, attr, comp, _1.TableExpression));
+        const chain = (0, combi_1.star)((0, combi_1.altPrio)(_1.Dereference, (0, _dynamic_access_1.dynAttr)(), attr, (0, _dynamic_access_1.dynComp)((0, combi_1.optPrio)(_1.FieldOffset), (0, combi_1.optPrio)(_1.FieldLength)), comp, _1.TableExpression));
         const clas = (0, combi_1.seq)(_1.ClassName, (0, combi_1.tok)(tokens_1.StaticArrow), _1.AttributeName);
         const start = (0, combi_1.altPrio)(clas, _1.SourceField, _1.SourceFieldSymbol);
         const after = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.DashW), (0, combi_1.seq)((0, combi_1.optPrio)(_1.TableBody), (0, combi_1.optPrio)(_1.FieldOffset), (0, combi_1.optPrio)(_1.FieldLength)));
@@ -6874,10 +6920,10 @@ const _select_core_1 = __webpack_require__(/*! ./_select_core */ "../core/build/
 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, combi_1.altPrio)((0, combi_1.seq)("SINGLE", (0, combi_1.optPrio)("FOR UPDATE"), (0, _select_core_1.buildSelectSingleCore)(true)), (0, _select_core_1.buildSelectCore)(true));
         const unionTail = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.plusPrio)(_1.SQLSetOp), version_1.Version.OpenABAP);
-        const 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);
+        const chained = (0, combi_1.seq)((0, _select_core_1.buildSelectCore)(false, false), unionTail, (0, combi_1.optPrio)(_1.SQLOrderBy), (0, combi_1.optPrio)(into));
+        return (0, combi_1.seq)("SELECT", (0, combi_1.altPrio)(chained, standalone));
     }
 }
 exports.Select = Select;
@@ -7153,6 +7199,7 @@ const version_1 = __webpack_require__(/*! ../../../version */ "../core/build/src
 const text_element_1 = __webpack_require__(/*! ./text_element */ "../core/build/src/abap/2_statements/expressions/text_element.js");
 const attribute_chain_1 = __webpack_require__(/*! ./attribute_chain */ "../core/build/src/abap/2_statements/expressions/attribute_chain.js");
 const dereference_1 = __webpack_require__(/*! ./dereference */ "../core/build/src/abap/2_statements/expressions/dereference.js");
+const _dynamic_access_1 = __webpack_require__(/*! ./_dynamic_access */ "../core/build/src/abap/2_statements/expressions/_dynamic_access.js");
 // todo, COND and SWITCH are quite similar?
 // this class is used quite often, so its nice to have the differentiating tokens part of it
 class Source extends combi_1.Expression {
@@ -7160,7 +7207,8 @@ class Source extends combi_1.Expression {
         const comp = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), _1.ComponentChain);
         const attr = (0, combi_1.seq)(_1.Arrow, attribute_chain_1.AttributeChain);
         const deref = (0, combi_1.optPrio)((0, combi_1.ver)(version_1.Version.v756, dereference_1.Dereference));
-        const method = (0, combi_1.seq)(_1.MethodCallChain, (0, combi_1.optPrio)((0, combi_1.altPrio)(attr, comp)), deref);
+        const dynChain = (0, combi_1.star)((0, combi_1.altPrio)((0, _dynamic_access_1.dynAttr)(), (0, _dynamic_access_1.dynComp)(), dereference_1.Dereference));
+        const method = (0, combi_1.seq)(_1.MethodCallChain, (0, combi_1.optPrio)((0, combi_1.altPrio)(attr, comp)), deref, dynChain);
         const rparen = (0, combi_1.tok)(tokens_1.WParenRightW);
         const rparenNoSpace = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenRightW), (0, combi_1.tok)(tokens_1.WParenRightW));
         const lparenNoSpace = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenLeft), (0, combi_1.tok)(tokens_1.ParenLeftW));
@@ -7517,6 +7565,7 @@ const _1 = __webpack_require__(/*! . */ "../core/build/src/abap/2_statements/exp
 const version_1 = __webpack_require__(/*! ../../../version */ "../core/build/src/version.js");
 const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "../core/build/src/abap/1_lexer/tokens/index.js");
 const sql_set_op_group_1 = __webpack_require__(/*! ./sql_set_op_group */ "../core/build/src/abap/2_statements/expressions/sql_set_op_group.js");
+const _select_core_1 = __webpack_require__(/*! ./_select_core */ "../core/build/src/abap/2_statements/expressions/_select_core.js");
 class SQLCompare extends combi_1.Expression {
     getRunnable() {
         const subSelect = (0, combi_1.ver)(version_1.Version.v750, sql_set_op_group_1.SQLSetOpGroup, version_1.Version.OpenABAP);
@@ -7529,7 +7578,9 @@ class SQLCompare extends combi_1.Expression {
         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.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);
+        // simple subquery for pre-v750 versions: EXISTS ( SELECT ... )
+        const simpleSubSelect = (0, combi_1.seq)("(", "SELECT", (0, _select_core_1.buildSelectCore)(undefined, false), ")");
+        const exists = (0, combi_1.seq)("EXISTS", (0, combi_1.altPrio)(subSelect, simpleSubSelect));
         return (0, combi_1.altPrio)(exists, _1.Dynamic, rett);
     }
 }
@@ -8098,7 +8149,7 @@ class SQLIn extends combi_1.Expression {
         const listNeww = (0, combi_1.ver)(version_1.Version.v740sp02, listNew, version_1.Version.OpenABAP);
         const subSelect = sql_set_op_group_1.SQLSetOpGroup;
         // simple subquery for pre-v750 versions: IN ( SELECT ... ), https://github.com/abaplint/abaplint/issues/3999
-        const simpleSubSelect = (0, combi_1.seq)("(", (0, _select_core_1.buildSelectCore)(undefined, false), ")");
+        const simpleSubSelect = (0, combi_1.seq)("(", "SELECT", (0, _select_core_1.buildSelectCore)(undefined, false), ")");
         const inn = (0, combi_1.seq)("IN", (0, combi_1.altPrio)(subSelect, simpleSubSelect, listOld, listNeww, _1.SQLSource));
         return inn;
     }
@@ -8410,7 +8461,7 @@ const sql_set_op_group_1 = __webpack_require__(/*! ./sql_set_op_group */ "../cor
 const _select_core_1 = __webpack_require__(/*! ./_select_core */ "../core/build/src/abap/2_statements/expressions/_select_core.js");
 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, combi_1.seq)("SELECT", (0, _select_core_1.buildSelectCore)(false, 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));
@@ -8438,7 +8489,7 @@ const version_1 = __webpack_require__(/*! ../../../version */ "../core/build/src
 const _select_core_1 = __webpack_require__(/*! ./_select_core */ "../core/build/src/abap/2_statements/expressions/_select_core.js");
 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, combi_1.seq)("SELECT", (0, _select_core_1.buildSelectCore)(false, 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);
     }
@@ -8815,11 +8866,12 @@ const _1 = __webpack_require__(/*! . */ "../core/build/src/abap/2_statements/exp
 const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "../core/build/src/abap/1_lexer/tokens/index.js");
 const attribute_name_1 = __webpack_require__(/*! ./attribute_name */ "../core/build/src/abap/2_statements/expressions/attribute_name.js");
 const dereference_1 = __webpack_require__(/*! ./dereference */ "../core/build/src/abap/2_statements/expressions/dereference.js");
+const _dynamic_access_1 = __webpack_require__(/*! ./_dynamic_access */ "../core/build/src/abap/2_statements/expressions/_dynamic_access.js");
 class Target extends combi_1.Expression {
     getRunnable() {
         const attr = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.InstanceArrow), attribute_name_1.AttributeName);
         const comp = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), _1.ComponentName);
-        const something = (0, combi_1.starPrio)((0, combi_1.altPrio)(dereference_1.Dereference, attr, comp, _1.TableExpression));
+        const something = (0, combi_1.starPrio)((0, combi_1.altPrio)(dereference_1.Dereference, (0, _dynamic_access_1.dynAttr)(), attr, (0, _dynamic_access_1.dynComp)(), comp, _1.TableExpression));
         const clas = (0, combi_1.seq)(_1.ClassName, (0, combi_1.tok)(tokens_1.StaticArrow), attribute_name_1.AttributeName);
         const start = (0, combi_1.altPrio)(_1.Cast, _1.NewObject, clas, _1.TargetField, _1.TargetFieldSymbol);
         const fields = (0, combi_1.seq)((0, combi_1.optPrio)(_1.FieldOffset), (0, combi_1.optPrio)(_1.FieldLength));
@@ -26520,12 +26572,13 @@ class BasicTypes {
             || text.startsWith("TYPE TABLE FOR DELETE ")
             || text.startsWith("TYPE TABLE FOR UPDATE "))) {
             const name = typename.concatTokens();
-            const type = (_d = this.input.scope.getDDIC().lookupDDLS(name)) === null || _d === void 0 ? void 0 : _d.type;
+            const ddlsName = this.getRAPBaseEntityName(name);
+            const type = (_d = this.input.scope.getDDIC().lookupDDLS(ddlsName)) === null || _d === void 0 ? void 0 : _d.type;
             if (type) {
                 return new Types.TableType(basic_1.VoidType.get("RAP-TODO"), options);
             }
-            else if (this.input.scope.getDDIC().inErrorNamespace(name)) {
-                return new Types.UnknownType(`DDLS ${name} not found`);
+            else if (this.input.scope.getDDIC().inErrorNamespace(ddlsName)) {
+                return new Types.UnknownType(`DDLS ${ddlsName} not found`);
             }
             else {
                 return Types.VoidType.get(name);
@@ -26697,6 +26750,15 @@ class BasicTypes {
         }
         return false;
     }
+    getRAPBaseEntityName(name) {
+        const association = name.indexOf("\\_");
+        const path = name.indexOf("\\\\");
+        if (association === -1 && path === -1) {
+            return name;
+        }
+        const splitAt = association === -1 ? path : path === -1 ? association : Math.min(association, path);
+        return name.substring(0, splitAt);
+    }
     // todo, rewrite this method
     resolveTypeChain(expr) {
         var _a, _b, _c, _d;
@@ -32633,9 +32695,15 @@ exports.SQLIn = void 0;
 const Expressions = __importStar(__webpack_require__(/*! ../../2_statements/expressions */ "../core/build/src/abap/2_statements/expressions/index.js"));
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "../core/build/src/abap/types/basic/index.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "../core/build/src/abap/5_syntax/_syntax_input.js");
+const sql_set_op_group_1 = __webpack_require__(/*! ./sql_set_op_group */ "../core/build/src/abap/5_syntax/expressions/sql_set_op_group.js");
 const sql_source_1 = __webpack_require__(/*! ./sql_source */ "../core/build/src/abap/5_syntax/expressions/sql_source.js");
 class SQLIn {
     static runSyntax(node, input) {
+        const setop = node.findDirectExpression(Expressions.SQLSetOpGroup);
+        if (setop) {
+            sql_set_op_group_1.SQLSetOpGroup.runSyntax(setop, input);
+            return;
+        }
         if (node.getChildren().length === 2) {
             const insource = node.findFirstExpression(Expressions.SQLSource);
             if (insource) {
@@ -32722,6 +32790,69 @@ exports.SQLOrderBy = SQLOrderBy;
 
 /***/ },
 
+/***/ "../core/build/src/abap/5_syntax/expressions/sql_set_op_group.js"
+/*!***********************************************************************!*\
+  !*** ../core/build/src/abap/5_syntax/expressions/sql_set_op_group.js ***!
+  \***********************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"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.SQLSetOpGroup = void 0;
+const Expressions = __importStar(__webpack_require__(/*! ../../2_statements/expressions */ "../core/build/src/abap/2_statements/expressions/index.js"));
+const select_1 = __webpack_require__(/*! ./select */ "../core/build/src/abap/5_syntax/expressions/select.js");
+class SQLSetOpGroup {
+    static runSyntax(node, input) {
+        if (node.findDirectExpression(Expressions.SQLFrom)) {
+            select_1.Select.runSyntax(node, input, true);
+        }
+        for (const group of node.findDirectExpressions(Expressions.SQLSetOpGroup)) {
+            SQLSetOpGroup.runSyntax(group, input);
+        }
+        for (const setop of node.findDirectExpressions(Expressions.SQLSetOp)) {
+            SQLSetOpGroup.runSyntax(setop, input);
+        }
+    }
+}
+exports.SQLSetOpGroup = SQLSetOpGroup;
+//# sourceMappingURL=sql_set_op_group.js.map
+
+/***/ },
+
 /***/ "../core/build/src/abap/5_syntax/expressions/sql_source.js"
 /*!*****************************************************************!*\
   !*** ../core/build/src/abap/5_syntax/expressions/sql_source.js ***!
@@ -50102,7 +50233,9 @@ class MethodParameters {
     }
     workaroundRAP(node, input, parentName) {
         const resultName = node.findExpressionAfterToken("RESULT");
-        const isRap = node.findExpressionAfterToken("IMPORTING");
+        const concat = node.concatTokens().toUpperCase();
+        const isRap = node.findExpressionAfterToken("IMPORTING")
+            || (concat.includes(" IMPORTING REQUEST ") ? node.findExpressionAfterToken("REQUEST") : undefined);
         if (isRap) {
             for (const foo of node.findDirectExpressions(Expressions.MethodParamName)) {
                 if (foo === resultName) {
@@ -50110,7 +50243,6 @@ class MethodParameters {
                 }
                 this.importing.push(new _typed_identifier_1.TypedIdentifier(foo.getFirstToken(), input.filename, basic_1.VoidType.get("RapMethodParameter"), ["importing" /* IdentifierMeta.MethodImporting */]));
             }
-            const concat = node.concatTokens().toUpperCase();
             if (concat.includes(" FOR VALIDATE ")
                 || concat.includes(" FOR BEHAVIOR ")
                 || concat.includes(" FOR DETERMINE ")
@@ -66030,7 +66162,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.32";
+        return "2.119.34";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

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