X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FSub%2FPrototype%2FUtil.pm;h=315224076b3a393c4656bb67b1a6abb3acdbb93f;hb=a3206d42a03b8e1e09b5f2bdddcbbfeca6ffe40f;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..3152240 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; +use Scalar::Util qw; =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; - my @a = qw/a b c/; + my @a = qw; 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; 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 @@ -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; } @@ -207,8 +219,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 +232,10 @@ sub _check_name { } else { croak 'Unhandled ' . $r . ' reference as first argument'; } + $name =~ s/^\s+//; $name =~ s/[\s\$\@\%\*\&;].*//; + return $name, $proto; } @@ -228,28 +243,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; } @@ -267,10 +293,36 @@ If you plan to recall several times, consider using L instead. =cut -sub recall { - my $wrap = eval { wrap shift }; - croak _clean_msg $@ if $@; - return $wrap->(@_); +sub recall; + +BEGIN { + my $safe_wrap = sub { + my $name = shift; + + my ($wrap, $err); + { + local $@; + $wrap = eval { wrap $name }; + $err = $@; + } + + $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 @@ -279,13 +331,13 @@ The functions L, L and L are only exported on request, =cut -use base qw/Exporter/; +use base qw; -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 ] ); @EXPORT_OK = map { @$_ } values %EXPORT_TAGS; $EXPORT_TAGS{'all'} = [ @EXPORT_OK ];