X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F13-reap-ctl.t;h=7ec492a9906c8ffac3d06ad2943533be88c48d0e;hb=95f528be96f28fc6246faddb1e18d7fe2d0a043b;hp=f9ca9cdb6ed267eae3bc5de77950cbe2dbfb034d;hpb=bac4fc46c2d48ce5db75de6c88e0983aeeedf865;p=perl%2Fmodules%2FScope-Upper.git

diff --git a/t/13-reap-ctl.t b/t/13-reap-ctl.t
index f9ca9cd..7ec492a 100644
--- a/t/13-reap-ctl.t
+++ b/t/13-reap-ctl.t
@@ -3,9 +3,9 @@
 use strict;
 use warnings;
 
-use Test::More tests => 28;
+use Test::More tests => 38 + 4 * 7;
 
-use Scope::Upper qw/reap/;
+use Scope::Upper qw/reap UP HERE/;
 
 our ($x, $y);
 
@@ -16,7 +16,7 @@ sub check { ++$y }
  {
   local $x = 2;
   {
-   reap \&check => 1;
+   reap \&check => UP;
   }
   is $x, 2,     'goto 1 [not yet - x]';
   is $y, undef, 'goto 1 [not yet - y]';
@@ -39,7 +39,7 @@ $y = undef;
   {
    local $x = 3;
    {
-    reap \&check => 2;
+    reap \&check => UP UP;
    }
    is $x, 3,     'goto 2 [not yet - x]';
    is $y, undef, 'goto 2 [not yet - y]';
@@ -64,7 +64,7 @@ $y = undef;
    {
     {
      local $x = 3;
-     reap \&check => 3;
+     reap \&check => UP UP UP;
      is $x, 3,     'die - reap outside eval [not yet 1 - x]';
      is $y, undef, 'die - reap outside eval [not yet 1 - y]';
     }
@@ -88,7 +88,7 @@ $y = undef;
   {
    {
     local $x = 3;
-    reap \&check => 2;
+    reap \&check => UP UP;
     is $x, 3,     'die - reap at eval [not yet 1 - x]';
     is $y, undef, 'die - reap at eval [not yet 1 - y]';
    }
@@ -109,7 +109,7 @@ $y = undef;
   {
    {
     local $x = 3;
-    reap \&check => 1;
+    reap \&check => UP;
     is $x, 3,     'die - reap inside eval [not yet 1 - x]';
     is $y, undef, 'die - reap inside eval [not yet 1 - y]';
    }
@@ -121,3 +121,78 @@ $y = undef;
  is $x, 1, 'die - reap inside eval [ok - x]';
  is $y, 1, 'die - reap inside eval [ok - y]';
 }
+
+$y = undef;
+{
+ local $x = 1;
+ eval {
+  local $x = 2;
+  eval {
+   local $x = 3;
+   reap { ++$y; die "reaped\n" } => HERE;
+   is $x, 3,     'die in reap at eval [not yet - x]';
+   is $y, undef, 'die in reap at eval [not yet - y]';
+  }; # should trigger here, but the die isn't catched by this eval
+  die "failed\n";
+ };
+ is $@, "reaped\n", 'die in reap at eval [ok - $@]';
+ is $x, 1, 'die in reap at eval [ok - x]';
+ is $y, 1, 'die in reap at eval [ok - y]';
+}
+
+$y = undef;
+{
+ local $x = 1;
+ eval {
+  local $x = 2;
+  {
+   local $x = 3;
+   reap { ++$y; die "reaped\n" } => HERE;
+   is $x, 3,     'die in reap inside eval [not yet - x]';
+   is $y, undef, 'die in reap inside eval [not yet - y]';
+  } # should trigger here
+  die "failed\n";
+ };
+ is $@, "reaped\n", 'die in reap inside eval [ok - $@]';
+ is $x, 1, 'die in reap inside eval [ok - x]';
+ is $y, 1, 'die in reap inside eval [ok - y]';
+}
+
+sub hijacked {
+ my ($cb, $desc) = @_;
+ local $x = 2;
+ sub {
+  local $x = 3;
+  &reap($cb => UP);
+  is $x, 3,     "$desc [not yet 1 - x]";
+  is $y, undef, "$desc [not yet 1 - y]";
+ }->();
+ is $x, 2,     "$desc [not yet 2 - x]";
+ is $y, undef, "$desc [not yet 2 - y]";
+ 11, 12;
+}
+
+for ([ sub { ++$y; 15, 16, 17, 18 },        'implicit ' ],
+     [ sub { ++$y; return 15, 16, 17, 18 }, ''          ]) {
+ my ($cb, $imp) = @$_;
+ $imp = "RT #44204 - ${imp}return from reap";
+ my $desc;
+ $y = undef;
+ {
+  $desc = "$imp in list context";
+  local $x = 1;
+  my @l = hijacked($cb, $desc);
+  is $x,         1,          "$desc [ok - x]";
+  is $y,         1,          "$desc [ok - y]";
+  is_deeply \@l, [ 11, 12 ], "$desc [ok - l]";
+ }
+ $y = undef;
+ {
+  $desc = "$imp in list context";
+  local $x = 1;
+  my $s = hijacked($cb, $desc);
+  is $x, 1,  "$desc [ok - x]";
+  is $y, 1,  "$desc [ok - y]";
+  is $s, 12, "$desc [ok - s]";
+ }
+}