Move Metamodel::C3MRO to use ::Locking

And added ::Locking role to classes that now need it
rakudo · Mar 18, 2024 · cf46bd5 · cf46bd5
1 parent 68628fe
commit cf46bd5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/src/Perl6/Metamodel/C3MRO.nqp b/src/Perl6/Metamodel/C3MRO.nqp
@@ -1,11 +1,6 @@
 role Perl6::Metamodel::C3MRO {
     # Storage of the MRO.
     has $!mro;
-    has $!mro_lock;
-
-    method TWEAK(*%named) {
-        $!mro_lock := NQPLock.new();
-    }
 
     # Computes C3 MRO.
     method compute_mro($class) {
@@ -139,7 +134,7 @@ role Perl6::Metamodel::C3MRO {
             ++$i;
         }
 
-        $!mro_lock.protect({
+        self.protect({
             $!mro := nqp::hash(
               'all', nqp::hash(
                 'all',      @all,

diff --git a/src/Perl6/Metamodel/ConcreteRoleHOW.nqp b/src/Perl6/Metamodel/ConcreteRoleHOW.nqp
@@ -1,4 +1,5 @@
 class Perl6::Metamodel::ConcreteRoleHOW
+    does Perl6::Metamodel::Locking
     does Perl6::Metamodel::Naming
     does Perl6::Metamodel::BUILDALL
     does Perl6::Metamodel::Composing

diff --git a/src/Perl6/Metamodel/NativeHOW.nqp b/src/Perl6/Metamodel/NativeHOW.nqp
@@ -1,4 +1,5 @@
 class Perl6::Metamodel::NativeHOW
+    does Perl6::Metamodel::Locking
     does Perl6::Metamodel::Naming
     does Perl6::Metamodel::BUILDALL
     does Perl6::Metamodel::Documenting

diff --git a/src/Perl6/Metamodel/NativeRefHOW.nqp b/src/Perl6/Metamodel/NativeRefHOW.nqp
@@ -1,5 +1,6 @@
 #- Metamodel::NativeRefHOW -----------------------------------------------------
 class Perl6::Metamodel::NativeRefHOW
+    does Perl6::Metamodel::Locking
     does Perl6::Metamodel::Naming
     does Perl6::Metamodel::BUILDALL
     does Perl6::Metamodel::Documenting