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

diff --git a/t/20-return.t b/t/20-return.t
index 7ba7a74..ee42a98 100644
--- a/t/20-return.t
+++ b/t/20-return.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 52;
+use Test::More tests => 62;
 
 use Sub::Nary;
 
@@ -31,6 +31,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' ],
 
@@ -39,12 +40,21 @@ my @tests = (
  [ 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' ],
+ [ sub { return values %h },       'list' ],
 
  [ sub { return $x, $a[3], $h{c} }, 3 ],
  [ sub { return $x, @a },           'list' ],
  [ sub { return %h, $y },           'list' ],
 
- [ sub { return 1 .. 3 }, 'list' ],
+ [ 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 ],
@@ -71,16 +81,17 @@ my @tests = (
 
  [ sub { eval 'return 1, 2' }, 'list' ],
 
- [ sub { return <$x> }, 'list' ],
+ [ sub { grep { return 2, 4 } 5 .. 10 },                2 ],
+ [ sub { grep { $_ > 1 } do { return 2, 4; 5 .. 10 } }, 2 ],
 
- [ sub { return stat $0 },   13 ],
- [ sub { return caller 0 },  sub { my @a = caller 0; scalar @a }->() ],
- [ sub { return localtime }, do { my @a = localtime; scalar @a } ],
+ [ sub { map { return 2, 4 } 5 .. 10 },                2 ],
+ [ sub { map { $_ + 1 } do { return 2, 4; 5 .. 10 } }, 2 ],
 );
 
 my $i = 1;
 for (@tests) {
  my $r = $sn->nary($_->[0]);
- is_deeply($r, { $_->[1] => 1 }, 'return test ' . $i);
+ my $exp = ref $_->[1] ? $_->[1] : { $_->[1] => 1 };
+ is_deeply($r, $exp, 'return test ' . $i);
  ++$i;
 }