@abaplint/core 2.91.25 → 2.91.26

package/build/abaplint.d.ts

@@ -1866,6 +1866,8 @@ declare namespace Expressions {
         Language,
         Length,
         Let,
+        LoopGroupByComponent,
+        LoopGroupByTarget,
         LoopGroupBy,
         MacroName,
         MessageClass_2 as MessageClass,
@@ -1933,10 +1935,10 @@ declare namespace Expressions {
         SQLCompareOperator,
         SQLCompare,
         SQLCond,
-        SQLField,
         SQLFieldListLoop,
         SQLFieldList,
         SQLFieldName,
+        SQLField,
         SQLForAllEntries,
         SQLFromSource,
         SQLFrom,
@@ -3549,6 +3551,14 @@ declare class LoopGroupBy extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class LoopGroupByComponent extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class LoopGroupByTarget extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class MacroName extends Expression {
     getRunnable(): IStatementRunnable;
 }

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

@@ -96,6 +96,8 @@ __exportStar(require("./interface_name"), exports);
 __exportStar(require("./language"), exports);
 __exportStar(require("./length"), exports);
 __exportStar(require("./let"), exports);
+__exportStar(require("./loop_group_by_component"), exports);
+__exportStar(require("./loop_group_by_target"), exports);
 __exportStar(require("./loop_group_by"), exports);
 __exportStar(require("./macro_name"), exports);
 __exportStar(require("./message_class"), exports);
@@ -163,10 +165,10 @@ __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"), exports);
 __exportStar(require("./sql_field_list_loop"), exports);
 __exportStar(require("./sql_field_list"), exports);
 __exportStar(require("./sql_field_name"), exports);
+__exportStar(require("./sql_field"), exports);
 __exportStar(require("./sql_for_all_entries"), exports);
 __exportStar(require("./sql_from_source"), exports);
 __exportStar(require("./sql_from"), exports);

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

@@ -3,18 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoopGroupBy = void 0;
 const combi_1 = require("../combi");
 const tokens_1 = require("../../1_lexer/tokens");
-const component_name_1 = require("./component_name");
-const component_compare_1 = require("./component_compare");
-const target_1 = require("./target");
-const fstarget_1 = require("./fstarget");
 const source_1 = require("./source");
+const loop_group_by_target_1 = require("./loop_group_by_target");
+const loop_group_by_component_1 = require("./loop_group_by_component");
 class LoopGroupBy extends combi_1.Expression {
     getRunnable() {
-        const into = (0, combi_1.seq)((0, combi_1.opt)("REFERENCE"), "INTO", target_1.Target);
-        const assigning = (0, combi_1.seq)("ASSIGNING", fstarget_1.FSTarget);
-        const groupSize = (0, combi_1.seq)(component_name_1.ComponentName, "=", "GROUP SIZE");
-        const components = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), (0, combi_1.plus)((0, combi_1.alt)(component_compare_1.ComponentCompare, groupSize)), (0, combi_1.tok)(tokens_1.WParenRightW));
-        const ret = (0, combi_1.seq)((0, combi_1.alt)(source_1.Source, components), (0, combi_1.optPrio)("ASCENDING"), (0, combi_1.optPrio)("WITHOUT MEMBERS"), (0, combi_1.optPrio)((0, combi_1.alt)(into, assigning)));
+        const components = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), (0, combi_1.plus)(loop_group_by_component_1.LoopGroupByComponent), (0, combi_1.tok)(tokens_1.WParenRightW));
+        const ret = (0, combi_1.seq)((0, combi_1.alt)(source_1.Source, components), (0, combi_1.optPrio)("ASCENDING"), (0, combi_1.optPrio)("WITHOUT MEMBERS"), loop_group_by_target_1.LoopGroupByTarget);
         return ret;
     }
 }

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoopGroupByComponent = void 0;
+const combi_1 = require("../combi");
+const component_name_1 = require("./component_name");
+const component_compare_simple_1 = require("./component_compare_simple");
+class LoopGroupByComponent extends combi_1.Expression {
+    getRunnable() {
+        const groupSize = (0, combi_1.seq)(component_name_1.ComponentName, "=", "GROUP SIZE");
+        const components = (0, combi_1.alt)(component_compare_simple_1.ComponentCompareSimple, groupSize);
+        return components;
+    }
+}
+exports.LoopGroupByComponent = LoopGroupByComponent;
+//# sourceMappingURL=loop_group_by_component.js.map

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoopGroupByTarget = void 0;
+const combi_1 = require("../combi");
+const target_1 = require("./target");
+const fstarget_1 = require("./fstarget");
+class LoopGroupByTarget extends combi_1.Expression {
+    getRunnable() {
+        const into = (0, combi_1.seq)((0, combi_1.opt)("REFERENCE"), "INTO", target_1.Target);
+        const assigning = (0, combi_1.seq)("ASSIGNING", fstarget_1.FSTarget);
+        return (0, combi_1.optPrio)((0, combi_1.alt)(into, assigning));
+    }
+}
+exports.LoopGroupByTarget = LoopGroupByTarget;
+//# sourceMappingURL=loop_group_by_target.js.map

