perl 5.0 alpha 6
[p5sagit/p5-mst-13.2.git] / lib / perldb.pl
index 84543df..0b50555 100644 (file)
@@ -1,6 +1,10 @@
 package DB;
 
-$header = '$Header: perldb.pl,v 3.0.1.2 90/03/12 16:39:39 lwall Locked $';
+# modified Perl debugger, to be run from Emacs in perldb-mode
+# Ray Lischner (uunet!mntgfx!lisch) as of 5 Nov 1990
+# Johan Vromans -- upgrade to 4.0 pl 10
+
+$header = '$RCSfile: perldb.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:24:07 $';
 #
 # This file is automatically included if you do perl -d.
 # It's probably not useful to include this yourself.
@@ -10,6 +14,39 @@ $header = '$Header: perldb.pl,v 3.0.1.2 90/03/12 16:39:39 lwall Locked $';
 # have a breakpoint.  It also inserts a do 'perldb.pl' before the first line.
 #
 # $Log:        perldb.pl,v $
+# Revision 4.1  92/08/07  18:24:07  lwall
+# 
+# Revision 4.0.1.3  92/06/08  13:43:57  lwall
+# patch20: support for MSDOS folded into perldb.pl
+# patch20: perldb couldn't debug file containing '-', such as STDIN designator
+# 
+# Revision 4.0.1.2  91/11/05  17:55:58  lwall
+# patch11: perldb.pl modified to run within emacs in perldb-mode
+# 
+# Revision 4.0.1.1  91/06/07  11:17:44  lwall
+# patch4: added $^P variable to control calling of perldb routines
+# patch4: debugger sometimes listed wrong number of lines for a statement
+# 
+# Revision 4.0  91/03/20  01:25:50  lwall
+# 4.0 baseline.
+# 
+# Revision 3.0.1.6  91/01/11  18:08:58  lwall
+# patch42: @_ couldn't be accessed from debugger
+# 
+# Revision 3.0.1.5  90/11/10  01:40:26  lwall
+# patch38: the debugger wouldn't stop correctly or do action routines
+# 
+# Revision 3.0.1.4  90/10/15  17:40:38  lwall
+# patch29: added caller
+# patch29: the debugger now understands packages and evals
+# patch29: scripts now run at almost full speed under the debugger
+# patch29: more variables are settable from debugger
+# 
+# Revision 3.0.1.3  90/08/09  04:00:58  lwall
+# patch19: debugger now allows continuation lines
+# patch19: debugger can now dump lists of variables
+# patch19: debugger can now add aliases easily from prompt
+# 
 # Revision 3.0.1.2  90/03/12  16:39:39  lwall
 # patch13: perl -d didn't format stack traces of *foo right
 # patch13: perl -d wiped out scalar return values of subroutines
@@ -25,65 +62,92 @@ $header = '$Header: perldb.pl,v 3.0.1.2 90/03/12 16:39:39 lwall Locked $';
 # 
 #
 
-open(IN,"/dev/tty");           # so we don't dingle stdin
-open(OUT,">/dev/tty"); # so we don't dongle stdout
+if (-e "/dev/tty") {
+    $console = "/dev/tty";
+    $rcfile=".perldb";
+}
+else {
+    $console = "con";
+    $rcfile="perldb.ini";
+}
+
+open(IN, "<$console") || open(IN,  "<&STDIN"); # so we don't dingle stdin
+open(OUT,">$console") || open(OUT, "<&STDERR")
+    || open(OUT, ">&STDOUT");  # so we don't dongle stdout
 select(OUT);
-$| = 1;                                # for DB'OUT
+$| = 1;                                # for DB::OUT
 select(STDOUT);
 $| = 1;                                # for real STDOUT
