Remove mab references.

[p5sagit/p5-mst-13.2.git] / lib / Carp.pm

diff --git a/lib/Carp.pm b/lib/Carp.pm
index ba21d9c..5de8f83 100644 (file)
--- a/lib/Carp.pm
+++ b/lib/Carp.pm
@@ -28,6 +28,7 @@ not where carp() was called.
 # exceptions outside of the current package.
 
 $CarpLevel = 0;                # How many extra package levels to skip on carp.
+$MaxEvalLen = 0;       # How much eval '...text...' to show. 0 = all.
 
 require Exporter;
 @ISA = Exporter;
@@ -37,10 +38,27 @@ sub longmess {
     my $error = shift;
     my $mess = "";
     my $i = 1 + $CarpLevel;
-    my ($pack,$file,$line,$sub);
-    while (($pack,$file,$line,$sub) = caller($i++)) {
-       $mess .= "\t$sub " if $error eq "called";
-       $mess .= "$error at $file line $line\n";
+    my ($pack,$file,$line,$sub,$eval,$require);
+    while (($pack,$file,$line,$sub,undef,undef,$eval,$require) = caller($i++)) {
+       if ($error =~ m/\n$/) {
+           $mess .= $error;
+       } else {
+           if (defined $eval) {
+               if ($require) {
+                   $sub = "require $eval";
+               } else {
+                   $eval =~ s/([\\\'])/\\$1/g;
+                   if ($MaxEvalLen && length($eval) > $MaxEvalLen) {
+                       substr($eval,$MaxEvalLen) = '...';
+                   }
+                   $sub = "eval '$eval'";
+               }
+           } elsif ($sub eq '(eval)') {
+               $sub = 'eval {...}';
+           }
+           $mess .= "\t$sub " if $error eq "called";
+           $mess .= "$error at $file line $line\n";
+       }
        $error = "called";
     }
     $mess || $error;
@@ -48,20 +66,40 @@ sub longmess {
 
 sub shortmess {        # Short-circuit &longmess if called via multiple packages
     my $error = $_[0]; # Instead of "shift"
-    my ($curpack) = caller(1);
+    my ($prevpack) = caller(1);
     my $extra = $CarpLevel;
     my $i = 2;
-    my ($pack,$file,$line,$sub);
-    while (($pack,$file,$line,$sub) = caller($i++)) {
-       if ($pack ne $curpack) {
-           if ($extra-- > 0) {
-               $curpack = $pack;
-           }
-           else {
-               return "$error at $file line $line\n";
-           }
+    my ($pack,$file,$line);
+    my %isa = ($prevpack,1);
+
+    @isa{@{"${prevpack}::ISA"}} = ()
+       if(defined @{"${prevpack}::ISA"});
+
+    while (($pack,$file,$line) = caller($i++)) {
+       if(defined @{$pack . "::ISA"}) {
+           my @i = @{$pack . "::ISA"};
+           my %i;
+           @i{@i} = ();
+           @isa{@i,$pack} = ()
+               if(exists $i{$prevpack} || exists $isa{$pack});
+       }
+
+       next
+           if(exists $isa{$pack});
+
+       if ($extra-- > 0) {
+           %isa = ($pack,1);
+           @isa{@{$pack . "::ISA"}} = ()
+               if(defined @{$pack . "::ISA"});
+       }
+       else {
+           return "$error at $file line $line\n";
        }
     }
+    continue {
+       $prevpack = $pack;
+    }
+
     goto &longmess;
 }