Create Setty.new-fp so that the .Set and .KeySet coercers can use that

rakudo · Sep 7, 2013 · 22622a9 · 22622a9
1 parent 06622f7
commit 22622a9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/src/core/Any.pm b/src/core/Any.pm
@@ -741,22 +741,8 @@ my class Any { # declared in BOOTSTRAP
     }
     method FLATTENABLE_HASH() { nqp::hash() }
 
-    method Set() {
-        my @keys;
-        for self.list() {
-            when Pair { @keys.push(.key) if .value }
-            default   { @keys.push($_) }
-        }
-        Set.new(@keys);
-    }
-    method KeySet() {
-        my @keys;
-        for self.list() {
-            when Pair { @keys.push(.key) if .value; }
-            default   { @keys.push($_) }
-        }
-        KeySet.new(@keys);
-    }
+    method Set()    {    Set.new-fp(self.list) }
+    method KeySet() { KeySet.new-fp(self.list) }
     method Bag()    {    Bag.new-fp(self.list) }
     method KeyBag() { KeyBag.new-fp(self.list) }
 }

diff --git a/src/core/Setty.pm b/src/core/Setty.pm
@@ -52,6 +52,18 @@ my role Setty does Associative {
         %e{$_.WHICH} = $_ for @args;
         self.bless(:elems(%e));
     }
+    method new-fp(*@pairs --> Setty) {
+        my %e;
+        for @pairs {
+            when Pair {
+                %e{.key.WHICH} //= $_.key if .value;
+            }
+            default {
+                %e{.WHICH} //= $_;
+            }
+        }
+        self.bless(:elems(%e));
+    }
 
     method ACCEPTS($other) {
         self.defined