X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FSub-Nary.git;a=blobdiff_plain;f=t%2F20-return.t;h=99d9954562118d840300e81324bf56368d31b21a;hp=e08fdbacd8049a314a08baf1b18fbac2d1ec1830;hb=HEAD;hpb=002535b0100121f92a04638a58e2d34add019275

diff --git a/t/20-return.t b/t/20-return.t
index e08fdba..99d9954 100644
--- a/t/20-return.t
+++ b/t/20-return.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 63;
+use Test::More tests => 69;
 
 use Sub::Nary;
 
@@ -27,6 +27,7 @@ my @tests = (
  [ 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 { my $x = do { return 2, 3; 4 } },      2 ],
 
  [ sub { return $x },     1 ],
  [ sub { return $x, $y }, 2 ],
@@ -41,7 +42,7 @@ my @tests = (
 
  [ sub { return %h },              'list' ],
  [ sub { return $h{a} },           1 ],
- [ sub { return @h{qw/a b/} },     2 ],
+ [ sub { return @h{qw<a b>} },     2 ],
  [ sub { return @h{@a[1 .. 3]} },  3 ],
  [ sub { return @h{@a[$y .. 3]} }, 'list' ],
  [ sub { return keys %h },         'list' ],
@@ -63,22 +64,27 @@ 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 (1, 2, 3) { return 1, 2 if $x } },                     'list' ],
  [ 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 ],
- [ sub { for my $i (1 .. 4) { return @h{qw/a b/} } },                    2 ],
+ [ sub { for my $i (1 .. 4) { return @h{qw<a b>} } },                    2 ],
  [ 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 (do { return 2, 3 }) { } },  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 ],
+ [ sub { eval { return 1, 2; 3, 4, 5 } },           2 ],
  [ sub { eval { }; return $x, 2 },                  2 ],
  [ sub { return eval { 1, $x }; },                  2 ],
  [ sub { return 1, eval { $x, eval { $h{foo} } } }, 3 ],