From 4eb380d2d0687e68a31caf538093b98d77e0e8e1 Mon Sep 17 00:00:00 2001
From: ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 10 Jul 2006 01:57:22 +0000
Subject: Merged my changes from HEAD

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/debug.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/debug.rb')

diff --git a/lib/debug.rb b/lib/debug.rb
index d22982b5a..9ae119f8f 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -255,6 +255,9 @@ class Context
 
   def debug_command(file, line, id, binding)
     MUTEX.lock
+    unless defined?($debugger_restart) and $debugger_restart
+      callcc{|c| $debugger_restart = c} 
+    end
     set_last_thread(Thread.current)
     frame_pos = 0
     binding_file = file
@@ -524,6 +527,9 @@ class Context
 	when /^\s*p\s+/
 	  stdout.printf "%s\n", debug_eval($', binding).inspect
 
+	when /^\s*r(?:estart)?$/
+          $debugger_restart.call
+
 	when /^\s*h(?:elp)?$/
 	  debug_print_help()
 
@@ -541,11 +547,11 @@ class Context
     stdout.print <<EOHELP
 Debugger help v.-0.002b
 Commands
-  b[reak] [file|class:]<line|method>
+  b[reak] [file:|class:]<line|method>
   b[reak] [class.]<line|method>
                              set breakpoint to some position
   wat[ch] <expression>       set watchpoint to some expression
-  cat[ch] <an Exception>     set catchpoint to an exception
+  cat[ch] (<exception>|off)  set catchpoint to an exception
   b[reak]                    list breakpoints
   cat[ch]                    show catchpoint
   del[ete][ nnn]             delete some or all breakpoints
-- 
cgit