From: Vincent Pit Date: Thu, 25 Aug 2011 10:54:31 +0000 (+0200) Subject: Don't recall() using goto on perl 5.8.0 X-Git-Tag: v0.10~2 X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FSub-Prototype-Util.git;a=commitdiff_plain;h=07e369ea55f844ee3160639eec14cee5884b1290 Don't recall() using goto on perl 5.8.0 Since it tends to crash a lot. --- diff --git a/lib/Sub/Prototype/Util.pm b/lib/Sub/Prototype/Util.pm index 6bf7790..2c47ba6 100644 --- a/lib/Sub/Prototype/Util.pm +++ b/lib/Sub/Prototype/Util.pm @@ -293,18 +293,36 @@ If you plan to recall several times, consider using L instead. =cut -sub recall { - my $name = shift; - - my ($wrap, $err); - { - local $@; - $wrap = eval { wrap $name }; - $err = $@; - } - croak _clean_msg $err if $err; +sub recall; + +BEGIN { + my $safe_wrap = sub { + my $name = shift; + + my ($wrap, $err); + { + local $@; + $wrap = eval { wrap $name }; + $err = $@; + } + + $wrap, $err; + }; - goto $wrap; + if ("$]" == 5.008) { + # goto tends to crash a lot on perl 5.8.0 + *recall = sub { + my ($wrap, $err) = $safe_wrap->(shift); + croak _clean_msg $err if $err; + $wrap->(@_) + } + } else { + *recall = sub { + my ($wrap, $err) = $safe_wrap->(shift); + croak _clean_msg $err if $err; + goto $wrap; + } + } } =head1 EXPORT