Don't call BUILD ourselves anymore

So that BUILD won't need to return self either anymore
rakudo · Jul 29, 2015 · df4c333 · df4c333
1 parent 7bda3db
commit df4c333
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git a/src/core/BagHash.pm b/src/core/BagHash.pm
@@ -2,9 +2,7 @@ my class BagHash does Baggy {
 
     method Bag (:$view) {
         if $view {
-            my $bag := nqp::create(Bag);
-            $bag.BUILD( :elems(%!elems) );
-            $bag;
+            Bag.bless( :elems(%!elems) );
         }
         else {
             Bag.new-from-pairs(%!elems.values);

diff --git a/src/core/Baggy.pm b/src/core/Baggy.pm
@@ -1,7 +1,7 @@
 my role Baggy does QuantHash {
     has %!elems; # key.WHICH => (key,value)
 
-    submethod BUILD (:%!elems) { self }
+    submethod BUILD (:%!elems) { }
     method default(--> Int) { 0 }
 
     multi method keys(Baggy:D:)     { %!elems.values.map( {.key} ) }

diff --git a/src/core/MixHash.pm b/src/core/MixHash.pm
@@ -2,9 +2,7 @@ my class MixHash does Mixy {
 
     method Mix (:$view) {
         if $view {
-            my $mix := nqp::create(Mix);
-            $mix.BUILD( :elems(%!elems) );
-            $mix;
+            Mix.bless(:elems(%!elems));
         }
         else {
             Mix.new-from-pairs(%!elems.values);

diff --git a/src/core/Mixy.pm b/src/core/Mixy.pm
@@ -15,7 +15,7 @@ my role Mixy does Baggy  {
         for %e -> $p {
             %e.DELETE-KEY($p.key) if $p.value.value == 0;
         }
-        nqp::create(self).BUILD(:elems(%e));
+        self.bless(:elems(%e));
     }
 
     multi method gist(Mixy:D $ : --> Str) {

diff --git a/src/core/SetHash.pm b/src/core/SetHash.pm
@@ -2,9 +2,7 @@ my class SetHash does Setty {
 
     method Set (:$view) {
         if $view {
-            my $set := nqp::create(Set);
-            $set.BUILD( :elems(%!elems) );
-            $set;
+            Set.bless( :elems(%!elems) );
         }
         else {
             Set.new(self.keys);

diff --git a/src/core/Setty.pm b/src/core/Setty.pm
@@ -1,7 +1,7 @@
 my role Setty does QuantHash {
     has %!elems; # key.WHICH => key
 
-    submethod BUILD (:%!elems)  { self }
+    submethod BUILD (:%!elems)  { }
     method default(--> Bool) { False }
 
     multi method keys(Setty:D:)   { %!elems.values }