X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F20-return.t;h=e17deda4511f4559f138d05fe38b32413b913521;hb=3b10ab9a7a01f579892a98a1ffc53202d6adc8d6;hp=ee42a98054af4bd4980381778a4418b35bc02dc8;hpb=04997f51e7b0a73e04ef0c8df41d4ad045fc7584;p=perl%2Fmodules%2FSub-Nary.git

diff --git a/t/20-return.t b/t/20-return.t
index ee42a98..e17deda 100644
--- a/t/20-return.t
+++ b/t/20-return.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 62;
+use Test::More tests => 66;
 
 use Sub::Nary;
 
@@ -23,6 +23,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 ],
@@ -58,6 +62,8 @@ 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 (do { return 2, 3 if $x }) { } },      { 2 => 0.5, 0 => 0.5 } ],
  [ 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 ],
@@ -65,11 +71,14 @@ my @tests = (
  [ sub { for (my $i; $i < 10; ++$i) { return 1, @a[do{return 2, 3}] } }, 2 ],
  [ sub { return 1, 2 for 1 .. 4 },                                       2 ],
 
- [ sub { while (1) { return } },            0 ],
- [ sub { while (1) { } return 1, 2 },       2 ],
- [ sub { while (1) { return 1, 2 } },       2 ],
- [ sub { while (1) { last; return 1, 2 } }, 2 ],
- [ sub { return 1, 2 while 1 },             2 ],
+ [ sub { while (1) { return } },                 0 ],
+ [ sub { while (1) { } return 1, 2 },            2 ],
+ [ sub { while (1) { return 1, 2 } },            2 ],
+ [ sub { while (1) { return 1, 2 if $x } },      'list' ],
+ [ sub { while (1) { last; return 1, 2 } },      2 ],
+ [ sub { return 1, 2 while 1 },                  2 ],
+ [ sub { while (do { return 2, 3 }) { } },       2 ],
+ [ sub { while (do { return 2, 3 if $x }) { } }, 'list' ],
 
  [ sub { eval { return } },                         0 ],
  [ sub { eval { return 1, 2 } },                    2 ],
@@ -80,12 +89,6 @@ my @tests = (
  [ sub { return eval { do { eval { @a } } } },      'list' ],
 
  [ sub { eval 'return 1, 2' }, 'list' ],
-
- [ sub { grep { return 2, 4 } 5 .. 10 },                2 ],
- [ sub { grep { $_ > 1 } do { return 2, 4; 5 .. 10 } }, 2 ],
-
- [ sub { map { return 2, 4 } 5 .. 10 },                2 ],
- [ sub { map { $_ + 1 } do { return 2, 4; 5 .. 10 } }, 2 ],
 );
 
 my $i = 1;