@abaplint/core 2.120.20 → 2.120.22

package/build/abaplint.d.ts

@@ -1264,6 +1264,7 @@ declare class ClassDefinition_3 extends Identifier implements IClassDefinition {
     private checkInterfaceVisibility;
     private checkMethodsFromSuperClasses;
     private checkMethodNameConflicts;
+    private checkEventNameConflicts;
     private findFriends;
     private addReference;
     private parse;

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

@@ -23,11 +23,12 @@ class ModifyEntities {
         const reported = (0, combi_1.seq)("REPORTED", expressions_1.Target);
         const end = (0, combi_1.optPrio)((0, combi_1.per)(failed, result, mapped, reported));
         const entities = (0, combi_1.seq)((0, combi_1.optPrio)("AUGMENTING"), "ENTITIES OF", expressions_1.NamespaceSimpleName, (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.plusPrio)((0, combi_1.seq)("ENTITY", expressions_1.NamespaceSimpleName, (0, combi_1.plus)(operation))));
+        const dynamic = (0, combi_1.seq)("ENTITIES", (0, combi_1.optPrio)((0, combi_1.altPrio)("IN LOCAL MODE", (0, combi_1.seq)((0, combi_1.opt)("FORWARDING"), "PRIVILEGED"))), "OPERATIONS", expressions_1.Source);
         const create2 = (0, combi_1.seq)("CREATE", fieldsWith, (0, combi_1.opt)((0, combi_1.seq)("CREATE BY", expressions_1.EMLEntityPath, fieldsWith)));
         const create3 = (0, combi_1.seq)("CREATE BY", expressions_1.EMLEntityPath, fieldsWith);
         const create4 = (0, combi_1.seq)("CREATE FROM", expressions_1.Source, (0, combi_1.plus)((0, combi_1.seq)("CREATE BY", expressions_1.EMLEntityPath, "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, updateSetFields, updateFrom, create2, create3, create4));
-        return (0, combi_1.ver)(version_1.Release.v754, (0, combi_1.seq)("MODIFY", (0, combi_1.alt)(entities, entity), end), { also: combi_1.AlsoIn.OpenABAP });
+        return (0, combi_1.ver)(version_1.Release.v754, (0, combi_1.seq)("MODIFY", (0, combi_1.alt)(entities, dynamic, entity), end), { also: combi_1.AlsoIn.OpenABAP });
     }
 }
 exports.ModifyEntities = ModifyEntities;

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

@@ -151,7 +151,7 @@ class CreateObject {
         this.validateParameters(cdef, node, input);
     }
     static checkInstantiationAllowed(cdef, input) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const createVis = cdef.getCreateVisibility();
         if (createVis === visibility_1.Visibility.Public) {
             return undefined;
@@ -168,23 +168,30 @@ class CreateObject {
             input.scope.isLocalFriend(cdef.getName(), enclosingClass)) {
             return undefined;
         }
+        const enclosingDefinition = input.scope.findClassDefinition(enclosingClass);
+        if (enclosingDefinition !== undefined) {
+            const implementedInterfaces = new _object_oriented_1.ObjectOriented(input.scope).findInterfaces(enclosingDefinition);
+            if (cdef.getFriends().some(friend => implementedInterfaces.some(implemented => implemented.name.toUpperCase() === friend.toUpperCase()))) {
+                return undefined;
+            }
+        }
         // subclasses of friends also have friendship
-        let enclosingSup = (_a = input.scope.findClassDefinition(enclosingClass)) === null || _a === void 0 ? void 0 : _a.getSuperClass();
+        let enclosingSup = enclosingDefinition === null || enclosingDefinition === void 0 ? void 0 : enclosingDefinition.getSuperClass();
         while (enclosingSup !== undefined) {
             if (cdef.getFriends().some(f => f.toUpperCase() === enclosingSup.toUpperCase()) ||
                 input.scope.isLocalFriend(cdef.getName(), enclosingSup)) {
                 return undefined;
             }
-            enclosingSup = (_b = input.scope.findClassDefinition(enclosingSup)) === null || _b === void 0 ? void 0 : _b.getSuperClass();
+            enclosingSup = (_a = input.scope.findClassDefinition(enclosingSup)) === null || _a === void 0 ? void 0 : _a.getSuperClass();
         }
         if (createVis === visibility_1.Visibility.Protected) {
             // subclasses are also allowed
-            let sup = (_c = input.scope.findClassDefinition(enclosingClass)) === null || _c === void 0 ? void 0 : _c.getSuperClass();
+            let sup = (_b = input.scope.findClassDefinition(enclosingClass)) === null || _b === void 0 ? void 0 : _b.getSuperClass();
             while (sup !== undefined) {
                 if (sup.toUpperCase() === cdef.getName().toUpperCase()) {
                     return undefined;
                 }
-                sup = (_d = input.scope.findClassDefinition(sup)) === null || _d === void 0 ? void 0 : _d.getSuperClass();
+                sup = (_c = input.scope.findClassDefinition(sup)) === null || _c === void 0 ? void 0 : _c.getSuperClass();
             }
         }
         return cdef.getName() + " cannot be instantiated, class is defined as " +

package/build/src/abap/types/class_definition.js

@@ -98,6 +98,7 @@ class ClassDefinition extends _identifier_1.Identifier {
         this.checkInterfaceVisibility(input, node);
         this.checkMethodsFromSuperClasses(input);
         this.checkMethodNameConflicts(input);
+        this.checkEventNameConflicts(input);
         this.checkClassNameLength(input);
         this.checkMethodNameLength(input);
         this.checkClassConstructorStatic(input);
@@ -237,6 +238,15 @@ class ClassDefinition extends _identifier_1.Identifier {
             }
         }
     }
+    checkEventNameConflicts(input) {
+        for (const e of this.events) {
+            if (this.attributes.findByName(e.getName()) !== undefined
+                || this.types.getByName(e.getName()) !== undefined
+                || this.methodDefs.getByName(e.getName()) !== undefined) {
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, e.getToken(), `"${e.getName()}" already defined`));
+            }
+        }
+    }
     findFriends(def, input) {
         var _a;
         const result = [];

package/build/src/registry.js

@@ -75,7 +75,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.20";
+        return "2.120.22";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

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