[svn:parrot] r32482 - trunk/languages/perl6/src/parser

[pmichaud]

Author: pmichaud
Date: Sun Nov  9 23:21:05 2008
New Revision: 32482

Modified:
   trunk/languages/perl6/src/parser/actions.pm
   trunk/languages/perl6/src/parser/grammar.pg

Log:
[rakudo]:  Update for_statement to use xblock.


Modified: trunk/languages/perl6/src/parser/actions.pm
==============================================================================
--- trunk/languages/perl6/src/parser/actions.pm (original)
+++ trunk/languages/perl6/src/parser/actions.pm Sun Nov  9 23:21:05 2008
@@ -261,15 +261,10 @@
 }
 
 method for_statement($/) {
-    my $block := $( $<pblock> );
-    $block.blocktype('declaration');
-    declare_implicit_function_vars($block);
-    my $past := PAST::Op.new(
-        PAST::Op.new(:name('list'), $($<EXPR>)),
-        $block,
-        :pasttype($<sym>),
-        :node( $/ )
-    );
+    my $past := $( $<xblock> );
+    $past.pasttype('for');
+    $past[0] := PAST::Op.new(:name('list'), $past[0]);
+    declare_implicit_function_vars($past[1]);
     make $past;
 }
 

Modified: trunk/languages/perl6/src/parser/grammar.pg
==============================================================================
--- trunk/languages/perl6/src/parser/grammar.pg (original)
+++ trunk/languages/perl6/src/parser/grammar.pg Sun Nov  9 23:21:05 2008
@@ -303,7 +303,7 @@
 
 rule for_statement {
     $<sym>=[for]
-    <EXPR> <pblock>
+    <xblock>
     {*}
 }