Merge pull request #1400 from jstuder-gh/issue_1397_ords_rotor

Issue 1397: Reifiy pending elements in Seq prior to rotor call
rakudo · Jan 14, 2018 · 1ed8f5d · 1ed8f5d
2 parents 029226f + 4a82b4b
commit 1ed8f5d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/core/Rakudo/Iterator.pm b/src/core/Rakudo/Iterator.pm
@@ -2795,6 +2795,7 @@ class Rakudo::Iterator {
             has $!cycle;
             has $!buffer;
             has int $!complete;
+            has int $!is-exhausted = 0;
             method !SET-SELF(\iterator,\cycle,\partial) {
                 nqp::stmts(
                   ($!iterator := iterator),
@@ -2812,6 +2813,9 @@ class Rakudo::Iterator {
                 )
             }
             method pull-one() is raw {
+              nqp::if(
+                $!is-exhausted,
+                IterationEnd,
                 nqp::stmts(
                   nqp::if(
                     nqp::istype((my $todo := $!cycle.pull-one),Pair),
@@ -2896,6 +2900,7 @@ class Rakudo::Iterator {
                   nqp::if(
                     nqp::not_i(nqp::elems($!buffer))
                       || (nqp::eqaddr($pulled,IterationEnd)
+                           && ($!is-exhausted = 1)
                            && $!complete
                            && nqp::islt_i(nqp::elems($!buffer),$elems)
                          ),
@@ -2946,6 +2951,7 @@ class Rakudo::Iterator {
                     )
                   )
                 )
+              )
             }
             method is-lazy() { $!iterator.is-lazy }
         }.new(iterator,cycle,partial)