@abaplint/cli 2.120.60 → 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);
@@ -24936,6 +24934,12 @@ class BuiltIn {
         }
         return this.buildDefinition(def, name);
     }
+    static hasUnnamedArgument(name) {
+        if (name === undefined) {
+            return false;
+        }
+        return BuiltIn.unnamedArgument.has(name.toUpperCase());
+    }
     static isPredicate(name) {
         if (name === undefined) {
             return undefined;
@@ -26037,6 +26041,12 @@ BuiltIn.methods = {
         return: basic_1.IntegerType.get(),
     },
 };
+// functions called with exactly one unnamed argument, all others take named arguments like "val"
+BuiltIn.unnamedArgument = new Set([
+    "ABS", "ACOS", "ASIN", "ATAN", "BOOLC", "CEIL", "CHARLEN", "COS", "COSH", "DBMAXLEN", "EXP", "FLOOR",
+    "FRAC", "LINES", "LOG", "LOG10", "NUMOFCHAR", "SIGN", "SIN", "SINH", "SQRT", "STRLEN", "TAN", "TANH",
+    "TRUNC", "XSTRLEN"
+]);
 //# sourceMappingURL=_builtin.js.map
 
 /***/ },
@@ -38090,17 +38100,54 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Case = void 0;
+exports.checkCaseOperand = checkCaseOperand;
 const Expressions = __importStar(__webpack_require__(/*! ../../2_statements/expressions */ "../core/build/src/abap/2_statements/expressions/index.js"));
 const source_1 = __webpack_require__(/*! ../expressions/source */ "../core/build/src/abap/5_syntax/expressions/source.js");
+const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "../core/build/src/abap/5_syntax/_syntax_input.js");
+const _builtin_1 = __webpack_require__(/*! ../_builtin */ "../core/build/src/abap/5_syntax/_builtin.js");
+const _object_oriented_1 = __webpack_require__(/*! ../_object_oriented */ "../core/build/src/abap/5_syntax/_object_oriented.js");
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "../core/build/src/abap/types/basic/index.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "../core/build/src/version.js");
 class Case {
     runSyntax(node, input) {
         // just recurse
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             source_1.Source.runSyntax(s, input);
+            checkCaseOperand(s, input);
         }
     }
 }
 exports.Case = Case;
+// Before 7.40 SP02 the operands of CASE and WHEN are enhanced functional operand positions: besides
+// data objects and functional methods, only built-in functions with exactly one unnamed argument are allowed
+function checkCaseOperand(source, input) {
+    var _a, _b;
+    if ((0, version_1.releaseAtLeast)(input.scope.getRelease(), version_1.Release.v740sp02)
+        || input.scope.getLanguageVersion() === version_1.LanguageVersion.Cloud
+        || input.scope.getOpenABAP()) {
+        return;
+    }
+    const chain = source.findDirectExpression(Expressions.MethodCallChain);
+    if (chain === undefined || source.getChildren().length !== 1 || chain.getChildren().length !== 1) {
+        return;
+    }
+    const call = chain.findDirectExpression(Expressions.MethodCall);
+    const nameToken = (_a = call === null || call === void 0 ? void 0 : call.findDirectExpression(Expressions.MethodName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+    const name = nameToken === null || nameToken === void 0 ? void 0 : nameToken.getStr();
+    if (nameToken === undefined || _builtin_1.BuiltIn.searchBuiltin(name) === undefined || _builtin_1.BuiltIn.hasUnnamedArgument(name)) {
+        return;
+    }
+    // a method of the enclosing class takes precedence over the built-in function
+    const meType = (_b = input.scope.findVariable("me")) === null || _b === void 0 ? void 0 : _b.getType();
+    if (meType instanceof basic_1.ObjectReferenceType) {
+        const def = input.scope.findObjectDefinition(meType.getIdentifierName());
+        if (new _object_oriented_1.ObjectOriented(input.scope).searchMethodName(def, name).method !== undefined) {
+            return;
+        }
+    }
+    const message = "Built-in function " + name + " not allowed as CASE/WHEN operand before v740sp02";
+    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, nameToken, message));
+}
 //# sourceMappingURL=case.js.map
 
 /***/ },
@@ -47174,11 +47221,15 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.When = void 0;
 const Expressions = __importStar(__webpack_require__(/*! ../../2_statements/expressions */ "../core/build/src/abap/2_statements/expressions/index.js"));
 const source_1 = __webpack_require__(/*! ../expressions/source */ "../core/build/src/abap/5_syntax/expressions/source.js");
+const case_1 = __webpack_require__(/*! ./case */ "../core/build/src/abap/5_syntax/statements/case.js");
 class When {
     runSyntax(node, input) {
         for (const s of node.findAllExpressions(Expressions.Source)) {
             source_1.Source.runSyntax(s, input);
         }
+        for (const s of node.findDirectExpressions(Expressions.Source)) {
+            (0, case_1.checkCaseOperand)(s, input);
+        }
     }
 }
 exports.When = When;
@@ -70712,7 +70763,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.60";
+        return "2.120.62";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.120.60",
+    "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.60",
+        "@abaplint/core": "^2.120.62",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",