X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F20-return.t;h=48d3a54a1cbdbe9a649c5cc2186cbbc0b1baf05f;hb=91deeda20173f3d35c5b936c9e6db1cbe08f0e00;hp=191a386dd9ca0332542df8e0c68ab899381e2c8a;hpb=cab48037c2f684dd60d1860bdc2efa3d10d3e7a3;p=perl%2Fmodules%2FSub-Nary.git

diff --git a/t/20-return.t b/t/20-return.t
index 191a386..48d3a54 100644
--- a/t/20-return.t
+++ b/t/20-return.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 56;
+use Test::More tests => 72;
 
 use Sub::Nary;
 
@@ -11,6 +11,8 @@ my $sn = Sub::Nary->new();
 
 my ($x, $y, @a, %h);
 
+my $exp_2 = { 1 => 0.5, 2 => 0.5 };
+
 my @tests = (
  [ sub { return },               0 ],
  [ sub { return () },            0 ],
@@ -31,6 +33,7 @@ my @tests = (
  [ sub { return $a[0] },             1 ],
  [ sub { return @a[1, 2] },          2 ],
  [ sub { return @a[2 .. 4] },        3 ],
+ [ sub { return @a[1, 4 .. 7, 2] },  6 ],
  [ sub { return @a[do{ 1 .. 5 }] },  5 ],
  [ sub { return @a[do{ 1 .. $x }] }, 'list' ],
 
@@ -46,13 +49,14 @@ my @tests = (
  [ sub { return $x, @a },           'list' ],
  [ sub { return %h, $y },           'list' ],
 
- [ sub { return 1 .. 3 },                  3 ],
+ [ sub { return 2 .. 4 },                  3 ],
  [ sub { return $x .. 3 },                 'list' ],
  [ sub { return 1 .. $x },                 'list' ],
  [ sub { return '2foo' .. 4 },             3 ],
  [ sub { my @a = (7, 8); return @a .. 4 }, 'list' ],
  [ sub { return do { return 1, 2 } .. 3 }, 2 ],
  [ sub { return 1 .. do { return 2, 3 } }, 2 ],
+ [ sub { my @a = return 6, $x },           2 ],
 
  [ sub { for (1, 2, 3) { return } },                                     0 ],
  [ sub { for (1, 2, 3) { } return 1, 2; },                               2 ],
@@ -78,6 +82,26 @@ 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 { grep { return 2, 4 } () },                       0 ],
+ [ sub { grep { return $_ ? 2 : (3, 4) } 7 .. 8 },        $exp_2 ],
+ [ 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 } ],
+ [ sub { grep { return $_ ? 2 : (3, 4) } do { return 3 .. 5 if $x; () } },
+                                                       { 3 => 0.5, 0 => 0.5 } ],
+
+ [ sub { map { return 2, 4 } 5 .. 10 },                  2 ],
+ [ 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 { $_ > 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 } ],
+ [ sub { map { return $_ ? 2 : (3, 4) } do { return 3 .. 5 if $x; () } },
+                                                       { 3 => 0.5, 0 => 0.5 } ],
 );
 
 my $i = 1;