nextsame/nextwith should always cause a return

Even in the case they have nowhere to go.
rakudo · Nov 17, 2015 · 7c6a55e · 7c6a55e
1 parent a662e02
commit 7c6a55e
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/core/control.pm b/src/core/control.pm
@@ -112,11 +112,9 @@ my &callwith := -> |c {
 
 my &nextwith := -> |c {
     my Mu $dispatcher := nqp::p6finddispatcher('nextwith');
-    unless $dispatcher.exhausted {
-        nqp::p6routinereturn(nqp::p6recont_ro(
-            $dispatcher.call_with_args(|c)))
-    }
-    Nil
+    nqp::p6routinereturn($dispatcher.exhausted
+        ?? Nil
+        !! nqp::p6recont_ro($dispatcher.call_with_args(|c)))
 };
 
 my &callsame := -> {
@@ -128,12 +126,10 @@ my &callsame := -> {
 
 my &nextsame := -> {
     my Mu $dispatcher := nqp::p6finddispatcher('nextsame');
-    unless $dispatcher.exhausted {
-        nqp::p6routinereturn(nqp::p6recont_ro(
-            $dispatcher.call_with_capture(
+    nqp::p6routinereturn($dispatcher.exhausted
+        ?? Nil
+        !! nqp::p6recont_ro($dispatcher.call_with_capture(
                 nqp::p6argsfordispatcher($dispatcher))))
-    }
-    Nil
 };
 
 my &lastcall := -> --> True {