X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FSub%2FPrototype%2FUtil.pm;h=1bace59e0416137415ef486b8dc8da44324eeb82;hb=fc524c3e7d5c883b8a51b8986a2968c0f10ab5ea;hp=a580cc16343103d061e3b8bc8c2a9e81debdb5d9;hpb=1d86cd887b8dbb41650915d7e60dcc077bd2ad35;p=perl%2Fmodules%2FSub-Prototype-Util.git

diff --git a/lib/Sub/Prototype/Util.pm b/lib/Sub/Prototype/Util.pm
index a580cc1..1bace59 100644
--- a/lib/Sub/Prototype/Util.pm
+++ b/lib/Sub/Prototype/Util.pm
@@ -5,8 +5,8 @@ use 5.006;
 use strict;
 use warnings;
 
-use Carp qw/croak/;
-use Scalar::Util qw/reftype/;
+use Carp         qw<croak>;
+use Scalar::Util qw<reftype>;
 
 =head1 NAME
 
@@ -14,19 +14,19 @@ Sub::Prototype::Util - Prototype-related utility routines.
 
 =head1 VERSION
 
-Version 0.09
+Version 0.10
 
 =cut
 
-use vars qw/$VERSION/;
+use vars qw<$VERSION>;
 
-$VERSION = '0.09';
+$VERSION = '0.10';
 
 =head1 SYNOPSIS
 
-    use Sub::Prototype::Util qw/flatten wrap recall/;
+    use Sub::Prototype::Util qw<flatten wrap recall>;
 
-    my @a = qw/a b c/;
+    my @a = qw<a b c>;
     my @args = ( \@a, 1, { d => 2 }, undef, 3 );
 
     my @flat = flatten '\@$;$', @args; # ('a', 'b', 'c', 1, { d => 2 })
@@ -45,25 +45,31 @@ They all handle C<5.10>'s C<_> prototype.
 
 =cut
 
-my %sigils = qw/SCALAR $ ARRAY @ HASH % GLOB * CODE &/;
+my %sigils   = qw<SCALAR $ ARRAY @ HASH % GLOB * CODE &>;
 my %reftypes = reverse %sigils;
 
 sub _check_ref {
- my ($a, $p) = @_;
- my $r;
- if (!defined $a || !defined($r = reftype $a)) { # not defined or plain scalar
-  croak 'Got ' . ((defined $a) ? 'a plain scalar' : 'undef')
-               . ' where a reference was expected';
+ my ($arg, $sigil) = @_;
+
+ my $reftype;
+ if (not defined $arg or not defined($reftype = reftype $arg)) {
+  # not defined or plain scalar
+  my $that = (defined $arg) ? 'a plain scalar' : 'undef';
+  croak "Got $that where a reference was expected";
  }
- croak 'Unexpected ' . $r . ' reference' unless exists $sigils{$r}
-                                            and $p =~ /\Q$sigils{$r}\E/;
- return $r;
+
+ croak "Unexpected $reftype reference" unless exists $sigils{$reftype}
+                                          and $sigil =~ /\Q$sigils{$reftype}\E/;
+
+ $reftype;
 }
 
 sub _clean_msg {
  my ($msg) = @_;
+
  $msg =~ s/(?:\s+called)?\s+at\s+.*$//s;
- return $msg;
+
+ $msg;
 }
 
 =head2 C<flatten $proto, @args>
@@ -76,26 +82,31 @@ It croaks if the arguments can't possibly match the required prototype, e.g. whe
 
 sub flatten {
  my $proto = shift;
+
  return @_ unless defined $proto;
+
  my @args;
  while ($proto =~ /(\\?)(\[[^\]]+\]|[^\];])/g) {
-  my $p = $2;
+  my $sigil = $2;
+
   if ($1) {
-   my $a = shift;
-   my $r = _check_ref $a, $p;
-   push @args, $r eq 'SCALAR'
-               ? $$a
-               : ($r eq 'ARRAY'
-                  ? @$a
-                  : ($r eq 'HASH'
-                     ? %$a
-                     : ($r eq 'GLOB'
-                        ? *$a
-                        : &$a # _check_ref ensures this must be a code ref
+   my $arg     = shift;
+   my $reftype = _check_ref $arg, $sigil;
+
+   push @args, $reftype eq 'SCALAR'
+               ? $$arg
+               : ($reftype eq 'ARRAY'
+                  ? @$arg
+                  : ($reftype eq 'HASH'
+                     ? %$arg
+                     : ($reftype eq 'GLOB'
+                        ? *$arg
+                        : &$arg # _check_ref ensures this must be a code ref
                        )
                     )
                  );
-  } elsif ($p =~ /[\@\%]/) {
+
+  } elsif ($sigil =~ /[\@\%]/) {
    push @args, @_;
    last;
   } else {
@@ -103,6 +114,7 @@ sub flatten {
    push @args, shift;
   }
  }
+
  return @args;
 }
 
@@ -120,7 +132,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
@@ -281,18 +293,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  = $@;
+  }
 
- goto $wrap;
+  $wrap, $err;
+ };
+
+ 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
@@ -301,13 +331,13 @@ The functions L</flatten>, L</wrap> and L</recall> are only exported on request,
 
 =cut
 
-use base qw/Exporter/;
+use base qw<Exporter>;
 
-use vars qw/@EXPORT @EXPORT_OK %EXPORT_TAGS/;
+use vars qw<@EXPORT @EXPORT_OK %EXPORT_TAGS>;
 
 @EXPORT             = ();
 %EXPORT_TAGS        = (
- 'funcs' =>  [ qw/flatten wrap recall/ ]
+ 'funcs' =>  [ qw<flatten wrap recall> ]
 );
 @EXPORT_OK          = map { @$_ } values %EXPORT_TAGS;
 $EXPORT_TAGS{'all'} = [ @EXPORT_OK ];