@abaplint/core 2.85.29 → 2.85.32

package/build/abaplint.d.ts

@@ -1912,6 +1912,7 @@ declare namespace Expressions {
         SQLCompareOperator,
         SQLCompare,
         SQLCond,
+        SQLFieldListLoop,
         SQLFieldList,
         SQLFieldName,
         SQLForAllEntries,
@@ -4894,6 +4895,10 @@ declare class SQLFieldList extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class SQLFieldListLoop extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class SQLFieldName extends Expression {
     getRunnable(): IStatementRunnable;
 }

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

@@ -158,6 +158,7 @@ __exportStar(require("./sql_client"), exports);
 __exportStar(require("./sql_compare_operator"), exports);
 __exportStar(require("./sql_compare"), exports);
 __exportStar(require("./sql_cond"), exports);
+__exportStar(require("./sql_field_list_loop"), exports);
 __exportStar(require("./sql_field_list"), exports);
 __exportStar(require("./sql_field_name"), exports);
 __exportStar(require("./sql_for_all_entries"), exports);

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

@@ -3,25 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectLoop = void 0;
 const combi_1 = require("../combi");
 const _1 = require(".");
-const version_1 = require("../../../version");
 const sql_order_by_1 = require("./sql_order_by");
 const sql_having_1 = require("./sql_having");
-const sql_path_1 = require("./sql_path");
-const sql_as_name_1 = require("./sql_as_name");
-const sql_case_1 = require("./sql_case");
 const sql_into_structure_1 = require("./sql_into_structure");
 const sql_field_list_1 = require("./sql_field_list");
 const sql_hints_1 = require("./sql_hints");
-const sql_function_1 = require("./sql_function");
+const sql_field_list_loop_1 = require("./sql_field_list_loop");
 class SelectLoop extends combi_1.Expression {
     getRunnable() {
         const where = (0, combi_1.seq)("WHERE", _1.SQLCond);
-        const comma = (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp05, ","));
-        const as = (0, combi_1.seq)("AS", sql_as_name_1.SQLAsName);
-        const someField = (0, combi_1.seq)((0, combi_1.alt)(_1.SQLFieldName, sql_path_1.SQLPath, _1.SQLAggregation, sql_function_1.SQLFunction, sql_case_1.SQLCase), (0, combi_1.optPrio)(as), comma);
-        const fieldList = (0, combi_1.seq)((0, combi_1.star)(someField), (0, combi_1.alt)(_1.SQLFieldName, sql_path_1.SQLPath), (0, combi_1.optPrio)(as), comma, (0, combi_1.star)(someField));
-        // todo, use SQLFieldList instead?
-        const fields = (0, combi_1.alt)("*", _1.Dynamic, fieldList);
         const client = "CLIENT SPECIFIED";
         const bypass = "BYPASSING BUFFER";
         const up = (0, combi_1.seq)("UP TO", _1.SQLSource, "ROWS");
@@ -29,7 +19,7 @@ class SelectLoop extends combi_1.Expression {
         const tab = (0, combi_1.seq)(_1.SQLIntoTable, (0, combi_1.alt)(pack, (0, combi_1.seq)(_1.SQLFrom, pack), (0, combi_1.seq)(pack, _1.SQLFrom)));
         const perm = (0, combi_1.per)(_1.SQLFrom, where, up, sql_order_by_1.SQLOrderBy, sql_having_1.SQLHaving, client, bypass, _1.SQLGroupBy, _1.SQLForAllEntries, (0, combi_1.alt)(tab, sql_into_structure_1.SQLIntoStructure));
         const strict = (0, combi_1.seq)(_1.SQLFrom, "FIELDS", sql_field_list_1.SQLFieldList, where, sql_into_structure_1.SQLIntoStructure, up);
-        const ret = (0, combi_1.seq)("SELECT", (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), fields, perm), strict), (0, combi_1.optPrio)(sql_hints_1.SQLHints));
+        const ret = (0, combi_1.seq)("SELECT", (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), sql_field_list_loop_1.SQLFieldListLoop, perm), strict), (0, combi_1.optPrio)(sql_hints_1.SQLHints));
         return ret;
     }
 }

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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLFieldListLoop = void 0;
+const combi_1 = require("../combi");
+const _1 = require(".");
+const version_1 = require("../../../version");
+const sql_function_1 = require("./sql_function");
+const sql_path_1 = require("./sql_path");
+// loop must include one field from the database table
+class SQLFieldListLoop extends combi_1.Expression {
+    getRunnable() {
+        const comma = (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp05, ","));
+        const as = (0, combi_1.seq)("AS", _1.SQLAsName);
+        const someField = (0, combi_1.seq)((0, combi_1.alt)(_1.SQLFieldName, sql_path_1.SQLPath, _1.SQLAggregation, sql_function_1.SQLFunction, _1.SQLCase), (0, combi_1.optPrio)(as), comma);
+        const fieldList = (0, combi_1.seq)((0, combi_1.star)(someField), (0, combi_1.alt)(_1.SQLFieldName, sql_path_1.SQLPath), (0, combi_1.optPrio)(as), comma, (0, combi_1.star)(someField));
+        const fields = (0, combi_1.alt)("*", _1.Dynamic, fieldList);
+        return fields;
+    }
+}
+exports.SQLFieldListLoop = SQLFieldListLoop;
+//# sourceMappingURL=sql_field_list_loop.js.map

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