package/build/src/abap/5_syntax/basic_types.js

@@ -24,6 +24,7 @@ class BasicTypes {
     }
     lookupQualifiedName(name) {
         var _a;
+        // argh, todo, rewrite this entire method
         if (name === undefined) {
             return undefined;
         }
@@ -43,6 +44,21 @@ class BasicTypes {
                 }
             }
         }
+        else if (name.includes("-")) {
+            const split = name.split("-");
+            const typeName = split[0];
+            const fieldName = split[1];
+            const type = this.scope.findType(typeName);
+            if (type) {
+                const stru = type.getType();
+                if (stru instanceof basic_1.StructureType) {
+                    const f = stru.getComponentByName(fieldName);
+                    if (f) {
+                        return new _typed_identifier_1.TypedIdentifier(type.getToken(), type.getFilename(), f);
+                    }
+                }
+            }
+        }
         const lookup = this.scope.getDDIC().lookupNoVoid(name);
         const id = (_a = lookup === null || lookup === void 0 ? void 0 : lookup.object) === null || _a === void 0 ? void 0 : _a.getIdentifier();
         if (id && (lookup === null || lookup === void 0 ? void 0 : lookup.type)) {
@@ -193,7 +209,7 @@ class BasicTypes {
         }
         return undefined;
     }
