@abaplint/core 2.113.216 → 2.113.218

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

@@ -4,7 +4,7 @@ exports.AssociationName = void 0;
 const combi_1 = require("../combi");
 class AssociationName extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.regex)(/^\\_[\w]+$/);
+        return (0, combi_1.regex)(/^(\\_[\w]+)+$/);
     }
 }
 exports.AssociationName = AssociationName;

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

@@ -448,7 +448,7 @@ class TypeUtils {
                     if (!(sourceRowType instanceof basic_1.StructureType)) {
                         return false;
                     }
-                    else if (!(this.structureContainsString(sourceRowType))
+                    else if (!this.structureContainsString(sourceRowType)
                         && this.structureContainsVoid(sourceRowType) === false) {
                         return false;
                     }
@@ -458,7 +458,7 @@ class TypeUtils {
                     if (!(targetRowType instanceof basic_1.StructureType)) {
                         return false;
                     }
-                    else if (!(this.structureContainsString(targetRowType))
+                    else if (!this.structureContainsString(targetRowType)
                         && this.structureContainsVoid(targetRowType) === false) {
                         return false;
                     }

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

@@ -11,7 +11,7 @@ class CorrespondingBody {
         }
         const base = (_a = node.findDirectExpression(Expressions.CorrespondingBodyBase)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Source);
         if (base) {
-            source_1.Source.runSyntax(base, input);
+            source_1.Source.runSyntax(base, input, targetType);
         }
         let type = undefined;
         for (const s of node.findDirectExpressions(Expressions.Source)) {

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

@@ -50,8 +50,10 @@ class FieldChain {
             }
             else if (current.get() instanceof tokens_1.Dash) {
                 if (context instanceof basic_1.UnknownType) {
+                    /*
                     const message = "Not a structure, type unknown, FieldChain";
-                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, current.getFirstToken(), message));
+                    input.issues.push(syntaxIssue(input, current.getFirstToken(), message));
+                    */
                     return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                 }
                 else if (!(context instanceof basic_1.StructureType)

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

@@ -12,9 +12,10 @@ const component_cond_1 = require("../expressions/component_cond");
 const dynamic_1 = require("../expressions/dynamic");
 const loop_group_by_1 = require("../expressions/loop_group_by");
 const _syntax_input_1 = require("../_syntax_input");
+const version_1 = require("../../../version");
 class Loop {
     runSyntax(node, input) {
-        var _a;
+        var _a, _b;
         const loopTarget = node.findDirectExpression(Expressions.LoopTarget);
         let target = loopTarget === null || loopTarget === void 0 ? void 0 : loopTarget.findDirectExpression(Expressions.Target);
         const targetType = target ? target_1.Target.runSyntax(target, input) : undefined;
@@ -64,6 +65,7 @@ class Loop {
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
         }
         const targetConcat = loopTarget === null || loopTarget === void 0 ? void 0 : loopTarget.concatTokens().toUpperCase();
+        const topType = sourceType; // todo: refactor topType vs sourceType vs rowType
         if (sourceType instanceof basic_1.TableType) {
             rowType = sourceType.getRowType();
             sourceType = rowType;
@@ -71,6 +73,10 @@ class Loop {
                 sourceType = new basic_1.DataReference(sourceType);
             }
         }
+        const cond = node.findDirectExpression(Expressions.ComponentCond);
+        if (cond !== undefined) {
+            component_cond_1.ComponentCond.runSyntax(cond, input, rowType);
+        }
         if (targetConcat
             && targetConcat.startsWith("TRANSPORTING ")
             && node.findDirectTokenByText("WHERE") === undefined) {
@@ -78,6 +84,32 @@ class Loop {
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return;
         }
+        if (node.findDirectTokenByText("USING") !== undefined
+            && cond !== undefined
+            && topType instanceof basic_1.TableType) {
+            // https://github.com/abap2xlsx/abap2xlsx/issues/1341
+            const keyName = node.findExpressionAfterToken("KEY");
+            let key = undefined;
+            if ((keyName === null || keyName === void 0 ? void 0 : keyName.get()) instanceof Expressions.SimpleName) {
+                // it might be dynamic, in that case we cannot check anything
+                key = (_b = topType.getOptions().secondary) === null || _b === void 0 ? void 0 : _b.find(k => k.name.toUpperCase() === keyName.getFirstToken().getStr().toUpperCase());
+                if (key === undefined) {
+                    const message = "Key " + (keyName === null || keyName === void 0 ? void 0 : keyName.concatTokens()) + " not found in table type";
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                    return;
+                }
+                if (input.scope.getRegistry().getConfig().getVersion() <= version_1.Version.v740sp02) {
+                    const compares = cond.findAllExpressionsRecursive(Expressions.ComponentCompare).map(c => c.concatTokens().toUpperCase());
+                    for (const keyField of key.keyFields) {
+                        if (compares.find(c => c === keyField.toUpperCase() + " IS INITIAL") !== undefined) {
+                            const message = "Loop, key check with IS INITIAL cannot optimized before 7.40 SP02";
+                            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                            return;
+                        }
+                    }
+                }
+            }
+        }
         const inline = target === null || target === void 0 ? void 0 : target.findDirectExpression(Expressions.InlineData);
         if (inline) {
             inline_data_1.InlineData.runSyntax(inline, input, sourceType);
@@ -98,9 +130,6 @@ class Loop {
                 fstarget_1.FSTarget.runSyntax(fstarget, input, sourceType);
             }
         }
-        for (const t of node.findDirectExpressions(Expressions.ComponentCond)) {
-            component_cond_1.ComponentCond.runSyntax(t, input, rowType);
-        }
         for (const t of node.findDirectExpressions(Expressions.Dynamic)) {
             dynamic_1.Dynamic.runSyntax(t, input);
         }

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

@@ -6,7 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSCase extends combi_1.Expression {
     getRunnable() {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.starPrio)((0, combi_1.seq)(".", _1.CDSName)));
-        const value = (0, combi_1.altPrio)(_1.CDSFunction, _1.CDSString, CDSCase, _1.CDSCast, _1.CDSArithmetics, name);
+        const value = (0, combi_1.altPrio)(_1.CDSString, CDSCase, _1.CDSCast, _1.CDSArithmetics, _1.CDSFunction, name);
         const thenValue = (0, combi_1.altPrio)((0, combi_1.seq)("(", value, ")"), value);
         const simple = (0, combi_1.seq)((0, combi_1.altPrio)(_1.CDSFunction, name), (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", value, "THEN", thenValue)));
         const complex = (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", _1.CDSCondition, "THEN", thenValue));

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

@@ -9,7 +9,7 @@ class CDSDefineCustom extends combi_1.Expression {
     getRunnable() {
         const field = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.str)("KEY")), cds_name_1.CDSName, ":", cds_type_1.CDSType, ";");
         const compsiOrAssoci = (0, combi_1.seq)(cds_name_1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE"), (0, combi_1.opt)((0, combi_1.str)("ROOT")), (0, combi_1.str)("CUSTOM ENTITY"), (0, combi_1.opt)(_1.CDSWithParameters), cds_name_1.CDSName, (0, combi_1.str)("{"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.alt)(field, compsiOrAssoci))), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE"), (0, combi_1.opt)((0, combi_1.str)("ROOT")), (0, combi_1.str)("CUSTOM ENTITY"), cds_name_1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), (0, combi_1.str)("{"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.alt)(field, compsiOrAssoci))), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineCustom = CDSDefineCustom;

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -939,7 +939,6 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
         const source = high.findExpressionAfterToken("MESSAGE");
         if ((source === null || source === void 0 ? void 0 : source.get()) instanceof Expressions.MessageSourceSource
             && ((_a = source.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.Source) {
-            ;
             const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             const firstToken = high.getFirstToken();

package/build/src/rules/fully_type_constants.js

@@ -45,7 +45,7 @@ class FullyTypeConstants extends _abap_rule_1.ABAPRule {
         for (const stat of file.getStatements()) {
             if ((stat.get() instanceof Statements.Constant
                 || (this.conf.checkData === true && stat.get() instanceof Statements.Data))
-                && (!this.isTyped(stat))) {
+                && !this.isTyped(stat)) {
                 const type = stat.get() instanceof Statements.Constant ? "constant definition" : "data definition";
                 let token = (_a = stat.findFirstExpression(expressions_1.NamespaceSimpleName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
                 if (token === undefined) {
@@ -60,7 +60,7 @@ class FullyTypeConstants extends _abap_rule_1.ABAPRule {
         return issues;
     }
     isTyped(stat) {
-        return (stat.findFirstExpression(expressions_1.Type) || stat.findFirstExpression(expressions_1.TypeTable));
+        return stat.findFirstExpression(expressions_1.Type) || stat.findFirstExpression(expressions_1.TypeTable);
     }
 }
 exports.FullyTypeConstants = FullyTypeConstants;

package/build/src/rules/implement_methods.js

@@ -180,7 +180,7 @@ class ImplementMethods extends _abap_rule_1.ABAPRule {
                 return [idef];
             }
             for (const m of this.findInterfaceMethods(idef)) {
-                if (interfaceInfo.abstractMethods.includes(m.method.name.toUpperCase())) {
+                if (this.isAbstract(m, interfaceInfo, def)) {
                     continue;
                 }
                 if (this.isImplemented(m, def, impl) === false) {
@@ -199,6 +199,23 @@ class ImplementMethods extends _abap_rule_1.ABAPRule {
         }
         return ret;
     }
+    isAbstract(m, interfaceInfo, def) {
+        if (interfaceInfo.abstractMethods.includes(m.method.name.toUpperCase())) {
+            return true;
+        }
+        if (!def.superClassName) {
+            return false;
+        }
+        // look up in superclass if method is abstract there
+        const superClass = this.findClass(def.superClassName);
+        const superInterface = superClass === null || superClass === void 0 ? void 0 : superClass.def.interfaces.find(iface => iface.name.toUpperCase() === m.objectName.toUpperCase());
+        if (superClass && superInterface) {
+            return this.isAbstract(m, superInterface, superClass.def);
+        }
+        else {
+            return false;
+        }
+    }
     isImplemented(m, def, impl) {
         if (impl === undefined) {
             return false;

package/build/src/rules/unnecessary_return.js

@@ -61,9 +61,9 @@ ENDFORM.`,
         for (let i = 0; i < statements.length; i++) {
             const node = statements[i];
             const nodeType = node.get();
-            if ((nodeType instanceof Statements.MethodImplementation
+            if (nodeType instanceof Statements.MethodImplementation
                 || nodeType instanceof Statements.Form
-                || nodeType instanceof Statements.FunctionModule)) {
+                || nodeType instanceof Statements.FunctionModule) {
                 statementCounter = 0;
                 continue;
             }

package/package.json

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