@@ -103,7 +103,9 @@ class StatementParser {
     lazyUnknown(wa) {
         const result = [];
         for (let statement of wa.statements) {
-            if (statement.get() instanceof _statement_1.Unknown) {
+            // dont use CALL METHOD, when executing lazy, it easily gives a Move for the last statment if lazy logic is evaluated
+            if (statement.get() instanceof _statement_1.Unknown
+                && statement.concatTokens().toUpperCase().startsWith("CALL METHOD ") === false) {
                 for (const { first, second } of this.buildSplits(statement.getTokens())) {
                     const s = this.categorizeStatement(new nodes_1.StatementNode(new _statement_1.Unknown()).setChildren(this.tokensToNodes(second)));
                     if (!(s.get() instanceof _statement_1.Unknown)) {

package/build/src/abap/5_syntax/expressions/constant.js

@@ -9,7 +9,11 @@ class Constant {
             return new basic_1.IntegerType("I");
         }
         else if (node.getFirstToken().getStr().startsWith("'")) {
-            return new basic_1.CharacterType(10);
+            let len = node.getFirstToken().getStr().length - 2;
+            if (len <= 0) {
+                len = 1;
+            }
+            return new basic_1.CharacterType(len);
         }
         else {
             return new basic_1.StringType("STRING");

package/build/src/registry.js

@@ -68,7 +68,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.85.29";
+        return "2.85.32";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/downport.js

@@ -291,8 +291,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         }
     }
     downportSelectInline(low, high, lowFile, highSyntax) {
-        if (!(low.get() instanceof _statement_1.Unknown)
-            || !(high.get() instanceof Statements.Select)) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        else if (!(high.get() instanceof Statements.Select) && !(high.get() instanceof Statements.SelectLoop)) {
             return undefined;
         }
         // as first step outline the @DATA, note that void types are okay, as long the field names are specified
@@ -307,7 +309,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         return undefined;
     }
     downportSelectSingleInline(_low, high, lowFile, _highSyntax) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const targets = ((_a = high.findFirstExpression(Expressions.SQLIntoStructure)) === null || _a === void 0 ? void 0 : _a.findDirectExpressions(Expressions.SQLTarget)) || [];
         if (targets.length !== 1) {
             return undefined;
@@ -325,7 +327,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
             return undefined;
         }
         const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
-        const fieldList = high.findFirstExpression(Expressions.SQLFieldList);
+        let fieldList = high.findFirstExpression(Expressions.SQLFieldList);
+        if (fieldList === undefined) {
+            fieldList = high.findFirstExpression(Expressions.SQLFieldListLoop);
+        }
         if (fieldList === undefined) {
             return undefined;
         }
@@ -341,6 +346,13 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         else if (fieldList.concatTokens().toUpperCase() === "COUNT( * )") {
             fieldDefinition = `DATA ${name} TYPE i.`;
         }
+        else if (fieldList.getChildren().length === 1 && fieldList.getChildren()[0].get() instanceof Expressions.SQLAggregation) {
+            const c = fieldList.getChildren()[0];
+            if (c instanceof nodes_1.ExpressionNode) {
+                const concat = (_d = c.findFirstExpression(Expressions.SQLArithmetics)) === null || _d === void 0 ? void 0 : _d.concatTokens();
+                fieldDefinition = `DATA ${name} TYPE ${tableName}-${concat}.`;
+            }
+        }
         else {
             for (const f of fields) {
                 const fieldName = f.concatTokens();
@@ -361,26 +373,31 @@ ${indentation}`);
         if (targets.length !== 1) {
             return undefined;
         }
+        const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
         const inlineData = targets[0].findFirstExpression(Expressions.InlineData);
         if (inlineData === undefined) {
             return undefined;
         }
         const sqlFrom = high.findAllExpressions(Expressions.SQLFromSource);
-        if (sqlFrom.length !== 1) {
-            return undefined;
+        if (sqlFrom.length === 0) {
+            return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Error outlining, sqlFrom not found", this.getMetadata().key, this.conf.severity);
         }
-        const tableName = (_b = sqlFrom[0].findDirectExpression(Expressions.DatabaseTable)) === null || _b === void 0 ? void 0 : _b.concatTokens();
+        let tableName = (_b = sqlFrom[0].findDirectExpression(Expressions.DatabaseTable)) === null || _b === void 0 ? void 0 : _b.concatTokens();
         if (tableName === undefined) {
             return undefined;
         }
-        const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
         const fieldList = high.findFirstExpression(Expressions.SQLFieldList);
         if (fieldList === undefined) {
             return undefined;
         }
         let fieldDefinitions = "";
         for (const f of fieldList.findDirectExpressions(Expressions.SQLFieldName)) {
-            const fieldName = f.concatTokens();
+            let fieldName = f.concatTokens();
+            if (fieldName.includes("~")) {
+                const split = fieldName.split("~");
+                fieldName = split[0];
+                tableName = split[1];
+            }
             fieldDefinitions += indentation + "        " + fieldName + " TYPE " + tableName + "-" + fieldName + ",\n";
         }
         const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
@@ -477,6 +494,7 @@ ${indentation}`);
         if (!(((_a = target === null || target === void 0 ? void 0 : target.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.InlineData)) {
             return undefined;
         }
+        let type = "";
         const source = node.findFirstExpression(Expressions.Source);
         if (source === undefined) {
             return undefined;
@@ -494,13 +512,25 @@ ${indentation}`);
             return undefined;
         }
         else if (source.findFirstExpression(Expressions.TableExpression)) {
-            return undefined;
+            const chain = source.findDirectExpression(Expressions.FieldChain);
+            if (chain !== undefined
+                && chain.getChildren().length === 2
+                && chain.getChildren()[0].get() instanceof Expressions.SourceField
+                && chain.getChildren()[1].get() instanceof Expressions.TableExpression) {
+                type = "LINE OF " + chain.getChildren()[0].concatTokens();
+            }
+            else {
+                return undefined;
+            }
+        }
+        else {
+            type = source.concatTokens();
         }
         const targetName = (_c = target.findFirstExpression(Expressions.TargetField)) === null || _c === void 0 ? void 0 : _c.concatTokens();
         const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
         const firstToken = node.getFirstToken();
         const lastToken = node.getLastToken();
-        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), `DATA ${targetName} LIKE ${source.concatTokens()}.\n${indentation}`);
+        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), `DATA ${targetName} LIKE ${type}.\n${indentation}`);
         const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, firstToken.getStart(), lastToken.getEnd(), `${targetName} = ${source.concatTokens()}.`);
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Outline DATA", this.getMetadata().key, this.conf.severity, fix);
@@ -1007,15 +1037,22 @@ ${indentation}    output = ${topTarget}.`;
             if (spag === undefined) {
                 continue;
             }
-            const found = spag.findVariable(name);
-            if (found === undefined) {
-                continue;
+            let type = "";
+            if (node.concatTokens().toUpperCase().startsWith("APPEND INITIAL LINE TO ")) {
+                type = "LIKE LINE OF " + ((_b = node.findFirstExpression(Expressions.Target)) === null || _b === void 0 ? void 0 : _b.concatTokens());
             }
-            else if (found.getType() instanceof basic_1.VoidType) {
-                return issue_1.Issue.atToken(lowFile, i.getFirstToken(), "Error outlining voided type", this.getMetadata().key, this.conf.severity);
+            else {
+                const found = spag.findVariable(name);
+                if (found === undefined) {
+                    continue;
+                }
+                else if (found.getType() instanceof basic_1.VoidType) {
+                    return issue_1.Issue.atToken(lowFile, i.getFirstToken(), "Error outlining voided type", this.getMetadata().key, this.conf.severity);
+                }
+                type = "TYPE ";
+                type += found.getType().getQualifiedName() ? found.getType().getQualifiedName().toLowerCase() : found.getType().toABAP();
             }
-            const type = found.getType().getQualifiedName() ? (_b = found.getType().getQualifiedName()) === null || _b === void 0 ? void 0 : _b.toLowerCase() : found.getType().toABAP();
-            const code = `FIELD-SYMBOLS ${name} TYPE ${type}.\n` +
+            const code = `FIELD-SYMBOLS ${name} ${type}.\n` +
                 " ".repeat(node.getFirstToken().getStart().getCol() - 1);
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, i.getFirstToken().getStart(), i.getLastToken().getEnd(), name);
@@ -1076,11 +1113,18 @@ ${indentation}    output = ${topTarget}.`;
     }
     buildCondBody(body, uniqueName, indent, lowFile, highSyntax) {
         let code = "";
+        let first = true;
         for (const c of body.getChildren()) {
             if (c instanceof nodes_1.TokenNode) {
                 switch (c.getFirstToken().getStr().toUpperCase()) {
                     case "WHEN":
-                        code += indent + "IF ";
+                        if (first === true) {
+                            code += indent + "IF ";
+                            first = false;
+                        }
+                        else {
+                            code += indent + "ELSEIF ";
+                        }
                         break;
                     case "THEN":
                         code += ".\n";

package/package.json

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