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

Conflicts:
	src/NQP/Grammar.pm

src/NQP/Actions.pm

@@ -59,9 +59,17 @@ method statement($/, $key?) {
     my $past;
     if $<EXPR> {
         my $mc := $<statement_mod_cond>[0];
-        $past := $mc
-              ?? PAST::Op.new($mc.ast, $<EXPR>.ast, :pasttype(~$mc<sym>), :node($/) )
-              !! $<EXPR>.ast;
+        my $ml := $<statement_mod_loop>[0];
+        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;
+        }
     }
     elsif $<statement_control> { $past := $<statement_control>.ast; }
     else { $past := 0; }
@@ -177,9 +185,11 @@ method blorst($/) {
 
 # Statement modifiers
 
-method statement_mod_cond:sym<if>($/)     { make $<mod_expr>.ast; }
-method statement_mod_cond:sym<unless>($/) { make $<mod_expr>.ast; }
+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; }
 
 ## Terms
 

src/NQP/Grammar.pm

@@ -80,7 +80,8 @@ token statement {
     | <statement_control>
     | <EXPR> <.ws>
         [
-        | <statement_mod_cond>
+        | <statement_mod_cond> <statement_mod_loop>?
+        | <statement_mod_loop>
         ]?
     ]
 }
@@ -185,8 +186,13 @@ token blorst {
 
 proto token statement_mod_cond { <...> }
 
-token statement_mod_cond:sym<if>     { <sym> :s <mod_expr=.EXPR> }
-token statement_mod_cond:sym<unless> { <sym> :s <mod_expr=.EXPR> }
+token statement_mod_cond:sym<if>     { <sym> :s <cond=.EXPR> }
+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> }
 
 ## Terms
 

t/nqp/14-while.t

@@ -2,7 +2,7 @@
 
 # while, until statements
 
-plan(12);
+plan(14);
 
 my $a; my $sum;
 
@@ -13,13 +13,21 @@ while $a != 10 {
 }
 ok($sum == 45, 'basic while loop test');
 
+$a := 1; $sum := 0;
+$sum := $sum + $a++ while $a < 10;
+ok($sum == 45, 'basic while statement modifier');
+
 $a := 1; $sum := 0;
 until $a == 10 {
     $sum := $sum + $a;
     $a := $a + 1;
 }
 ok($sum == 45, 'basic until loop test');
 
+$a := 1; $sum := 0;
+$sum := $sum + $a++ until $a > 9;
+ok($sum == 45, 'basic until statement modifier');
+
 $a := 1; $sum := 0;
 while $a != 1 {
     $sum := 99;

t/nqp/42-cond-loop.t

@@ -0,0 +1,40 @@
+#!./parrot nqp.pbc
+
+# combination of conditional modifier and loop modifier
+
+plan(8);
+
+my $a; my $s;
+
+
+$a := 0; $s := 0;
+$s := 5 if $a > 7 while $a++ < 9;
+ok( $s == 5 && $a == 10, 'true if + while');
+
+$a := 0; $s := 0;
+$s := 5 if $a > 17 while $a++ < 9;
+ok( $s == 0 && $a == 10, 'false if + while');
+
+$a := 0; $s := 0;
+$s := 5 if $a > 7 until $a++ > 9;
+ok( $s == 5 && $a == 11, 'true if + until');
+
+$a := 0; $s := 0;
+$s := 5 if $a > 17 until $a++ > 9;
+ok( $s == 0 && $a == 11, 'false if + until');
+
+$a := 0; $s := 0;
+$s := 5 unless $a > 0 while $a++ < 9;
+ok( $s == 0 && $a == 10, 'true unless + while');
+
+$a := 0; $s := 0;
+$s := 5 unless $a < 0 while $a++ < 9;
+ok( $s == 5 && $a == 10, 'false unless + while');
+
+$a := 0; $s := 0;
+$s := 5 if $a > 0 until $a++ > 9;
+ok( $s == 5 && $a == 11, 'true unless + until');
+
+$a := 0; $s := 0;
+$s := 5 if $a < 0 until $a++ > 9;
+ok( $s == 0 && $a == 11, 'false unless + until');