@abaplint/core 2.120.56 → 2.120.57

package/build/src/abap/2_statements/expressions/method_def_returning.js

@@ -39,7 +39,8 @@ const Expressions = __importStar(require("."));
 const tokens_1 = require("../../1_lexer/tokens");
 class MethodDefReturning extends combi_1.Expression {
     getRunnable() {
-        const value = (0, combi_1.seq)("VALUE", (0, combi_1.tok)(tokens_1.ParenLeft), Expressions.MethodParamName, (0, combi_1.tok)(tokens_1.ParenRightW));
+        // see MethodParam: the lexer gives "!VALUE" as one Identifier
+        const value = (0, combi_1.seq)((0, combi_1.altPrio)("VALUE", "!VALUE"), (0, combi_1.tok)(tokens_1.ParenLeft), Expressions.MethodParamName, (0, combi_1.tok)(tokens_1.ParenRightW));
         return (0, combi_1.seq)("RETURNING", value, Expressions.TypeParam);
     }
 }

package/build/src/abap/2_statements/expressions/method_param.js

@@ -39,8 +39,11 @@ const Expressions = __importStar(require("."));
 const tokens_1 = require("../../1_lexer/tokens");
 class MethodParam extends combi_1.Expression {
     getRunnable() {
-        const ref = (0, combi_1.seq)("REFERENCE", (0, combi_1.tok)(tokens_1.ParenLeft), Expressions.MethodParamName, (0, combi_1.tok)(tokens_1.ParenRightW));
-        const value = (0, combi_1.seq)("VALUE", (0, combi_1.tok)(tokens_1.ParenLeft), Expressions.MethodParamName, (0, combi_1.tok)(tokens_1.ParenRightW));
+        // The escape is part of the token: the lexer gives "!VALUE" as a single
+        // Identifier, so a literal "VALUE" cannot match it and the whole METHODS
+        // statement falls back to Unknown.
+        const ref = (0, combi_1.seq)((0, combi_1.altPrio)("REFERENCE", "!REFERENCE"), (0, combi_1.tok)(tokens_1.ParenLeft), Expressions.MethodParamName, (0, combi_1.tok)(tokens_1.ParenRightW));
+        const value = (0, combi_1.seq)((0, combi_1.altPrio)("VALUE", "!VALUE"), (0, combi_1.tok)(tokens_1.ParenLeft), Expressions.MethodParamName, (0, combi_1.tok)(tokens_1.ParenRightW));
         const fieldsOrValue = (0, combi_1.seq)((0, combi_1.altPrio)(value, ref, Expressions.MethodParamName), Expressions.TypeParam);
         return fieldsOrValue;
     }

package/build/src/abap/2_statements/statement_parser.js

@@ -305,6 +305,10 @@ class StatementParser {
         let add = [];
         let pre = [];
         let colon = undefined;
+        // inside EXEC SQL and an AMDP body a colon reads a host variable, ":lv_a",
+        // and is not the chaining marker; recognized here because nativeSQL() runs
+        // afterwards and can only re-wrap what this has already cut
+        let native = false;
         for (const token of wa.tokens) {
             if (token instanceof Tokens.Comment) {
                 wa.statements.push(new nodes_1.StatementNode(new _statement_1.Comment()).setChildren(this.tokensToNodes([token])));
@@ -314,6 +318,7 @@ class StatementParser {
             const str = token.getStr();
             if (str.length === 1) {
                 if (str === ".") {
+                    native = this.nativeAfter(native, add, colon);
                     wa.addUnknown(pre, add, colon);
                     add = [];
                     pre = [];
@@ -323,13 +328,13 @@ class StatementParser {
                     wa.addUnknown(pre, add, colon);
                     add = [];
                 }
-                else if (str === ":" && colon === undefined) {
+                else if (str === ":" && colon === undefined && native === false) {
                     colon = token;
                     add.pop(); // do not add colon token to statement
                     pre.push(...add);
                     add = [];
                 }
-                else if (str === ":") {
+                else if (str === ":" && native === false) {
                     add.pop(); // do not add colon token to statement
                 }
             }
@@ -338,6 +343,36 @@ class StatementParser {
             wa.addUnknown(pre, add, colon);
         }
     }
+    /** whether the statement that just ended opens or closes a region where a
+     * colon belongs to the statement rather than chaining it */
+    nativeAfter(native, tokens, colon) {
+        // a pragma sits between the closing keyword and the period, so it is left
+        // out before the last word is read: "ENDEXEC ##NEEDED." closes the region
+        const words = tokens.filter(t => !(t instanceof Tokens.Pragma)).map(t => t.getStr().toUpperCase());
+        // a native body usually arrives as one blob terminated by its own closing
+        // keyword, so the terminator is the word before the period
+        if (words[words.length - 2] === "ENDEXEC" || words[words.length - 2] === "ENDMETHOD") {
+            return false;
+        }
+        if (colon !== undefined) {
+            // a fragment of a chain cannot OPEN a region: it is only part of a
+            // statement, and taking "DATA: lv_a TYPE i, exec sql." for one would
+            // turn chaining off for the rest of the file
+            return native;
+        }
+        if (words[0] === "EXEC" && words[1] === "SQL") {
+            return true;
+        }
+        // "BY DATABASE" as well as LANGUAGE, and not LANGUAGE alone: a method
+        // may be NAMED language
+        if (words[0] === "METHOD"
+            && words.includes("BY")
+            && words.includes("DATABASE")
+            && words.includes("LANGUAGE")) {
+            return true;
+        }
+        return native;
+    }
 }
 exports.StatementParser = StatementParser;
 //# sourceMappingURL=statement_parser.js.map

package/build/src/abap/types/method_parameters.js

@@ -333,7 +333,9 @@ class MethodParameters {
     }
     isPassByValue(param) {
         var _a;
-        return param.getFirstToken().getStr().toUpperCase() === "VALUE"
+        // "!" is the identifier escape, generated code has eg. "IMPORTING !VALUE(iv_foo)"
+        const first = param.getFirstToken().getStr().toUpperCase();
+        return (first === "VALUE" || first === "!VALUE")
             && ((_a = param.getChildren()[1]) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr()) === "(";
     }
 }

package/build/src/registry.js

@@ -75,7 +75,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.56";
+        return "2.120.57";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.120.56",
+    "version": "2.120.57",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",