use strict;
use warnings;
-use Carp qw/croak/;
-use Scalar::Util qw/reftype/;
+use Carp qw<croak>;
+use Scalar::Util qw<reftype>;
=head1 NAME
=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 })
=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>
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 {
push @args, shift;
}
}
+
return @args;
}
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;
}
=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
=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 ];