[ruby-dev:11207] [Patch] debug.rb -- catchpoint

なひです．

[ruby-dev:11158]のpatchを取り込んで頂いてありがとうございました．
まだちょっと準備が整っていないのですが，もうしばらくしたら，
「何故Tracerの出力の出口を一本化すると『ものすごく嬉しい』のか」
がわかる成果物を公開できる予定です．

# rdebugって覚えてる人居るかしら．

それとは別に，debug.rbにcatchpoint対応を追加するPatchです．
  catch HogeError
で，HogeErrorがraiseされた時に停止します．
  catch off
とすると，例外発生時に止まらなくなります．
起動時(default)は
  catch StandardError
の状態になっています．

# 従来はなんでもかんでも止まってました．

「出口の一本化対応」も少し入ってます．

	/	/	/

--- debug.rb.dist	Fri Sep  1 00:16:48 2000
+++ debug.rb	Fri Oct 13 19:33:37 2000
@@ -6,7 +6,7 @@ if $SAFE > 0
   exit 1
 end
-SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
 
 require 'tracer'
+
 class Tracer
   def Tracer.trace_func(*vars)
@@ -15,4 +15,5 @@ class Tracer
 end
 
+SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
 
 class DEBUGGER__
@@ -90,4 +91,5 @@ class DEBUGGER__
       @finish_pos = 0
       @trace = false
+      @catch = "StandardError"
     end
 
@@ -131,14 +133,6 @@ class DEBUGGER__
     def var_list(ary, binding)
       ary.sort!
-      if false # ary.size < 0
-	f = open("|less", "w")
-	for v in ary
-	  f.printf "  %s => %s\n", v, eval(v, binding).inspect
-	end
-	f.close
-      else
-	for v in ary
-	  stdout.printf "  %s => %s\n", v, eval(v, binding).inspect
-	end
+      for v in ary
+	stdout.printf "  %s => %s\n", v, eval(v, binding).inspect
       end
     end
