Fix signature issues with Supply.(zip|merge)

rakudo · Apr 20, 2014 · c0b27ba · c0b27ba
1 parent 15b0352
commit c0b27ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/core/Supply.pm b/src/core/Supply.pm
@@ -89,8 +89,8 @@ my role Supply {
     method map(&mapper)        { SupplyOperations.map(self, &mapper) }
     method uniq(:&as,:&with)   { SupplyOperations.uniq(self, :&as, :&with) }
     method squish(:&as,:&with) { SupplyOperations.squish(self, :&as, :&with) }
-    method merge($s)           { SupplyOperations.merge(self, $s) }
-    method zip($s,:&with)      { SupplyOperations.zip(self, $s, :&with) }
+    method merge(*@s)          { SupplyOperations.merge(self, @s) }
+    method zip(*@s,:&with)     { SupplyOperations.zip(self, @s, :&with) }
 }
 
 # The on meta-combinator provides a mechanism for implementing thread-safe

diff --git a/src/core/SupplyOperations.pm b/src/core/SupplyOperations.pm
@@ -241,7 +241,7 @@ my class SupplyOperations is repr('Uninstantiable') {
         MapSupply.new(:source($a), :&mapper)
     }
 
-    method merge(Supply @s is copy) {
+    method merge(*@s) {
 
         @s.shift unless @s[0].defined;  # lose if used as class method
         return @s[0] if +@s <= 1;       # nothing to be done
@@ -255,7 +255,7 @@ my class SupplyOperations is repr('Uninstantiable') {
         }
     }
 
-    method zip(Supply @s is copy, :&with is copy) {
+    method zip(*@s, :&with is copy) {
 
         @s.shift unless @s[0].defined;  # lose if used as class method
         return Supply unless +@s;       # nothing to be done