@abaplint/cli 2.113.54 → 2.113.56

package/build/cli.js

@@ -5741,7 +5741,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;
@@ -6411,11 +6411,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.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;
@@ -7291,10 +7292,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));
+        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)("WITH", _1.Source, (0, combi_1.opt)(_1.Source), (0, combi_1.opt)(_1.Source), (0, combi_1.opt)(_1.Source));
-        return (0, combi_1.alt)(wit, witComplex);
+        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;
@@ -7867,7 +7868,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, _1.SQLCase));
+        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, ")");
@@ -7996,8 +7997,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"));
     }
@@ -11967,13 +11969,14 @@ class Describe {
         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 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 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));
         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);
     }
@@ -13222,7 +13225,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;
@@ -14831,7 +14834,7 @@ 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 form = (0, combi_1.seq)((0, combi_1.alt)("INVERSE", "INPUT", "COLOR"), "=", expressions_1.Source);
         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));
@@ -14839,7 +14842,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 lineFormat = (0, combi_1.seq)("LINE FORMAT", (0, combi_1.per)("INPUT OFF", "INVERSE", "RESET", "INTENSIFIED", "COLOR COL_NORMAL"));
         const onOff = (0, combi_1.alt)("ON", "OFF");
         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);
@@ -15361,7 +15364,7 @@ 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);
@@ -17026,7 +17029,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);
@@ -26810,7 +26813,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);
         }
     }
@@ -51631,9 +51634,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;
@@ -51665,26 +51669,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);
@@ -53131,7 +53134,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.54";
+        return "2.113.56";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -59387,7 +59390,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);

package/package.json

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