.tap now has done/quit named parameters

rakudo · Nov 23, 2013 · ea77e4f · ea77e4f
1 parent b6eee1f
commit ea77e4f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 31 deletions.
diff --git a/src/vm/jvm/core/Supply.pm b/src/vm/jvm/core/Supply.pm
@@ -18,7 +18,7 @@ my role Supply {
     has @!tappers;
     has $!tappers_lock = Lock.new;
 
-    method tap(&more, &done?, &quit?) {
+    method tap(&more, :&done, :&quit) {
         my $sub = Tap.new(:&more, :&done, :&quit, :supply(self));
         $!tappers_lock.protect({
             @!tappers.push($sub);
@@ -64,10 +64,9 @@ my role Supply {
 
     method Channel() {
         my $c = Channel.new();
-        self.tap(
-            -> \val { $c.send(val) },
-            { $c.close },
-            -> $ex { $c.quit($ex) });
+        self.tap( -> \val { $c.send(val) },
+          done => { $c.close },
+          quit => -> $ex { $c.quit($ex) });
         $c
     }
 
@@ -126,19 +125,18 @@ sub on(&setup) {
                 &quit = -> $ex { self.quit($ex) }
             }
             $source.tap(
-                -> \val {
-                    $lock.protect({ more(val) });
-                    CATCH { self.quit($_) }
-                },
-                {
-                    $lock.protect({ done() });
-                    CATCH { self.quit($_) }
-                },
-                -> $ex {
-                    $lock.protect({ quit($ex) });
-                    CATCH { self.quit($_) }
-                }
-            );
+              -> \val {
+                  $lock.protect({ more(val) });
+                  CATCH { self.quit($_) }
+              },
+              done => {
+                  $lock.protect({ done() });
+                  CATCH { self.quit($_) }
+              },
+              quit => -> $ex {
+                  $lock.protect({ quit($ex) });
+                  CATCH { self.quit($_) }
+              });
         }
 
         method tap(|c) {

diff --git a/src/vm/jvm/core/SupplyOperations.pm b/src/vm/jvm/core/SupplyOperations.pm
@@ -90,12 +90,11 @@ my class SupplyOperations is repr('Uninstantiable') {
 
             method tap(|c) {
                 my $sub = self.Supply::tap(|c);
-                my $tap = $!source.tap(
-                    -> \val {
-                        if (&!filter(val)) { self!more(val) }
-                    },
-                    { self!done(); },
-                    -> $ex { self!quit($ex) }
+                my $tap = $!source.tap( -> \val {
+                      if (&!filter(val)) { self!more(val) }
+                  },
+                  done => { self!done(); },
+                  quit => -> $ex { self!quit($ex) }
                 );
                 $sub
             }
@@ -112,13 +111,11 @@ my class SupplyOperations is repr('Uninstantiable') {
 
             method tap(|c) {
                 my $sub = self.Supply::tap(|c);
-                my $tap = $!source.tap(
-                    -> \val {
-                        self!more(&!mapper(val))
-                    },
-                    { self!done(); },
-                    -> $ex { self!quit($ex) }
-                );
+                my $tap = $!source.tap( -> \val {
+                      self!more(&!mapper(val))
+                  },
+                  done => { self!done(); },
+                  quit => -> $ex { self!quit($ex) });
                 $sub
             }
         }