Handle immediate blocks (in 'if' statements, at least).

perl6 · Oct 23, 2009 · f8fb418 · f8fb418
1 parent b7a03fc
commit f8fb418
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -1,5 +1,7 @@
 class NQP::Actions is HLL::Actions;
 
+our @BLOCK := Q:PIR { %r = new ['ResizablePMCArray'] };
+
 method TOP($/) { make $<statementlist>.ast; }
 
 method statementlist($/) {
@@ -20,7 +22,7 @@ method statement($/) {
 
 method xblock($/) {
     my $pblock := $<pblock>.ast;
-#    $pblock.blocktype('immediate');
+    $pblock.blocktype('immediate');
     make PAST::Op.new( $<EXPR>.ast, $pblock, :pasttype('if'), :node($/) );
 }
 
@@ -29,7 +31,16 @@ method pblock($/) {
 }
 
 method blockoid($/) {
-    make $<statementlist>.ast;
+    my $past := $<statementlist>.ast;
+    my $BLOCK := @BLOCK.shift;
+    $BLOCK.push($past);
+    $BLOCK.node($/);
+    make $BLOCK;
+}
+
+method newpad($/) {
+    our @BLOCK;
+    @BLOCK.unshift( PAST::Block.new( PAST::Stmts.new() ) );
 }
 
 ## Statement control
@@ -39,7 +50,7 @@ method statement_control:sym<if>($/) {
     my $past := $<xblock>[$count].ast;
     if $<else> {
         my $else := $<else>[0].ast;
-#        $else.blocktype('immediate');
+        $else.blocktype('immediate');
         $past.push($else);
     }
     # build if/then/elsif structure

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -1,6 +1,6 @@
 grammar NQP::Grammar is HLL::Grammar;
 
-token TOP { <?DEBUG> <statementlist> <?DUMP_TOKRX: 'noun'> [ $ || <.panic: 'Confused'> ] }
+token TOP { <statementlist> [ $ || <.panic: 'Confused'> ] }
 
 rule statementlist {
     | $
@@ -26,13 +26,19 @@ token xblock {
 }
 
 token pblock {
-    <?[{]> <blockoid>
+    <?[{]> 
+    <.newpad>
+    <blockoid>
 }
 
 token blockoid {
+    <.finishpad>
     '{' ~ '}' <statementlist>
 }
 
+token newpad { <?> }
+token finishpad { <?> }
+
 proto token terminator { <...> }
 
 token terminator:sym<;> { <?[;]> }