Make Supply.Supply do the right thing

This also involved making .Supply a multi. This breaks 2 questionable spectests.
rakudo · Jun 11, 2017 · 52d3957 · 52d3957
1 parent 5c56e9e
commit 52d3957
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/src/core/Any.pm b/src/core/Any.pm
@@ -453,7 +453,8 @@ my class Any { # declared in BOOTSTRAP
     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 }
+    proto method Supply(|) is nodal { * }
+    multi method Supply() { self.list.Supply }
 
     method nl-out() { "\n" }
     method print-nl() { self.print(self.nl-out) }

diff --git a/src/core/Channel.pm b/src/core/Channel.pm
@@ -106,7 +106,7 @@ my class Channel does Awaitable {
         }
     }
 
-    method Supply(Channel:D:) {
+    multi method Supply(Channel:D:) {
         supply {
             # Tap the async notification for new values supply.
             whenever $!async-notify.unsanitized-supply.schedule-on($*SCHEDULER) {

diff --git a/src/core/IO/CatHandle.pm b/src/core/IO/CatHandle.pm
@@ -158,7 +158,7 @@ my class IO::CatHandle is IO::Handle {
     }
     multi method lines(::?CLASS:D:) { self!LINES }
 
-    method Supply (::?CLASS:D: :$size = $*DEFAULT-READ-ELEMS --> Supply:D) {
+    multi method Supply (::?CLASS:D: :$size = $*DEFAULT-READ-ELEMS --> Supply:D) {
         nqp::if(
           nqp::isconcrete($!encoding),
           (supply nqp::stmts(

diff --git a/src/core/IO/Handle.pm b/src/core/IO/Handle.pm
@@ -469,7 +469,7 @@ my class IO::Handle {
         $result
     }
 
-    method Supply(IO::Handle:D: :$size = $*DEFAULT-READ-ELEMS --> Supply:D) {
+    multi method Supply(IO::Handle:D: :$size = $*DEFAULT-READ-ELEMS --> Supply:D) {
         if $!decoder { # handle is in character mode
             supply {
                 my int $chars = $size;

diff --git a/src/core/IO/Socket/Async.pm b/src/core/IO/Socket/Async.pm
@@ -41,7 +41,7 @@ my class IO::Socket::Async {
         -> Mu \seq, Mu \data, Mu \err { $ss.process(seq, data, err) }
     }
 
-    method Supply(IO::Socket::Async:D: :$bin, :$buf = buf8.new, :$enc, :$scheduler = $*SCHEDULER) {
+    multi method Supply(IO::Socket::Async:D: :$bin, :$buf = buf8.new, :$enc, :$scheduler = $*SCHEDULER) {
         if $bin {
             my $cancellation;
             Supply.on-demand:

diff --git a/src/core/List.pm b/src/core/List.pm
@@ -911,7 +911,7 @@ my class List does Iterable does Positional { # declared in BOOTSTRAP
     }
     method FLATTENABLE_HASH() { nqp::hash() }
 
-    method Supply(List:D:) { Supply.from-list(self) }
+    multi method Supply(List:D:) { Supply.from-list(self) }
 
     method CALL-ME(List:U: |c) {
         self.new(|c);

diff --git a/src/core/Promise.pm b/src/core/Promise.pm
@@ -256,7 +256,7 @@ my class Promise does Awaitable {
         $p
     }
 
-    method Supply(Promise:D:) {
+    multi method Supply(Promise:D:) {
         Supply.on-demand: -> $s {
             self.then({
                 if self.status == Kept {

diff --git a/src/core/Supply.pm b/src/core/Supply.pm
@@ -573,7 +573,7 @@ my class Supply does Awaitable {
     ## Coercions
     ##
 
-    method Supply(Supply:) { self }
+    multi method Supply(Supply:D:) { self }
 
     method Channel(Supply:D:) {
         my $c = Channel.new();
@@ -585,7 +585,7 @@ my class Supply does Awaitable {
     }
 
     my class ConcQueue is repr('ConcBlockingQueue') { }
-    method list(Supply:D:) {
+    multi method list(Supply:D:) {
         gather {
             my Mu \queue = nqp::create(ConcQueue);
             my $exception;