X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FSub%2FPrototype%2FUtil.pm;h=011d1c2ad922841b0dde34b09a4482d978a51611;hb=397877aa88384ae12584dcf22494c35ab0adc5cd;hp=6bf77901c8a042635d0d89c858b22419b6ed3a35;hpb=ea95d5eb42f17626bfca0f26e58a7d6c28e74d47;p=perl%2Fmodules%2FSub-Prototype-Util.git

diff --git a/lib/Sub/Prototype/Util.pm b/lib/Sub/Prototype/Util.pm
index 6bf7790..011d1c2 100644
--- a/lib/Sub/Prototype/Util.pm
+++ b/lib/Sub/Prototype/Util.pm
@@ -14,13 +14,13 @@ Sub::Prototype::Util - Prototype-related utility routines.
 
 =head1 VERSION
 
-Version 0.09
+Version 0.10
 
 =cut
 
 use vars qw<$VERSION>;
 
-$VERSION = '0.09';
+$VERSION = '0.10';
 
 =head1 SYNOPSIS
 
@@ -29,10 +29,17 @@ $VERSION = '0.09';
     my @a = qw<a b c>;
     my @args = ( \@a, 1, { d => 2 }, undef, 3 );
 
-    my @flat = flatten '\@$;$', @args; # ('a', 'b', 'c', 1, { d => 2 })
-    recall 'CORE::push', @args; # @a contains 'a', 'b', 'c', 1, { d => 2 }, undef, 3
+    my @flat = flatten '\@$;$', @args;
+    # @flat contains now ('a', 'b', 'c', 1, { d => 2 })
+
+    my $res = recall 'CORE::push', @args;
+    # @a contains now 'a', 'b', 'c', 1, { d => 2 }, undef, 3
+    # and $res is 7
+
     my $splice = wrap 'CORE::splice';
-    my @b = $splice->(\@a, 4, 2); # @a is now ('a', 'b', 'c', 1, 3) and @b is ({ d => 2 }, undef)
+    my @b = $splice->(\@a, 4, 2);
+    # @a contains now ('a', 'b', 'c', 1, 3)
+    # and @b is ({ d => 2 }, undef)
 
 =head1 DESCRIPTION
 
@@ -72,7 +79,9 @@ sub _clean_msg {
  $msg;
 }
 
-=head2 C<flatten $proto, @args>
+=head2 C<flatten>
+
+    my @flattened = flatten($proto, @args);
 
 Flattens the array C<@args> according to the prototype C<$proto>.
 When C<@args> is what C<@_> is after calling a subroutine with prototype C<$proto>, C<flatten> returns the list of what C<@_> would have been if there were no prototype.
@@ -118,7 +127,10 @@ sub flatten {
  return @args;
 }
 
-=head2 C<wrap $name, %opts>
+=head2 C<wrap>
+
+    my $wrapper = wrap($name, %opts);
+    my $wrapper = wrap({ $name => $proto }, %opts);
 
 Generates a wrapper that calls the function C<$name> with a prototyped argument list.
 That is, the wrapper's arguments should be what C<@_> is when you define a subroutine with the same prototype as C<$name>.
@@ -132,7 +144,7 @@ In this case, C<$name> must be a hash reference that holds exactly one key / val
 
     my $push = wrap { 'CORE::push' => '\@$' }; # only pushes 1 arg
 
-Others arguments are seen as key / value pairs that are meant to tune the code generated by L</wrap>.
+The remaining arguments C<%opts> are treated as key / value pairs that are meant to tune the code generated by L</wrap>.
 Valid keys are :
 
 =over 4
@@ -165,7 +177,8 @@ Defaults to true, but turned off when C<sub> is false.
 For example, this allows you to recall into C<CORE::grep> and C<CORE::map> by using the C<\&@> prototype :
 
     my $grep = wrap { 'CORE::grep' => '\&@' };
-    sub mygrep (&@) { $grep->(@_) } # the prototypes are intentionally different
+    # the prototypes are intentionally different
+    sub mygrep (&@) { $grep->(@_) }
 
 =cut
 
@@ -279,7 +292,10 @@ sub wrap {
  return $call;
 }
 
-=head2 C<recall $name, @args>
+=head2 C<recall>
+
+    my @res = recall($name, @args);
+    my @res = recall({ $name => $proto }, @args);
 
 Calls the function C<$name> with the prototyped argument list C<@args>.
 That is, C<@args> should be what C<@_> is when you call a subroutine with C<$name> as prototype.
@@ -293,18 +309,36 @@ If you plan to recall several times, consider using L</wrap> instead.
 
 =cut
 
-sub recall {
- my $name = shift;
+sub recall;
 
- my ($wrap, $err);
- {
-  local $@;
-  $wrap = eval { wrap $name };
-  $err  = $@;
- }
- croak _clean_msg $err if $err;
+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