X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fperl5db.pl;h=ba3e2f74ae7e4de0be1b20e14b66d7ca30c437ca;hb=0ec158f4b0db050abb15876df15f5f883540cfd9;hp=b62ac8b5e545fa2b7afdeeaf995300e61ec711e5;hpb=c1051fcf201cfc8e5333ee502dfa83719c9146d7;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/perl5db.pl b/lib/perl5db.pl index b62ac8b..ba3e2f7 100644 --- a/lib/perl5db.pl +++ b/lib/perl5db.pl @@ -1,6 +1,8 @@ package DB; # Debugger for Perl 5.00x; perl5db.pl patch level: +$VERSION = 1.19; +$header = "perl5db.pl version $VERSION"; # It is crucial that there is no lexicals in scope of `eval ""' down below sub eval { @@ -21,20 +23,22 @@ sub eval { local $saved[0]; # Preserve the old value of $@ eval { &DB::save }; if ($at) { + local $\ = ''; print $OUT $at; } elsif ($onetimeDump) { - dumpit($OUT, \@res) if $onetimeDump eq 'dump'; - methods($res[0]) if $onetimeDump eq 'methods'; + if ($onetimeDump eq 'dump') { + local $option{dumpDepth} = $onetimedumpDepth + if defined $onetimedumpDepth; + dumpit($OUT, \@res); + } elsif ($onetimeDump eq 'methods') { + methods($res[0]) ; + } } @res; } # After this point it is safe to introduce lexicals # However, one should not overdo it: leave as much control from outside as possible - -$VERSION = 1.15; -$header = "perl5db.pl version $VERSION"; - # # This file is automatically included if you do perl -d. # It's probably not useful to include this yourself. @@ -43,7 +47,7 @@ $header = "perl5db.pl version $VERSION"; # wise to read the perldebguts man page or risk the ire of dragons. # # Perl supplies the values for %sub. It effectively inserts -# a &DB'DB(); in front of every place that can have a +# a &DB::DB(); in front of every place that can have a # breakpoint. Instead of a subroutine call it calls &DB::sub with # $DB::sub being the called subroutine. It also inserts a BEGIN # {require 'perl5db.pl'} before the first line. @@ -252,7 +256,7 @@ $header = "perl5db.pl version $VERSION"; # cmd_b_line($lineno [, $cond]) # b lineno [cond] # cmd_b_sub($sub [, $cond]) # b sub [cond] # cmd_stop() # Control-C -# cmd_d($lineno) # d lineno +# cmd_d($lineno) # d lineno (B) # The cmd_*() API returns FALSE on failure; in this case it outputs # the error message to the debugging output. # j) Low-level debugger API @@ -298,6 +302,25 @@ $header = "perl5db.pl version $VERSION"; # + Updated 1.14 change log # + Added *dbline explainatory comments # + Mentioning perldebguts man page +# Changes: 1.16: Feb 15, 2002 Mark-Jason Dominus +# + $onetimeDump improvements +# Changes: 1.17: Feb 20, 2002 Richard Foley +# Moved some code to cmd_[.]()'s for clarity and ease of handling, +# rationalised the following commands and added cmd_wrapper() to +# enable switching between old and frighteningly consistent new +# behaviours for diehards: 'o CommandSet=pre580' (sigh...) +# a(add), A(del) # action expr (added del by line) +# + b(add), B(del) # break [line] (was b,D) +# + w(add), W(del) # watch expr (was W,W) added del by expr +# + h(summary), h h(long) # help (hh) (was h h,h) +# + m(methods), M(modules) # ... (was m,v) +# + o(option) # lc (was O) +# + v(view code), V(view Variables) # ... (was w,V) +# Changes: 1.18: Mar 17, 2002 Richard Foley +# + fixed missing cmd_O bug +# Changes: 1.19: Mar 29, 2002 Spider Boardman +# + Added missing local()s -- DB::DB is called recursively. +# #################################################################### # Needed for the statement after exec(): @@ -328,7 +351,8 @@ $trace = $signal = $single = 0; # Uninitialized warning suppression # (local $^W cannot help - other packages!). $inhibit_exit = $option{PrintRet} = 1; -@options = qw(hashDepth arrayDepth DumpDBFiles DumpPackages DumpReused +@options = qw(hashDepth arrayDepth CommandSet dumpDepth + DumpDBFiles DumpPackages DumpReused compactDump veryCompact quote HighBit undefPrint globPrint PrintRet UsageOnly frame AutoTrace TTY noTTY ReadLine NonStop LineInfo maxTraceLen @@ -340,6 +364,7 @@ $inhibit_exit = $option{PrintRet} = 1; %optionVars = ( hashDepth => \$dumpvar::hashDepth, arrayDepth => \$dumpvar::arrayDepth, + CommandSet => \$CommandSet, DumpDBFiles => \$dumpvar::dumpDBFiles, DumpPackages => \$dumpvar::dumpPackages, DumpReused => \$dumpvar::dumpReused, @@ -393,17 +418,18 @@ $pre = [] unless defined $pre; $post = [] unless defined $post; $pretype = [] unless defined $pretype; $CreateTTY = 3 unless defined $CreateTTY; +$CommandSet = '580' unless defined $CommandSet; warnLevel($warnLevel); dieLevel($dieLevel); signalLevel($signalLevel); -&pager( - (defined($ENV{PAGER}) - ? $ENV{PAGER} - : ($^O eq 'os2' - ? 'cmd /c more' - : 'more'))) unless defined $pager; +pager( + defined $ENV{PAGER} ? $ENV{PAGER} : + eval { require Config } && + defined $Config::Config{pager} ? $Config::Config{pager} + : 'more' + ) unless defined $pager; setman(); &recallCommand("!") unless defined $prc; &shellBang("!") unless defined $psh; @@ -416,7 +442,7 @@ if (defined $ENV{PERLDB_PIDS}) { $term_pid = -1; } else { $ENV{PERLDB_PIDS} = "$$"; - $pids = ''; + $pids = "{pid=$$}"; $term_pid = $$; } $pidprompt = ''; @@ -596,6 +622,8 @@ if ($notty) { $header =~ s/.Header: ([^,]+),v(\s+\S+\s+\S+).*$/$1$2/; unless ($runnonstop) { + local $\ = ''; + local $, = ''; if ($term_pid eq '-1') { print $OUT "\nDaughter DB session started...\n"; } else { @@ -638,36 +666,44 @@ sub DB { } $runnonstop = 0 if $single or $signal; # Disable it if interactive. &save; - ($package, $filename, $line) = caller; - $filename_ini = $filename; - $usercontext = '($@, $!, $^E, $,, $/, $\, $^W) = @saved;' . + local($package, $filename, $line) = caller; + local $filename_ini = $filename; + local $usercontext = '($@, $!, $^E, $,, $/, $\, $^W) = @saved;' . "package $package;"; # this won't let them modify, alas local(*dbline) = $main::{'_<' . $filename}; - $max = $#dbline; + + # we need to check for pseudofiles on Mac OS (these are files + # not attached to a filename, but instead stored in Dev:Pseudo) + if ($^O eq 'MacOS' && $#dbline < 0) { + $filename_ini = $filename = 'Dev:Pseudo'; + *dbline = $main::{'_<' . $filename}; + } + + local $max = $#dbline; if ($dbline{$line} && (($stop,$action) = split(/\0/,$dbline{$line}))) { - if ($stop eq '1') { - $signal |= 1; - } elsif ($stop) { - $evalarg = "\$DB::signal |= 1 if do {$stop}"; &eval; - $dbline{$line} =~ s/;9($|\0)/$1/; - } + if ($stop eq '1') { + $signal |= 1; + } elsif ($stop) { + $evalarg = "\$DB::signal |= 1 if do {$stop}"; &eval; + $dbline{$line} =~ s/;9($|\0)/$1/; + } } my $was_signal = $signal; if ($trace & 2) { for (my $n = 0; $n <= $#to_watch; $n++) { - $evalarg = $to_watch[$n]; - local $onetimeDump; # Do not output results - my ($val) = &eval; # Fix context (&eval is doing array)? - $val = ( (defined $val) ? "'$val'" : 'undef' ); - if ($val ne $old_watch[$n]) { - $signal = 1; - print $OUT < 30) { $position = "$prefix$line):\n$line:\t$dbline[$line]$after"; - $prefix = ""; - $infix = ":\t"; + $prefix = ""; + $infix = ":\t"; } else { - $infix = "):\t"; - $position = "$prefix$line$infix$dbline[$line]$after"; + $infix = "):\t"; + $position = "$prefix$line$infix$dbline[$line]$after"; } if ($frame) { - print_lineinfo(' ' x $stack_depth, "$line:\t$dbline[$line]$after"); + print_lineinfo(' ' x $stack_depth, "$line:\t$dbline[$line]$after"); } else { - print_lineinfo($position); + print_lineinfo($position); } for ($i = $line + 1; $i <= $max && $dbline[$i] == 0; ++$i) { #{ vi - last if $dbline[$i] =~ /^\s*[\;\}\#\n]/; - last if $signal; - $after = ($dbline[$i] =~ /\n$/ ? '' : "\n"); - $incr_pos = "$prefix$i$infix$dbline[$i]$after"; - $position .= $incr_pos; - if ($frame) { - print_lineinfo(' ' x $stack_depth, "$i:\t$dbline[$i]$after"); - } else { - print_lineinfo($incr_pos); - } + last if $dbline[$i] =~ /^\s*[\;\}\#\n]/; + last if $signal; + $after = ($dbline[$i] =~ /\n$/ ? '' : "\n"); + $incr_pos = "$prefix$i$infix$dbline[$i]$after"; + $position .= $incr_pos; + if ($frame) { + print_lineinfo(' ' x $stack_depth, "$i:\t$dbline[$i]$after"); + } else { + print_lineinfo($incr_pos); + } } } } $evalarg = $action, &eval if $action; if ($single || $was_signal) { - local $level = $level + 1; - foreach $evalarg (@$pre) { - &eval; - } - print $OUT $stack_depth . " levels deep in subroutine calls!\n" - if $single & 4; - $start = $line; - $incr = -1; # for backward motion. - @typeahead = (@$pretype, @typeahead); - CMD: + local $level = $level + 1; + foreach $evalarg (@$pre) { + &eval; + } + print $OUT $stack_depth . " levels deep in subroutine calls!\n" + if $single & 4; + $start = $line; + $incr = -1; # for backward motion. + @typeahead = (@$pretype, @typeahead); + CMD: while (($term || &setterm), ($term_pid == $$ or resetterm(1)), defined ($cmd=&readline("$pidprompt DB" . ('<' x $level) . - ($#hist+1) . ('>' x $level) . - " "))) + ($#hist+1) . ('>' x $level) . " "))) { $single = 0; $signal = 0; @@ -753,51 +788,37 @@ EOP $cmd =~ s/\s+$//s; # trim annoying trailing whitespace ($i) = split(/\s+/,$cmd); if ($alias{$i}) { - # squelch the sigmangler - local $SIG{__DIE__}; - local $SIG{__WARN__}; - eval "\$cmd =~ $alias{$i}"; - if ($@) { - print $OUT "Couldn't evaluate `$i' alias: $@"; - next CMD; - } + # squelch the sigmangler + local $SIG{__DIE__}; + local $SIG{__WARN__}; + eval "\$cmd =~ $alias{$i}"; + if ($@) { + local $\ = ''; + print $OUT "Couldn't evaluate `$i' alias: $@"; + next CMD; + } } - $cmd =~ /^q$/ && ($fall_off_end = 1) && clean_ENV() && exit $?; - $cmd =~ /^h$/ && do { - print_help($help); - next CMD; }; - $cmd =~ /^h\s+h$/ && do { - print_help($summary); - next CMD; }; - # support long commands; otherwise bogus errors - # happen when you ask for h on for example - $cmd =~ /^h\s+(\S.*)$/ && do { - my $asked = $1; # for proper errmsg - my $qasked = quotemeta($asked); # for searching - # XXX: finds CR but not - if ($help =~ /^ is not a debugger command.\n"); - } - next CMD; }; + $cmd =~ /^q$/ && do { + $fall_off_end = 1; + clean_ENV(); + exit $?; + }; $cmd =~ /^t$/ && do { $trace ^= 1; + local $\ = ''; print $OUT "Trace = " . (($trace & 1) ? "on" : "off" ) . "\n"; next CMD; }; $cmd =~ /^S(\s+(!)?(.+))?$/ && do { $Srev = defined $2; $Spatt = $3; $Snocheck = ! defined $1; + local $\ = ''; + local $, = ''; foreach $subname (sort(keys %sub)) { if ($Snocheck or $Srev^($subname =~ /$Spatt/)) { print $OUT $subname,"\n"; } } next CMD; }; - $cmd =~ /^v$/ && do { - list_versions(); next CMD}; $cmd =~ s/^X\b/V $package/; $cmd =~ /^V$/ && do { $cmd = "V $package"; }; @@ -810,7 +831,10 @@ EOP local $frame = 0; local $doret = -2; # must detect sigpipe failures - eval { &main::dumpvar($packname,@vars) }; + eval { &main::dumpvar($packname, + defined $option{dumpDepth} + ? $option{dumpDepth} : -1, + @vars) }; if ($@) { die unless $@ =~ /dumpvar print failed/; } @@ -820,7 +844,12 @@ EOP select ($savout); next CMD; }; $cmd =~ s/^x\b/ / && do { # So that will be evaled - $onetimeDump = 'dump'; }; + $onetimeDump = 'dump'; + # handle special "x 3 blah" syntax + if ($cmd =~ s/^\s*(\d+)(?=\s)/ /) { + $onetimedumpDepth = $1; + } + }; $cmd =~ s/^m\s+([\w:]+)\s*$/ / && do { methods($1); next CMD}; $cmd =~ s/^m\b/ / && do { # So this will be evaled @@ -829,7 +858,7 @@ EOP $file = $1; $file =~ s/\s+$//; if (!$file) { - print $OUT "The old f command is now the r command.\n"; + print $OUT "The old f command is now the r command.\n"; # hint print $OUT "The new f command switches filenames.\n"; next CMD; } @@ -854,43 +883,6 @@ EOP next CMD; } }; - $cmd =~ s/^l\s+-\s*$/-/; - $cmd =~ /^([lb])\b\s*(\$.*)/s && do { - $evalarg = $2; - my ($s) = &eval; - print($OUT "Error: $@\n"), next CMD if $@; - $s = CvGV_name($s); - print($OUT "Interpreted as: $1 $s\n"); - $cmd = "$1 $s"; - }; - $cmd =~ /^l\b\s*([\':A-Za-z_][\':\w]*(\[.*\])?)/s && do { - my $s = $subname = $1; - $subname =~ s/\'/::/; - $subname = $package."::".$subname - unless $subname =~ /::/; - $subname = "CORE::GLOBAL::$s" - if not defined &$subname and $s !~ /::/ - and defined &{"CORE::GLOBAL::$s"}; - $subname = "main".$subname if substr($subname,0,2) eq "::"; - @pieces = split(/:/,find_sub($subname) || $sub{$subname}); - $subrange = pop @pieces; - $file = join(':', @pieces); - if ($file ne $filename) { - print $OUT "Switching to file '$file'.\n" - unless $slave_editor; - *dbline = $main::{'_<' . $file}; - $max = $#dbline; - $filename = $file; - } - if ($subrange) { - if (eval($subrange) < -$window) { - $subrange =~ s/-.*/+/; - } - $cmd = "l $subrange"; - } else { - print $OUT "Subroutine $subname not found.\n"; - next CMD; - } }; $cmd =~ /^\.$/ && do { $incr = -1; # for backward motion. $start = $line; @@ -899,201 +891,18 @@ EOP $max = $#dbline; print_lineinfo($position); next CMD }; - $cmd =~ /^w\b\s*(\d*)$/ && do { - $incr = $window - 1; - $start = $1 if $1; - $start -= $preview; - #print $OUT 'l ' . $start . '-' . ($start + $incr); - $cmd = 'l ' . $start . '-' . ($start + $incr); }; $cmd =~ /^-$/ && do { $start -= $incr + $window + 1; $start = 1 if $start <= 0; $incr = $window - 1; $cmd = 'l ' . ($start) . '+'; }; - $cmd =~ /^l$/ && do { - $incr = $window - 1; - $cmd = 'l ' . $start . '-' . ($start + $incr); }; - $cmd =~ /^l\b\s*(\d*)\+(\d*)$/ && do { - $start = $1 if $1; - $incr = $2; - $incr = $window - 1 unless $incr; - $cmd = 'l ' . $start . '-' . ($start + $incr); }; - $cmd =~ /^l\b\s*((-?[\d\$\.]+)([-,]([\d\$\.]+))?)?/ && do { - $end = (!defined $2) ? $max : ($4 ? $4 : $2); - $end = $max if $end > $max; - $i = $2; - $i = $line if $i eq '.'; - $i = 1 if $i < 1; - $incr = $end - $i; - if ($slave_editor) { - print $OUT "\032\032$filename:$i:0\n"; - $i = $end; - } else { - for (; $i <= $end; $i++) { - my ($stop,$action); - ($stop,$action) = split(/\0/, $dbline{$i}) if - $dbline{$i}; - $arrow = ($i==$line - and $filename eq $filename_ini) - ? '==>' - : ($dbline[$i]+0 ? ':' : ' ') ; - $arrow .= 'b' if $stop; - $arrow .= 'a' if $action; - print $OUT "$i$arrow\t", $dbline[$i]; - $i++, last if $signal; - } - print $OUT "\n" unless $dbline[$i-1] =~ /\n$/; - } - $start = $i; # remember in case they want more - $start = $max if $start > $max; - next CMD; }; - $cmd =~ /^D$/ && do { - print $OUT "Deleting all breakpoints...\n"; - my $file; - for $file (keys %had_breakpoints) { - local *dbline = $main::{'_<' . $file}; - my $max = $#dbline; - my $was; - - for ($i = 1; $i <= $max ; $i++) { - if (defined $dbline{$i}) { - $dbline{$i} =~ s/^[^\0]+//; - if ($dbline{$i} =~ s/^\0?$//) { - delete $dbline{$i}; - } - } - } - - if (not $had_breakpoints{$file} &= ~1) { - delete $had_breakpoints{$file}; - } - } - undef %postponed; - undef %postponed_file; - undef %break_on_load; - next CMD; }; - $cmd =~ /^L$/ && do { - my $file; - for $file (keys %had_breakpoints) { - local *dbline = $main::{'_<' . $file}; - my $max = $#dbline; - my $was; - - for ($i = 1; $i <= $max; $i++) { - if (defined $dbline{$i}) { - print $OUT "$file:\n" unless $was++; - print $OUT " $i:\t", $dbline[$i]; - ($stop,$action) = split(/\0/, $dbline{$i}); - print $OUT " break if (", $stop, ")\n" - if $stop; - print $OUT " action: ", $action, "\n" - if $action; - last if $signal; - } - } - } - if (%postponed) { - print $OUT "Postponed breakpoints in subroutines:\n"; - my $subname; - for $subname (keys %postponed) { - print $OUT " $subname\t$postponed{$subname}\n"; - last if $signal; - } - } - my @have = map { # Combined keys - keys %{$postponed_file{$_}} - } keys %postponed_file; - if (@have) { - print $OUT "Postponed breakpoints in files:\n"; - my ($file, $line); - for $file (keys %postponed_file) { - my $db = $postponed_file{$file}; - print $OUT " $file:\n"; - for $line (sort {$a <=> $b} keys %$db) { - print $OUT " $line:\n"; - my ($stop,$action) = split(/\0/, $$db{$line}); - print $OUT " break if (", $stop, ")\n" - if $stop; - print $OUT " action: ", $action, "\n" - if $action; - last if $signal; - } - last if $signal; - } - } - if (%break_on_load) { - print $OUT "Breakpoints on load:\n"; - my $file; - for $file (keys %break_on_load) { - print $OUT " $file\n"; - last if $signal; - } - } - if ($trace & 2) { - print $OUT "Watch-expressions:\n"; - my $expr; - for $expr (@to_watch) { - print $OUT " $expr\n"; - last if $signal; - } - } - next CMD; }; - $cmd =~ /^b\b\s*load\b\s*(.*)/ && do { - my $file = $1; $file =~ s/\s+$//; - cmd_b_load($file); - next CMD; }; - $cmd =~ /^b\b\s*(postpone|compile)\b\s*([':A-Za-z_][':\w]*)\s*(.*)/ && do { - my $cond = length $3 ? $3 : '1'; - my ($subname, $break) = ($2, $1 eq 'postpone'); - $subname =~ s/\'/::/g; - $subname = "${'package'}::" . $subname - unless $subname =~ /::/; - $subname = "main".$subname if substr($subname,0,2) eq "::"; - $postponed{$subname} = $break - ? "break +0 if $cond" : "compile"; - next CMD; }; - $cmd =~ /^b\b\s*([':A-Za-z_][':\w]*(?:\[.*\])?)\s*(.*)/ && do { - $subname = $1; - $cond = length $2 ? $2 : '1'; - cmd_b_sub($subname, $cond); - next CMD; }; - $cmd =~ /^b\b\s*(\d*)\s*(.*)/ && do { - $i = $1 || $line; - $cond = length $2 ? $2 : '1'; - cmd_b_line($i, $cond); - next CMD; }; - $cmd =~ /^d\b\s*(\d*)/ && do { - cmd_d($1 || $line); - next CMD; }; - $cmd =~ /^A$/ && do { - print $OUT "Deleting all actions...\n"; - my $file; - for $file (keys %had_breakpoints) { - local *dbline = $main::{'_<' . $file}; - my $max = $#dbline; - my $was; - - for ($i = 1; $i <= $max ; $i++) { - if (defined $dbline{$i}) { - $dbline{$i} =~ s/\0[^\0]*//; - delete $dbline{$i} if $dbline{$i} eq ''; - } - } - - unless ($had_breakpoints{$file} &= ~2) { - delete $had_breakpoints{$file}; - } - } - next CMD; }; - $cmd =~ /^O\s*$/ && do { - for (@options) { - &dump_option($_); - } - next CMD; }; - $cmd =~ /^O\s*(\S.*)/ && do { - parse_options($1); - next CMD; }; - $cmd =~ /^\<\<\s*(.*)/ && do { # \<\< for CPerl sake: not HERE + # rjsf -> + $cmd =~ /^([aAbBDhlLMoOvwW])\b\s*(.*)/s && do { + &cmd_wrapper($1, $2, $line); + next CMD; + }; + # <- rjsf + $cmd =~ /^\<\<\s*(.*)/ && do { # \<\< for CPerl sake: not HERE push @$pre, action($1); next CMD; }; $cmd =~ /^>>\s*(.*)/ && do { @@ -1171,22 +980,7 @@ EOP } $pretype = [$1]; next CMD; }; - $cmd =~ /^a\b\s*(\d*)\s*(.*)/ && do { - $i = $1 || $line; $j = $2; - if (length $j) { - if ($dbline[$i] == 0) { - print $OUT "Line $i may not have an action.\n"; - } else { - $had_breakpoints{$filename} |= 2; - $dbline{$i} =~ s/\0[^\0]*//; - $dbline{$i} .= "\0" . action($j); - } - } else { - $dbline{$i} =~ s/\0[^\0]*//; - delete $dbline{$i} if $dbline{$i} eq ''; - } - next CMD; }; - $cmd =~ /^n$/ && do { + $cmd =~ /^n$/ && do { end_report(), next CMD if $finished and $level <= 1; $single = 2; $laststep = $cmd; @@ -1203,7 +997,7 @@ EOP # sub-session anyway... # local $filename = $filename; # local *dbline = *dbline; # XXX Would this work?! - if ($i =~ /\D/) { # subroutine name + if ($subname =~ /\D/) { # subroutine name $subname = $package."::".$subname unless $subname =~ /::/; ($file,$i) = (find_sub($subname) =~ /^(.*):(.*)$/); @@ -1244,6 +1038,7 @@ EOP for (@ini_INC) { push @flags, '-I', $_; } + push @flags, '-T' if ${^TAINT}; # Arrange for setting the old INC: set_list("PERLDB_INC", @ini_INC); if ($0 eq '-e') { @@ -1321,18 +1116,8 @@ EOP $cmd =~ /^T$/ && do { print_trace($OUT, 1); # skip DB next CMD; }; - $cmd =~ /^W\s*$/ && do { - $trace &= ~2; - @to_watch = @old_watch = (); - next CMD; }; - $cmd =~ /^W\b\s*(.*)/s && do { - push @to_watch, $1; - $evalarg = $1; - my ($val) = &eval; - $val = (defined $val) ? "'$val'" : 'undef' ; - push @old_watch, $val; - $trace |= 2; - next CMD; }; + $cmd =~ /^w\b\s*(.*)/s && do { &cmd_w($1); next CMD; }; + $cmd =~ /^W\b\s*(.*)/s && do { &cmd_W($1); next CMD; }; $cmd =~ /^\/(.*)$/ && do { $inpat = $1; $inpat =~ s:([^\\])/$:$1:; @@ -1444,8 +1229,7 @@ EOP my @keys; if (length $cmd == 0) { @keys = sort keys %alias; - } - elsif (my($k,$v) = ($cmd =~ /^(\S+)\s+(\S.*)/)) { + } elsif (my($k,$v) = ($cmd =~ /^(\S+)\s+(\S.*)/)) { # can't use $_ or kill //g state for my $x ($k, $v) { $x =~ s/\a/\\a/g } $alias{$k} = "s\a$k\a$v\a"; @@ -1458,8 +1242,7 @@ EOP next CMD; } @keys = ($k); - } - else { + } else { @keys = ($cmd); } for my $k (@keys) { @@ -1477,8 +1260,7 @@ EOP $cmd =~ /^\@\s*(.*\S)/ && do { if (open my $fh, $1) { push @cmdfhs, $fh; - } - else { + } else { &warn("Can't execute `$1': $!\n"); } next CMD; }; @@ -1520,6 +1302,7 @@ EOP $evalarg = "\$^D = \$^D | \$DB::db_stop;\n$cmd"; &eval; if ($onetimeDump) { $onetimeDump = undef; + $onetimedumpDepth = undef; } elsif ($term_pid == $$) { print $OUT "\n"; } @@ -1557,7 +1340,7 @@ EOP $piped= ""; } } # CMD: - $fall_off_end = 1 unless defined $cmd; # Emulate `q' on EOF + $fall_off_end = 1 unless defined $cmd; # Emulate `q' on EOF foreach $evalarg (@$post) { &eval; } @@ -1592,6 +1375,7 @@ sub sub { print_trace($LINEINFO, -1, 1, 1, "$sub$al") ) : print_lineinfo(' ' x $stack_depth, "exited $sub$al\n")) if $frame & 2; if ($doret eq $stack_depth or $frame & 16) { + local $\ = ''; my $fh = ($doret eq $stack_depth ? $OUT : $LINEINFO); print $fh ' ' x $stack_depth if $frame & 16; print $fh "list context return from $sub:\n"; @@ -1611,6 +1395,7 @@ sub sub { print_trace($LINEINFO, -1, 1, 1, "$sub$al") ) : print_lineinfo(' ' x $stack_depth, "exited $sub$al\n")) if $frame & 2; if ($doret eq $stack_depth or $frame & 16 and defined wantarray) { + local $\ = ''; my $fh = ($doret eq $stack_depth ? $OUT : $LINEINFO); print $fh (' ' x $stack_depth) if $frame & 16; print $fh (defined wantarray @@ -1629,6 +1414,126 @@ sub sub { ### returns FALSE on error. ### User-interface functions cmd_* output error message. +### Note all cmd_[a-zA-Z]'s require $line, $dblineno as first arguments + +my %set = ( # + 'pre580' => { + 'a' => 'pre580_a', + 'A' => 'pre580_null', + 'b' => 'pre580_b', + 'B' => 'pre580_null', + 'd' => 'pre580_null', + 'D' => 'pre580_D', + 'h' => 'pre580_h', + 'M' => 'pre580_null', + 'O' => 'o', + 'o' => 'pre580_null', + 'v' => 'M', + 'w' => 'v', + 'W' => 'pre580_W', + }, +); + +sub cmd_wrapper { + my $cmd = shift; + my $line = shift; + my $dblineno = shift; + + # with this level of indirection we can wrap + # to old (pre580) or other command sets easily + # + my $call = 'cmd_'.( + $set{$CommandSet}{$cmd} || $cmd + ); + # print "cmd_wrapper($cmd): $CommandSet($set{$CommandSet}{$cmd}) => call($call)\n"; + + return &$call($line, $dblineno); +} + +sub cmd_a { + my $line = shift || ''; # [.|line] expr + my $dbline = shift; $line =~ s/^(\.|(?:[^\d]))/$dbline/; + if ($line =~ /^\s*(\d*)\s*(\S.+)/) { + my ($lineno, $expr) = ($1, $2); + if (length $expr) { + if ($dbline[$lineno] == 0) { + print $OUT "Line $lineno($dbline[$lineno]) does not have an action?\n"; + } else { + $had_breakpoints{$filename} |= 2; + $dbline{$lineno} =~ s/\0[^\0]*//; + $dbline{$lineno} .= "\0" . action($expr); + } + } + } else { + print $OUT "Adding an action requires an optional lineno and an expression\n"; # hint + } +} + +sub cmd_A { + my $line = shift || ''; + my $dbline = shift; $line =~ s/^\./$dbline/; + if ($line eq '*') { + eval { &delete_action(); 1 } or print $OUT $@ and return; + } elsif ($line =~ /^(\S.*)/) { + eval { &delete_action($1); 1 } or print $OUT $@ and return; + } else { + print $OUT "Deleting an action requires a line number, or '*' for all\n"; # hint + } +} + +sub delete_action { + my $i = shift; + if (defined($i)) { + die "Line $i has no action .\n" if $dbline[$i] == 0; + $dbline{$i} =~ s/\0[^\0]*//; # \^a + delete $dbline{$i} if $dbline{$i} eq ''; + } else { + print $OUT "Deleting all actions...\n"; + for my $file (keys %had_breakpoints) { + local *dbline = $main::{'_<' . $file}; + my $max = $#dbline; + my $was; + for ($i = 1; $i <= $max ; $i++) { + if (defined $dbline{$i}) { + $dbline{$i} =~ s/\0[^\0]*//; + delete $dbline{$i} if $dbline{$i} eq ''; + } + unless ($had_breakpoints{$file} &= ~2) { + delete $had_breakpoints{$file}; + } + } + } + } +} + +sub cmd_b { + my $line = shift; # [.|line] [cond] + my $dbline = shift; $line =~ s/^\./$dbline/; + if ($line =~ /^\s*$/) { + &cmd_b_line($dbline, 1); + } elsif ($line =~ /^load\b\s*(.*)/) { + my $file = $1; $file =~ s/\s+$//; + &cmd_b_load($file); + } elsif ($line =~ /^(postpone|compile)\b\s*([':A-Za-z_][':\w]*)\s*(.*)/) { + my $cond = length $3 ? $3 : '1'; + my ($subname, $break) = ($2, $1 eq 'postpone'); + $subname =~ s/\'/::/g; + $subname = "${'package'}::" . $subname unless $subname =~ /::/; + $subname = "main".$subname if substr($subname,0,2) eq "::"; + $postponed{$subname} = $break ? "break +0 if $cond" : "compile"; + } elsif ($line =~ /^([':A-Za-z_][':\w]*(?:\[.*\])?)\s*(.*)/) { + $subname = $1; + $cond = length $2 ? $2 : '1'; + &cmd_b_sub($subname, $cond); + } elsif ($line =~ /^(\d*)\s*(.*)/) { + $line = $1 || $dbline; + $cond = length $2 ? $2 : '1'; + &cmd_b_line($line, $cond); + } else { + print "confused by line($line)?\n"; + } +} + sub break_on_load { my $file = shift; $break_on_load{$file} = 1; @@ -1649,6 +1554,8 @@ sub cmd_b_load { } break_on_load($_) for @files; @files = report_break_on_load; + local $\ = ''; + local $" = ' '; print $OUT "Will stop on load of `@files'.\n"; } @@ -1689,7 +1596,10 @@ sub break_on_line { } sub cmd_b_line { - eval { break_on_line(@_); 1 } or print $OUT $@ and return; + eval { break_on_line(@_); 1 } or do { + local $\ = ''; + print $OUT $@ and return; + }; } sub break_on_filename_line { @@ -1734,23 +1644,301 @@ sub cmd_b_sub { if not defined &$subname and $s !~ /::/ and defined &{"CORE::GLOBAL::$s"}; $subname = "main".$subname if substr($subname,0,2) eq "::"; } - eval { break_subroutine($subname,$cond); 1 } or print $OUT $@ and return; + eval { break_subroutine($subname,$cond); 1 } or do { + local $\ = ''; + print $OUT $@ and return; + } } -sub cmd_stop { # As on ^C, but not signal-safy. - $signal = 1; +sub cmd_B { + my $line = ($_[0] =~ /^\./) ? $dbline : shift || ''; + my $dbline = shift; $line =~ s/^\./$dbline/; + if ($line eq '*') { + eval { &delete_breakpoint(); 1 } or print $OUT $@ and return; + } elsif ($line =~ /^(\S.*)/) { + eval { &delete_breakpoint($line || $dbline); 1 } or do { + local $\ = ''; + print $OUT $@ and return; + }; + } else { + print $OUT "Deleting a breakpoint requires a line number, or '*' for all\n"; # hint + } } sub delete_breakpoint { my $i = shift; - die "Line $i not breakable.\n" if $dbline[$i] == 0; - $dbline{$i} =~ s/^[^\0]*//; - delete $dbline{$i} if $dbline{$i} eq ''; + if (defined($i)) { + die "Line $i not breakable.\n" if $dbline[$i] == 0; + $dbline{$i} =~ s/^[^\0]*//; + delete $dbline{$i} if $dbline{$i} eq ''; + } else { + print $OUT "Deleting all breakpoints...\n"; + for my $file (keys %had_breakpoints) { + local *dbline = $main::{'_<' . $file}; + my $max = $#dbline; + my $was; + for ($i = 1; $i <= $max ; $i++) { + if (defined $dbline{$i}) { + $dbline{$i} =~ s/^[^\0]+//; + if ($dbline{$i} =~ s/^\0?$//) { + delete $dbline{$i}; + } + } + } + if (not $had_breakpoints{$file} &= ~1) { + delete $had_breakpoints{$file}; + } + } + undef %postponed; + undef %postponed_file; + undef %break_on_load; + } } -sub cmd_d { - my $i = shift; - eval { delete_breakpoint $i; 1 } or print $OUT $@ and return; +sub cmd_stop { # As on ^C, but not signal-safy. + $signal = 1; +} + +sub cmd_h { + my $line = shift || ''; + if ($line =~ /^h\s*/) { + print_help($help); + } elsif ($line =~ /^(\S.*)$/) { + # support long commands; otherwise bogus errors + # happen when you ask for h on for example + my $asked = $1; # for proper errmsg + my $qasked = quotemeta($asked); # for searching + # XXX: finds CR but not + if ($help =~ /^ is not a debugger command.\n"); + } + } else { + print_help($summary); + } +} + +sub cmd_l { + my $line = shift; + $line =~ s/^-\s*$/-/; + if ($line =~ /^(\$.*)/s) { + $evalarg = $2; + my ($s) = &eval; + print($OUT "Error: $@\n"), next CMD if $@; + $s = CvGV_name($s); + print($OUT "Interpreted as: $1 $s\n"); + $line = "$1 $s"; + &cmd_l($s); + } elsif ($line =~ /^([\':A-Za-z_][\':\w]*(\[.*\])?)/s) { + my $s = $subname = $1; + $subname =~ s/\'/::/; + $subname = $package."::".$subname + unless $subname =~ /::/; + $subname = "CORE::GLOBAL::$s" + if not defined &$subname and $s !~ /::/ + and defined &{"CORE::GLOBAL::$s"}; + $subname = "main".$subname if substr($subname,0,2) eq "::"; + @pieces = split(/:/,find_sub($subname) || $sub{$subname}); + $subrange = pop @pieces; + $file = join(':', @pieces); + if ($file ne $filename) { + print $OUT "Switching to file '$file'.\n" + unless $slave_editor; + *dbline = $main::{'_<' . $file}; + $max = $#dbline; + $filename = $file; + } + if ($subrange) { + if (eval($subrange) < -$window) { + $subrange =~ s/-.*/+/; + } + $line = $subrange; + &cmd_l($subrange); + } else { + print $OUT "Subroutine $subname not found.\n"; + } + } elsif ($line =~ /^\s*$/) { + $incr = $window - 1; + $line = $start . '-' . ($start + $incr); + &cmd_l($line); + } elsif ($line =~ /^(\d*)\+(\d*)$/) { + $start = $1 if $1; + $incr = $2; + $incr = $window - 1 unless $incr; + $line = $start . '-' . ($start + $incr); + &cmd_l($line); + } elsif ($line =~ /^((-?[\d\$\.]+)([-,]([\d\$\.]+))?)?/) { + $end = (!defined $2) ? $max : ($4 ? $4 : $2); + $end = $max if $end > $max; + $i = $2; + $i = $line if $i eq '.'; + $i = 1 if $i < 1; + $incr = $end - $i; + if ($slave_editor) { + print $OUT "\032\032$filename:$i:0\n"; + $i = $end; + } else { + for (; $i <= $end; $i++) { + my ($stop,$action); + ($stop,$action) = split(/\0/, $dbline{$i}) if + $dbline{$i}; + $arrow = ($i==$line + and $filename eq $filename_ini) + ? '==>' + : ($dbline[$i]+0 ? ':' : ' ') ; + $arrow .= 'b' if $stop; + $arrow .= 'a' if $action; + print $OUT "$i$arrow\t", $dbline[$i]; + $i++, last if $signal; + } + print $OUT "\n" unless $dbline[$i-1] =~ /\n$/; + } + $start = $i; # remember in case they want more + $start = $max if $start > $max; + } +} + +sub cmd_L { + my $arg = shift || 'abw'; $arg = 'abw' unless $CommandSet eq '580'; # sigh... + my $action_wanted = ($arg =~ /a/) ? 1 : 0; + my $break_wanted = ($arg =~ /b/) ? 1 : 0; + my $watch_wanted = ($arg =~ /w/) ? 1 : 0; + + if ($break_wanted or $action_wanted) { + for my $file (keys %had_breakpoints) { + local *dbline = $main::{'_<' . $file}; + my $max = $#dbline; + my $was; + for ($i = 1; $i <= $max; $i++) { + if (defined $dbline{$i}) { + print $OUT "$file:\n" unless $was++; + print $OUT " $i:\t", $dbline[$i]; + ($stop,$action) = split(/\0/, $dbline{$i}); + print $OUT " break if (", $stop, ")\n" + if $stop and $break_wanted; + print $OUT " action: ", $action, "\n" + if $action and $action_wanted; + last if $signal; + } + } + } + } + if (%postponed and $break_wanted) { + print $OUT "Postponed breakpoints in subroutines:\n"; + my $subname; + for $subname (keys %postponed) { + print $OUT " $subname\t$postponed{$subname}\n"; + last if $signal; + } + } + my @have = map { # Combined keys + keys %{$postponed_file{$_}} + } keys %postponed_file; + if (@have and ($break_wanted or $action_wanted)) { + print $OUT "Postponed breakpoints in files:\n"; + my ($file, $line); + for $file (keys %postponed_file) { + my $db = $postponed_file{$file}; + print $OUT " $file:\n"; + for $line (sort {$a <=> $b} keys %$db) { + print $OUT " $line:\n"; + my ($stop,$action) = split(/\0/, $$db{$line}); + print $OUT " break if (", $stop, ")\n" + if $stop and $break_wanted; + print $OUT " action: ", $action, "\n" + if $action and $action_wanted; + last if $signal; + } + last if $signal; + } + } + if (%break_on_load and $break_wanted) { + print $OUT "Breakpoints on load:\n"; + my $file; + for $file (keys %break_on_load) { + print $OUT " $file\n"; + last if $signal; + } + } + if ($watch_wanted) { + if ($trace & 2) { + print $OUT "Watch-expressions:\n" if @to_watch; + for my $expr (@to_watch) { + print $OUT " $expr\n"; + last if $signal; + } + } + } +} + +sub cmd_M { + &list_modules(); +} + +sub cmd_o { + my $opt = shift || ''; # opt[=val] + if ($opt =~ /^(\S.*)/) { + &parse_options($1); + } else { + for (@options) { + &dump_option($_); + } + } +} + +sub cmd_O { + print $OUT "The old O command is now the o command.\n"; # hint + print $OUT "Use 'h' to get current command help synopsis or\n"; # + print $OUT "use 'o CommandSet=pre580' to revert to old usage\n"; # +} + +sub cmd_v { + my $line = shift; + + if ($line =~ /^(\d*)$/) { + $incr = $window - 1; + $start = $1 if $1; + $start -= $preview; + $line = $start . '-' . ($start + $incr); + &cmd_l($line); + } +} + +sub cmd_w { + my $expr = shift || ''; + if ($expr =~ /^(\S.*)/) { + push @to_watch, $expr; + $evalarg = $expr; + my ($val) = &eval; + $val = (defined $val) ? "'$val'" : 'undef' ; + push @old_watch, $val; + $trace |= 2; + } else { + print $OUT "Adding a watch-expression requires an expression\n"; # hint + } +} + +sub cmd_W { + my $expr = shift || ''; + if ($expr eq '*') { + $trace &= ~2; + print $OUT "Deleting all watch expressions ...\n"; + @to_watch = @old_watch = (); + } elsif ($expr =~ /^(\S.*)/) { + my $i_cnt = 0; + foreach (@to_watch) { + my $val = $to_watch[$i_cnt]; + if ($val eq $expr) { # =~ m/^\Q$i$/) { + splice(@to_watch, $i_cnt, 1); + } + $i_cnt++; + } + } else { + print $OUT "Deleting a watch-expression requires an expression, or '*' for all\n"; # hint + } } ### END of the API section @@ -1762,6 +1950,8 @@ sub save { sub print_lineinfo { resetterm(1) if $LINEINFO eq $OUT and $term_pid != $$; + local $\ = ''; + local $, = ''; print $LINEINFO @_; } @@ -1782,6 +1972,7 @@ sub postponed_sub { ++$i until $dbline[$i] != 0 or $i >= $max; $dbline{$i} = delete $postponed{$subname}; } else { + local $\ = ''; print $OUT "Subroutine $subname not found.\n"; } return; @@ -1801,6 +1992,7 @@ sub postponed { local *dbline = shift; my $filename = $dbline; $filename =~ s/^_`$ENV{PERL5OPT}'.\n" if $ENV{PERL5OPT}; + local $ENV{PERL5LIB} = $ENV{PERL5LIB} ? $ENV{PERL5LIB} : $ENV{PERLLIB}; + $ENV{PERL5LIB} = '' unless defined $ENV{PERL5LIB}; + $ENV{PERL5LIB} = join ';', @ini_INC, split /;/, $ENV{PERL5LIB}; (my $name = $0) =~ s,^.*[/\\],,s; my @args; if ( pipe $in1, $out1 and pipe $in2, $out2 @@ -2049,6 +2253,8 @@ sub os2_get_fork_TTY { and @args = ($rl, fileno $in1, fileno $out2, "Daughter Perl debugger $pids $name") and (($kpid = CORE::system 4, $^X, '-we', <<'ES', @args) >= 0 # P_SESSION +END {sleep 5 unless $loaded} +BEGIN {open STDIN, 'AddHistory($got) if length($got) > 1 and defined $term->Features->{addHistory}; @@ -2180,10 +2387,11 @@ sub option_val { sub parse_options { local($_)= @_; + local $\ = ''; # too dangerous to let intuitive usage overwrite important things # defaultion should never be the default my %opt_needs_val = map { ( $_ => 1 ) } qw{ - arrayDepth hashDepth LineInfo maxTraceLen ornaments windowSize + dumpDepth arrayDepth hashDepth LineInfo maxTraceLen ornaments windowSize pager quote ReadLine recallCommand RemotePort ShellBang TTY }; while (length) { @@ -2200,7 +2408,6 @@ sub parse_options { $val_defaulted = 1; $val = "1"; # this is an evil default; make 'em set it! } elsif ($sep eq "=") { - if (s/ (["']) ( (?: \\. | (?! \1 ) [^\\] )* ) \1 //x) { my $quote = $1; ($val = $2) =~ s/\\([$quote\\])/$1/g; @@ -2226,7 +2433,8 @@ sub parse_options { print($OUT "Ambiguous option `$opt'\n"), next if $matches > 1; if ($opt_needs_val{$option} && $val_defaulted) { - print $OUT "Option `$opt' is non-boolean. Use `O $option=VAL' to set, `O $option?' to query\n"; + my $cmd = ($CommandSet eq '580') ? 'o' : 'O'; + print $OUT "Option `$opt' is non-boolean. Use `$cmd $option=VAL' to set, `$cmd $option?' to query\n"; next; } @@ -2288,6 +2496,7 @@ sub catch { sub warn { my($msg)= join("",@_); $msg .= ": $!\n" unless $msg =~ /\n$/; + local $\ = ''; print $OUT $msg; } @@ -2354,6 +2563,7 @@ sub tkRunning { if (${$term->Features}{tkRunning}) { return $term->tkRunning(@_); } else { + local $\ = ''; print $OUT "tkRunning not supported by current ReadLine package.\n"; 0; } @@ -2420,7 +2630,7 @@ sub LineInfo { $lineinfo; } -sub list_versions { +sub list_modules { # versions my %version; my $file; for (keys %INC) { @@ -2443,6 +2653,184 @@ sub sethelp { # eeevil ornaments enabled. This is an insane mess. $help = " +Help is currently only available for the new 580 CommandSet, +if you really want old behaviour, presumably you know what +you're doing ?-) + +B Stack trace. +B [I] Single step [in I]. +B [I] Next, steps over subroutine calls [in I]. +> Repeat last B or B command. +B Return from current subroutine. +B [I|I] Continue; optionally inserts a one-time-only breakpoint + at the specified position. +B IB<+>I List I+1 lines starting at I. +B IB<->I List lines I through I. +B I List single I. +B I List first window of lines from subroutine. +B I<\$var> List first window of lines from subroutine referenced by I<\$var>. +B List next window of lines. +B<-> List previous window of lines. +B [I] View window around I. +B<.> Return to the executed line. +B I Switch to viewing I. File must be already loaded. + I may be either the full name of the file, or a regular + expression matching the full file name: + B I and B I may access the same file. + Evals (with saved bodies) are considered to be filenames: + B I<(eval 7)> and B I access the body of the 7th eval + (in the order of execution). +BIB Search forwards for I; final B is optional. +BIB Search backwards for I; final B is optional. +B [I] List actions and or breakpoints and or watch-expressions. +B [[B]I] List subroutine names [not] matching I. +B Toggle trace mode. +B I Trace through execution of I. +B Sets breakpoint on current line) +B [I] [I] + Set breakpoint; I defaults to the current execution line; + I breaks if it evaluates to true, defaults to '1'. +B I [I] + Set breakpoint at first line of subroutine. +B I<\$var> Set breakpoint at first line of subroutine referenced by I<\$var>. +B B I Set breakpoint on 'require'ing the given file. +B B I [I] + Set breakpoint at first line of subroutine after + it is compiled. +B B I + Stop after the subroutine is compiled. +B [I] Delete the breakpoint for I. +B I<*> Delete all breakpoints. +B [I] I + Set an action to be done before the I is executed; + I defaults to the current execution line. + Sequence is: check for breakpoint/watchpoint, print line + if necessary, do action, prompt user if necessary, + execute line. +B Does nothing +B [I] Delete the action for I. +B I<*> Delete all actions. +B I Add a global watch-expression. +B Does nothing +B I Delete a global watch-expression. +B I<*> Delete all watch-expressions. +B [I [I]] List some (default all) variables in package (default current). + Use B<~>I and BI for positive and negative regexps. +B [I] Same as \"B I [I]\". +B I Evals expression in list context, dumps the result. +B I Evals expression in list context, prints methods callable + on the first element of the result. +B I Prints methods callable via the given class. +B Show versions of loaded modules. + +B<<> ? List Perl commands to run before each prompt. +B<<> I Define Perl command to run before each prompt. +B<<<> I Add to the list of Perl commands to run before each prompt. +B<>> ? List Perl commands to run after each prompt. +B<>> I Define Perl command to run after each prompt. +B<>>B<>> I Add to the list of Perl commands to run after each prompt. +B<{> I Define debugger command to run before each prompt. +B<{> ? List debugger commands to run before each prompt. +B<{{> I Add to the list of debugger commands to run before each prompt. +B<$prc> I Redo a previous command (default previous command). +B<$prc> I<-number> Redo number'th-to-last command. +B<$prc> I Redo last command that started with I. + See 'B I' too. +B<$psh$psh> I Run cmd in a subprocess (reads from DB::IN, writes to DB::OUT)" + . ( $rc eq $sh ? "" : " +B<$psh> [I] Run I in subshell (forces \"\$SHELL -c 'cmd'\")." ) . " + See 'B I' too. +B<@>I Execute I containing debugger commands (may nest). +B I<-number> Display last number commands (default all). +B

