X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FB%2FRecDeparse.pm;h=f9964207f1314ad5776338d58ea7b9dcf5108f2f;hb=b8b7412248e3d4fc5b193e5f756e1139a4b540bf;hp=2aac9bb42e16ebacd1d05aa5aa6e7a5e2489ae92;hpb=4f0a86c2a8beb9f7ab93e890d3835e18649b49ff;p=perl%2Fmodules%2FB-RecDeparse.git diff --git a/lib/B/RecDeparse.pm b/lib/B/RecDeparse.pm index 2aac9bb..f996420 100644 --- a/lib/B/RecDeparse.pm +++ b/lib/B/RecDeparse.pm @@ -1,13 +1,15 @@ package B::RecDeparse; -use 5.008; +use 5.008001; use strict; use warnings; +use B (); + use Config; -use base qw/B::Deparse/; +use base qw; =head1 NAME @@ -15,33 +17,43 @@ B::RecDeparse - Deparse recursively into subroutines. =head1 VERSION -Version 0.04 +Version 0.07 =cut -our $VERSION = '0.04'; +our $VERSION = '0.07'; =head1 SYNOPSIS - perl -MO=RecDeparse,deparse,[@B__Deparse_opts],level,-1 [ -e '...' | bleh.pl ] + # Deparse recursively a Perl one-liner : + $ perl -MO=RecDeparse,deparse,@B__Deparse_opts,level,-1 -e '...' + + # Or a complete Perl script : + $ perl -MO=RecDeparse,deparse,@B__Deparse_opts,level,-1 x.pl - # Or as a module : + # Or a single code reference : use B::RecDeparse; - my $brd = B::RecDeparse->new(deparse => [ @b__deparse_opts ], level => $level); + my $brd = B::RecDeparse->new( + deparse => \@B__Deparse_opts, + level => $level, + ); my $code = $brd->coderef2text(sub { ... }); =head1 DESCRIPTION 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 @@ -81,9 +93,13 @@ sub _parse_args { 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; } @@ -92,22 +108,28 @@ sub _recurse { } 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(@_); } @@ -115,9 +137,11 @@ 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 ((caller 1)[0] eq __PACKAGE__ and $body =~ s/^$key//) { return $body; } else { @@ -126,18 +150,35 @@ 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; + 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; + return do { local $self->{brd_sub} = 0; $self->SUPER::pp_refgen(@_); @@ -146,21 +187,30 @@ sub pp_refgen { sub pp_gv { my $self = shift; + + my $gv = $self->gv_or_padgv($_[0]); + my $name = $gv->NAME; + my $cv = $gv->CV; + my $seen = $self->{brd_seen}; + my $body; - if ($self->{brd_sub} <= 0 || !$self->_recurse) { + if (!$self->{brd_sub} or !$self->_recurse or $seen->{$name} or !$$cv + or !$cv->isa('B::CV') or $cv->ROOT->isa('B::NULL')) { $body = $self->SUPER::pp_gv(@_); } else { - my $gv = $self->gv_or_padgv($_[0]); $body = do { - local @{$self}{qw/brd_sub brd_cur/} = (0, $self->{brd_cur} + 1); + 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; } @@ -168,13 +218,16 @@ sub pp_gv { =head2 C +=head2 C + =head2 C =head2 C =head2 C -Functions and methods from L reimplemented 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. @@ -184,6 +237,8 @@ An object-oriented module shouldn't export any function, and so does this one. =head1 DEPENDENCIES +L 5.8.1. + L (standard since perl 5), L (since perl 5.00307) and L (since perl 5.005). =head1 AUTHOR @@ -194,7 +249,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 @@ -206,7 +262,7 @@ Tests code coverage report is available at L