Merge branch 'master' of git@github.com:perl6/nqp-rx

perl6 · Dec 2, 2009 · 588f6a7 · 588f6a7
2 parents eab37ff + 2665b51
commit 588f6a7
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -70,15 +70,12 @@ method statement($/, $key?) {
     if $<EXPR> {
         my $mc := $<statement_mod_cond>[0];
         my $ml := $<statement_mod_loop>[0];
+        $past := $<EXPR>.ast;
         if $mc {
-            $past := PAST::Op.new($mc<cond>.ast, $<EXPR>.ast, :pasttype(~$mc<sym>), :node($/) );
-            if $ml {
-                $past := PAST::Op.new($ml<cond>.ast, $past, :pasttype(~$ml<sym>), :node($/) );
-            }
-        } elsif $ml {
-            $past := PAST::Op.new($ml<cond>.ast, $<EXPR>.ast, :pasttype(~$ml<sym>), :node($/) );
-        } else {
-            $past := $<EXPR>.ast;
+            $past := PAST::Op.new($mc<cond>.ast, $past, :pasttype(~$mc<sym>), :node($/) );
+        }
+        if $ml {
+            $past := PAST::Op.new($ml<cond>.ast, $past, :pasttype(~$ml<sym>), :node($/) );
         }
     }
     elsif $<statement_control> { $past := $<statement_control>.ast; }