Fix andthen, notandthen, and orelse for 1-arg Iterable case

Be sure we update the $els var after we swap the 1-arg iterable to be our list of args.
rakudo · Apr 29, 2017 · 1ed76a9 · 1ed76a9
1 parent fdb2b2a
commit 1ed76a9
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/core/operators.pm b/src/core/operators.pm
@@ -671,7 +671,8 @@ sub infix:<andthen>(+a) {
           nqp::iseq_i($els, 1) && nqp::istype($current, Iterable),
           nqp::stmts(
             ($args := $current.List),
-            $current := $args[0])),
+            ($current := $args[0]),
+            $els = $args.elems)),
         (my int $i),
         nqp::until(
           nqp::iseq_i($els, $i = nqp::add_i($i, 1))
@@ -701,7 +702,8 @@ sub infix:<notandthen>(+a) {
           nqp::iseq_i($els, 1) && nqp::istype($current, Iterable),
           nqp::stmts(
             ($args := $current.List),
-            $current := $args[0])),
+            ($current := $args[0]),
+            $els = $args.elems)),
         (my int $i),
         nqp::until(
           nqp::iseq_i($els, $i = nqp::add_i($i, 1))
@@ -731,7 +733,8 @@ sub infix:<orelse>(+$) {
           nqp::iseq_i($els, 1) && nqp::istype($current, Iterable),
           nqp::stmts(
             ($args := $current.List),
-            $current := $args[0])),
+            ($current := $args[0]),
+            $els = $args.elems)),
         (my int $i),
         nqp::until(
           $current.defined || nqp::iseq_i($els, $i = nqp::add_i($i, 1)),