X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FB%2FRecDeparse.pm;h=35333fa72f97e900b60c64f2c35aa830602e1d6a;hb=a62d5a0296ab9eb32539e1644bf11bf52b09ab9f;hp=3a8a1ea4619be4cd464f2f8e32e458c4bd854b85;hpb=101804d9cc47742f54303d3d5173f8eb3165da98;p=perl%2Fmodules%2FB-RecDeparse.git diff --git a/lib/B/RecDeparse.pm b/lib/B/RecDeparse.pm index 3a8a1ea..35333fa 100644 --- a/lib/B/RecDeparse.pm +++ b/lib/B/RecDeparse.pm @@ -5,10 +5,11 @@ use 5.008; use strict; use warnings; -use Carp qw/croak/; +use B (); + use Config; -use base qw/B::Deparse/; +use base qw; =head1 NAME @@ -16,11 +17,11 @@ B::RecDeparse - Deparse recursively into subroutines. =head1 VERSION -Version 0.01 +Version 0.04 =cut -our $VERSION = '0.01'; +our $VERSION = '0.04'; =head1 SYNOPSIS @@ -34,15 +35,18 @@ our $VERSION = '0.01'; =head1 DESCRIPTION -This module extends L by making you recursively replace subroutine calls encountered when deparsing. +This module extends L by making it recursively replace subroutine calls encountered when deparsing. -Please refer to L documentation for what to do and how to do it. Besides the constructor syntax, everything should work the same for the two modules. +Please refer to L documentation for what to do and how to do it. +Besides the constructor syntax, everything should work the same for the two modules. =head1 METHODS =head2 C<< new < deparse => [ @B__Deparse_opts ], level => $level > >> -The L object constructor. You can specify the underlying L constructor arguments by passing a string or an array reference as the value of the C key. The C option expects an integer that specifies how many levels of recursions are allowed : C<-1> means infinite while C<0> means none and match L behaviour. +The L object constructor. +You can specify the underlying L constructor arguments by passing a string or an array reference as the value of the C key. +The C option expects an integer that specifies how many levels of recursions are allowed : C<-1> means infinite while C<0> means none and match L behaviour. =cut @@ -50,12 +54,17 @@ use constant { # p31268 made pp_entersub call single_delim FOOL_SINGLE_DELIM => ($^V ge v5.9.5) + || ($^V lt v5.9.0 and $^V ge v5.8.9) || ($Config{perl_patchlevel} && $Config{perl_patchlevel} >= 31268) }; sub _parse_args { - croak 'Optional arguments must be passed as key/value pairs' if @_ % 2; + if (@_ % 2) { + require Carp; + Carp::croak('Optional arguments must be passed as key/value pairs'); + } my %args = @_; + my $deparse = $args{deparse}; if (defined $deparse) { if (!ref $deparse) { @@ -66,42 +75,54 @@ sub _parse_args { } else { $deparse = [ ]; } - my $level = $args{level}; - $level = -1 unless defined $level; - $level = int $level; + + my $level = $args{level}; + $level = -1 unless defined $level; + $level = int $level; + return $deparse, $level; } sub new { my $class = shift; $class = ref($class) || $class || __PACKAGE__; + my ($deparse, $level) = _parse_args(@_); + my $self = bless $class->SUPER::new(@$deparse), $class; + $self->{brd_level} = $level; + return $self; } sub _recurse { - return $_[0]->{brd_level} >= 0 && $_[0]->{brd_cur} >= $_[0]->{brd_level} + return $_[0]->{brd_level} < 0 || $_[0]->{brd_cur} < $_[0]->{brd_level} } sub compile { - my $bd = B::Deparse->new(); my @args = @_; + + my $bd = B::Deparse->new(); my ($deparse, $level) = _parse_args(@args); + my $compiler = $bd->coderef2text(B::Deparse::compile(@$deparse)); $compiler =~ s/ ['"]? B::Deparse ['"]? \s* -> \s* (new) \s* \( ([^\)]*) \) /B::RecDeparse->$1(deparse => [ $2 ], level => $level)/gx; $compiler = eval 'sub ' . $compiler; die if $@; + return $compiler; } sub init { my $self = shift; - $self->{brd_cur} = 0; - $self->{brd_sub} = 0; + + $self->{brd_cur} = 0; + $self->{brd_sub} = 0; + $self->{brd_seen} = { }; + $self->SUPER::init(@_); } @@ -109,10 +130,12 @@ my $key = $; . __PACKAGE__ . $;; if (FOOL_SINGLE_DELIM) { my $oldsd = *B::Deparse::single_delim{CODE}; + no warnings 'redefine'; *B::Deparse::single_delim = sub { my $body = $_[2]; - if ($body =~ s/^$key//) { + + if ((caller 1)[0] eq __PACKAGE__ and $body =~ s/^$key//) { return $body; } else { $oldsd->(@_); @@ -120,39 +143,65 @@ if (FOOL_SINGLE_DELIM) { } } +sub deparse_sub { + my $self = shift; + my $cv = $_[0]; + + my $name; + unless ($cv->CvFLAGS & B::CVf_ANON()) { + $name = $cv->GV->SAFENAME; + } + + local $self->{brd_seen}->{$name} = 1 if defined $name; + return $self->SUPER::deparse_sub(@_); +} + sub pp_entersub { my $self = shift; - $self->{brd_sub} = 1; - my $body = $self->SUPER::pp_entersub(@_); - $self->{brd_sub} = 0; - $body =~ s/^&\s*(\w)/$1/ if not $self->_recurse; + + my $body = do { + local $self->{brd_sub} = 1; + $self->SUPER::pp_entersub(@_); + }; + + $body =~ s/^&\s*(\w)/$1/ if $self->_recurse; + return $body; } sub pp_refgen { my $self = shift; - $self->{brd_sub} = 0; - my $body = $self->SUPER::pp_refgen(@_); - $self->{brd_sub} = 1; - return $body; + + return do { + local $self->{brd_sub} = 0; + $self->SUPER::pp_refgen(@_); + } } sub pp_gv { my $self = shift; + + my $gv = $self->gv_or_padgv($_[0]); + my $name = $gv->NAME; + my $seen = $self->{brd_seen}; + my $body; - if ($self->{brd_sub} <= 0 || $self->_recurse) { + if ($self->{brd_sub} <= 0 || !$self->_recurse || $seen->{$name}) { $body = $self->SUPER::pp_gv(@_); } else { - my $gv = $self->gv_or_padgv($_[0]); - ++$self->{brd_cur}; - $body = 'sub ' . $self->indent($self->deparse_sub($gv->CV)); - --$self->{brd_cur}; + $body = do { + local @{$self}{qw} = (0, $self->{brd_cur} + 1); + local $seen->{$name} = 1; + 'sub ' . $self->indent($self->deparse_sub($gv->CV)); + }; + if (FOOL_SINGLE_DELIM) { $body = $key . $body; } else { $body .= '->'; } } + return $body; } @@ -160,13 +209,16 @@ sub pp_gv { =head2 C +=head2 C + =head2 C =head2 C =head2 C -Functions and methods from L overriden by this module. Never call them directly. +Functions and methods from L reimplemented by this module. +Never call them directly. Otherwise, L inherits all methods from L. @@ -182,11 +234,12 @@ L (standard since perl 5), L (since perl 5.00307) and L >>, L. -You can contact me by mail or on #perl @ FreeNode (vincent or Prof_Vince). +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 @@ -198,7 +251,7 @@ Tests code coverage report is available at L