X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FSub-Prototype-Util.git;a=blobdiff_plain;f=lib%2FSub%2FPrototype%2FUtil.pm;h=d52b905f8c8370fad0e2b7f218952da99b52e30f;hp=68ac767034d309c575945a2fb85a893e8a91d53a;hb=26e43a265dbd585d36cc6b3fc48c423e17421a62;hpb=8c3d123a078fe87b9b1b20fce287044d3f7f62db diff --git a/lib/Sub/Prototype/Util.pm b/lib/Sub/Prototype/Util.pm index 68ac767..d52b905 100644 --- a/lib/Sub/Prototype/Util.pm +++ b/lib/Sub/Prototype/Util.pm @@ -1,5 +1,7 @@ package Sub::Prototype::Util; +use 5.006; + use strict; use warnings; @@ -12,29 +14,30 @@ Sub::Prototype::Util - Prototype-related utility routines. =head1 VERSION -Version 0.08 +Version 0.09 =cut use vars qw/$VERSION/; -$VERSION = '0.08'; +$VERSION = '0.09'; =head1 SYNOPSIS - use Sub::Prototype::Util qw/flatten recall wrap/; + use Sub::Prototype::Util qw/flatten wrap recall/; 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 $splice = wrap 'CORE::splice', compile => 1; + 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) =head1 DESCRIPTION -Prototypes are evil, but sometimes you just have to bear with them, especially when messing with core functions. This module provides several utilities aimed at facilitating "overloading" of prototyped functions. +Prototypes are evil, but sometimes you just have to bear with them, especially when messing with core functions. +This module provides several utilities aimed at facilitating "overloading" of prototyped functions. They all handle C<5.10>'s C<_> prototype. @@ -57,154 +60,112 @@ sub _check_ref { return $r; } +sub _clean_msg { + my ($msg) = @_; + $msg =~ s/(?:\s+called)?\s+at\s+.*$//s; + return $msg; +} + =head2 C -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. +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. +It croaks if the arguments can't possibly match the required prototype, e.g. when a reference type is wrong or when not enough elements were provided. =cut sub flatten { my $proto = shift; return @_ unless defined $proto; - my @args; + my @args; while ($proto =~ /(\\?)(\[[^\]]+\]|[^\];])/g) { my $p = $2; if ($1) { my $a = shift; my $r = _check_ref $a, $p; - my %deref = ( - SCALAR => sub { push @args, $$a }, - ARRAY => sub { push @args, @$a }, - HASH => sub { push @args, %$a }, - GLOB => sub { push @args, *$a }, - CODE => sub { push @args, &$a } - ); - $deref{$r}->(); + 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 + ) + ) + ); } elsif ($p =~ /[\@\%]/) { push @args, @_; last; - } elsif ($p eq '_' && @_ == 0) { - push @args, $_; } else { + croak 'Not enough arguments to match this prototype' unless @_; push @args, shift; } } return @args; } -=head2 C - -Calls the function C<$name> with the prototyped argument list C<@args>. That is, C<@args> should be what C<@_> is when you define a subroutine with the same prototype as C<$name>. For example, - - my $a = [ ]; - recall 'CORE::push', $a, 1, 2, 3; - -will call C and so fill the arrayref C<$a> with C<1, 2, 3>. This is especially needed for core functions because you can't C into them. - -You can also force the use of a specific prototype. In this case, C<$name> must be a hash reference that holds exactly one key/value pair, the key being the function name and the value the prototpye that should be used to call it. - - recall { 'CORE::push' => '\@$' }, $a, 1, 2, 3; # will only push 1 +=head2 C -This allows you to recall into C and C by using the C<\&@> prototype : +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>. - sub mygrep (&@) { recall { 'CORE::grep' => '\&@' }, @_ } # the prototypes are intentionally different + my $a = [ 0 .. 2 ]; + my $push = wrap 'CORE::push'; + $push->($a, 3, 4); # returns 3 + 2 = 5 and $a now contains 0 .. 4 -=cut - -sub _check_name { - my $name = $_[0]; - croak 'No subroutine specified' unless $name; - my $proto; - my $r = ref $name; - if (!$r) { - $proto = prototype $name; - } elsif ($r eq 'HASH') { - croak 'Forced prototype hash reference must contain exactly one key/value pair' unless keys %$name == 1; - ($name, $proto) = %$name; - } else { - croak 'Unhandled ' . $r . ' reference as first argument'; - } - $name =~ s/^\s+//; - $name =~ s/[\s\$\@\%\*\&;].*//; - return $name, $proto; -} - -sub recall { - my ($name, $proto) = _check_name shift; - my $call = $name . '('; - my @cr; - if (defined $proto) { - my $i = 0; - while ($proto =~ /(\\?)(\[[^\]]+\]|[^\];])/g) { - my $p = $2; - if ($1) { - my $r = _check_ref $_[$i], $p; - $call .= $sigils{$r} . '{$_[' . $i . ']},'; - } elsif ($p =~ /[\@\%]/) { - $call .= '@_[' . $i . '..' . (@_ - 1) . ']'; - last; - } elsif ($p =~ /\&/) { - push @cr, $_[$i]; - $call .= 'sub{&{$cr[' . $#cr . ']}},'; - } elsif ($p eq '_' && $i >= @_) { - $call .= '$_,'; - } else { - $call .= '$_[' . $i . '],'; - } - ++$i; - } - $call =~ s/,$//; - } else { - $call .= join ',', map '$_[' . $_ . ']', 0 .. @_ - 1; - } - $call .= ');'; - my @ret = eval $call; - croak $@ if $@; - return @ret; -} +You can force the use of a specific prototype. +In this case, C<$name> must be a hash reference that holds exactly one key / value pair, the key being the function name and the value the prototpye that should be used to call it. -=head2 C + my $push = wrap { 'CORE::push' => '\@$' }; # only pushes 1 arg -Generates a wrapper that does the same thing as L, but specialized for a given function. This wrapper can be compiled once for all to avoid calling C at each run (like L does). You can still force the prototype by passing C<< { $name => $proto } >> as the first argument. Others arguments are seen as key / value pairs and tune the code generated by L. Valid keys are : +Others arguments are seen as key / value pairs that are meant to tune the code generated by L. +Valid keys are : =over 4 =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 C. +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 >> -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. +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 >> -Encloses the code into a C block. Default is true. +Encloses the code into a C block. +Default is true. =item C<< compile => $bool >> -Makes L compile the code generated and return the resulting code reference. Implies C<< sub => 1 >>. Be careful that in this case C must be a fully qualified function name. Defaults to false. +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. +Defaults to true, but turned off when C is false. =back -This is how you make your own C that pushes into array references : +For example, this allows you to recall into C and C by using the C<\&@> prototype : - my @a = (0 .. 2); - my $push = wrap 'CORE::push', compile => 1; - $push->(\@a, 3 .. 7); # returns 3 + 5 = 8, and @a now contains 0 .. 7 + my $grep = wrap { 'CORE::grep' => '\&@' }; + sub mygrep (&@) { $grep->(@_) } # the prototypes are intentionally different =cut sub _wrap { my ($name, $proto, $i, $args, $cr, $opts) = @_; - if ($proto =~ /(\\?)(\[[^\]]+\]|[^\];])(.*)/g) { + while ($proto =~ s/(\\?)(\[[^\]]+\]|[^\];])//) { my ($ref, $p) = ($1, $2); - $proto = $3; $p = $1 if $p =~ /^\[([^\]]+)\]/; my $cur = '$_[' . $i . ']'; if ($ref) { if (length $p > 1) { - return 'my $r = ' . $opts->{ref} . '(' . $cur . '); ' + return 'my $r = ' . $opts->{ref} . '(' . $cur . '); ' . join ' els', map( { "if (\$r eq '" . $reftypes{$_} ."') { " @@ -234,11 +195,28 @@ sub _wrap { } else { $args .= $cur . ', '; } - return _wrap($name, $proto, ($i + 1), $args, $cr, $opts); + ++$i; + } + $args =~ s/,\s*$//; + return $name . '(' . $args . ')'; +} + +sub _check_name { + my $name = $_[0]; + croak 'No subroutine specified' unless $name; + my $proto; + my $r = ref $name; + if (!$r) { + $proto = prototype $name; + } elsif ($r eq 'HASH') { + croak 'Forced prototype hash reference must contain exactly one key/value pair' unless keys %$name == 1; + ($name, $proto) = %$name; } else { - $args =~ s/,\s*$//; - return $name . '(' . $args . ')'; + croak 'Unhandled ' . $r . ' reference as first argument'; } + $name =~ s/^\s+//; + $name =~ s/[\s\$\@\%\*\&;].*//; + return $name, $proto; } sub wrap { @@ -246,7 +224,8 @@ sub wrap { croak 'Optional arguments must be passed as key => value pairs' if @_ % 2; my %opts = @_; $opts{ref} ||= 'ref'; - $opts{sub} = 1 if not exists $opts{sub} or $opts{compile}; + $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; my $call; @@ -264,14 +243,34 @@ sub wrap { $call = 'sub ' . $call if $opts{sub}; if ($opts{compile}) { $call = eval $call; - croak $@ if $@; + croak _clean_msg $@ if $@; } return $call; } +=head2 C + +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. +You can still force the prototype by passing C<< { $name => $proto } >> as the first argument. + + my $a = [ ]; + recall { 'CORE::push' => '\@$' }, $a, 1, 2, 3; # $a just contains 1 + +It's implemented in terms of L, and hence calls C at each run. +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->(@_); +} + =head1 EXPORT -The functions L, L and L are only exported on request, either by providing their name or by the C<':funcs'> and C<':all'> tags. +The functions L, L and L are only exported on request, either by providing their name or by the C<':funcs'> and C<':all'> tags. =cut @@ -281,7 +280,7 @@ use vars qw/@EXPORT @EXPORT_OK %EXPORT_TAGS/; @EXPORT = (); %EXPORT_TAGS = ( - 'funcs' => [ qw/flatten recall wrap/ ] + 'funcs' => [ qw/flatten wrap recall/ ] ); @EXPORT_OK = map { @$_ } values %EXPORT_TAGS; $EXPORT_TAGS{'all'} = [ @EXPORT_OK ]; @@ -298,7 +297,8 @@ You can contact me by mail or on C (vincent). =head1 BUGS -Please report any bugs or feature requests to C, or through the web interface at L. I will be notified, and then you'll automatically be notified of progress on your bug as I make changes. +Please report any bugs or feature requests to C, or through the web interface at L. +I will be notified, and then you'll automatically be notified of progress on your bug as I make changes. =head1 SUPPORT @@ -310,7 +310,7 @@ Tests code coverage report is available at L