@abaplint/transpiler-cli 2.10.20 → 2.10.21

package/build/bundle.js

@@ -3293,7 +3293,7 @@ class Compare extends combi_1.Expression {
         const between = (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), "BETWEEN", _1.Source, "AND", _1.Source);
         const predicate = (0, combi_1.ver)(version_1.Version.v740sp08, _1.MethodCallChain);
         const rett = (0, combi_1.seq)(_1.Source, (0, combi_1.altPrio)((0, combi_1.seq)(_1.CompareOperator, _1.Source), inn, between, sopt));
-        const fsassign = (0, combi_1.seq)(_1.SourceFieldSymbol, "IS", (0, combi_1.optPrio)("NOT"), "ASSIGNED");
+        const fsassign = (0, combi_1.seq)(_1.SourceFieldSymbolChain, "IS", (0, combi_1.optPrio)("NOT"), "ASSIGNED");
         const ret = (0, combi_1.seq)((0, combi_1.opt)("NOT"), (0, combi_1.altPrio)(rett, predicate, fsassign));
         return ret;
     }
@@ -3733,7 +3733,7 @@ class CorrespondingBody extends combi_1.Expression {
         const mapping = (0, combi_1.seq)("MAPPING", (0, combi_1.plus)((0, combi_1.seq)(_1.ComponentName, "=", component_chain_1.ComponentChain)));
         const baseParen = (0, combi_1.seq)("BASE", (0, combi_1.tok)(tokens_1.WParenLeftW), _1.Source, (0, combi_1.tok)(tokens_1.WParenRightW));
         const discarding = (0, combi_1.ver)(version_1.Version.v751, "DISCARDING DUPLICATES");
-        return (0, combi_1.seq)((0, combi_1.optPrio)("DEEP"), (0, combi_1.optPrio)(baseParen), _1.Source, (0, combi_1.optPrio)(discarding), (0, combi_1.optPrio)(mapping), (0, combi_1.optPrio)((0, combi_1.seq)("EXCEPT", (0, combi_1.alt)((0, combi_1.plus)(_1.Field), "*"))));
+        return (0, combi_1.seq)((0, combi_1.optPrio)("DEEP"), (0, combi_1.optPrio)(baseParen), _1.Source, (0, combi_1.optPrio)(discarding), (0, combi_1.optPrio)(mapping), (0, combi_1.optPrio)("CHANGING CONTROL"), (0, combi_1.optPrio)((0, combi_1.seq)("EXCEPT", (0, combi_1.alt)((0, combi_1.plus)(_1.Field), "*"))));
     }
 }
 exports.CorrespondingBody = CorrespondingBody;
@@ -3871,7 +3871,7 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 class DefinitionName extends combi_1.Expression {
     getRunnable() {
-        const r = (0, combi_1.regex)(/^((\w*\/\w+\/)|(\w*\/\w+\/)?[\w\*$%]+)$/);
+        const r = (0, combi_1.regex)(/^&|&?((\w*\/\w+\/)|(\w*\/\w+\/)?[\w\*$%\?]+)$/);
         return (0, combi_1.seq)(r, (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.optPrio)(r))), (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.DashW)));
     }
 }
@@ -3961,7 +3961,7 @@ exports.EntityAssociation = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 class EntityAssociation extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.regex)(/^[\w]+\\_[\w]+$/);
+        return (0, combi_1.regex)(/^[\/\w]+(\\_|\\\\)[\_\w\\~]+$/);
     }
 }
 exports.EntityAssociation = EntityAssociation;
@@ -4052,7 +4052,7 @@ class Field extends combi_1.Expression {
     getRunnable() {
         // "&1" can be used for almost anything(field names, method names etc.) in macros
         // field names with only digits should not be possible
-        return (0, combi_1.regex)(/^[&_!]?\*?\w*(\/\w+\/)?\d*[a-zA-Z_%\$][\w\*%\$\?#]*(~\w+)?$/);
+        return (0, combi_1.regex)(/^[&_!?]?\*?\w*(\/\w+\/)?\d*[a-zA-Z_%\$][\w\*%\$\?#]*(~\w+)?$/);
     }
 }
 exports.Field = Field;
@@ -4177,7 +4177,7 @@ const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 class FieldOffset extends combi_1.Expression {
     getRunnable() {
-        const offset = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.Plus), (0, combi_1.altPrio)((0, combi_1.regex)(/^\d+$/), _1.SimpleFieldChain2));
+        const offset = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.Plus), (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.regex)(/^\d+$/), _1.SimpleFieldChain2)));
         return offset;
     }
 }
@@ -4201,7 +4201,7 @@ const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules
 const table_body_1 = __webpack_require__(/*! ./table_body */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/table_body.js");
 class FieldSub extends combi_1.Expression {
     getRunnable() {
-        const ret = (0, combi_1.seq)((0, combi_1.regex)(/^\*?!?(\/\w+\/)?[a-zA-Z_%$][\w%$\$\*]*$/), (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.regex)(/^[\w%$\$\*]+$/))), (0, combi_1.opt)(table_body_1.TableBody));
+        const ret = (0, combi_1.seq)((0, combi_1.regex)(/^\*?!?&?(\/\w+\/)?[a-zA-Z_%$\?][\w%$\$\*]*$/), (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.regex)(/^[\w%$\$\*]+$/))), (0, combi_1.opt)(table_body_1.TableBody));
         return ret;
     }
 }