I Same as \"I\" in current package. +B<|>I Run debugger command, piping DB::OUT to current pager. +B<||>I Same as B<|>I but DB::OUT is temporarilly select()ed as well. +B<\=> [I I] Define a command alias, or list current aliases. +I Execute as a perl statement in current package. +B Pure-man-restart of debugger, some of debugger state + and command-line options may be lost. + Currently the following settings are preserved: + history, breakpoints and actions, debugger Bptions + and the following command-line options: I<-w>, I<-I>, I<-e>. + +B [I] ... Set boolean option to true +B [IB] Query options +B [IB<=>I] [I=B<\">IB<\">] ... + Set options. Use quotes in spaces in value. + I, I chars used to recall command or spawn shell; + I program for output of \"|cmd\"; + I run Tk while prompting (with ReadLine); + I I I level of verbosity; + I Allows stepping off the end of the script. + I Debugger should stop as early as possible. + I Remote hostname:port for remote debugging + The following options affect what happens with B, B, and B commands: + I, I print only first N elements ('' for all); + I, I change style of array and hash dump; + I whether to print contents of globs; + I dump arrays holding debugged files; + I dump symbol tables of packages; + I dump contents of \"reused\" addresses; + I, I, I change style of string dump; + I Do not print the overload-stringified value; + Other options include: + I affects printing of return value after B command, + I affects printing messages on subroutine entry/exit. + I affects printing messages on possible breaking points. + I gives max length of evals/args listed in stack trace. + I affects screen appearance of the command line. + I bits control attempts to create a new TTY on events: + 1: on fork() 2: debugger is started inside debugger + 4: on startup + During startup options are initialized from \$ENV{PERLDB_OPTS}. + You can put additional initialization options I, I, + I, I, and I there (or use + `B' after you set them). + +B or B<^D> Quit. Set B<\$DB::finished = 0> to debug global destruction. +B Summary of debugger commands. +B [I] Get help [on a specific debugger command], enter B<|h> to page. +B Long help for debugger commands +B<$doccmd> I Runs the external doc viewer B<$doccmd> command on the + named Perl I, or on B<$doccmd> itself if omitted. + Set B<\$DB::doccmd> to change viewer. + +Type `|h h' for a paged display if this was too hard to read. + +"; # Fix balance of vi % matching: }}}} + + # note: tabs in the following section are not-so-helpful + $summary = <<"END_SUM"; +I I + B [I|I] List source code B Stack trace + B<-> or B<.> List previous/current line B [I] Single step [in expr] + B [I] View around line B [I] Next, steps over subs + B I View source in file /B> Repeat last B or B + BIB BIB Search forw/backw B Return from subroutine + B Show module versions B [I|I] Continue until position +I B List break/watch/actions + B [...] Set debugger options B [I] Toggle trace [trace expr] + B<<>[B<<>]|B<{>[B<{>]|B<>>[B<>>] [I] Do pre/post-prompt B [I|I|I] [I] Set breakpoint + B<$prc> [I|I] Redo a previous command B I Delete a/all breakpoints + B [I<-num>] Display last num commands B [I] I Do cmd before line + B<=> [I I] Define/list an alias B I Delete a/all actions + B [I] Get help on command B I Add a watch expression + B Complete help page B I Delete a/all watch expressions + B<|>[B<|>]I Send output to pager B<$psh>\[B<$psh>\] I Run cmd in a subprocess + B or B<^D> Quit B Attempt a restart +I B Execute perl code, also see: B,B,B I + B|B I Evals expr in list context, dumps the result or lists methods. + B

