[nqp]: Add statement_control:sym<if> .

perl6 · Oct 21, 2009 · 9681684 · 9681684
1 parent 9104507
commit 9681684
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -30,6 +30,12 @@ method blockoid($/) {
     make $<statementlist>.ast;
 }
 
+## Statement control
+
+method statement_control:sym<if>($/) {
+    make $<xblock>.ast;
+}
+
 ## Terms
 
 method term:sym<identifier>($/) {

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -14,6 +14,7 @@ token statement {
 
 token eat_terminator {
     | ';'
+    | <?terminator>
     | $
 }
 
@@ -29,12 +30,17 @@ token blockoid {
     '{' ~ '}' <statementlist>
 }
 
+proto token terminator { <...> }
+
+token terminator:sym<;> { <?[;]> }
+token terminator:sym<}> { <?[}]> }
+
 ## Statement control
 
 proto token statement_control { <...> }
 
 token statement_control:sym<if> {
-    $<sym>=['if']
+    $<sym>=['if'] :s
     <xblock>
 }
 
@@ -77,6 +83,7 @@ token quote:sym<Q>    { 'Q'  <![(]> <.ws> <quote_EXPR> }
 
 token circumfix:sym<( )> { '(' <EXPR> ')' }
 token circumfix:sym<ang> { <?[<]>  <quote_EXPR: ':q', ':w'>  }
+token circumfix:sym<{ }> { <?[{]> <pblock> }
 
 ## Operators