Make 'return' a term taking an optional argument.

This way, 'return;' won't be silently ignored in a function. Closes #127.
Raku · Oct 28, 2013 · 724a9b1 · 724a9b1
1 parent e13e2f4
commit 724a9b1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/NQP/Actions.nqp b/src/NQP/Actions.nqp
@@ -1559,8 +1559,9 @@ class NQP::Actions is HLL::Actions {
 
     method postfix:sym<.>($/) { make $<dotty>.ast; }
 
-    method prefix:sym<return>($/) {
-        make QAST::Op.new( :op('call'), :name('RETURN') );
+    method term:sym<return>($/) {
+        make QAST::Op.new( :op('call'), :name('RETURN'),
+            $<EXPR> ?? $<EXPR>.ast !!  QAST::WVal.new( :value($*W.find_sym(['NQPMu'])) ));
     }
 
     method prefix:sym<make>($/) {

diff --git a/src/NQP/Grammar.nqp b/src/NQP/Grammar.nqp
@@ -629,7 +629,7 @@ grammar NQP::Grammar is HLL::Grammar {
     }
 
     token term:sym<name> {
-        <name> <args>**0..1
+        <name> <?{ ~$<name> ne 'return' }> <args>**0..1
     }
 
     token args {
@@ -796,8 +796,8 @@ grammar NQP::Grammar is HLL::Grammar {
 
     token infix:sym<,>    { <sym>  <O('%comma, :op<list>')> }
 
-    token prefix:sym<return> { <sym> \s <O('%list_prefix')> { $*RETURN_USED := 1 } }
     token prefix:sym<make>   { <sym> \s <O('%list_prefix')> }
+    token term:sym<return> { <sym> [\s <EXPR>]? { $*RETURN_USED := 1 } }
 
     method smartmatch($/) {
         # swap rhs into invocant position