Handle QuantHash:U coercion differently

This should fix some issues with set operators (RT ##131300). Before this, Set.Set would return Set. Now it returns set(Set). So instead of not coercing a QuantHash type object, we now coerce it into a defined QuantHash object with the type object as its member. This is consistent with e.g. Int.Set, which already coerced to set(Int).
rakudo · May 13, 2017 · 407bce1 · 407bce1
1 parent ba0581d
commit 407bce1
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 35 deletions.
diff --git a/src/core/Any.pm b/src/core/Any.pm
@@ -432,12 +432,24 @@ my class Any { # declared in BOOTSTRAP
     }
     method FLATTENABLE_HASH() is nodal { nqp::hash() }
 
-    method Set()     is nodal {     Set.new-from-pairs(self.list) }
-    method SetHash() is nodal { SetHash.new-from-pairs(self.list) }
-    method Bag()     is nodal {     Bag.new-from-pairs(self.list) }
-    method BagHash() is nodal { BagHash.new-from-pairs(self.list) }
-    method Mix()     is nodal {     Mix.new-from-pairs(self.list) }
-    method MixHash() is nodal { MixHash.new-from-pairs(self.list) }
+    proto method Set(|) is nodal { * }
+    multi method Set(Any:) { Set.new-from-pairs(self.list) }
+
+    proto method SetHash(|) is nodal { * }
+    multi method SetHash(Any:) { SetHash.new-from-pairs(self.list) }
+
+    proto method Bag(|) is nodal { * }
+    multi method Bag(Any:) { Bag.new-from-pairs(self.list) }
+
+    proto method BagHash(|) is nodal { * }
+    multi method BagHash(Any:) { BagHash.new-from-pairs(self.list) }
+
+    proto method Mix(|) is nodal { * }
+    multi method Mix(Any:) { Mix.new-from-pairs(self.list) }
+
+    proto method MixHash(|) is nodal { * }
+    multi method MixHash() { MixHash.new-from-pairs(self.list) }
+
     # XXX GLR does this really need to force a list?
     method Supply() is nodal { self.list.Supply }
 

diff --git a/src/core/Bag.pm b/src/core/Bag.pm
@@ -42,8 +42,8 @@ my class Bag does Baggy {
     }
 
 #--- coercion methods
-    method Bag() is nodal { self }
-    method Mix() is nodal {
+    multi method Bag(Bag:D:) { self }
+    multi method Mix(Bag:D:) {
         nqp::p6bindattrinvres(nqp::create(Mix),Mix,'%!elems',%!elems)
     }
 

diff --git a/src/core/BagHash.pm b/src/core/BagHash.pm
@@ -59,7 +59,7 @@ my class BagHash does Baggy {
 #--- introspection methods
     method total() { Rakudo::QuantHash.BAG-TOTAL(self.raw_hash) }
 
-    method Bag(:$view) is nodal {
+    multi method Bag(BagHash:D: :$view) {
         nqp::if(
           (my $raw := self.raw_hash) && nqp::elems($raw),
           nqp::p6bindattrinvres(
@@ -69,8 +69,8 @@ my class BagHash does Baggy {
           bag()
         )
     }
-    method BagHash() is nodal { self }
-    method Mix() is nodal {
+    multi method BagHash(BagHash:D:) { self }
+    multi method Mix(BagHash:D:) {
         nqp::if(
           (my $raw := self.raw_hash) && nqp::elems($raw),
           nqp::p6bindattrinvres(nqp::create(Mix),Mix,'%!elems',%!elems.clone),

diff --git a/src/core/Baggy.pm b/src/core/Baggy.pm
@@ -637,8 +637,8 @@ my role Baggy does QuantHash {
           )
         )
     }
-    method Set() is nodal     { self!SETIFY(Set)     }
-    method SetHash() is nodal { self!SETIFY(SetHash) }
+    multi method Set(Baggy:D:)     { self!SETIFY(Set)     }
+    multi method SetHash(Baggy:D:) { self!SETIFY(SetHash) }
 
     method !BAGGIFY(\type) {
         nqp::if(
@@ -684,8 +684,8 @@ my role Baggy does QuantHash {
         )
     }
 
-    method Bag() is nodal     { self!BAGGIFY(Bag)     }
-    method BagHash() is nodal { self!BAGGIFY(BagHash) }
+    multi method Bag(Baggy:D:)     { self!BAGGIFY(Bag)     }
+    multi method BagHash(Baggy:D:) { self!BAGGIFY(BagHash) }
 
     method !MIXIFY(\type) {
         nqp::if(
@@ -716,8 +716,8 @@ my role Baggy does QuantHash {
         )
     }
 
-    method Mix() is nodal     { self!MIXIFY(Mix)     }
-    method MixHash() is nodal { self!MIXIFY(MixHash) }
+    multi method Mix(Baggy:D:)     { self!MIXIFY(Mix)     }
+    multi method MixHash(Baggy:D:) { self!MIXIFY(MixHash) }
 
     method clone() {
         nqp::if(

diff --git a/src/core/Hash.pm b/src/core/Hash.pm
@@ -777,8 +777,8 @@ my class Hash { # declared in BOOTSTRAP
               )
             )
         }
-        method Set() is nodal     { self!SETIFY(Set    ) }
-        method SetHash() is nodal { self!SETIFY(SetHash) }
+        multi method Set(::?CLASS:D:)     { self!SETIFY(Set    ) }
+        multi method SetHash(::?CLASS:D:) { self!SETIFY(SetHash) }
     }
     method ^parameterize(Mu:U \hash, Mu:U \t, |c) {
         if c.elems == 0 {

diff --git a/src/core/Iterable.pm b/src/core/Iterable.pm
@@ -157,8 +157,8 @@ my role Iterable {
           )
         )
     }
-    method Set() is nodal     { self!SETIFY(Set)     }
-    method SetHash() is nodal { self!SETIFY(SetHash) }
+    multi method Set(Iterable:D:)     { self!SETIFY(Set)     }
+    multi method SetHash(Iterable:D:) { self!SETIFY(SetHash) }
 }
 
 #?if jvm

diff --git a/src/core/Map.pm b/src/core/Map.pm
@@ -433,8 +433,8 @@ my class Map does Iterable does Associative { # declared in BOOTSTRAP
           )
         )
     }
-    method Set() is nodal     { self!SETIFY(Set)     }
-    method SetHash() is nodal { self!SETIFY(SetHash) }
+    multi method Set(Map:D:)     { self!SETIFY(Set)     }
+    multi method SetHash(Map:D:) { self!SETIFY(SetHash) }
 }
 
 multi sub infix:<eqv>(Map:D \a, Map:D \b) {

diff --git a/src/core/Mix.pm b/src/core/Mix.pm
@@ -45,7 +45,7 @@ my class Mix does Mixy {
     }
 
 #--- coercion methods
-    method Mix() is nodal { self }
+    multi method Mix(Mix:D:) { self }
 
     method clone() { nqp::clone(self) }
 

diff --git a/src/core/MixHash.pm b/src/core/MixHash.pm
@@ -59,7 +59,7 @@ my class MixHash does Mixy {
     multi method new(MixHash:_:) { nqp::create(self) }
 
 #--- coercion methods
-    method Mix(:$view) is nodal {
+    multi method Mix(MixHash:D: :$view) {
         nqp::if(
           (my $raw := self.raw_hash) && nqp::elems($raw),
           nqp::p6bindattrinvres(
@@ -69,7 +69,7 @@ my class MixHash does Mixy {
           mix()
         )
     }
-    method MixHash() is nodal { self }
+    multi method MixHash(MixHash:D:) { self }
 
 #--- iterator methods
     sub proxy(Mu \iter,Mu \storage) is raw {

diff --git a/src/core/QuantHash.pm b/src/core/QuantHash.pm
@@ -5,7 +5,9 @@ my role QuantHash does Associative {
     method Real    ( --> Real:D)    { self.total.Real }
 
     method Capture() { self.Hash.Capture }
-    method list() { self.pairs.cache }
+
+    multi method list(QuantHash:U:) { self.Any::list }
+    multi method list(QuantHash:D:) { self.pairs.cache }
 
     method fmt(QuantHash: Cool $format = "%s\t\%s", $sep = "\n") {
         nqp::iseq_i(nqp::sprintfdirectives( nqp::unbox_s($format.Stringy)),1)

diff --git a/src/core/Set.pm b/src/core/Set.pm
@@ -87,8 +87,8 @@ my class Set does Setty {
         X::Immutable.new( method => 'grabpairs', typename => self.^name ).throw;
     }
 
-    method Set() is nodal { self }
-    method SetHash() is nodal {
+    multi method Set(Set:D:) { self }
+    multi method SetHash(Set:D:) {
         nqp::if(
           $!elems,
           nqp::p6bindattrinvres(

diff --git a/src/core/SetHash.pm b/src/core/SetHash.pm
@@ -117,7 +117,7 @@ my class SetHash does Setty {
         )
     }
 
-    method Set(SetHash:D: :$view) is nodal {
+    multi method Set(SetHash:D: :$view) {
         nqp::if(
           $!elems,
           nqp::p6bindattrinvres(
@@ -127,7 +127,7 @@ my class SetHash does Setty {
           nqp::create(Set)
         )
     }
-    method SetHash(SetHash:D:) is nodal { self }
+    multi method SetHash(SetHash:D:) { self }
 
     multi method AT-KEY(SetHash:D: \k --> Bool:D) is raw {
         Proxy.new(

diff --git a/src/core/Setty.pm b/src/core/Setty.pm
@@ -214,10 +214,10 @@ my role Setty does QuantHash {
           nqp::create(type)
         )
     }
-    method Bag()     { self!BAGGIFY(Bag)     }
-    method BagHash() { self!BAGGIFY(BagHash) }
-    method Mix()     { self!BAGGIFY(Mix)     }
-    method MixHash() { self!BAGGIFY(MixHash) }
+    multi method Bag(Setty:D:)     { self!BAGGIFY(Bag)     }
+    multi method BagHash(Setty:D:) { self!BAGGIFY(BagHash) }
+    multi method Mix(Setty:D:)     { self!BAGGIFY(Mix)     }
+    multi method MixHash(Setty:D:) { self!BAGGIFY(MixHash) }
 
     method raw_hash() is raw { $!elems }
     method hll_hash() is raw {