Add <block> subrule.

perl6 · Nov 8, 2009 · 57d2a44 · 57d2a44
1 parent 238f21b
commit 57d2a44
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -71,6 +71,10 @@ method pblock($/) {
     make $<blockoid>.ast;
 }
 
+method block($/) {
+    make $<blockoid>.ast;
+}
+
 method blockoid($/) {
     my $past := $<statementlist>.ast;
     my $BLOCK := @BLOCK.shift;
@@ -159,8 +163,8 @@ method statement_prefix:sym<INIT>($/) {
 }
 
 method blorst($/) {
-    make $<pblock>
-         ?? block_immediate($<pblock>.ast)
+    make $<block>
+         ?? block_immediate($<block>.ast)
          !! $<statement>.ast;
 }
 

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -94,7 +94,13 @@ token xblock {
 }
 
 token pblock {
-    <?[{]> 
+    [ <?[{]> || <.panic: 'Missing block'> ]
+    <.newpad>
+    <blockoid>
+}
+
+token block {
+    [ <?[{]> || <.panic: 'Missing block'> ]
     <.newpad>
     <blockoid>
 }
@@ -162,7 +168,7 @@ proto token statement_prefix { <...> }
 token statement_prefix:sym<INIT> { <sym> <blorst> }
 
 token blorst {
-    \s <.ws> [ <pblock> | <statement> ]
+    \s <.ws> [ <?[{]> <block> | <statement> ]
 }
 
 ## Terms