@abaplint/core 2.113.39 → 2.113.41

package/build/abaplint.d.ts

@@ -2334,6 +2334,7 @@ declare namespace Expressions {
         SQLFromSource,
         SQLFrom,
         SQLFunction,
+        SQLFunctionInput,
         SQLGroupBy,
         SQLHaving,
         SQLHints,
@@ -6012,6 +6013,10 @@ declare class SQLFunction extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class SQLFunctionInput extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class SQLGroupBy extends Expression {
     getRunnable(): IStatementRunnable;
 }

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

@@ -189,6 +189,7 @@ __exportStar(require("./sql_for_all_entries"), exports);
 __exportStar(require("./sql_from_source"), exports);
 __exportStar(require("./sql_from"), exports);
 __exportStar(require("./sql_function"), exports);
+__exportStar(require("./sql_function_input"), exports);
 __exportStar(require("./sql_group_by"), exports);
 __exportStar(require("./sql_having"), exports);
 __exportStar(require("./sql_hints"), exports);

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

@@ -1,37 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLFunction = void 0;
-const constant_1 = require("./constant");
 const version_1 = require("../../../version");
 const tokens_1 = require("../../1_lexer/tokens");
 const combi_1 = require("../combi");
 const integer_1 = require("./integer");
-const sql_alias_field_1 = require("./sql_alias_field");
-const sql_field_name_1 = require("./sql_field_name");
-const simple_source3_1 = require("./simple_source3");
-const source_1 = require("./source");
-const sql_aggregation_1 = require("./sql_aggregation");
+const sql_function_input_1 = require("./sql_function_input");
 class SQLFunction extends combi_1.Expression {
     getRunnable() {
-        const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), source_1.Source, (0, combi_1.tok)(tokens_1.WParenRightW));
-        const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.altPrio)(simple_source3_1.SimpleSource3, paren)));
-        const param = (0, combi_1.altPrio)(SQLFunction, sql_aggregation_1.SQLAggregation, sql_field_name_1.SQLFieldName, sql_alias_field_1.SQLAliasField, constant_1.Constant, at);
         const castTypes = (0, combi_1.altPrio)((0, combi_1.seq)("CHAR", (0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)), (0, combi_1.seq)("DEC", (0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, ",", integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)), "FLTP", "NUMC", "INT8");
-        const commaParam = (0, combi_1.seq)(",", param);
+        const commaParam = (0, combi_1.seq)(",", sql_function_input_1.SQLFunctionInput);
         // note: the function names are not keywords, they are usually in lower case
-        const abs = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^abs$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const cast = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^cast$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, "AS", castTypes, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const ceil = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^ceil$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const coalesce = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^coalesce$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, commaParam, (0, combi_1.optPrio)(commaParam), (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const concat = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^concat$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const div = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^div$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const floor = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^floor$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const length = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^length$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const lower = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)((0, combi_1.regex)(/^lower$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const mod = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^mod$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const replace = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^replace$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, commaParam, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const round = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^round$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const upper = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)((0, combi_1.regex)(/^upper$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const abs = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^abs$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const cast = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^cast$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, "AS", castTypes, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const ceil = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^ceil$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const coalesce = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^coalesce$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.optPrio)(commaParam), (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const concat = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^concat$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const div = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^div$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const floor = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^floor$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const length = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^length$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const lower = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)((0, combi_1.regex)(/^lower$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const mod = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^mod$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const replace = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^replace$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const round = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)((0, combi_1.regex)(/^round$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, commaParam, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const upper = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)((0, combi_1.regex)(/^upper$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const uuid = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)((0, combi_1.regex)(/^uuid$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.WParenRightW)));
         return (0, combi_1.altPrio)(uuid, abs, ceil, floor, cast, div, mod, coalesce, concat, replace, length, lower, upper, round);
     }

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

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLFunctionInput = void 0;
+const constant_1 = require("./constant");
+const version_1 = require("../../../version");
+const tokens_1 = require("../../1_lexer/tokens");
+const combi_1 = require("../combi");
+const sql_alias_field_1 = require("./sql_alias_field");
+const sql_field_name_1 = require("./sql_field_name");
+const simple_source3_1 = require("./simple_source3");
+const source_1 = require("./source");
+const sql_aggregation_1 = require("./sql_aggregation");
+const sql_function_1 = require("./sql_function");
+class SQLFunctionInput extends combi_1.Expression {
+    getRunnable() {
+        const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), source_1.Source, (0, combi_1.tok)(tokens_1.WParenRightW));
+        const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.altPrio)(simple_source3_1.SimpleSource3, paren)));
+        const param = (0, combi_1.altPrio)(sql_function_1.SQLFunction, sql_aggregation_1.SQLAggregation, sql_field_name_1.SQLFieldName, sql_alias_field_1.SQLAliasField, constant_1.Constant, at);
+        const operator = (0, combi_1.altPrio)("+", "-", "*", "/", "&&");
+        return (0, combi_1.seq)(param, (0, combi_1.starPrio)((0, combi_1.seq)(operator, param)));
+    }
+}
+exports.SQLFunctionInput = SQLFunctionInput;
+//# sourceMappingURL=sql_function_input.js.map