@@ -159,5 +153,5 @@ class DEBUGGER__
 	obj = debug_eval($', binding)
 	unless obj.kind_of? Module
-	  stdout.print "should be Class/Module: ", $', "\n"
+	  stdout.print "Should be Class/Module: ", $', "\n"
 	else
 	  var_list(obj.constants, obj.module_eval{binding()})
@@ -185,5 +179,5 @@ class DEBUGGER__
 	obj = debug_eval(input, binding)
 	unless obj.kind_of? Module
-	  stdout.print "should be Class/Module: ", input, "\n"
+	  stdout.print "Should be Class/Module: ", input, "\n"
 	else
 	  len = 0
@@ -236,10 +230,10 @@ class DEBUGGER__
 	  case input
 	  when /^\s*tr(?:ace)?(?:\s+(on|off))?$/
-	    if !defined?( $1 )
-	      @trace = !@trace
-	    elsif $1 == 'on'
-	      @trace = true
-	    else
-	      @trace = false
+	    if defined?( $1 )
+	      if $1 == 'on'
+		@trace = true
+	      else
+		@trace = false
+	      end
 	    end
 	    if @trace
@@ -272,5 +266,5 @@ class DEBUGGER__
 	    if break_points.find{|b| b[1] == 0}
 	      n = 1
-	      stdout.print "breakpoints:\n"
+	      stdout.print "Breakpoints:\n"
 	      for b in break_points
 		if b[0] and b[1] == 0
@@ -283,5 +277,5 @@ class DEBUGGER__
 	      n = 1
 	      stdout.print "\n"
-	      stdout.print "watchpoints:\n"
+	      stdout.print "Watchpoints:\n"
 	      for b in break_points
 		if b[0] and b[1] == 1
@@ -292,5 +286,5 @@ class DEBUGGER__
 	    end
 	    if break_points.size == 0
-	      stdout.print "no breakpoints\n"
+	      stdout.print "No breakpoints\n"
 	    else
 	      stdout.print "\n"
@@ -300,5 +294,5 @@ class DEBUGGER__
 	    pos = $1
 	    unless pos
-	      input = readline("clear all breakpoints? (y/n) ", false)
+	      input = readline("Clear all breakpoints? (y/n) ", false)
 	      if input == "y"
 		for b in break_points
@@ -327,5 +321,5 @@ class DEBUGGER__
 	    pos = $1
 	    unless pos
-	      input = readline("clear all expressions? (y/n) ", false)
+	      input = readline("Clear all expressions? (y/n) ", false)
 	      if input == "y"
 		for d in display
@@ -338,5 +332,5 @@ class DEBUGGER__
 		display[pos-1][0] = false
 	      else
-		stdout.printf "display expression %d is not defined\n", pos
+		stdout.printf "Display expression %d is not defined\n", pos
 	      end
 	    end
@@ -398,5 +392,5 @@ class DEBUGGER__
 	    if frame_pos >= @frames.size
 	      frame_pos = @frames.size - 1
-	      stdout.print "at toplevel\n"
+	      stdout.print "At toplevel\n"
 	    end
 	    binding, binding_file, binding_line = @frames[frame_pos]
@@ -413,5 +407,5 @@ class DEBUGGER__
 	    if frame_pos < 0
 	      frame_pos = 0
-	      stdout.print "at stack bottom\n"
+	      stdout.print "At stack bottom\n"
 	    end
 	    binding, binding_file, binding_line = @frames[frame_pos]
@@ -423,9 +417,27 @@ class DEBUGGER__
 	    else
 	      @finish_pos = @frames.size - frame_pos
-	      p @finish_pos
 	      frame_pos = 0
+	      MUTEX.unlock
 	      return
 	    end
 
+	  when /^\s*cat(?:ch)?(?:\s+(.+))?$/
+	    if $1
+	      excn = $1
+	      if excn == 'off'
+		@catch = nil
+		stdout.print "Clear catchpoint.\n"
+	      else
+		@catch = excn
+		stdout.printf "Set catchpoint %s.\n", @catch
+	      end
+	    else
+	      if @catch
+		stdout.printf "Catchpoint %s.\n", @catch
+	      else
+		stdout.print "No catchpoint.\n"
+	      end
+	    end
+
 	  when /^\s*q(?:uit)?$/
 	    input = readline("really quit? (y/n) ", false)
@@ -445,12 +457,12 @@ class DEBUGGER__
 
 	  when /^\s*p\s+/
-	    p debug_eval($', binding)
+	    stdout.printf "%s\n", debug_eval($', binding)
 
-	  when /^\s*h(?:elp)?/
+	  when /^\s*h(?:elp)?$/
 	    debug_print_help()
 
 	  else
 	    v = debug_eval(input, binding)
-	    p v unless (v == nil)
+	    stdout.printf "%s\n", v unless (v == nil)
 	  end
 	end
@@ -459,5 +471,5 @@ class DEBUGGER__
 
     def debug_print_help
-      print <<EOHELP
+      stdout.print <<EOHELP
 Debugger help v.-0.002b
 Commands
@@ -465,5 +477,7 @@ Commands
 	                     set breakpoint to some position
   wat[ch] <expression>       set watchpoint to some expression
+  cat[ch] <an Exception>     set catchpoint to an exception
   b[reak]                    list breakpoints
+  cat[ch]                    show catchpoint
   del[ele][ nnn]             delete some or all breakpoints
   disp[lay] <expression>     add expression into display expression list
@@ -550,5 +564,5 @@ EOHELP
 	end
       else
-	stdout.printf "no sourcefile available for %s\n", file
+	stdout.printf "No sourcefile available for %s\n", file
       end
     end
@@ -581,9 +595,9 @@ EOHELP
 	if b[0]
 	  if b[1] == 0 and b[2] == file and b[3] == pos
-	    stdout.printf "breakpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
+	    stdout.printf "Breakpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
 	    return true
 	  elsif b[1] == 1
 	    if debug_silent_eval(b[2], binding)
-	      stdout.printf "watchpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
+	      stdout.printf "Watchpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
 	      return true
 	    end
@@ -597,14 +611,13 @@ EOHELP
 
     def excn_handle(file, line, id, binding)
-      p $!
+      stdout.printf "Exception `%s': %s\n", $!.type, $!
       if $!.type <= SystemExit
 	set_trace_func nil
 	exit
       end
+
       MUTEX.lock
       fs = @frames.size
       tb = caller(0)[-fs..-1]
-
-      stdout.printf "%s\n", $!
       if tb
 	for i in tb
@@ -612,5 +625,9 @@ EOHELP
 	end
       end
-      debug_command(file, line, id, binding)
+      if @catch and ($!.type.ancestors.find { |e| e.to_s == @catch })
+	debug_command(file, line, id, binding)
+      else
+	MUTEX.unlock
+      end
     end
 
@@ -782,6 +799,6 @@ EOHELP
   end
 
-  @stdout.printf "Debug.rb\n"
-  @stdout.printf "Emacs support available.\n\n"
+  stdout.printf "Debug.rb\n"
+  stdout.printf "Emacs support available.\n\n"
   set_trace_func proc{|event, file, line, id, binding,klass,*rest|
     DEBUGGER__.context.trace_func event, file, line, id, binding,klass