@abaplint/transpiler-cli 2.12.3 → 2.12.5

package/abap_transpile

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 require("./build/bundle");

package/build/bundle.js

@@ -3447,9 +3447,11 @@ exports.ComponentCompareSimple = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const component_chain_simple_1 = __webpack_require__(/*! ./component_chain_simple */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_chain_simple.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class ComponentCompareSimple extends combi_1.Expression {
     getRunnable() {
-        const ret = (0, combi_1.seq)((0, combi_1.altPrio)(component_chain_simple_1.ComponentChainSimple, _1.Dynamic), "=", _1.Source);
+        const source = (0, combi_1.altPrio)((0, combi_1.ver)(version_1.Version.v740sp02, _1.Source, version_1.Version.OpenABAP), _1.SimpleSource4);
+        const ret = (0, combi_1.seq)((0, combi_1.altPrio)(component_chain_simple_1.ComponentChainSimple, _1.Dynamic), "=", source);
         return (0, combi_1.plus)(ret);
     }
 }
@@ -4447,7 +4449,7 @@ const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules
 class FormName extends combi_1.Expression {
     getRunnable() {
         // todo, does not handle namespaces properly
-        return (0, combi_1.seq)((0, combi_1.regex)(/^!?[\w%$\*\/\?]+$/), (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.optPrio)((0, combi_1.regex)(/^\w+$/)))), (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.DashW)));
+        return (0, combi_1.seq)((0, combi_1.regex)(/^!?[\w%$\*\/\?<>]+$/), (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.optPrio)((0, combi_1.regex)(/^\w+$/)))), (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.DashW)));
     }
 }
 exports.FormName = FormName;
