X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F20-return.t;h=ccfd9e9fa2a0aaf8df73a912e5bb54677899507f;hb=f73405816c83f0e2816e81421a8b6cf72d5e3151;hp=48d3a54a1cbdbe9a649c5cc2186cbbc0b1baf05f;hpb=3271ef4bff5871bc6aa2d90537f97f177cbacc2a;p=perl%2Fmodules%2FSub-Nary.git

diff --git a/t/20-return.t b/t/20-return.t
index 48d3a54..ccfd9e9 100644
--- a/t/20-return.t
+++ b/t/20-return.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 72;
+use Test::More tests => 79;
 
 use Sub::Nary;
 
@@ -25,6 +25,10 @@ my @tests = (
  [ sub { do { 1; return 2, 3 } },              2 ],
  [ sub { do { 1; return 2, 3; 4 } },           2 ],
  [ sub { do { 1; return 2, return 3 } },       1 ],
+ [ sub { do { return if $x; 2, 3 }, 4 },       { 0 => 0.5, 3 => 0.5 } ],
+ [ sub { do { do { return if $x }, 3 }, 4 },   { 0 => 0.5, 3 => 0.5 } ],
+ [ sub { do { return if $x; 2, 3 }, do { return 1 if $y; 4, 5, 6 } },
+                                           { 0 => 0.5, 1 => 0.25, 5 => 0.25 } ],
 
  [ sub { return $x },     1 ],
  [ sub { return $x, $y }, 2 ],
@@ -60,6 +64,7 @@ my @tests = (
 
  [ sub { for (1, 2, 3) { return } },                                     0 ],
  [ sub { for (1, 2, 3) { } return 1, 2; },                               2 ],
+ [ sub { for (do { return 1, 2, 3 }) { } return 1, 2; },                 3 ],
  [ sub { for ($x, 1, $y) { return 1, 2 } },                              2 ],
  [ sub { for (@a) { return 1, do { $x } } },                             2 ],
  [ sub { for (keys %h) { return do { 1 }, do { return @a[0, 2] } } },    2 ],
@@ -72,6 +77,7 @@ my @tests = (
  [ sub { while (1) { return 1, 2 } },       2 ],
  [ sub { while (1) { last; return 1, 2 } }, 2 ],
  [ sub { return 1, 2 while 1 },             2 ],
+ [ sub { while (do { return 2, 3 }) { } },  2 ],
 
  [ sub { eval { return } },                         0 ],
  [ sub { eval { return 1, 2 } },                    2 ],
@@ -87,6 +93,8 @@ my @tests = (
  [ sub { grep { $_ > 1 } do { return 2, 4; 5 .. 10 } },   2 ],
  [ sub { grep { return 2, 4 } () },                       0 ],
  [ sub { grep { return $_ ? 2 : (3, 4) } 7 .. 8 },        $exp_2 ],
+ [ sub { grep { return 2 if $_; 3 } 7 .. 8 },
+                                                  { 1 => 0.75, list => 0.25 } ],
  [ sub { grep { $_ > 1 } do { return $x ? 7 : (8, 9) } }, $exp_2 ],
  [ sub { grep { return $_ ? 2 : (3, 4) } do { return 3 .. 5 if $x; } },
                                            { 3 => 0.5, 1 => 0.25, 2 => 0.25 } ],
@@ -97,6 +105,8 @@ my @tests = (
  [ sub { map { $_ + 1 } do { return 2, 4; 5 .. 10 } },   2 ],
  [ sub { map { return 2, 4 } () },                       0 ],
  [ sub { map { return $_ ? 2 : (3, 4) } 7 .. 8 },        $exp_2 ],
+ [ sub { map { return 2 if $_; 3 } 7 .. 8 },
+                                                     { 1 => 0.75, 2 => 0.25 } ],
  [ sub { map { $_ > 1 } do { return $x ? 7 : (8, 9) } }, $exp_2 ],
  [ sub { map { return $_ ? 2 : (3, 4) } do { return 3 .. 5 if $x; } },
                                            { 3 => 0.5, 1 => 0.25, 2 => 0.25 } ],