Add some (non-working) block rules to NQP.

perl6 · Oct 21, 2009 · 31f8ae7 · 31f8ae7
1 parent 4ed10a8
commit 31f8ae7
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -10,7 +10,25 @@ method statementlist($/) {
     make $past;
 }
 
-method statement($/) { make $<EXPR>.ast; }
+method statement($/) { 
+    my $past;
+    if $<EXPR> { $past := $<EXPR>.ast; }
+    elsif $<statement_control> { $past := $<statement_control>.ast; }
+    else { $past := 0; }
+    make $past;
+}
+
+method xblock($/) {
+    make PAST::Op.new( $<EXPR>.ast, $<pblock>.ast, :pasttype('if') );
+}
+
+method pblock($/) {
+    make $<blockoid>.ast;
+}
+
+method blockoid($/) {
+    make $<statementlist>.ast;
+}
 
 ## Terms
 
@@ -41,6 +59,8 @@ method circumfix:sym<( )>($/) { make $<EXPR>.ast; }
 
 method circumfix:sym<ang>($/) { make $<quote_EXPR>.ast; }
 
+method circumfix:sym<{ }>($/) { make $<pblock>.ast; }
+
 method postcircumfix:sym<[ ]>($/) {
     make PAST::Var.new( $<EXPR>.ast , :scope('keyed_int') );
 }

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -8,6 +8,7 @@ rule statementlist {
 }
 
 token statement {
+    | <statement_control>
     | <EXPR>
 }
 
@@ -16,6 +17,29 @@ token eat_terminator {
     | $
 }
 
+token xblock {
+    <EXPR> <.ws> <pblock>
+}
+
+token pblock {
+    <?[{]> <blockoid>
+}
+
+token blockoid {
+    '{' ~ '}' <statementlist>
+}
+
+## Statement control
+
+proto token statement_control { <...> }
+
+token statement_control:sym<if> {
+    $<sym>=['if']
+    <xblock>
+}
+
+
+
 ## Terms
 
 proto token term { <...> }