@@ -4932,6 +4934,7 @@ __exportStar(__webpack_require__(/*! ./sql_arithmetic_operator */ "./node_module
 __exportStar(__webpack_require__(/*! ./sql_arithmetics */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_arithmetics.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_as_name */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_as_name.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_case */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_case.js"), exports);
+__exportStar(__webpack_require__(/*! ./sql_cast */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_cast.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_cds_parameters */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_cds_parameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_client */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_client.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_compare_operator */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_compare_operator.js"), exports);
@@ -5010,9 +5013,10 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.InlineField = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 class InlineField extends combi_1.Expression {
     getRunnable() {
-        return new _1.Field();
+        return (0, combi_1.seq)(_1.Field, (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), _1.FieldAll)));
     }
 }
 exports.InlineField = InlineField;
@@ -6585,7 +6589,7 @@ class SelectLoop extends combi_1.Expression {
         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, (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 aggr = (0, combi_1.seq)(_1.SQLAggregation, into, (0, combi_1.optPrio)(sql_up_to_1.SQLUpTo), _1.SQLFrom, where, _1.SQLGroupBy);
+        const aggr = (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 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, aggr), (0, combi_1.optPrio)(sql_hints_1.SQLHints));
         return ret;
     }
@@ -6913,7 +6917,7 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 class SourceFieldSymbolChain extends combi_1.Expression {
     getRunnable() {
         const chain = (0, combi_1.seq)(new _1.ArrowOrDash(), _1.ComponentName);
-        return (0, combi_1.seq)(_1.FieldSymbol, (0, combi_1.starPrio)(chain));
+        return (0, combi_1.seq)(_1.FieldSymbol, (0, combi_1.starPrio)(chain), (0, combi_1.optPrio)(_1.TableBody));
     }
 }
 exports.SourceFieldSymbolChain = SourceFieldSymbolChain;
@@ -7069,7 +7073,7 @@ class SQLCase extends combi_1.Expression {
         const abap = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), _1.SimpleFieldChain2);
         const field = (0, combi_1.altPrio)(_1.SQLAggregation, SQLCase, _1.SQLFunction, _1.SQLPath, sql_field_name_1.SQLFieldName, constant_1.Constant);
         const sub = (0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/", "&&"), (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenLeftW)), field, (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenRightW)));
-        const sourc = (0, combi_1.altPrio)(SQLCase, _1.SQLAggregation, _1.SQLFunction, sql_source_1.SQLSource, constant_1.Constant);
+        const sourc = (0, combi_1.altPrio)(SQLCase, _1.SQLAggregation, _1.SQLFunction, sql_field_name_1.SQLFieldName, sql_source_1.SQLSource, constant_1.Constant);
         const val = (0, combi_1.altPrio)(sql_cond_1.SQLCond, constant_1.Constant, abap);
         const when = (0, combi_1.seq)("WHEN", val, "THEN", sourc, (0, combi_1.starPrio)(sub));
         const els = (0, combi_1.seq)("ELSE", sourc);
@@ -7081,6 +7085,33 @@ exports.SQLCase = SQLCase;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_cast.js":
+/*!*****************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_cast.js ***!
+  \*****************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.SQLCast = void 0;
+const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
+const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
+const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const sql_field_name_1 = __webpack_require__(/*! ./sql_field_name */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_field_name.js");
+class SQLCast extends combi_1.Expression {
+    getRunnable() {
+        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);
+        // todo: from version something
+        return (0, combi_1.seq)("CAST", "(", (0, combi_1.opt)((0, combi_1.altPrio)(sql_field_name_1.SQLFieldName, abap)), "AS", sql_field_name_1.SQLFieldName, ")");
+    }
+}
+exports.SQLCast = SQLCast;
+//# sourceMappingURL=sql_cast.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_cds_parameters.js":
 /*!***************************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_cds_parameters.js ***!
@@ -7235,7 +7266,8 @@ class SQLField extends combi_1.Expression {
     getRunnable() {
         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 as = (0, combi_1.seq)("AS", _1.SQLAsName);
-        const field = (0, combi_1.altPrio)(_1.SQLAggregation, _1.SQLCase, sql_function_1.SQLFunction, sql_path_1.SQLPath, _1.SQLFieldName, abap, _1.Constant);
+        const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), _1.SQLFieldName, (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.WParenRight)));
+        const field = (0, combi_1.altPrio)(_1.SQLAggregation, _1.SQLCase, _1.SQLCast, sql_function_1.SQLFunction, sql_path_1.SQLPath, _1.SQLFieldName, abap, _1.Constant, paren);
         const sub = (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/", "&&"), (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenLeftW)), field, (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenRightW))));
         const arith = (0, combi_1.ver)(version_1.Version.v740sp05, sub);
         return (0, combi_1.seq)(field, (0, combi_1.optPrio)(arith), (0, combi_1.optPrio)(as));
@@ -7286,13 +7318,11 @@ exports.SQLFieldList = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
-const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 class SQLFieldList extends combi_1.Expression {
     getRunnable() {
-        const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), _1.SQLFieldName, (0, combi_1.tok)(tokens_1.WParenRightW));
         const nev = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.starPrio)((0, combi_1.seq)(",", _1.SQLField)), version_1.Version.OpenABAP);
         const old = (0, combi_1.starPrio)(_1.SQLField);
-        return (0, combi_1.altPrio)("*", _1.Dynamic, (0, combi_1.seq)(_1.SQLField, (0, combi_1.alt)(nev, old)), paren);
+        return (0, combi_1.altPrio)("*", _1.Dynamic, (0, combi_1.seq)(_1.SQLField, (0, combi_1.alt)(nev, old)));
     }
 }
 exports.SQLFieldList = SQLFieldList;
@@ -9620,7 +9650,7 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class CallBadi {
     getMatcher() {
-        const call = (0, combi_1.seq)("CALL", "BADI", expressions_1.MethodSource, expressions_1.MethodCallBody);
+        const call = (0, combi_1.seq)("CALL BADI", expressions_1.MethodSource, expressions_1.MethodCallBody);
         return (0, combi_1.verNot)(version_1.Version.Cloud, call);
     }
 }
@@ -12225,7 +12255,10 @@ class Field {
         const module = (0, combi_1.seq)("MODULE", expressions_1.FormName, (0, combi_1.opt)((0, combi_1.alt)("ON INPUT", "ON REQUEST", "ON CHAIN-REQUEST")));
         const values = (0, combi_1.seq)("VALUES", (0, combi_1.tok)(tokens_1.WParenLeft), "BETWEEN", expressions_1.Constant, "AND", expressions_1.Constant, (0, combi_1.tok)(tokens_1.ParenRightW));
         const wit = (0, combi_1.seq)("WITH", expressions_1.FieldChain);
-        const ret = (0, combi_1.seq)("FIELD", expressions_1.FieldChain, (0, combi_1.opt)((0, combi_1.altPrio)(module, values, wit)));
+        const cond = (0, combi_1.seq)(expressions_1.FieldChain, "=", expressions_1.FieldChain);
+        const where = (0, combi_1.seq)(cond, (0, combi_1.starPrio)((0, combi_1.seq)("AND", cond)));
+        const select = (0, combi_1.seq)("SELECT * FROM", expressions_1.FieldChain, "WHERE", where, "INTO RESULT WHENEVER NOT FOUND SEND ERRORMESSAGE");
+        const ret = (0, combi_1.seq)("FIELD", expressions_1.FieldChain, (0, combi_1.opt)((0, combi_1.altPrio)(module, values, wit, select)));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -13384,6 +13417,7 @@ __exportStar(__webpack_require__(/*! ./editor_call */ "./node_modules/@abaplint/
 __exportStar(__webpack_require__(/*! ./break */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/break.js"), exports);
 __exportStar(__webpack_require__(/*! ./delete_textpool */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/delete_textpool.js"), exports);
 __exportStar(__webpack_require__(/*! ./get */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/get.js"), exports);
+__exportStar(__webpack_require__(/*! ./loop_extract */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/loop_extract.js"), exports);
 __exportStar(__webpack_require__(/*! ./selectoption */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/selectoption.js"), exports);
 __exportStar(__webpack_require__(/*! ./convert */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/convert.js"), exports);
 __exportStar(__webpack_require__(/*! ./static */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/static.js"), exports);
@@ -13927,8 +13961,8 @@ class Loop {
         const to = (0, combi_1.seq)("TO", expressions_1.Source);
         const usingKey = (0, combi_1.seq)("USING KEY", (0, combi_1.altPrio)(expressions_1.SimpleName, expressions_1.Dynamic));
         const options = (0, combi_1.per)(expressions_1.LoopTarget, from, to, where, usingKey, group, step);
-        const at = (0, combi_1.seq)("AT", (0, combi_1.opt)((0, combi_1.seq)("SCREEN", (0, combi_1.failCombinator)())), (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp08, "GROUP", version_1.Version.OpenABAP)), expressions_1.LoopSource, (0, combi_1.opt)(options));
-        return (0, combi_1.seq)("LOOP", (0, combi_1.opt)(at));
+        const at = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.seq)("SCREEN", (0, combi_1.failCombinator)())), (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp08, "GROUP", version_1.Version.OpenABAP)), expressions_1.LoopSource, (0, combi_1.opt)(options));
+        return (0, combi_1.seq)("LOOP AT", at);
     }
 }
 exports.Loop = Loop;
@@ -13960,6 +13994,27 @@ exports.LoopAtScreen = LoopAtScreen;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/loop_extract.js":
+/*!********************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/statements/loop_extract.js ***!
+  \********************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.LoopExtract = void 0;
+const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+class LoopExtract {
+    getMatcher() {
+        return (0, combi_1.str)("LOOP");
+    }
+}
+exports.LoopExtract = LoopExtract;
+//# sourceMappingURL=loop_extract.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/message.js":
 /*!***************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/statements/message.js ***!
@@ -15654,10 +15709,11 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class SelectionScreen {
     getMatcher() {
-        const beginBlock = (0, combi_1.seq)("BEGIN OF BLOCK", expressions_1.BlockName, (0, combi_1.optPrio)("WITH FRAME"), (0, combi_1.optPrio)((0, combi_1.seq)("TITLE", (0, combi_1.alt)(expressions_1.InlineField, expressions_1.TextElement))), (0, combi_1.optPrio)("NO INTERVALS"));
+        const text = (0, combi_1.altPrio)(expressions_1.TextElement, expressions_1.InlineField);
+        const beginBlock = (0, combi_1.seq)("BEGIN OF BLOCK", expressions_1.BlockName, (0, combi_1.optPrio)("WITH FRAME"), (0, combi_1.optPrio)((0, combi_1.seq)("TITLE", text)), (0, combi_1.optPrio)("NO INTERVALS"));
         const endBlock = (0, combi_1.seq)("END OF BLOCK", expressions_1.BlockName);
         const nesting = (0, combi_1.seq)("NESTING LEVEL", expressions_1.Source);
-        const scrOptions = (0, combi_1.per)((0, combi_1.seq)("AS", (0, combi_1.alt)("WINDOW", "SUBSCREEN")), (0, combi_1.seq)("TITLE", (0, combi_1.alt)(expressions_1.InlineField, expressions_1.TextElement)), "NO INTERVALS", nesting);
+        const scrOptions = (0, combi_1.per)((0, combi_1.seq)("AS", (0, combi_1.alt)("WINDOW", "SUBSCREEN")), (0, combi_1.seq)("TITLE", text), "NO INTERVALS", nesting);
         const beginScreen = (0, combi_1.seq)("BEGIN OF SCREEN", expressions_1.Integer, (0, combi_1.opt)(scrOptions));
         const endScreen = (0, combi_1.seq)("END OF SCREEN", expressions_1.Integer);
         const beginLine = (0, combi_1.str)("BEGIN OF LINE");
@@ -15668,12 +15724,12 @@ class SelectionScreen {
         const ldb = (0, combi_1.seq)("FOR FIELD", expressions_1.FieldSub, (0, combi_1.optPrio)(ldbId));
         const commentOpt = (0, combi_1.per)(ldb, modif, visible);
         const position = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.regex)(/^\/?[\d\w]+$/)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenLeft), (0, combi_1.tok)(tokens_1.WParenLeft)), expressions_1.Integer, (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenRightW), (0, combi_1.tok)(tokens_1.ParenRight)));
-        const comment = (0, combi_1.seq)("COMMENT", position, (0, combi_1.opt)((0, combi_1.alt)(expressions_1.InlineField, expressions_1.TextElement)), (0, combi_1.opt)(commentOpt));
+        const comment = (0, combi_1.seq)("COMMENT", position, (0, combi_1.opt)(text), (0, combi_1.opt)(commentOpt));
         const command = (0, combi_1.seq)("USER-COMMAND", (0, combi_1.alt)(expressions_1.Field, expressions_1.Constant));
-        const push = (0, combi_1.seq)("PUSHBUTTON", position, (0, combi_1.alt)(expressions_1.InlineField, expressions_1.TextElement), command, (0, combi_1.opt)(modif), (0, combi_1.opt)(visible));
+        const push = (0, combi_1.seq)("PUSHBUTTON", position, text, command, (0, combi_1.opt)(modif), (0, combi_1.opt)(visible));
         const prog = (0, combi_1.seq)("PROGRAM", expressions_1.Field);
         const def = (0, combi_1.seq)("DEFAULT", (0, combi_1.opt)(prog), "SCREEN", expressions_1.Integer);
-        const tab = (0, combi_1.seq)("TAB", (0, combi_1.tok)(tokens_1.WParenLeft), expressions_1.Integer, (0, combi_1.tok)(tokens_1.ParenRightW), (0, combi_1.alt)(expressions_1.InlineField, expressions_1.TextElement), command, (0, combi_1.opt)(def), (0, combi_1.opt)(modif));
+        const tab = (0, combi_1.seq)("TAB", (0, combi_1.tok)(tokens_1.WParenLeft), expressions_1.Integer, (0, combi_1.tok)(tokens_1.ParenRightW), text, command, (0, combi_1.opt)(def), (0, combi_1.opt)(modif));
         const func = (0, combi_1.seq)("FUNCTION KEY", expressions_1.Integer);
         const skip = (0, combi_1.seq)("SKIP", (0, combi_1.opt)(expressions_1.Integer));
         const posSymbols = (0, combi_1.altPrio)("POS_LOW", "POS_HIGH");
@@ -16291,8 +16347,7 @@ class Sort {
         const fields = (0, combi_1.plus)((0, combi_1.seq)(sel, (0, combi_1.optPrio)(text), (0, combi_1.optPrio)(order), (0, combi_1.optPrio)(text)));
         const by = (0, combi_1.seq)("BY", fields);
         const normal = (0, combi_1.seq)(expressions_1.Target, (0, combi_1.opt)((0, combi_1.per)(order, by, "STABLE", text)));
-        const target = (0, combi_1.altPrio)(text, normal);
-        return (0, combi_1.seq)("SORT", target);
+        return (0, combi_1.seq)("SORT", normal);
     }
 }
 exports.Sort = Sort;
@@ -16316,10 +16371,10 @@ const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@a
 class SortDataset {
     getMatcher() {
         const order = (0, combi_1.alt)("ASCENDING", "DESCENDING");
-        const sel = (0, combi_1.alt)(expressions_1.FieldSub, expressions_1.SourceFieldSymbol, expressions_1.Dynamic);
+        const sel = (0, combi_1.alt)(expressions_1.ComponentChain, expressions_1.SourceFieldSymbol, expressions_1.Dynamic);
         const fields = (0, combi_1.plus)((0, combi_1.seq)(sel, (0, combi_1.optPrio)(order)));
         const by = (0, combi_1.seq)("BY", fields);
-        const ret = (0, combi_1.seq)("SORT", (0, combi_1.opt)(by));
+        const ret = (0, combi_1.seq)("SORT", (0, combi_1.opt)("AS TEXT"), (0, combi_1.opt)(by));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -18717,6 +18772,7 @@ __exportStar(__webpack_require__(/*! ./dynpro_loop */ "./node_modules/@abaplint/
 __exportStar(__webpack_require__(/*! ./statics */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/statics.js"), exports);
 __exportStar(__webpack_require__(/*! ./test_injection */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/test_injection.js"), exports);
 __exportStar(__webpack_require__(/*! ./test_seam */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/test_seam.js"), exports);
+__exportStar(__webpack_require__(/*! ./loop_extract */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/loop_extract.js"), exports);
 __exportStar(__webpack_require__(/*! ./try */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/try.js"), exports);
 __exportStar(__webpack_require__(/*! ./type_enum */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/type_enum.js"), exports);
 __exportStar(__webpack_require__(/*! ./type_mesh */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/type_mesh.js"), exports);
@@ -18822,6 +18878,29 @@ exports.LoopAtScreen = LoopAtScreen;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/loop_extract.js":
+/*!********************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/3_structures/structures/loop_extract.js ***!
+  \********************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.LoopExtract = void 0;
+const Statements = __webpack_require__(/*! ../../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
+const _combi_1 = __webpack_require__(/*! ./_combi */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/_combi.js");
+const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/index.js");
+class LoopExtract {
+    getMatcher() {
+        return (0, _combi_1.beginEnd)((0, _combi_1.sta)(Statements.LoopExtract), (0, _combi_1.star)((0, _combi_1.sub)(_1.Body)), (0, _combi_1.sta)(Statements.EndLoop));
+    }
+}
+exports.LoopExtract = LoopExtract;
+//# sourceMappingURL=loop_extract.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/method.js":
 /*!**************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/3_structures/structures/method.js ***!
@@ -18886,7 +18965,7 @@ const _statement_1 = __webpack_require__(/*! ../../2_statements/statements/_stat
 class Normal {
     getMatcher() {
         // note that the sequence of alternatives here influences performance
-        return (0, _combi_1.alt)((0, _combi_1.sta)(Statements.Move), (0, _combi_1.sta)(Statements.Call), (0, _combi_1.sta)(Statements.Data), (0, _combi_1.sub)(Structures.If), (0, _combi_1.sta)(Statements.Clear), (0, _combi_1.sta)(Statements.FieldSymbol), (0, _combi_1.sta)(Statements.CreateObject), (0, _combi_1.sta)(Statements.CallFunction), (0, _combi_1.sta)(_statement_1.MacroCall), (0, _combi_1.sub)(Structures.LoopAtScreen), (0, _combi_1.sub)(Structures.Loop), (0, _combi_1.sta)(Statements.Append), (0, _combi_1.sub)(Structures.Try), (0, _combi_1.sub)(Structures.OnChange), (0, _combi_1.sta)(Statements.ReadTable), (0, _combi_1.sta)(Statements.Assert), (0, _combi_1.sta)(Statements.Return), (0, _combi_1.sta)(Statements.Select), (0, _combi_1.sta)(Statements.Assign), (0, _combi_1.sta)(Statements.InsertInternal), (0, _combi_1.sta)(Statements.DeleteInternal), (0, _combi_1.sta)(Statements.Concatenate), (0, _combi_1.sub)(Structures.Case), (0, _combi_1.sub)(Structures.CaseType), (0, _combi_1.sub)(Structures.Enhancement), (0, _combi_1.sub)(Structures.EnhancementSection), (0, _combi_1.sta)(Statements.AddCorresponding), (0, _combi_1.sta)(Statements.Add), (0, _combi_1.sta)(Statements.AssignLocalCopy), (0, _combi_1.sta)(Statements.AuthorityCheck), (0, _combi_1.sta)(Statements.Back), (0, _combi_1.sta)(Statements.Break), (0, _combi_1.sta)(Statements.BreakId), (0, _combi_1.sta)(Statements.CallDatabase), (0, _combi_1.sta)(Statements.CallDialog), (0, _combi_1.sta)(Statements.CallKernel), (0, _combi_1.sta)(Statements.CallOLE), (0, _combi_1.sta)(Statements.CallScreen), (0, _combi_1.sta)(Statements.ModifyScreen), (0, _combi_1.sta)(Statements.CallSelectionScreen), (0, _combi_1.sta)(Statements.CallTransaction), (0, _combi_1.sta)(Statements.CallTransformation), (0, _combi_1.sta)(Statements.Check), (0, _combi_1.sta)(Statements.ClassDefinitionLoad), (0, _combi_1.sta)(Statements.CloseCursor), (0, _combi_1.sta)(Statements.CloseDataset), (0, _combi_1.sta)(Statements.Collect), (0, _combi_1.sta)(Statements.Commit), (0, _combi_1.sta)(Statements.Communication), (0, _combi_1.sta)(Statements.Compute), (0, _combi_1.sta)(Statements.CallBadi), (0, _combi_1.sta)(Statements.Condense), (0, _combi_1.sta)(Statements.Constant), (0, _combi_1.sta)(Statements.Contexts), (0, _combi_1.sta)(Statements.Continue), (0, _combi_1.sta)(Statements.ConvertText), (0, _combi_1.sta)(Statements.Convert), (0, _combi_1.sta)(Statements.CreateData), (0, _combi_1.sta)(Statements.CreateOLE), (0, _combi_1.sta)(Statements.DeleteCluster), (0, _combi_1.sta)(Statements.DeleteDatabase), (0, _combi_1.sta)(Statements.DeleteDataset), (0, _combi_1.sta)(Statements.DeleteDynpro), (0, _combi_1.sta)(Statements.DeleteMemory), (0, _combi_1.sta)(Statements.DeleteReport), (0, _combi_1.sta)(Statements.DeleteTextpool), (0, _combi_1.sta)(Statements.Demand), (0, _combi_1.sta)(Statements.Describe), (0, _combi_1.sta)(Statements.Detail), (0, _combi_1.sta)(Statements.Divide), (0, _combi_1.sta)(Statements.EditorCall), (0, _combi_1.sta)(Statements.EnhancementPoint), (0, _combi_1.sta)(Statements.Exit), (0, _combi_1.sta)(Statements.ExportDynpro), (0, _combi_1.sta)(Statements.Export), (0, _combi_1.sta)(Statements.Extract), (0, _combi_1.sta)(Statements.FetchNextCursor), (0, _combi_1.sta)(Statements.FieldGroup), (0, _combi_1.sta)(Statements.Fields), (0, _combi_1.sta)(Statements.Find), (0, _combi_1.sta)(Statements.Format), (0, _combi_1.sta)(Statements.FreeMemory), (0, _combi_1.sta)(Statements.FreeObject), (0, _combi_1.sta)(Statements.Free), (0, _combi_1.sta)(Statements.GenerateDynpro), (0, _combi_1.sta)(Statements.GenerateReport), (0, _combi_1.sta)(Statements.GenerateSubroutine), (0, _combi_1.sta)(Statements.GetBadi), (0, _combi_1.sta)(Statements.GetBit), (0, _combi_1.sta)(Statements.GetCursor), (0, _combi_1.sta)(Statements.GetDataset), (0, _combi_1.sta)(Statements.GetLocale), (0, _combi_1.sta)(Statements.GetParameter), (0, _combi_1.sta)(Statements.GetPFStatus), (0, _combi_1.sta)(Statements.GetProperty), (0, _combi_1.sta)(Statements.GetReference), (0, _combi_1.sta)(Statements.GetRunTime), (0, _combi_1.sta)(Statements.GetTime), (0, _combi_1.sta)(Statements.Hide), (0, _combi_1.sta)(Statements.Nodes), (0, _combi_1.sta)(Statements.ImportDynpro), (0, _combi_1.sta)(Statements.ImportNametab), (0, _combi_1.sta)(Statements.MoveCorresponding), (0, _combi_1.sta)(Statements.Import), (0, _combi_1.sta)(Statements.Infotypes), (0, _combi_1.sta)(Statements.Include), // include does not have to be at top level
+        return (0, _combi_1.alt)((0, _combi_1.sta)(Statements.Move), (0, _combi_1.sta)(Statements.Call), (0, _combi_1.sta)(Statements.Data), (0, _combi_1.sub)(Structures.If), (0, _combi_1.sta)(Statements.Clear), (0, _combi_1.sta)(Statements.FieldSymbol), (0, _combi_1.sta)(Statements.CreateObject), (0, _combi_1.sta)(Statements.CallFunction), (0, _combi_1.sta)(_statement_1.MacroCall), (0, _combi_1.sub)(Structures.LoopAtScreen), (0, _combi_1.sub)(Structures.Loop), (0, _combi_1.sub)(Structures.LoopExtract), (0, _combi_1.sta)(Statements.Append), (0, _combi_1.sub)(Structures.Try), (0, _combi_1.sub)(Structures.OnChange), (0, _combi_1.sta)(Statements.ReadTable), (0, _combi_1.sta)(Statements.Assert), (0, _combi_1.sta)(Statements.Return), (0, _combi_1.sta)(Statements.Select), (0, _combi_1.sta)(Statements.Assign), (0, _combi_1.sta)(Statements.InsertInternal), (0, _combi_1.sta)(Statements.DeleteInternal), (0, _combi_1.sta)(Statements.Concatenate), (0, _combi_1.sub)(Structures.Case), (0, _combi_1.sub)(Structures.CaseType), (0, _combi_1.sub)(Structures.Enhancement), (0, _combi_1.sub)(Structures.EnhancementSection), (0, _combi_1.sta)(Statements.AddCorresponding), (0, _combi_1.sta)(Statements.Add), (0, _combi_1.sta)(Statements.AssignLocalCopy), (0, _combi_1.sta)(Statements.AuthorityCheck), (0, _combi_1.sta)(Statements.Back), (0, _combi_1.sta)(Statements.Break), (0, _combi_1.sta)(Statements.BreakId), (0, _combi_1.sta)(Statements.CallDatabase), (0, _combi_1.sta)(Statements.CallDialog), (0, _combi_1.sta)(Statements.CallKernel), (0, _combi_1.sta)(Statements.CallOLE), (0, _combi_1.sta)(Statements.CallScreen), (0, _combi_1.sta)(Statements.ModifyScreen), (0, _combi_1.sta)(Statements.CallSelectionScreen), (0, _combi_1.sta)(Statements.CallTransaction), (0, _combi_1.sta)(Statements.CallTransformation), (0, _combi_1.sta)(Statements.Check), (0, _combi_1.sta)(Statements.ClassDefinitionLoad), (0, _combi_1.sta)(Statements.CloseCursor), (0, _combi_1.sta)(Statements.CloseDataset), (0, _combi_1.sta)(Statements.Collect), (0, _combi_1.sta)(Statements.Commit), (0, _combi_1.sta)(Statements.Communication), (0, _combi_1.sta)(Statements.Compute), (0, _combi_1.sta)(Statements.CallBadi), (0, _combi_1.sta)(Statements.Condense), (0, _combi_1.sta)(Statements.Constant), (0, _combi_1.sta)(Statements.Contexts), (0, _combi_1.sta)(Statements.Continue), (0, _combi_1.sta)(Statements.ConvertText), (0, _combi_1.sta)(Statements.Convert), (0, _combi_1.sta)(Statements.CreateData), (0, _combi_1.sta)(Statements.CreateOLE), (0, _combi_1.sta)(Statements.DeleteCluster), (0, _combi_1.sta)(Statements.DeleteDatabase), (0, _combi_1.sta)(Statements.DeleteDataset), (0, _combi_1.sta)(Statements.DeleteDynpro), (0, _combi_1.sta)(Statements.DeleteMemory), (0, _combi_1.sta)(Statements.DeleteReport), (0, _combi_1.sta)(Statements.DeleteTextpool), (0, _combi_1.sta)(Statements.Demand), (0, _combi_1.sta)(Statements.Describe), (0, _combi_1.sta)(Statements.Detail), (0, _combi_1.sta)(Statements.Divide), (0, _combi_1.sta)(Statements.EditorCall), (0, _combi_1.sta)(Statements.EnhancementPoint), (0, _combi_1.sta)(Statements.Exit), (0, _combi_1.sta)(Statements.ExportDynpro), (0, _combi_1.sta)(Statements.Export), (0, _combi_1.sta)(Statements.Extract), (0, _combi_1.sta)(Statements.FetchNextCursor), (0, _combi_1.sta)(Statements.FieldGroup), (0, _combi_1.sta)(Statements.Fields), (0, _combi_1.sta)(Statements.Find), (0, _combi_1.sta)(Statements.Format), (0, _combi_1.sta)(Statements.FreeMemory), (0, _combi_1.sta)(Statements.FreeObject), (0, _combi_1.sta)(Statements.Free), (0, _combi_1.sta)(Statements.GenerateDynpro), (0, _combi_1.sta)(Statements.GenerateReport), (0, _combi_1.sta)(Statements.GenerateSubroutine), (0, _combi_1.sta)(Statements.GetBadi), (0, _combi_1.sta)(Statements.GetBit), (0, _combi_1.sta)(Statements.GetCursor), (0, _combi_1.sta)(Statements.GetDataset), (0, _combi_1.sta)(Statements.GetLocale), (0, _combi_1.sta)(Statements.GetParameter), (0, _combi_1.sta)(Statements.GetPFStatus), (0, _combi_1.sta)(Statements.GetProperty), (0, _combi_1.sta)(Statements.GetReference), (0, _combi_1.sta)(Statements.GetRunTime), (0, _combi_1.sta)(Statements.GetTime), (0, _combi_1.sta)(Statements.Hide), (0, _combi_1.sta)(Statements.Nodes), (0, _combi_1.sta)(Statements.ImportDynpro), (0, _combi_1.sta)(Statements.ImportNametab), (0, _combi_1.sta)(Statements.MoveCorresponding), (0, _combi_1.sta)(Statements.Import), (0, _combi_1.sta)(Statements.Infotypes), (0, _combi_1.sta)(Statements.Include), // include does not have to be at top level
         (0, _combi_1.sta)(Statements.InsertDatabase), (0, _combi_1.sta)(Statements.InsertReport), (0, _combi_1.sta)(Statements.InsertTextpool), (0, _combi_1.sta)(Statements.InsertFieldGroup), (0, _combi_1.sta)(Statements.InterfaceLoad), (0, _combi_1.sta)(Statements.Leave), (0, _combi_1.sta)(Statements.LoadReport), (0, _combi_1.sta)(Statements.Local), (0, _combi_1.sta)(Statements.With), (0, _combi_1.sta)(Statements.LogPoint), (0, _combi_1.sta)(Statements.Message), (0, _combi_1.sta)(Statements.ModifyLine), (0, _combi_1.sta)(Statements.ModifyDatabase), (0, _combi_1.sta)(Statements.ModifyInternal), (0, _combi_1.sta)(Statements.Multiply), (0, _combi_1.sta)(Statements.NewLine), (0, _combi_1.sta)(Statements.NewPage), (0, _combi_1.sta)(Statements.OpenCursor), (0, _combi_1.sta)(Statements.OpenDataset), (0, _combi_1.sta)(Statements.Overlay), (0, _combi_1.sta)(Statements.Pack), (0, _combi_1.sta)(Statements.Perform), (0, _combi_1.sta)(Statements.FormDefinition), (0, _combi_1.sta)(Statements.Position), (0, _combi_1.sta)(Statements.Put), (0, _combi_1.sta)(Statements.PrintControl), (0, _combi_1.sta)(Statements.RaiseEvent), (0, _combi_1.sta)(Statements.RaiseEntityEvent), (0, _combi_1.sta)(Statements.Raise), (0, _combi_1.sta)(Statements.Ranges), (0, _combi_1.sta)(Statements.ReadDataset), (0, _combi_1.sta)(Statements.ReadLine), (0, _combi_1.sta)(Statements.ReadReport), (0, _combi_1.sta)(Statements.ReadTextpool), (0, _combi_1.sta)(Statements.Receive), (0, _combi_1.sta)(Statements.RefreshControl), (0, _combi_1.sta)(Statements.Refresh), (0, _combi_1.sta)(Statements.Reject), (0, _combi_1.sta)(Statements.Replace), (0, _combi_1.sta)(Statements.Reserve), (0, _combi_1.sta)(Statements.Resume), (0, _combi_1.sta)(Statements.Retry), (0, _combi_1.sta)(Statements.Rollback), (0, _combi_1.sta)(Statements.Scan), (0, _combi_1.sta)(Statements.ScrollList), (0, _combi_1.sta)(Statements.Search), (0, _combi_1.sta)(Statements.SetBit), (0, _combi_1.sta)(Statements.SetBlank), (0, _combi_1.sta)(Statements.SetCountry), (0, _combi_1.sta)(Statements.SetCursor), (0, _combi_1.sta)(Statements.SetDataset), (0, _combi_1.sta)(Statements.SetExtendedCheck), (0, _combi_1.sta)(Statements.SetHandler), (0, _combi_1.sta)(Statements.SetLanguage), (0, _combi_1.sta)(Statements.SetLeft), (0, _combi_1.sta)(Statements.SetLocale), (0, _combi_1.sta)(Statements.SetMargin), (0, _combi_1.sta)(Statements.SetParameter), (0, _combi_1.sta)(Statements.SetPFStatus), (0, _combi_1.sta)(Statements.SetProperty), (0, _combi_1.sta)(Statements.SetRunTime), (0, _combi_1.sta)(Statements.SetScreen), (0, _combi_1.sta)(Statements.SetTitlebar), (0, _combi_1.sta)(Statements.SetUserCommand), (0, _combi_1.sta)(Statements.SetUpdateTask), (0, _combi_1.sta)(Statements.Shift), (0, _combi_1.sta)(Statements.Skip), (0, _combi_1.sta)(Statements.SortDataset), (0, _combi_1.sta)(Statements.Sort), (0, _combi_1.sta)(Statements.Static), (0, _combi_1.sta)(Statements.Split), (0, _combi_1.sta)(Statements.Stop), (0, _combi_1.sta)(Statements.Submit), (0, _combi_1.sta)(Statements.Summary), (0, _combi_1.sta)(Statements.SubtractCorresponding), (0, _combi_1.sta)(Statements.Subtract), (0, _combi_1.sta)(Statements.SuppressDialog), (0, _combi_1.sta)(Statements.Supply), (0, _combi_1.sta)(Statements.Sum), (0, _combi_1.sta)(Statements.SyntaxCheck), (0, _combi_1.sta)(Statements.SystemCall), (0, _combi_1.sta)(Statements.Tables), (0, _combi_1.sta)(Statements.Transfer), (0, _combi_1.sta)(Statements.Translate), (0, _combi_1.sta)(Statements.Type), (0, _combi_1.sta)(Statements.TypePools), (0, _combi_1.sta)(Statements.Uline), (0, _combi_1.sta)(Statements.Unassign), (0, _combi_1.sta)(Statements.Unpack), (0, _combi_1.sta)(Statements.UpdateDatabase), (0, _combi_1.sta)(Statements.Wait), (0, _combi_1.sta)(Statements.Window), (0, _combi_1.sta)(Statements.Write), (0, _combi_1.sta)(Statements.CommitEntities), (0, _combi_1.sta)(Statements.GetPermissions), (0, _combi_1.sta)(Statements.SetLocks), (0, _combi_1.sta)(Statements.ModifyEntities), (0, _combi_1.sta)(Statements.ReadEntities), (0, _combi_1.sta)(Statements.RollbackEntities), (0, _combi_1.sta)(Statements.Module), // todo, should be dynpro specific
         (0, _combi_1.sta)(Statements.Field), // todo, should be dynpro specific
         (0, _combi_1.sub)(Structures.Chain), // todo, should be dynpro specific
@@ -18911,9 +18990,10 @@ exports.OnChange = void 0;
 const Statements = __webpack_require__(/*! ../../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 const _combi_1 = __webpack_require__(/*! ./_combi */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/_combi.js");
 const body_1 = __webpack_require__(/*! ./body */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/body.js");
+const else_1 = __webpack_require__(/*! ./else */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/else.js");
 class OnChange {
     getMatcher() {
-        return (0, _combi_1.beginEnd)((0, _combi_1.sta)(Statements.OnChange), (0, _combi_1.opt)((0, _combi_1.sub)(body_1.Body)), (0, _combi_1.sta)(Statements.EndOn));
+        return (0, _combi_1.beginEnd)((0, _combi_1.sta)(Statements.OnChange), (0, _combi_1.seq)((0, _combi_1.opt)((0, _combi_1.sub)(body_1.Body)), (0, _combi_1.opt)((0, _combi_1.sub)(else_1.Else))), (0, _combi_1.sta)(Statements.EndOn));
     }
 }
 exports.OnChange = OnChange;
@@ -18959,9 +19039,10 @@ const _combi_1 = __webpack_require__(/*! ./_combi */ "./node_modules/@abaplint/c
 const chain_1 = __webpack_require__(/*! ./chain */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/chain.js");
 const loop_1 = __webpack_require__(/*! ./loop */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/loop.js");
 const dynpro_loop_1 = __webpack_require__(/*! ./dynpro_loop */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/dynpro_loop.js");
+const loop_extract_1 = __webpack_require__(/*! ./loop_extract */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/loop_extract.js");
 class ProcessAfterInput {
     getMatcher() {
-        const pai = (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sta)(Statements.Module), (0, _combi_1.sta)(Statements.Field), (0, _combi_1.sta)(Statements.CallSubscreen), (0, _combi_1.sub)(chain_1.Chain), (0, _combi_1.sub)(dynpro_loop_1.DynproLoop), (0, _combi_1.sub)(loop_1.Loop)));
+        const pai = (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sta)(Statements.Module), (0, _combi_1.sta)(Statements.Field), (0, _combi_1.sta)(Statements.CallSubscreen), (0, _combi_1.sub)(chain_1.Chain), (0, _combi_1.sub)(dynpro_loop_1.DynproLoop), (0, _combi_1.sub)(loop_extract_1.LoopExtract), (0, _combi_1.sub)(loop_1.Loop)));
         return (0, _combi_1.seq)((0, _combi_1.sta)(Statements.ProcessAfterInput), pai);
     }
 }
@@ -18983,9 +19064,10 @@ exports.ProcessBeforeOutput = void 0;
 const Statements = __webpack_require__(/*! ../../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 const _combi_1 = __webpack_require__(/*! ./_combi */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/_combi.js");
 const dynpro_loop_1 = __webpack_require__(/*! ./dynpro_loop */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/dynpro_loop.js");
+const loop_extract_1 = __webpack_require__(/*! ./loop_extract */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/loop_extract.js");
 class ProcessBeforeOutput {
     getMatcher() {
-        const pbo = (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sta)(Statements.Module), (0, _combi_1.sta)(Statements.Field), (0, _combi_1.sta)(Statements.CallSubscreen), (0, _combi_1.sub)(dynpro_loop_1.DynproLoop)));
+        const pbo = (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sta)(Statements.Module), (0, _combi_1.sta)(Statements.Field), (0, _combi_1.sta)(Statements.CallSubscreen), (0, _combi_1.sub)(loop_extract_1.LoopExtract), (0, _combi_1.sub)(dynpro_loop_1.DynproLoop)));
         return (0, _combi_1.seq)((0, _combi_1.sta)(Statements.ProcessBeforeOutput), pbo);
     }
 }
@@ -22988,6 +23070,9 @@ class BasicTypes {
         if (chain === undefined) {
             chain = node.findFirstExpression(Expressions.SimpleFieldChain);
         }
+        if (chain === undefined) {
+            chain = node.findFirstExpression(Expressions.SimpleFieldChain2);
+        }
         if (chain === undefined) {
             throw new Error("resolveLikeName, chain undefined");
         }
@@ -23386,10 +23471,10 @@ class BasicTypes {
                 sub = node.findFirstExpression(Expressions.TypeParam);
             }
             if (sub === undefined) {
-                sub = node.findFirstExpression(Expressions.FieldChain);
+                sub = node.findFirstExpression(Expressions.TypeName);
             }
             if (sub === undefined) {
-                sub = node.findFirstExpression(Expressions.TypeName);
+                sub = node.findFirstExpression(Expressions.FieldChain);
             }
             found = this.resolveLikeName(sub);
             if (found && this.isOccurs(node)) {
@@ -23728,7 +23813,10 @@ class BasicTypes {
             }
         }
         const found = this.resolveTypeName(chain);
-        if (found && !(found instanceof Types.UnknownType) && !(found instanceof Types.VoidType)) {
+        if (found && found instanceof Types.VoidType) {
+            return found;
+        }
+        else if (found && !(found instanceof Types.UnknownType)) {
             return new Types.DataReference(found);
         }
         else if (chain.concatTokens().toUpperCase() === "DATA") {
@@ -24269,7 +24357,9 @@ class ComponentCompareSimple {
                 else if (c.get() instanceof Expressions.Dynamic) {
                     targetType = undefined;
                 }
-                else if (c.get() instanceof Expressions.Source) {
+                else if (c.get() instanceof Expressions.Source
+                    || c.get() instanceof Expressions.SimpleSource4
+                    || c.get() instanceof Expressions.SimpleSource2) {
                     const sourceType = source_1.Source.runSyntax(c, input, targetType);
                     if (targetType && new _type_utils_1.TypeUtils(input.scope).isAssignable(sourceType, targetType) === false) {
                         const message = "ComponentCompareSimple, incompatible types";
@@ -24839,7 +24929,7 @@ class FieldChain {
         if (((_a = node.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.SourceField
             && node.findDirectExpression(Expressions.ComponentName)) {
             // workaround for names with dashes, eg. "sy-repid"
-            const concat = node.concatTokens();
+            const concat = node.concatTokens().replace(/ /g, "");
             const offset = ((_b = node.findDirectExpression(Expressions.FieldOffset)) === null || _b === void 0 ? void 0 : _b.concatTokens()) || "";
             const length = ((_c = node.findDirectExpression(Expressions.FieldLength)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "";
             const found = input.scope.findVariable(concat.replace(offset, "").replace(length, ""));
@@ -25201,16 +25291,24 @@ const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@ab
 const expressions_1 = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const basic_types_1 = __webpack_require__(/*! ../basic_types */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/basic_types.js");
 const assert_error_1 = __webpack_require__(/*! ../assert_error */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/assert_error.js");
+const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 class FormParam {
     static runSyntax(node, input) {
-        var _a, _b, _c;
-        const nameToken = (_a = node.findFirstExpression(expressions_1.FormParamName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+        var _a, _b;
+        const formParamName = node.findFirstExpression(expressions_1.FormParamName);
+        if (formParamName === undefined) {
+            throw new assert_error_1.AssertError("FormParam, could not find FormParamName");
+        }
+        let nameToken = formParamName.getFirstToken();
+        if (formParamName.getChildren().length > 1) {
+            nameToken = new tokens_1.Identifier(nameToken.getStart(), formParamName.concatTokens());
+        }
         if (node.findDirectTokenByText("STRUCTURE") && nameToken) {
             // STRUCTURES typing
-            const typeName = (_b = node.findDirectExpression(expressions_1.SimpleFieldChain)) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr();
+            const typeName = (_a = node.findDirectExpression(expressions_1.SimpleFieldChain)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr();
             let type = undefined;
             if (typeName) {
-                type = (_c = input.scope.findType(typeName)) === null || _c === void 0 ? void 0 : _c.getType();
+                type = (_b = input.scope.findType(typeName)) === null || _b === void 0 ? void 0 : _b.getType();
                 if (type === undefined) {
                     type = input.scope.getDDIC().lookupTableOrView(typeName).type;
                 }
@@ -28281,14 +28379,17 @@ class ValueBody {
         const fields = new Set();
         for (const s of node.findDirectExpressions(Expressions.FieldAssignment)) {
             field_assignment_1.FieldAssignment.runSyntax(s, input, targetType);
-            const fieldname = (_a = s.findDirectExpression(Expressions.FieldSub)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
-            if (fieldname) {
-                if (fields.has(fieldname)) {
-                    const message = "Duplicate field assignment";
-                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, s.getFirstToken(), message));
-                    return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+            if (node.findDirectExpression(Expressions.ValueBodyLine) === undefined) {
+                // todo: refine, still needs to be checked when there are table lines
+                const fieldname = (_a = s.findDirectExpression(Expressions.FieldSub)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
+                if (fieldname) {
+                    if (fields.has(fieldname)) {
+                        const message = "Duplicate field assignment";
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, s.getFirstToken(), message));
+                        return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                    }
+                    fields.add(fieldname);
                 }
-                fields.add(fieldname);
             }
         }
         let type = undefined; // todo, this is only correct if there is a single source in the body
@@ -29960,7 +30061,7 @@ class Controls {
         }
         if (node.findDirectTokenByText("TABLEVIEW") && token) {
             const cols = new basic_1.StructureType([
-                { name: "SCREEN", type: new basic_1.CharacterType(1) }, // todo
+                { name: "SCREEN", type: basic_1.VoidType.get("TABLEVIEW-SCREEN") }, // todo
                 { name: "INDEX", type: basic_1.IntegerType.get() },
                 { name: "SELECTED", type: new basic_1.CharacterType(1) },
                 { name: "VISLENGTH", type: basic_1.IntegerType.get() },
@@ -30720,6 +30821,38 @@ exports.FetchNextCursor = FetchNextCursor;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/field_group.js":
+/*!***************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/field_group.js ***!
+  \***************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.FieldGroup = void 0;
+const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const _typed_identifier_1 = __webpack_require__(/*! ../../types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+class FieldGroup {
+    runSyntax(node, input) {
+        const nameExpression = node.findFirstExpression(Expressions.Field);
+        if (nameExpression === undefined) {
+            return;
+        }
+        const name = nameExpression === null || nameExpression === void 0 ? void 0 : nameExpression.concatTokens();
+        if (name === undefined) {
+            return;
+        }
+        const id = new _typed_identifier_1.TypedIdentifier(nameExpression === null || nameExpression === void 0 ? void 0 : nameExpression.getFirstToken(), input.filename, basic_1.VoidType.get("FIELD-GROUP"));
+        input.scope.addIdentifier(id);
+    }
+}
+exports.FieldGroup = FieldGroup;
+//# sourceMappingURL=field_group.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/fieldsymbol.js":
 /*!***************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/fieldsymbol.js ***!
@@ -30903,6 +31036,30 @@ exports.Format = Format;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/free.js":
+/*!********************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/free.js ***!
+  \********************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Free = void 0;
+const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const target_1 = __webpack_require__(/*! ../expressions/target */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/target.js");
+class Free {
+    runSyntax(node, input) {
+        for (const t of node.findDirectExpressions(Expressions.Target)) {
+            target_1.Target.runSyntax(t, input);
+        }
+    }
+}
+exports.Free = Free;
+//# sourceMappingURL=free.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/get_badi.js":
 /*!************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/get_badi.js ***!
@@ -31275,7 +31432,7 @@ const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modu
 const assert_error_1 = __webpack_require__(/*! ../assert_error */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/assert_error.js");
 class IncludeType {
     runSyntax(node, input) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const components = [];
         const iname = node.findFirstExpression(Expressions.TypeName);
         if (iname === undefined) {
@@ -31290,7 +31447,10 @@ class IncludeType {
                 ityp = found;
             }
         }
-        const as = (_b = node.findExpressionAfterToken("AS")) === null || _b === void 0 ? void 0 : _b.concatTokens();
+        else if (ityp instanceof basic_1.UnknownType) {
+            ityp = (_c = (_b = input.scope.findVariable(name)) === null || _b === void 0 ? void 0 : _b.getType()) !== null && _c !== void 0 ? _c : ityp;
+        }
+        const as = (_d = node.findExpressionAfterToken("AS")) === null || _d === void 0 ? void 0 : _d.concatTokens();
         if (as && ityp instanceof basic_1.StructureType) {
             ityp = new basic_1.StructureType(ityp.getComponents().concat([{
                     name: as,
@@ -31301,7 +31461,10 @@ class IncludeType {
         else if (ityp instanceof basic_1.TableType && isStructure) {
             ityp = ityp.getRowType();
         }
-        else if (ityp instanceof basic_1.VoidType) {
+        if (ityp instanceof basic_1.VoidType) {
+            return ityp;
+        }
+        else if (ityp instanceof basic_1.UnknownType) {
             return ityp;
         }
         if (!(ityp instanceof basic_1.StructureType)) {
@@ -31309,7 +31472,7 @@ class IncludeType {
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, iname.getFirstToken(), message));
             return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
         }
-        const suffix = (_c = node.findExpressionAfterToken("SUFFIX")) === null || _c === void 0 ? void 0 : _c.concatTokens();
+        const suffix = (_e = node.findExpressionAfterToken("SUFFIX")) === null || _e === void 0 ? void 0 : _e.concatTokens();
         if (suffix && ityp instanceof basic_1.StructureType) {
             const components = [];
             for (const c of ityp.getComponents()) {
@@ -32348,7 +32511,7 @@ class Parameter {
         }
         const magicName = "%_" + nameToken.getStr() + "_%_app_%";
         const magicToken = new tokens_1.Identifier(nameToken.getStart(), magicName);
-        input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(magicToken, input.filename, basic_1.VoidType.get("PARAMETER magic")));
+        input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(magicToken, input.filename, basic_1.VoidType.get("PARAMETER-MAGIC")));
     }
 }
 exports.Parameter = Parameter;
@@ -32587,7 +32750,7 @@ class Ranges {
         if (typeExpression === undefined) {
             throw new assert_error_1.AssertError("Ranges, unexpected node");
         }
-        const found = new basic_types_1.BasicTypes(input).parseType(typeExpression);
+        const found = new basic_types_1.BasicTypes(input).resolveLikeName(typeExpression);
         if (found && nameToken) {
             const structure = new basic_1.StructureType([
                 { name: "sign", type: new basic_1.CharacterType(1) },
@@ -32692,11 +32855,8 @@ const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modu
 class ReadTable {
     runSyntax(node, input) {
         const concat = node.concatTokens().toUpperCase();
-        const sources = node.findDirectExpressions(Expressions.Source);
-        let firstSource = node.findDirectExpression(Expressions.SimpleSource2);
-        if (firstSource === undefined) {
-            firstSource = sources[0];
-        }
+        const sources = node.findDirectExpressionsMulti([Expressions.Source, Expressions.SimpleSource2]);
+        const firstSource = sources[0];
         const sourceType = firstSource ? source_1.Source.runSyntax(firstSource, input) : undefined;
         if (sourceType === undefined) {
             const message = "No source type determined, read table";
@@ -32869,6 +33029,30 @@ exports.Receive = Receive;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/refresh.js":
+/*!***********************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/refresh.js ***!
+  \***********************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Refresh = void 0;
+const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const target_1 = __webpack_require__(/*! ../expressions/target */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/target.js");
+class Refresh {
+    runSyntax(node, input) {
+        for (const t of node.findDirectExpressions(Expressions.Target)) {
+            target_1.Target.runSyntax(t, input);
+        }
+    }
+}
+exports.Refresh = Refresh;
+//# sourceMappingURL=refresh.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/replace.js":
 /*!***********************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/replace.js ***!
@@ -33029,8 +33213,8 @@ class SelectionScreen {
             return;
         }
         const field = node.findFirstExpression(Expressions.InlineField);
-        if (field !== undefined && field.getFirstToken().getStr().length > 8) {
-            const message = "SELECTION-SCREEN name too long, " + field.getFirstToken().getStr();
+        if (field !== undefined && field.concatTokens().length > 8) {
+            const message = "SELECTION-SCREEN name too long, " + field.concatTokens();
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, field.getFirstToken(), message));
             return;
         }
@@ -33044,10 +33228,12 @@ class SelectionScreen {
             input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(blockToken, input.filename, type, ["selection_screen_tab" /* IdentifierMeta.SelectionScreenTab */]));
         }
         else if (concat.startsWith("SELECTION-SCREEN TAB") && fieldName) {
-            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(fieldName, input.filename, new basic_1.CharacterType(83), ["selection_screen_tab" /* IdentifierMeta.SelectionScreenTab */]));
+            const id = new _typed_identifier_1.TypedIdentifier(fieldName, input.filename, new basic_1.CharacterType(83), ["selection_screen_tab" /* IdentifierMeta.SelectionScreenTab */]);
+            input.scope.addNamedIdentifier(field.concatTokens(), id);
         }
         else if (fieldName) {
-            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(fieldName, input.filename, new basic_1.CharacterType(83)));
+            const id = new _typed_identifier_1.TypedIdentifier(fieldName, input.filename, new basic_1.CharacterType(83));
+            input.scope.addNamedIdentifier(field.concatTokens(), id);
         }
     }
 }
@@ -34308,11 +34494,13 @@ const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ ".
 const Statements = __webpack_require__(/*! ../../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 const Structures = __webpack_require__(/*! ../../3_structures/structures */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/index.js");
 const include_type_1 = __webpack_require__(/*! ../statements/include_type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/include_type.js");
+const constant_1 = __webpack_require__(/*! ../statements/constant */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/constant.js");
+const constants_1 = __webpack_require__(/*! ./constants */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/structures/constants.js");
 class Data {
     static runSyntax(node, input) {
         var _a;
         const fouth = (_a = node.getFirstChild()) === null || _a === void 0 ? void 0 : _a.getChildren()[3];
-        const isCommonPart = fouth instanceof nodes_1.TokenNode && fouth.concatTokens() === "COMMON";
+        const isCommonPart = fouth instanceof nodes_1.TokenNode && fouth.concatTokens().toUpperCase() === "COMMON";
         if (isCommonPart) {
             this.runCommonPartSyntax(node, input);
             return undefined;
@@ -34345,46 +34533,6 @@ class Data {
             }
             else if (c instanceof nodes_1.StatementNode && ctyp instanceof Statements.IncludeType) {
                 // INCLUDES
-                /*
-                const typeToken = c.findFirstExpression(Expressions.TypeName)?.getFirstToken();
-                const typeName = typeToken?.getStr();
-        
-                let foundId = input.scope.findType(typeName);
-                if (foundId === undefined) {
-                  foundId = input.scope.findVariable(typeName);
-                }
-        
-                let found = foundId?.getType();
-                if (found === undefined) {
-                  const f = input.scope.getDDIC().lookupTableOrView(typeName).type;
-                  if (f instanceof TypedIdentifier) {
-                    found = f.getType();
-                  } else {
-                    found = f;
-                  }
-                } else {
-                  input.scope.addReference(typeToken, foundId, ReferenceType.TypeReference, input.filename);
-                }
-                if (found instanceof Basic.VoidType) {
-                  if (table === true) {
-                    const ttyp = new Basic.TableType(found, {withHeader: true, keyType: Basic.TableKeyType.default});
-                    return new TypedIdentifier(name, input.filename, ttyp);
-                  } else {
-                    return new TypedIdentifier(name, input.filename, found);
-                  }
-                }
-                if (found instanceof Basic.UnknownType) {
-                  return new TypedIdentifier(name, input.filename, new Basic.UnknownType("unknown type, " + typeName));
-                }
-                if (found instanceof Basic.TableType && found.isWithHeader()) {
-                  found = found.getRowType();
-                }
-                if (!(found instanceof Basic.StructureType)) {
-                  const message = "not structured, " + typeName;
-                  input.issues.push(syntaxIssue(input, typeToken!, message));
-                  return new TypedIdentifier(name, input.filename, Basic.VoidType.get(CheckSyntaxKey));
-                }
-        */
                 const found = new include_type_1.IncludeType().runSyntax(c, input);
                 if (found instanceof Basic.VoidType) {
                     if (table === true) {
@@ -34395,6 +34543,9 @@ class Data {
                         return new _typed_identifier_1.TypedIdentifier(name, input.filename, found);
                     }
                 }
+                else if (found instanceof Basic.UnknownType) {
+                    return new _typed_identifier_1.TypedIdentifier(name, input.filename, found);
+                }
                 for (const c of found) {
                     components.push(c);
                 }
@@ -34435,6 +34586,18 @@ class Data {
                     input.scope.addType(found);
                 }
             }
+            else if (c instanceof nodes_1.StatementNode && ctyp instanceof Statements.Constant) {
+                const found = new constant_1.Constant().runSyntax(c, input);
+                if (found) {
+                    input.scope.addIdentifier(found);
+                }
+            }
+            else if (c instanceof nodes_1.StructureNode && ctyp instanceof Structures.Constants) {
+                const { type: found, values: _ } = new constants_1.Constants().runSyntax(c, input);
+                if (found) {
+                    input.scope.addIdentifier(found);
+                }
+            }
         }
     }
 }
@@ -34665,7 +34828,7 @@ class Types {
                 }
                 else if (ctyp instanceof Statements.IncludeType) {
                     const found = new include_type_1.IncludeType().runSyntax(c, input);
-                    if (found instanceof basic_1.VoidType) {
+                    if (found instanceof basic_1.VoidType || found instanceof Basic.UnknownType) {
                         voidd = found;
                     }
                     else {
@@ -34774,6 +34937,8 @@ const do_1 = __webpack_require__(/*! ./statements/do */ "./node_modules/@abaplin
 const concatenate_1 = __webpack_require__(/*! ./statements/concatenate */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/concatenate.js");
 const call_function_1 = __webpack_require__(/*! ./statements/call_function */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/call_function.js");
 const clear_1 = __webpack_require__(/*! ./statements/clear */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/clear.js");
+const refresh_1 = __webpack_require__(/*! ./statements/refresh */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/refresh.js");
+const free_1 = __webpack_require__(/*! ./statements/free */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/free.js");
 const replace_1 = __webpack_require__(/*! ./statements/replace */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/replace.js");
 const get_bit_1 = __webpack_require__(/*! ./statements/get_bit */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/get_bit.js");
 const raise_1 = __webpack_require__(/*! ./statements/raise */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/raise.js");
@@ -34856,6 +35021,7 @@ const modify_entities_1 = __webpack_require__(/*! ./statements/modify_entities *
 const commit_entities_1 = __webpack_require__(/*! ./statements/commit_entities */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/commit_entities.js");
 const _syntax_input_1 = __webpack_require__(/*! ./_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
 const assert_error_1 = __webpack_require__(/*! ./assert_error */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/assert_error.js");
+const field_group_1 = __webpack_require__(/*! ./statements/field_group */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/field_group.js");
 // -----------------------------------
 const map = {};
 function addToMap(handler) {
@@ -34899,6 +35065,8 @@ if (Object.keys(map).length === 0) {
     addToMap(new delete_internal_1.DeleteInternal());
     addToMap(new delete_cluster_1.DeleteCluster());
     addToMap(new clear_1.Clear());
+    addToMap(new free_1.Free());
+    addToMap(new refresh_1.Refresh());
     addToMap(new receive_1.Receive());
     addToMap(new get_bit_1.GetBit());
     addToMap(new class_local_friends_1.ClassLocalFriends());
@@ -34986,6 +35154,7 @@ if (Object.keys(map).length === 0) {
     addToMap(new translate_1.Translate());
     addToMap(new modify_internal_1.ModifyInternal());
     addToMap(new read_textpool_1.ReadTextpool());
+    addToMap(new field_group_1.FieldGroup());
     addToMap(new editor_call_1.EditorCall());
     addToMap(new delete_memory_1.DeleteMemory());
 }
@@ -35929,6 +36098,15 @@ class StatementNode extends _abstract_node_1.AbstractNode {
         }
         return ret;
     }
+    findDirectExpressionsMulti(type) {
+        const ret = [];
+        for (const child of this.getChildren()) {
+            if (child instanceof expression_node_1.ExpressionNode && type.some(t => child.get() instanceof t)) {
+                ret.push(child);
+            }
+        }
+        return ret;
+    }
     findDirectTokenByText(text) {
         const upper = text.toUpperCase();
         for (const child of this.getChildren()) {
@@ -53459,7 +53637,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.223";
+        return "2.113.232";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -55438,6 +55616,10 @@ DATA END OF foo.`,
             if (t.getChildren().length !== 3) {
                 continue;
             }
+            const data = t.findFirstStatement(Statements.DataBegin);
+            if (data === null || data === void 0 ? void 0 : data.findDirectTokenByText("OCCURS")) {
+                continue;
+            }
             if (t.findFirstStatement(Statements.IncludeType)) {
                 const token = t.getFirstToken();
                 const message = "DATA BEGIN with single INCLUDE";
@@ -56362,6 +56544,7 @@ const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./
 const _abap_object_1 = __webpack_require__(/*! ../objects/_abap_object */ "./node_modules/@abaplint/core/build/src/objects/_abap_object.js");
 const include_graph_1 = __webpack_require__(/*! ../utils/include_graph */ "./node_modules/@abaplint/core/build/src/utils/include_graph.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
+const objects_1 = __webpack_require__(/*! ../objects */ "./node_modules/@abaplint/core/build/src/objects/index.js");
 class CheckIncludeConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.CheckIncludeConf = CheckIncludeConf;
@@ -56377,7 +56560,8 @@ class CheckInclude {
             extendedInformation: `
 * Reports unused includes
 * Errors if the includes are not found
-* Error if including a main program`,
+* Error if including a main program
+* Skips ZX* includes`,
             tags: [_irule_1.RuleTag.Syntax],
         };
     }
@@ -56396,6 +56580,9 @@ class CheckInclude {
         if (!(obj instanceof _abap_object_1.ABAPObject)) {
             return [];
         }
+        if (obj instanceof objects_1.Program && obj.isInclude() === true && obj.getName().startsWith("ZX")) {
+            return [];
+        }
         let ret = [];
         for (const file of obj.getABAPFiles()) {
             ret = ret.concat(this.graph.getIssuesFile(file));
@@ -68964,6 +69151,12 @@ class ObsoleteStatementConf extends _basic_rule_config_1.BasicRuleConfig {
         this.formDefinition = true;
         /** Check for FORM IMPLEMENTATION */
         this.formImplementation = true;
+        /** Check for COMMON PART */
+        this.commonPart = true;
+        /** Check for FIELD-GROUPS */
+        this.fieldGroups = true;
+        /** Check for REPLACE INTO */
+        this.replaceInto = true;
     }
 }
 exports.ObsoleteStatementConf = ObsoleteStatementConf;
@@ -69075,10 +69268,22 @@ ENDIF.`,
                 const issue = issue_1.Issue.atStatement(file, staNode, "COMMUNICATION is obsolete", this.getMetadata().key, this.conf.severity);
                 issues.push(issue);
             }
+            if (this.conf.commonPart && sta instanceof Statements.DataBegin && staNode.findDirectTokenByText("COMMON")) {
+                const issue = issue_1.Issue.atStatement(file, staNode, "COMMON PART is obsolete", this.getMetadata().key, this.conf.severity);
+                issues.push(issue);
+            }
+            if (this.conf.replaceInto && sta instanceof Statements.Replace && staNode.findDirectTokenByText("INTO")) {
+                const issue = issue_1.Issue.atStatement(file, staNode, "REPLACE INTO is obsolete", this.getMetadata().key, this.conf.severity);
+                issues.push(issue);
+            }
             if (this.conf.pack && sta instanceof Statements.Pack) {
                 const issue = issue_1.Issue.atStatement(file, staNode, "PACK is obsolete", this.getMetadata().key, this.conf.severity);
                 issues.push(issue);
             }
+            if (this.conf.fieldGroups && sta instanceof Statements.FieldGroup) {
+                const issue = issue_1.Issue.atStatement(file, staNode, "FIELD-GROUPS is obsolete", this.getMetadata().key, this.conf.severity);
+                issues.push(issue);
+            }
             if (this.conf.parameter && sta instanceof Statements.Parameter) {
                 const token = staNode.getFirstToken();
                 if (token.getStr().toUpperCase() === "PARAMETER") {
@@ -76740,11 +76945,7 @@ class SkipLogic {
         var _a;
         if (this.tobj === undefined) {
             this.tobj = {};
-            for (const obj of this.reg.getObjects()) {
-                if (obj.getType() !== "TOBJ") {
-                    continue;
-                }
-                const tobj = obj;
+            for (const tobj of this.reg.getObjectsByType("TOBJ")) {
                 const area = (_a = tobj.getArea()) === null || _a === void 0 ? void 0 : _a.toUpperCase();
                 if (area) {
                     this.tobj[area] = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.12.3",
+  "version": "2.12.5",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -27,10 +27,10 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/core": "^2.113.223",
-    "@abaplint/transpiler": "^2.12.3",
+    "@abaplint/core": "^2.113.232",
+    "@abaplint/transpiler": "^2.12.5",
     "@types/glob": "^8.1.0",
-    "@types/node": "^24.7.0",
+    "@types/node": "^24.8.1",
     "@types/progress": "^2.0.7",
     "glob": "=7.2.0",
     "progress": "^2.0.3",
@@ -38,6 +38,6 @@
     "typescript": "^5.9.3",
     "p-limit": "^3.1.0",
     "webpack-cli": "^6.0.1",
-    "webpack": "^5.102.0"
+    "webpack": "^5.102.1"
   }
 }