@abaplint/core 2.113.219 → 2.113.220

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

@@ -15,7 +15,8 @@ class ModifyEntities {
         const updateFrom = (0, combi_1.seq)("UPDATE FROM", expressions_1.Source, (0, combi_1.opt)(relating));
         const deleteFrom = (0, combi_1.seq)("DELETE FROM", expressions_1.Source);
         const updateFields = (0, combi_1.seq)("UPDATE", fieldsWith);
-        const operation = (0, combi_1.alt)((0, combi_1.seq)("UPDATE SET FIELDS WITH", expressions_1.Source), (0, combi_1.seq)("CREATE SET FIELDS WITH", expressions_1.Source), updateFields, deleteFrom, updateFrom, create, execute, (0, combi_1.seq)("CREATE", (0, combi_1.opt)(by), (0, combi_1.optPrio)("AUTO FILL CID"), (0, combi_1.altPrio)(withh, fieldsWith)));
+        const updateSetFields = (0, combi_1.seq)("UPDATE SET FIELDS WITH", expressions_1.Source);
+        const operation = (0, combi_1.alt)(updateSetFields, (0, combi_1.seq)("CREATE SET FIELDS WITH", expressions_1.Source), updateFields, deleteFrom, updateFrom, create, execute, (0, combi_1.seq)("CREATE", (0, combi_1.opt)(by), (0, combi_1.optPrio)("AUTO FILL CID"), (0, combi_1.altPrio)(withh, fieldsWith)));
         const failed = (0, combi_1.seq)("FAILED", expressions_1.Target);
         const result = (0, combi_1.seq)("RESULT", expressions_1.Target);
         const mapped = (0, combi_1.seq)("MAPPED", expressions_1.Target);
@@ -25,7 +26,7 @@ class ModifyEntities {
         const create2 = (0, combi_1.seq)("CREATE", fieldsWith, (0, combi_1.opt)((0, combi_1.seq)("CREATE BY", expressions_1.AssociationName, fieldsWith)));
         const create3 = (0, combi_1.seq)("CREATE BY", expressions_1.AssociationName, fieldsWith);
         const create4 = (0, combi_1.seq)("CREATE FROM", expressions_1.Source, (0, combi_1.plus)((0, combi_1.seq)("CREATE BY", expressions_1.AssociationName, "FROM", expressions_1.Source)));
-        const entity = (0, combi_1.seq)("ENTITY", (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.alt)(expressions_1.NamespaceSimpleName, expressions_1.EntityAssociation), (0, combi_1.alt)(execute, create, updateFields, deleteFrom, updateFrom, create2, create3, create4));
+        const entity = (0, combi_1.seq)("ENTITY", (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.alt)(expressions_1.NamespaceSimpleName, expressions_1.EntityAssociation), (0, combi_1.alt)(execute, create, updateFields, deleteFrom, updateSetFields, updateFrom, create2, create3, create4));
         return (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("MODIFY", (0, combi_1.alt)(entities, entity), end));
     }
 }

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

@@ -13,7 +13,8 @@ class ReadEntities {
         const result = (0, combi_1.seq)("RESULT", expressions_1.Target);
         const failed = (0, combi_1.seq)("FAILED", expressions_1.Target);
         const reported = (0, combi_1.seq)("REPORTED", expressions_1.Target);
-        const entity = (0, combi_1.seq)("ENTITY", expressions_1.NamespaceSimpleName, (0, combi_1.opt)((0, combi_1.seq)("BY", expressions_1.AssociationName)), (0, combi_1.alt)(fields, from, all), (0, combi_1.optPrio)(result));
+        const foo = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.seq)("BY", expressions_1.AssociationName)), (0, combi_1.alt)(fields, from, all), (0, combi_1.optPrio)(result));
+        const entity = (0, combi_1.seq)("ENTITY", expressions_1.NamespaceSimpleName, (0, combi_1.plus)(foo));
         const s = (0, combi_1.seq)("ENTITIES OF", expressions_1.NamespaceSimpleName, (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.plus)(entity), (0, combi_1.optPrio)((0, combi_1.seq)("LINK", expressions_1.Target)), (0, combi_1.optPrio)((0, combi_1.per)(failed, reported)));
         const byall = (0, combi_1.seq)("BY", expressions_1.AssociationName, all);
         const by = (0, combi_1.seq)("BY", expressions_1.AssociationName, fields);

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

