@abaplint/transpiler-cli 2.8.27 → 2.8.29

package/build/bundle.js

@@ -1652,7 +1652,24 @@ exports.WStaticArrowW = WStaticArrowW;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.failStar = exports.failCombinator = exports.verNot = exports.ver = exports.plusPrio = exports.plus = exports.starPrio = exports.star = exports.per = exports.optPrio = exports.opt = exports.altPrio = exports.alt = exports.seq = exports.tok = exports.regex = exports.str = exports.Combi = exports.Expression = void 0;
+exports.Combi = exports.Expression = void 0;
+exports.str = str;
+exports.regex = regex;
+exports.tok = tok;
+exports.seq = seq;
+exports.alt = alt;
+exports.altPrio = altPrio;
+exports.opt = opt;
+exports.optPrio = optPrio;
+exports.per = per;
+exports.star = star;
+exports.starPrio = starPrio;
+exports.plus = plus;
+exports.plusPrio = plusPrio;
+exports.ver = ver;
+exports.verNot = verNot;
+exports.failCombinator = failCombinator;
+exports.failStar = failStar;
 const Tokens = __webpack_require__(/*! ../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 const nodes_1 = __webpack_require__(/*! ../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
 const version_1 = __webpack_require__(/*! ../../version */ "./node_modules/@abaplint/core/build/src/version.js");
@@ -2465,15 +2482,12 @@ function str(s) {
         return new Word(s);
     }
 }
-exports.str = str;
 function regex(r) {
     return new Regex(r);
 }
-exports.regex = regex;
 function tok(t) {
     return new Token(t.name);
 }
-exports.tok = tok;
 const expressionSingletons = {};
 const stringSingletons = {};
 function map(s) {
@@ -2502,65 +2516,51 @@ function seq(first, second, ...rest) {
     list.push(...rest.map(map));
     return new Sequence(list);
 }
-exports.seq = seq;
 function alt(first, second, ...rest) {
     const list = [map(first), map(second)];
     list.push(...rest.map(map));
     return new Alternative(list);
 }
-exports.alt = alt;
 function altPrio(first, second, ...rest) {
     const list = [map(first), map(second)];
     list.push(...rest.map(map));
     return new AlternativePriority(list);
 }
-exports.altPrio = altPrio;
 function opt(first) {
     return new Optional(map(first));
 }
-exports.opt = opt;
 function optPrio(first) {
     return new OptionalPriority(map(first));
 }
-exports.optPrio = optPrio;
 function per(first, second, ...rest) {
     const list = [map(first), map(second)];
     list.push(...rest.map(map));
     return new Permutation(list);
 }
-exports.per = per;
 function star(first) {
     return new Star(map(first));
 }
-exports.star = star;
 function starPrio(first) {
     return new StarPriority(map(first));
 }
-exports.starPrio = starPrio;
 function plus(first) {
     return new Plus(map(first));
 }
-exports.plus = plus;
 function plusPrio(first) {
     return new PlusPriority(map(first));
 }
-exports.plusPrio = plusPrio;
 function ver(version, first, or) {
     return new Vers(version, map(first), or);
 }
-exports.ver = ver;
 function verNot(version, first) {
     return new VersNot(version, map(first));
 }
-exports.verNot = verNot;
 function failCombinator() {
     return new FailCombinator();
 }
-exports.failCombinator = failCombinator;
 function failStar() {
     return new FailStar();
 }
-exports.failStar = failStar;
 //# sourceMappingURL=combi.js.map
 
 /***/ }),
