@abaplint/cli 2.120.61 → 2.120.62

package/build/cli.js

@@ -53,9 +53,8 @@ const BUFS = new Set([
     CH_DOT, CH_COMMA, CH_COLON, 40 /* ( */, 41 /* ) */, 91 /* [ */,
     93 /* ] */, 43 /* + */, CH_AT
 ]);
-// characters that may follow the closing "'", "`" or "|" of a literal, anything else
-// is a syntax error, "There must be a space or equivalent character after ...",
-// note that "(" is allowed, ie. text elements like 'text'(001)
+// characters treated as separators after ping literals and string templates.
+// Single-quoted text literals always end at their closing quote.
 const AFTER_LITERAL = new Set([
     EOF, CH_SPACE, CH_TAB, CH_NL, CH_DOT, CH_COMMA, CH_COLON, CH_DQUOTE,
     40 /* ( */, 41 /* ) */, 91 /* [ */, 93 /* ] */
@@ -373,9 +372,7 @@ class Lexer {
                 && ahead !== CH_QUOTE
                 && this.buffer.countIsEven(CH_QUOTE)) {
                 // end of string
-                if (AFTER_LITERAL.has(ahead)) {
-                    this.add();
-                }
+                this.add();
                 if (ahead === CH_DQUOTE) {
                     this.m = ModeComment;
                 }
@@ -3094,7 +3091,8 @@ class ExpandMacros {
         for (const input of inputs) {
             const search = "&" + i;
             const reg = new RegExp(search, "g");
-            str = str.replace(reg, input);
+            // a function replacement: "$`" and "$'" in the argument are text, not patterns
+            str = str.replace(reg, () => input);
             i++;
         }
         const file = new memory_file_1.MemoryFile("expand_macros.abap.prog", str);
@@ -16838,7 +16836,7 @@ class ModifyEntities {
         const mapped = (0, combi_1.seq)("MAPPED", expressions_1.Target);
         const reported = (0, combi_1.seq)("REPORTED", expressions_1.Target);
         const end = (0, combi_1.optPrio)((0, combi_1.per)(failed, result, mapped, reported));
-        const entities = (0, combi_1.seq)((0, combi_1.optPrio)("AUGMENTING"), "ENTITIES OF", expressions_1.NamespaceSimpleName, (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.plusPrio)((0, combi_1.seq)("ENTITY", expressions_1.NamespaceSimpleName, (0, combi_1.plus)(operation))));
+        const entities = (0, combi_1.seq)((0, combi_1.optPrio)("AUGMENTING"), "ENTITIES OF", expressions_1.NamespaceSimpleName, (0, combi_1.optPrio)((0, combi_1.altPrio)("IN LOCAL MODE", (0, combi_1.seq)((0, combi_1.opt)("FORWARDING"), "PRIVILEGED"))), (0, combi_1.plusPrio)((0, combi_1.seq)("ENTITY", expressions_1.NamespaceSimpleName, (0, combi_1.plus)(operation))));
         const dynamic = (0, combi_1.seq)("ENTITIES", (0, combi_1.optPrio)((0, combi_1.altPrio)("IN LOCAL MODE", (0, combi_1.seq)((0, combi_1.opt)("FORWARDING"), "PRIVILEGED"))), "OPERATIONS", expressions_1.Source);
         const create2 = (0, combi_1.seq)("CREATE", fieldsWith, (0, combi_1.opt)((0, combi_1.seq)("CREATE BY", expressions_1.EMLEntityPath, fieldsWith)));
         const create3 = (0, combi_1.seq)("CREATE BY", expressions_1.EMLEntityPath, fieldsWith);
@@ -70765,7 +70763,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.61";
+        return "2.120.62";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

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