-    simpleType(node, noQualifiedName) {
+    simpleType(node, qualifiedNamePrefix) {
         let nameExpr = node.findFirstExpression(Expressions.NamespaceSimpleName);
         if (nameExpr === undefined) {
             nameExpr = node.findFirstExpression(Expressions.DefinitionName);
@@ -211,15 +227,15 @@ class BasicTypes {
                 qualifiedName = name.getStr();
             }
             else {
-                qualifiedName = name.getStr();
+                qualifiedName = (qualifiedNamePrefix || "") + name.getStr();
                 if (this.scope.getType() === _scope_type_1.ScopeType.ClassDefinition
                     || this.scope.getType() === _scope_type_1.ScopeType.Interface) {
                     qualifiedName = this.scope.getName() + "=>" + qualifiedName;
                 }
             }
         }
-        if (noQualifiedName === true) {
-            qualifiedName = undefined;
+        else if (qualifiedNamePrefix) {
+            qualifiedName = qualifiedNamePrefix + qualifiedName;
         }
         const found = this.parseType(node, qualifiedName);
         if (found) {

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

@@ -10,10 +10,8 @@ const target_1 = require("./target");
 class LoopGroupBy {
     runSyntax(node, scope, filename) {
         const components = [];
-        for (const c of node.findDirectExpressions(Expressions.ComponentCompare)) {
-            for (const f of c.findDirectExpressions(Expressions.ComponentChainSimple)) {
-                components.push({ name: f.getFirstToken().getStr(), type: new basic_1.VoidType("todoGroupBy") });
-            }
+        for (const c of node.findDirectExpressions(Expressions.LoopGroupByComponent)) {
+            components.push({ name: c.getFirstToken().getStr(), type: new basic_1.VoidType("todoGroupBy") });
         }
         if (components.length === 0) {
             return;
@@ -32,8 +30,10 @@ class LoopGroupBy {
         if (inlinefs) {
             new inline_fs_1.InlineFS().runSyntax(inlinefs, scope, filename, sourceType);
         }
-        for (const t of node.findDirectExpressions(Expressions.ComponentCompare)) {
-            new component_compare_1.ComponentCompare().runSyntax(t, scope, filename);
+        for (const c of node.findDirectExpressions(Expressions.LoopGroupByComponent)) {
+            for (const t of c.findDirectExpressions(Expressions.ComponentCompareSimple)) {
+                new component_compare_1.ComponentCompare().runSyntax(t, scope, filename);
+            }
         }
     }
 }

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

@@ -7,7 +7,7 @@ const Expressions = require("../../2_statements/expressions");
 const basic_1 = require("../../types/basic");
 const _scope_type_1 = require("../_scope_type");
 class TypeTable {
-    runSyntax(node, scope, filename) {
+    runSyntax(node, scope, filename, qualifiedNamePrefix) {
         // todo, input is currently the statement, but should be the expression?
         let nameExpr = node.findFirstExpression(Expressions.DefinitionName);
         if (nameExpr === undefined) {
@@ -17,9 +17,9 @@ class TypeTable {
             return undefined;
         }
         const name = nameExpr.getFirstToken();
-        let qualifiedName = "";
+        let qualifiedName = qualifiedNamePrefix || "";
         if (node.getFirstToken().getStr().toUpperCase() === "TYPES") {
-            qualifiedName = name.getStr();
+            qualifiedName = qualifiedName + name.getStr();
             if (scope.getType() === _scope_type_1.ScopeType.ClassDefinition
                 || scope.getType() === _scope_type_1.ScopeType.Interface) {
                 qualifiedName = scope.getName() + "=>" + qualifiedName;

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

@@ -7,12 +7,12 @@ const basic_1 = require("../../types/basic");
 const Expressions = require("../../2_statements/expressions");
 const type_table_1 = require("../expressions/type_table");
 class Type {
-    runSyntax(node, scope, filename, noQualifiedName) {
+    runSyntax(node, scope, filename, qualifiedNamePrefix) {
         const tt = node.findFirstExpression(Expressions.TypeTable);
         if (tt) {
-            return new type_table_1.TypeTable().runSyntax(node, scope, filename);
+            return new type_table_1.TypeTable().runSyntax(node, scope, filename, qualifiedNamePrefix);
         }
-        const found = new basic_types_1.BasicTypes(filename, scope).simpleType(node, noQualifiedName);
+        const found = new basic_types_1.BasicTypes(filename, scope).simpleType(node, qualifiedNamePrefix);
         if (found) {
             return found;
         }

package/build/src/abap/5_syntax/structures/types.js

@@ -20,7 +20,7 @@ class Types {
             const ctyp = c.get();
             if (c instanceof nodes_1.StatementNode) {
                 if (ctyp instanceof Statements.Type) {
-                    const found = new type_1.Type().runSyntax(c, scope, filename, true);
+                    const found = new type_1.Type().runSyntax(c, scope, filename, name.getStr() + "-");
                     if (found) {
                         components.push({ name: found.getName(), type: found.getType() });
                     }

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -208,6 +208,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.downportLoopGroup(high, lowFile, highSyntax, highFile);
+        if (found) {
+            return found;
+        }
         found = this.callFunctionParameterSimple(high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -860,6 +864,67 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, simple REF move", this.getMetadata().key, this.conf.severity, fix);
     }
+    downportLoopGroup(high, lowFile, highSyntax, highFile) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        if (!(high.get() instanceof Statements.Loop)) {
+            return undefined;
+        }
+        const group = high.findDirectExpression(Expressions.LoopGroupBy);
+        if (group === undefined) {
+            return undefined;
+        }
+        const groupTargetName = ((_a = group.findFirstExpression(Expressions.TargetField)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "nameNotFound";
+        const loopSourceName = ((_b = high.findFirstExpression(Expressions.SimpleSource2)) === null || _b === void 0 ? void 0 : _b.concatTokens()) || "nameNotFound";
+        const loopTargetName = ((_c = high.findFirstExpression(Expressions.TargetField)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "nameNotFound";
+        const groupTarget = ((_d = group.findDirectExpression(Expressions.LoopGroupByTarget)) === null || _d === void 0 ? void 0 : _d.concatTokens()) || "";
+        let loopSourceRowType = "typeNotFound";
+        const spag = highSyntax.spaghetti.lookupPosition(high.getFirstToken().getStart(), lowFile.getFilename());
+        if (spag !== undefined) {
+            const found = spag.findVariable(loopSourceName);
+            const tt = found === null || found === void 0 ? void 0 : found.getType();
+            if (tt instanceof basic_1.TableType) {
+                loopSourceRowType = tt.getRowType().getQualifiedName() || "typeNotFound";
+            }
+        }
+        let code = `TYPES: BEGIN OF ${groupTargetName}#type,\n`;
+        for (const c of group.findAllExpressions(Expressions.LoopGroupByComponent)) {
+            const name = c.findFirstExpression(Expressions.ComponentName);
+            let type = ((_e = c.findFirstExpression(Expressions.Source)) === null || _e === void 0 ? void 0 : _e.concatTokens()) || "todo";
+            if ((_f = c.concatTokens()) === null || _f === void 0 ? void 0 : _f.toUpperCase().endsWith(" = GROUP SIZE")) {
+                type = "i";
+            }
+            else {
+                type = type.replace(loopTargetName, loopSourceRowType);
+                type = type.replace("->", "-");
+            }
+            code += `  ${name === null || name === void 0 ? void 0 : name.concatTokens()} TYPE ${type},\n`;
+        }
+        code += `  items LIKE ${loopSourceName},
+END OF ${groupTargetName}#type.
+DATA ${groupTargetName}#tab TYPE STANDARD TABLE OF ${groupTargetName}#type WITH DEFAULT KEY.
+* todo, aggregation code here
+LOOP AT ${groupTargetName}#tab ${groupTarget}.`;
+        let fix = edit_helper_1.EditHelper.replaceRange(lowFile, high.getFirstToken().getStart(), high.getLastToken().getEnd(), code);
+        for (const l of ((_g = highFile.getStructure()) === null || _g === void 0 ? void 0 : _g.findAllStructures(Structures.Loop)) || []) {
+            // make sure to find the correct/current loop statement
+            if (l.findDirectStatement(Statements.Loop) !== high) {
+                continue;
+            }
+            for (const loop of l.findAllStatements(Statements.Loop)) {
+                if ((_h = loop.concatTokens()) === null || _h === void 0 ? void 0 : _h.toUpperCase().startsWith("LOOP AT GROUP ")) {
+                    const subLoopSource = loop.findFirstExpression(Expressions.SimpleSource2);
+                    if (subLoopSource === undefined) {
+                        continue;
+                    }
+                    const subLoopSourceName = (subLoopSource === null || subLoopSource === void 0 ? void 0 : subLoopSource.concatTokens()) || "nameNotFound";
+                    const subCode = `LOOP AT ${subLoopSourceName}->items`;
+                    const subFix = edit_helper_1.EditHelper.replaceRange(lowFile, loop.getFirstToken().getStart(), subLoopSource.getLastToken().getEnd(), subCode);
+                    fix = edit_helper_1.EditHelper.merge(subFix, fix);
+                }
+            }
+        }
+        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, LOOP GROUP", this.getMetadata().key, this.conf.severity, fix);
+    }
     downportRef(high, lowFile, highSyntax) {
         let found = undefined;
         for (const s of high.findAllExpressionsRecursive(Expressions.Source)) {

package/package.json

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