@abaplint/cli 2.118.10 → 2.118.11

package/build/cli.js

@@ -1736,6 +1736,7 @@ class AbstractToken {
     constructor(start, str) {
         this.start = start;
         this.str = str;
+        this.strUpper = str.toUpperCase();
     }
     // special function, for debugging purposes, see https://github.com/abaplint/abaplint/pull/3137
     [Symbol.for("debug.description")]() {
@@ -1744,6 +1745,9 @@ class AbstractToken {
     getStr() {
         return this.str;
     }
+    getUpperStr() {
+        return this.strUpper;
+    }
     getRow() {
         return this.start.getRow();
     }
@@ -2849,7 +2853,7 @@ class Word {
         const result = [];
         for (const input of r) {
             if (input.remainingLength() !== 0
-                && input.peek().getStr().toUpperCase() === this.s) {
+                && input.peek().getUpperStr() === this.s) {
                 //        console.log("match, " + this.s + result.length);
                 result.push(input.shift(new nodes_1.TokenNode(input.peek())));
             }
@@ -2868,7 +2872,7 @@ class Word {
 }
 class Token {
     constructor(s) {
-        this.name = s.toUpperCase();
+        this.name = s;
     }
     listKeywords() {
         return [];
@@ -2880,7 +2884,7 @@ class Token {
         const result = [];
         for (const input of r) {
             if (input.remainingLength() !== 0
-                && input.peek().constructor.name.toUpperCase() === this.name) {
+                && input.peek().constructor.name === this.name) {
                 result.push(input.shift(new nodes_1.TokenNode(input.peek())));
             }
         }
@@ -3618,7 +3622,7 @@ function tok(t) {
 }
 const expressionSingletons = {};
 const stringSingletons = {};
-function map(s) {
+function mapInput(s) {
     const type = typeof s;
     if (type === "string") {
         if (stringSingletons[s] === undefined) {
@@ -3640,48 +3644,48 @@ function map(s) {
     }
 }
 function seq(first, second, ...rest) {
-    const list = [map(first), map(second)];
-    list.push(...rest.map(map));
+    const list = [mapInput(first), mapInput(second)];
+    list.push(...rest.map(mapInput));
     return new Sequence(list);
 }
 function alt(first, second, ...rest) {
-    const list = [map(first), map(second)];
-    list.push(...rest.map(map));
+    const list = [mapInput(first), mapInput(second)];
+    list.push(...rest.map(mapInput));
     return new Alternative(list);
 }
 function altPrio(first, second, ...rest) {
-    const list = [map(first), map(second)];
-    list.push(...rest.map(map));
+    const list = [mapInput(first), mapInput(second)];
+    list.push(...rest.map(mapInput));
     return new AlternativePriority(list);
 }
 function opt(first) {
-    return new Optional(map(first));
+    return new Optional(mapInput(first));
 }
 function optPrio(first) {
-    return new OptionalPriority(map(first));
+    return new OptionalPriority(mapInput(first));
 }
 function per(first, second, ...rest) {
-    const list = [map(first), map(second)];
-    list.push(...rest.map(map));
+    const list = [mapInput(first), mapInput(second)];
+    list.push(...rest.map(mapInput));
     return new Permutation(list);
 }
 function star(first) {
-    return new Star(map(first));
+    return new Star(mapInput(first));
 }
 function starPrio(first) {
-    return new StarPriority(map(first));
+    return new StarPriority(mapInput(first));
 }
 function plus(first) {
-    return new Plus(map(first));
+    return new Plus(mapInput(first));
 }
 function plusPrio(first) {
-    return new PlusPriority(map(first));
+    return new PlusPriority(mapInput(first));
 }
 function ver(version, first, or) {
-    return new Vers(version, map(first), or);
+    return new Vers(version, mapInput(first), or);
 }
 function verNot(version, first) {
-    return new VersNot(version, map(first));
+    return new VersNot(version, mapInput(first));
 }
 function failCombinator() {
     return new FailCombinator();
@@ -36117,6 +36121,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Data = void 0;
 const data_1 = __webpack_require__(/*! ../statements/data */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/data.js");
 const nodes_1 = __webpack_require__(/*! ../../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
+const identifier_1 = __webpack_require__(/*! ../../1_lexer/tokens/identifier */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/identifier.js");
 const type_1 = __webpack_require__(/*! ../statements/type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/type.js");
 const _typed_identifier_1 = __webpack_require__(/*! ../../types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
 const types_1 = __webpack_require__(/*! ./types */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/structures/types.js");
@@ -36139,7 +36144,11 @@ class Data {
             this.runCommonPartSyntax(node, input);
             return undefined;
         }
-        const name = node.findFirstExpression(Expressions.DefinitionName).getFirstToken();
+        const nameExpr = node.findFirstExpression(Expressions.DefinitionName);
+        let name = nameExpr.getFirstToken();
+        if (nameExpr.countTokens() > 1) { // workaround for names with dashes
+            name = new identifier_1.Identifier(name.getStart(), nameExpr.concatTokens());
+        }
         let table = false;
         const values = {};
         const components = [];
@@ -56128,7 +56137,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.118.10";
+        return "2.118.11";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

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