Get Baggy.AT-KEY optimization back into role

We don't need no lexical, we can BEGIN :-)
rakudo · May 22, 2017 · accf519 · accf519
1 parent ff04a37
commit accf519
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/src/core/Bag.pm b/src/core/Bag.pm
@@ -39,14 +39,6 @@ my class Bag does Baggy {
         )
     }
 
-    my $p0 := nqp::p6bindattrinvres(nqp::create(Pair),Pair,'$!value',0);
-    multi method AT-KEY(Bag:D: \k) {
-        nqp::getattr(
-          nqp::ifnull(nqp::atkey(self.raw_hash,k.WHICH),$p0),
-          Pair,
-          '$!value'
-        )
-    }
     multi method DELETE-KEY(Bag:D: \k) {
         X::Immutable.new(method => 'DELETE-KEY', typename => self.^name).throw;
     }

diff --git a/src/core/Baggy.pm b/src/core/Baggy.pm
@@ -128,6 +128,16 @@ my role Baggy does QuantHash {
           0
         )
     }
+    multi method AT-KEY(Bag:D: \k) {
+        nqp::getattr(
+          nqp::ifnull(
+            nqp::atkey(self.raw_hash,k.WHICH),
+            BEGIN nqp::p6bindattrinvres(nqp::create(Pair),Pair,'$!value',0)
+          ),
+          Pair,
+          '$!value'
+        )
+    }
     multi method DELETE-KEY(Baggy:D: \k) {
         nqp::if(
           (my $raw := self.raw_hash)

diff --git a/src/core/Mix.pm b/src/core/Mix.pm
@@ -14,14 +14,6 @@ my class Mix does Mixy {
         )
     }
 
-    my $p0 := nqp::p6bindattrinvres(nqp::create(Pair),Pair,'$!value',0);
-    multi method AT-KEY(Mix:D: \k) {
-        nqp::getattr( 
-          nqp::ifnull(nqp::atkey(self.raw_hash,k.WHICH),$p0),
-          Pair,
-          '$!value'
-        )
-    }
     multi method DELETE-KEY(Mix:D: \k) {
         X::Immutable.new(method => 'DELETE-KEY', typename => self.^name).throw;
     }