Complete rewrite. Make the inspect process return both the ret state and the last...

[perl/modules/Sub-Nary.git] / t / 20-return.t

diff --git a/t/20-return.t b/t/20-return.t
index ee42a98054af4bd4980381778a4418b35bc02dc8..48d3a54a1cbdbe9a649c5cc2186cbbc0b1baf05f 100644 (file)
--- 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 => 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 ],
@@ -81,11 +83,25 @@ my @tests = (
 
  [ 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 ],
+ [ 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;