Simplify return/return-rw

Not sure why we were saving the parameters to have them returned, if we're returning them by exception already?
rakudo · Jun 11, 2016 · 2b76da0 · 2b76da0
1 parent 3d276a5
commit 2b76da0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/core/Mu.pm b/src/core/Mu.pm
@@ -38,17 +38,13 @@ my class Mu { # declared in BOOTSTRAP
     proto method split(|) { * }
 
     method take {
-        take self;
+        take self
     }
     method return-rw(|) {  # same code as control.pm's return-rw
-        my $list := RETURN-LIST(nqp::p6argvmarray());
-        nqp::p6routinereturn($list);
-        $list;
+        nqp::p6routinereturn(RETURN-LIST(nqp::p6argvmarray))
     }
     method return(|) {  # same code as control.pm's return
-        my $list := RETURN-LIST(nqp::p6argvmarray());
-        nqp::p6routinereturn(nqp::p6recont_ro($list));
-        $list;
+        nqp::p6routinereturn(nqp::p6recont_ro(RETURN-LIST(nqp::p6argvmarray)))
     }
 
     proto method WHY(|) { * }

diff --git a/src/core/control.pm b/src/core/control.pm
@@ -31,14 +31,10 @@ sub RETURN-LIST(Mu \list) is raw {
 }
 
 my &return-rw := -> | {
-    my $list := RETURN-LIST(nqp::p6argvmarray());
-    nqp::p6routinereturn($list);
-    $list;
+    nqp::p6routinereturn(RETURN-LIST(nqp::p6argvmarray))
 };
 my &return := -> | {
-    my $list := RETURN-LIST(nqp::p6argvmarray());
-    nqp::p6routinereturn(nqp::p6recont_ro($list));
-    $list;
+    nqp::p6routinereturn(nqp::p6recont_ro(RETURN-LIST(nqp::p6argvmarray)))
 };
 
 # RT #122732 - control operator crossed continuation barrier