Fix nested for-loop side-effects in sink context.

rakudo · Dec 9, 2012 · d4bf9e4 · d4bf9e4
1 parent 469768f
commit d4bf9e4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/src/core/List.pm b/src/core/List.pm
@@ -97,14 +97,14 @@ my class List does Positional {
         nqp::p6bool(nqp::existspos($!items, nqp::unbox_i(pos)))
     }
 
-    method gimme($n) {
+    method gimme($n, :$sink) {
         # loop through iterators until we have at least $n elements
         my int $count = nqp::elems(nqp::p6listitems(self));
         my $eager = nqp::p6bool(nqp::istype($n, Whatever) || $n == $Inf);
         while $!nextiter.defined && ($eager 
                                        ?? !$!nextiter.infinite 
                                        !! ($count < $n)) {
-            $!nextiter.reify($eager ?? Whatever !! $n - $count);
+            $!nextiter.reify($eager ?? Whatever !! $n - $count, :$sink);
             $count = nqp::elems($!items);
         }
 
@@ -381,7 +381,7 @@ my class List does Positional {
     }
 
     method sink() {
-        self.eager;
+        self.gimme(*, :sink);
         Nil;
     }
 }

diff --git a/src/core/ListIter.pm b/src/core/ListIter.pm
@@ -7,7 +7,7 @@ my class ListIter {
     #   has Mu $!rest;         # RPA of elements remaining to be reified
     #   has $!list;            # List object associated with this iterator
 
-    method reify($n = 1) {
+    method reify($n = 1, :$sink) {
         unless nqp::isconcrete($!reified) {
             my $eager = nqp::p6bool(nqp::istype($n, Whatever));
             my $flattens = nqp::p6bool(nqp::isconcrete($!list)) && $!list.flattens;
@@ -33,7 +33,8 @@ my class ListIter {
                         $x := $x.iterator.reify(
                                   $eager 
                                     ?? Whatever 
-                                    !! nqp::p6box_i($count - nqp::elems($rpa)))
+                                    !! nqp::p6box_i($count - nqp::elems($rpa)),
+                                  :$sink)
                             if nqp::istype($x, Iterable);
                         nqp::splice($!rest, nqp::getattr($x, Parcel, '$!storage'), 0, 0);
 

diff --git a/src/core/MapIter.pm b/src/core/MapIter.pm
@@ -24,7 +24,7 @@ my class MapIter is Iterator {
 
     method flattens() { $!flattens }
 
-    method reify($n = 1) {
+    method reify($n = 1, :$sink) {
         unless nqp::isconcrete($!reified) {
             my $argc   = $!block.count;
             $argc = 1 if $argc < 1 || $argc ~~ Inf;
@@ -48,9 +48,10 @@ my class MapIter is Iterator {
 
             my int $NEXT = nqp::can($block, 'fire_phasers') 
                              && +$block.phasers('NEXT');
+            my int $is_sink = $sink ?? 1 !! 0;
 
             Q:PIR {
-                .local int argc, count, NEXT
+                .local int argc, count, NEXT, is_sink
                 .local pmc handler, self, MapIter, items, args, result, block, rpa
                 $P0      = find_lex '$argc'
                 argc     = repr_unbox_int $P0
@@ -64,6 +65,7 @@ my class MapIter is Iterator {
                 block    = find_lex '$block'
                 handler  = root_new ['parrot';'ExceptionHandler']
                 NEXT     = find_lex '$NEXT'
+                is_sink  = find_lex '$is_sink'
 
                 set_addr handler, catch
                 handler.'handle_types'(.CONTROL_LOOP_LAST, .CONTROL_LOOP_NEXT, .CONTROL_LOOP_REDO)
@@ -84,8 +86,18 @@ my class MapIter is Iterator {
                 unless args goto iter_done
               redo:
                 result = block(args :flat)
+                if is_sink goto sink_result
                 push rpa, result
                 goto next
+              sink_result:
+                $I0 = repr_defined result
+                unless $I0 goto next
+                $I0 = can result, 'sink'
+                unless $I0 goto next
+                $I0 = defined result
+                unless $I0 goto next
+                result.'sink'()
+                goto next
               catch:
                 .local pmc exception, type
                 .get_results (exception)