@@ -364,7 +364,9 @@ class BuiltIn {
         // https://help.sap.com/doc/abapdocu_751_index_htm/7.51/en-us/abennews-610-system.htm
         const id3 = new tokens_1.Identifier(new position_1.Position(this.row++, 1), "sy-repid");
         const syrepid = new _typed_identifier_1.TypedIdentifier(id3, BuiltIn.filename, new basic_1.CharacterType(40, { qualifiedName: "sy-repid" }), ["read_only" /* IdentifierMeta.ReadOnly */, "built-in" /* IdentifierMeta.BuiltIn */]);
-        return [sy, syst, syrepid];
+        const id4 = new tokens_1.Identifier(new position_1.Position(this.row++, 1), "syst-repid");
+        const systrepid = new _typed_identifier_1.TypedIdentifier(id4, BuiltIn.filename, new basic_1.CharacterType(40, { qualifiedName: "syst-repid" }), ["read_only" /* IdentifierMeta.ReadOnly */, "built-in" /* IdentifierMeta.BuiltIn */]);
+        return [sy, syst, syrepid, systrepid];
     }
     buildConstant(name, type, value) {
         const id = new tokens_1.Identifier(new position_1.Position(this.row++, 1), name);

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

@@ -422,7 +422,7 @@ class BasicTypes {
             const name = typename.concatTokens();
             const type = (_d = this.input.scope.getDDIC().lookupDDLS(name)) === null || _d === void 0 ? void 0 : _d.type;
             if (type) {
-                return new Types.TableType(basic_1.VoidType.get("RapTodo"), options);
+                return new Types.TableType(basic_1.VoidType.get("RAP-TODO"), options);
             }
             else if (this.input.scope.getDDIC().inErrorNamespace(name)) {
                 return new Types.UnknownType(`DDLS ${name} not found`);

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

@@ -32,7 +32,7 @@ class ClassImplementation {
         }
         else {
             // todo: instead of the void type, do proper typing, ie. only empty constructor method
-            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(new tokens_1.Identifier(new position_1.Position(1, 1), "super"), _builtin_1.BuiltIn.filename, basic_1.VoidType.get("noSuper")));
+            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(new tokens_1.Identifier(new position_1.Position(1, 1), "super"), _builtin_1.BuiltIn.filename, basic_1.VoidType.get("noSuperClass")));
         }
         input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(new tokens_1.Identifier(new position_1.Position(1, 1), "me"), _builtin_1.BuiltIn.filename, new basic_1.ObjectReferenceType(classDefinition)));
         helper.addAliasedAttributes(classDefinition); // todo, this is not correct, take care of instance vs static

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

@@ -6,7 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSFunctionInput extends combi_1.Expression {
     getRunnable() {
         const qualified = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParameters), (0, combi_1.starPrio)((0, combi_1.seq)(".", _1.CDSName, (0, combi_1.opt)(_1.CDSParameters))));
-        const input = (0, combi_1.altPrio)(_1.CDSCast, _1.CDSFunction, _1.CDSArithmetics, _1.CDSCase, _1.CDSString, qualified, _1.CDSInteger);
+        const input = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSCast, _1.CDSFunction, _1.CDSCase, _1.CDSString, qualified, _1.CDSInteger);
         return input;
     }
 }

package/build/src/registry.js

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

package/build/src/rules/align_type_expressions.js

@@ -88,6 +88,7 @@ ENDINTERFACE.`,
         }
         issues.push(...this.checkTypes(stru, file));
         issues.push(...this.checkMethods(stru, file));
+        issues.push(...this.checkEvents(stru, file));
         return issues;
     }
     check(fields, column, file) {
@@ -147,6 +148,26 @@ ENDINTERFACE.`,
         }
         return issues;
     }