@@ -4374,7 +4374,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;
@@ -4663,7 +4663,7 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 class IncludeName extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.regex)(/^<?(\/\w+\/)?[\w%]+(~\w+)?>?$/), (0, combi_1.optPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.regex)(/^\w+$/))));
+        return (0, combi_1.seq)((0, combi_1.regex)(/^<?(\/\w+\/)?[\w%#]+(~\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+$/)))));
     }
 }
 exports.IncludeName = IncludeName;
@@ -4844,6 +4844,7 @@ __exportStar(__webpack_require__(/*! ./simple_source2 */ "./node_modules/@abapli
 __exportStar(__webpack_require__(/*! ./simple_source3 */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/simple_source3.js"), exports);
 __exportStar(__webpack_require__(/*! ./simple_source4 */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/simple_source4.js"), exports);
 __exportStar(__webpack_require__(/*! ./simple_target */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/simple_target.js"), exports);
+__exportStar(__webpack_require__(/*! ./source_field_symbol_chain */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/source_field_symbol_chain.js"), exports);
 __exportStar(__webpack_require__(/*! ./source_field_symbol */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/source_field_symbol.js"), exports);
 __exportStar(__webpack_require__(/*! ./source_field */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/source_field.js"), exports);
 __exportStar(__webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/source.js"), exports);
@@ -4863,10 +4864,13 @@ __exportStar(__webpack_require__(/*! ./sql_field_list_loop */ "./node_modules/@a
 __exportStar(__webpack_require__(/*! ./sql_field_list */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_field_list.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_field_name */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_field_name.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_field */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_field.js"), exports);
+__exportStar(__webpack_require__(/*! ./sql_fields_loop */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_fields_loop.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_fields */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_fields.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_for_all_entries */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_for_all_entries.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_from_source */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_from_source.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_from */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_from.js"), exports);
+__exportStar(__webpack_require__(/*! ./provide_field_name */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/provide_field_name.js"), exports);
+__exportStar(__webpack_require__(/*! ./sql_function_input */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_function_input.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_function */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_function.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_group_by */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_group_by.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_having */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_having.js"), exports);
@@ -4975,7 +4979,8 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 class InlineLoopDefinition extends combi_1.Expression {
     getRunnable() {
         const index = (0, combi_1.seq)("INDEX INTO", _1.TargetField);
-        return (0, combi_1.seq)((0, combi_1.altPrio)(_1.TargetFieldSymbol, _1.TargetField), "IN", (0, combi_1.opt)("GROUP"), _1.Source, (0, combi_1.optPrio)(index));
+        const key = (0, combi_1.seq)("USING KEY", _1.SimpleName);
+        return (0, combi_1.seq)((0, combi_1.altPrio)(_1.TargetFieldSymbol, _1.TargetField), "IN", (0, combi_1.opt)("GROUP"), _1.Source, (0, combi_1.optPrio)(key), (0, combi_1.optPrio)(index));
     }
 }
 exports.InlineLoopDefinition = InlineLoopDefinition;
@@ -5329,11 +5334,12 @@ exports.MacroName = MacroName;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.MessageClass = void 0;
+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");
 class MessageClass extends combi_1.Expression {
     getRunnable() {
         // "&1" can be used for almost anything(field names, method names etc.) in macros
-        return (0, combi_1.regex)(/^>?[\w\/]+#?@?\/?!?&?>?\$?$/);
+        return (0, combi_1.seq)((0, combi_1.regex)(/^>?[\w\/]+#?@?\/?!?&?>?\$?\??<?$/), (0, combi_1.starPrio)((0, combi_1.tok)(tokens_1.Plus)), (0, combi_1.starPrio)((0, combi_1.tok)(tokens_1.PlusW)), (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.MessageClass = MessageClass;
@@ -5844,7 +5850,7 @@ exports.NamespaceSimpleName = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 class NamespaceSimpleName extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.regex)(/^((\w*\/\w+\/)|(\w*\/\w+\/)?[\w\*$%]+)$/);
+        return (0, combi_1.regex)(/^((\w*\/\w+\/)|(\w*\/\w+\/)?[\w\*$%#]+)$/);
     }
 }
 exports.NamespaceSimpleName = NamespaceSimpleName;
@@ -6174,6 +6180,28 @@ exports.PerformUsing = PerformUsing;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/provide_field_name.js":
+/*!***************************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/provide_field_name.js ***!
+  \***************************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ProvideFieldName = void 0;
+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");
+class ProvideFieldName extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)((0, combi_1.regex)(/^(?!(?:FROM|BETWEEN|WHERE)$)(\/\w+\/)?(\w+~(\w+|\*)|\w+)$/i), (0, combi_1.optPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.regex)(/^\w+$/i))));
+    }
+}
+exports.ProvideFieldName = ProvideFieldName;
+//# sourceMappingURL=provide_field_name.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/radio_group_name.js":
 /*!*************************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/radio_group_name.js ***!
@@ -6209,8 +6237,10 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 class RaiseWith extends combi_1.Expression {
     getRunnable() {
-        const wit = (0, combi_1.seq)("WITH", _1.SimpleSource1, (0, combi_1.opt)(_1.SimpleSource1), (0, combi_1.opt)(_1.SimpleSource1), (0, combi_1.opt)(_1.SimpleSource1));
-        return wit;
+        const wit = (0, combi_1.seq)(_1.SimpleSource1, (0, combi_1.opt)(_1.SimpleSource1), (0, combi_1.opt)(_1.SimpleSource1), (0, combi_1.opt)(_1.SimpleSource1));
+        // todo: I guess this is from version something?
+        const witComplex = (0, combi_1.seq)(_1.Source, (0, combi_1.opt)(_1.Source), (0, combi_1.opt)(_1.Source), (0, combi_1.opt)(_1.Source));
+        return (0, combi_1.seq)("WITH", (0, combi_1.altPrio)(witComplex, wit));
     }
 }
 exports.RaiseWith = RaiseWith;
@@ -6377,8 +6407,6 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 const sql_group_by_1 = __webpack_require__(/*! ./sql_group_by */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_group_by.js");
 const sql_into_structure_1 = __webpack_require__(/*! ./sql_into_structure */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_into_structure.js");
-const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.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");
 const sql_up_to_1 = __webpack_require__(/*! ./sql_up_to */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_up_to.js");
 class Select extends combi_1.Expression {
     getRunnable() {
@@ -6389,9 +6417,8 @@ class Select extends combi_1.Expression {
         const fields = (0, combi_1.ver)(version_1.Version.v750, _1.SQLFields);
         // todo, HINTS cannot be anywhere, need an expression dedicated for strict sql
         const perm = (0, combi_1.per)(_1.SQLFrom, into, _1.SQLForAllEntries, where, _1.SQLOrderBy, sql_up_to_1.SQLUpTo, offset, _1.SQLClient, _1.SQLHaving, bypass, sql_group_by_1.SQLGroupBy, fields, _1.DatabaseConnection, _1.SQLHints);
-        const permSingle = (0, combi_1.per)(_1.SQLFrom, (0, combi_1.altPrio)(sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList), where, _1.SQLClient, bypass, fields, _1.DatabaseConnection, _1.SQLHints);
-        const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), sql_field_name_1.SQLFieldName, (0, combi_1.tok)(tokens_1.WParenRightW));
-        const fieldList = (0, combi_1.optPrio)((0, combi_1.altPrio)(_1.SQLFieldList, paren));
+        const permSingle = (0, combi_1.per)(_1.SQLFrom, (0, combi_1.altPrio)(sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList), where, _1.SQLClient, bypass, sql_group_by_1.SQLGroupBy, fields, _1.DatabaseConnection, _1.SQLHints);
+        const fieldList = (0, combi_1.optPrio)(_1.SQLFieldList);
         const single = (0, combi_1.seq)("SINGLE", (0, combi_1.optPrio)("FOR UPDATE"), fieldList, permSingle);
         const other = (0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), fieldList, perm);
         const ret = (0, combi_1.seq)("SELECT", (0, combi_1.altPrio)(single, other));
@@ -6422,6 +6449,8 @@ const sql_hints_1 = __webpack_require__(/*! ./sql_hints */ "./node_modules/@abap
 const sql_field_list_loop_1 = __webpack_require__(/*! ./sql_field_list_loop */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_field_list_loop.js");
 const sql_up_to_1 = __webpack_require__(/*! ./sql_up_to */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_up_to.js");
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
+const sql_fields_loop_1 = __webpack_require__(/*! ./sql_fields_loop */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_fields_loop.js");
+// note: SELECT loops are matched before single statement SELECTs
 class SelectLoop extends combi_1.Expression {
     getRunnable() {
         const where = (0, combi_1.seq)("WHERE", _1.SQLCond);
@@ -6431,8 +6460,9 @@ class SelectLoop extends combi_1.Expression {
         const packTab = (0, combi_1.seq)(pack, _1.SQLIntoTable);
         const into = (0, combi_1.altPrio)(sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList);
         const perm = (0, combi_1.per)(_1.SQLFrom, where, sql_up_to_1.SQLUpTo, sql_order_by_1.SQLOrderBy, sql_having_1.SQLHaving, _1.SQLClient, bypass, _1.SQLGroupBy, _1.SQLForAllEntries, (0, combi_1.alt)(tab, into, packTab));
-        const strict = (0, combi_1.seq)(_1.SQLFrom, (0, combi_1.ver)(version_1.Version.v750, _1.SQLFields), (0, combi_1.optPrio)((0, combi_1.seq)(where, into, sql_up_to_1.SQLUpTo)));
-        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), (0, combi_1.optPrio)(sql_hints_1.SQLHints));
+        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, _1.SQLFrom, 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;
     }
 }
@@ -6674,6 +6704,7 @@ class Source extends combi_1.Expression {
         const method = (0, combi_1.seq)(_1.MethodCallChain, (0, combi_1.optPrio)((0, combi_1.altPrio)(attr, comp)), deref);
         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));
         // paren used for eg. "( 2 + 1 ) * 4"
         const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), Source, rparen);
         const after = (0, combi_1.seq)((0, combi_1.altPrio)("&", "&&", _1.ArithOperator), Source);
@@ -6681,7 +6712,7 @@ class Source extends combi_1.Expression {
         const prefix = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WPlus), "BIT-NOT");
         const old = (0, combi_1.seq)((0, combi_1.optPrio)(prefix), (0, combi_1.altPrio)(_1.Constant, _1.StringTemplate, text_element_1.TextElement, bool, method, (0, combi_1.seq)(_1.FieldChain, deref), paren), (0, combi_1.optPrio)(after));
         const corr = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("CORRESPONDING", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CorrespondingBody, rparen, (0, combi_1.optPrio)(after)));
-        const conv = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("CONV", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.ConvBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
+        const conv = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("CONV", _1.TypeNameOrInfer, lparenNoSpace, _1.ConvBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
         const swit = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("SWITCH", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.SwitchBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
         const value = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("VALUE", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.ValueBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
         const cond = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("COND", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CondBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
@@ -6743,6 +6774,29 @@ exports.SourceFieldSymbol = SourceFieldSymbol;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/source_field_symbol_chain.js":
+/*!**********************************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/source_field_symbol_chain.js ***!
+  \**********************************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.SourceFieldSymbolChain = 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");
+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));
+    }
+}
+exports.SourceFieldSymbolChain = SourceFieldSymbolChain;
+//# sourceMappingURL=source_field_symbol_chain.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_aggregation.js":
 /*!************************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_aggregation.js ***!
@@ -6760,7 +6814,7 @@ const dynamic_1 = __webpack_require__(/*! ./dynamic */ "./node_modules/@abaplint
 const sql_arithmetics_1 = __webpack_require__(/*! ./sql_arithmetics */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_arithmetics.js");
 class SQLAggregation extends combi_1.Expression {
     getRunnable() {
-        const f = (0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), (0, combi_1.altPrio)(sql_arithmetics_1.SQLArithmetics, dynamic_1.Dynamic, _1.SQLFunction));
+        const f = (0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), (0, combi_1.altPrio)(_1.SQLCase, sql_arithmetics_1.SQLArithmetics, dynamic_1.Dynamic, _1.SQLFunction));
         const fparen = (0, combi_1.seq)("(", _1.Field, ")");
         const count = (0, combi_1.seq)("COUNT", (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenLeft), (0, combi_1.tok)(tokens_1.ParenLeftW)), (0, combi_1.optPrio)("DISTINCT"), (0, combi_1.altPrio)("*", _1.Field, fparen), ")");
         const max = (0, combi_1.seq)("MAX", (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenLeft), (0, combi_1.tok)(tokens_1.ParenLeftW)), f, ")");
@@ -6889,8 +6943,9 @@ class SQLCase extends combi_1.Expression {
     getRunnable() {
         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);
-        const when = (0, combi_1.seq)("WHEN", (0, combi_1.altPrio)(sql_cond_1.SQLCond, constant_1.Constant), "THEN", sourc, (0, combi_1.starPrio)(sub));
+        const sourc = (0, combi_1.altPrio)(SQLCase, _1.SQLAggregation, _1.SQLFunction, sql_source_1.SQLSource, constant_1.Constant);
+        const val = (0, combi_1.altPrio)(sql_cond_1.SQLCond, constant_1.Constant, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), _1.SimpleSource3));
+        const when = (0, combi_1.seq)("WHEN", val, "THEN", sourc, (0, combi_1.starPrio)(sub));
         const els = (0, combi_1.seq)("ELSE", sourc);
         return (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("CASE", (0, combi_1.opt)(sql_field_name_1.SQLFieldName), (0, combi_1.plusPrio)(when), (0, combi_1.optPrio)(els), "END"));
     }
@@ -6966,15 +7021,16 @@ const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules
 class SQLCompare extends combi_1.Expression {
     getRunnable() {
         const subSelect = (0, combi_1.seq)("(", _1.Select, ")");
+        const subSelectDouble = (0, combi_1.seq)("(", "(", _1.Select, ")", ")");
         const between = (0, combi_1.seq)("BETWEEN", _1.SQLSource, "AND", _1.SQLSource);
         const like = (0, combi_1.seq)("LIKE", _1.SQLSource, (0, combi_1.optPrio)((0, combi_1.seq)("ESCAPE", _1.SQLSource)));
         const nul = (0, combi_1.seq)("IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("NULL", (0, combi_1.ver)(version_1.Version.v753, "INITIAL")));
         const source = new _1.SQLSource();
-        const sub = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("ALL", "ANY", "SOME")), subSelect);
+        const sub = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("ALL", "ANY", "SOME")), (0, combi_1.altPrio)(subSelect, subSelectDouble));
         const arith = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/"), _1.SQLFieldName)));
         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)));
-        const rett = (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLFunction, (0, combi_1.seq)(_1.SQLFieldName, (0, combi_1.optPrio)(arith)), at), (0, combi_1.altPrio)((0, combi_1.seq)(_1.SQLCompareOperator, (0, combi_1.altPrio)(sub, source)), (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(_1.SQLIn, like, between)), nul));
+        const rett = (0, combi_1.seq)((0, combi_1.altPrio)(_1.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, source)), (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(_1.SQLIn, like, between)), nul));
         const exists = (0, combi_1.seq)("EXISTS", subSelect);
         return (0, combi_1.altPrio)(exists, _1.Dynamic, rett);
     }
@@ -7105,11 +7161,13 @@ 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)));
         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)));
+        return (0, combi_1.altPrio)("*", _1.Dynamic, (0, combi_1.seq)(_1.SQLField, (0, combi_1.alt)(nev, old)), paren);
     }
 }
 exports.SQLFieldList = SQLFieldList;
@@ -7131,13 +7189,15 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 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 sql_path_1 = __webpack_require__(/*! ./sql_path */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_path.js");
+const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 // loop must include one field from the database table
 class SQLFieldListLoop extends combi_1.Expression {
     getRunnable() {
         const comma = (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp05, ","));
         const as = (0, combi_1.seq)("AS", _1.SQLAsName);
         const someField = (0, combi_1.seq)(_1.SQLField, comma);
-        const fieldList = (0, combi_1.seq)((0, combi_1.star)(someField), (0, combi_1.alt)(_1.SQLFieldName, sql_path_1.SQLPath, _1.Constant), (0, combi_1.optPrio)(as), comma, (0, combi_1.star)(someField));
+        const abap = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), _1.SimpleFieldChain));
+        const fieldList = (0, combi_1.seq)((0, combi_1.star)(someField), (0, combi_1.alt)(_1.SQLFieldName, abap, sql_path_1.SQLPath, _1.Constant), (0, combi_1.optPrio)(as), comma, (0, combi_1.star)(someField));
         const fields = (0, combi_1.alt)("*", _1.Dynamic, fieldList);
         return fields;
     }
@@ -7190,6 +7250,28 @@ exports.SQLFields = SQLFields;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_fields_loop.js":
+/*!************************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_fields_loop.js ***!
+  \************************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.SQLFieldsLoop = 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");
+class SQLFieldsLoop extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)("FIELDS", (0, combi_1.opt)("DISTINCT"), _1.SQLFieldListLoop);
+    }
+}
+exports.SQLFieldsLoop = SQLFieldsLoop;
+//# sourceMappingURL=sql_fields_loop.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_for_all_entries.js":
 /*!****************************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_for_all_entries.js ***!
@@ -7276,37 +7358,29 @@ exports.SQLFromSource = SQLFromSource;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SQLFunction = void 0;
-const constant_1 = __webpack_require__(/*! ./constant */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/constant.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 integer_1 = __webpack_require__(/*! ./integer */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/integer.js");
-const sql_alias_field_1 = __webpack_require__(/*! ./sql_alias_field */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_alias_field.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");
-const simple_source3_1 = __webpack_require__(/*! ./simple_source3 */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/simple_source3.js");
-const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/source.js");
-const sql_aggregation_1 = __webpack_require__(/*! ./sql_aggregation */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_aggregation.js");
+const sql_function_input_1 = __webpack_require__(/*! ./sql_function_input */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_function_input.js");
 class SQLFunction extends combi_1.Expression {
     getRunnable() {
-        const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), source_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)(simple_source3_1.SimpleSource3, paren)));
-        const param = (0, combi_1.altPrio)(SQLFunction, sql_aggregation_1.SQLAggregation, sql_field_name_1.SQLFieldName, sql_alias_field_1.SQLAliasField, constant_1.Constant, at);
         const castTypes = (0, combi_1.altPrio)((0, combi_1.seq)("CHAR", (0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)), (0, combi_1.seq)("DEC", (0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, ",", integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)), "FLTP", "NUMC", "INT8");
-        const commaParam = (0, combi_1.seq)(",", param);
+        const commaParam = (0, combi_1.seq)(",", sql_function_input_1.SQLFunctionInput);
         // note: the function names are not keywords, they are usually in lower case
-        const abs = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^abs$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const cast = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^cast$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, "AS", castTypes, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const ceil = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^ceil$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const coalesce = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^coalesce$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, commaParam, (0, combi_1.optPrio)(commaParam), (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const concat = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^concat$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const div = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^div$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const floor = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^floor$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const length = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^length$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const lower = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)((0, combi_1.regex)(/^lower$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const mod = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^mod$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const replace = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^replace$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, commaParam, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const round = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^round$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const upper = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)((0, combi_1.regex)(/^upper$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const abs = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^abs$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const cast = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^cast$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, "AS", castTypes, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const ceil = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^ceil$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const coalesce = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^coalesce$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.optPrio)(commaParam), (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const concat = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^concat$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const div = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^div$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const floor = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^floor$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const length = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^length$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const lower = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)((0, combi_1.regex)(/^lower$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const mod = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^mod$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const replace = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^replace$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const round = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^round$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const upper = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)((0, combi_1.regex)(/^upper$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const uuid = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)((0, combi_1.regex)(/^uuid$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.WParenRightW)));
         return (0, combi_1.altPrio)(uuid, abs, ceil, floor, cast, div, mod, coalesce, concat, replace, length, lower, upper, round);
     }
@@ -7316,6 +7390,40 @@ exports.SQLFunction = SQLFunction;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_function_input.js":
+/*!***************************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_function_input.js ***!
+  \***************************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.SQLFunctionInput = void 0;
+const constant_1 = __webpack_require__(/*! ./constant */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/constant.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_alias_field_1 = __webpack_require__(/*! ./sql_alias_field */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_alias_field.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");
+const simple_source3_1 = __webpack_require__(/*! ./simple_source3 */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/simple_source3.js");
+const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/source.js");
+const sql_aggregation_1 = __webpack_require__(/*! ./sql_aggregation */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_aggregation.js");
+const sql_function_1 = __webpack_require__(/*! ./sql_function */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_function.js");
+class SQLFunctionInput extends combi_1.Expression {
+    getRunnable() {
+        const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), source_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)(simple_source3_1.SimpleSource3, paren)));
+        const param = (0, combi_1.altPrio)(sql_function_1.SQLFunction, sql_aggregation_1.SQLAggregation, sql_field_name_1.SQLFieldName, sql_alias_field_1.SQLAliasField, constant_1.Constant, at);
+        const operator = (0, combi_1.altPrio)("+", "-", "*", "/", "&&");
+        return (0, combi_1.seq)(param, (0, combi_1.starPrio)((0, combi_1.seq)(operator, param)));
+    }
+}
+exports.SQLFunctionInput = SQLFunctionInput;
+//# sourceMappingURL=sql_function_input.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_group_by.js":
 /*!*********************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_group_by.js ***!
@@ -7354,9 +7462,13 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SQLHaving = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 const dynamic_1 = __webpack_require__(/*! ./dynamic */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/dynamic.js");
+const sql_aggregation_1 = __webpack_require__(/*! ./sql_aggregation */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_aggregation.js");
+const sql_compare_operator_1 = __webpack_require__(/*! ./sql_compare_operator */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_compare_operator.js");
+const sql_source_1 = __webpack_require__(/*! ./sql_source */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_source.js");
 class SQLHaving extends combi_1.Expression {
     getRunnable() {
-        const having = (0, combi_1.seq)("HAVING", dynamic_1.Dynamic);
+        const cond = (0, combi_1.seq)(sql_aggregation_1.SQLAggregation, sql_compare_operator_1.SQLCompareOperator, sql_source_1.SQLSource);
+        const having = (0, combi_1.seq)("HAVING", (0, combi_1.altPrio)(dynamic_1.Dynamic, cond));
         return having;
     }
 }
@@ -7739,7 +7851,7 @@ class StringTemplateFormatting extends combi_1.Expression {
         const alignOptions = (0, combi_1.altPrio)("LEFT", "RIGHT", "CENTER", _1.Source);
         const dateTimeOptions = (0, combi_1.altPrio)("RAW", "ISO", "USER", "ENVIRONMENT", _1.Source, dynamic_1.Dynamic);
         const timeStampOptions = (0, combi_1.altPrio)("SPACE", "ISO", "USER", "ENVIRONMENT", _1.Source);
-        const numberOptions = (0, combi_1.altPrio)("RAW", "USER", "ENVIRONMENT", _1.Source);
+        const numberOptions = (0, combi_1.altPrio)("RAW", "USER", "ENVIRONMENT", _1.Source, dynamic_1.Dynamic);
         const signOptions = (0, combi_1.altPrio)("LEFT", "LEFTPLUS", "LEFTSPACE", "RIGHT", "RIGHTPLUS", "RIGHTSPACE", _1.Source);
         const caseOptions = (0, combi_1.altPrio)("RAW", "UPPER", "LOWER", _1.Source, dynamic_1.Dynamic);
         const zeroXSDOptions = (0, combi_1.altPrio)("YES", "NO", _1.Source);
@@ -7951,7 +8063,7 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 class TargetFieldSymbol extends combi_1.Expression {
     getRunnable() {
-        return new _1.FieldSymbol();
+        return (0, combi_1.seq)(_1.FieldSymbol, (0, combi_1.optPrio)(_1.TableBody));
     }
 }
 exports.TargetFieldSymbol = TargetFieldSymbol;
@@ -8066,8 +8178,8 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 class Throw extends combi_1.Expression {
     getRunnable() {
-        // todo, MESSAGE
-        return (0, combi_1.seq)("THROW", (0, combi_1.opt)("RESUMABLE"), _1.ClassName, (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.ParenLeft)), (0, combi_1.opt)((0, combi_1.alt)(_1.Source, _1.ParameterListS)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.ParenRightW)));
+        const message = (0, combi_1.seq)("MESSAGE", _1.MessageSource, (0, combi_1.opt)(_1.RaiseWith));
+        return (0, combi_1.seq)("THROW", (0, combi_1.opt)("RESUMABLE"), _1.ClassName, (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.ParenLeft)), (0, combi_1.opt)((0, combi_1.alt)(_1.Source, _1.ParameterListS, message)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.ParenRightW)));
     }
 }
 exports.Throw = Throw;
@@ -8216,8 +8328,18 @@ class TypeStructure extends combi_1.Expression {
     getRunnable() {
         // todo, add version,
         const hier = (0, combi_1.seq)("HIERARCHY", _1.NamespaceSimpleName);
+        const create = (0, combi_1.seq)("CREATE", (0, combi_1.alt)(_1.NamespaceSimpleName, _1.EntityAssociation));
+        const update = (0, combi_1.seq)("UPDATE", (0, combi_1.alt)(_1.NamespaceSimpleName, _1.EntityAssociation));
+        const readResult = (0, combi_1.seq)("READ RESULT", (0, combi_1.alt)(_1.NamespaceSimpleName, _1.EntityAssociation));
+        const action = (0, combi_1.seq)("ACTION IMPORT", _1.Source);
+        const permissionsRequest = (0, combi_1.seq)("PERMISSIONS REQUEST", _1.NamespaceSimpleName);
         const evt = (0, combi_1.seq)("EVENT", _1.EventName);
-        return (0, combi_1.seq)("TYPE STRUCTURE FOR", (0, combi_1.altPrio)(hier, evt));
+        const failedEarly = (0, combi_1.seq)("FAILED EARLY", _1.NamespaceSimpleName);
+        const mappedEarly = (0, combi_1.seq)("MAPPED EARLY", _1.NamespaceSimpleName);
+        const reportedEarly = (0, combi_1.seq)("REPORTED EARLY", _1.NamespaceSimpleName);
+        const structure = (0, combi_1.seq)("STRUCTURE FOR", (0, combi_1.altPrio)(hier, evt, create, update, action, permissionsRequest, readResult));
+        const response = (0, combi_1.seq)("RESPONSE FOR", (0, combi_1.altPrio)(failedEarly, mappedEarly, reportedEarly));
+        return (0, combi_1.seq)("TYPE", (0, combi_1.altPrio)(structure, response));
     }
 }
 exports.TypeStructure = TypeStructure;
@@ -8247,16 +8369,17 @@ class TypeTable extends combi_1.Expression {
         const generic = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE");
         const normal1 = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE OF", (0, combi_1.optPrio)("REF TO"), _1.TypeName);
         const likeType = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE OF", (0, combi_1.optPrio)("REF TO"), (0, combi_1.opt)(field_chain_1.FieldChain), (0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))));
-        const rangeType = (0, combi_1.seq)("RANGE OF", _1.TypeName, (0, combi_1.optPrio)(header), (0, combi_1.optPrio)(initial));
-        const rangeLike = (0, combi_1.seq)("RANGE OF", field_chain_1.FieldChain, (0, combi_1.optPrio)(header), (0, combi_1.optPrio)(initial));
+        const rangeType = (0, combi_1.seq)("RANGE OF", _1.TypeName, (0, combi_1.optPrio)(header), (0, combi_1.optPrio)(initial), (0, combi_1.optPrio)("VALUE IS INITIAL"));
+        const rangeLike = (0, combi_1.seq)("RANGE OF", field_chain_1.FieldChain, (0, combi_1.optPrio)(header), (0, combi_1.optPrio)(initial), (0, combi_1.optPrio)("VALUE IS INITIAL"));
         // a maximum of 15 secondary table keys can be defined
         // "WITH" is not allowed as a field name in keys
         const typetable = (0, combi_1.alt)(generic, (0, combi_1.seq)(normal1, (0, combi_1.alt)((0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))), (0, combi_1.seq)((0, combi_1.plus)(type_table_key_1.TypeTableKey), (0, combi_1.optPrio)(initial)))));
-        const occurs = (0, combi_1.seq)("OCCURS", _1.Integer);
-        const derived = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("TABLE FOR", (0, combi_1.altPrio)("ACTION IMPORT", "ACTION RESULT", "CREATE", "EVENT", "FAILED", "LOCK", "READ RESULT", "UPDATE"), _1.TypeName));
+        const occurs = (0, combi_1.seq)("OCCURS", (0, combi_1.altPrio)(_1.Integer, field_chain_1.FieldChain));
+        const derived = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("TABLE FOR", (0, combi_1.altPrio)("ACTION IMPORT", "ACTION RESULT", "CREATE", "EVENT", "REPORTED EARLY", "FAILED EARLY", "FAILED", "LOCK", "DETERMINATION", "READ RESULT", "UPDATE"), (0, combi_1.alt)(_1.TypeName, _1.EntityAssociation)));
         const oldType = (0, combi_1.seq)((0, combi_1.opt)("REF TO"), _1.TypeName, (0, combi_1.alt)((0, combi_1.seq)(occurs, (0, combi_1.opt)(header)), header));
         const oldLike = (0, combi_1.seq)((0, combi_1.opt)("REF TO"), field_chain_1.FieldChain, (0, combi_1.alt)((0, combi_1.seq)(occurs, (0, combi_1.opt)(header)), header));
-        const ret = (0, combi_1.altPrio)((0, combi_1.seq)(occurs, (0, combi_1.opt)(header)), (0, combi_1.seq)("LIKE", (0, combi_1.alt)(oldLike, likeType, rangeLike)), (0, combi_1.seq)("TYPE", (0, combi_1.alt)(oldType, typetable, rangeType, derived)));
+        const typeLine = (0, combi_1.seq)("LINE OF", _1.TypeName, occurs, header);
+        const ret = (0, combi_1.altPrio)((0, combi_1.seq)(occurs, (0, combi_1.opt)(header)), (0, combi_1.seq)("LIKE", (0, combi_1.alt)(oldLike, likeType, rangeLike, typeLine)), (0, combi_1.seq)("TYPE", (0, combi_1.alt)(oldType, typetable, rangeType, typeLine, derived)));
         return ret;
     }
 }
@@ -8285,7 +8408,8 @@ class TypeTableKey extends combi_1.Expression {
         const emptyKey = (0, combi_1.ver)(version_1.Version.v740sp02, "EMPTY KEY");
         const components = (0, combi_1.plus)((0, combi_1.alt)((0, combi_1.seq)("WITH", (0, combi_1.failStar)()), _1.FieldSub));
         const further = (0, combi_1.seq)((0, combi_1.alt)("WITHOUT", "WITH"), "FURTHER SECONDARY KEYS");
-        const key = (0, combi_1.seq)("WITH", (0, combi_1.opt)(uniqueness), (0, combi_1.altPrio)(defaultKey, emptyKey, (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("SORTED", "HASHED")), "KEY", (0, combi_1.alt)((0, combi_1.seq)(_1.Field, "COMPONENTS", components), components))), (0, combi_1.optPrio)(further), (0, combi_1.optPrio)("READ-ONLY"));
+        const alias = (0, combi_1.seq)("ALIAS", _1.Field);
+        const key = (0, combi_1.seq)("WITH", (0, combi_1.opt)(uniqueness), (0, combi_1.altPrio)(defaultKey, emptyKey, (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("SORTED", "HASHED")), "KEY", (0, combi_1.alt)((0, combi_1.seq)(_1.Field, (0, combi_1.opt)(alias), "COMPONENTS", components), components))), (0, combi_1.optPrio)(further), (0, combi_1.optPrio)("READ-ONLY"));
         return key;
     }
 }
@@ -8432,7 +8556,7 @@ class WriteOffsetLength extends combi_1.Expression {
     getRunnable() {
         const post = (0, combi_1.seq)((0, combi_1.alt)(simple_field_chain2_1.SimpleFieldChain2, (0, combi_1.regex)(/^[\d]+$/), (0, combi_1.regex)(/^\*$/)), (0, combi_1.alt)((0, combi_1.tok)(tokens_1.ParenRightW), (0, combi_1.tok)(tokens_1.ParenRight)));
         const wlength = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeft), post);
-        const length = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeft), post);
+        const length = (0, combi_1.seq)((0, combi_1.alt)((0, combi_1.tok)(tokens_1.WParenLeft), (0, combi_1.tok)(tokens_1.ParenLeft)), post);
         const complex = (0, combi_1.alt)(wlength, (0, combi_1.seq)((0, combi_1.alt)(simple_field_chain2_1.SimpleFieldChain2, (0, combi_1.regex)(/^\/?[\w\d]+$/), "/"), (0, combi_1.opt)(length)));
         const at = (0, combi_1.seq)((0, combi_1.opt)("AT"), complex);
         return at;
@@ -8659,8 +8783,13 @@ class StatementParser {
                     || type instanceof Statements.EndMethod) {
                     sql = false;
                 }
-                else if (!(type instanceof _statement_1.Comment)) {
+                else {
                     wa.statements[i] = new nodes_1.StatementNode(new _statement_1.NativeSQL()).setChildren(this.tokensToNodes(statement.getTokens()));
+                    if (statement.concatTokens().toUpperCase().endsWith("ENDMETHOD.")) {
+                        // yea, this is not completely correct
+                        wa.statements[i] = new nodes_1.StatementNode(new Statements.EndMethod()).setChildren(this.tokensToNodes(statement.getTokens()));
+                        sql = false;
+                    }
                 }
             }
         }
@@ -8847,7 +8976,9 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 class Add {
     getMatcher() {
         const to = (0, combi_1.seq)("TO", expressions_1.Target);
-        const then = (0, combi_1.seq)("THEN", expressions_1.FieldSub, "UNTIL", expressions_1.FieldSub, "GIVING", expressions_1.FieldSub);
+        const accordingTo = (0, combi_1.seq)("ACCORDING TO", expressions_1.FieldSub);
+        const giving = (0, combi_1.seq)("GIVING", expressions_1.FieldSub, (0, combi_1.opt)(accordingTo));
+        const then = (0, combi_1.seq)("THEN", expressions_1.FieldSub, "UNTIL", expressions_1.FieldSub, (0, combi_1.alt)(giving, to));
         const ret = (0, combi_1.seq)("ADD", expressions_1.Source, (0, combi_1.altPrio)(to, then));
         return ret;
     }
@@ -9004,7 +9135,10 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class AssignLocalCopy {
     getMatcher() {
-        const ret = (0, combi_1.seq)("ASSIGN LOCAL COPY OF", (0, combi_1.opt)((0, combi_1.seq)("INITIAL", (0, combi_1.opt)("LINE OF"))), (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic), "TO", expressions_1.TargetFieldSymbol);
+        const init = (0, combi_1.seq)("INITIAL", (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic));
+        const iline = (0, combi_1.seq)("INITIAL LINE OF", (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic));
+        const main = (0, combi_1.seq)("MAIN TABLE FIELD", expressions_1.Dynamic);
+        const ret = (0, combi_1.seq)("ASSIGN LOCAL COPY OF", (0, combi_1.alt)(init, iline, main, expressions_1.Source), "TO", expressions_1.TargetFieldSymbol);
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -9104,6 +9238,28 @@ exports.AtLineSelection = AtLineSelection;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/at_pf.js":
+/*!*************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/statements/at_pf.js ***!
+  \*************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AtPF = void 0;
+const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
+class AtPF {
+    getMatcher() {
+        return (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.seq)("AT", (0, combi_1.regex)(/^PF\d\d?$/i)));
+    }
+}
+exports.AtPF = AtPF;
+//# sourceMappingURL=at_pf.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/at_selection_screen.js":
 /*!***************************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/statements/at_selection_screen.js ***!
@@ -9221,7 +9377,8 @@ const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@a
 class Break {
     getMatcher() {
         const next = (0, combi_1.str)("AT NEXT APPLICATION STATEMENT");
-        const ret = (0, combi_1.altPrio)((0, combi_1.seq)("BREAK-POINT", (0, combi_1.optPrio)((0, combi_1.altPrio)(next, expressions_1.Source))), (0, combi_1.seq)("BREAK", expressions_1.FieldSub));
+        // note BREAK is a special macro that wraps the parameter in a char
+        const ret = (0, combi_1.altPrio)((0, combi_1.seq)("BREAK-POINT", (0, combi_1.optPrio)((0, combi_1.altPrio)(next, expressions_1.Source))), (0, combi_1.seq)("BREAK", (0, combi_1.starPrio)((0, combi_1.regex)(/.*/))));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -9350,7 +9507,7 @@ class CallDialog {
         const exporting = (0, combi_1.seq)("EXPORTING", (0, combi_1.plus)(from));
         const to = (0, combi_1.seq)(expressions_1.Field, (0, combi_1.optPrio)((0, combi_1.seq)("TO", expressions_1.Field)));
         const importing = (0, combi_1.seq)("IMPORTING", (0, combi_1.plus)(to));
-        const ret = (0, combi_1.seq)("CALL DIALOG", expressions_1.Constant, (0, combi_1.opt)(exporting), (0, combi_1.opt)(importing));
+        const ret = (0, combi_1.seq)("CALL DIALOG", (0, combi_1.alt)(expressions_1.Constant, expressions_1.FieldSub), (0, combi_1.opt)(exporting), (0, combi_1.opt)(importing));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -9383,7 +9540,8 @@ class CallFunction {
         const separate = (0, combi_1.str)("AS SEPARATE UNIT");
         const keeping = (0, combi_1.str)("KEEPING LOGICAL UNIT OF WORK");
         const options = (0, combi_1.per)(starting, update, background, expressions_1.Destination, calling, performing, separate, keeping);
-        const dynamic = (0, combi_1.seq)("PARAMETER-TABLE", expressions_1.Source, (0, combi_1.opt)((0, combi_1.seq)("EXCEPTION-TABLE", expressions_1.Source)));
+        const ex = (0, combi_1.seq)("EXCEPTION-TABLE", expressions_1.Source);
+        const dynamic = (0, combi_1.alt)((0, combi_1.seq)("PARAMETER-TABLE", expressions_1.Source, (0, combi_1.opt)(ex)), ex);
         const call = (0, combi_1.seq)("CALL", (0, combi_1.altPrio)("FUNCTION", (0, combi_1.verNot)(version_1.Version.Cloud, "CUSTOMER-FUNCTION")), expressions_1.FunctionName, (0, combi_1.opt)(options), (0, combi_1.alt)(expressions_1.FunctionParameters, dynamic));
         return call;
     }
@@ -9659,7 +9817,7 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 class Check {
     getMatcher() {
-        const ret = (0, combi_1.seq)("CHECK", (0, combi_1.altPrio)(expressions_1.Cond, expressions_1.Field));
+        const ret = (0, combi_1.seq)("CHECK", (0, combi_1.altPrio)(expressions_1.Cond, expressions_1.FieldSub));
         return ret;
     }
 }
@@ -10036,7 +10194,10 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class CommitEntities {
     getMatcher() {
-        const s = (0, combi_1.seq)("COMMIT ENTITIES", (0, combi_1.optPrio)("IN SIMULATION MODE"), (0, combi_1.star)((0, combi_1.seq)("RESPONSE OF", expressions_1.NamespaceSimpleName, "FAILED", expressions_1.Target, "REPORTED", expressions_1.Target)));
+        const failed = (0, combi_1.seq)("FAILED", expressions_1.Target);
+        const reported = (0, combi_1.seq)("REPORTED", expressions_1.Target);
+        const responses = (0, combi_1.seq)("RESPONSES", failed, reported);
+        const s = (0, combi_1.seq)("COMMIT ENTITIES", (0, combi_1.optPrio)("IN SIMULATION MODE"), (0, combi_1.opt)(responses), (0, combi_1.opt)((0, combi_1.seq)("RESPONSE OF", expressions_1.NamespaceSimpleName, failed, reported)));
         return (0, combi_1.ver)(version_1.Version.v754, s);
     }
 }
@@ -10475,7 +10636,8 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 class DataBegin {
     getMatcher() {
         const occurs = (0, combi_1.seq)("OCCURS", expressions_1.Integer);
-        const structure = (0, combi_1.seq)("BEGIN OF", (0, combi_1.opt)("COMMON PART"), expressions_1.DefinitionName, (0, combi_1.opt)("READ-ONLY"), (0, combi_1.opt)(occurs));
+        const common = (0, combi_1.altPrio)((0, combi_1.seq)("COMMON PART", expressions_1.DefinitionName), "COMMON PART");
+        const structure = (0, combi_1.seq)("BEGIN OF", (0, combi_1.altPrio)(common, (0, combi_1.seq)(expressions_1.DefinitionName, (0, combi_1.opt)("READ-ONLY"), (0, combi_1.opt)(occurs))));
         return (0, combi_1.seq)("DATA", structure);
     }
 }
@@ -10686,7 +10848,7 @@ class DeleteMemory {
         const memory = (0, combi_1.seq)("MEMORY ID", expressions_1.Source);
         const id = (0, combi_1.seq)("ID", expressions_1.Source);
         const client = (0, combi_1.seq)("CLIENT", expressions_1.Source);
-        const shared = (0, combi_1.seq)("SHARED MEMORY", expressions_1.Field, "(", expressions_1.Field, ")", (0, combi_1.optPrio)(client), id);
+        const shared = (0, combi_1.seq)("SHARED", (0, combi_1.altPrio)("MEMORY", "BUFFER"), expressions_1.Field, "(", expressions_1.Field, ")", (0, combi_1.optPrio)(client), id);
         const ret = (0, combi_1.seq)("DELETE FROM", (0, combi_1.alt)(memory, shared));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
@@ -10794,15 +10956,17 @@ class Describe {
         const table = (0, combi_1.seq)("TABLE", expressions_1.FieldChain, (0, combi_1.opt)((0, combi_1.per)(tlines, kind, occurs)));
         const mode = (0, combi_1.seq)("IN", (0, combi_1.alt)("BYTE", "CHARACTER"), "MODE");
         const field = (0, combi_1.seq)("FIELD", expressions_1.Source, (0, combi_1.per)((0, combi_1.seq)("TYPE", expressions_1.Target), (0, combi_1.seq)("COMPONENTS", expressions_1.Target), (0, combi_1.seq)("LENGTH", expressions_1.Target, (0, combi_1.opt)(mode)), (0, combi_1.seq)("DECIMALS", expressions_1.Target), (0, combi_1.seq)("HELP-ID", expressions_1.Target), (0, combi_1.seq)("OUTPUT-LENGTH", expressions_1.Target), (0, combi_1.seq)("EDIT MASK", expressions_1.Target), (0, combi_1.seq)("INTO", expressions_1.Target)));
-        const distance = (0, combi_1.seq)("DISTANCE BETWEEN", expressions_1.Source, "AND", expressions_1.Source, "INTO", expressions_1.Target, mode);
+        const distance = (0, combi_1.seq)("DISTANCE BETWEEN", expressions_1.Source, "AND", expressions_1.Source, "INTO", expressions_1.Target, (0, combi_1.opt)(mode));
         const lines = (0, combi_1.seq)("NUMBER OF LINES", expressions_1.Target);
+        const pages = (0, combi_1.seq)("NUMBER OF PAGES", expressions_1.Target);
         const line = (0, combi_1.seq)("LINE", expressions_1.Source);
         const page = (0, combi_1.seq)("PAGE", expressions_1.Source);
         const index = (0, combi_1.seq)("INDEX", expressions_1.Source);
         const top = (0, combi_1.seq)("TOP-LINES", expressions_1.Target);
         const lineSize = (0, combi_1.seq)("LINE-SIZE", expressions_1.Target);
+        const lineCount = (0, combi_1.seq)("LINE-COUNT", expressions_1.Target);
         const first = (0, combi_1.seq)("FIRST-LINE", expressions_1.Target);
-        const list = (0, combi_1.seq)("LIST", (0, combi_1.per)(lines, index, line, page, top, first, lineSize));
+        const list = (0, combi_1.seq)("LIST", (0, combi_1.per)(lines, pages, index, line, page, top, first, lineSize, lineCount));
         const ret = (0, combi_1.seq)("DESCRIBE", (0, combi_1.altPrio)(table, field, distance, list));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
@@ -11684,7 +11848,7 @@ class Export {
         const database = (0, combi_1.seq)("DATABASE", cluster, (0, combi_1.per)(from, client, id, using));
         const target = (0, combi_1.alt)(buffer, memory, database, table, shared);
         const left = (0, combi_1.alt)(expressions_1.FieldSub, expressions_1.FieldSymbol);
-        const source = (0, combi_1.alt)((0, combi_1.plus)((0, combi_1.altPrio)(expressions_1.ParameterS, (0, combi_1.seq)(left, from), left)), expressions_1.Dynamic);
+        const source = (0, combi_1.alt)((0, combi_1.plus)((0, combi_1.altPrio)(expressions_1.ParameterS, (0, combi_1.seq)(left, from), left)), expressions_1.Dynamic, expressions_1.Constant);
         const compression = (0, combi_1.seq)("COMPRESSION", (0, combi_1.alt)("ON", "OFF"));
         const hint = (0, combi_1.seq)("CODE PAGE HINT", expressions_1.Source);
         return (0, combi_1.seq)("EXPORT", source, "TO", target, (0, combi_1.opt)(compression), (0, combi_1.opt)(hint));
@@ -11931,7 +12095,7 @@ class Format {
     getMatcher() {
         const eq = (0, combi_1.seq)("=", expressions_1.Source);
         const value = (0, combi_1.altPrio)(eq, "ON", "OFF");
-        const options = (0, combi_1.per)("RESET", (0, combi_1.seq)("INTENSIFIED", (0, combi_1.opt)(value)), (0, combi_1.seq)("INVERSE", (0, combi_1.opt)(value)), (0, combi_1.seq)("HOTSPOT", (0, combi_1.opt)(value)), (0, combi_1.seq)("FRAMES", value), (0, combi_1.seq)("INPUT", value), expressions_1.Color);
+        const options = (0, combi_1.per)("RESET", (0, combi_1.seq)("INTENSIFIED", (0, combi_1.opt)(value)), (0, combi_1.seq)("INVERSE", (0, combi_1.opt)(value)), (0, combi_1.seq)("HOTSPOT", (0, combi_1.opt)(value)), (0, combi_1.seq)("FRAMES", value), (0, combi_1.seq)("INPUT", (0, combi_1.opt)(value)), expressions_1.Color);
         const ret = (0, combi_1.seq)("FORMAT", options);
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
@@ -12051,7 +12215,7 @@ class FunctionPool {
         const message = (0, combi_1.seq)("MESSAGE-ID", expressions_1.MessageClass);
         const line = (0, combi_1.seq)("LINE-SIZE", expressions_1.Integer);
         const no = (0, combi_1.str)("NO STANDARD PAGE HEADING");
-        return (0, combi_1.seq)("FUNCTION-POOL", expressions_1.Field, (0, combi_1.opt)((0, combi_1.per)(message, line, no)));
+        return (0, combi_1.seq)("FUNCTION-POOL", expressions_1.IncludeName, (0, combi_1.opt)((0, combi_1.per)(message, line, no)));
     }
 }
 exports.FunctionPool = FunctionPool;
@@ -12351,7 +12515,9 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class GetPermissions {
     getMatcher() {
-        const s = (0, combi_1.seq)("GET PERMISSIONS ONLY GLOBAL AUTHORIZATION ENTITY", expressions_1.SimpleName, "REQUEST", expressions_1.Source, "RESULT", expressions_1.Target, "FAILED", expressions_1.Target, "REPORTED", expressions_1.Target);
+        const type = (0, combi_1.altPrio)("GLOBAL AUTHORIZATION", "INSTANCE");
+        const from = (0, combi_1.seq)("FROM", expressions_1.Source);
+        const s = (0, combi_1.seq)("GET PERMISSIONS ONLY", type, "ENTITY", expressions_1.SimpleName, (0, combi_1.optPrio)(from), "REQUEST", expressions_1.Source, "RESULT", expressions_1.Target, "FAILED", expressions_1.Target, "REPORTED", expressions_1.Target);
         return (0, combi_1.ver)(version_1.Version.v754, s);
     }
 }
@@ -12547,7 +12713,7 @@ class Import {
         const using = (0, combi_1.seq)("USING", expressions_1.Source);
         const cluster = (0, combi_1.seq)(expressions_1.NamespaceSimpleName, (0, combi_1.tok)(tokens_1.ParenLeft), (0, combi_1.regex)(/^[\w$%\^]{2}$/), (0, combi_1.tok)(tokens_1.ParenRightW));
         const buffer = (0, combi_1.seq)("DATA BUFFER", expressions_1.Source);
-        const memory = (0, combi_1.seq)("MEMORY ID", expressions_1.Source);
+        const memory = (0, combi_1.seq)("MEMORY", (0, combi_1.opt)((0, combi_1.seq)("ID", expressions_1.Source)));
         const table = (0, combi_1.seq)("INTERNAL TABLE", expressions_1.Source);
         const shared = (0, combi_1.seq)((0, combi_1.alt)("SHARED MEMORY", "SHARED BUFFER"), cluster, (0, combi_1.per)(dto, client, id));
         const database = (0, combi_1.seq)("DATABASE", cluster, (0, combi_1.per)(dto, client, id, using));
@@ -12876,6 +13042,7 @@ __exportStar(__webpack_require__(/*! ./export */ "./node_modules/@abaplint/core/
 __exportStar(__webpack_require__(/*! ./import */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/import.js"), exports);
 __exportStar(__webpack_require__(/*! ./at_first */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/at_first.js"), exports);
 __exportStar(__webpack_require__(/*! ./at_last */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/at_last.js"), exports);
+__exportStar(__webpack_require__(/*! ./at_pf */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/at_pf.js"), exports);
 __exportStar(__webpack_require__(/*! ./at */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/at.js"), exports);
 __exportStar(__webpack_require__(/*! ./put */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/put.js"), exports);
 __exportStar(__webpack_require__(/*! ./endat */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/endat.js"), exports);
@@ -13011,8 +13178,10 @@ const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@a
 class Infotypes {
     getMatcher() {
         const occurs = (0, combi_1.seq)("OCCURS", expressions_1.Constant);
-        const name = (0, combi_1.seq)("NAME", expressions_1.Field);
-        const ret = (0, combi_1.seq)("INFOTYPES", expressions_1.Constant, (0, combi_1.optPrio)(occurs), (0, combi_1.optPrio)(name));
+        const name = (0, combi_1.seq)("NAME", expressions_1.FieldSub);
+        const mode = "MODE N";
+        const valid = (0, combi_1.seq)("VALID FROM", expressions_1.Source, "TO", expressions_1.Source);
+        const ret = (0, combi_1.seq)("INFOTYPES", (0, combi_1.regex)(/^\d\d\d\d$/), (0, combi_1.optPrio)(valid), (0, combi_1.optPrio)(name), (0, combi_1.optPrio)(occurs), (0, combi_1.optPrio)(mode));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -13514,17 +13683,19 @@ class MethodDef {
         const parameters = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("FINAL", def, expressions_1.Abstract)), (0, combi_1.optPrio)(expressions_1.MethodDefImporting), (0, combi_1.optPrio)(expressions_1.MethodDefExporting), (0, combi_1.optPrio)(expressions_1.MethodDefChanging), (0, combi_1.optPrio)(expressions_1.MethodDefReturning), (0, combi_1.optPrio)((0, combi_1.altPrio)(expressions_1.MethodDefRaising, expressions_1.MethodDefExceptions)));
         const testing = (0, combi_1.seq)((0, combi_1.optPrio)(expressions_1.Abstract), "FOR TESTING", (0, combi_1.optPrio)((0, combi_1.altPrio)(expressions_1.MethodDefRaising, expressions_1.MethodDefExceptions)));
         // todo, this is only from version something
-        const tableFunction = (0, combi_1.seq)("TABLE FUNCTION", (0, combi_1.regex)(/^\w+?$/));
+        const tableFunction = (0, combi_1.seq)("TABLE FUNCTION", expressions_1.NamespaceSimpleName);
         // todo, this is only from version something
         const ddl = "DDL OBJECT OPTIONS CDS SESSION CLIENT REQUIRED";
         const result = (0, combi_1.seq)("RESULT", expressions_1.MethodParamName);
         const link = (0, combi_1.seq)("LINK", expressions_1.MethodParamName);
         const full = (0, combi_1.seq)("FULL", expressions_1.MethodParamName);
         const modify = (0, combi_1.alt)((0, combi_1.seq)("FOR ACTION", expressions_1.TypeName, (0, combi_1.optPrio)(result)), (0, combi_1.seq)("FOR CREATE", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation)), (0, combi_1.seq)("FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("FOR UPDATE", expressions_1.TypeName));
-        const behavior = (0, combi_1.altPrio)((0, combi_1.seq)("VALIDATE ON SAVE IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("MODIFY IMPORTING", expressions_1.MethodParamName, modify), (0, combi_1.seq)("READ IMPORTING", expressions_1.MethodParamName, "FOR READ", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation), (0, combi_1.optPrio)(full), result, (0, combi_1.optPrio)(link)), (0, combi_1.seq)("FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.NamespaceSimpleName, "FOR", expressions_1.NamespaceSimpleName, result), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR CREATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR UPDATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR READ", expressions_1.TypeName, result), (0, combi_1.seq)((0, combi_1.alt)("BEHAVIOR", "LOCK"), "IMPORTING", expressions_1.MethodParamName, "FOR LOCK", expressions_1.TypeName), (0, combi_1.seq)("DETERMINE", (0, combi_1.alt)("ON MODIFY", "ON SAVE"), "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("GLOBAL AUTHORIZATION IMPORTING REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result), (0, combi_1.seq)("INSTANCE AUTHORIZATION IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result));
+        const forRead = (0, combi_1.seq)("FOR READ", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation), (0, combi_1.optPrio)(full), result, (0, combi_1.optPrio)(link));
+        const forfunction = (0, combi_1.seq)("FOR FUNCTION", expressions_1.TypeName, result);
+        const behavior = (0, combi_1.altPrio)((0, combi_1.seq)("VALIDATE ON SAVE IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("MODIFY IMPORTING", expressions_1.MethodParamName, modify), (0, combi_1.seq)("READ IMPORTING", expressions_1.MethodParamName, (0, combi_1.altPrio)(forRead, forfunction)), (0, combi_1.seq)("FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.NamespaceSimpleName, "FOR", expressions_1.NamespaceSimpleName, result), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR CREATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR UPDATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR READ", expressions_1.TypeName, result), (0, combi_1.seq)((0, combi_1.alt)("BEHAVIOR", "LOCK"), "IMPORTING", expressions_1.MethodParamName, "FOR LOCK", expressions_1.TypeName), (0, combi_1.seq)("DETERMINE", (0, combi_1.alt)("ON MODIFY", "ON SAVE"), "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("GLOBAL AUTHORIZATION IMPORTING REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result), (0, combi_1.seq)("INSTANCE AUTHORIZATION IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result), (0, combi_1.seq)("INSTANCE FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result));
         // todo, this is only from version something
         const amdp = (0, combi_1.seq)("AMDP OPTIONS CDS SESSION CLIENT CURRENT", (0, combi_1.optPrio)(expressions_1.MethodDefImporting), (0, combi_1.optPrio)(expressions_1.MethodDefExporting), (0, combi_1.optPrio)(expressions_1.MethodDefRaising));
-        const ret = (0, combi_1.seq)((0, combi_1.altPrio)("CLASS-METHODS", "METHODS"), expressions_1.MethodName, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.optPrio)(expressions_1.Abstract), expressions_1.EventHandler), parameters, testing, (0, combi_1.seq)("FOR", (0, combi_1.alt)(tableFunction, ddl, behavior)), amdp, "NOT AT END OF MODE", (0, combi_1.optPrio)(expressions_1.Redefinition)));
+        const ret = (0, combi_1.seq)((0, combi_1.altPrio)("CLASS-METHODS", "METHODS"), expressions_1.MethodName, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.optPrio)(expressions_1.Abstract), (0, combi_1.optPrio)(def), expressions_1.EventHandler), parameters, testing, (0, combi_1.seq)("FOR", (0, combi_1.alt)(tableFunction, ddl, behavior)), amdp, "NOT AT END OF MODE", (0, combi_1.optPrio)(expressions_1.Redefinition)));
         return ret;
     }
 }
@@ -13601,8 +13772,15 @@ class ModifyEntities {
     getMatcher() {
         const fieldsWith = (0, combi_1.seq)("FIELDS (", (0, combi_1.plus)(expressions_1.SimpleName), ") WITH", expressions_1.Source);
         const operation = (0, combi_1.alt)((0, combi_1.seq)("UPDATE SET FIELDS WITH", expressions_1.Source), (0, combi_1.seq)("CREATE SET FIELDS WITH", expressions_1.Source), (0, combi_1.seq)("UPDATE", fieldsWith), (0, combi_1.seq)("DELETE FROM", expressions_1.Source), (0, combi_1.seq)("EXECUTE", expressions_1.SimpleName, "FROM", expressions_1.Source), (0, combi_1.seq)("CREATE", (0, combi_1.optPrio)("AUTO FILL CID"), fieldsWith));
-        const s = (0, combi_1.seq)("MODIFY ENTITIES OF", expressions_1.NamespaceSimpleName, (0, combi_1.opt)("IN LOCAL MODE"), "ENTITY", expressions_1.SimpleName, operation, (0, combi_1.per)((0, combi_1.seq)("FAILED", expressions_1.Target), (0, combi_1.seq)("RESULT", expressions_1.Target), (0, combi_1.seq)("MAPPED", expressions_1.Target), (0, combi_1.seq)("REPORTED", expressions_1.Target)));
-        return (0, combi_1.ver)(version_1.Version.v754, s);
+        const failed = (0, combi_1.seq)("FAILED", expressions_1.Target);
+        const result = (0, combi_1.seq)("RESULT", expressions_1.Target);
+        const mapped = (0, combi_1.seq)("MAPPED", expressions_1.Target);
+        const reported = (0, combi_1.seq)("REPORTED", expressions_1.Target);
+        const from = (0, combi_1.seq)("FROM", expressions_1.Source);
+        const execute = (0, combi_1.seq)("EXECUTE", expressions_1.NamespaceSimpleName);
+        const entities = (0, combi_1.seq)("ENTITIES OF", expressions_1.NamespaceSimpleName, (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.plusPrio)((0, combi_1.seq)("ENTITY", expressions_1.SimpleName, operation)), (0, combi_1.optPrio)((0, combi_1.per)(failed, result, mapped, reported)));
+        const entity = (0, combi_1.seq)("ENTITY", expressions_1.NamespaceSimpleName, execute, from, mapped, failed, reported);
+        return (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("MODIFY", (0, combi_1.alt)(entities, entity)));
     }
 }
 exports.ModifyEntities = ModifyEntities;
@@ -13658,7 +13836,9 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class ModifyLine {
     getMatcher() {
-        const form = (0, combi_1.seq)((0, combi_1.alt)("INVERSE", "INPUT"), "=", expressions_1.Source);
+        const onOff = (0, combi_1.alt)("ON", "OFF");
+        const eq = (0, combi_1.seq)("=", expressions_1.Source);
+        const form = (0, combi_1.seq)((0, combi_1.alt)("INVERSE", "INPUT", "COLOR"), (0, combi_1.alt)(eq, onOff));
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
         const value = (0, combi_1.seq)("FIELD VALUE", (0, combi_1.plus)((0, combi_1.seq)(expressions_1.Source, (0, combi_1.optPrio)(from))));
         const format = (0, combi_1.seq)("FIELD FORMAT", expressions_1.Source, (0, combi_1.opt)(form));
@@ -13666,8 +13846,7 @@ class ModifyLine {
         const index = (0, combi_1.seq)("INDEX", expressions_1.Source);
         const page = (0, combi_1.seq)("OF PAGE", expressions_1.Source);
         const ocp = (0, combi_1.str)("OF CURRENT PAGE");
-        const lineFormat = (0, combi_1.seq)("LINE FORMAT", (0, combi_1.alt)("INPUT OFF", "INVERSE", "RESET", "INTENSIFIED"));
-        const onOff = (0, combi_1.alt)("ON", "OFF");
+        const lineFormat = (0, combi_1.seq)("LINE FORMAT", (0, combi_1.per)("INPUT OFF", "INVERSE", "RESET", "INTENSIFIED", expressions_1.Color));
         const intensified = (0, combi_1.seq)("INTENSIFIED", onOff);
         const options = (0, combi_1.per)(index, value, format, page, lineFormat, lineValue, ocp, intensified, expressions_1.Color);
         const ret = (0, combi_1.seq)("MODIFY", (0, combi_1.altPrio)("CURRENT LINE", (0, combi_1.seq)("LINE", expressions_1.Source)), (0, combi_1.opt)(options));
@@ -13744,7 +13923,7 @@ const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules
 class Move {
     getMatcher() {
         const mov = (0, combi_1.verNot)(version_1.Version.Cloud, "MOVE");
-        const move = (0, combi_1.seq)(mov, (0, combi_1.altPrio)((0, combi_1.seq)("EXACT", expressions_1.Source, "TO", expressions_1.Target), (0, combi_1.seq)(expressions_1.Source, (0, combi_1.altPrio)("?TO", "TO"), expressions_1.Target)));
+        const move = (0, combi_1.seq)(mov, (0, combi_1.altPrio)((0, combi_1.seq)("EXACT", expressions_1.Source, "TO", expressions_1.Target), (0, combi_1.seq)(expressions_1.Source, (0, combi_1.altPrio)("?TO", "TO"), expressions_1.Target)), (0, combi_1.opt)((0, combi_1.seq)("PERCENTAGE", expressions_1.Source, (0, combi_1.opt)((0, combi_1.alt)("LEFT", "RIGHT")))));
         const calcAssign = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.WPlus), "="), (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WDash), "="), "/=", "*=", "&&="));
         const chained = (0, combi_1.seq)("=", (0, combi_1.star)((0, combi_1.seq)(expressions_1.Target, "=")));
         const equals = (0, combi_1.altPrio)((0, combi_1.altPrio)(chained, "?="), calcAssign);
@@ -13856,13 +14035,16 @@ class NewPage {
         const coverText = (0, combi_1.seq)("COVER TEXT", expressions_1.Source);
         const coverPage = (0, combi_1.seq)("SAP COVER PAGE", expressions_1.Source);
         const immediately = (0, combi_1.seq)("IMMEDIATELY", expressions_1.Source);
+        const copies = (0, combi_1.seq)("COPIES", expressions_1.Source);
         const keep = (0, combi_1.seq)("KEEP IN SPOOL", expressions_1.Source);
         const layout = (0, combi_1.seq)("LAYOUT", expressions_1.Source);
         const listAuth = (0, combi_1.seq)("LIST AUTHORITY", expressions_1.Source);
+        const department = (0, combi_1.seq)("DEPARTMENT", expressions_1.Source);
+        const receiver = (0, combi_1.seq)("RECEIVER", expressions_1.Source);
         const dataset = (0, combi_1.seq)("LIST DATASET", expressions_1.Source);
         const name = (0, combi_1.seq)("LIST NAME", expressions_1.Source);
         const newList = (0, combi_1.seq)("NEW LIST IDENTIFICATION", expressions_1.Source);
-        const ret = (0, combi_1.seq)("NEW-PAGE", (0, combi_1.opt)((0, combi_1.per)(print, (0, combi_1.alt)("NO-TITLE", "WITH-TITLE"), (0, combi_1.alt)("NO-HEADING", "WITH-HEADING"), "NO DIALOG", parameters, listAuth, immediately, dataset, coverPage, newList, keep, name, layout, destination, coverText, archive, "NEW-SECTION", lineCount, line)));
+        const ret = (0, combi_1.seq)("NEW-PAGE", (0, combi_1.opt)((0, combi_1.per)(print, (0, combi_1.alt)("NO-TITLE", "WITH-TITLE"), (0, combi_1.alt)("NO-HEADING", "WITH-HEADING"), "NO DIALOG", "NO-TOPOFPAGE", parameters, listAuth, immediately, dataset, coverPage, newList, keep, department, name, layout, destination, receiver, copies, coverText, archive, "NEW-SECTION", lineCount, line)));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -14058,8 +14240,9 @@ class Parameter {
         const length = (0, combi_1.seq)("LENGTH", expressions_1.Constant);
         const match = (0, combi_1.seq)("MATCHCODE OBJECT", expressions_1.Field);
         const decimals = (0, combi_1.seq)("DECIMALS", expressions_1.Source);
-        const perm = (0, combi_1.per)(type, def, "OBLIGATORY", match, cmd, length, decimals, radio, memory, modif, listbox, visible, "VALUE CHECK", "NO-DISPLAY", "AS CHECKBOX", "LOWER CASE");
-        const ret = (0, combi_1.seq)(para, expressions_1.FieldSub, (0, combi_1.opt)(expressions_1.FieldLength), (0, combi_1.opt)(perm));
+        const forTable = (0, combi_1.seq)("FOR TABLE", expressions_1.DatabaseTable, (0, combi_1.opt)("VALUE-REQUEST"));
+        const perm = (0, combi_1.per)(type, def, "OBLIGATORY", match, cmd, length, decimals, radio, memory, modif, listbox, visible, forTable, "VALUE CHECK", "NO-DISPLAY", "AS CHECKBOX", "LOWER CASE");
+        const ret = (0, combi_1.seq)(para, expressions_1.FieldSub, (0, combi_1.opt)(expressions_1.ConstantFieldLength), (0, combi_1.opt)(perm));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -14141,7 +14324,13 @@ class PrintControl {
     getMatcher() {
         const index = (0, combi_1.seq)("INDEX-LINE", expressions_1.Source);
         const func = (0, combi_1.seq)("FUNCTION", expressions_1.Source);
-        const ret = (0, combi_1.seq)("PRINT-CONTROL", (0, combi_1.alt)(index, func));
+        const line = (0, combi_1.seq)("LINE", expressions_1.Source);
+        const position = (0, combi_1.seq)("POSITION", expressions_1.Source);
+        const size = (0, combi_1.seq)("SIZE", expressions_1.Source);
+        const cpi = (0, combi_1.seq)("CPI", expressions_1.Source);
+        const lpi = (0, combi_1.seq)("LPI", expressions_1.Source);
+        const font = (0, combi_1.seq)("FONT", expressions_1.Source);
+        const ret = (0, combi_1.seq)("PRINT-CONTROL", (0, combi_1.per)(index, func, line, position, size, cpi, lpi, font));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -14186,12 +14375,12 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class Program {
     getMatcher() {
-        const message = (0, combi_1.seq)("MESSAGE-ID", expressions_1.Source);
+        const message = (0, combi_1.seq)("MESSAGE-ID", expressions_1.MessageClass);
         const size = (0, combi_1.seq)("LINE-SIZE", expressions_1.Source);
         const heading = (0, combi_1.str)("NO STANDARD PAGE HEADING");
-        const line = (0, combi_1.seq)("LINE-COUNT", expressions_1.Source);
+        const line = (0, combi_1.seq)("LINE-COUNT", expressions_1.Source, (0, combi_1.opt)(expressions_1.FieldLength));
         const options = (0, combi_1.per)(message, size, heading, line);
-        const ret = (0, combi_1.seq)("PROGRAM", (0, combi_1.optPrio)(expressions_1.ReportName), (0, combi_1.opt)(options));
+        const ret = (0, combi_1.seq)("PROGRAM", (0, combi_1.opt)(expressions_1.ReportName), (0, combi_1.opt)(options));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -14236,10 +14425,13 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class Provide {
     getMatcher() {
-        const list = (0, combi_1.plus)((0, combi_1.altPrio)("*", expressions_1.Field));
+        const list = (0, combi_1.plusPrio)((0, combi_1.altPrio)("*", expressions_1.ProvideFieldName));
         const fields = (0, combi_1.seq)("FIELDS", list, "FROM", expressions_1.Source, "INTO", expressions_1.Target, "VALID", expressions_1.Field, "BOUNDS", expressions_1.Field, "AND", expressions_1.Field);
-        const fieldList = (0, combi_1.altPrio)((0, combi_1.seq)(list, "FROM", expressions_1.Source), list);
-        const ret = (0, combi_1.seq)("PROVIDE", (0, combi_1.altPrio)((0, combi_1.plus)(fields), (0, combi_1.plus)(fieldList)), "BETWEEN", expressions_1.SimpleSource3, "AND", expressions_1.SimpleSource3);
+        const from = (0, combi_1.seq)("FROM", expressions_1.Source);
+        const fieldList = (0, combi_1.seq)((0, combi_1.plus)(list), from);
+        const where = (0, combi_1.seq)("WHERE", expressions_1.Cond);
+        const between = (0, combi_1.seq)("BETWEEN", expressions_1.SimpleSource3, "AND", expressions_1.SimpleSource3);
+        const ret = (0, combi_1.seq)("PROVIDE", (0, combi_1.altPrio)((0, combi_1.plusPrio)(fields), (0, combi_1.plusPrio)(fieldList)), (0, combi_1.opt)((0, combi_1.per)(between, where)));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -14408,7 +14600,7 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class ReadDataset {
     getMatcher() {
-        const ret = (0, combi_1.seq)("READ DATASET", expressions_1.Source, "INTO", expressions_1.Target, (0, combi_1.opt)((0, combi_1.seq)("MAXIMUM LENGTH", expressions_1.Source)), (0, combi_1.opt)((0, combi_1.seq)("ACTUAL LENGTH", expressions_1.Target)), (0, combi_1.opt)((0, combi_1.seq)("LENGTH", expressions_1.Target)));
+        const ret = (0, combi_1.seq)("READ DATASET", expressions_1.Source, "INTO", expressions_1.Target, (0, combi_1.opt)((0, combi_1.per)((0, combi_1.seq)("MAXIMUM LENGTH", expressions_1.Source), (0, combi_1.seq)("ACTUAL LENGTH", expressions_1.Target), (0, combi_1.seq)("LENGTH", expressions_1.Target))));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -14436,7 +14628,7 @@ class ReadEntities {
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
         const fields = (0, combi_1.seq)("FIELDS", (0, combi_1.tok)(tokens_1.WParenLeftW), (0, combi_1.plus)(expressions_1.SimpleName), (0, combi_1.tok)(tokens_1.WParenRightW), "WITH", expressions_1.Source);
         const all = (0, combi_1.seq)("ALL FIELDS WITH", expressions_1.Source);
-        const s = (0, combi_1.seq)("READ ENTITIES OF", expressions_1.NamespaceSimpleName, (0, combi_1.opt)("IN LOCAL MODE"), "ENTITY", expressions_1.SimpleName, (0, combi_1.opt)((0, combi_1.seq)("BY", expressions_1.AssociationName)), (0, combi_1.alt)(fields, from, all), "RESULT", expressions_1.Target, (0, combi_1.optPrio)((0, combi_1.seq)("LINK", expressions_1.Target)), (0, combi_1.optPrio)((0, combi_1.seq)("FAILED", expressions_1.Target)), (0, combi_1.optPrio)((0, combi_1.seq)("REPORTED", expressions_1.Target)));
+        const s = (0, combi_1.seq)("READ ENTITIES OF", expressions_1.NamespaceSimpleName, (0, combi_1.opt)("IN LOCAL MODE"), "ENTITY", expressions_1.SimpleName, (0, combi_1.opt)((0, combi_1.seq)("BY", expressions_1.AssociationName)), (0, combi_1.alt)(fields, from, all), (0, combi_1.optPrio)((0, combi_1.seq)("RESULT", expressions_1.Target)), (0, combi_1.optPrio)((0, combi_1.seq)("LINK", expressions_1.Target)), (0, combi_1.optPrio)((0, combi_1.seq)("FAILED", expressions_1.Target)), (0, combi_1.optPrio)((0, combi_1.seq)("REPORTED", expressions_1.Target)));
         return (0, combi_1.ver)(version_1.Version.v754, s);
     }
 }
@@ -14524,7 +14716,7 @@ class ReadTable {
         const key = (0, combi_1.seq)((0, combi_1.altPrio)("WITH KEY", "WITH TABLE KEY"), (0, combi_1.alt)(expressions_1.ComponentCompareSimple, components, (0, combi_1.seq)((0, combi_1.optPrio)("="), expressions_1.Source)));
         const using = (0, combi_1.seq)("USING KEY", (0, combi_1.alt)(expressions_1.Field, expressions_1.Dynamic));
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
-        const perm = (0, combi_1.per)((0, combi_1.alt)(index, key, from), expressions_1.ReadTableTarget, using, comparing, "CASTING", "TRANSPORTING ALL FIELDS", (0, combi_1.seq)("TRANSPORTING", transporting_fields_1.TransportingFields), "BINARY SEARCH");
+        const perm = (0, combi_1.per)((0, combi_1.alt)(index, key, from), expressions_1.ReadTableTarget, using, comparing, "CASTING", (0, combi_1.seq)("TRANSPORTING", (0, combi_1.altPrio)("ALL FIELDS", "NO FIELDS", transporting_fields_1.TransportingFields)), "BINARY SEARCH");
         return (0, combi_1.seq)("READ TABLE", (0, combi_1.alt)(expressions_1.SimpleSource2, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source)), (0, combi_1.opt)(perm));
     }
 }
@@ -14922,7 +15114,7 @@ class ScrollList {
         const line = (0, combi_1.seq)("LINE", expressions_1.Source);
         const column = (0, combi_1.seq)("TO COLUMN", expressions_1.Source);
         const to = (0, combi_1.seq)("TO", (0, combi_1.alt)("FIRST PAGE", "LAST PAGE", (0, combi_1.seq)("PAGE", expressions_1.Source)));
-        const ret = (0, combi_1.seq)("SCROLL LIST", (0, combi_1.per)(index, (0, combi_1.alt)(to, "BACKWARD", "FORWARD"), column, line));
+        const ret = (0, combi_1.seq)("SCROLL LIST", (0, combi_1.per)(index, (0, combi_1.alt)(to, "BACKWARD", "FORWARD"), (0, combi_1.alt)("LEFT", "RIGHT"), column, line));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -15030,7 +15222,9 @@ class SelectionScreen {
         const endLine = (0, combi_1.str)("END OF LINE");
         const modif = (0, combi_1.seq)("MODIF ID", expressions_1.Modif);
         const visible = (0, combi_1.seq)("VISIBLE LENGTH", (0, combi_1.regex)(/^\d+$/));
-        const commentOpt = (0, combi_1.per)((0, combi_1.seq)("FOR FIELD", expressions_1.Field), modif, visible);
+        const ldbId = (0, combi_1.seq)("ID", (0, combi_1.regex)(/^\w+$/));
+        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 command = (0, combi_1.seq)("USER-COMMAND", (0, combi_1.alt)(expressions_1.Field, expressions_1.Constant));
@@ -15043,13 +15237,16 @@ class SelectionScreen {
         const posSymbols = (0, combi_1.altPrio)("POS_LOW", "POS_HIGH");
         // number between 1 and 83
         const posIntegers = (0, combi_1.regex)(/^(0?[1-9]|[1234567][0-9]|8[0-3])$/);
-        const pos = (0, combi_1.seq)("POSITION", (0, combi_1.altPrio)(posIntegers, posSymbols));
+        const pos = (0, combi_1.seq)("POSITION", (0, combi_1.altPrio)(posIntegers, posSymbols), (0, combi_1.opt)((0, combi_1.seq)("FOR TABLE", expressions_1.Field)));
         const incl = (0, combi_1.seq)("INCLUDE BLOCKS", expressions_1.BlockName);
-        const tabbed = (0, combi_1.seq)("BEGIN OF TABBED BLOCK", expressions_1.InlineField, "FOR", expressions_1.Integer, "LINES", (0, combi_1.optPrio)("NO INTERVALS"));
-        const uline = (0, combi_1.seq)("ULINE", (0, combi_1.opt)(position));
+        const tabbed = (0, combi_1.seq)("BEGIN OF TABBED BLOCK", expressions_1.BlockName, "FOR", expressions_1.Integer, "LINES", (0, combi_1.optPrio)("NO INTERVALS"));
+        const uline = (0, combi_1.seq)("ULINE", (0, combi_1.opt)(position), (0, combi_1.opt)(modif));
         const param = (0, combi_1.seq)("INCLUDE PARAMETERS", expressions_1.Field);
         const iso = (0, combi_1.seq)("INCLUDE SELECT-OPTIONS", expressions_1.Field);
-        const ret = (0, combi_1.seq)("SELECTION-SCREEN", (0, combi_1.altPrio)(comment, func, skip, pos, incl, iso, push, tab, uline, beginBlock, tabbed, endBlock, beginLine, endLine, param, beginScreen, endScreen));
+        const exclude = (0, combi_1.seq)("EXCLUDE", (0, combi_1.alt)("IDS", "PARAMETERS"), (0, combi_1.regex)(/^\w+$/));
+        const beginVersion = (0, combi_1.seq)("BEGIN OF VERSION", (0, combi_1.regex)(/^\w+$/), expressions_1.TextElement);
+        const endVersion = (0, combi_1.seq)("END OF VERSION", (0, combi_1.regex)(/^\w+$/));
+        const ret = (0, combi_1.seq)("SELECTION-SCREEN", (0, combi_1.altPrio)(comment, func, skip, pos, incl, iso, push, tab, uline, beginBlock, tabbed, endBlock, beginLine, endLine, param, beginScreen, endScreen, exclude, beginVersion, endVersion));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -15851,7 +16048,7 @@ class Submit {
         const between = (0, combi_1.seq)("BETWEEN", expressions_1.Source, "AND", expressions_1.Source);
         const selectionTable = (0, combi_1.seq)("WITH SELECTION-TABLE", expressions_1.Source);
         const awith = (0, combi_1.seq)("WITH", expressions_1.FieldSub, (0, combi_1.alt)(compare, between), (0, combi_1.optPrio)(sign));
-        const prog = (0, combi_1.alt)(expressions_1.NamespaceSimpleName, expressions_1.Dynamic);
+        const prog = (0, combi_1.altPrio)(expressions_1.IncludeName, expressions_1.Dynamic);
         const job = (0, combi_1.seq)("VIA JOB", expressions_1.Source, "NUMBER", expressions_1.Source);
         const exporting = (0, combi_1.str)("EXPORTING LIST TO MEMORY");
         const spool = (0, combi_1.seq)("SPOOL PARAMETERS", expressions_1.Source);
@@ -16862,8 +17059,8 @@ class Write {
         const dateFormat = (0, combi_1.altPrio)("DD/MM/YY", "MM/DD/YY", "DD/MM/YYYY", "MM/DD/YYYY", "DDMMYY", "MMDDYY", "YYMMDD");
         const as = (0, combi_1.seq)("AS", (0, combi_1.altPrio)("LINE", "ICON", "CHECKBOX", "SYMBOL"));
         const to = (0, combi_1.seq)("TO", expressions_1.Target);
-        const options = (0, combi_1.per)(mask, to, (0, combi_1.seq)("EXPONENT", expressions_1.Source), "NO-GROUPING", "NO-ZERO", "CENTERED", (0, combi_1.seq)("INPUT", (0, combi_1.opt)(onOff)), "NO-GAP", "LEFT-JUSTIFIED", as, (0, combi_1.seq)("FRAMES", onOff), (0, combi_1.seq)("HOTSPOT", (0, combi_1.opt)(onOff)), "RIGHT-JUSTIFIED", (0, combi_1.seq)("TIME ZONE", expressions_1.Source), (0, combi_1.seq)("UNDER", expressions_1.Source), (0, combi_1.seq)("STYLE", expressions_1.Source), (0, combi_1.seq)("ROUND", expressions_1.Source), (0, combi_1.seq)("QUICKINFO", expressions_1.Source), "ENVIRONMENT TIME FORMAT", dateFormat, (0, combi_1.seq)("UNIT", expressions_1.Source), (0, combi_1.seq)("INTENSIFIED", (0, combi_1.opt)(onOff)), (0, combi_1.seq)("INDEX", expressions_1.Source), (0, combi_1.seq)("DECIMALS", expressions_1.Source), (0, combi_1.seq)("INVERSE", (0, combi_1.opt)(onOff)), expressions_1.Color, (0, combi_1.seq)("CURRENCY", expressions_1.Source), "NO-SIGN");
-        const ret = (0, combi_1.seq)("WRITE", (0, combi_1.alt)("AT /", (0, combi_1.seq)((0, combi_1.opt)(expressions_1.WriteOffsetLength), (0, combi_1.altPrio)(expressions_1.Source, expressions_1.Dynamic, "/"), (0, combi_1.opt)(options))));
+        const options = (0, combi_1.per)(mask, to, (0, combi_1.seq)("EXPONENT", expressions_1.Source), "NO-GROUPING", "NO-ZERO", "CENTERED", (0, combi_1.seq)("INPUT", (0, combi_1.opt)(onOff)), "NO-GAP", "LEFT-JUSTIFIED", as, (0, combi_1.seq)("FRAMES", onOff), (0, combi_1.seq)("HOTSPOT", (0, combi_1.opt)(onOff)), "RIGHT-JUSTIFIED", (0, combi_1.seq)("TIME ZONE", expressions_1.Source), (0, combi_1.seq)("UNDER", expressions_1.Source), (0, combi_1.seq)("STYLE", expressions_1.Source), (0, combi_1.seq)("ROUND", expressions_1.Source), (0, combi_1.seq)("QUICKINFO", expressions_1.Source), "ENVIRONMENT TIME FORMAT", dateFormat, (0, combi_1.seq)("UNIT", expressions_1.Source), (0, combi_1.seq)("INTENSIFIED", (0, combi_1.opt)(onOff)), (0, combi_1.seq)("INDEX", expressions_1.Source), (0, combi_1.seq)("DECIMALS", expressions_1.Source), (0, combi_1.seq)("INVERSE", (0, combi_1.opt)(onOff)), expressions_1.Color, (0, combi_1.seq)("CURRENCY", expressions_1.Source), "RESET", "NO-SIGN");
+        const ret = (0, combi_1.seq)("WRITE", (0, combi_1.alt)("AT /", (0, combi_1.seq)((0, combi_1.opt)(expressions_1.WriteOffsetLength), (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic, "/"), (0, combi_1.opt)(options))));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -17304,7 +17501,7 @@ const Structures = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/b
 const Statements = __webpack_require__(/*! ../../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 class Any {
     getMatcher() {
-        return (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sta)(Statements.ClassLocalFriends), (0, _combi_1.sta)(Statements.ClassDeferred), (0, _combi_1.sta)(Statements.Report), (0, _combi_1.sta)(Statements.Program), (0, _combi_1.sta)(Statements.Parameter), (0, _combi_1.sta)(Statements.CheckSelectOptions), (0, _combi_1.sta)(Statements.Get), (0, _combi_1.sta)(Statements.Initialization), (0, _combi_1.sta)(Statements.InterfaceDeferred), (0, _combi_1.sta)(Statements.SelectionScreen), (0, _combi_1.sta)(Statements.SelectOption), (0, _combi_1.sta)(Statements.AtSelectionScreen), (0, _combi_1.sta)(Statements.AtLineSelection), (0, _combi_1.sta)(Statements.AtUserCommand), (0, _combi_1.sta)(Statements.StartOfSelection), (0, _combi_1.sta)(Statements.EndOfSelection), (0, _combi_1.sta)(Statements.LoadOfProgram), (0, _combi_1.sta)(Statements.TopOfPage), (0, _combi_1.sta)(Statements.EndOfPage), (0, _combi_1.sta)(Statements.Controls), (0, _combi_1.sta)(Statements.TypePools), (0, _combi_1.sta)(Statements.TypePool), (0, _combi_1.sta)(Statements.FunctionPool), (0, _combi_1.sub)(Structures.Normal), (0, _combi_1.sub)(Structures.Form), (0, _combi_1.sub)(Structures.Module), (0, _combi_1.sub)(Structures.FunctionModule), (0, _combi_1.sub)(Structures.Interface), (0, _combi_1.sub)(Structures.ClassDefinition), (0, _combi_1.sub)(Structures.ClassImplementation)));
+        return (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sta)(Statements.ClassLocalFriends), (0, _combi_1.sta)(Statements.ClassDeferred), (0, _combi_1.sta)(Statements.Report), (0, _combi_1.sta)(Statements.Program), (0, _combi_1.sta)(Statements.Parameter), (0, _combi_1.sta)(Statements.CheckSelectOptions), (0, _combi_1.sta)(Statements.Get), (0, _combi_1.sta)(Statements.Initialization), (0, _combi_1.sta)(Statements.InterfaceDeferred), (0, _combi_1.sta)(Statements.SelectionScreen), (0, _combi_1.sta)(Statements.SelectOption), (0, _combi_1.sta)(Statements.AtSelectionScreen), (0, _combi_1.sta)(Statements.AtLineSelection), (0, _combi_1.sta)(Statements.AtPF), (0, _combi_1.sta)(Statements.AtUserCommand), (0, _combi_1.sta)(Statements.StartOfSelection), (0, _combi_1.sta)(Statements.EndOfSelection), (0, _combi_1.sta)(Statements.LoadOfProgram), (0, _combi_1.sta)(Statements.TopOfPage), (0, _combi_1.sta)(Statements.EndOfPage), (0, _combi_1.sta)(Statements.Controls), (0, _combi_1.sta)(Statements.TypePools), (0, _combi_1.sta)(Statements.TypePool), (0, _combi_1.sta)(Statements.FunctionPool), (0, _combi_1.sub)(Structures.Normal), (0, _combi_1.sub)(Structures.Form), (0, _combi_1.sub)(Structures.Module), (0, _combi_1.sub)(Structures.FunctionModule), (0, _combi_1.sub)(Structures.Interface), (0, _combi_1.sub)(Structures.ClassDefinition), (0, _combi_1.sub)(Structures.ClassImplementation)));
     }
 }
 exports.Any = Any;
@@ -17418,9 +17615,10 @@ const Statements = __webpack_require__(/*! ../../2_statements/statements */ "./n
 const _combi_1 = __webpack_require__(/*! ./_combi */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/_combi.js");
 const when_1 = __webpack_require__(/*! ./when */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/when.js");
 const _statement_1 = __webpack_require__(/*! ../../2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
+const normal_1 = __webpack_require__(/*! ./normal */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/normal.js");
 class Case {
     getMatcher() {
-        return (0, _combi_1.beginEnd)((0, _combi_1.sta)(Statements.Case), (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sub)(when_1.When), (0, _combi_1.sta)(_statement_1.MacroCall), (0, _combi_1.sta)(Statements.Include))), (0, _combi_1.sta)(Statements.EndCase));
+        return (0, _combi_1.beginEnd)((0, _combi_1.sta)(Statements.Case), (0, _combi_1.seq)((0, _combi_1.star)((0, _combi_1.sub)(normal_1.Normal)), (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sub)(when_1.When), (0, _combi_1.sta)(_statement_1.MacroCall), (0, _combi_1.sta)(Statements.Include)))), (0, _combi_1.sta)(Statements.EndCase));
     }
 }
 exports.Case = Case;
@@ -20784,7 +20982,7 @@ class ObjectOriented {
         return ret;
     }
     addAliasedAttributes(classDefinition) {
-        for (const alias of classDefinition.getAliases()) {
+        for (const alias of classDefinition.getAliases() || []) {
             const comp = alias.getComponent();
             const idef = this.scope.findInterfaceDefinition(comp.split("~")[0]);
             if (idef) {
@@ -20816,7 +21014,7 @@ class ObjectOriented {
         return undefined;
     }
     findMethodViaAlias(methodName, def) {
-        for (const a of def.getAliases()) {
+        for (const a of def.getAliases() || []) {
             if (a.getName().toUpperCase() === methodName.toUpperCase()) {
                 const comp = a.getComponent();
                 const res = this.findMethodInInterface(comp.split("~")[0], comp.split("~")[1]);
@@ -20899,9 +21097,12 @@ class ObjectOriented {
             return undefined;
         }
         const upper = name.toUpperCase();
-        for (const a of def.getAttributes().getAll()) {
-            if (a.getName().toUpperCase() === upper) {
-                return a;
+        const attr = def.getAttributes();
+        if (attr) {
+            for (const a of attr.getAll()) {
+                if (a.getName().toUpperCase() === upper) {
+                    return a;
+                }
             }
         }
         for (const a of def.getAliases() || []) {
@@ -21015,7 +21216,11 @@ class ObjectOriented {
         return { method: undefined, def: undefined };
     }
     findMethod(def, methodName) {
-        for (const method of def.getMethodDefinitions().getAll()) {
+        const defs = def.getMethodDefinitions();
+        if (defs === undefined) {
+            return undefined;
+        }
+        for (const method of defs.getAll()) {
             if (method.getName().toUpperCase() === methodName.toUpperCase()) {
                 if (method.isRedefinition()) {
                     return this.findMethodInSuper(def, methodName);
@@ -21312,6 +21517,7 @@ var ReferenceType;
     ReferenceType["TableVoidReference"] = "Table (Void)";
     ReferenceType["MethodReference"] = "Method";
     ReferenceType["BuiltinMethodReference"] = "Builtin Method";
+    ReferenceType["ConstructorReference"] = "Constructor Reference";
     ReferenceType["MethodImplementationReference"] = "Method Implementation";
     ReferenceType["TypeReference"] = "Type";
     ReferenceType["BuiltinTypeReference"] = "Builtin Type";
@@ -21769,6 +21975,9 @@ class TypeUtils {
         return this.isAssignable(source, target);
     }
     isAssignable(source, target) {
+        if (source === undefined || target === undefined) {
+            return true;
+        }
         /*
             console.dir(source);
             console.dir(target);
@@ -21882,9 +22091,11 @@ class TypeUtils {
                 && this.isCharLike(source)) {
                 return true;
             }
+            else if (source instanceof basic_1.StructureType) {
+                return this.isCharLikeStrict(source);
+            }
             else if (source instanceof basic_1.DataReference
                 || source instanceof basic_1.ObjectReferenceType
-                || source instanceof basic_1.StructureType
                 || source instanceof basic_1.GenericObjectReferenceType) {
                 return false;
             }
@@ -23120,7 +23331,7 @@ class Compare {
         for (const t of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(t, input);
         }
-        for (const t of node.findDirectExpressions(Expressions.SourceFieldSymbol)) {
+        for (const t of node.findDirectExpressions(Expressions.SourceFieldSymbolChain)) {
             new source_field_symbol_1.SourceFieldSymbol().runSyntax(t, input);
         }
         for (const t of node.findDirectExpressions(Expressions.MethodCallChain)) {
@@ -25482,6 +25693,7 @@ class NewObject {
             const clas = input.scope.findClassDefinition(targetType.getIdentifierName());
             if (clas) {
                 input.scope.addReference(typeToken, clas, _reference_1.ReferenceType.InferredType, input.filename);
+                input.scope.addReference(typeToken, clas, _reference_1.ReferenceType.ConstructorReference, input.filename, { ooName: clas.getName() });
             }
             else {
                 const intf = input.scope.findInterfaceDefinition(targetType.getIdentifierName());
@@ -25508,6 +25720,7 @@ class NewObject {
             const objDefinition = input.scope.findObjectDefinition(typeName);
             if (objDefinition) {
                 input.scope.addReference(typeToken, objDefinition, _reference_1.ReferenceType.ObjectOrientedReference, input.filename);
+                input.scope.addReference(typeToken, objDefinition, _reference_1.ReferenceType.ConstructorReference, input.filename, { ooName: objDefinition.getName() });
                 const objref = new basic_1.ObjectReferenceType(objDefinition);
                 const clas = input.scope.findClassDefinition(objref.getIdentifierName());
                 if ((clas === null || clas === void 0 ? void 0 : clas.isAbstract()) === true) {
@@ -25623,7 +25836,7 @@ const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ ".
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 class RaiseWith {
     runSyntax(node, input) {
-        for (const f of node.findDirectExpressions(Expressions.SimpleSource1)) {
+        for (const f of node.findAllExpressionsMulti([Expressions.SimpleSource1, Expressions.Source])) {
             new source_1.Source().runSyntax(f, input);
         }
     }
@@ -25778,7 +25991,7 @@ class Select {
         const fields = this.findFields(node, input);
         if (fields.length === 0
             && node.findDirectExpression(Expressions.SQLFieldListLoop) === undefined) {
-            const message = `fields missing`;
+            const message = `SELECT: fields missing`;
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return;
         }
@@ -25957,7 +26170,7 @@ class Select {
         const ret = [];
         expr = node.findFirstExpression(Expressions.SQLFieldList);
         if (expr === undefined) {
-            expr = node.findDirectExpression(Expressions.SQLFieldListLoop);
+            expr = node.findFirstExpression(Expressions.SQLFieldListLoop);
         }
         if (((_a = expr === null || expr === void 0 ? void 0 : expr.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.Dynamic) {
             new dynamic_1.Dynamic().runSyntax(expr.getFirstChild(), input);
@@ -26124,7 +26337,7 @@ class Source {
                         const foundType = this.determineType(node, input, targetType);
                         const bodyType = new conv_body_1.ConvBody().runSyntax(node.findDirectExpression(Expressions.ConvBody), input);
                         if (new _type_utils_1.TypeUtils(input.scope).isAssignable(foundType, bodyType) === false) {
-                            const message = "CONV: Types not compatible";
+                            const message = `CONV: Types not compatible, ${foundType === null || foundType === void 0 ? void 0 : foundType.constructor.name}, ${bodyType === null || bodyType === void 0 ? void 0 : bodyType.constructor.name}`;
                             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                             return new basic_1.VoidType(_syntax_input_1.CheckSyntaxKey);
                         }
@@ -28409,8 +28622,11 @@ class ClassImplementation {
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return;
         }
-        for (const t of classDefinition.getTypeDefinitions().getAll()) {
-            input.scope.addType(t.type);
+        const types = classDefinition.getTypeDefinitions();
+        if (types !== undefined) {
+            for (const t of types.getAll()) {
+                input.scope.addType(t.type);
+            }
         }
         const sup = input.scope.findClassDefinition(classDefinition.getSuperClass());
         if (sup) {
@@ -28423,10 +28639,12 @@ class ClassImplementation {
         input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(new tokens_1.Identifier(new position_1.Position(1, 1), "me"), _builtin_1.BuiltIn.filename, new basic_1.ObjectReferenceType(classDefinition)));
         helper.addAliasedAttributes(classDefinition); // todo, this is not correct, take care of instance vs static
         const classAttributes = classDefinition.getAttributes();
-        input.scope.addList(classAttributes.getConstants());
-        input.scope.addList(classAttributes.getStatic());
-        for (const i of classAttributes.getInstance()) {
-            input.scope.addExtraLikeType(i);
+        if (classAttributes !== undefined) {
+            input.scope.addList(classAttributes.getConstants());
+            input.scope.addList(classAttributes.getStatic());
+            for (const i of classAttributes.getInstance()) {
+                input.scope.addExtraLikeType(i);
+            }
         }
         helper.fromSuperClassesAndInterfaces(classDefinition);
     }
@@ -28928,6 +29146,7 @@ const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
 class CreateObject {
     runSyntax(node, input) {
+        var _a;
         let cdef = undefined;
         // CREATE OBJECT, TYPE
         const type = node.findExpressionAfterToken("TYPE");
@@ -28937,6 +29156,7 @@ class CreateObject {
             cdef = input.scope.findClassDefinition(name);
             if (cdef) {
                 input.scope.addReference(token, cdef, _reference_1.ReferenceType.ObjectOrientedReference, input.filename);
+                input.scope.addReference(token, cdef, _reference_1.ReferenceType.ConstructorReference, input.filename, { ooName: cdef.getName() });
                 if (cdef.isAbstract() === true) {
                     const message = cdef.getName() + " is abstract, cannot be instantiated";
                     input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
@@ -28956,60 +29176,61 @@ class CreateObject {
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, input);
         }
-        let first = true;
-        for (const t of node.findAllExpressions(Expressions.Target)) {
+        for (const t of ((_a = node.findDirectExpression(Expressions.ParameterListExceptions)) === null || _a === void 0 ? void 0 : _a.findAllExpressions(Expressions.Target)) || []) {
+            new target_1.Target().runSyntax(t, input);
+        }
+        const t = node.findDirectExpression(Expressions.Target);
+        if (t) {
             const found = new target_1.Target().runSyntax(t, input);
-            if (first === true) {
-                first = false;
-                if (found instanceof basic_1.VoidType) {
-                    continue;
-                }
-                else if (found instanceof basic_1.UnknownType) {
-                    const message = "Target type unknown, " + t.concatTokens();
+            if (found instanceof basic_1.VoidType) {
+                // do nothing
+            }
+            else if (found instanceof basic_1.UnknownType) {
+                const message = "Target type unknown, " + t.concatTokens();
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                return;
+            }
+            else if (!(found instanceof basic_1.ObjectReferenceType)
+                && !(found instanceof basic_1.AnyType)
+                && !(found instanceof basic_1.DataType)
+                && !(found instanceof basic_1.GenericObjectReferenceType)) {
+                const message = "Target must be an object reference, " + t.concatTokens();
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                return;
+            }
+            else if (found instanceof basic_1.GenericObjectReferenceType && type === undefined) {
+                const message = "Generic type, cannot be instantiated";
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                return;
+            }
+            else if (found instanceof basic_1.ObjectReferenceType) {
+                const id = found.getIdentifier();
+                if (id instanceof types_1.InterfaceDefinition && type === undefined) {
+                    const message = "Interface reference, cannot be instantiated";
                     input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                     return;
                 }
-                else if (!(found instanceof basic_1.ObjectReferenceType)
-                    && !(found instanceof basic_1.AnyType)
-                    && !(found instanceof basic_1.DataType)
-                    && !(found instanceof basic_1.GenericObjectReferenceType)) {
-                    const message = "Target must be an object reference, " + t.concatTokens();
+                else if (found instanceof basic_1.ObjectReferenceType
+                    && type === undefined
+                    && input.scope.findInterfaceDefinition(found.getQualifiedName())) {
+                    const message = "Interface reference, cannot be instantiated";
                     input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                     return;
                 }
-                else if (found instanceof basic_1.GenericObjectReferenceType && type === undefined) {
-                    const message = "Generic type, cannot be instantiated";
+                else if (id instanceof types_1.ClassDefinition && cdef === undefined) {
+                    cdef = id;
+                }
+                if (type === undefined && id instanceof types_1.ClassDefinition && id.isAbstract() === true) {
+                    const message = id.getName() + " is abstract, cannot be instantiated";
                     input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                     return;
                 }
-                else if (found instanceof basic_1.ObjectReferenceType) {
-                    const id = found.getIdentifier();
-                    if (id instanceof types_1.InterfaceDefinition && type === undefined) {
-                        const message = "Interface reference, cannot be instantiated";
-                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
-                        return;
-                    }
-                    else if (found instanceof basic_1.ObjectReferenceType
-                        && type === undefined
-                        && input.scope.findInterfaceDefinition(found.getQualifiedName())) {
-                        const message = "Interface reference, cannot be instantiated";
-                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
-                        return;
-                    }
-                    else if (id instanceof types_1.ClassDefinition && cdef === undefined) {
-                        cdef = id;
-                    }
-                    if (type === undefined && id instanceof types_1.ClassDefinition && id.isAbstract() === true) {
-                        const message = id.getName() + " is abstract, cannot be instantiated";
-                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
-                        return;
-                    }
-                }
             }
         }
         for (const t of node.findDirectExpressions(Expressions.Dynamic)) {
             new dynamic_1.Dynamic().runSyntax(t, input);
         }
+        input.scope.addReference(t === null || t === void 0 ? void 0 : t.getFirstToken(), cdef, _reference_1.ReferenceType.ConstructorReference, input.filename, { ooName: cdef === null || cdef === void 0 ? void 0 : cdef.getName() });
         this.validateParameters(cdef, node, input);
     }
     validateParameters(cdef, node, input) {
@@ -30575,17 +30796,18 @@ class MethodImplementation {
             return;
         }
         const { method: methodDefinition } = helper.searchMethodName(classDefinition, methodName);
-        if (methodDefinition === undefined) {
-            const message = "Method definition \"" + methodName + "\" not found";
-            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
-            return;
-        }
         const start = node.getFirstToken().getStart();
-        if (methodDefinition.isStatic() === false) {
+        if ((methodDefinition === null || methodDefinition === void 0 ? void 0 : methodDefinition.isStatic()) === false) {
             input.scope.push(_scope_type_1.ScopeType.MethodInstance, methodName, start, input.filename);
             input.scope.addList(classDefinition.getAttributes().getInstance());
         }
         input.scope.push(_scope_type_1.ScopeType.Method, methodName, start, input.filename);
+        // note: the scope must be pushed before returning
+        if (methodDefinition === undefined) {
+            const message = "Method definition \"" + methodName + "\" not found";
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+            return;
+        }
         input.scope.addReference(methodToken, methodDefinition, _reference_1.ReferenceType.MethodImplementationReference, input.filename);
         input.scope.addList(methodDefinition.getParameters().getAll());
         for (const i of helper.findInterfaces(classDefinition)) {
@@ -31386,7 +31608,7 @@ class ReadTable {
         if (indexSource) {
             const indexType = new source_1.Source().runSyntax(indexSource, input);
             if (new _type_utils_1.TypeUtils(input.scope).isAssignable(indexType, basic_1.IntegerType.get()) === false) {
-                const message = "READ TABLE, INDEX must be simple";
+                const message = "READ TABLE, INDEX must be simple, got " + (indexType === null || indexType === void 0 ? void 0 : indexType.constructor.name);
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
             }
@@ -31681,30 +31903,35 @@ const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@ab
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
 class SelectionScreen {
     runSyntax(node, input) {
-        const field = node.findFirstExpression(Expressions.InlineField);
-        if (field === undefined) {
+        const blockNode = node.findFirstExpression(Expressions.BlockName);
+        const blockToken = blockNode === null || blockNode === void 0 ? void 0 : blockNode.getFirstToken();
+        const blockName = blockNode === null || blockNode === void 0 ? void 0 : blockNode.concatTokens();
+        if (blockName !== undefined && blockName.length > 16) {
+            const message = "SELECTION-SCREEN block name too long, " + blockName;
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return;
         }
-        if (field.getFirstToken().getStr().length > 8) {
+        const field = node.findFirstExpression(Expressions.InlineField);
+        if (field !== undefined && field.getFirstToken().getStr().length > 8) {
             const message = "SELECTION-SCREEN name too long, " + field.getFirstToken().getStr();
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, field.getFirstToken(), message));
             return;
         }
-        const name = field.getFirstToken();
+        const fieldName = field === null || field === void 0 ? void 0 : field.getFirstToken();
         const concat = node.concatTokens().toUpperCase();
-        if (concat.includes("BEGIN OF TABBED BLOCK")) {
+        if (concat.includes("BEGIN OF TABBED BLOCK") && blockToken) {
             const type = new basic_1.StructureType([
                 { name: "PROG", type: new basic_1.CharacterType(40) },
                 { name: "DYNNR", type: new basic_1.CharacterType(4) },
                 { name: "ACTIVETAB", type: new basic_1.CharacterType(132) },
             ]);
-            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(name, input.filename, type, ["selection_screen_tab" /* IdentifierMeta.SelectionScreenTab */]));
+            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(blockToken, input.filename, type, ["selection_screen_tab" /* IdentifierMeta.SelectionScreenTab */]));
         }
-        else if (concat.startsWith("SELECTION-SCREEN TAB")) {
-            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(name, input.filename, new basic_1.CharacterType(83), ["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 */]));
         }
-        else {
-            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(name, input.filename, new basic_1.CharacterType(83)));
+        else if (fieldName) {
+            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(fieldName, input.filename, new basic_1.CharacterType(83)));
         }
     }
 }
@@ -32325,7 +32552,7 @@ class Tables {
         }
         let name = nameToken.getStr();
         if (name.startsWith("*")) {
-            name = name.substr(1);
+            name = name.substring(1);
         }
         // lookupTableOrView will also give Unknown and Void
         const found = (_b = input.scope.getDDIC()) === null || _b === void 0 ? void 0 : _b.lookupTableOrView(name);
@@ -32333,10 +32560,10 @@ class Tables {
             input.scope.getDDICReferences().addUsing(input.scope.getParentObj(), { object: found.object, filename: input.filename, token: nameToken });
             if (input.scope.getType() === _scope_type_1.ScopeType.Form || input.scope.getType() === _scope_type_1.ScopeType.FunctionModule) {
                 // hoist TABLES definitions to global scope
-                input.scope.addNamedIdentifierToParent(nameToken.getStr(), new _typed_identifier_1.TypedIdentifier(nameToken, input.filename, found.type));
+                input.scope.addNamedIdentifierToParent(nameToken.getStr(), new _typed_identifier_1.TypedIdentifier(nameToken, input.filename, found.type, ["tables" /* IdentifierMeta.Tables */]));
             }
             else {
-                input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, input.filename, found.type));
+                input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, input.filename, found.type, ["tables" /* IdentifierMeta.Tables */]));
             }
             return;
         }
@@ -33022,6 +33249,9 @@ class Data {
                 if (found instanceof Basic.UnknownType) {
                     return new _typed_identifier_1.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((0, _syntax_input_1.syntaxIssue)(input, typeToken, message));
@@ -34183,6 +34413,7 @@ exports.SELECTION_EVENTS = [
     Statements.StartOfSelection,
     Statements.AtSelectionScreen,
     Statements.AtLineSelection,
+    Statements.AtPF,
     Statements.AtUserCommand,
     Statements.EndOfSelection,
     Statements.Initialization,
@@ -34221,6 +34452,7 @@ const Expressions = __webpack_require__(/*! ../2_statements/expressions */ "./no
 const flow_graph_1 = __webpack_require__(/*! ./flow_graph */ "./node_modules/@abaplint/core/build/src/abap/flow/flow_graph.js");
 const objects_1 = __webpack_require__(/*! ../../objects */ "./node_modules/@abaplint/core/build/src/objects/index.js");
 const selection_events_1 = __webpack_require__(/*! ./selection_events */ "./node_modules/@abaplint/core/build/src/abap/flow/selection_events.js");
+const virtual_position_1 = __webpack_require__(/*! ../../virtual_position */ "./node_modules/@abaplint/core/build/src/virtual_position.js");
 class StatementFlow {
     constructor() {
         this.counter = 0;
@@ -34257,7 +34489,7 @@ class StatementFlow {
                 throw new Error("StatementFlow, unknown structure");
             }
         }
-        if (obj instanceof objects_1.Program) {
+        if (obj instanceof objects_1.Program || obj instanceof objects_1.FunctionGroup) {
             // find the top level events
             let inEvent = false;
             let collected = [];
@@ -34284,7 +34516,8 @@ class StatementFlow {
             if (inEvent === true) {
                 ret.push(this.runEvent(collected, name));
             }
-            else if (collected.length > 0) {
+            else if (collected.length > 0
+                && !(obj instanceof objects_1.FunctionGroup)) {
                 // implicit START-OF-SELECTION
                 ret.push(this.runEvent(collected, "START-OF-SELECTION."));
             }
@@ -34308,7 +34541,8 @@ class StatementFlow {
         var _a;
         return ((_a = f.findDirectStructure(Structures.Body)) === null || _a === void 0 ? void 0 : _a.getChildren()) || [];
     }
-    buildName(statement) {
+    // note: it must handle macros and chained statements
+    static buildName(statement) {
         let token = undefined;
         const colon = statement.getColon();
         if (colon === undefined) {
@@ -34322,12 +34556,18 @@ class StatementFlow {
                 }
             }
         }
+        let extra = "";
+        const tStart = token === null || token === void 0 ? void 0 : token.getStart();
+        if (tStart instanceof virtual_position_1.VirtualPosition) {
+            extra += "$" + tStart.vrow;
+            extra += "," + tStart.vcol;
+        }
         if (token === undefined) {
             return "tokenError";
         }
         return statement.get().constructor.name +
             ":" + token.getRow() +
-            "," + token.getCol();
+            "," + token.getCol() + extra;
     }
     traverseBody(children, context) {
         const graph = new flow_graph_1.FlowGraph(this.counter++);
@@ -34340,7 +34580,7 @@ class StatementFlow {
             if (c.get() instanceof Structures.Normal) {
                 const firstChild = c.getFirstChild(); // "Normal" only has one child
                 if (firstChild instanceof nodes_1.StatementNode) {
-                    const name = this.buildName(firstChild);
+                    const name = StatementFlow.buildName(firstChild);
                     graph.addEdge(current, name, flow_graph_1.FLOW_EDGE_TYPE.undefined);
                     current = name;
                     if (firstChild.get() instanceof Statements.Check) {
@@ -34389,7 +34629,7 @@ class StatementFlow {
         let current = graph.getStart();
         const type = n.get();
         if (type instanceof Structures.If) {
-            const ifName = this.buildName(n.findDirectStatement(Statements.If));
+            const ifName = StatementFlow.buildName(n.findDirectStatement(Statements.If));
             const sub = this.traverseBody(this.findBody(n), context);
             graph.addEdge(current, ifName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
             graph.addGraph(ifName, sub, flow_graph_1.FLOW_EDGE_TYPE.true);
@@ -34400,7 +34640,7 @@ class StatementFlow {
                 if (elseifst === undefined) {
                     continue;
                 }
-                const elseIfName = this.buildName(elseifst);
+                const elseIfName = StatementFlow.buildName(elseifst);
                 const sub = this.traverseBody(this.findBody(e), context);
                 graph.addEdge(current, elseIfName, flow_graph_1.FLOW_EDGE_TYPE.false);
                 graph.addGraph(elseIfName, sub, flow_graph_1.FLOW_EDGE_TYPE.true);
@@ -34410,7 +34650,7 @@ class StatementFlow {
             const els = n.findDirectStructure(Structures.Else);
             const elsest = els === null || els === void 0 ? void 0 : els.findDirectStatement(Statements.Else);
             if (els && elsest) {
-                const elseName = this.buildName(elsest);
+                const elseName = StatementFlow.buildName(elsest);
                 const sub = this.traverseBody(this.findBody(els), context);
                 graph.addEdge(current, elseName, flow_graph_1.FLOW_EDGE_TYPE.false);
                 graph.addGraph(elseName, sub, flow_graph_1.FLOW_EDGE_TYPE.undefined);
@@ -34427,7 +34667,7 @@ class StatementFlow {
             || type instanceof Structures.Select
             || type instanceof Structures.LoopAtScreen
             || type instanceof Structures.Do) {
-            const loopName = this.buildName(n.getFirstStatement());
+            const loopName = StatementFlow.buildName(n.getFirstStatement());
             const sub = this.traverseBody(this.findBody(n), Object.assign(Object.assign({}, context), { loopStart: loopName, loopEnd: graph.getEnd() }));
             graph.addEdge(current, loopName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
             graph.addGraph(loopName, sub, flow_graph_1.FLOW_EDGE_TYPE.true);
@@ -34436,10 +34676,12 @@ class StatementFlow {
         }
         else if (type instanceof Structures.Data
             || type instanceof Structures.Constants
+            || type instanceof Structures.Statics
+            || type instanceof Structures.ExecSQL
             || type instanceof Structures.Types) {
             // these doesnt affect control flow, so just take the first statement
             const statement = n.getFirstStatement();
-            const name = this.buildName(statement);
+            const name = StatementFlow.buildName(statement);
             graph.addEdge(current, name, flow_graph_1.FLOW_EDGE_TYPE.undefined);
             graph.addEdge(name, graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
         }
@@ -34447,7 +34689,7 @@ class StatementFlow {
             || type instanceof Structures.AtLast
             || type instanceof Structures.At
             || type instanceof Structures.OnChange) {
-            const name = this.buildName(n.getFirstStatement());
+            const name = StatementFlow.buildName(n.getFirstStatement());
             const body = this.traverseBody(this.findBody(n), context);
             graph.addEdge(current, name, flow_graph_1.FLOW_EDGE_TYPE.undefined);
             graph.addGraph(name, body, flow_graph_1.FLOW_EDGE_TYPE.undefined);
@@ -34455,13 +34697,13 @@ class StatementFlow {
             graph.addEdge(current, graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
         }
         else if (type instanceof Structures.Try) {
-            const tryName = this.buildName(n.getFirstStatement());
+            const tryName = StatementFlow.buildName(n.getFirstStatement());
             const body = this.traverseBody(this.findBody(n), context);
             graph.addEdge(current, tryName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
             graph.addGraph(tryName, body, flow_graph_1.FLOW_EDGE_TYPE.undefined);
             graph.addEdge(body.getEnd(), graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
             for (const c of n.findDirectStructures(Structures.Catch)) {
-                const catchName = this.buildName(c.getFirstStatement());
+                const catchName = StatementFlow.buildName(c.getFirstStatement());
                 const catchBody = this.traverseBody(this.findBody(c), context);
                 // TODO: this does not take exceptions into account
                 graph.addEdge(body.getEnd(), catchName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
@@ -34470,8 +34712,16 @@ class StatementFlow {
             }
             // TODO, handle CLEANUP
         }
+        else if (type instanceof Structures.CatchSystemExceptions) {
+            // TODO: this is not completely correct
+            const catchName = StatementFlow.buildName(n.getFirstStatement());
+            const body = this.traverseBody(this.findBody(n), context);
+            graph.addEdge(current, catchName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
+            graph.addGraph(catchName, body, flow_graph_1.FLOW_EDGE_TYPE.undefined);
+            graph.addEdge(body.getEnd(), graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
+        }
         else if (type instanceof Structures.Case) {
-            const caseName = this.buildName(n.getFirstStatement());
+            const caseName = StatementFlow.buildName(n.getFirstStatement());
             graph.addEdge(current, caseName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
             let othersFound = false;
             for (const w of n.findDirectStructures(Structures.When)) {
@@ -34482,7 +34732,7 @@ class StatementFlow {
                 if (first.get() instanceof Statements.WhenOthers) {
                     othersFound = true;
                 }
-                const firstName = this.buildName(first);
+                const firstName = StatementFlow.buildName(first);
                 const sub = this.traverseBody(this.findBody(w), context);
                 graph.addEdge(caseName, firstName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
                 graph.addGraph(firstName, sub, flow_graph_1.FLOW_EDGE_TYPE.undefined);
@@ -34493,7 +34743,7 @@ class StatementFlow {
             }
         }
         else if (type instanceof Structures.CaseType) {
-            const caseName = this.buildName(n.getFirstStatement());
+            const caseName = StatementFlow.buildName(n.getFirstStatement());
             graph.addEdge(current, caseName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
             let othersFound = false;
             for (const w of n.findDirectStructures(Structures.WhenType)) {
@@ -34504,7 +34754,7 @@ class StatementFlow {
                 if (first.get() instanceof Statements.WhenOthers) {
                     othersFound = true;
                 }
-                const firstName = this.buildName(first);
+                const firstName = StatementFlow.buildName(first);
                 const sub = this.traverseBody(this.findBody(w), context);
                 graph.addEdge(caseName, firstName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
                 graph.addGraph(firstName, sub, flow_graph_1.FLOW_EDGE_TYPE.undefined);
@@ -34514,6 +34764,9 @@ class StatementFlow {
                 graph.addEdge(caseName, graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
             }
         }
+        else if (type instanceof Structures.Define) {
+            // do nothing
+        }
         else {
             console.dir("StatementFlow,todo, " + n.get().constructor.name);
         }
@@ -35650,6 +35903,10 @@ class AbstractType {
         var _a;
         return (_a = this.data) === null || _a === void 0 ? void 0 : _a.RTTIName;
     }
+    getDescription() {
+        var _a;
+        return (_a = this.data) === null || _a === void 0 ? void 0 : _a.description;
+    }
     getConversionExit() {
         var _a;
         return (_a = this.data) === null || _a === void 0 ? void 0 : _a.conversionExit;
@@ -36675,10 +36932,11 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.StructureType = void 0;
 const _abstract_type_1 = __webpack_require__(/*! ./_abstract_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/_abstract_type.js");
 class StructureType extends _abstract_type_1.AbstractType {
-    constructor(components, qualifiedName, ddicName) {
+    constructor(components, qualifiedName, ddicName, description) {
         super({
             qualifiedName: qualifiedName,
             ddicName: ddicName,
+            description: description,
         });
         if (components.length === 0) {
             throw new Error("Structure does not contain any components");
@@ -36755,9 +37013,12 @@ var TableKeyType;
     TableKeyType["empty"] = "EMPTY";
 })(TableKeyType || (exports.TableKeyType = TableKeyType = {}));
 class TableType extends _abstract_type_1.AbstractType {
-    constructor(rowType, options, qualifiedName) {
+    constructor(rowType, options, qualifiedName, description) {
         var _a;
-        super({ qualifiedName: qualifiedName });
+        super({
+            qualifiedName: qualifiedName,
+            description: description,
+        });
         this.rowType = rowType;
         this.options = options;
         if (((_a = options.primaryKey) === null || _a === void 0 ? void 0 : _a.type) === TableAccessType.standard && options.primaryKey.isUnique === true) {
@@ -38598,20 +38859,84 @@ exports.ArtifactsRules = ArtifactsRules;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.CDSDetermineTypes = void 0;
 const basic_1 = __webpack_require__(/*! ../abap/types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const ddic_1 = __webpack_require__(/*! ../ddic */ "./node_modules/@abaplint/core/build/src/ddic.js");
 class CDSDetermineTypes {
-    parseType(_reg, parsedData) {
+    parseType(reg, parsedData, ddlsName) {
+        const ddic = new ddic_1.DDIC(reg);
         if ((parsedData === null || parsedData === void 0 ? void 0 : parsedData.fields.length) === 0) {
             return new basic_1.VoidType("DDLS:todo");
         }
         else {
             const components = [];
             for (const f of (parsedData === null || parsedData === void 0 ? void 0 : parsedData.fields) || []) {
-                components.push({
-                    name: f.name,
-                    type: new basic_1.VoidType("DDLS:fieldname"),
-                });
+                if (f.prefix !== "") {
+                    const prefixUpper = f.prefix.toUpperCase();
+                    let source = parsedData.sources.find((s) => { var _a; return ((_a = s.as) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === prefixUpper; });
+                    if ((source === null || source === void 0 ? void 0 : source.name) === undefined) {
+                        source = parsedData.sources.find((s) => s.name.toUpperCase() === prefixUpper);
+                    }
+                    if ((source === null || source === void 0 ? void 0 : source.name) === undefined
+                        && (parsedData.associations.find((s) => s.name.toUpperCase() === prefixUpper)
+                            || parsedData.associations.find((s) => { var _a; return ((_a = s.as) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === prefixUpper; }))) {
+                        components.push({
+                            name: f.name,
+                            type: new basic_1.VoidType("DDLS:association"),
+                        });
+                        continue;
+                    }
+                    if ((source === null || source === void 0 ? void 0 : source.name) === undefined) {
+                        components.push({
+                            name: f.name,
+                            type: new basic_1.UnknownType("CDS parser error, unknown source, " + ddlsName),
+                        });
+                        continue;
+                    }
+                    const lookup = ddic.lookupTableOrView(source.name);
+                    if (lookup.type) {
+                        if (lookup.type instanceof basic_1.StructureType) {
+                            const type = lookup.type.getComponentByName(f.name);
+                            if (type) {
+                                components.push({
+                                    name: f.name,
+                                    type: type,
+                                });
+                            }
+                            else {
+                                components.push({
+                                    name: f.name,
+                                    type: new basic_1.UnknownType(f.name + " not found in " + source.name + ", CDSDetermineTypes"),
+                                });
+                            }
+                        }
+                        else {
+                            // its void or unknown
+                            components.push({
+                                name: f.name,
+                                type: lookup.type,
+                            });
+                        }
+                    }
+                    else if (reg.inErrorNamespace(source.name)) {
+                        components.push({
+                            name: f.name,
+                            type: new basic_1.UnknownType(source.name + " not found, CDSDetermineTypes"),
+                        });
+                    }
+                    else {
+                        components.push({
+                            name: f.name,
+                            type: new basic_1.VoidType(source.name),
+                        });
+                    }
+                }
+                else {
+                    components.push({
+                        name: f.name,
+                        type: new basic_1.VoidType("DDLS:fieldname:" + ddlsName),
+                    });
+                }
             }
-            return new basic_1.StructureType(components);
+            return new basic_1.StructureType(components, parsedData.definitionName, parsedData.definitionName, parsedData.description);
         }
     }
 }
@@ -38852,7 +39177,7 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node
 class CDSAggregate extends combi_1.Expression {
     getRunnable() {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
-        const value = (0, combi_1.alt)(name, _1.CDSCast, _1.CDSCase);
+        const value = (0, combi_1.alt)(name, "*", _1.CDSCast, _1.CDSCase, _1.CDSFunction);
         return (0, combi_1.seq)((0, combi_1.alt)("MAX", "MIN", "SUM", "AVG", "COUNT"), "(", (0, combi_1.opt)("DISTINCT"), value, ")");
     }
 }
@@ -38998,7 +39323,11 @@ class CDSArithmetics extends combi_1.Expression {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
         const val = (0, combi_1.alt)(cds_integer_1.CDSInteger, name, _1.CDSFunction, _1.CDSCase, _1.CDSCast, _1.CDSString);
         const operator = (0, combi_1.altPrio)("+", "-", "*", "/");
-        return (0, combi_1.seq)(val, operator, val);
+        const operatorValue = (0, combi_1.seq)(operator, val);
+        const paren = (0, combi_1.seq)("(", val, (0, combi_1.plus)(operatorValue), ")");
+        const noParen = (0, combi_1.seq)(val, (0, combi_1.plus)(operatorValue));
+        // todo: this is pretty bad, it needs a rewrite
+        return (0, combi_1.altPrio)((0, combi_1.seq)(paren, (0, combi_1.plus)(operatorValue)), paren, noParen);
     }
 }
 exports.CDSArithmetics = CDSArithmetics;
@@ -39114,7 +39443,7 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node
 class CDSCast extends combi_1.Expression {
     getRunnable() {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
-        return (0, combi_1.seq)("CAST", "(", (0, combi_1.alt)(name, _1.CDSFunction, _1.CDSCase, CDSCast, _1.CDSString, _1.CDSArithmetics), "AS", _1.CDSType, (0, combi_1.opt)((0, combi_1.seq)("PRESERVING", "TYPE")), ")");
+        return (0, combi_1.seq)("CAST", "(", (0, combi_1.alt)(name, _1.CDSFunction, _1.CDSCase, _1.CDSAggregate, CDSCast, _1.CDSString, _1.CDSArithmetics), "AS", _1.CDSType, (0, combi_1.opt)((0, combi_1.seq)("PRESERVING", "TYPE")), ")");
     }
 }
 exports.CDSCast = CDSCast;
@@ -39160,13 +39489,13 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node
 const cds_integer_1 = __webpack_require__(/*! ./cds_integer */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_integer.js");
 class CDSCondition extends combi_1.Expression {
     getRunnable() {
-        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", (0, combi_1.alt)(_1.CDSName, _1.CDSString))));
-        const left = (0, combi_1.alt)(name, _1.CDSFunction);
+        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", (0, combi_1.alt)(_1.CDSName, _1.CDSString))));
+        const left = (0, combi_1.alt)(name, _1.CDSFunction, _1.CDSString);
         const compare = (0, combi_1.seq)(left, (0, combi_1.alt)("=", (0, combi_1.seq)("!", "="), (0, combi_1.seq)("<", ">"), "<", ">", (0, combi_1.seq)(">", "="), (0, combi_1.seq)("<", "="), "LIKE", "NOT LIKE"), (0, combi_1.alt)(left, cds_integer_1.CDSInteger, _1.CDSFunction, _1.CDSString));
         const is = (0, combi_1.seq)(left, "IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("INITIAL", "NULL"));
-        const condition = (0, combi_1.alt)(compare, is);
+        const condition = (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.alt)(compare, is));
         const paren = (0, combi_1.seq)("(", CDSCondition, ")");
-        return (0, combi_1.seq)((0, combi_1.alt)(condition, paren), (0, combi_1.star)((0, combi_1.seq)((0, combi_1.alt)("AND", "OR"), (0, combi_1.alt)(condition, paren))));
+        return (0, combi_1.seq)((0, combi_1.alt)(condition, paren), (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.altPrio)("AND", "OR"), (0, combi_1.altPrio)(condition, paren))));
     }
 }
 exports.CDSCondition = CDSCondition;
@@ -39288,7 +39617,7 @@ const cds_as_1 = __webpack_require__(/*! ./cds_as */ "./node_modules/@abaplint/c
 const cds_cast_1 = __webpack_require__(/*! ./cds_cast */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_cast.js");
 class CDSElement extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), (0, combi_1.altPrio)(_1.CDSAggregate, _1.CDSString, _1.CDSFunction, _1.CDSArithmetics, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)(_1.CDSName, ": REDIRECTED TO", (0, combi_1.opt)((0, combi_1.alt)("PARENT", "COMPOSITION CHILD")), _1.CDSName), (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParameters), (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName, (0, combi_1.opt)(_1.CDSParameters)))), (0, combi_1.regex)(/^\d+$/)), (0, combi_1.opt)(cds_as_1.CDSAs));
+        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), (0, combi_1.altPrio)(_1.CDSAggregate, _1.CDSString, _1.CDSArithmetics, _1.CDSFunction, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)(_1.CDSName, ": REDIRECTED TO", (0, combi_1.opt)((0, combi_1.alt)("PARENT", "COMPOSITION CHILD")), _1.CDSName), _1.CDSPrefixedName, (0, combi_1.regex)(/^\d+$/)), (0, combi_1.opt)(cds_as_1.CDSAs));
     }
 }
 exports.CDSElement = CDSElement;
@@ -39335,30 +39664,43 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 class CDSFunction extends combi_1.Expression {
     getRunnable() {
-        const qualified = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParameters), (0, combi_1.starPrio)((0, combi_1.seq)(".", _1.CDSName, (0, combi_1.opt)(_1.CDSParameters))));
-        const input = (0, combi_1.altPrio)(_1.CDSCast, CDSFunction, _1.CDSArithmetics, _1.CDSCase, _1.CDSString, qualified, (0, combi_1.regex)(/^\d+$/));
-        const coalesce = (0, combi_1.seq)("COALESCE", "(", input, ",", input, ")");
-        const concat = (0, combi_1.seq)("CONCAT", "(", input, ",", input, ")");
-        const concat_with_space = (0, combi_1.seq)("CONCAT_WITH_SPACE", "(", input, ",", input, ",", input, ")");
-        const dats_add_days = (0, combi_1.seq)("DATS_ADD_DAYS", "(", input, ",", input, ",", input, ")");
-        const dats_add_months = (0, combi_1.seq)("DATS_ADD_MONTHS", "(", input, ",", input, ",", input, ")");
-        const dats_days_between = (0, combi_1.seq)("DATS_DAYS_BETWEEN", "(", input, ",", input, ")");
-        const dats_is_valid = (0, combi_1.seq)("DATS_IS_VALID", "(", input, ")");
-        const substring = (0, combi_1.seq)("SUBSTRING", "(", input, ",", input, ",", input, ")");
-        const bintohex = (0, combi_1.seq)("BINTOHEX", "(", input, ")");
-        const hextobin = (0, combi_1.seq)("HEXTOBIN", "(", input, ")");
-        const tstmp_to_dats = (0, combi_1.seq)("TSTMP_TO_DATS", "(", input, ",", input, ",", input, ",", input, ")");
-        const tstmp_to_tims = (0, combi_1.seq)("TSTMP_TO_TIMS", "(", input, ",", input, ",", input, ",", input, ")");
-        const tstmp_to_dst = (0, combi_1.seq)("TSTMP_TO_DST", "(", input, ",", input, ",", input, ",", input, ")");
-        const dats_tims_to_tstmp = (0, combi_1.seq)("DATS_TIMS_TO_TSTMP", "(", input, ",", input, ",", input, ",", input, ",", input, ")");
-        const tstmp_is_valid = (0, combi_1.seq)("TSTMP_IS_VALID", "(", input, ")");
+        const coalesce = (0, combi_1.seq)("COALESCE", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const concat = (0, combi_1.seq)("CONCAT", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const concat_with_space = (0, combi_1.seq)("CONCAT_WITH_SPACE", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const dats_add_days = (0, combi_1.seq)("DATS_ADD_DAYS", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const dats_add_months = (0, combi_1.seq)("DATS_ADD_MONTHS", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const dats_days_between = (0, combi_1.seq)("DATS_DAYS_BETWEEN", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const dats_is_valid = (0, combi_1.seq)("DATS_IS_VALID", "(", _1.CDSFunctionInput, ")");
+        const substring = (0, combi_1.seq)("SUBSTRING", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const bintohex = (0, combi_1.seq)("BINTOHEX", "(", _1.CDSFunctionInput, ")");
+        const hextobin = (0, combi_1.seq)("HEXTOBIN", "(", _1.CDSFunctionInput, ")");
+        const upper = (0, combi_1.seq)("UPPER", "(", _1.CDSFunctionInput, ")");
+        const lower = (0, combi_1.seq)("LOWER", "(", _1.CDSFunctionInput, ")");
+        const abs = (0, combi_1.seq)("ABS", "(", _1.CDSFunctionInput, ")");
+        const ceil = (0, combi_1.seq)("CEIL", "(", _1.CDSFunctionInput, ")");
+        const floor = (0, combi_1.seq)("FLOOR", "(", _1.CDSFunctionInput, ")");
+        const round = (0, combi_1.seq)("ROUND", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const div = (0, combi_1.seq)("DIV", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const division = (0, combi_1.seq)("DIVISION", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const tstmp_to_dats = (0, combi_1.seq)("TSTMP_TO_DATS", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const tstmp_to_tims = (0, combi_1.seq)("TSTMP_TO_TIMS", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const tstmp_to_dst = (0, combi_1.seq)("TSTMP_TO_DST", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const dats_tims_to_tstmp = (0, combi_1.seq)("DATS_TIMS_TO_TSTMP", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const tstmp_is_valid = (0, combi_1.seq)("TSTMP_IS_VALID", "(", _1.CDSFunctionInput, ")");
         const tstmp_current_utctimestamp = (0, combi_1.seq)("TSTMP_CURRENT_UTCTIMESTAMP", "(", ")");
-        const tstmp_seconds_between = (0, combi_1.seq)("TSTMP_SECONDS_BETWEEN", "(", input, ",", input, ",", input, ")");
-        const tstmp_add_seconds = (0, combi_1.seq)("TSTMP_ADD_SECONDS", "(", input, ",", input, ",", input, ")");
-        const abap_system_timezone = (0, combi_1.seq)("ABAP_SYSTEM_TIMEZONE", "(", input, ",", input, ")");
-        const abap_user_timezone = (0, combi_1.seq)("ABAP_USER_TIMEZONE", "(", input, ",", input, ",", input, ")");
-        const mod = (0, combi_1.seq)("MOD", "(", input, ",", input, ")");
-        return (0, combi_1.altPrio)(substring, coalesce, tstmp_to_dats, concat, tstmp_to_tims, concat_with_space, dats_is_valid, dats_days_between, tstmp_add_seconds, tstmp_seconds_between, tstmp_current_utctimestamp, tstmp_is_valid, abap_system_timezone, abap_user_timezone, bintohex, hextobin, dats_add_days, dats_add_months, tstmp_to_dst, dats_tims_to_tstmp, mod);
+        const tstmp_seconds_between = (0, combi_1.seq)("TSTMP_SECONDS_BETWEEN", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const tstmp_add_seconds = (0, combi_1.seq)("TSTMP_ADD_SECONDS", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const abap_system_timezone = (0, combi_1.seq)("ABAP_SYSTEM_TIMEZONE", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const abap_user_timezone = (0, combi_1.seq)("ABAP_USER_TIMEZONE", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const mod = (0, combi_1.seq)("MOD", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const left = (0, combi_1.seq)("LEFT", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const right = (0, combi_1.seq)("RIGHT", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const conversionInput = (0, combi_1.seq)(_1.CDSName, "=", ">", _1.CDSFunctionInput);
+        const conversionInputs = (0, combi_1.seq)(conversionInput, (0, combi_1.starPrio)((0, combi_1.seq)(",", conversionInput)));
+        const unitConversion = (0, combi_1.seq)("UNIT_CONVERSION", "(", conversionInputs, ")");
+        const currencyConversion = (0, combi_1.seq)("CURRENCY_CONVERSION", "(", conversionInputs, ")");
+        const decimalShift = (0, combi_1.seq)("DECIMAL_SHIFT", "(", conversionInputs, ")");
+        return (0, combi_1.altPrio)(substring, coalesce, tstmp_to_dats, concat, tstmp_to_tims, upper, lower, abs, ceil, floor, round, div, division, concat_with_space, dats_is_valid, dats_days_between, tstmp_add_seconds, tstmp_seconds_between, tstmp_current_utctimestamp, tstmp_is_valid, abap_system_timezone, abap_user_timezone, bintohex, hextobin, dats_add_days, dats_add_months, tstmp_to_dst, dats_tims_to_tstmp, mod, left, right, unitConversion, currencyConversion, decimalShift);
     }
 }
 exports.CDSFunction = CDSFunction;
@@ -39366,6 +39708,30 @@ exports.CDSFunction = CDSFunction;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_function_input.js":
+/*!*************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/cds/expressions/cds_function_input.js ***!
+  \*************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CDSFunctionInput = void 0;
+const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/cds/expressions/index.js");
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+class CDSFunctionInput extends combi_1.Expression {
+    getRunnable() {
+        const qualified = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParameters), (0, combi_1.starPrio)((0, combi_1.seq)(".", _1.CDSName, (0, combi_1.opt)(_1.CDSParameters))));
+        const input = (0, combi_1.altPrio)(_1.CDSCast, _1.CDSFunction, _1.CDSArithmetics, _1.CDSCase, _1.CDSString, qualified, (0, combi_1.regex)(/^\d+$/));
+        return input;
+    }
+}
+exports.CDSFunctionInput = CDSFunctionInput;
+//# sourceMappingURL=cds_function_input.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_group_by.js":
 /*!*******************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/cds/expressions/cds_group_by.js ***!
@@ -39526,6 +39892,29 @@ exports.CDSParametersSelect = CDSParametersSelect;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_prefixed_name.js":
+/*!************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/cds/expressions/cds_prefixed_name.js ***!
+  \************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CDSPrefixedName = void 0;
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const cds_name_1 = __webpack_require__(/*! ./cds_name */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_name.js");
+const cds_parameters_1 = __webpack_require__(/*! ./cds_parameters */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_parameters.js");
+class CDSPrefixedName extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)(cds_name_1.CDSName, (0, combi_1.opt)(cds_parameters_1.CDSParameters), (0, combi_1.star)((0, combi_1.seq)(".", cds_name_1.CDSName, (0, combi_1.opt)(cds_parameters_1.CDSParameters))));
+    }
+}
+exports.CDSPrefixedName = CDSPrefixedName;
+//# sourceMappingURL=cds_prefixed_name.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_provider_contract.js":
 /*!****************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/cds/expressions/cds_provider_contract.js ***!
@@ -39586,10 +39975,10 @@ const cds_association_1 = __webpack_require__(/*! ./cds_association */ "./node_m
 const cds_join_1 = __webpack_require__(/*! ./cds_join */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_join.js");
 class CDSSelect extends combi_1.Expression {
     getRunnable() {
-        const fields = (0, combi_1.opt)((0, combi_1.seq)((0, combi_1.star)((0, combi_1.seq)(_1.CDSElement, ",")), _1.CDSElement));
+        const fields = (0, combi_1.seq)((0, combi_1.star)((0, combi_1.seq)(_1.CDSElement, ",")), _1.CDSElement);
         const distinct = (0, combi_1.str)("DISTINCT");
-        const elements = (0, combi_1.seq)((0, combi_1.str)("{"), (0, combi_1.plus)(_1.CDSElement), (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.str)("}"));
-        return (0, combi_1.seq)("SELECT", (0, combi_1.opt)(distinct), (0, combi_1.opt)(fields), "FROM", _1.CDSSource, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs), (0, combi_1.star)(cds_join_1.CDSJoin), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.star)(cds_association_1.CDSAssociation), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.opt)(elements), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)(_1.CDSGroupBy), (0, combi_1.opt)(_1.CDSHaving), (0, combi_1.opt)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), CDSSelect)));
+        const elements = (0, combi_1.seq)((0, combi_1.str)("{"), _1.CDSElement, (0, combi_1.starPrio)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.str)("}"));
+        return (0, combi_1.seq)("SELECT", (0, combi_1.optPrio)(distinct), (0, combi_1.opt)(fields), "FROM", _1.CDSSource, (0, combi_1.star)(cds_join_1.CDSJoin), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.star)(cds_association_1.CDSAssociation), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.opt)(elements), (0, combi_1.optPrio)(_1.CDSWhere), (0, combi_1.optPrio)(_1.CDSGroupBy), (0, combi_1.optPrio)(_1.CDSHaving), (0, combi_1.optPrio)((0, combi_1.seq)("UNION", (0, combi_1.optPrio)("ALL"), CDSSelect)));
     }
 }
 exports.CDSSelect = CDSSelect;
@@ -39611,8 +40000,7 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 class CDSSource extends combi_1.Expression {
     getRunnable() {
-        const pre = (0, combi_1.seq)("/", (0, combi_1.regex)(/^[\w_]+$/), "/");
-        return (0, combi_1.seq)((0, combi_1.opt)(pre), (0, combi_1.regex)(/^[\w_]+$/), (0, combi_1.opt)(_1.CDSAs));
+        return (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs));
     }
 }
 exports.CDSSource = CDSSource;
@@ -39633,7 +40021,8 @@ exports.CDSString = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 class CDSString extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.regex)(/^'[\w: -_]*'$/);
+        // https://stackoverflow.com/a/57754227
+        return (0, combi_1.regex)(/^'[A-Za-zÀ-ž\u0370-\u03FF\u0400-\u04FF: -_]*'$/);
     }
 }
 exports.CDSString = CDSString;
@@ -39753,6 +40142,7 @@ __exportStar(__webpack_require__(/*! ./cds_define_view */ "./node_modules/@abapl
 __exportStar(__webpack_require__(/*! ./cds_element */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_element.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_extend_view */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_extend_view.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_function */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_function.js"), exports);
+__exportStar(__webpack_require__(/*! ./cds_function_input */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_function_input.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_group_by */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_group_by.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_having */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_having.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_integer */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_integer.js"), exports);
@@ -39760,6 +40150,7 @@ __exportStar(__webpack_require__(/*! ./cds_join */ "./node_modules/@abaplint/cor
 __exportStar(__webpack_require__(/*! ./cds_name */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_name.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_parameters_select */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_parameters_select.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_parameters */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_parameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./cds_prefixed_name */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_prefixed_name.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_provider_contract */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_provider_contract.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_relation */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_relation.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_select */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_select.js"), exports);
@@ -40135,10 +40526,10 @@ class DDIC {
             return { type: new Types.VoidType(name) };
         }
     }
-    lookupDomain(name, dataElement) {
+    lookupDomain(name, dataElement, description) {
         const found = this.reg.getObject("DOMA", name);
         if (found) {
-            return { type: found.parseType(this.reg, dataElement), object: found };
+            return { type: found.parseType(this.reg, dataElement, description), object: found };
         }
         else if (this.reg.inErrorNamespace(name)) {
             return { type: new Types.UnknownType(name + ", lookupDomain"), object: undefined };
@@ -40240,9 +40631,15 @@ class DDIC {
             return { type: new Types.VoidType(name) };
         }
     }
-    textToType(text, length, decimals, infoText, qualifiedName, conversionExit, ddicName) {
+    textToType(input) {
         // todo: support short strings, and length of different integers, NUMC vs CHAR, min/max length
-        switch (text) {
+        const extra = {
+            qualifiedName: input.qualifiedName,
+            conversionExit: input.conversionExit,
+            ddicName: input.ddicName,
+            description: input.description,
+        };
+        switch (input.text) {
             case "DEC": // 1 <= len <= 31
             case "D16F": // 1 <= len <= 31
             case "D16D":
@@ -40251,45 +40648,45 @@ class DDIC {
             case "DF34_DEC": // 1 <= len <= 31
             case "CURR": // 1 <= len <= 31
             case "QUAN": // 1 <= len <= 31
-                if (length === undefined) {
-                    return new Types.UnknownType(text + " unknown length, " + infoText, infoText);
+                if (input.length === undefined) {
+                    return new Types.UnknownType(input.text + " unknown length, " + input.infoText, input.infoText);
                 }
-                else if (decimals === undefined) {
-                    return new Types.PackedType(parseInt(length, 10), 0, { qualifiedName, conversionExit, ddicName });
+                else if (input.decimals === undefined) {
+                    return new Types.PackedType(parseInt(input.length, 10), 0, extra);
                 }
-                return new Types.PackedType(parseInt(length, 10), parseInt(decimals, 10), { qualifiedName, conversionExit, ddicName });
+                return new Types.PackedType(parseInt(input.length, 10), parseInt(input.decimals, 10), extra);
             case "ACCP":
-                return new Types.CharacterType(6, { qualifiedName, conversionExit, ddicName }); // YYYYMM
+                return new Types.CharacterType(6, extra); // YYYYMM
             case "LANG":
-                return new Types.CharacterType(1, { qualifiedName, conversionExit, ddicName });
+                return new Types.CharacterType(1, extra);
             case "CLNT":
-                return new Types.CharacterType(3, { qualifiedName, conversionExit, ddicName });
+                return new Types.CharacterType(3, extra);
             case "CUKY":
-                return new Types.CharacterType(5, { qualifiedName, conversionExit, ddicName });
+                return new Types.CharacterType(5, extra);
             case "UNIT": // 2 <= len <= 3
-                return new Types.CharacterType(3, { qualifiedName, conversionExit, ddicName });
+                return new Types.CharacterType(3, extra);
             case "UTCLONG":
-                return new Types.CharacterType(27, { qualifiedName, conversionExit, ddicName });
+                return new Types.CharacterType(27, extra);
             case "NUMC": // 1 <= len <= 255
-                if (length === undefined) {
-                    return new Types.UnknownType(text + " unknown length", infoText);
+                if (input.length === undefined) {
+                    return new Types.UnknownType(input.text + " unknown length", input.infoText);
                 }
-                return new Types.NumericType(parseInt(length, 10), qualifiedName);
+                return new Types.NumericType(parseInt(input.length, 10), input.qualifiedName);
             case "CHAR": // 1 <= len <= 30000 (1333 for table fields)
             case "LCHR": // 256 <= len <= 32000
-                if (length === undefined) {
-                    return new Types.UnknownType(text + " unknown length", infoText);
+                if (input.length === undefined) {
+                    return new Types.UnknownType(input.text + " unknown length", input.infoText);
                 }
-                return new Types.CharacterType(parseInt(length, 10), { qualifiedName, conversionExit, ddicName });
+                return new Types.CharacterType(parseInt(input.length, 10), extra);
             case "RAW": // 1 <= len <= 32000
             case "LRAW": // 256 <= len <= 32000
-                if (length === undefined) {
-                    return new Types.UnknownType(text + " unknown length", infoText);
+                if (input.length === undefined) {
+                    return new Types.UnknownType(input.text + " unknown length", input.infoText);
                 }
-                return new Types.HexType(parseInt(length, 10), qualifiedName);
+                return new Types.HexType(parseInt(input.length, 10), input.qualifiedName);
             case "TIMN": // Native HANA
             case "TIMS":
-                return new Types.TimeType({ qualifiedName: qualifiedName }); //HHMMSS
+                return new Types.TimeType({ qualifiedName: input.qualifiedName }); //HHMMSS
             case "DECFLOAT16": // len = 16
             case "DECFLOAT34": // len = 34
             case "D16R": // len = 16
@@ -40297,37 +40694,37 @@ class DDIC {
             case "DF16_RAW": // len = 16
             case "DF34_RAW": // len = 34
             case "FLTP": // len = 16
-                if (length === undefined) {
-                    return new Types.UnknownType(text + " unknown length", infoText);
+                if (input.length === undefined) {
+                    return new Types.UnknownType(input.text + " unknown length", input.infoText);
                 }
-                return new Types.FloatingPointType(parseInt(length, 10), qualifiedName);
+                return new Types.FloatingPointType(parseInt(input.length, 10), input.qualifiedName);
             case "DATN": // Native HANA
             case "DATS":
-                return new Types.DateType({ qualifiedName: qualifiedName }); //YYYYMMDD
+                return new Types.DateType({ qualifiedName: input.qualifiedName }); //YYYYMMDD
             case "INT1":
             case "INT2":
             case "INT4":
-                return Types.IntegerType.get({ qualifiedName: qualifiedName });
+                return Types.IntegerType.get({ qualifiedName: input.qualifiedName });
             case "INT8":
-                return new Types.Integer8Type({ qualifiedName: qualifiedName });
+                return new Types.Integer8Type({ qualifiedName: input.qualifiedName });
             case "SSTR": // 1 <= len <= 1333
             case "SSTRING": // 1 <= len <= 1333
             case "STRG": // 256 <= len
             case "STRING": // 256 <= len
-                return Types.StringType.get({ qualifiedName: qualifiedName });
+                return Types.StringType.get({ qualifiedName: input.qualifiedName });
             case "RSTR": // 256 <= len
             case "RAWSTRING": // 256 <= len
             case "GEOM_EWKB":
-                return new Types.XStringType({ qualifiedName: qualifiedName });
+                return new Types.XStringType({ qualifiedName: input.qualifiedName });
             case "D16S":
             case "D34S":
             case "DF16_SCL":
             case "DF34_SCL":
             case "PREC":
             case "VARC":
-                return new Types.UnknownType(text + " is an obsolete data type", infoText);
+                return new Types.UnknownType(input.text + " is an obsolete data type", input.infoText);
             default:
-                return new Types.UnknownType(text + " unknown", infoText);
+                return new Types.UnknownType(input.text + " unknown", input.infoText);
         }
     }
 }
@@ -41622,6 +42019,9 @@ class LSPLookup {
         if (variable.getType().getDDICName() !== undefined) {
             value += "\n\nDDIC Name: ```" + variable.getType().getDDICName() + "```";
         }
+        if (variable.getType().getDescription() !== undefined) {
+            value += "\n\nDescription: " + variable.getType().getDescription();
+        }
         return value;
     }
     static referenceHover(ref, scope, reg) {
@@ -42158,15 +42558,13 @@ exports.Definition = Definition;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Diagnostics = void 0;
 const LServer = __webpack_require__(/*! vscode-languageserver-types */ "./node_modules/vscode-languageserver-types/lib/umd/main.js");
-const _lsp_utils_1 = __webpack_require__(/*! ./_lsp_utils */ "./node_modules/@abaplint/core/build/src/lsp/_lsp_utils.js");
 const severity_1 = __webpack_require__(/*! ../severity */ "./node_modules/@abaplint/core/build/src/severity.js");
 class Diagnostics {
     constructor(reg) {
         this.reg = reg;
     }
     findIssues(textDocument) {
-        this.reg.parse();
-        const file = _lsp_utils_1.LSPUtils.getABAPFile(this.reg, textDocument.uri); // todo, this sould also run for xml files
+        const file = this.reg.getFileByName(textDocument.uri);
         if (file === undefined) {
             return [];
         }
@@ -42174,6 +42572,7 @@ class Diagnostics {
         if (obj === undefined) {
             return [];
         }
+        this.reg.parse();
         let issues = this.reg.findIssuesObject(obj);
         issues = issues.filter(i => i.getFilename() === file.getFilename());
         return issues;
@@ -42338,6 +42737,7 @@ const _lsp_utils_1 = __webpack_require__(/*! ./_lsp_utils */ "./node_modules/@ab
 const syntax_1 = __webpack_require__(/*! ../abap/5_syntax/syntax */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/syntax.js");
 const _abap_object_1 = __webpack_require__(/*! ../objects/_abap_object */ "./node_modules/@abaplint/core/build/src/objects/_abap_object.js");
 const dump_scope_1 = __webpack_require__(/*! ./dump_scope */ "./node_modules/@abaplint/core/build/src/lsp/dump_scope.js");
+const virtual_position_1 = __webpack_require__(/*! ../virtual_position */ "./node_modules/@abaplint/core/build/src/virtual_position.js");
 class Help {
     static find(reg, textDocument, position) {
         const file = _lsp_utils_1.LSPUtils.getABAPFile(reg, textDocument.uri);
@@ -42512,13 +42912,24 @@ class Help {
         return ret + "</ul>";
     }
     static tokens(file) {
-        let inner = "<table><tr><td><b>String</b></td><td><b>Type</b></td><td><b>Row</b></td><td><b>Column</b></td></tr>";
+        let inner = `<table><tr><td><b>String</b></td><td><b>Type</b></td>
+    <td><b>Row</b></td><td><b>Column</b></td>
+    <td><b>vRow</b></td><td><b>vColumn</b></td>
+    </tr>`;
         for (const token of file.getTokens()) {
-            inner = inner + "<tr><td><tt>" +
+            const tStart = token.getStart();
+            inner += "<tr><td><tt>" +
                 this.escape(token.getStr()) + "</tt></td><td>" +
                 token.constructor.name + "</td><td align=\"right\">" +
-                token.getRow() + "</td><td align=\"right\">" +
-                token.getCol() + "</td></tr>";
+                tStart.getRow() + "</td><td align=\"right\">" +
+                tStart.getCol() + "</td>";
+            if (tStart instanceof virtual_position_1.VirtualPosition) {
+                inner += `<td>${tStart.vcol}</td><td>${tStart.vrow}</td>`;
+            }
+            else {
+                inner += "<td></td><td></td>";
+            }
+            inner += "</tr>";
         }
         inner = inner + "</table>";
         return inner;
@@ -42852,7 +43263,8 @@ class InlayHints {
     findImplicitReferences(node) {
         const ret = [];
         for (const r of node.getData().references) {
-            if (r.referenceType === _reference_1.ReferenceType.InferredType) {
+            if (r.referenceType === _reference_1.ReferenceType.InferredType ||
+                r.referenceType === _reference_1.ReferenceType.DataWriteReference) {
                 ret.push(r);
             }
         }
@@ -45445,12 +45857,13 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         return (_a = this.parsedData) === null || _a === void 0 ? void 0 : _a.definitionName;
     }
     getDescription() {
-        // todo
-        return undefined;
+        var _a;
+        this.parse();
+        return (_a = this.parsedData) === null || _a === void 0 ? void 0 : _a.description;
     }
     parseType(reg) {
         this.parse();
-        return new cds_determine_types_1.CDSDetermineTypes().parseType(reg, this.parsedData);
+        return new cds_determine_types_1.CDSDetermineTypes().parseType(reg, this.parsedData, this.getName());
     }
     getParsedData() {
         return this.parsedData;
@@ -45471,6 +45884,17 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
     hasParserError() {
         return this.parserError;
     }
+    listKeys() {
+        var _a;
+        this.parse();
+        const ret = [];
+        for (const field of ((_a = this.parsedData) === null || _a === void 0 ? void 0 : _a.fields) || []) {
+            if (field.key === true) {
+                ret.push(field.name);
+            }
+        }
+        return ret;
+    }
     parse() {
         var _a, _b;
         if (this.isDirty() === false) {
@@ -45480,6 +45904,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         this.parsedData = {
             sqlViewName: undefined,
             definitionName: undefined,
+            description: this.findDescription(),
             fields: [],
             sources: [],
             relations: [],
@@ -45514,11 +45939,19 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
     //////////
     findSQLViewName() {
         var _a;
-        const match = (_a = this.findSourceFile()) === null || _a === void 0 ? void 0 : _a.getRaw().match(/@AbapCatalog\.sqlViewName: '(\w+)'/);
+        const match = (_a = this.findSourceFile()) === null || _a === void 0 ? void 0 : _a.getRaw().match(/@AbapCatalog\.sqlViewName: '([\w/]+)'/);
         if (match) {
             this.parsedData.sqlViewName = match[1].toUpperCase();
         }
     }
+    findDescription() {
+        var _a;
+        const match = (_a = this.findSourceFile()) === null || _a === void 0 ? void 0 : _a.getRaw().match(/@EndUserText\.label: '([\w,.:-=#%&() ]+)'/);
+        if (match) {
+            return match[1];
+        }
+        return undefined;
+    }
     findFieldNames(tree) {
         var _a, _b;
         let expr = tree.findFirstExpression(expressions_1.CDSSelect);
@@ -45529,14 +45962,18 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
             expr = tree.findFirstExpression(expressions_1.CDSDefineProjection);
         }
         for (const e of (expr === null || expr === void 0 ? void 0 : expr.findDirectExpressions(expressions_1.CDSElement)) || []) {
+            let prefix = "";
             let found = (_a = e.findDirectExpression(expressions_1.CDSAs)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(expressions_1.CDSName);
             if (found === undefined) {
-                const list = e.findDirectExpressions(expressions_1.CDSName);
+                const list = e.findAllExpressions(expressions_1.CDSName);
                 if (e.concatTokens().toUpperCase().includes(" REDIRECTED TO ")) {
                     found = list[0];
                 }
                 else {
                     found = list[list.length - 1];
+                    if (list.length > 1) {
+                        prefix = list[0].concatTokens();
+                    }
                 }
             }
             if (found === undefined) {
@@ -45553,20 +45990,21 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
             this.parsedData.fields.push({
                 name: name,
                 annotations: annotations,
+                prefix: prefix,
                 key: e.findDirectTokenByText("KEY") !== undefined,
             });
         }
     }
     findSourcesAndRelations(tree) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         for (const e of tree.findAllExpressions(expressions_1.CDSSource)) {
-            const name = e.getFirstToken().getStr();
-            const as = (_b = (_a = e.findDirectExpression(expressions_1.CDSAs)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(expressions_1.CDSName)) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr();
+            const name = ((_a = e.getFirstChild()) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase().replace(/ /g, "")) || "ERROR";
+            const as = (_c = (_b = e.findDirectExpression(expressions_1.CDSAs)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(expressions_1.CDSName)) === null || _c === void 0 ? void 0 : _c.concatTokens().toUpperCase();
             this.parsedData.sources.push({ name, as });
         }
         for (const e of tree.findAllExpressions(expressions_1.CDSRelation)) {
             const name = e.getFirstToken().getStr();
-            const as = (_d = (_c = e.findDirectExpression(expressions_1.CDSAs)) === null || _c === void 0 ? void 0 : _c.findDirectExpression(expressions_1.CDSName)) === null || _d === void 0 ? void 0 : _d.getFirstToken().getStr();
+            const as = (_e = (_d = e.findDirectExpression(expressions_1.CDSAs)) === null || _d === void 0 ? void 0 : _d.findDirectExpression(expressions_1.CDSName)) === null || _e === void 0 ? void 0 : _e.getFirstToken().getStr();
             this.parsedData.relations.push({ name, as });
         }
         for (const e of tree.findAllExpressions(expressions_1.CDSAssociation)) {
@@ -45575,7 +46013,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
                 continue;
             }
             const name = j.getFirstToken().getStr();
-            const as = (_f = (_e = j.findDirectExpression(expressions_1.CDSAs)) === null || _e === void 0 ? void 0 : _e.findDirectExpression(expressions_1.CDSName)) === null || _f === void 0 ? void 0 : _f.getFirstToken().getStr();
+            const as = (_g = (_f = j.findDirectExpression(expressions_1.CDSAs)) === null || _f === void 0 ? void 0 : _f.findDirectExpression(expressions_1.CDSName)) === null || _g === void 0 ? void 0 : _g.getFirstToken().getStr();
             this.parsedData.associations.push({
                 name: name || "ERROR",
                 as: as,
@@ -45635,6 +46073,7 @@ class DataElement extends _abstract_object_1.AbstractObject {
         return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.texts;
     }
     parseType(reg) {
+        var _a;
         const references = [];
         let lookup = undefined;
         if (this.parsedXML === undefined) {
@@ -45647,7 +46086,7 @@ class DataElement extends _abstract_object_1.AbstractObject {
                     lookup = { type: new Types.UnknownType("DOMNAME unexpectely empty in " + this.getName()) };
                 }
                 else {
-                    lookup = ddic.lookupDomain(this.parsedXML.domname, this.getName());
+                    lookup = ddic.lookupDomain(this.parsedXML.domname, this.getName(), this.getDescription());
                 }
             }
             else if (this.parsedXML.refkind === "R") {
@@ -45663,7 +46102,16 @@ class DataElement extends _abstract_object_1.AbstractObject {
                     lookup = { type: new Types.UnknownType("DATATYPE unexpectely empty in " + this.getName()) };
                 }
                 else {
-                    lookup = { type: ddic.textToType(this.parsedXML.datatype, this.parsedXML.leng, this.parsedXML.decimals, this.getName(), this.getName(), undefined, this.getName()) };
+                    lookup = { type: ddic.textToType({
+                            text: this.parsedXML.datatype,
+                            length: this.parsedXML.leng,
+                            decimals: this.parsedXML.decimals,
+                            infoText: this.getName(),
+                            qualifiedName: this.getName(),
+                            conversionExit: undefined,
+                            ddicName: this.getName(),
+                            description: (_a = this.parsedXML.texts) === null || _a === void 0 ? void 0 : _a.heading,
+                        }) };
                 }
             }
         }
@@ -45806,7 +46254,7 @@ class Domain extends _abstract_object_1.AbstractObject {
         this.parsedXML = undefined;
         super.setDirty();
     }
-    parseType(reg, dataElement) {
+    parseType(reg, dataElement, description) {
         // dont cache the DOMA parsed type, they are cached on DTEL level
         // also note that the type carries the name of the DTEL
         if (this.parsedXML === undefined) {
@@ -45816,7 +46264,16 @@ class Domain extends _abstract_object_1.AbstractObject {
             return new Types.UnknownType("Domain " + this.getName() + " parser error", this.getName());
         }
         const ddic = new ddic_1.DDIC(reg);
-        return ddic.textToType(this.parsedXML.datatype, this.parsedXML.length, this.parsedXML.decimals, this.getName(), dataElement, this.parsedXML.conversionExit, dataElement);
+        return ddic.textToType({
+            text: this.parsedXML.datatype,
+            length: this.parsedXML.length,
+            decimals: this.parsedXML.decimals,
+            infoText: this.getName(),
+            qualifiedName: dataElement,
+            conversionExit: this.parsedXML.conversionExit,
+            ddicName: dataElement,
+            description: description,
+        });
     }
     parse() {
         var _a, _b, _c, _d, _e, _f, _g;
@@ -49617,6 +50074,9 @@ class RenamerHelper {
         let ret = [];
         if (node.getIdentifier().stype !== _scope_type_1.ScopeType.BuiltIn) {
             for (const r of node.getData().references) {
+                if (r.referenceType === __1.ReferenceType.ConstructorReference) {
+                    continue;
+                }
                 if (((_a = r.resolved) === null || _a === void 0 ? void 0 : _a.equals(identifier))
                     && r.referenceType !== __1.ReferenceType.InferredType
                     && !(r.position.getStart() instanceof virtual_position_1.VirtualPosition)) {
@@ -50120,7 +50580,7 @@ const version_1 = __webpack_require__(/*! ../version */ "./node_modules/@abaplin
 var EnhancementCategory;
 (function (EnhancementCategory) {
     EnhancementCategory["NotClassified"] = "0";
-    EnhancementCategory["CannotBeEhanced"] = "1";
+    EnhancementCategory["CannotBeEnhanced"] = "1";
     EnhancementCategory["Character"] = "2";
     EnhancementCategory["CharacterOrNumeric"] = "3";
     EnhancementCategory["Deep"] = "4";
@@ -50208,9 +50668,10 @@ class Table extends _abstract_object_1.AbstractObject {
                     references.push({ object: lookup.object });
                 }
             }
-            else if (field.FIELDNAME === ".INCLUDE" || field.FIELDNAME === ".INCLU--AP") { // incude or append structure
+            else if (field.FIELDNAME === ".INCLUDE"
+                || field.FIELDNAME.startsWith(".INCLU-")) {
                 if (field.PRECFIELD === undefined) {
-                    return new Types.UnknownType("Table, parser error, PRECFIELD undefined");
+                    return new Types.UnknownType("Table, parser error, PRECFIELD undefined, " + this.getName());
                 }
                 const lookup = ddic.lookupTableOrView(field.PRECFIELD);
                 let found = lookup.type;
@@ -50224,8 +50685,11 @@ class Table extends _abstract_object_1.AbstractObject {
                     if (field.GROUPNAME !== undefined) {
                         components.push({ name: field.GROUPNAME, type: found });
                     }
-                    for (const c of found.getComponents()) {
-                        components.push({ name: c.name, type: c.type });
+                    if (field.FIELDNAME.startsWith(".INCLU-") === false
+                        || field.FIELDNAME === ".INCLU--AP") {
+                        for (const c of found.getComponents()) {
+                            components.push({ name: c.name, type: c.type });
+                        }
                     }
                 }
                 else if ((((_a = field.PRECFIELD) === null || _a === void 0 ? void 0 : _a.startsWith("CI_")) || ((_b = field.PRECFIELD) === null || _b === void 0 ? void 0 : _b.startsWith("SI_")))
@@ -50242,26 +50706,25 @@ class Table extends _abstract_object_1.AbstractObject {
                 else {
                     components.push({ name: field.FIELDNAME, type: found });
                 }
-            }
-            else if (comptype === "S" && field.FIELDNAME.startsWith(".INCLU-")) {
+                /*
+              } else if (comptype === "S" && field.FIELDNAME.startsWith(".INCLU-")) {
                 const lookup = ddic.lookupTableOrView(field.PRECFIELD);
                 if (lookup.object) {
-                    references.push({ object: lookup.object });
+                  references.push({object: lookup.object});
                 }
                 const found = lookup.type;
                 if (found instanceof Types.VoidType) {
-                    // set the full structure to void
-                    return found;
-                }
-                else if (found instanceof Types.StructureType) {
-                    const suffix = field.FIELDNAME.split("-")[1];
-                    for (const c of found.getComponents()) {
-                        components.push({ name: c.name + suffix, type: c.type });
-                    }
-                }
-                else if (found instanceof Types.UnknownType) {
-                    return found;
+                  // set the full structure to void
+                  return found;
+                } else if (found instanceof Types.StructureType) {
+                  const suffix = field.FIELDNAME.split("-")[1];
+                  for (const c of found.getComponents()) {
+                    components.push({name: c.name + suffix, type: c.type});
+                  }
+                } else if (found instanceof Types.UnknownType) {
+                  return found;
                 }
+                  */
             }
             else if (comptype === "S") {
                 const lookup = ddic.lookupTableOrView(field.ROLLNAME);
@@ -50330,7 +50793,13 @@ class Table extends _abstract_object_1.AbstractObject {
                 const length = field.LENG ? field.LENG : field.INTLEN;
                 components.push({
                     name: field.FIELDNAME,
-                    type: ddic.textToType(datatype, length, field.DECIMALS, this.getName() + "-" + field.FIELDNAME)
+                    type: ddic.textToType({
+                        text: datatype,
+                        length: length,
+                        decimals: field.DECIMALS,
+                        infoText: this.getName() + "-" + field.FIELDNAME,
+                        description: field.DDTEXT,
+                    })
                 });
             }
             else {
@@ -50350,7 +50819,7 @@ class Table extends _abstract_object_1.AbstractObject {
             return new Types.UnknownType("Table/Structure " + this.getName() + " does not contain any components");
         }
         reg.getDDICReferences().setUsing(this, references);
-        return new Types.StructureType(components, this.getName(), this.getName());
+        return new Types.StructureType(components, this.getName(), this.getName(), this.getDescription());
     }
     getTableCategory() {
         var _a;
@@ -50407,6 +50876,7 @@ class Table extends _abstract_object_1.AbstractObject {
                 GROUPNAME: field.GROUPNAME,
                 CHECKTABLE: field.CHECKTABLE,
                 REFTYPE: field.REFTYPE,
+                DDTEXT: field.DDTEXT,
             });
         }
     }
@@ -50528,34 +50998,34 @@ class TableType extends _abstract_object_1.AbstractObject {
         }
         else if (this.parsedXML.rowkind === "S") {
             const lookup = ddic.lookupTableOrView(this.parsedXML.rowtype);
-            type = new Types.TableType(lookup.type, tableOptions, this.getName());
+            type = new Types.TableType(lookup.type, tableOptions, this.getName(), this.getDescription());
             if (lookup.object) {
                 references.push({ object: lookup.object });
             }
         }
         else if (this.parsedXML.rowkind === "E") {
             const lookup = ddic.lookupDataElement(this.parsedXML.rowtype);
-            type = new Types.TableType(lookup.type, tableOptions, this.getName());
+            type = new Types.TableType(lookup.type, tableOptions, this.getName(), this.getDescription());
             if (lookup.object) {
                 references.push({ object: lookup.object });
             }
         }
         else if (this.parsedXML.rowkind === "L") {
             const lookup = ddic.lookupTableType(this.parsedXML.rowtype);
-            type = new Types.TableType(lookup.type, tableOptions, this.getName());
+            type = new Types.TableType(lookup.type, tableOptions, this.getName(), this.getDescription());
             if (lookup.object) {
                 references.push({ object: lookup.object });
             }
         }
         else if (this.parsedXML.rowkind === "R" && this.parsedXML.rowtype === "OBJECT") {
-            type = new Types.TableType(new basic_1.GenericObjectReferenceType(), tableOptions, this.getName());
+            type = new Types.TableType(new basic_1.GenericObjectReferenceType(), tableOptions, this.getName(), this.getDescription());
         }
         else if (this.parsedXML.rowkind === "R" && this.parsedXML.rowtype === "DATA") {
-            type = new Types.TableType(new basic_1.DataReference(new Types.DataType()), tableOptions, this.getName());
+            type = new Types.TableType(new basic_1.DataReference(new Types.DataType()), tableOptions, this.getName(), this.getDescription());
         }
         else if (this.parsedXML.rowkind === "R" && this.parsedXML.rowtype !== undefined) {
             const lookup = ddic.lookupObject(this.parsedXML.rowtype);
-            type = new Types.TableType(lookup.type, tableOptions, this.getName());
+            type = new Types.TableType(lookup.type, tableOptions, this.getName(), this.getDescription());
             if (lookup.object) {
                 references.push({ object: lookup.object });
             }
@@ -50565,8 +51035,13 @@ class TableType extends _abstract_object_1.AbstractObject {
                 type = new Types.UnknownType("Table Type, empty DATATYPE" + this.getName(), this.getName());
             }
             else {
-                const row = ddic.textToType(this.parsedXML.datatype, this.parsedXML.leng, this.parsedXML.decimals, this.getName());
-                type = new Types.TableType(row, tableOptions, this.getName());
+                const row = ddic.textToType({
+                    text: this.parsedXML.datatype,
+                    length: this.parsedXML.leng,
+                    decimals: this.parsedXML.decimals,
+                    infoText: this.getName(),
+                });
+                type = new Types.TableType(row, tableOptions, this.getName(), this.getDescription());
             }
         }
         else {
@@ -50911,9 +51386,25 @@ class View extends _abstract_object_1.AbstractObject {
         }
         return new Types.StructureType(components, this.getName());
     }
+    listKeys() {
+        var _a;
+        if (this.parsedData === undefined) {
+            this.parseXML();
+        }
+        const ret = [];
+        for (const p of ((_a = this.parsedData) === null || _a === void 0 ? void 0 : _a.fields) || []) {
+            if (p.KEYFLAG === "X") {
+                ret.push(p.FIELDNAME);
+            }
+        }
+        return ret;
+    }
     getDescription() {
-        // todo
-        return undefined;
+        var _a;
+        if (this.parsedData === undefined) {
+            this.parseXML();
+        }
+        return (_a = this.parsedData) === null || _a === void 0 ? void 0 : _a.header.DDTEXT;
     }
     ///////////////
     parseXML() {
@@ -50921,6 +51412,7 @@ class View extends _abstract_object_1.AbstractObject {
         this.parsedData = {
             header: {
                 VIEWCLASS: "",
+                DDTEXT: "",
             },
             fields: [],
             join: [],
@@ -50932,6 +51424,7 @@ class View extends _abstract_object_1.AbstractObject {
         const header = (_a = parsed.abapGit["asx:abap"]["asx:values"]) === null || _a === void 0 ? void 0 : _a.DD25V;
         this.parsedData.header = {
             VIEWCLASS: (header === null || header === void 0 ? void 0 : header.VIEWCLASS) || "",
+            DDTEXT: (header === null || header === void 0 ? void 0 : header.DDTEXT) || "",
         };
         const fields = (_b = parsed.abapGit["asx:abap"]["asx:values"]) === null || _b === void 0 ? void 0 : _b.DD27P_TABLE;
         for (const field of (0, xml_utils_1.xmlToArray)(fields === null || fields === void 0 ? void 0 : fields.DD27P)) {
@@ -50939,6 +51432,7 @@ class View extends _abstract_object_1.AbstractObject {
                 VIEWFIELD: field.VIEWFIELD,
                 TABNAME: field.TABNAME,
                 FIELDNAME: field.FIELDNAME,
+                KEYFLAG: field.KEYFLAG,
             });
         }
         const join = (_c = parsed.abapGit["asx:abap"]["asx:values"]) === null || _c === void 0 ? void 0 : _c.DD28J_TABLE;
@@ -51394,6 +51888,7 @@ class Indent {
             else if (type instanceof Statements.StartOfSelection
                 || type instanceof Statements.AtSelectionScreen
                 || type instanceof Statements.AtLineSelection
+                || type instanceof Statements.AtPF
                 || type instanceof Statements.Initialization
                 || type instanceof Statements.AtUserCommand
                 || type instanceof Statements.TopOfPage
@@ -51677,7 +52172,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.16";
+        return "2.113.70";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -55384,6 +55879,7 @@ const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./
 const position_1 = __webpack_require__(/*! ../position */ "./node_modules/@abaplint/core/build/src/position.js");
 const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
+const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 class ColonMissingSpaceConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.ColonMissingSpaceConf = ColonMissingSpaceConf;
@@ -55413,18 +55909,29 @@ class ColonMissingSpace extends _abap_rule_1.ABAPRule {
     }
     runParsed(file) {
         const issues = [];
-        const tokens = file.getTokens();
-        for (let i = 0; i < tokens.length; i++) {
-            const token = tokens[i];
-            if (token.getStr() === ":"
-                && tokens[i + 1] !== undefined
-                && tokens[i + 1].getRow() === token.getRow()
-                && tokens[i + 1].getCol() === token.getCol() + 1) {
-                const start = token.getStart();
-                const end = new position_1.Position(start.getRow(), start.getCol() + 1);
-                const fix = edit_helper_1.EditHelper.insertAt(file, end, " ");
-                const issue = issue_1.Issue.atRange(file, start, end, this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
-                issues.push(issue);
+        for (const statement of file.getStatements()) {
+            const colon = statement.getColon();
+            if (colon === undefined
+                || statement.get() instanceof _statement_1.NativeSQL
+                || statement.get() instanceof _statement_1.Comment) {
+                continue;
+            }
+            // todo: this can be more smart, performance wise
+            const tokens = [...statement.getTokens()];
+            tokens.push(colon);
+            tokens.sort((a, b) => a.getStart().isAfter(b.getStart()) ? 1 : -1);
+            for (let i = 0; i < tokens.length; i++) {
+                const token = tokens[i];
+                if (token.getStr() === ":"
+                    && tokens[i + 1] !== undefined
+                    && tokens[i + 1].getRow() === token.getRow()
+                    && tokens[i + 1].getCol() === token.getCol() + 1) {
+                    const start = token.getStart();
+                    const end = new position_1.Position(start.getRow(), start.getCol() + 1);
+                    const fix = edit_helper_1.EditHelper.insertAt(file, end, " ");
+                    const issue = issue_1.Issue.atRange(file, start, end, this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
+                    issues.push(issue);
+                }
             }
         }
         return issues;
@@ -56607,6 +57114,9 @@ class DoubleSpace extends _abap_rule_1.ABAPRule {
     runParsed(file) {
         let issues = [];
         for (const s of file.getStatements()) {
+            if (s.get() instanceof _statement_1.NativeSQL) {
+                continue;
+            }
             if (this.conf.keywords === true
                 && !(s.get() instanceof _statement_1.Unknown)
                 && !(s.get() instanceof statements_1.MethodDef)
@@ -57491,7 +58001,7 @@ ${indentation}`);
         return issue_1.Issue.atToken(lowFile, inlineData.getFirstToken(), "Outline SELECT @DATA", this.getMetadata().key, this.conf.severity, fix);
     }
     downportSelectTableInline(low, high, lowFile, highSyntax) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (!(low.get() instanceof _statement_1.Unknown)) {
             return undefined;
         }
@@ -57512,13 +58022,22 @@ ${indentation}`);
         if (tableName === undefined) {
             return undefined;
         }
+        const tableMap = {};
+        for (const from of sqlFrom) {
+            const dbName = (_c = from.findDirectExpression(Expressions.DatabaseTable)) === null || _c === void 0 ? void 0 : _c.concatTokens().toUpperCase();
+            if (dbName === undefined) {
+                continue;
+            }
+            const asName = ((_d = from.findDirectExpression(Expressions.SQLAsName)) === null || _d === void 0 ? void 0 : _d.concatTokens().toUpperCase()) || dbName;
+            tableMap[asName] = dbName;
+        }
         const fieldList = high.findFirstExpression(Expressions.SQLFieldList);
         if (fieldList === undefined) {
             return undefined;
         }
         let fieldDefinitions = "";
         for (const f of fieldList.findAllExpressions(Expressions.SQLField)) {
-            let fieldName = (_c = f.findFirstExpression(Expressions.SQLFieldName)) === null || _c === void 0 ? void 0 : _c.concatTokens();
+            let fieldName = (_e = f.findFirstExpression(Expressions.SQLFieldName)) === null || _e === void 0 ? void 0 : _e.concatTokens();
             if (fieldName === undefined) {
                 continue;
             }
@@ -57527,12 +58046,13 @@ ${indentation}`);
                 tableName = split[0];
                 fieldName = split[1];
             }
-            const typeName = tableName + "-" + fieldName;
-            fieldName = ((_d = f.findFirstExpression(Expressions.SQLAsName)) === null || _d === void 0 ? void 0 : _d.concatTokens()) || fieldName;
-            fieldDefinitions += indentation + "        " + fieldName + " TYPE " + typeName + ",\n";
+            const translated = tableMap[tableName.toUpperCase()];
+            const typeName = translated + "-" + fieldName;
+            fieldName = ((_f = f.findFirstExpression(Expressions.SQLAsName)) === null || _f === void 0 ? void 0 : _f.concatTokens()) || fieldName;
+            fieldDefinitions += indentation + "        " + fieldName + " TYPE " + typeName.toLowerCase() + ",\n";
         }
         const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
-        const name = ((_e = inlineData.findFirstExpression(Expressions.TargetField)) === null || _e === void 0 ? void 0 : _e.concatTokens()) || "error";
+        const name = ((_g = inlineData.findFirstExpression(Expressions.TargetField)) === null || _g === void 0 ? void 0 : _g.concatTokens()) || "error";
         let fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getStart(), `TYPES: BEGIN OF ${uniqueName},
 ${fieldDefinitions}${indentation}      END OF ${uniqueName}.
 ${indentation}DATA ${name} TYPE STANDARD TABLE OF ${uniqueName} WITH DEFAULT KEY.
@@ -57923,7 +58443,7 @@ ${indentation}CATCH ${className} INTO ${targetName}.`;
             }
             startToken = node.getFirstToken();
         }
-        const withs = ((_f = node.findDirectExpression(Expressions.RaiseWith)) === null || _f === void 0 ? void 0 : _f.findDirectExpressions(Expressions.SimpleSource1)) || [];
+        const withs = ((_f = node.findDirectExpression(Expressions.RaiseWith)) === null || _f === void 0 ? void 0 : _f.findDirectExpressionsMulti([Expressions.SimpleSource1, Expressions.Source])) || [];
         const className = ((_g = node.findDirectExpression(Expressions.ClassName)) === null || _g === void 0 ? void 0 : _g.concatTokens()) || "ERROR";
         const uniqueName1 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
         const uniqueName2 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
@@ -58454,21 +58974,17 @@ ${indentation}${uniqueName}`;
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, op.getStart(), sourceStart, "= " + target + operator);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Expand operator", this.getMetadata().key, this.conf.severity, fix);
     }
-    // must be very simple string templates, like "|{ ls_line-no ALPHA = IN }|"
     stringTemplateAlpha(low, high, lowFile, highSyntax) {
         var _a, _b;
         if (!(low.get() instanceof _statement_1.Unknown)) {
             return undefined;
         }
-        for (const child of high.findAllExpressionsRecursive(Expressions.StringTemplate)) {
-            const templateTokens = child.getChildren();
-            if (templateTokens.length !== 3
-                || templateTokens[0].getFirstToken().getStr() !== "|{"
-                || templateTokens[2].getFirstToken().getStr() !== "}|") {
+        for (const child of high.findAllExpressionsRecursive(Expressions.StringTemplateSource)) {
+            const formatting = (_a = child.findDirectExpression(Expressions.StringTemplateFormatting)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
+            if (formatting === undefined
+                || (formatting === null || formatting === void 0 ? void 0 : formatting.startsWith("ALPHA = ")) === false) {
                 continue;
             }
-            const templateSource = child.findDirectExpression(Expressions.StringTemplateSource);
-            const formatting = (_a = templateSource === null || templateSource === void 0 ? void 0 : templateSource.findDirectExpression(Expressions.StringTemplateFormatting)) === null || _a === void 0 ? void 0 : _a.concatTokens();
             let functionName = "";
             switch (formatting) {
                 case "ALPHA = IN":
@@ -58481,7 +58997,7 @@ ${indentation}${uniqueName}`;
                     return undefined;
             }
             const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
-            const source = (_b = templateSource === null || templateSource === void 0 ? void 0 : templateSource.findDirectExpression(Expressions.Source)) === null || _b === void 0 ? void 0 : _b.concatTokens();
+            const source = (_b = child.findDirectExpression(Expressions.Source)) === null || _b === void 0 ? void 0 : _b.concatTokens();
             const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const code = `DATA ${uniqueName} TYPE string.
 ${indentation}CALL FUNCTION '${functionName}'
@@ -61070,6 +61586,8 @@ class FullyTypeITabs extends _abap_rule_1.ABAPRule {
             key: "fully_type_itabs",
             title: "Fully type internal tables",
             shortDescription: `No implict table types or table keys`,
+            extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#use-the-right-table-type
+https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#avoid-default-key`,
             badExample: `DATA lt_foo TYPE TABLE OF ty.
 DATA lt_bar TYPE STANDARD TABLE OF ty.`,
             goodExample: `DATA lt_foo TYPE STANDARD TABLE OF ty WITH EMPTY KEY.`,
@@ -62565,6 +63083,7 @@ const ddic_1 = __webpack_require__(/*! ../ddic */ "./node_modules/@abaplint/core
 const position_1 = __webpack_require__(/*! ../position */ "./node_modules/@abaplint/core/build/src/position.js");
 const virtual_position_1 = __webpack_require__(/*! ../virtual_position */ "./node_modules/@abaplint/core/build/src/virtual_position.js");
 const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
+const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 class IndentationConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -62676,6 +63195,9 @@ ENDCLASS.`,
                     continue;
                 }
             }
+            if (statement.get() instanceof _statement_1.NativeSQL) {
+                continue;
+            }
             // only apply for the first statement in a chain
             if (statement.getColon() !== undefined
                 && (previous === null || previous === void 0 ? void 0 : previous.getColon()) !== undefined
@@ -63370,6 +63892,7 @@ class Skip {
     skipStatement(statement) {
         const get = statement.get();
         if (get instanceof _statement_1.Unknown
+            || get instanceof _statement_1.NativeSQL
             || get instanceof _statement_1.MacroContent
             || get instanceof _statement_1.MacroCall
             || statement.getFirstToken().getStart() instanceof virtual_position_1.VirtualPosition
@@ -67936,12 +68459,23 @@ This rule makes sure the spaces are consistently required across the language.`,
         if (children.length < 2) {
             return undefined;
         }
-        const nextLast = children[children.length - 2];
-        const last = children[children.length - 1];
-        if (nextLast.getStr().startsWith("'")
-            && nextLast.getRow() === last.getRow()
-            && nextLast.getEnd().getCol() === last.getStart().getCol()) {
-            return last.getEnd();
+        if (children.length >= 4
+            && children[0].getStr().toUpperCase() === "CONV") {
+            const first = children[2];
+            const second = children[3];
+            if (first.getRow() === second.getRow()
+                && first.getCol() + 1 === second.getStart().getCol()) {
+                return second.getStart();
+            }
+        }
+        {
+            const nextLast = children[children.length - 2];
+            const last = children[children.length - 1];
+            if (nextLast.getStr().startsWith("'")
+                && nextLast.getRow() === last.getRow()
+                && nextLast.getEnd().getCol() === last.getStart().getCol()) {
+                return last.getEnd();
+            }
         }
         return undefined;
     }
@@ -70015,7 +70549,11 @@ class SelectionScreenNaming extends _abap_rule_1.ABAPRule {
             return statNode.findFirstExpression(expressions_1.FieldSub);
         }
         else if (statNode.get() instanceof statements_1.SelectionScreen) {
-            return statNode.findFirstExpression(expressions_1.InlineField);
+            let ret = statNode.findFirstExpression(expressions_1.InlineField);
+            if (ret === undefined && statNode.concatTokens().toUpperCase().includes(" BEGIN OF TABBED BLOCK")) {
+                ret = statNode.findFirstExpression(expressions_1.BlockName);
+            }
+            return ret;
         }
         else {
             return undefined;
@@ -70520,6 +71058,8 @@ const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/co
 const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@abaplint/core/build/src/rules/_abap_rule.js");
 const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
+const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
+const tokens_1 = __webpack_require__(/*! ../abap/1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 class SpaceBeforeColonConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.SpaceBeforeColonConf = SpaceBeforeColonConf;
@@ -70550,22 +71090,34 @@ class SpaceBeforeColon extends _abap_rule_1.ABAPRule {
     }
     runParsed(file) {
         const issues = [];
-        let prev = file.getTokens()[0];
-        for (const token of file.getTokens()) {
-            if (token.getStr() === ":" && !prev) {
-                const issue = issue_1.Issue.atToken(file, token, this.getMessage(), this.getMetadata().key, this.conf.severity);
-                issues.push(issue);
+        for (const statement of file.getStatements()) {
+            const colon = statement.getColon();
+            if (colon === undefined
+                || statement.get() instanceof _statement_1.NativeSQL
+                || statement.get() instanceof tokens_1.Comment) {
+                continue;
             }
-            else if (token.getStr() === ":"
-                && prev.getRow() === token.getRow()
-                && prev.getCol() + prev.getStr().length < token.getCol()) {
-                const start = new position_1.Position(token.getRow(), prev.getEnd().getCol());
-                const end = new position_1.Position(token.getRow(), token.getStart().getCol());
-                const fix = edit_helper_1.EditHelper.deleteRange(file, start, end);
-                const issue = issue_1.Issue.atRowRange(file, start.getRow(), start.getCol(), end.getCol(), this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
-                issues.push(issue);
+            // todo: this can be more smart, performance wise
+            const tokens = [...statement.getTokens()];
+            tokens.push(colon);
+            tokens.sort((a, b) => a.getStart().isAfter(b.getStart()) ? 1 : -1);
+            let prev = tokens[0];
+            for (const token of tokens) {
+                if (token.getStr() === ":" && !prev) {
+                    const issue = issue_1.Issue.atToken(file, token, this.getMessage(), this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
+                }
+                else if (token.getStr() === ":"
+                    && prev.getRow() === token.getRow()
+                    && prev.getCol() + prev.getStr().length < token.getCol()) {
+                    const start = new position_1.Position(token.getRow(), prev.getEnd().getCol());
+                    const end = new position_1.Position(token.getRow(), token.getStart().getCol());
+                    const fix = edit_helper_1.EditHelper.deleteRange(file, start, end);
+                    const issue = issue_1.Issue.atRowRange(file, start.getRow(), start.getCol(), end.getCol(), this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
+                    issues.push(issue);
+                }
+                prev = token;
             }
-            prev = token;
         }
         return issues;
     }
@@ -75322,7 +75874,6 @@ exports.Chunk = Chunk;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DatabaseSetup = void 0;
-/* eslint-disable max-len */
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const sqlite_database_schema_1 = __webpack_require__(/*! ./schema_generation/sqlite_database_schema */ "./node_modules/@abaplint/transpiler/build/src/db/schema_generation/sqlite_database_schema.js");
 const pg_database_schema_1 = __webpack_require__(/*! ./schema_generation/pg_database_schema */ "./node_modules/@abaplint/transpiler/build/src/db/schema_generation/pg_database_schema.js");
@@ -75971,7 +76522,7 @@ class CompareTranspiler {
         // todo, this is not correct
         const concat = node.concatTokens().toUpperCase();
         let pre = concat.startsWith("NOT ") ? "!" : "";
-        const sources = node.findDirectExpressions(core_1.Expressions.Source).concat(node.findDirectExpressions(core_1.Expressions.SourceFieldSymbol));
+        const sources = node.findDirectExpressionsMulti([core_1.Expressions.Source, core_1.Expressions.SourceFieldSymbolChain, core_1.Expressions.SourceFieldSymbol]);
         if (sources.length === 1) {
             const s0 = traversal.traverse(sources[0]);
             if (concat.startsWith("NOT ") && concat.endsWith(" IS NOT INITIAL")) {
@@ -76943,6 +77494,7 @@ __exportStar(__webpack_require__(/*! ./field_length */ "./node_modules/@abaplint
 __exportStar(__webpack_require__(/*! ./field_offset */ "./node_modules/@abaplint/transpiler/build/src/expressions/field_offset.js"), exports);
 __exportStar(__webpack_require__(/*! ./field_symbol */ "./node_modules/@abaplint/transpiler/build/src/expressions/field_symbol.js"), exports);
 __exportStar(__webpack_require__(/*! ./function_exporting */ "./node_modules/@abaplint/transpiler/build/src/expressions/function_exporting.js"), exports);
+__exportStar(__webpack_require__(/*! ./source_field_symbol_chain */ "./node_modules/@abaplint/transpiler/build/src/expressions/source_field_symbol_chain.js"), exports);
 __exportStar(__webpack_require__(/*! ./function_parameters */ "./node_modules/@abaplint/transpiler/build/src/expressions/function_parameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./message_number */ "./node_modules/@abaplint/transpiler/build/src/expressions/message_number.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_call_body */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_call_body.js"), exports);
@@ -77806,6 +78358,27 @@ exports.SourceFieldSymbolTranspiler = SourceFieldSymbolTranspiler;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/expressions/source_field_symbol_chain.js":
+/*!**********************************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/expressions/source_field_symbol_chain.js ***!
+  \**********************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.SourceFieldSymbolChainTranspiler = void 0;
+const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/transpiler/build/src/expressions/index.js");
+class SourceFieldSymbolChainTranspiler {
+    transpile(node, traversal) {
+        return new _1.FieldSymbolTranspiler().transpile(node, traversal);
+    }
+}
+exports.SourceFieldSymbolChainTranspiler = SourceFieldSymbolChainTranspiler;
+//# sourceMappingURL=source_field_symbol_chain.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_arithmetic_operator.js":
 /*!********************************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/expressions/sql_arithmetic_operator.js ***!
@@ -78828,11 +79401,11 @@ class HandleDataElement {
                 fixedValues = doma.getFixedValues();
             }
         }
-        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
-  "objectType": "DTEL",
-  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
-  "domain": ${JSON.stringify(obj.getDomainName())},
-  "fixedValues": ${JSON.stringify(fixedValues)},
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "DTEL",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+  "domain": ${JSON.stringify(obj.getDomainName())},
+  "fixedValues": ${JSON.stringify(fixedValues)},
 };`);
         const output = {
             object: {
@@ -78870,20 +79443,20 @@ class HandleEnqu {
         if (filename === undefined) {
             return [];
         }
-        const chunk = new chunk_1.Chunk().appendString(`// enqueue object
-abap.FunctionModules["ENQUEUE_${obj.getName().toUpperCase()}"] = async (INPUT) => {
-  const lookup = abap.Classes["KERNEL_LOCK"];
-  if (lookup === undefined) {
-    throw new Error("Lock, kernel class missing");
-  }
-  await lookup.enqueue(INPUT);
-};
-abap.FunctionModules["DEQUEUE_${obj.getName().toUpperCase()}"] = async (INPUT) => {
-  const lookup = abap.Classes["KERNEL_LOCK"];
-  if (lookup === undefined) {
-    throw new Error("Lock, kernel class missing");
-  }
-  await lookup.dequeue(INPUT);
+        const chunk = new chunk_1.Chunk().appendString(`// enqueue object
+abap.FunctionModules["ENQUEUE_${obj.getName().toUpperCase()}"] = async (INPUT) => {
+  const lookup = abap.Classes["KERNEL_LOCK"];
+  if (lookup === undefined) {
+    throw new Error("Lock, kernel class missing");
+  }
+  await lookup.enqueue(INPUT);
+};
+abap.FunctionModules["DEQUEUE_${obj.getName().toUpperCase()}"] = async (INPUT) => {
+  const lookup = abap.Classes["KERNEL_LOCK"];
+  if (lookup === undefined) {
+    throw new Error("Lock, kernel class missing");
+  }
+  await lookup.dequeue(INPUT);
 };`);
         const output = {
             object: {
@@ -79051,11 +79624,11 @@ class HandleSMIM {
         }
         obj.parse();
         const dataFile = obj.getDataFile();
-        const chunk = new chunk_1.Chunk().appendString(`abap.SMIM["${obj.getName().toUpperCase()}"] = {
-  "objectType": "SMIM",
-  "filename": ${JSON.stringify(dataFile?.getFilename())},
-  "url": ${JSON.stringify(obj.getURL())},
-  "class": ${JSON.stringify(obj.getClass())},
+        const chunk = new chunk_1.Chunk().appendString(`abap.SMIM["${obj.getName().toUpperCase()}"] = {
+  "objectType": "SMIM",
+  "filename": ${JSON.stringify(dataFile?.getFilename())},
+  "url": ${JSON.stringify(obj.getURL())},
+  "class": ${JSON.stringify(obj.getClass())},
 };`);
         const output = {
             object: {
@@ -79109,10 +79682,10 @@ class HandleTable {
             return [];
         }
         const type = obj.parseType(reg);
-        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
-  "objectType": "TABL",
-  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
-  "keyFields": ${JSON.stringify(obj.listKeys(reg))},
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "TABL",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+  "keyFields": ${JSON.stringify(obj.listKeys(reg))},
 };`);
         const output = {
             object: {
@@ -79151,9 +79724,9 @@ class HandleTableType {
             return [];
         }
         const type = obj.parseType(reg);
-        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
-  "objectType": "TTYP",
-  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "TTYP",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
 };`);
         const output = {
             object: {
@@ -79241,9 +79814,9 @@ class HandleView {
             return [];
         }
         const type = obj.parseType(reg);
-        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
-  "objectType": "VIEW",
-  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "VIEW",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
 };`);
         // todo, "keyFields": ${JSON.stringify(obj.listKeys())},
         const output = {
@@ -79283,9 +79856,9 @@ class HandleW3MI {
         }
         obj.parse();
         const dataFile = obj.getDataFile();
-        const chunk = new chunk_1.Chunk().appendString(`abap.W3MI["${obj.getName().toUpperCase()}"] = {
-  "objectType": "W3MI",
-  "filename": ${JSON.stringify(dataFile?.getFilename())},
+        const chunk = new chunk_1.Chunk().appendString(`abap.W3MI["${obj.getName().toUpperCase()}"] = {
+  "objectType": "W3MI",
+  "filename": ${JSON.stringify(dataFile?.getFilename())},
 };`);
         const output = {
             object: {
@@ -79917,26 +80490,26 @@ class AssignTranspiler {
                 const firstFirst = first.getChildren()[1];
                 if (firstFirst?.get() instanceof abaplint.Expressions.Constant) {
                     const s = firstFirst.getFirstToken().getStr().toLowerCase().match(/\w+/)?.toString();
-                    options.push(`dynamicSource: (() => {
-            try { return ${s}; } catch {}
-            try { return this.${s}; } catch {}
+                    options.push(`dynamicSource: (() => {
+            try { return ${s}; } catch {}
+            try { return this.${s}; } catch {}
           })()`);
                 }
                 else if (firstFirst?.get() instanceof abaplint.Expressions.FieldChain && firstFirst instanceof abaplint.Nodes.ExpressionNode) {
                     const code = new expressions_1.FieldChainTranspiler(true).transpile(firstFirst, traversal).getCode();
-                    options.push(`dynamicSource: (() => {
-            const name = ${code}.toLowerCase().replace(/[~\\/]/g, "$").match(/[\\w\\$\\/]+/)[0];
-            try { return eval(name); } catch {}
-            try { return eval("this." + name); } catch {}
+                    options.push(`dynamicSource: (() => {
+            const name = ${code}.toLowerCase().replace(/[~\\/]/g, "$").match(/[\\w\\$\\/]+/)[0];
+            try { return eval(name); } catch {}
+            try { return eval("this." + name); } catch {}
           })()`);
                 }
             }
             else if (first?.get() instanceof abaplint.Expressions.Source && first instanceof abaplint.Nodes.ExpressionNode) {
                 //        const name = first.concatTokens().toLowerCase();
                 const name = new expressions_1.SourceTranspiler().transpile(first, traversal).getCode();
-                options.push(`dynamicSource: (() => {
-          try { return ${name}; } catch {}
-          try { return this.${name}; } catch {}
+                options.push(`dynamicSource: (() => {
+          try { return ${name}; } catch {}
+          try { return this.${name}; } catch {}
         })()`);
             }
         }
@@ -80144,9 +80717,9 @@ class CallTranspiler {
         let pre = "";
         let post = "";
         pre = "try {\n" + pre;
-        post += `\nabap.builtin.sy.get().subrc.set(0);
-} catch (e) {
-if (e.classic) {
+        post += `\nabap.builtin.sy.get().subrc.set(0);
+} catch (e) {
+if (e.classic) {
   switch (e.classic.toUpperCase()) {\n`;
         for (const e of node.findAllExpressions(abaplint.Expressions.ParameterException)) {
             const name = e.getFirstToken().getStr().toUpperCase();
@@ -80162,10 +80735,10 @@ if (e.classic) {
                 post += `case "${name}": abap.builtin.sy.get().subrc.set(${value}); break;\n`;
             }
         }
-        post += `  }
-} else {
-  throw e;
-}
+        post += `  }
+} else {
+  throw e;
+}
 }`;
         return { pre, post };
     }
@@ -80500,11 +81073,11 @@ class ClassImplementationTranspiler {
             ret += " extends " + traversal_1.Traversal.escapeNamespace(def?.getSuperClass()?.toLowerCase());
         }
         const scope = traversal.findCurrentScopeByToken(token);
-        return new chunk_1.Chunk().append(ret + ` {
-static INTERNAL_TYPE = 'CLAS';
-static INTERNAL_NAME = '${traversal.buildInternalName(token.getStr(), def)}';
-static IMPLEMENTED_INTERFACES = [${this.findImplementedByClass(traversal, def, scope).map(e => `"` + e.toUpperCase() + `"`).join(",")}];
-static ATTRIBUTES = {${traversal.buildAttributes(def, scope).join(",\n")}};
+        return new chunk_1.Chunk().append(ret + ` {
+static INTERNAL_TYPE = 'CLAS';
+static INTERNAL_NAME = '${traversal.buildInternalName(token.getStr(), def)}';
+static IMPLEMENTED_INTERFACES = [${this.findImplementedByClass(traversal, def, scope).map(e => `"` + e.toUpperCase() + `"`).join(",")}];
+static ATTRIBUTES = {${traversal.buildAttributes(def, scope).join(",\n")}};
 static METHODS = {${traversal.buildMethods(def, scope).join(",\n")}};`, node, traversal);
     }
     findImplementedInterface(traversal, def, scope) {
@@ -81260,6 +81833,27 @@ exports.DeleteInternalTranspiler = DeleteInternalTranspiler;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/statements/delete_memory.js":
+/*!*********************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/statements/delete_memory.js ***!
+  \*********************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DeleteMemoryTranspiler = void 0;
+const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+class DeleteMemoryTranspiler {
+    transpile(_node, _traversal) {
+        return new chunk_1.Chunk(`throw new Error("DeleteMemory, not supported, transpiler");`);
+    }
+}
+exports.DeleteMemoryTranspiler = DeleteMemoryTranspiler;
+//# sourceMappingURL=delete_memory.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/statements/delete_report.js":
 /*!*********************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/statements/delete_report.js ***!
@@ -81382,16 +81976,16 @@ class DoTranspiler {
             const source = new expressions_1.SourceTranspiler(true).transpile(found, traversal).getCode();
             const idSource = unique_identifier_1.UniqueIdentifier.get();
             const id = unique_identifier_1.UniqueIdentifier.get();
-            return new chunk_1.Chunk(`const ${this.syIndexBackup} = abap.builtin.sy.get().index.get();
-const ${idSource} = ${source};
-for (let ${id} = 0; ${id} < ${idSource}; ${id}++) {
+            return new chunk_1.Chunk(`const ${this.syIndexBackup} = abap.builtin.sy.get().index.get();
+const ${idSource} = ${source};
+for (let ${id} = 0; ${id} < ${idSource}; ${id}++) {
 abap.builtin.sy.get().index.set(${id} + 1);`);
         }
         else {
             const unique = unique_identifier_1.UniqueIdentifier.get();
-            return new chunk_1.Chunk(`const ${this.syIndexBackup} = abap.builtin.sy.get().index.get();
-let ${unique} = 1;
-while (true) {
+            return new chunk_1.Chunk(`const ${this.syIndexBackup} = abap.builtin.sy.get().index.get();
+let ${unique} = 1;
+while (true) {
 abap.builtin.sy.get().index.set(${unique}++);`);
         }
     }
@@ -81551,7 +82145,7 @@ class EndDoTranspiler {
         this.syIndexBackup = syIndexBackup;
     }
     transpile(node, traversal) {
-        return new chunk_1.Chunk().append(`}
+        return new chunk_1.Chunk().append(`}
 abap.builtin.sy.get().index.set(${this.syIndexBackup});\n`, node, traversal);
     }
 }
@@ -81750,7 +82344,7 @@ class EndWhileTranspiler {
         this.syIndexBackup = syIndexBackup;
     }
     transpile(node, traversal) {
-        return new chunk_1.Chunk().append(`}
+        return new chunk_1.Chunk().append(`}
 abap.builtin.sy.get().index.set(${this.syIndexBackup});\n`, node, traversal);
     }
 }
@@ -82485,6 +83079,7 @@ __exportStar(__webpack_require__(/*! ./delete_database */ "./node_modules/@abapl
 __exportStar(__webpack_require__(/*! ./delete_dataset */ "./node_modules/@abaplint/transpiler/build/src/statements/delete_dataset.js"), exports);
 __exportStar(__webpack_require__(/*! ./delete_internal */ "./node_modules/@abaplint/transpiler/build/src/statements/delete_internal.js"), exports);
 __exportStar(__webpack_require__(/*! ./delete_report */ "./node_modules/@abaplint/transpiler/build/src/statements/delete_report.js"), exports);
+__exportStar(__webpack_require__(/*! ./delete_memory */ "./node_modules/@abaplint/transpiler/build/src/statements/delete_memory.js"), exports);
 __exportStar(__webpack_require__(/*! ./delete_textpool */ "./node_modules/@abaplint/transpiler/build/src/statements/delete_textpool.js"), exports);
 __exportStar(__webpack_require__(/*! ./describe */ "./node_modules/@abaplint/transpiler/build/src/statements/describe.js"), exports);
 __exportStar(__webpack_require__(/*! ./do */ "./node_modules/@abaplint/transpiler/build/src/statements/do.js"), exports);
@@ -83154,9 +83749,9 @@ class MethodImplementationTranspiler {
                         after += `let ${varPrefixed} = ${unique}?.${varName};\n`;
                     }
                     if (type instanceof abaplint.BasicTypes.NumericGenericType) {
-                        after += `if (${varPrefixed}.constructor.name === "Character") {
-  ${varPrefixed} = ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};
-  ${varPrefixed}.set(${unique}?.${varName});
+                        after += `if (${varPrefixed}.constructor.name === "Character") {
+  ${varPrefixed} = ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};
+  ${varPrefixed}.set(${unique}?.${varName});
 }\n`;
                     }
                 }
@@ -83719,8 +84314,8 @@ class RaiseTranspiler {
         const extra = `{"INTERNAL_FILENAME": "${traversal.getFilename()}","INTERNAL_LINE": ${node.getStart().getRow()}}`;
         const lookup = traversal.lookupClassOrInterface(classNameToken?.getStr(), classNameToken);
         const id = unique_identifier_1.UniqueIdentifier.get();
-        return new chunk_1.Chunk().append(`const ${id} = await (new ${lookup}()).constructor_(${p});
-${id}.EXTRA_CX = ${extra};
+        return new chunk_1.Chunk().append(`const ${id} = await (new ${lookup}()).constructor_(${p});
+${id}.EXTRA_CX = ${extra};
 throw ${id};`, node, traversal);
     }
 }
@@ -84372,19 +84967,19 @@ class SelectTranspiler {
             if (keys.length > 0) {
                 by = JSON.stringify(keys);
             }
-            const code = `if (${faeTranspiled}.array().length === 0) {
-  throw new Error("FAE, todo, empty table");
-} else {
-  const ${unique2} = ${faeTranspiled}.array();
-  abap.statements.clear(${target});
-  for await (const ${unique} of ${unique2}) {
-    await abap.statements.select(${target}, {select: "${select.trim()}"${extra}}, {appending: true});
-  }
-  if (!(${target} instanceof abap.types.HashedTable) && ${target}.getOptions()?.primaryKey?.type !== "SORTED") {
-    abap.statements.sort(${target}, {by: ${by}.map(k => { return {component: k}; })});
-    await abap.statements.deleteInternal(${target}, {adjacent: true, by: ${by}});
-  }
-  abap.builtin.sy.get().dbcnt.set(${target}.getArrayLength());
+            const code = `if (${faeTranspiled}.array().length === 0) {
+  throw new Error("FAE, todo, empty table");
+} else {
+  const ${unique2} = ${faeTranspiled}.array();
+  abap.statements.clear(${target});
+  for await (const ${unique} of ${unique2}) {
+    await abap.statements.select(${target}, {select: "${select.trim()}"${extra}}, {appending: true});
+  }
+  if (!(${target} instanceof abap.types.HashedTable) && ${target}.getOptions()?.primaryKey?.type !== "SORTED") {
+    abap.statements.sort(${target}, {by: ${by}.map(k => { return {component: k}; })});
+    await abap.statements.deleteInternal(${target}, {adjacent: true, by: ${by}});
+  }
+  abap.builtin.sy.get().dbcnt.set(${target}.getArrayLength());
 }`;
             return new chunk_1.Chunk().append(code, node, traversal);
         }
@@ -85323,11 +85918,11 @@ class WhileTranspiler {
         const cond = new expressions_1.CondTranspiler().transpile(node.findFirstExpression(abaplint.Expressions.Cond), traversal);
         const unique = unique_identifier_1.UniqueIdentifier.get();
         return new chunk_1.Chunk()
-            .append(`const ${this.syIndexBackup} = abap.builtin.sy.get().index.get();
-let ${unique} = 1;
+            .append(`const ${this.syIndexBackup} = abap.builtin.sy.get().index.get();
+let ${unique} = 1;
 while (`, node, traversal)
             .appendChunk(cond)
-            .appendString(`) {
+            .appendString(`) {
 abap.builtin.sy.get().index.set(${unique}++);`);
     }
 }
@@ -85434,7 +86029,6 @@ class AtTranspiler {
             suffix = "";
         }
         if (concat?.startsWith("AT NEW ")) {
-            // eslint-disable-next-line max-len
             ret.appendString(`if (${previous} === undefined || abap.compare.eq(${previous}${suffix}, ${loopTarget}${suffix}) === false) {\n`);
             const body = node.findDirectStructure(abaplint.Structures.Body);
             if (body) {
@@ -85450,7 +86044,6 @@ class AtTranspiler {
             ret.appendString(`${next} = ${loop.getTarget()};\n`);
             ret.appendString(`break;\n`);
             ret.appendString(`}\n`);
-            // eslint-disable-next-line max-len
             ret.appendString(`if (${next} === undefined || abap.compare.eq(${next}${suffix}, ${loopTarget}${suffix}) === false) {\n`);
             const body = node.findDirectStructure(abaplint.Structures.Body);
             if (body) {
@@ -85676,17 +86269,17 @@ class ClassDefinitionTranspiler {
         }
         else {
             // its an abstract class with only abstract methods
-            return new chunk_1.Chunk(`
-class ${className?.toLowerCase()} {
-  static INTERNAL_TYPE = 'CLAS';
-  static IMPLEMENTED_INTERFACES = [];
-  static INTERNAL_NAME = 'ABSTRACT_CLASS_INTERNAL_NAME';
-  static ATTRIBUTES = {};
-  async constructor_() {
-    this.me = new abap.types.ABAPObject();
-    this.me.set(this);
-    return this;
-  }
+            return new chunk_1.Chunk(`
+class ${className?.toLowerCase()} {
+  static INTERNAL_TYPE = 'CLAS';
+  static IMPLEMENTED_INTERFACES = [];
+  static INTERNAL_NAME = 'ABSTRACT_CLASS_INTERNAL_NAME';
+  static ATTRIBUTES = {};
+  async constructor_() {
+    this.me = new abap.types.ABAPObject();
+    this.me.set(this);
+    return this;
+  }
 }`);
         }
     }
@@ -86066,8 +86659,8 @@ class FunctionModuleTranspiler {
             const type = scope?.findVariable(name)?.getType();
             if (type !== undefined && p.optional === true) {
                 // todo, set DEFAULT value
-                ret += `if (${name} === undefined) {
-  ${name} = ${new transpile_types_1.TranspileTypes().toType(type)};
+                ret += `if (${name} === undefined) {
+  ${name} = ${new transpile_types_1.TranspileTypes().toType(type)};
 }\n`;
             }
         }
@@ -86355,7 +86948,6 @@ exports.ModuleTranspiler = ModuleTranspiler;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SelectTranspiler = void 0;
-/* eslint-disable max-len */
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const select_1 = __webpack_require__(/*! ../statements/select */ "./node_modules/@abaplint/transpiler/build/src/statements/select.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
@@ -86380,10 +86972,10 @@ class SelectTranspiler {
         const packageSize = node.findFirstExpression(abaplint.Expressions.SelectLoop)?.findExpressionAfterToken("SIZE");
         if (packageSize) {
             const getSize = new expressions_1.SQLSourceTranspiler().transpile(packageSize, traversal).getCode() + ".get()";
-            ret.appendString(`if (${targetName}.array().length > ${getSize}) {
-  throw new Error("PACKAGE SIZED loop larger than package size not supported");
-};
-abap.statements.append({source: ${targetName}, target: ${intoName}, lines: true});
+            ret.appendString(`if (${targetName}.array().length > ${getSize}) {
+  throw new Error("PACKAGE SIZED loop larger than package size not supported");
+};
+abap.statements.append({source: ${targetName}, target: ${intoName}, lines: true});
 {\n`);
         }
         else if (concat.includes(" INTO CORRESPONDING FIELDS OF ")) {
@@ -87533,16 +88125,16 @@ class UnitTest {
     initializationScript(reg, dbSetup, extraSetup, useImport) {
         let ret = "";
         if (useImport === true) {
-            ret = `/* eslint-disable import/newline-after-import */
+            ret = `/* eslint-disable import/newline-after-import */
 import "./_top.mjs";\n`;
         }
         else {
-            ret = `/* eslint-disable import/newline-after-import */
-import runtime from "@abaplint/runtime";
+            ret = `/* eslint-disable import/newline-after-import */
+import runtime from "@abaplint/runtime";
 globalThis.abap = new runtime.ABAP();\n`;
         }
-        ret += `${this.buildImports(reg, useImport)}
-
+        ret += `${this.buildImports(reg, useImport)}
+
 export async function initializeABAP() {\n`;
         ret += `  const sqlite = [];\n`;
         for (const i of dbSetup.schemas.sqlite) {
@@ -87579,19 +88171,19 @@ export async function initializeABAP() {\n`;
         return filename.replace(/\//g, "%23");
     }
     unitTestScriptOpen(reg, _skip) {
-        let ret = `/* eslint-disable curly */
-import fs from "fs";
-import path from "path";
-import {fileURLToPath} from "url";
-import {initializeABAP} from "./init.mjs";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-async function run() {
-  await initializeABAP();
-  let lt_input = new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character(30), testclass_name: new abap.types.Character(30), method_name: new abap.types.Character(30)}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]});
-  let ls_input = new abap.types.Structure({class_name: new abap.types.Character(30), testclass_name: new abap.types.Character(30), method_name: new abap.types.Character(30)});
-  let ls_result = new abap.types.Structure({list: new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character(30), testclass_name: new abap.types.Character(30), method_name: new abap.types.Character(30), expected: new abap.types.String(), actual: new abap.types.String(), status: new abap.types.String(), runtime: new abap.types.Integer(), message: new abap.types.String(), js_location: new abap.types.String(), console: new abap.types.String()}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]}), json: new abap.types.String()});
+        let ret = `/* eslint-disable curly */
+import fs from "fs";
+import path from "path";
+import {fileURLToPath} from "url";
+import {initializeABAP} from "./init.mjs";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+async function run() {
+  await initializeABAP();
+  let lt_input = new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character(30), testclass_name: new abap.types.Character(30), method_name: new abap.types.Character(30)}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]});
+  let ls_input = new abap.types.Structure({class_name: new abap.types.Character(30), testclass_name: new abap.types.Character(30), method_name: new abap.types.Character(30)});
+  let ls_result = new abap.types.Structure({list: new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character(30), testclass_name: new abap.types.Character(30), method_name: new abap.types.Character(30), expected: new abap.types.String(), actual: new abap.types.String(), status: new abap.types.String(), runtime: new abap.types.Integer(), message: new abap.types.String(), js_location: new abap.types.String(), console: new abap.types.String()}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]}), json: new abap.types.String()});
 `;
         for (const obj of reg.getObjects()) {
             if (reg.isDependency(obj) || !(obj instanceof abaplint.Objects.Class)) {
@@ -87611,25 +88203,25 @@ async function run() {
                         if (m.isForTesting === false) {
                             continue;
                         }
-                        ret += `  ls_input.get().class_name.set("${obj.getName()}");
-  ls_input.get().testclass_name.set("${def.name.toUpperCase()}");
-  ls_input.get().method_name.set("${m.name.toUpperCase()}");
+                        ret += `  ls_input.get().class_name.set("${obj.getName()}");
+  ls_input.get().testclass_name.set("${def.name.toUpperCase()}");
+  ls_input.get().method_name.set("${m.name.toUpperCase()}");
   abap.statements.append({source: ls_input, target: lt_input});\n`;
                     }
                 }
             }
         }
-        ret += `
-
-  ls_result.set(await abap.Classes["KERNEL_UNIT_RUNNER"].run({it_input: lt_input}));
-  fs.writeFileSync(__dirname + path.sep + "output.json", ls_result.get().json.get());
-}
-
-run().then(() => {
-  process.exit(0);
-}).catch((err) => {
-  console.log(err);
-  process.exit(1);
+        ret += `
+
+  ls_result.set(await abap.Classes["KERNEL_UNIT_RUNNER"].run({it_input: lt_input}));
+  fs.writeFileSync(__dirname + path.sep + "output.json", ls_result.get().json.get());
+}
+
+run().then(() => {
+  process.exit(0);
+}).catch((err) => {
+  console.log(err);
+  process.exit(1);
 });`;
         return ret;
     }
@@ -87717,29 +88309,29 @@ run().then(() => {
         return tests;
     }
     unitTestScript(reg, skip) {
-        let ret = `/* eslint-disable curly */
-import fs from "fs";
-import path from "path";
-import {fileURLToPath} from "url";
-import {initializeABAP} from "./init.mjs";
-import runtime from "@abaplint/runtime";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-async function run() {
-  await initializeABAP();
-  const unit = new runtime.UnitTestResult();
-  let clas;
-  let locl;
-  let meth;
+        let ret = `/* eslint-disable curly */
+import fs from "fs";
+import path from "path";
+import {fileURLToPath} from "url";
+import {initializeABAP} from "./init.mjs";
+import runtime from "@abaplint/runtime";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+async function run() {
+  await initializeABAP();
+  const unit = new runtime.UnitTestResult();
+  let clas;
+  let locl;
+  let meth;
   try {\n`;
         for (const st of this.getSortedTests(reg)) {
             ret += `// --------------------------------------------\n`;
             ret += `    clas = unit.addObject("${st.obj.getName()}");\n`;
             const lc = st.localClass.toLowerCase();
-            ret += `    {
-        const {${lc}} = await import("./${this.escapeNamespace(st.obj.getName().toLowerCase())}.${st.obj.getType().toLowerCase()}.testclasses.mjs");
-        locl = clas.addTestClass("${lc}");
+            ret += `    {
+        const {${lc}} = await import("./${this.escapeNamespace(st.obj.getName().toLowerCase())}.${st.obj.getType().toLowerCase()}.testclasses.mjs");
+        locl = clas.addTestClass("${lc}");
         if (${lc}.class_setup) await ${lc}.class_setup();\n`;
             for (const m of st.methods) {
                 const skipThis = (skip || []).some(a => a.object === st.obj.getName() && a.class === lc && a.method === m);
@@ -87814,22 +88406,22 @@ async function run() {
               }
             }
             */
-        ret += `// -------------------END-------------------
-    fs.writeFileSync(__dirname + path.sep + "_output.xml", unit.xUnitXML());
-  } catch (e) {
-    if (meth) {
-      meth.fail();
-    }
-    fs.writeFileSync(__dirname + path.sep + "_output.xml", unit.xUnitXML());
-    throw e;
-  }
-}
-
-run().then(() => {
-  process.exit(0);
-}).catch((err) => {
-  console.log(err);
-  process.exit(1);
+        ret += `// -------------------END-------------------
+    fs.writeFileSync(__dirname + path.sep + "_output.xml", unit.xUnitXML());
+  } catch (e) {
+    if (meth) {
+      meth.fail();
+    }
+    fs.writeFileSync(__dirname + path.sep + "_output.xml", unit.xUnitXML());
+    throw e;
+  }
+}
+
+run().then(() => {
+  process.exit(0);
+}).catch((err) => {
+  console.log(err);
+  process.exit(1);
 });`;
         return ret;
     }
@@ -101101,7 +101693,7 @@ var lib = JSON5;
 /******/ 	
 /************************************************************************/
 var __webpack_exports__ = {};
-// This entry need to be wrapped in an IIFE because it need to be in strict mode.
+// This entry needs to be wrapped in an IIFE because it needs to be in strict mode.
 (() => {
 "use strict";
 var exports = __webpack_exports__;
@@ -101238,7 +101830,7 @@ async function run() {
     fs.writeFileSync(outputFolder + path.sep + "init.mjs", output.initializationScript);
     // new static referenced imports,
     fs.writeFileSync(outputFolder + path.sep + "_init.mjs", output.initializationScript2);
-    fs.writeFileSync(outputFolder + path.sep + "_top.mjs", `import runtime from "@abaplint/runtime";
+    fs.writeFileSync(outputFolder + path.sep + "_top.mjs", `import runtime from "@abaplint/runtime";
 globalThis.abap = new runtime.ABAP();`);
 }
 run().then(() => {