X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FB%2FRecDeparse.pm;h=2aac9bb42e16ebacd1d05aa5aa6e7a5e2489ae92;hb=4f0a86c2a8beb9f7ab93e890d3835e18649b49ff;hp=26986677a01a66de8182191f0b2645dd4975744e;hpb=ec8262f6b90d1c456270cbe1678cb8ff2c80d660;p=perl%2Fmodules%2FB-RecDeparse.git

diff --git a/lib/B/RecDeparse.pm b/lib/B/RecDeparse.pm
index 2698667..2aac9bb 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,9 +70,11 @@ 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;
 }
 
@@ -112,7 +118,7 @@ if (FOOL_SINGLE_DELIM) {
  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->(@_);