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

diff --git a/t/20-return.t b/t/20-return.t
index fc85334..191a386 100644
--- a/t/20-return.t
+++ b/t/20-return.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 49;
+use Test::More tests => 56;
 
 use Sub::Nary;
 
@@ -39,12 +39,20 @@ 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 1 .. 3 },                  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 { for (1, 2, 3) { return } },                                     0 ],
  [ sub { for (1, 2, 3) { } return 1, 2; },                               2 ],
@@ -70,13 +78,12 @@ my @tests = (
  [ sub { return eval { do { eval { @a } } } },      'list' ],
 
  [ sub { eval 'return 1, 2' }, 'list' ],
-
- [ sub { return <$x> }, 'list' ],
 );
 
 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;
 }