+$sub = '';
+
+# Is Perl being run from Emacs?
+$emacs = $main::ARGV[$[] eq '-emacs';
+shift(@main::ARGV) if $emacs;
 
 $header =~ s/.Header: ([^,]+),v(\s+\S+\s+\S+).*$/$1$2/;
-print OUT "\nLoading DB from $header\n\n";
+print OUT "\nLoading DB routines from $header\n";
+print OUT ("Emacs support ",
+          $emacs ? "enabled" : "available",
+          ".\n");
+print OUT "\nEnter h for help.\n\n";
 
 sub DB {
-    local($. ,$@, $!, $[, $,, $/, $\);
-    $[ = 0; $, = ""; $/ = "\n"; $\ = "";
-    ($line) = @_;
-    if ($stop[$line]) {
+    &save;
+    ($package, $filename, $line) = caller;
+    $usercontext = '($@, $!, $[, $,, $/, $\) = @saved;' .
+       "package $package;";            # this won't let them modify, alas
+    local(*dbline) = "::_<$filename";
+    $max = $#dbline;
+    if (($stop,$action) = split(/\0/,$dbline{$line})) {
        if ($stop eq '1') {
            $signal |= 1;
        }
        else {
-           package main;
-           $DB'signal |= eval $DB'stop[$DB'line];  print DB'OUT $@;
-           $DB'stop[$DB'line] =~ s/;9$//;
+           $evalarg = "\$DB::signal |= do {$stop;}"; &eval;
+           $dbline{$line} =~ s/;9($|\0)/$1/;
        }
     }
     if ($single || $trace || $signal) {
-       print OUT "$sub($line):\t",$line[$line];
-       for ($i = $line + 1; $i <= $max && $line[$i] == 0; ++$i) {
-           last if $line[$i] =~ /^\s*(}|#|\n)/;
-           print OUT "$sub($i):\t",$line[$i];
+       if ($emacs) {
+           print OUT "\032\032$filename:$line:0\n";
+       } else {
+           print OUT "$package::" unless $sub =~ /'|::/;
+           print OUT "$sub($filename:$line):\t",$dbline[$line];
+           for ($i = $line + 1; $i <= $max && $dbline[$i] == 0; ++$i) {
+               last if $dbline[$i] =~ /^\s*(}|#|\n)/;
+               print OUT "$sub($filename:$i):\t",$dbline[$i];
+           }
        }
     }
-    if ($action[$line]) {
-       package main;
-       eval $DB'action[$DB'line];  print DB'OUT $@;
-    }
+    $evalarg = $action, &eval if $action;
     if ($single || $signal) {
-       if ($pre) {
-           package main;
-           eval $DB'pre;  print DB'OUT $@;
-       }
+       $evalarg = $pre, &eval if $pre;
        print OUT $#stack . " levels deep in subroutine calls!\n"
            if $single & 4;
        $start = $line;
-       while ((print OUT "  DB<", $#hist+1, "> "), $cmd=<IN>) {
-           $single = 0;
-           $signal = 0;
-           $cmd eq '' && exit 0;
-           chop($cmd);
-           $cmd =~ /^q$/ && exit 0;
-           $cmd =~ /^$/ && ($cmd = $laststep);
-           push(@hist,$cmd) if length($cmd) > 1;
-           ($i) = split(/\s+/,$cmd);
-           eval "\$cmd =~ $alias{$i}", print OUT $@ if $alias{$i};
-           $cmd =~ /^h$/ && do {
-               print OUT "
+      CMD:
+       while ((print OUT "  DB<", $#hist+1, "> "), $cmd=&gets) {
+           {
+               $single = 0;
+               $signal = 0;
+               $cmd eq '' && exit 0;
+               chop($cmd);
+               $cmd =~ s/\\$// && do {
+                   print OUT "  cont: ";
+                   $cmd .= &gets;
+                   redo CMD;
+               };
+               $cmd =~ /^q$/ && exit 0;
+               $cmd =~ /^$/ && ($cmd = $laststep);
+               push(@hist,$cmd) if length($cmd) > 1;
+               ($i) = split(/\s+/,$cmd);
+               eval "\$cmd =~ $alias{$i}", print OUT $@ if $alias{$i};
+               $cmd =~ /^h$/ && do {
+                   print OUT "
 T              Stack trace.
 s              Single step.
 n              Next, steps over subroutine calls.
-f              Finish current subroutine.
+r              Return from current subroutine.
 c [line]       Continue; optionally inserts a one-time-only breakpoint 
                at the specified line.
 <CR>           Repeat last n or s.
@@ -94,6 +158,7 @@ l            List next window.
 -              List previous window.
 w line         List window around line.
 l subname      List subroutine.
+f filename     Switch to filename.
 /pattern/      Search forwards for pattern; final / is optional.
 ?pattern?      Search backwards for pattern.
 L              List breakpoints and actions.
@@ -111,274 +176,379 @@ a [line] command
                Sequence is: check for breakpoint, print line if necessary,
                do action, prompt user if breakpoint or step, evaluate line.
 A              Delete all actions.
-V package      List all variables and values in package (default main).
+V [pkg [vars]] List some (default all) variables in package (default current).
+X [vars]       Same as \"V currentpackage [vars]\".
 < command      Define command before prompt.
 > command      Define command after prompt.
 ! number       Redo command (default previous command).
 ! -number      Redo number\'th to last command.
 H -number      Display last number commands (default all).
 q or ^D                Quit.
-p expr         Same as \"package main; print DB'OUT expr\".
-command                Execute as a perl statement.
+p expr         Same as \"print DB::OUT expr\" in current package.
+= [alias value]        Define a command alias, or list current aliases.
+command                Execute as a perl statement in current package.
 
 ";
-               next; };
-           $cmd =~ /^t$/ && do {
-               $trace = !$trace;
-               print OUT "Trace = ".($trace?"on":"off")."\n";
-               next; };
-           $cmd =~ /^S$/ && do {
-               foreach $subname (sort(keys %sub)) {
-                   if ($subname =~ /^main'(.*)/) {
-                       print OUT $1,"\n";
+                   next CMD; };
+               $cmd =~ /^t$/ && do {
+                   $trace = !$trace;
+                   print OUT "Trace = ".($trace?"on":"off")."\n";
+                   next CMD; };
+               $cmd =~ /^S$/ && do {
+                   foreach $subname (sort(keys %sub)) {
+                       print OUT $subname,"\n";
+                   }
+                   next CMD; };
+               $cmd =~ s/^X\b/V $package/;
+               $cmd =~ /^V$/ && do {
+                   $cmd = "V $package"; };
+               $cmd =~ /^V\b\s*(\S+)\s*(.*)/ && do {
+                   local ($savout) = select(OUT);
+                   $packname = $1;
+                   @vars = split(' ',$2);
+                   do 'dumpvar.pl' unless defined &main::dumpvar;
+                   if (defined &main::dumpvar) {
+                       &main::dumpvar($packname,@vars);
                    }
                    else {
-                       print OUT $subname,"\n";
+                       print DB::OUT "dumpvar.pl not available.\n";
+                   }
+                   select ($savout);
+                   next CMD; };
+               $cmd =~ /^f\b\s*(.*)/ && do {
+                   $file = $1;
+                   if (!$file) {
+                       print OUT "The old f command is now the r command.\n";
+                       print OUT "The new f command switches filenames.\n";
+                       next CMD;
+                   }
+                   if (!defined $::_main{'_<' . $file}) {
+                       if (($try) = grep(m#^_<.*$file#, keys %::_main)) {
+                           $file = substr($try,2);
+                           print "\n$file:\n";
+                       }
                    }
-               }
-               next; };
-           $cmd =~ /^V$/ && do {
-               $cmd = 'V main'; };
-           $cmd =~ /^V\s*(['A-Za-z_]['\w]*)$/ && do {
-               $packname = $1;
-               do 'dumpvar.pl' unless defined &main'dumpvar;
-               if (defined &main'dumpvar) {
-                   &main'dumpvar($packname);
-               }
-               else {
-                   print DB'OUT "dumpvar.pl not available.\n";
-               }
-               next; };
-           $cmd =~ /^l\s*(['A-Za-z_]['\w]*)/ && do {
-               $subname = $1;
-               $subname = "main'" . $subname unless $subname =~ /'/;
-               $subrange = $sub{$subname};
-               if ($subrange) {
-                   if (eval($subrange) < -$window) {
-                       $subrange =~ s/-.*/+/;
+                   if (!defined $::_main{'_<' . $file}) {
+                       print OUT "There's no code here anything matching $file.\n";
+                       next CMD;
                    }
-                   $cmd = "l $subrange";
-               } else {
-                   print OUT "Subroutine $1 not found.\n";
-                   next;
-               } };
-           $cmd =~ /^w\s*(\d*)$/ && do {
-               $incr = $window - 1;
-               $start = $1 if $1;
-               $start -= $preview;
-               $cmd = 'l ' . $start . '-' . ($start + $incr); };
-           $cmd =~ /^-$/ && do {
-               $incr = $window - 1;
-               $cmd = 'l ' . ($start-$window*2) . '+'; };
-           $cmd =~ /^l$/ && do {
-               $incr = $window - 1;
-               $cmd = 'l ' . $start . '-' . ($start + $incr); };
-           $cmd =~ /^l\s*(\d*)\+(\d*)$/ && do {
-               $start = $1 if $1;
-               $incr = $2;
-               $incr = $window - 1 unless $incr;
-               $cmd = 'l ' . $start . '-' . ($start + $incr); };
-           $cmd =~ /^l\s*(([\d\$\.]+)([-,]([\d\$\.]+))?)?/ && do {
-               $end = (!$2) ? $max : ($4 ? $4 : $2);
-               $end = $max if $end > $max;
-               $i = $2;
-               $i = $line if $i eq '.';
-               $i = 1 if $i < 1;
-               for (; $i <= $end; $i++) {
-                   print OUT "$i:\t", $line[$i];
-                   last if $signal;
-               }
-               $start = $i;    # remember in case they want more
-               $start = $max if $start > $max;
-               next; };
-           $cmd =~ /^D$/ && do {
-               print OUT "Deleting all breakpoints...\n";
-               for ($i = 1; $i <= $max ; $i++) {
-                   $stop[$i] = 0;
-               }
-               next; };
-           $cmd =~ /^L$/ && do {
-               for ($i = 1; $i <= $max; $i++) {
-                   if ($stop[$i] || $action[$i]) {
-                       print OUT "$i:\t", $line[$i];
-                       print OUT "  break if (", $stop[$i], ")\n" 
-                           if $stop[$i];
-                       print OUT "  action:  ", $action[$i], "\n" 
-                           if $action[$i];
+                   elsif ($file ne $filename) {
+                       *dbline = "::_<$file";
+                       $max = $#dbline;
+                       $filename = $file;
+                       $start = 1;
+                       $cmd = "l";
+                   } };
+               $cmd =~ /^l\b\s*([':A-Za-z_][':\w]*)/ && do {
+                   $subname = $1;
+                   $subname = "main::" . $subname unless $subname =~ /'|::/;
+                   $subname = "main" . $subname if substr($subname,0,1)eq "'";
+                   $subname = "main" . $subname if substr($subname,0,2)eq "::";
+                   ($file,$subrange) = split(/:/,$sub{$subname});
+                   if ($file ne $filename) {
+                       *dbline = "::_<$file";
+                       $max = $#dbline;
+                       $filename = $file;
+                   }
+                   if ($subrange) {
+                       if (eval($subrange) < -$window) {
+                           $subrange =~ s/-.*/+/;
+                       }
+                       $cmd = "l $subrange";
+                   } else {
+                       print OUT "Subroutine $1 not found.\n";
+                       next CMD;
+                   } };
+               $cmd =~ /^w\b\s*(\d*)$/ && do {
+                   $incr = $window - 1;
+                   $start = $1 if $1;
+                   $start -= $preview;
+                   $cmd = 'l ' . $start . '-' . ($start + $incr); };
+               $cmd =~ /^-$/ && do {
+                   $incr = $window - 1;
+                   $cmd = 'l ' . ($start-$window*2) . '+'; };
+               $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 = (!$2) ? $max : ($4 ? $4 : $2);
+                   $end = $max if $end > $max;
+                   $i = $2;
+                   $i = $line if $i eq '.';
+                   $i = 1 if $i < 1;
+                   if ($emacs) {
+                       print OUT "\032\032$filename:$i:0\n";
+                       $i = $end;
+                   } else {
+                       for (; $i <= $end; $i++) {
+                           print OUT "$i:\t", $dbline[$i];
+                           last if $signal;
+                       }
+                   }
+                   $start = $i;        # remember in case they want more
+                   $start = $max if $start > $max;
+                   next CMD; };
+               $cmd =~ /^D$/ && do {
+                   print OUT "Deleting all breakpoints...\n";
+                   for ($i = 1; $i <= $max ; $i++) {
+                       if (defined $dbline{$i}) {
+                           $dbline{$i} =~ s/^[^\0]+//;
+                           if ($dbline{$i} =~ s/^\0?$//) {
+                               delete $dbline{$i};
+                           }
+                       }
+                   }
+                   next CMD; };
+               $cmd =~ /^L$/ && do {
+                   for ($i = 1; $i <= $max; $i++) {
+                       if (defined $dbline{$i}) {
+                           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;
+                       }
+                   }
+                   next CMD; };
+               $cmd =~ /^b\b\s*([':A-Za-z_][':\w]*)\s*(.*)/ && do {
+                   $subname = $1;
+                   $cond = $2 || '1';
+                   $subname = "$package::" . $subname unless $subname =~ /'|::/;
+                   $subname = "main" . $subname if substr($subname,0,1) eq "'";
+                   $subname = "main" . $subname if substr($subname,0,2) eq "::";
+                   ($filename,$i) = split(/:/, $sub{$subname});
+                   $i += 0;
+                   if ($i) {
+                       *dbline = "::_<$filename";
+                       ++$i while $dbline[$i] == 0 && $i < $#dbline;
+                       $dbline{$i} =~ s/^[^\0]*/$cond/;
+                   } else {
+                       print OUT "Subroutine $subname not found.\n";
+                   }
+                   next CMD; };
+               $cmd =~ /^b\b\s*(\d*)\s*(.*)/ && do {
+                   $i = ($1?$1:$line);
+                   $cond = $2 || '1';
+                   if ($dbline[$i] == 0) {
+                       print OUT "Line $i not breakable.\n";
+                   } else {
+                       $dbline{$i} =~ s/^[^\0]*/$cond/;
+                   }
+                   next CMD; };
+               $cmd =~ /^d\b\s*(\d+)?/ && do {
+                   $i = ($1?$1:$line);
+                   $dbline{$i} =~ s/^[^\0]*//;
+                   delete $dbline{$i} if $dbline{$i} eq '';
+                   next CMD; };
+               $cmd =~ /^A$/ && do {
+                   for ($i = 1; $i <= $max ; $i++) {
+                       if (defined $dbline{$i}) {
+                           $dbline{$i} =~ s/\0[^\0]*//;
+                           delete $dbline{$i} if $dbline{$i} eq '';
+                       }
+                   }
+                   next CMD; };
+               $cmd =~ /^<\s*(.*)/ && do {
+                   $pre = do action($1);
+                   next CMD; };
+               $cmd =~ /^>\s*(.*)/ && do {
+                   $post = do action($1);
+                   next CMD; };
+               $cmd =~ /^a\b\s*(\d+)(\s+(.*))?/ && do {
+                   $i = $1;
+                   if ($dbline[$i] == 0) {
+                       print OUT "Line $i may not have an action.\n";
+                   } else {
+                       $dbline{$i} =~ s/\0[^\0]*//;
+                       $dbline{$i} .= "\0" . do action($3);
+                   }
+                   next CMD; };
+               $cmd =~ /^n$/ && do {
+                   $single = 2;
+                   $laststep = $cmd;
+                   last CMD; };
+               $cmd =~ /^s$/ && do {
+                   $single = 1;
+                   $laststep = $cmd;
+                   last CMD; };
+               $cmd =~ /^c\b\s*(\d*)\s*$/ && do {
+                   $i = $1;
+                   if ($i) {
+                       if ($dbline[$i] == 0) {
+                           print OUT "Line $i not breakable.\n";
+                           next CMD;
+                       }
+                       $dbline{$i} =~ s/(\0|$)/;9$1/;  # add one-time-only b.p.
+                   }
+                   for ($i=0; $i <= $#stack; ) {
+                       $stack[$i++] &= ~1;
+                   }
+                   last CMD; };
+               $cmd =~ /^r$/ && do {
+                   $stack[$#stack] |= 2;
+                   last CMD; };
+               $cmd =~ /^T$/ && do {
+                   local($p,$f,$l,$s,$h,$a,@a,@sub);
+                   for ($i = 1; ($p,$f,$l,$s,$h,$w) = caller($i); $i++) {
+                       @a = @args;
+                       for (@a) {
+                           s/'/\\'/g;
+                           s/([^\0]*)/'$1'/ unless /^-?[\d.]+$/;
+                           s/([\200-\377])/sprintf("M-%c",ord($1)&0177)/eg;
+                           s/([\0-\37\177])/sprintf("^%c",ord($1)^64)/eg;
+                       }
+                       $w = $w ? '@ = ' : '$ = ';
+                       $a = $h ? '(' . join(', ', @a) . ')' : '';
+                       push(@sub, "$w&$s$a from file $f line $l\n");
                        last if $signal;
                    }
-               }
-               next; };
-           $cmd =~ /^b\s*(['A-Za-z_]['\w]*)\s*(.*)/ && do {
-               $subname = $1;
-               $subname = "main'" . $subname unless $subname =~ /'/;
-               ($i) = split(/-/, $sub{$subname});
-               if ($i) {
-                   ++$i while $line[$i] == 0 && $i < $#line;
-                   $stop[$i] = $2 ? $2 : 1;
-               } else {
-                   print OUT "Subroutine $1 not found.\n";
-               }
-               next; };
-           $cmd =~ /^b\s*(\d*)\s*(.*)/ && do {
-               $i = ($1?$1:$line);
-               if ($line[$i] == 0) {
-                   print OUT "Line $i not breakable.\n";
-               } else {
-                   $stop[$i] = $2 ? $2 : 1;
-               }
-               next; };
-           $cmd =~ /^d\s*(\d+)?/ && do {
-               $i = ($1?$1:$line);
-               $stop[$i] = '';
-               next; };
-           $cmd =~ /^A$/ && do {
-               for ($i = 1; $i <= $max ; $i++) {
-                   $action[$i] = '';
-               }
-               next; };
-           $cmd =~ /^<\s*(.*)/ && do {
-               $pre = do action($1);
-               next; };
-           $cmd =~ /^>\s*(.*)/ && do {
-               $post = do action($1);
-               next; };
-           $cmd =~ /^a\s*(\d+)(\s+(.*))?/ && do {
-               $i = $1;
-               if ($line[$i] == 0) {
-                   print OUT "Line $i may not have an action.\n";
-               } else {
-                   $action[$i] = do action($3);
-               }
-               next; };
-           $cmd =~ /^n$/ && do {
-               $single = 2;
-               $laststep = $cmd;
-               last; };
-           $cmd =~ /^s$/ && do {
-               $single = 1;
-               $laststep = $cmd;
-               last; };
-           $cmd =~ /^c\s*(\d*)\s*$/ && do {
-               $i = $1;
-               if ($i) {
-                   if ($line[$i] == 0) {
-                       print OUT "Line $i not breakable.\n";
-                       next;
+                   for ($i=0; $i <= $#sub; $i++) {
+                       last if $signal;
+                       print OUT $sub[$i];
                    }
-                   $stop[$i] .= ";9";  # add one-time-only b.p.
-               }
-               for ($i=0; $i <= $#stack; ) {
-                   $stack[$i++] &= ~1;
-               }
-               last; };
-           $cmd =~ /^f$/ && do {
-               $stack[$#stack] |= 2;
-               last; };
-           $cmd =~ /^T$/ && do {
-               for ($i=0; $i <= $#sub; ) {
-                   print OUT $sub[$i++], "\n";
-                   last if $signal;
-               }
-               next; };
-           $cmd =~ /^\/(.*)$/ && do {
-               $inpat = $1;
-               $inpat =~ s:([^\\])/$:$1:;
-               if ($inpat ne "") {
-                   eval '$inpat =~ m'."\n$inpat\n";    
-                   if ($@ ne "") {
-                       print OUT "$@";
-                       next;
+                   next CMD; };
+               $cmd =~ /^\/(.*)$/ && do {
+                   $inpat = $1;
+                   $inpat =~ s:([^\\])/$:$1:;
+                   if ($inpat ne "") {
+                       eval '$inpat =~ m'."\n$inpat\n";        
+                       if ($@ ne "") {
+                           print OUT "$@";
+                           next CMD;
+                       }
+                       $pat = $inpat;
                    }
-                   $pat = $inpat;
-               }
-               $end = $start;
-               eval '
-               for (;;) {
-                   ++$start;
-                   $start = 1 if ($start > $max);
-                   last if ($start == $end);
-                   if ($line[$start] =~ m'."\n$pat\n".'i) {
-                       print OUT "$start:\t", $line[$start], "\n";
-                       last;
+                   $end = $start;
+                   eval '
+                   for (;;) {
+                       ++$start;
+                       $start = 1 if ($start > $max);
+                       last if ($start == $end);
+                       if ($dbline[$start] =~ m'."\n$pat\n".'i) {
+                           if ($emacs) {
+                               print OUT "\032\032$filename:$start:0\n";
+                           } else {
+                               print OUT "$start:\t", $dbline[$start], "\n";
+                           }
+                           last;
+                       }
+                   } ';
+                   print OUT "/$pat/: not found\n" if ($start == $end);
+                   next CMD; };
+               $cmd =~ /^\?(.*)$/ && do {
+                   $inpat = $1;
+                   $inpat =~ s:([^\\])\?$:$1:;
+                   if ($inpat ne "") {
+                       eval '$inpat =~ m'."\n$inpat\n";        
+                       if ($@ ne "") {
+                           print OUT "$@";
+                           next CMD;
+                       }
+                       $pat = $inpat;
                    }
-               } ';
-               print OUT "/$pat/: not found\n" if ($start == $end);
-               next; };
-           $cmd =~ /^\?(.*)$/ && do {
-               $inpat = $1;
-               $inpat =~ s:([^\\])\?$:$1:;
-               if ($inpat ne "") {
-                   eval '$inpat =~ m'."\n$inpat\n";    
-                   if ($@ ne "") {
-                       print OUT "$@";
-                       next;
+                   $end = $start;
+                   eval '
+                   for (;;) {
+                       --$start;
+                       $start = $max if ($start <= 0);
+                       last if ($start == $end);
+                       if ($dbline[$start] =~ m'."\n$pat\n".'i) {
+                           if ($emacs) {
+                               print OUT "\032\032$filename:$start:0\n";
+                           } else {
+                               print OUT "$start:\t", $dbline[$start], "\n";
+                           }
+                           last;
+                       }
+                   } ';
+                   print OUT "?$pat?: not found\n" if ($start == $end);
+                   next CMD; };
+               $cmd =~ /^!+\s*(-)?(\d+)?$/ && do {
+                   pop(@hist) if length($cmd) > 1;
+                   $i = ($1?($#hist-($2?$2:1)):($2?$2:$#hist));
+                   $cmd = $hist[$i] . "\n";
+                   print OUT $cmd;
+                   redo CMD; };
+               $cmd =~ /^!(.+)$/ && do {
+                   $pat = "^$1";
+                   pop(@hist) if length($cmd) > 1;
+                   for ($i = $#hist; $i; --$i) {
+                       last if $hist[$i] =~ $pat;
                    }
-                   $pat = $inpat;
-               }
-               $end = $start;
-               eval '
-               for (;;) {
-                   --$start;
-                   $start = $max if ($start <= 0);
-                   last if ($start == $end);
-                   if ($line[$start] =~ m'."\n$pat\n".'i) {
-                       print OUT "$start:\t", $line[$start], "\n";
-                       last;
+                   if (!$i) {
+                       print OUT "No such command!\n\n";
+                       next CMD;
                    }
-               } ';
-               print OUT "?$pat?: not found\n" if ($start == $end);
-               next; };
-           $cmd =~ /^!+\s*(-)?(\d+)?$/ && do {
-               pop(@hist) if length($cmd) > 1;
-               $i = ($1?($#hist-($2?$2:1)):($2?$2:$#hist));
-               $cmd = $hist[$i] . "\n";
-               print OUT $cmd;
-               redo; };
-           $cmd =~ /^!(.+)$/ && do {
-               $pat = "^$1";
-               pop(@hist) if length($cmd) > 1;
-               for ($i = $#hist; $i; --$i) {
-                   last if $hist[$i] =~ $pat;
-               }
-               if (!$i) {
-                   print OUT "No such command!\n\n";
-                   next;
-               }
-               $cmd = $hist[$i] . "\n";
-               print OUT $cmd;
-               redo; };
-           $cmd =~ /^H\s*(-(\d+))?/ && do {
-               $end = $2?($#hist-$2):0;
-               $hist = 0 if $hist < 0;
-               for ($i=$#hist; $i>$end; $i--) {
-                   print OUT "$i: ",$hist[$i],"\n"
-                       unless $hist[$i] =~ /^.?$/;
-               };
-               next; };
-           $cmd =~ s/^p( .*)?$/print DB'OUT$1/;
-           {
-               package main;
-               eval $DB'cmd;
+                   $cmd = $hist[$i] . "\n";
+                   print OUT $cmd;
+                   redo CMD; };
+               $cmd =~ /^H\b\s*(-(\d+))?/ && do {
+                   $end = $2?($#hist-$2):0;
+                   $hist = 0 if $hist < 0;
+                   for ($i=$#hist; $i>$end; $i--) {
+                       print OUT "$i: ",$hist[$i],"\n"
+                           unless $hist[$i] =~ /^.?$/;
+                   };
+                   next CMD; };
+               $cmd =~ s/^p( .*)?$/print DB::OUT$1/;
+               $cmd =~ /^=/ && do {
+                   if (local($k,$v) = ($cmd =~ /^=\s*(\S+)\s+(.*)/)) {
+                       $alias{$k}="s~$k~$v~";
+                       print OUT "$k = $v\n";
+                   } elsif ($cmd =~ /^=\s*$/) {
+                       foreach $k (sort keys(%alias)) {
+                           if (($v = $alias{$k}) =~ s~^s\~$k\~(.*)\~$~$1~) {
+                               print OUT "$k = $v\n";
+                           } else {
+                               print OUT "$k\t$alias{$k}\n";
+                           };
+                       };
+                   };
+                   next CMD; };
            }
-           print OUT $@,"\n";
+           $evalarg = $cmd; &eval;
+           print OUT "\n";
        }
        if ($post) {
-           package main;
-           eval $DB'post;  print DB'OUT $@;
+           $evalarg = $post; &eval;
        }
     }
+    ($@, $!, $[, $,, $/, $\) = @saved;
+}
+
+sub save {
+    @saved = ($@, $!, $[, $,, $/, $\);
+    $[ = 0; $, = ""; $/ = "\n"; $\ = "";
+}
+
+# The following takes its argument via $evalarg to preserve current @_
+
+sub eval {
+    eval "$usercontext $evalarg; &DB::save";
+    print OUT $@;
 }
 
 sub action {
     local($action) = @_;
     while ($action =~ s/\\$//) {
        print OUT "+ ";
-       $action .= <IN>;
+       $action .= &gets;
     }
     $action;
 }
 
+sub gets {
+    local($.);
+    <IN>;
+}
+
 sub catch {
     $signal = 1;
 }
@@ -387,56 +557,40 @@ sub sub {
     push(@stack, $single);
     $single &= 1;
     $single |= 4 if $#stack == $deep;
-    local(@args) = @_;
-    for (@args) {
-       if (/^StB\000/ && length($_) == length($_main{'_main'})) {
-           $_ = sprintf("%s",$_);
-       }
-       else {
-           s/'/\\'/g;
-           s/(.*)/'$1'/ unless /^-?[\d.]+$/;
-       }
-    }
-    push(@sub, $sub . '(' . join(', ', @args) . ') from ' . $line);
     if (wantarray) {
        @i = &$sub;
-       --$#sub;
        $single |= pop(@stack);
        @i;
     }
     else {
        $i = &$sub;
-       --$#sub;
        $single |= pop(@stack);
        $i;
     }
 }
 
 $single = 1;                   # so it stops on first executable statement
-$max = $#line;
 @hist = ('?');
-$SIG{'INT'} = "DB'catch";
+$SIG{'INT'} = "DB::catch";
 $deep = 100;           # warning if stack gets this deep
 $window = 10;
 $preview = 3;
 
 @stack = (0);
-@args = @ARGV;
+@ARGS = @ARGV;
 for (@args) {
     s/'/\\'/g;
     s/(.*)/'$1'/ unless /^-?[\d.]+$/;
 }
-push(@sub, 'main(' . join(', ', @args) . ")" );
-$sub = 'main';
 
-if (-f '.perldb') {
-    do './.perldb';
+if (-f $rcfile) {
+    do "./$rcfile";
 }
-elsif (-f "$ENV{'LOGDIR'}/.perldb") {
-    do "$ENV{'LOGDIR'}/.perldb";
+elsif (-f "$ENV{'LOGDIR'}/$rcfile") {
+    do "$ENV{'LOGDIR'}/$rcfile";
 }
-elsif (-f "$ENV{'HOME'}/.perldb") {
-    do "$ENV{'HOME'}/.perldb";
+elsif (-f "$ENV{'HOME'}/$rcfile") {
+    do "$ENV{'HOME'}/$rcfile";
 }
 
 1;