package/build/src/abap/2_statements/statements/data_begin.js

@@ -6,7 +6,8 @@ const expressions_1 = require("../expressions");
 class DataBegin {
     getMatcher() {
         const occurs = (0, combi_1.seq)("OCCURS", expressions_1.Integer);
-        const structure = (0, combi_1.seq)("BEGIN OF", (0, combi_1.opt)("COMMON PART"), expressions_1.DefinitionName, (0, combi_1.opt)("READ-ONLY"), (0, combi_1.opt)(occurs));
+        const common = (0, combi_1.altPrio)((0, combi_1.seq)("COMMON PART", expressions_1.DefinitionName), "COMMON PART");
+        const structure = (0, combi_1.seq)("BEGIN OF", (0, combi_1.altPrio)(common, (0, combi_1.seq)(expressions_1.DefinitionName, (0, combi_1.opt)("READ-ONLY"), (0, combi_1.opt)(occurs))));
         return (0, combi_1.seq)("DATA", structure);
     }
 }

package/build/src/abap/5_syntax/statements/method_implementation.js

@@ -19,17 +19,18 @@ class MethodImplementation {
             return;
         }
         const { method: methodDefinition } = helper.searchMethodName(classDefinition, methodName);
-        if (methodDefinition === undefined) {
-            const message = "Method definition \"" + methodName + "\" not found";
-            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
-            return;
-        }
         const start = node.getFirstToken().getStart();
