X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FSub%2FPrototype%2FUtil.pm;h=317f4e242b41fa0e4588996bcbb4e57560608658;hb=e1696935dc69a87c8faff343d3cde52cb49703e9;hp=d52b905f8c8370fad0e2b7f218952da99b52e30f;hpb=26e43a265dbd585d36cc6b3fc48c423e17421a62;p=perl%2Fmodules%2FSub-Prototype-Util.git diff --git a/lib/Sub/Prototype/Util.pm b/lib/Sub/Prototype/Util.pm index d52b905..317f4e2 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,25 +14,32 @@ Sub::Prototype::Util - Prototype-related utility routines. =head1 VERSION -Version 0.09 +Version 0.11 =cut -use vars qw/$VERSION/; +use vars qw<$VERSION>; -$VERSION = '0.09'; +$VERSION = '0.11'; =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 }) - 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 @@ -45,28 +52,36 @@ 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 +=head2 C + + 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 returns the list of what C<@_> would have been if there were no prototype. @@ -76,26 +91,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,10 +123,14 @@ sub flatten { push @args, shift; } } + return @args; } -=head2 C +=head2 C + + 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>. @@ -120,29 +144,37 @@ 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. +The remaining arguments C<%opts> are treated as key / value pairs that are meant to tune the code generated by L. Valid keys are : =over 4 -=item C<< ref => $func >> +=item * + +C<< ref => $func >> Specifies the function used in the generated code to test the reference type of scalars. Defaults to C<'ref'>. You may also want to use L. -=item C<< wrong_ref => $code >> +=item * + +C<< wrong_ref => $code >> The code executed when a reference of incorrect type is encountered. The result of this snippet is also the result of the generated code, hence it defaults to C<'undef'>. It's a good place to C or C too. -=item C<< sub => $bool >> +=item * + +C<< sub => $bool >> Encloses the code into a C block. Default is true. -=item C<< compile => $bool >> +=item * + +C<< compile => $bool >> Makes L compile the code generated and return the resulting code reference. Be careful that in this case C must be a fully qualified function name. @@ -153,57 +185,64 @@ Defaults to true, but turned off when C is false. For example, this allows you to recall into C and C 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 sub _wrap { - my ($name, $proto, $i, $args, $cr, $opts) = @_; + my ($name, $proto, $i, $args, $coderefs, $opts) = @_; + while ($proto =~ s/(\\?)(\[[^\]]+\]|[^\];])//) { - my ($ref, $p) = ($1, $2); - $p = $1 if $p =~ /^\[([^\]]+)\]/; - my $cur = '$_[' . $i . ']'; + my ($ref, $sigil) = ($1, $2); + $sigil = $1 if $sigil =~ /^\[([^\]]+)\]/; + + my $cur = "\$_[$i]"; + if ($ref) { - if (length $p > 1) { - return 'my $r = ' . $opts->{ref} . '(' . $cur . '); ' - . join ' els', - map( { - "if (\$r eq '" . $reftypes{$_} ."') { " - . _wrap($name, $proto, ($i + 1), - $args . $_ . '{' . $cur . '}, ', - $cr, $opts) - . ' }' - } split //, $p), - 'e { ' . $opts->{wrong_ref} . ' }' + if (length $sigil > 1) { + my $code = "my \$r = $opts->{ref}($cur); "; + my @branches = map { + my $subcall = _wrap( + $name, $proto, ($i + 1), $args . "$_\{$cur}, ", $coderefs, $opts + ); + "if (\$r eq '$reftypes{$_}') { $subcall }"; + } split //, $sigil; + $code .= join ' els', @branches, "e { $opts->{wrong_ref} }"; + return $code; } else { - $args .= $p . '{' . $cur . '}, '; + $args .= "$sigil\{$cur}, "; } - } elsif ($p =~ /[\@\%]/) { + } elsif ($sigil =~ /[\@\%]/) { $args .= '@_[' . $i . '..$#_]'; - } elsif ($p =~ /\&/) { - my %h = do { my $c; map { $_ => $c++ } @$cr }; + } elsif ($sigil =~ /\&/) { + my %h = do { my $c; map { $_ => $c++ } @$coderefs }; my $j; - if (not exists $h{$i}) { - push @$cr, $i; - $j = $#{$cr}; - } else { + if (exists $h{$i}) { $j = int $h{$i}; + } else { + push @$coderefs, $i; + $j = $#{$coderefs}; } - $args .= 'sub{&{$c[' . $j . ']}}, '; - } elsif ($p eq '_') { - $args .= '((@_ > ' . $i . ') ? ' . $cur . ' : $_), '; + $args .= "sub{&{\$c[$j]}}, "; + } elsif ($sigil eq '_') { + $args .= "((\@_ > $i) ? $cur : \$_), "; } else { - $args .= $cur . ', '; + $args .= "$cur, "; } + } continue { ++$i; } + $args =~ s/,\s*$//; - return $name . '(' . $args . ')'; + + return "$name($args)"; } sub _check_name { - my $name = $_[0]; + my ($name) = @_; croak 'No subroutine specified' unless $name; + my $proto; my $r = ref $name; if (!$r) { @@ -214,8 +253,10 @@ sub _check_name { } else { croak 'Unhandled ' . $r . ' reference as first argument'; } + $name =~ s/^\s+//; $name =~ s/[\s\$\@\%\*\&;].*//; + return $name, $proto; } @@ -223,32 +264,46 @@ 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; } -=head2 C +=head2 C + + 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. @@ -262,10 +317,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 @@ -274,13 +355,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 ]; @@ -310,7 +391,7 @@ Tests code coverage report is available at L