X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FB%2FRecDeparse.pm;h=4f7b6361b923df0890348b39038f68f1167a5aa6;hb=e4de83a1e5557e69ecdaa3ac6c61a73b73da0bc0;hp=db96fd6b763ea091a5707db1ce986c3c6542cdc8;hpb=9cd527f20a3c5db1da76cc84685929819e1cc136;p=perl%2Fmodules%2FB-RecDeparse.git

diff --git a/lib/B/RecDeparse.pm b/lib/B/RecDeparse.pm
index db96fd6..4f7b636 100644
--- a/lib/B/RecDeparse.pm
+++ b/lib/B/RecDeparse.pm
@@ -5,7 +5,6 @@ use 5.008;
 use strict;
 use warnings;
 
-use Carp qw/croak/;
 use Config;
 
 use base qw/B::Deparse/;
@@ -16,11 +15,11 @@ B::RecDeparse - Deparse recursively into subroutines.
 
 =head1 VERSION
 
-Version 0.03
+Version 0.04
 
 =cut
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 =head1 SYNOPSIS
 
@@ -50,12 +49,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,18 +70,24 @@ 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;
 }
 
@@ -86,22 +96,27 @@ 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->SUPER::init(@_);
 }
 
@@ -109,9 +124,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 {
@@ -122,16 +139,20 @@ if (FOOL_SINGLE_DELIM) {
 
 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(@_);
@@ -140,21 +161,25 @@ sub pp_refgen {
 
 sub pp_gv {
  my $self = shift;
+
  my $body;
  if ($self->{brd_sub} <= 0 || !$self->_recurse) {
   $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);
    'sub ' . $self->indent($self->deparse_sub($gv->CV));
   };
+
   if (FOOL_SINGLE_DELIM) {
    $body = $key . $body;
   } else {
    $body .= '->';
   }
  }
+
  return $body;
 }
 
@@ -200,7 +225,7 @@ Tests code coverage report is available at L<http://www.profvince.com/perl/cover
 
 =head1 COPYRIGHT & LICENSE
 
-Copyright 2008 Vincent Pit, all rights reserved.
+Copyright 2008,2009,2010 Vincent Pit, all rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.