+    checkEvents(stru, file) {
+        const issues = [];
+        const events = stru.findAllStatements(Statements.Events);
+        for (const e of events) {
+            const fields = [];
+            const params = e.findAllExpressions(Expressions.MethodParam);
+            let column = 0;
+            for (const p of params) {
+                const children = p.getChildren();
+                const name = children[children.length - 2];
+                fields.push({
+                    nameEnd: name.getLastToken().getEnd(),
+                    after: p.findFirstExpression(Expressions.TypeParam).getFirstToken().getStart()
+                });
+                column = Math.max(column, name.getFirstToken().getEnd().getCol() + 1);
+            }
+            issues.push(...this.check(fields, column, file));
+        }
+        return issues;
+    }
     checkTypes(stru, file) {
         const issues = [];
         const types = stru.findAllStructuresRecursive(Structures.Types);

package/build/src/rules/identical_contents.js

@@ -66,20 +66,51 @@ WRITE 'world'.`,
     ////////////////
     analyzeIf(file, node) {
         var _a;
-        if (node.getChildren().length !== 4) {
+        const ifBody = node.findDirectStructure(Structures.Body);
+        const elseIfBodies = node.findDirectStructures(Structures.ElseIf) || [];
+        const elseBody = (_a = node.findDirectStructure(Structures.Else)) === null || _a === void 0 ? void 0 : _a.findDirectStructure(Structures.Body);
+        if (elseBody === undefined) {
             return [];
         }
-        const ifBody = node.findDirectStructure(Structures.Body);
-        if (node.findDirectStructure(Structures.ElseIf)) {
+        const ifFirst = ifBody === null || ifBody === void 0 ? void 0 : ifBody.getFirstChild();
+        const elseFirst = elseBody === null || elseBody === void 0 ? void 0 : elseBody.getFirstChild();
+        const ifLast = ifBody === null || ifBody === void 0 ? void 0 : ifBody.getLastChild();
+        const elseLast = elseBody === null || elseBody === void 0 ? void 0 : elseBody.getLastChild();
+        if (elseIfBodies.length > 0) {
+            let firstMatch = true;
+            let lastMatch = true;
+            for (const elseif of elseIfBodies) {
+                const elseifBody = elseif.findDirectStructure(Structures.Body);
+                const elseifFirst = elseifBody === null || elseifBody === void 0 ? void 0 : elseifBody.getFirstChild();
+                const elseifLast = elseifBody === null || elseifBody === void 0 ? void 0 : elseifBody.getLastChild();
+                if (ifFirst === undefined
+                    || ifLast === undefined
+                    || elseLast === undefined
+                    || elseFirst === undefined) {
+                    return [];
+                }
+                if (elseifFirst === undefined
+                    || ifFirst.concatTokens() !== elseifFirst.concatTokens()
+                    || elseFirst.concatTokens() !== elseifFirst.concatTokens()) {
+                    firstMatch = false;
+                }
+                if (elseifLast === undefined
+                    || ifLast.concatTokens() !== elseifLast.concatTokens()
+                    || elseLast.concatTokens() !== elseifLast.concatTokens()) {
+                    lastMatch = false;
+                }
+            }
+            if (firstMatch === true || lastMatch === true) {
+                const message = "Identical contents";
+                const issue = issue_1.Issue.atToken(file, node.getFirstToken(), message, this.getMetadata().key, this.conf.severity);
+                return [issue];
+            }
             return [];
         }
-        const elseBody = (_a = node.findDirectStructure(Structures.Else)) === null || _a === void 0 ? void 0 : _a.findDirectStructure(Structures.Body);
-        if (elseBody === undefined || ifBody === undefined) {
+        else if (elseBody === undefined || ifBody === undefined) {
             return [];
         }
         {
-            const ifFirst = ifBody.getFirstChild();
-            const elseFirst = elseBody.getFirstChild();
             if (ifFirst === undefined || elseFirst === undefined || this.isChained(ifFirst)) {
                 return [];
             }
@@ -90,8 +121,6 @@ WRITE 'world'.`,
             }
         }
         {
-            const ifLast = ifBody.getLastChild();
-            const elseLast = elseBody.getLastChild();
             if (ifLast === undefined || elseLast === undefined || this.isChained(ifLast)) {
                 return [];
             }

package/package.json

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