I Print expression (uses script's current package). + B [[B]I] List subroutine names [not] matching pattern + B [I [I]] List Variables in Package. Vars can be ~pattern or !pattern. + B [I] Same as \"B I [I]\". + B [I [I]] List lexicals in higher scope . Vars same as B. +For more help, type B I, or run B<$doccmd perldebug> for all docs. +END_SUM + # ')}}; # Fix balance of vi % matching + + # and this is really numb... + $pre580_help = " B Stack trace. B [I] Single step [in I]. B [I] Next, steps over subroutine calls [in I]. @@ -2581,7 +2969,7 @@ Type `|h' for a paged display if this was too hard to read. "; # Fix balance of vi % matching: }}}} # note: tabs in the following section are not-so-helpful - $summary = <<"END_SUM"; + $pre580_summary = <<"END_SUM"; I I B [I|I] List source code B Stack trace B<-> or B<.> List previous/current line B [I] Single step [in expr] @@ -2604,9 +2992,11 @@ I B Execute perl code, also see: B,B,B B [[B]I] List subroutine names [not] matching pattern B [I [I]] List Variables in Package. Vars can be ~pattern or !pattern. B [I] Same as \"B I [I]\". + B [I [I]] List lexicals in higher scope . Vars same as B. For more help, type B I, or run B<$doccmd perldebug> for all docs. END_SUM # ')}}; # Fix balance of vi % matching + } sub print_help { @@ -2654,6 +3044,7 @@ sub print_help { . $Term::ReadLine::TermCap::rl_term_set[1] }gex; + local $\ = ''; print $OUT $_; } @@ -2682,6 +3073,7 @@ sub diesignal { &warn(Carp::longmess("Signal @_")); } else { + local $\ = ''; print $DB::OUT "Got signal @_\n"; } kill 'ABRT', $$; @@ -2753,6 +3145,7 @@ sub warnLevel { } sub dieLevel { + local $\ = ''; if (@_) { $prevdie = $SIG{__DIE__} unless $dieLevel; $dieLevel = shift; @@ -2840,6 +3233,8 @@ sub methods_via { for $name (grep {defined &{${"${class}::"}{$_}}} sort keys %{"${class}::"}) { next if $seen{ $name }++; + local $\ = ''; + local $, = ''; print $DB::OUT "$prepend$name\n"; } return unless shift; # Recurse? @@ -3026,6 +3421,7 @@ sub db_complete { } sub end_report { + local $\ = ''; print $OUT "Use `q' to quit or `R' to restart. `h q' for details.\n" } @@ -3045,6 +3441,123 @@ END { DB::fake::at_exit() unless $fall_off_end or $runnonstop; } + +# ===================================== pre580 ================================ +# this is very sad below here... +# + +sub cmd_pre580_null { + # do nothing... +} + +sub cmd_pre580_a { + my $cmd = shift; + if ($cmd =~ /^(\d*)\s*(.*)/) { + $i = $1 || $line; $j = $2; + if (length $j) { + if ($dbline[$i] == 0) { + print $OUT "Line $i may not have an action.\n"; + } else { + $had_breakpoints{$filename} |= 2; + $dbline{$i} =~ s/\0[^\0]*//; + $dbline{$i} .= "\0" . action($j); + } + } else { + $dbline{$i} =~ s/\0[^\0]*//; + delete $dbline{$i} if $dbline{$i} eq ''; + } + } +} + +sub cmd_pre580_b { + my $cmd = shift; + my $dbline = shift; + if ($cmd =~ /^load\b\s*(.*)/) { + my $file = $1; $file =~ s/\s+$//; + &cmd_b_load($file); + } elsif ($cmd =~ /^(postpone|compile)\b\s*([':A-Za-z_][':\w]*)\s*(.*)/) { + my $cond = length $3 ? $3 : '1'; + my ($subname, $break) = ($2, $1 eq 'postpone'); + $subname =~ s/\'/::/g; + $subname = "${'package'}::" . $subname + unless $subname =~ /::/; + $subname = "main".$subname if substr($subname,0,2) eq "::"; + $postponed{$subname} = $break ? "break +0 if $cond" : "compile"; + } elsif ($cmd =~ /^([':A-Za-z_][':\w]*(?:\[.*\])?)\s*(.*)/) { + my $subname = $1; + my $cond = length $2 ? $2 : '1'; + &cmd_b_sub($subname, $cond); + } elsif ($cmd =~ /^(\d*)\s*(.*)/) { + my $i = $1 || $dbline; + my $cond = length $2 ? $2 : '1'; + &cmd_b_line($i, $cond); + } +} + +sub cmd_pre580_D { + my $cmd = shift; + if ($cmd =~ /^\s*$/) { + print $OUT "Deleting all breakpoints...\n"; + my $file; + for $file (keys %had_breakpoints) { + local *dbline = $main::{'_<' . $file}; + my $max = $#dbline; + my $was; + + for ($i = 1; $i <= $max ; $i++) { + if (defined $dbline{$i}) { + $dbline{$i} =~ s/^[^\0]+//; + if ($dbline{$i} =~ s/^\0?$//) { + delete $dbline{$i}; + } + } + } + + if (not $had_breakpoints{$file} &= ~1) { + delete $had_breakpoints{$file}; + } + } + undef %postponed; + undef %postponed_file; + undef %break_on_load; + } +} + +sub cmd_pre580_h { + my $cmd = shift; + if ($cmd =~ /^\s*$/) { + print_help($pre580_help); + } elsif ($cmd =~ /^h\s*/) { + print_help($pre580_summary); + } elsif ($cmd =~ /^h\s+(\S.*)$/) { + my $asked = $1; # for proper errmsg + my $qasked = quotemeta($asked); # for searching + # XXX: finds CR but not + if ($pre580_help =~ /^ is not a debugger command.\n"); + } + } +} + +sub cmd_pre580_W { + my $cmd = shift; + if ($cmd =~ /^$/) { + $trace &= ~2; + @to_watch = @old_watch = (); + } elsif ($cmd =~ /^(.*)/s) { + push @to_watch, $1; + $evalarg = $1; + my ($val) = &eval; + $val = (defined $val) ? "'$val'" : 'undef' ; + push @old_watch, $val; + $trace |= 2; + } +} + package DB::fake; sub at_exit { @@ -3054,3 +3567,4 @@ sub at_exit { package DB; # Do not trace this 1; below! 1; +