@@ -2649,6 +2649,7 @@ class ExpandMacros {
             else if (type instanceof Statements.Include) {
                 const includeName = (_b = statement.findDirectExpression(Expressions.IncludeName)) === null || _b === void 0 ? void 0 : _b.concatTokens();
                 // todo, this does not take function module includes into account
+                // todo, workaround for cyclic includes?
                 const prog = (_c = this.reg) === null || _c === void 0 ? void 0 : _c.getObject("PROG", includeName);
                 if (prog) {
                     prog.parse(this.version, this.globalMacros, this.reg);
@@ -6861,9 +6862,10 @@ 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 when = (0, combi_1.seq)("WHEN", (0, combi_1.alt)(constant_1.Constant, sql_cond_1.SQLCond), "THEN", (0, combi_1.altPrio)(_1.SQLAggregation, _1.SQLFunction, sql_source_1.SQLSource), (0, combi_1.starPrio)(sub));
-        const els = (0, combi_1.seq)("ELSE", sql_source_1.SQLSource);
-        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.plus)(when), (0, combi_1.optPrio)(els), "END"));
+        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 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"));
     }
 }
 exports.SQLCase = SQLCase;
@@ -6933,6 +6935,7 @@ exports.SQLCompare = 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 SQLCompare extends combi_1.Expression {
     getRunnable() {
         const subSelect = (0, combi_1.seq)("(", _1.Select, ")");
@@ -6942,7 +6945,9 @@ class SQLCompare extends combi_1.Expression {
         const source = new _1.SQLSource();
         const sub = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("ALL", "ANY", "SOME")), subSelect);
         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 rett = (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLFunction, (0, combi_1.seq)(_1.SQLFieldName, (0, combi_1.optPrio)(arith))), (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 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 exists = (0, combi_1.seq)("EXISTS", subSelect);
         return (0, combi_1.altPrio)(exists, _1.Dynamic, rett);
     }
@@ -7257,21 +7262,22 @@ const sql_aggregation_1 = __webpack_require__(/*! ./sql_aggregation */ "./node_m
 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.alt)(simple_source3_1.SimpleSource3, paren)));
