From 68bb56ba66915fa81c3ea0918203565b350ae4c3 Mon Sep 17 00:00:00 2001
From: Jonathan Scott Duff <duff@pobox.com>
Date: Sun, 21 Feb 2010 01:19:13 -0600
Subject: [PATCH] simplify statement_mod_loop logic a little

---
 src/Perl6/Actions.pm | 13 +++++--------
 src/Perl6/Grammar.pm |  6 +++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
index 6a7bec65aba..63ebdabebb0 100644
--- a/src/Perl6/Actions.pm
+++ b/src/Perl6/Actions.pm
@@ -132,14 +132,11 @@ method statement($/, $key?) {
         }
         if $ml {
             if ~$ml<sym> eq 'for' {
-                my $block := PAST::Block.new( :blocktype('immediate'),
+                $past := PAST::Block.new( :blocktype('immediate'),
                     PAST::Var.new( :name('$_'), :scope('parameter'), :isdecl(1) ),
                     $past);
-                $past := PAST::Op.new($ml<EXPR>.ast, $block, :pasttype(~$ml<sym>), :node($/) );
-            }
-            else {
-                $past := PAST::Op.new($ml<cond>.ast, $past, :pasttype(~$ml<sym>), :node($/) );
             }
+            $past := PAST::Op.new($ml<smexpr>.ast, $past, :pasttype(~$ml<sym>), :node($/) );
         }
     }
     elsif $<statement_control> { $past := $<statement_control>.ast; }
@@ -464,9 +461,9 @@ sub add_phaser($/, $bank) {
 method statement_mod_cond:sym<if>($/)     { make $<cond>.ast; }
 method statement_mod_cond:sym<unless>($/) { make $<cond>.ast; }
 
-method statement_mod_loop:sym<while>($/)  { make $<cond>.ast; }
-method statement_mod_loop:sym<until>($/)  { make $<cond>.ast; }
-method statement_mod_loop:sym<for>($/)    { make $<EXPR>.ast; }
+method statement_mod_loop:sym<while>($/)  { make $<smexpr>.ast; }
+method statement_mod_loop:sym<until>($/)  { make $<smexpr>.ast; }
+method statement_mod_loop:sym<for>($/)    { make $<smexpr>.ast; }
 
 ## Terms
 
diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
index 860e10bd07c..680bd0e9426 100644
--- a/src/Perl6/Grammar.pm
+++ b/src/Perl6/Grammar.pm
@@ -423,9 +423,9 @@ token statement_mod_cond:sym<unless> { <sym> :s <cond=.EXPR> }
 
 proto token statement_mod_loop { <...> }
 
-token statement_mod_loop:sym<while> { <sym> :s <cond=.EXPR> }
-token statement_mod_loop:sym<until> { <sym> :s <cond=.EXPR> }
-token statement_mod_loop:sym<for>   { <sym> :s <EXPR> }
+token statement_mod_loop:sym<while> { <sym> :s <smexpr=.EXPR> }
+token statement_mod_loop:sym<until> { <sym> :s <smexpr=.EXPR> }
+token statement_mod_loop:sym<for>   { <sym> :s <smexpr=.EXPR> }
 
 ## Terms