@abaplint/cli 2.113.53 → 2.113.55

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;
@@ -7292,7 +7293,9 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 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;
+        // 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);
     }
 }
 exports.RaiseWith = RaiseWith;
@@ -7865,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));
+        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 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, ")");
@@ -7994,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"));
     }
@@ -9228,8 +9232,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;
@@ -11965,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);
     }
@@ -13220,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;
@@ -15359,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);
@@ -17024,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);
@@ -53129,7 +53134,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.53";
+        return "2.113.55";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.53",
+    "version": "2.113.55",
     "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.53",
+        "@abaplint/core": "^2.113.55",
         "@types/chai": "^4.3.20",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",