X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FSub%2FPrototype%2FUtil.pm;h=bfbd2a20b60129f898ba3db11df2495ddd794224;hb=eb44d389e2988873318074f6fe1f090886e4beba;hp=d2564d85e33dd66c758302d3798343d97b999367;hpb=c7c6c66b6fb5da113036318ca7e196ac422b32b0;p=perl%2Fmodules%2FSub-Prototype-Util.git

diff --git a/lib/Sub/Prototype/Util.pm b/lib/Sub/Prototype/Util.pm
index d2564d8..bfbd2a2 100644
--- a/lib/Sub/Prototype/Util.pm
+++ b/lib/Sub/Prototype/Util.pm
@@ -76,26 +76,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 +108,7 @@ sub flatten {
    push @args, shift;
   }
  }
+
  return @args;
 }
 
@@ -207,8 +213,9 @@ sub _wrap {
 }
 
 sub _check_name {
- my $name = $_[0];
+ my ($name) = @_;
  croak 'No subroutine specified' unless $name;
+
  my $proto;
  my $r = ref $name;
  if (!$r) {
@@ -219,8 +226,10 @@ sub _check_name {
  } else {
   croak 'Unhandled ' . $r . ' reference as first argument';
  }
+
  $name =~ s/^\s+//;
  $name =~ s/[\s\$\@\%\*\&;].*//;
+
  return $name, $proto;
 }
 
@@ -228,28 +237,39 @@ sub wrap {
  my ($name, $proto) = _check_name shift;
  croak 'Optional arguments must be passed as key => value pairs' if @_ % 2;
  my %opts = @_;
+
  $opts{ref}     ||= 'ref';
- $opts{sub}       = 1       if not defined $opts{sub};
- $opts{compile}   = 1       if not defined $opts{compile} and $opts{sub};
- $opts{wrong_ref} = 'undef' if not defined $opts{wrong_ref};
- my @cr;
+ $opts{sub}       = 1       unless defined $opts{sub};
+ $opts{compile}   = 1       if     not defined $opts{compile} and $opts{sub};
+ $opts{wrong_ref} = 'undef' unless defined $opts{wrong_ref};
+
+ my @coderefs;
  my $call;
  if (defined $proto) {
-  $call = _wrap $name, $proto, 0, '', \@cr, \%opts;
+  $call = _wrap $name, $proto, 0, '', \@coderefs, \%opts;
  } else {
   $call = _wrap $name, '', 0, '@_';
  }
- if (@cr) {
-  $call = 'my @c; '
-        . join('', map { 'push @c, $_[' . $_ . ']; ' } @cr)
-        . $call
+
+ if (@coderefs) {
+  my $decls = @coderefs > 1 ? 'my @c = @_[' . join(', ', @coderefs) . ']; '
+                            : 'my @c = ($_[' . $coderefs[0] . ']); ';
+  $call = $decls . $call;
  }
- $call = '{ ' . $call . ' }';
- $call = 'sub ' . $call if $opts{sub};
+
+ $call = "{ $call }";
+ $call = "sub $call" if $opts{sub};
+
  if ($opts{compile}) {
-  $call = eval $call;
-  croak _clean_msg $@ if $@;
+  my $err;
+  {
+   local $@;
+   $call = eval $call;
+   $err  = $@;
+  }
+  croak _clean_msg $err if $err;
  }
+
  return $call;
 }
 
@@ -268,9 +288,17 @@ If you plan to recall several times, consider using L</wrap> instead.
 =cut
 
 sub recall {
- my $wrap = eval { wrap shift };
- croak _clean_msg $@ if $@;
- return $wrap->(@_);
+ my $name = shift;
+
+ my ($wrap, $err);
+ {
+  local $@;
+  $wrap = eval { wrap $name };
+  $err  = $@;
+ }
+ croak _clean_msg $err if $err;
+
+ goto $wrap;
 }
 
 =head1 EXPORT