-        const param = (0, combi_1.alt)(sql_field_name_1.SQLFieldName, sql_alias_field_1.SQLAliasField, SQLFunction, constant_1.Constant, sql_aggregation_1.SQLAggregation, at);
+        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 abs = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("abs", (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)("cast", (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)("ceil", (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)("coalesce", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const concat = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("concat", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const div = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("div", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const coalesce = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("coalesce", (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)("concat", (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)("div", (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)("floor", (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)("length", (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)("lower", (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)("mod", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const replace = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("replace", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const round = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("round", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const mod = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("mod", (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)("replace", (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)("round", (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)("upper", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const uuid = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("uuid", (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);
@@ -8214,7 +8220,7 @@ class TypeTable extends combi_1.Expression {
         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", _1.SimpleFieldChain, (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));
         // 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)))));
@@ -16915,7 +16921,13 @@ StructureParser.singletons = {};
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.sub = exports.sta = exports.star = exports.opt = exports.beginEnd = exports.alt = exports.seq = void 0;
+exports.seq = seq;
+exports.alt = alt;
+exports.beginEnd = beginEnd;
+exports.opt = opt;
+exports.star = star;
+exports.sta = sta;
+exports.sub = sub;
 const nodes_1 = __webpack_require__(/*! ../../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
 const _statement_1 = __webpack_require__(/*! ../../2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 class Sequence {
@@ -17223,27 +17235,21 @@ class SubStatement {
 function seq(first, ...rest) {
     return new Sequence([first].concat(rest));
 }
-exports.seq = seq;
 function alt(first, ...rest) {
     return new Alternative([first].concat(rest));
 }
-exports.alt = alt;
 function beginEnd(begin, body, end) {
     return new Sequence([begin, body, end]);
 }
-exports.beginEnd = beginEnd;
 function opt(o) {
     return new Optional(o);
 }
-exports.opt = opt;
 function star(s) {
     return new Star(s);
 }
-exports.star = star;
 function sta(s) {
     return new SubStatement(s);
 }
-exports.sta = sta;
 const singletons = {};
 function sub(s) {
     if (singletons[s.name] === undefined) {
@@ -17251,7 +17257,6 @@ function sub(s) {
     }
     return singletons[s.name];
 }
-exports.sub = sub;
 //# sourceMappingURL=_combi.js.map
 
 /***/ }),
@@ -17502,10 +17507,9 @@ const _combi_1 = __webpack_require__(/*! ./_combi */ "./node_modules/@abaplint/c
 const private_section_1 = __webpack_require__(/*! ./private_section */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/private_section.js");
 const protected_section_1 = __webpack_require__(/*! ./protected_section */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/protected_section.js");
 const public_section_1 = __webpack_require__(/*! ./public_section */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/public_section.js");
-const statements_1 = __webpack_require__(/*! ../../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 class ClassDefinition {
     getMatcher() {
-        const body = (0, _combi_1.seq)((0, _combi_1.opt)((0, _combi_1.sta)(statements_1.SetExtendedCheck)), (0, _combi_1.star)((0, _combi_1.sta)(statements_1.TypePools)), (0, _combi_1.opt)((0, _combi_1.sub)(public_section_1.PublicSection)), (0, _combi_1.opt)((0, _combi_1.sub)(protected_section_1.ProtectedSection)), (0, _combi_1.opt)((0, _combi_1.sub)(private_section_1.PrivateSection)), (0, _combi_1.opt)((0, _combi_1.sta)(statements_1.SetExtendedCheck)));
+        const body = (0, _combi_1.seq)((0, _combi_1.opt)((0, _combi_1.sta)(Statements.SetExtendedCheck)), (0, _combi_1.star)((0, _combi_1.sta)(Statements.TypePools)), (0, _combi_1.opt)((0, _combi_1.sub)(public_section_1.PublicSection)), (0, _combi_1.star)((0, _combi_1.sta)(Statements.Include)), (0, _combi_1.opt)((0, _combi_1.sub)(protected_section_1.ProtectedSection)), (0, _combi_1.opt)((0, _combi_1.sub)(private_section_1.PrivateSection)), (0, _combi_1.opt)((0, _combi_1.sta)(Statements.SetExtendedCheck)));
         return (0, _combi_1.beginEnd)((0, _combi_1.sta)(Statements.ClassDefinition), body, (0, _combi_1.sta)(Statements.EndClass));
     }
 }
@@ -22227,7 +22231,7 @@ class BasicTypes {
             return new Types.TableType(structure, options, name);
         }
         else if (text.startsWith("LIKE RANGE OF ")) {
-            const sub = node.findFirstExpression(Expressions.SimpleFieldChain);
+            const sub = node.findFirstExpression(Expressions.FieldChain);
             found = this.resolveLikeName(sub);
             if (found === undefined) {
                 return new Types.UnknownType("LIKE RANGE OF, could not resolve type");
@@ -38784,7 +38788,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() {
-        return (0, combi_1.seq)("SELECT", (0, combi_1.opt)("DISTINCT"), "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.str)("{"), (0, combi_1.plus)(_1.CDSElement), (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSGroupBy), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), CDSSelect)));
+        const fields = (0, combi_1.opt)((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.CDSGroupBy), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), CDSSelect)));
     }
 }
 exports.CDSSelect = CDSSelect;
@@ -39941,7 +39948,9 @@ __exportStar(__webpack_require__(/*! ./ddl_type */ "./node_modules/@abaplint/cor
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.applyEditList = exports.applyEditSingle = exports.EditHelper = exports.EditDraft = void 0;
+exports.EditHelper = exports.EditDraft = void 0;
+exports.applyEditSingle = applyEditSingle;
+exports.applyEditList = applyEditList;
 const position_1 = __webpack_require__(/*! ./position */ "./node_modules/@abaplint/core/build/src/position.js");
 const memory_file_1 = __webpack_require__(/*! ./files/memory_file */ "./node_modules/@abaplint/core/build/src/files/memory_file.js");
 class EditDraft {
@@ -40159,7 +40168,6 @@ function applyEditSingle(reg, edit) {
         reg.updateFile(result);
     }
 }
-exports.applyEditSingle = applyEditSingle;
 /** returns list of filenames which were changed */
 function applyEditList(reg, edits) {
     const ret = [];
@@ -40189,7 +40197,6 @@ function applyEditList(reg, edits) {
     }
     return ret;
 }
-exports.applyEditList = applyEditList;
 //# sourceMappingURL=edit_helper.js.map
 
 /***/ }),
@@ -40286,8 +40293,8 @@ exports.MemoryFile = MemoryFile;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.Info = exports.Diagnostics = exports.Rename = exports.PrettyPrinter = exports.Position = exports.CurrentScope = exports.ABAPFile = exports.RulesRunner = exports.SpaghettiScope = exports.SyntaxLogic = exports.ABAPObject = exports.Tokens = exports.ExpressionsCDS = exports.CDSParser = exports.LanguageServerTypes = exports.DDLParser = exports.applyEditList = exports.applyEditSingle = exports.SpaghettiScopeNode = exports.AbstractFile = exports.Token = exports.ScopeType = exports.BasicTypes = exports.TypedIdentifier = exports.AbstractType = exports.VirtualPosition = exports.Comment = exports.Unknown = exports.Empty = exports.Identifier = exports.Nodes = exports.Types = exports.Expressions = exports.Statements = exports.Structures = exports.SkipLogic = exports.Objects = exports.ArtifactsRules = exports.ArtifactsObjects = exports.ArtifactsABAP = exports.BuiltIn = exports.MethodLengthStats = exports.LanguageServer = exports.Registry = exports.CyclomaticComplexityStats = exports.ReferenceType = exports.Version = exports.Config = exports.Issue = exports.MemoryFile = void 0;
-exports.LSPEdit = exports.RuleTag = exports.Severity = exports.Visibility = void 0;
+exports.PrettyPrinter = exports.Position = exports.CurrentScope = exports.ABAPFile = exports.RulesRunner = exports.SpaghettiScope = exports.SyntaxLogic = exports.ABAPObject = exports.Tokens = exports.ExpressionsCDS = exports.CDSParser = exports.LanguageServerTypes = exports.DDLParser = exports.NativeSQL = exports.MacroContent = exports.MacroCall = exports.applyEditList = exports.applyEditSingle = exports.SpaghettiScopeNode = exports.AbstractFile = exports.Token = exports.ScopeType = exports.BasicTypes = exports.TypedIdentifier = exports.AbstractType = exports.VirtualPosition = exports.Comment = exports.Unknown = exports.Empty = exports.Identifier = exports.Nodes = exports.Types = exports.Expressions = exports.Statements = exports.Structures = exports.SkipLogic = exports.Objects = exports.ArtifactsRules = exports.ArtifactsObjects = exports.ArtifactsABAP = exports.BuiltIn = exports.MethodLengthStats = exports.LanguageServer = exports.Registry = exports.CyclomaticComplexityStats = exports.ReferenceType = exports.Version = exports.Config = exports.Issue = exports.MemoryFile = void 0;
+exports.LSPEdit = exports.RuleTag = exports.Severity = exports.Visibility = exports.Info = exports.Diagnostics = exports.Rename = void 0;
 const issue_1 = __webpack_require__(/*! ./issue */ "./node_modules/@abaplint/core/build/src/issue.js");
 Object.defineProperty(exports, "Issue", ({ enumerable: true, get: function () { return issue_1.Issue; } }));
 const config_1 = __webpack_require__(/*! ./config */ "./node_modules/@abaplint/core/build/src/config.js");
@@ -40355,6 +40362,9 @@ const _statement_1 = __webpack_require__(/*! ./abap/2_statements/statements/_sta
 Object.defineProperty(exports, "Empty", ({ enumerable: true, get: function () { return _statement_1.Empty; } }));
 Object.defineProperty(exports, "Unknown", ({ enumerable: true, get: function () { return _statement_1.Unknown; } }));
 Object.defineProperty(exports, "Comment", ({ enumerable: true, get: function () { return _statement_1.Comment; } }));
+Object.defineProperty(exports, "MacroCall", ({ enumerable: true, get: function () { return _statement_1.MacroCall; } }));
+Object.defineProperty(exports, "MacroContent", ({ enumerable: true, get: function () { return _statement_1.MacroContent; } }));
+Object.defineProperty(exports, "NativeSQL", ({ enumerable: true, get: function () { return _statement_1.NativeSQL; } }));
 const edit_helper_1 = __webpack_require__(/*! ./edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
 Object.defineProperty(exports, "applyEditSingle", ({ enumerable: true, get: function () { return edit_helper_1.applyEditSingle; } }));
 Object.defineProperty(exports, "applyEditList", ({ enumerable: true, get: function () { return edit_helper_1.applyEditList; } }));
@@ -50715,7 +50725,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.109.3";
+        return "2.110.6";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -61457,7 +61467,6 @@ __exportStar(__webpack_require__(/*! ./cds_legacy_view */ "./node_modules/@abapl
 __exportStar(__webpack_require__(/*! ./cds_parser_error */ "./node_modules/@abaplint/core/build/src/rules/cds_parser_error.js"), exports);
 __exportStar(__webpack_require__(/*! ./chain_mainly_declarations */ "./node_modules/@abaplint/core/build/src/rules/chain_mainly_declarations.js"), exports);
 __exportStar(__webpack_require__(/*! ./change_if_to_case */ "./node_modules/@abaplint/core/build/src/rules/change_if_to_case.js"), exports);
-__exportStar(__webpack_require__(/*! ./unused_macros */ "./node_modules/@abaplint/core/build/src/rules/unused_macros.js"), exports);
 __exportStar(__webpack_require__(/*! ./check_abstract */ "./node_modules/@abaplint/core/build/src/rules/check_abstract.js"), exports);
 __exportStar(__webpack_require__(/*! ./check_comments */ "./node_modules/@abaplint/core/build/src/rules/check_comments.js"), exports);
 __exportStar(__webpack_require__(/*! ./check_ddic */ "./node_modules/@abaplint/core/build/src/rules/check_ddic.js"), exports);
@@ -61519,6 +61528,7 @@ __exportStar(__webpack_require__(/*! ./line_only_punc */ "./node_modules/@abapli
 __exportStar(__webpack_require__(/*! ./local_class_naming */ "./node_modules/@abaplint/core/build/src/rules/local_class_naming.js"), exports);
 __exportStar(__webpack_require__(/*! ./local_testclass_consistency */ "./node_modules/@abaplint/core/build/src/rules/local_testclass_consistency.js"), exports);
 __exportStar(__webpack_require__(/*! ./local_variable_names */ "./node_modules/@abaplint/core/build/src/rules/local_variable_names.js"), exports);
+__exportStar(__webpack_require__(/*! ./macro_naming */ "./node_modules/@abaplint/core/build/src/rules/macro_naming.js"), exports);
 __exportStar(__webpack_require__(/*! ./main_file_contents */ "./node_modules/@abaplint/core/build/src/rules/main_file_contents.js"), exports);
 __exportStar(__webpack_require__(/*! ./many_parentheses */ "./node_modules/@abaplint/core/build/src/rules/many_parentheses.js"), exports);
 __exportStar(__webpack_require__(/*! ./max_one_method_parameter_per_line */ "./node_modules/@abaplint/core/build/src/rules/max_one_method_parameter_per_line.js"), exports);
@@ -61596,6 +61606,7 @@ __exportStar(__webpack_require__(/*! ./unnecessary_return */ "./node_modules/@ab
 __exportStar(__webpack_require__(/*! ./unreachable_code */ "./node_modules/@abaplint/core/build/src/rules/unreachable_code.js"), exports);
 __exportStar(__webpack_require__(/*! ./unsecure_fae */ "./node_modules/@abaplint/core/build/src/rules/unsecure_fae.js"), exports);
 __exportStar(__webpack_require__(/*! ./unused_ddic */ "./node_modules/@abaplint/core/build/src/rules/unused_ddic.js"), exports);
+__exportStar(__webpack_require__(/*! ./unused_macros */ "./node_modules/@abaplint/core/build/src/rules/unused_macros.js"), exports);
 __exportStar(__webpack_require__(/*! ./unused_methods */ "./node_modules/@abaplint/core/build/src/rules/unused_methods.js"), exports);
 __exportStar(__webpack_require__(/*! ./unused_types */ "./node_modules/@abaplint/core/build/src/rules/unused_types.js"), exports);
 __exportStar(__webpack_require__(/*! ./unused_variables */ "./node_modules/@abaplint/core/build/src/rules/unused_variables.js"), exports);
@@ -62932,6 +62943,83 @@ exports.LocalVariableNames = LocalVariableNames;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/rules/macro_naming.js":
+/*!*********************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/rules/macro_naming.js ***!
+  \*********************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.MacroNaming = exports.MacroNamingConf = void 0;
+const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
+const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@abaplint/core/build/src/rules/_abap_rule.js");
+const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
+const Expressions = __webpack_require__(/*! ../abap/2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.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 objects_1 = __webpack_require__(/*! ../objects */ "./node_modules/@abaplint/core/build/src/objects/index.js");
+class MacroNamingConf extends _basic_rule_config_1.BasicRuleConfig {
+    constructor() {
+        super(...arguments);
+        /** The pattern for macros, case insensitive */
+        this.pattern = "^_.+$";
+    }
+}
+exports.MacroNamingConf = MacroNamingConf;
+class MacroNaming extends _abap_rule_1.ABAPRule {
+    constructor() {
+        super(...arguments);
+        this.conf = new MacroNamingConf();
+    }
+    getMetadata() {
+        return {
+            key: "macro_naming",
+            title: "Macro naming conventions",
+            shortDescription: `Allows you to enforce a pattern for macro definitions`,
+            extendedInformation: `Use rule "avoid_use" to avoid macros alotogether.`,
+            tags: [_irule_1.RuleTag.Naming, _irule_1.RuleTag.SingleFile],
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    runParsed(file, obj) {
+        const issues = [];
+        const testRegex = new RegExp(this.conf.pattern, "i");
+        if (obj instanceof objects_1.TypePool) {
+            return [];
+        }
+        for (const stat of file.getStatements()) {
+            if (!(stat.get() instanceof Statements.Define)) {
+                continue;
+            }
+            const expr = stat.findDirectExpression(Expressions.MacroName);
+            if (expr === undefined) {
+                continue;
+            }
+            const token = expr.getFirstToken();
+            if (testRegex.exec(token.getStr())) {
+                continue;
+            }
+            else {
+                const message = "Bad macro name naming, expected \"" + this.conf.pattern + "\", got \"" + token.getStr() + "\"";
+                const issue = issue_1.Issue.atToken(file, token, message, this.getMetadata().key, this.conf.severity);
+                issues.push(issue);
+            }
+        }
+        return issues;
+    }
+}
+exports.MacroNaming = MacroNaming;
+//# sourceMappingURL=macro_naming.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/rules/main_file_contents.js":
 /*!***************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/rules/main_file_contents.js ***!
@@ -65847,7 +65935,7 @@ ENDIF.`,
             const children = statementNode.getChildren();
             const sourceString = children[1].concatTokens();
             const targetString = children[3].concatTokens();
-            let operator = children[2].concatTokens();
+            let operator = children[2].concatTokens().toUpperCase();
             if (operator === "TO") {
                 operator = " = ";
             }
@@ -68081,11 +68169,9 @@ class RFCErrorHandling extends _abap_rule_1.ABAPRule {
             tags: [_irule_1.RuleTag.SingleFile],
             shortDescription: `Checks that exceptions 'system_failure' and 'communication_failure' are handled in RFC calls`,
             extendedInformation: `https://help.sap.com/doc/abapdocu_750_index_htm/7.50/en-US/abenrfc_exception.htm`,
-            badExample: `
-CALL FUNCTION 'ZRFC'
+            badExample: `CALL FUNCTION 'ZRFC'
   DESTINATION lv_rfc.`,
-            goodExample: `
-CALL FUNCTION 'ZRFC'
+            goodExample: `CALL FUNCTION 'ZRFC'
   DESTINATION lv_rfc
   EXCEPTIONS
     system_failure        = 1 MESSAGE msg
@@ -70192,7 +70278,7 @@ const objects_1 = __webpack_require__(/*! ../objects */ "./node_modules/@abaplin
 class TypesNamingConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
-        /** The pattern for TYPES */
+        /** The pattern for TYPES, case insensitive */
         this.pattern = "^TY_.+$";
     }
 }
@@ -73557,7 +73643,8 @@ exports.NameValidator = NameValidator;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getPreviousVersion = exports.defaultVersion = exports.Version = void 0;
+exports.defaultVersion = exports.Version = void 0;
+exports.getPreviousVersion = getPreviousVersion;
 var Version;
 (function (Version) {
     Version["OpenABAP"] = "open-abap";
@@ -73592,7 +73679,6 @@ function getPreviousVersion(v) {
     }
     return all[found - 1];
 }
-exports.getPreviousVersion = getPreviousVersion;
 //# sourceMappingURL=version.js.map
 
 /***/ }),
@@ -73637,7 +73723,8 @@ exports.VirtualPosition = VirtualPosition;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.unescape = exports.xmlToArray = void 0;
+exports.xmlToArray = xmlToArray;
+exports.unescape = unescape;
 function xmlToArray(data) {
     if (data === undefined) {
         return [];
@@ -73649,7 +73736,6 @@ function xmlToArray(data) {
         return [data];
     }
 }
-exports.xmlToArray = xmlToArray;
 function unescape(str) {
     if (str === undefined) {
         return "";
@@ -73661,7 +73747,6 @@ function unescape(str) {
     str = str.replace(/'/g, "'");
     return str;
 }
-exports.unescape = unescape;
 //# sourceMappingURL=xml_utils.js.map
 
 /***/ }),
@@ -75879,7 +75964,7 @@ class MethodSourceTranspiler {
                     else if (call.endsWith(".") === false) {
                         call += ".";
                     }
-                    call += second.getFirstToken().getStr().replace(/\'/g, "").toLowerCase().replace("~", "$").trimEnd();
+                    call += second.getFirstToken().getStr().replace(/[\'\`]/g, "").toLowerCase().replace("~", "$").trimEnd();
                 }
                 else {
                     ret.appendString("MethodSourceTranspiler-Unexpected");
@@ -77955,7 +78040,12 @@ class Keywords {
             for (const f of o.getABAPFiles()) {
                 const tokens = [];
                 for (const s of f.getStatements()) {
-                    tokens.push(...this.traverse(s, f));
+                    if (s.get() instanceof abaplint.MacroCall) {
+                        tokens.push(...this.handleMacro(s));
+                    }
+                    else {
+                        tokens.push(...this.traverse(s, f));
+                    }
                 }
                 if (tokens.length === 0) {
                     continue;
@@ -77971,6 +78061,20 @@ class Keywords {
         }
         reg.parse();
     }
+    handleMacro(node) {
+        const tokens = [];
+        for (const token of node.getTokens()) {
+            for (const k of this.keywords) {
+                const lower = token.getStr().toLowerCase();
+                if (k === lower
+                    || "!" + k === lower
+                    || lower.endsWith("~" + k)) {
+                    tokens.push(token);
+                }
+            }
+        }
+        return tokens;
+    }
     traverse(node, file) {
         const ret = [];
         for (const c of node.getChildren()) {
@@ -81081,7 +81185,8 @@ exports.InitializationTranspiler = InitializationTranspiler;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.findConnection = exports.InsertDatabaseTranspiler = void 0;
+exports.InsertDatabaseTranspiler = void 0;
+exports.findConnection = findConnection;
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/transpiler/build/src/expressions/index.js");
@@ -81125,7 +81230,6 @@ function findConnection(connection) {
     }
     return con;
 }
-exports.findConnection = findConnection;
 //# sourceMappingURL=insert_database.js.map
 
 /***/ }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.8.27",
+  "version": "2.8.29",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -26,15 +26,15 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.8.27",
+    "@abaplint/transpiler": "^2.8.29",
     "@types/glob": "^8.1.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.7",
-    "@types/node": "^20.14.2",
-    "@abaplint/core": "^2.109.3",
+    "@types/node": "^20.14.10",
+    "@abaplint/core": "^2.110.6",
     "progress": "^2.0.3",
-    "webpack": "^5.91.0",
+    "webpack": "^5.92.1",
     "webpack-cli": "^5.1.4",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.3"
   }
 }