From: Ilya Zakharevich <ilya@math.ohio-state.edu>
Date: Fri, 21 Feb 1997 07:37:59 +0000 (-0500)
Subject: Debugger patch
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7d0742d84411135caaa356cb76d4e5f4fdbeb13a;p=p5sagit%2Fp5-mst-13.2.git

Debugger patch

private-msgid: <199702210737.CAA03951@monk.mps.ohio-state.edu>
---

diff --git a/lib/perl5db.pl b/lib/perl5db.pl
index 38ae297..a82888a 100644
--- a/lib/perl5db.pl
+++ b/lib/perl5db.pl
@@ -1100,22 +1100,24 @@ sub sub {
     if (wantarray) {
 	@ret = &$sub;
 	$single |= pop(@stack);
-	print ($OUT "list context return from $sub:\n"), dumpit( \@ret ),
-	  $doret = -2 if $doret eq $#stack;
 	($frame & 4 
 	 ? ( (print $LINEINFO ' ' x $#stack, "out "), 
 	     print_trace($LINEINFO, -1, 1, 1, "$sub$al") )
 	 : print $LINEINFO ' ' x $#stack, "exited $sub$al\n") if $frame & 2;
+	print ($OUT ($frame & 16 ? ' ' x $#stack : ""),
+		    "list context return from $sub:\n"), dumpit( \@ret ),
+	  $doret = -2 if $doret eq $#stack or $frame & 16;
 	@ret;
     } else {
 	$ret = &$sub;
 	$single |= pop(@stack);
-	print ($OUT "scalar context return from $sub: "), dumpit( $ret ),
-	  $doret = -2 if $doret eq $#stack;
 	($frame & 4 
 	 ? ( (print $LINEINFO ' ' x $#stack, "out "), 
 	      print_trace($LINEINFO, -1, 1, 1, "$sub$al") )
 	 : print $LINEINFO ' ' x $#stack, "exited $sub$al\n") if $frame & 2;
+	print ($OUT ($frame & 16 ? ' ' x $#stack : ""),
+		    "scalar context return from $sub: "), dumpit( $ret ),
+	  $doret = -2 if $doret eq $#stack or $frame & 16;
 	$ret;
     }
 }