-        if (methodDefinition.isStatic() === false) {
+        if ((methodDefinition === null || methodDefinition === void 0 ? void 0 : methodDefinition.isStatic()) === false) {
             input.scope.push(_scope_type_1.ScopeType.MethodInstance, methodName, start, input.filename);
             input.scope.addList(classDefinition.getAttributes().getInstance());
         }
         input.scope.push(_scope_type_1.ScopeType.Method, methodName, start, input.filename);
+        // note: the scope must be pushed before returning
+        if (methodDefinition === undefined) {
+            const message = "Method definition \"" + methodName + "\" not found";
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+            return;
+        }
         input.scope.addReference(methodToken, methodDefinition, _reference_1.ReferenceType.MethodImplementationReference, input.filename);
         input.scope.addList(methodDefinition.getParameters().getAll());
         for (const i of helper.findInterfaces(classDefinition)) {

package/build/src/abap/5_syntax/statements/read_table.js

@@ -41,7 +41,7 @@ class ReadTable {
         if (indexSource) {
             const indexType = new source_1.Source().runSyntax(indexSource, input);
             if (new _type_utils_1.TypeUtils(input.scope).isAssignable(indexType, basic_1.IntegerType.get()) === false) {
-                const message = "READ TABLE, INDEX must be simple";
+                const message = "READ TABLE, INDEX must be simple, got " + (indexType === null || indexType === void 0 ? void 0 : indexType.constructor.name);
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
             }

package/build/src/abap/flow/statement_flow.js

@@ -8,6 +8,7 @@ const Expressions = require("../2_statements/expressions");
 const flow_graph_1 = require("./flow_graph");
 const objects_1 = require("../../objects");
 const selection_events_1 = require("./selection_events");
+const virtual_position_1 = require("../../virtual_position");
 class StatementFlow {
     constructor() {
         this.counter = 0;
@@ -96,6 +97,7 @@ class StatementFlow {
         var _a;
         return ((_a = f.findDirectStructure(Structures.Body)) === null || _a === void 0 ? void 0 : _a.getChildren()) || [];
     }
+    // note: it must handle macros and chained statements
     buildName(statement) {
         let token = undefined;
         const colon = statement.getColon();
@@ -110,12 +112,18 @@ class StatementFlow {
                 }
             }
         }
+        let extra = "";
+        const tStart = token === null || token === void 0 ? void 0 : token.getStart();
+        if (tStart instanceof virtual_position_1.VirtualPosition) {
+            extra += "$" + tStart.vrow;
+            extra += "," + tStart.vcol;
+        }
         if (token === undefined) {
             return "tokenError";
         }
         return statement.get().constructor.name +
             ":" + token.getRow() +
-            "," + token.getCol();
+            "," + token.getCol() + extra;
     }
     traverseBody(children, context) {
         const graph = new flow_graph_1.FlowGraph(this.counter++);

package/build/src/cds/cds_determine_types.js

@@ -13,9 +13,19 @@ class CDSDetermineTypes {
             const components = [];
             for (const f of (parsedData === null || parsedData === void 0 ? void 0 : parsedData.fields) || []) {
                 if (f.prefix !== "") {
-                    let source = parsedData.sources.find((s) => { var _a; return ((_a = s.as) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === f.prefix.toUpperCase(); });
+                    const prefixUpper = f.prefix.toUpperCase();
+                    let source = parsedData.sources.find((s) => { var _a; return ((_a = s.as) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === prefixUpper; });
                     if ((source === null || source === void 0 ? void 0 : source.name) === undefined) {
-                        source = parsedData.sources.find((s) => s.name.toUpperCase() === f.prefix.toUpperCase());
+                        source = parsedData.sources.find((s) => s.name.toUpperCase() === prefixUpper);
+                    }
+                    if ((source === null || source === void 0 ? void 0 : source.name) === undefined
+                        && (parsedData.associations.find((s) => s.name.toUpperCase() === prefixUpper)
+                            || parsedData.associations.find((s) => { var _a; return ((_a = s.as) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === prefixUpper; }))) {
+                        components.push({
+                            name: f.name,
+                            type: new basic_1.VoidType("DDLS:association"),
+                        });
+                        continue;
                     }
                     if ((source === null || source === void 0 ? void 0 : source.name) === undefined) {
                         components.push({

package/build/src/cds/expressions/cds_cast.js

@@ -6,7 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSCast extends combi_1.Expression {
     getRunnable() {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
-        return (0, combi_1.seq)("CAST", "(", (0, combi_1.alt)(name, _1.CDSFunction, _1.CDSCase, CDSCast, _1.CDSString, _1.CDSArithmetics), "AS", _1.CDSType, (0, combi_1.opt)((0, combi_1.seq)("PRESERVING", "TYPE")), ")");
+        return (0, combi_1.seq)("CAST", "(", (0, combi_1.alt)(name, _1.CDSFunction, _1.CDSCase, _1.CDSAggregate, CDSCast, _1.CDSString, _1.CDSArithmetics), "AS", _1.CDSType, (0, combi_1.opt)((0, combi_1.seq)("PRESERVING", "TYPE")), ")");
     }
 }
 exports.CDSCast = CDSCast;

package/build/src/lsp/help.js

@@ -6,6 +6,7 @@ const _lsp_utils_1 = require("./_lsp_utils");
 const syntax_1 = require("../abap/5_syntax/syntax");
 const _abap_object_1 = require("../objects/_abap_object");
 const dump_scope_1 = require("./dump_scope");
+const virtual_position_1 = require("../virtual_position");
 class Help {
     static find(reg, textDocument, position) {
         const file = _lsp_utils_1.LSPUtils.getABAPFile(reg, textDocument.uri);
@@ -180,13 +181,24 @@ class Help {
         return ret + "</ul>";
     }
     static tokens(file) {
-        let inner = "<table><tr><td><b>String</b></td><td><b>Type</b></td><td><b>Row</b></td><td><b>Column</b></td></tr>";
+        let inner = `<table><tr><td><b>String</b></td><td><b>Type</b></td>
+    <td><b>Row</b></td><td><b>Column</b></td>
+    <td><b>vRow</b></td><td><b>vColumn</b></td>
+    </tr>`;
         for (const token of file.getTokens()) {
-            inner = inner + "<tr><td><tt>" +
+            const tStart = token.getStart();
+            inner += "<tr><td><tt>" +
                 this.escape(token.getStr()) + "</tt></td><td>" +
                 token.constructor.name + "</td><td align=\"right\">" +
-                token.getRow() + "</td><td align=\"right\">" +
-                token.getCol() + "</td></tr>";
+                tStart.getRow() + "</td><td align=\"right\">" +
+                tStart.getCol() + "</td>";
+            if (tStart instanceof virtual_position_1.VirtualPosition) {
+                inner += `<td>${tStart.vcol}</td><td>${tStart.vrow}</td>`;
+            }
+            else {
+                inner += "<td></td><td></td>";
+            }
+            inner += "</tr>";
         }
         inner = inner + "</table>";
         return inner;

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.39";
+        return "2.113.41";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

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