@abaplint/cli 2.113.63 → 2.113.65

package/build/cli.js

@@ -5279,7 +5279,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;
     }
 }
@@ -6417,7 +6417,7 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 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.seq)((0, combi_1.regex)(/^>?[\w\/]+#?@?\/?!?&?>?\$?\??<?$/), (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)));
+        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;
@@ -9480,7 +9480,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;
     }
 }
@@ -10042,7 +10043,8 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 class Add {
     getMatcher() {
         const to = (0, combi_1.seq)("TO", expressions_1.Target);
-        const giving = (0, combi_1.seq)("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;
@@ -10572,7 +10574,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);
     }
 }
@@ -10882,7 +10884,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;
     }
 }
@@ -14976,7 +14978,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)), (0, combi_1.opt)((0, combi_1.seq)("PERCENTAGE", expressions_1.Source)));
+        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);
@@ -15097,7 +15099,7 @@ class NewPage {
         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, department, name, layout, destination, receiver, copies, 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);
     }
 }
@@ -15295,7 +15297,7 @@ class Parameter {
         const decimals = (0, combi_1.seq)("DECIMALS", expressions_1.Source);
         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.FieldLength), (0, combi_1.opt)(perm));
+        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);
     }
 }
@@ -34296,6 +34298,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));
@@ -35586,7 +35591,7 @@ class StatementFlow {
         return ((_a = f.findDirectStructure(Structures.Body)) === null || _a === void 0 ? void 0 : _a.getChildren()) || [];
     }
     // note: it must handle macros and chained statements
-    buildName(statement) {
+    static buildName(statement) {
         let token = undefined;
         const colon = statement.getColon();
         if (colon === undefined) {
@@ -35624,7 +35629,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) {
@@ -35673,7 +35678,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);
@@ -35684,7 +35689,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);
@@ -35694,7 +35699,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);
@@ -35711,7 +35716,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);
@@ -35724,7 +35729,7 @@ class StatementFlow {
             || 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);
         }
@@ -35732,7 +35737,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);
@@ -35740,13 +35745,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);
@@ -35757,14 +35762,14 @@ class StatementFlow {
         }
         else if (type instanceof Structures.CatchSystemExceptions) {
             // TODO: this is not completely correct
-            const catchName = this.buildName(n.getFirstStatement());
+            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)) {
@@ -35775,7 +35780,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);
@@ -35786,7 +35791,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)) {
@@ -35797,7 +35802,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);
@@ -53212,7 +53217,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.63";
+        return "2.113.65";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

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