Fix blorst to genrate well-nested QAST.

rakudo · Jun 28, 2013 · 6b4e594 · 6b4e594
1 parent 78374b7
commit 6b4e594
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -1207,7 +1207,9 @@ class Perl6::Actions is HLL::Actions does STDActions {
     }
 
     method blorst($/) {
-        make $<block> ?? $<block>.ast !! make_thunk_ref($<statement>.ast, $/);
+        make $<block>
+            ?? $<block>.ast
+            !! make_thunk_ref($<statement>.ast, $/, $*BLORST_BLOCK);
     }
 
     # Statement modifiers
@@ -5428,8 +5430,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
         return $closure;
     }
 
-    sub make_thunk_ref($to_thunk, $/) {
-        my $block := $*W.push_lexpad($/);
+    sub make_thunk_ref($to_thunk, $/, $block = $*W.push_lexpad($/)) {
         $block.push(QAST::Stmts.new(autosink($to_thunk)));
         $*W.pop_lexpad();
         reference_to_code_object(

diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -1314,7 +1314,12 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
     }
 
     token blorst {
-        \s <.ws> [ <?[{]> <block> | <![;]> <statement> || <.missing: 'block or statement'> ]
+        \s <.ws>
+        [
+        | <?[{]> <block>
+        | <![;]> :my $*BLORST_BLOCK := $*W.push_lexpad($/); <statement>
+        || <.missing: 'block or statement'>
+        ]
     }
 
     ## Statement modifiers