Fix map/grep handling of returns in block with a new cumulate function

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

diff --git a/t/20-return.t b/t/20-return.t
index 48d3a54a1cbdbe9a649c5cc2186cbbc0b1baf05f..c48eeeff15c3bef5c82b140f0031fe94b58b2b5b 100644 (file)
--- a/t/20-return.t
+++ b/t/20-return.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 72;
+use Test::More tests => 76;
 
 use Sub::Nary;
 
@@ -60,6 +60,7 @@ 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 ($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 ],
@@ -72,6 +73,7 @@ my @tests = (
  [ 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 { eval { return } },                         0 ],
  [ sub { eval { return 1, 2 } },                    2 ],
@@ -87,6 +89,8 @@ my @tests = (
  [ 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 { return 2 if $_; 3 } 7 .. 8 },
+                                                  { 1 => 0.75, list => 0.25 } ],
  [ 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 } ],
@@ -97,6 +101,8 @@ my @tests = (
  [ 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 { return 2 if $_; 3 } 7 .. 8 },
+                                                     { 1 => 0.75, 2 => 0.25 } ],
  [ 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 } ],