* lib: Convert tabs to spaces for ruby files per

	  http://redmine.ruby-lang.org/projects/ruby/wiki/DeveloperHowto#coding-style
	  Patch by Steve Klabnik [Ruby 1.9 - Bug #4730]
	  Patch by Jason Dew [Ruby 1.9 - Feature #4718]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 495 insertions, 495 deletions

diff --git a/lib/debug.rb b/lib/debug.rb
index b97486d236..de0155440e 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -21,494 +21,494 @@ end
 SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
 
 class DEBUGGER__
-MUTEX = Mutex.new
+  MUTEX = Mutex.new
 
-class Context
-  DEBUG_LAST_CMD = []
+  class Context
+    DEBUG_LAST_CMD = []
 
-  begin
-    require 'readline'
-    def readline(prompt, hist)
-      Readline::readline(prompt, hist)
-    end
-  rescue LoadError
-    def readline(prompt, hist)
-      STDOUT.print prompt
-      STDOUT.flush
-      line = STDIN.gets
-      exit unless line
-      line.chomp!
-      line
+    begin
+      require 'readline'
+      def readline(prompt, hist)
+        Readline::readline(prompt, hist)
+      end
+    rescue LoadError
+      def readline(prompt, hist)
+        STDOUT.print prompt
+        STDOUT.flush
+        line = STDIN.gets
+        exit unless line
+        line.chomp!
+        line
+      end
+      USE_READLINE = false
     end
-    USE_READLINE = false
-  end
 
-  def initialize
-    if Thread.current == Thread.main
-      @stop_next = 1
-    else
-      @stop_next = 0
+    def initialize
+      if Thread.current == Thread.main
+        @stop_next = 1
+      else
+        @stop_next = 0
+      end
+      @last_file = nil
+      @file = nil
+      @line = nil
+      @no_step = nil
+      @frames = []
+      @finish_pos = 0
+      @trace = false
+      @catch = "StandardError"
+      @suspend_next = false
     end
-    @last_file = nil
-    @file = nil
-    @line = nil
-    @no_step = nil
-    @frames = []
-    @finish_pos = 0
-    @trace = false
-    @catch = "StandardError"
-    @suspend_next = false
-  end
 
-  def stop_next(n=1)
-    @stop_next = n
-  end
+    def stop_next(n=1)
+      @stop_next = n
+    end
 
-  def set_suspend
-    @suspend_next = true
-  end
+    def set_suspend
+      @suspend_next = true
+    end
 
-  def clear_suspend
-    @suspend_next = false
-  end
+    def clear_suspend
+      @suspend_next = false
+    end
 
-  def suspend_all
-    DEBUGGER__.suspend
-  end
+    def suspend_all
+      DEBUGGER__.suspend
+    end
 
-  def resume_all
-    DEBUGGER__.resume
-  end
+    def resume_all
+      DEBUGGER__.resume
+    end
 
-  def check_suspend
-    while MUTEX.synchronize {
-	if @suspend_next
-	  DEBUGGER__.waiting.push Thread.current
-	  @suspend_next = false
-	  true
-	end
+    def check_suspend
+      while MUTEX.synchronize {
+        if @suspend_next
+          DEBUGGER__.waiting.push Thread.current
+          @suspend_next = false
+          true
+        end
       }
+      end
     end
-  end
 
-  def trace?
-    @trace
-  end
+    def trace?
+      @trace
+    end
 
-  def set_trace(arg)
-    @trace = arg
-  end
+    def set_trace(arg)
+      @trace = arg
+    end
 
-  def stdout
-    DEBUGGER__.stdout
-  end
+    def stdout
+      DEBUGGER__.stdout
+    end
 
-  def break_points
-    DEBUGGER__.break_points
-  end
+    def break_points
+      DEBUGGER__.break_points
+    end
 
-  def display
-    DEBUGGER__.display
-  end
+    def display
+      DEBUGGER__.display
+    end
 
-  def context(th)
-    DEBUGGER__.context(th)
-  end
+    def context(th)
+      DEBUGGER__.context(th)
+    end
 
-  def set_trace_all(arg)
-    DEBUGGER__.set_trace(arg)
-  end
+    def set_trace_all(arg)
+      DEBUGGER__.set_trace(arg)
+    end
 
-  def set_last_thread(th)
-    DEBUGGER__.set_last_thread(th)
-  end
+    def set_last_thread(th)
+      DEBUGGER__.set_last_thread(th)
+    end
 
-  def debug_eval(str, binding)
-    begin
-      eval(str, binding)
-    rescue StandardError, ScriptError => e
-      at = eval("caller(1)", binding)
-      stdout.printf "%s:%s\n", at.shift, e.to_s.sub(/\(eval\):1:(in `.*?':)?/, '')
-      for i in at
-	stdout.printf "\tfrom %s\n", i
+    def debug_eval(str, binding)
+      begin
+        eval(str, binding)
+      rescue StandardError, ScriptError => e
+        at = eval("caller(1)", binding)
+        stdout.printf "%s:%s\n", at.shift, e.to_s.sub(/\(eval\):1:(in `.*?':)?/, '')
+        for i in at
+          stdout.printf "\tfrom %s\n", i
+        end
+        throw :debug_error
       end
-      throw :debug_error
     end
-  end
 
-  def debug_silent_eval(str, binding)
-    begin
-      eval(str, binding)
-    rescue StandardError, ScriptError
-      nil
+    def debug_silent_eval(str, binding)
+      begin
+        eval(str, binding)
+      rescue StandardError, ScriptError
+        nil
+      end
     end
-  end
 
-  def var_list(ary, binding)
-    ary.sort!
-    for v in ary
-      stdout.printf "  %s => %s\n", v, eval(v, binding).inspect
+    def var_list(ary, binding)
+      ary.sort!
+      for v in ary
+        stdout.printf "  %s => %s\n", v, eval(v, binding).inspect
+      end
     end
-  end
 
-  def debug_variable_info(input, binding)
-    case input
-    when /^\s*g(?:lobal)?\s*$/
-      var_list(global_variables, binding)
+    def debug_variable_info(input, binding)
+      case input
+      when /^\s*g(?:lobal)?\s*$/
+        var_list(global_variables, binding)
 
-    when /^\s*l(?:ocal)?\s*$/
-      var_list(eval("local_variables", binding), binding)
+      when /^\s*l(?:ocal)?\s*$/
+        var_list(eval("local_variables", binding), binding)
 
-    when /^\s*i(?:nstance)?\s+/
-      obj = debug_eval($', binding)
-      var_list(obj.instance_variables, obj.instance_eval{binding()})
+      when /^\s*i(?:nstance)?\s+/
+        obj = debug_eval($', binding)
+        var_list(obj.instance_variables, obj.instance_eval{binding()})
 
-    when /^\s*c(?:onst(?:ant)?)?\s+/
-      obj = debug_eval($', binding)
-      unless obj.kind_of? Module
-	stdout.print "Should be Class/Module: ", $', "\n"
-      else
-	var_list(obj.constants, obj.module_eval{binding()})
+      when /^\s*c(?:onst(?:ant)?)?\s+/
+        obj = debug_eval($', binding)
+        unless obj.kind_of? Module
+          stdout.print "Should be Class/Module: ", $', "\n"
+        else
+          var_list(obj.constants, obj.module_eval{binding()})
+        end
       end
     end
-  end
 
-  def debug_method_info(input, binding)
-    case input
-    when /^i(:?nstance)?\s+/
-      obj = debug_eval($', binding)
-
-      len = 0
-      for v in obj.methods.sort
-	len += v.size + 1
-	if len > 70
-	  len = v.size + 1
-	  stdout.print "\n"
-	end
-	stdout.print v, " "
-      end
-      stdout.print "\n"
+    def debug_method_info(input, binding)
+      case input
+      when /^i(:?nstance)?\s+/
+        obj = debug_eval($', binding)
+
+        len = 0
+        for v in obj.methods.sort
+          len += v.size + 1
+          if len > 70
+            len = v.size + 1
+            stdout.print "\n"
+          end
+          stdout.print v, " "
+        end
+        stdout.print "\n"
 
-    else
-      obj = debug_eval(input, binding)
-      unless obj.kind_of? Module
-	stdout.print "Should be Class/Module: ", input, "\n"
       else
-	len = 0
-	for v in obj.instance_methods(false).sort
-	  len += v.size + 1
-	  if len > 70
-	    len = v.size + 1
-	    stdout.print "\n"
-	  end
-	  stdout.print v, " "
-	end
-	stdout.print "\n"
+        obj = debug_eval(input, binding)
+        unless obj.kind_of? Module
+          stdout.print "Should be Class/Module: ", input, "\n"
+        else
+          len = 0
+          for v in obj.instance_methods(false).sort
+            len += v.size + 1
+            if len > 70
+              len = v.size + 1
+              stdout.print "\n"
+            end
+            stdout.print v, " "
+          end
+          stdout.print "\n"
+        end
       end
     end
-  end
 
-  def thnum
-    num = DEBUGGER__.instance_eval{@thread_list[Thread.current]}
-    unless num
-      DEBUGGER__.make_thread_list
+    def thnum
       num = DEBUGGER__.instance_eval{@thread_list[Thread.current]}
+      unless num
+        DEBUGGER__.make_thread_list
+        num = DEBUGGER__.instance_eval{@thread_list[Thread.current]}
+      end
+      num
     end
-    num
-  end
 
-  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
-    binding_line = line
-    previous_line = nil
-    if ENV['EMACS']
-      stdout.printf "\032\032%s:%d:\n", binding_file, binding_line
-    else
-      stdout.printf "%s:%d:%s", binding_file, binding_line,
-	line_at(binding_file, binding_line)
-    end
-    @frames[0] = [binding, file, line, id]
-    display_expressions(binding)
-    prompt = true
-    while prompt and input = readline("(rdb:%d) "%thnum(), true)
-      catch(:debug_error) do
-	if input == ""
-          next unless DEBUG_LAST_CMD[0]
-	  input = DEBUG_LAST_CMD[0]
-	  stdout.print input, "\n"
-	else
-	  DEBUG_LAST_CMD[0] = input
-	end
-
-	case input
-	when /^\s*tr(?:ace)?(?:\s+(on|off))?(?:\s+(all))?$/
-          if defined?( $2 )
-            if $1 == 'on'
-              set_trace_all true
-            else
-              set_trace_all false
-            end
-          elsif defined?( $1 )
-            if $1 == 'on'
-              set_trace true
-            else
-              set_trace false
-            end
+    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
+      binding_line = line
+      previous_line = nil
+      if ENV['EMACS']
+        stdout.printf "\032\032%s:%d:\n", binding_file, binding_line
+      else
+        stdout.printf "%s:%d:%s", binding_file, binding_line,
+          line_at(binding_file, binding_line)
+      end
+      @frames[0] = [binding, file, line, id]
+      display_expressions(binding)
+      prompt = true
+      while prompt and input = readline("(rdb:%d) "%thnum(), true)
+        catch(:debug_error) do
+          if input == ""
+            next unless DEBUG_LAST_CMD[0]
+            input = DEBUG_LAST_CMD[0]
+            stdout.print input, "\n"
+          else
+            DEBUG_LAST_CMD[0] = input
           end
+
+          case input
+          when /^\s*tr(?:ace)?(?:\s+(on|off))?(?:\s+(all))?$/
+            if defined?( $2 )
+              if $1 == 'on'
+                set_trace_all true
+              else
+                set_trace_all false
+              end
+            elsif defined?( $1 )
+              if $1 == 'on'
+                set_trace true
+              else
+                set_trace false
+              end
+            end
           if trace?
             stdout.print "Trace on.\n"
           else
             stdout.print "Trace off.\n"
           end
 
-	when /^\s*b(?:reak)?\s+(?:(.+):)?([^.:]+)$/
-	  pos = $2
-          if $1
-            klass = debug_silent_eval($1, binding)
-            file = $1
+          when /^\s*b(?:reak)?\s+(?:(.+):)?([^.:]+)$/
+            pos = $2
+            if $1
+              klass = debug_silent_eval($1, binding)
+              file = $1
+            end
+            if pos =~ /^\d+$/
+              pname = pos
+              pos = pos.to_i
+            else
+              pname = pos = pos.intern.id2name
+            end
+            break_points.push [true, 0, klass || file, pos]
+            stdout.printf "Set breakpoint %d at %s:%s\n", break_points.size, klass || file, pname
+
+          when /^\s*b(?:reak)?\s+(.+)[#.]([^.:]+)$/
+            pos = $2.intern.id2name
+            klass = debug_eval($1, binding)
+            break_points.push [true, 0, klass, pos]
+            stdout.printf "Set breakpoint %d at %s.%s\n", break_points.size, klass, pos
+
+          when /^\s*wat(?:ch)?\s+(.+)$/
+            exp = $1
+            break_points.push [true, 1, exp]
+            stdout.printf "Set watchpoint %d:%s\n", break_points.size, exp
+
+          when /^\s*b(?:reak)?$/
+            if break_points.find{|b| b[1] == 0}
+              n = 1
+              stdout.print "Breakpoints:\n"
+              break_points.each do |b|
+                if b[0] and b[1] == 0
+                  stdout.printf "  %d %s:%s\n", n, b[2], b[3]
+                end
+                n += 1
+              end
+            end
+          if break_points.find{|b| b[1] == 1}
+            n = 1
+            stdout.print "\n"
+            stdout.print "Watchpoints:\n"
+            for b in break_points
+              if b[0] and b[1] == 1
+                stdout.printf "  %d %s\n", n, b[2]
+              end
+              n += 1
+            end
           end
-	  if pos =~ /^\d+$/
-	    pname = pos
-	    pos = pos.to_i
-	  else
-	    pname = pos = pos.intern.id2name
-	  end
-	  break_points.push [true, 0, klass || file, pos]
-	  stdout.printf "Set breakpoint %d at %s:%s\n", break_points.size, klass || file, pname
-
-	when /^\s*b(?:reak)?\s+(.+)[#.]([^.:]+)$/
-	  pos = $2.intern.id2name
-	  klass = debug_eval($1, binding)
-	  break_points.push [true, 0, klass, pos]
-	  stdout.printf "Set breakpoint %d at %s.%s\n", break_points.size, klass, pos
-
-	when /^\s*wat(?:ch)?\s+(.+)$/
-	  exp = $1
-	  break_points.push [true, 1, exp]
-	  stdout.printf "Set watchpoint %d:%s\n", break_points.size, exp
-
-	when /^\s*b(?:reak)?$/
-	  if break_points.find{|b| b[1] == 0}
-	    n = 1
-	    stdout.print "Breakpoints:\n"
-	    break_points.each do |b|
-	      if b[0] and b[1] == 0
-		stdout.printf "  %d %s:%s\n", n, b[2], b[3]
-	      end
-	      n += 1
-	    end
-	  end
-	  if break_points.find{|b| b[1] == 1}
-	    n = 1
-	    stdout.print "\n"
-	    stdout.print "Watchpoints:\n"
-	    for b in break_points
-	      if b[0] and b[1] == 1
-		stdout.printf "  %d %s\n", n, b[2]
-	      end
-	      n += 1
-	    end
-	  end
-	  if break_points.size == 0
-	    stdout.print "No breakpoints\n"
-	  else
-	    stdout.print "\n"
-	  end
-
-	when /^\s*del(?:ete)?(?:\s+(\d+))?$/
-	  pos = $1
-	  unless pos
-	    input = readline("Clear all breakpoints? (y/n) ", false)
-	    if input == "y"
-	      for b in break_points
-		b[0] = false
-	      end
-	    end
-	  else
-	    pos = pos.to_i
-	    if break_points[pos-1]
-	      break_points[pos-1][0] = false
-	    else
-	      stdout.printf "Breakpoint %d is not defined\n", pos
-	    end
-	  end
-
-	when /^\s*disp(?:lay)?\s+(.+)$/
-	  exp = $1
-	  display.push [true, exp]
-	  stdout.printf "%d: ", display.size
-	  display_expression(exp, binding)
-
-	when /^\s*disp(?:lay)?$/
-	  display_expressions(binding)
-
-	when /^\s*undisp(?:lay)?(?:\s+(\d+))?$/
-	  pos = $1
-	  unless pos
-	    input = readline("Clear all expressions? (y/n) ", false)
-	    if input == "y"
-	      for d in display
-		d[0] = false
-	      end
-	    end
-	  else
-	    pos = pos.to_i
-	    if display[pos-1]
-	      display[pos-1][0] = false
-	    else
-	      stdout.printf "Display expression %d is not defined\n", pos
-	    end
-	  end
-
-	when /^\s*c(?:ont)?$/
-	  prompt = false
-
-	when /^\s*s(?:tep)?(?:\s+(\d+))?$/
-	  if $1
-	    lev = $1.to_i
-	  else
-	    lev = 1
-	  end
-	  @stop_next = lev
-	  prompt = false
-
-	when /^\s*n(?:ext)?(?:\s+(\d+))?$/
-	  if $1
-	    lev = $1.to_i
-	  else
-	    lev = 1
-	  end
-	  @stop_next = lev
-	  @no_step = @frames.size - frame_pos
-	  prompt = false
-
-	when /^\s*w(?:here)?$/, /^\s*f(?:rame)?$/
-	  display_frames(frame_pos)
-
-	when /^\s*l(?:ist)?(?:\s+(.+))?$/
-	  if not $1
-	    b = previous_line ? previous_line + 10 : binding_line - 5
-	    e = b + 9
-	  elsif $1 == '-'
-	    b = previous_line ? previous_line - 10 : binding_line - 5
-	    e = b + 9
-	  else
-	    b, e = $1.split(/[-,]/)
-	    if e
-	      b = b.to_i
-	      e = e.to_i
-	    else
-	      b = b.to_i - 5
-	      e = b + 9
-	    end
-	  end
-	  previous_line = b
-	  display_list(b, e, binding_file, binding_line)
-
-	when /^\s*up(?:\s+(\d+))?$/
-	  previous_line = nil
-	  if $1
-	    lev = $1.to_i
-	  else
-	    lev = 1
-	  end
-	  frame_pos += lev
-	  if frame_pos >= @frames.size
-	    frame_pos = @frames.size - 1
-	    stdout.print "At toplevel\n"
-	  end
-	  binding, binding_file, binding_line = @frames[frame_pos]
-	  stdout.print format_frame(frame_pos)
-
-	when /^\s*down(?:\s+(\d+))?$/
-	  previous_line = nil
-	  if $1
-	    lev = $1.to_i
-	  else
-	    lev = 1
-	  end
-	  frame_pos -= lev
-	  if frame_pos < 0
-	    frame_pos = 0
-	    stdout.print "At stack bottom\n"
-	  end
-	  binding, binding_file, binding_line = @frames[frame_pos]
-	  stdout.print format_frame(frame_pos)
-
-	when /^\s*fin(?:ish)?$/
-	  if frame_pos == @frames.size
-	    stdout.print "\"finish\" not meaningful in the outermost frame.\n"
-	  else
-	    @finish_pos = @frames.size - frame_pos
-	    frame_pos = 0
-	    prompt = false
-	  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)
-	  if input == "y"
-	    exit!	# exit -> exit!: No graceful way to stop threads...
-	  end
-
-	when /^\s*v(?:ar)?\s+/
-	  debug_variable_info($', binding)
-
-	when /^\s*m(?:ethod)?\s+/
-	  debug_method_info($', binding)
-
-	when /^\s*th(?:read)?\s+/
-	  if DEBUGGER__.debug_thread_info($', binding) == :cont
-	    prompt = false
-	  end
-
-	when /^\s*pp\s+/
-	  PP.pp(debug_eval($', binding), stdout)
-
-	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()
-
-	else
-	  v = debug_eval(input, binding)
-	  stdout.printf "%s\n", v.inspect
-	end
+          if break_points.size == 0
+            stdout.print "No breakpoints\n"
+          else
+            stdout.print "\n"
+          end
+
+          when /^\s*del(?:ete)?(?:\s+(\d+))?$/
+            pos = $1
+            unless pos
+              input = readline("Clear all breakpoints? (y/n) ", false)
+              if input == "y"
+                for b in break_points
+                  b[0] = false
+                end
+              end
+            else
+              pos = pos.to_i
+              if break_points[pos-1]
+                break_points[pos-1][0] = false
+              else
+                stdout.printf "Breakpoint %d is not defined\n", pos
+              end
+            end
+
+          when /^\s*disp(?:lay)?\s+(.+)$/
+            exp = $1
+            display.push [true, exp]
+            stdout.printf "%d: ", display.size
+            display_expression(exp, binding)
+
+          when /^\s*disp(?:lay)?$/
+            display_expressions(binding)
+
+          when /^\s*undisp(?:lay)?(?:\s+(\d+))?$/
+            pos = $1
+            unless pos
+              input = readline("Clear all expressions? (y/n) ", false)
+              if input == "y"
+                for d in display
+                  d[0] = false
+                end
+              end
+            else
+              pos = pos.to_i
+              if display[pos-1]
+                display[pos-1][0] = false
+              else
+                stdout.printf "Display expression %d is not defined\n", pos
+              end
+            end
+
+          when /^\s*c(?:ont)?$/
+            prompt = false
+
+          when /^\s*s(?:tep)?(?:\s+(\d+))?$/
+            if $1
+              lev = $1.to_i
+            else
+              lev = 1
+            end
+          @stop_next = lev
+          prompt = false
+
+          when /^\s*n(?:ext)?(?:\s+(\d+))?$/
+            if $1
+              lev = $1.to_i
+            else
+              lev = 1
+            end
+          @stop_next = lev
+          @no_step = @frames.size - frame_pos
+          prompt = false
+
+          when /^\s*w(?:here)?$/, /^\s*f(?:rame)?$/
+            display_frames(frame_pos)
+
+          when /^\s*l(?:ist)?(?:\s+(.+))?$/
+            if not $1
+              b = previous_line ? previous_line + 10 : binding_line - 5
+              e = b + 9
+            elsif $1 == '-'
+              b = previous_line ? previous_line - 10 : binding_line - 5
+              e = b + 9
+            else
+              b, e = $1.split(/[-,]/)
+              if e
+                b = b.to_i
+                e = e.to_i
+              else
+                b = b.to_i - 5
+                e = b + 9
+              end
+            end
+          previous_line = b
+          display_list(b, e, binding_file, binding_line)
+
+          when /^\s*up(?:\s+(\d+))?$/
+            previous_line = nil
+            if $1
+              lev = $1.to_i
+            else
+              lev = 1
+            end
+            frame_pos += lev
+            if frame_pos >= @frames.size
+              frame_pos = @frames.size - 1
+              stdout.print "At toplevel\n"
+            end
+            binding, binding_file, binding_line = @frames[frame_pos]
+            stdout.print format_frame(frame_pos)
+
+          when /^\s*down(?:\s+(\d+))?$/
+            previous_line = nil
+            if $1
+              lev = $1.to_i
+            else
+              lev = 1
+            end
+            frame_pos -= lev
+            if frame_pos < 0
+              frame_pos = 0
+              stdout.print "At stack bottom\n"
+            end
+            binding, binding_file, binding_line = @frames[frame_pos]
+            stdout.print format_frame(frame_pos)
+
+          when /^\s*fin(?:ish)?$/
+            if frame_pos == @frames.size
+              stdout.print "\"finish\" not meaningful in the outermost frame.\n"
+            else
+              @finish_pos = @frames.size - frame_pos
+              frame_pos = 0
+              prompt = false
+            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)
+            if input == "y"
+              exit!  # exit -> exit!: No graceful way to stop threads...
+            end
+
+          when /^\s*v(?:ar)?\s+/
+            debug_variable_info($', binding)
+
+          when /^\s*m(?:ethod)?\s+/
+            debug_method_info($', binding)
+
+          when /^\s*th(?:read)?\s+/
+            if DEBUGGER__.debug_thread_info($', binding) == :cont
+              prompt = false
+            end
+
+          when /^\s*pp\s+/
+            PP.pp(debug_eval($', binding), stdout)
+
+          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()
+
+          else
+            v = debug_eval(input, binding)
+            stdout.printf "%s\n", v.inspect
+          end
+        end
       end
+      MUTEX.unlock
+      resume_all
     end
-    MUTEX.unlock
-    resume_all
-  end
 
-  def debug_print_help
-    stdout.print <<EOHELP
+    def debug_print_help
+      stdout.print <<EOHELP
 Debugger help v.-0.002b
 Commands
   b[reak] [file:|class:]<line|method>
@@ -548,15 +548,15 @@ Commands
   p expression               evaluate expression and print its value
   h[elp]                     print this help
   <everything else>          evaluate
-EOHELP
+      EOHELP
   end
 
   def display_expressions(binding)
     n = 1
     for d in display
       if d[0]
-	stdout.printf "%d: ", n
-	display_expression(d[1], binding)
+  stdout.printf "%d: ", n
+  display_expression(d[1], binding)
       end
       n += 1
     end
@@ -576,9 +576,9 @@ EOHELP
   def display_frames(pos)
     0.upto(@frames.size - 1) do |n|
       if n == pos
-	stdout.print "--> "
+  stdout.print "--> "
       else
-	stdout.print "    "
+  stdout.print "    "
       end
       stdout.print format_frame(n)
     end
@@ -594,13 +594,13 @@ EOHELP
     stdout.printf "[%d, %d] in %s\n", b, e, file
     if lines = SCRIPT_LINES__[file] and lines != true
       b.upto(e) do |n|
-	if n > 0 && lines[n-1]
-	  if n == line
-	    stdout.printf "=> %d  %s\n", n, lines[n-1].chomp
-	  else
-	    stdout.printf "   %d  %s\n", n, lines[n-1].chomp
-	  end
-	end
+  if n > 0 && lines[n-1]
+    if n == line
+      stdout.printf "=> %d  %s\n", n, lines[n-1].chomp
+    else
+      stdout.printf "   %d  %s\n", n, lines[n-1].chomp
+    end
+  end
       end
     else
       stdout.printf "No sourcefile available for %s\n", file
@@ -630,19 +630,19 @@ EOHELP
     return false if break_points.empty?
     n = 1
     for b in break_points
-      if b[0]		# valid
-	if b[1] == 0	# breakpoint
-	  if (b[2] == file and b[3] == pos) or
-	      (klass and b[2] == klass and b[3] == pos)
-	    stdout.printf "Breakpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
-	    return true
-	  end
-	elsif b[1] == 1	# watchpoint
-	  if debug_silent_eval(b[2], binding)
-	    stdout.printf "Watchpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
-	    return true
-	  end
-	end
+      if b[0]    # valid
+  if b[1] == 0  # breakpoint
+    if (b[2] == file and b[3] == pos) or
+        (klass and b[2] == klass and b[3] == pos)
+      stdout.printf "Breakpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
+      return true
+    end
+  elsif b[1] == 1  # watchpoint
+    if debug_silent_eval(b[2], binding)
+      stdout.printf "Watchpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
+      return true
+    end
+  end
       end
       n += 1
     end
@@ -660,9 +660,9 @@ EOHELP
       fs = @frames.size
       tb = caller(0)[-fs..-1]
       if tb
-	for i in tb
-	  stdout.printf "\tfrom %s\n", i
-	end
+  for i in tb
+    stdout.printf "\tfrom %s\n", i
+  end
       end
       suspend_all
       debug_command(file, line, id, binding)
@@ -678,24 +678,24 @@ EOHELP
     when 'line'
       frame_set_pos(file, line)
       if !@no_step or @frames.size == @no_step
-	@stop_next -= 1
-	@stop_next = -1 if @stop_next < 0
+  @stop_next -= 1
+  @stop_next = -1 if @stop_next < 0
       elsif @frames.size < @no_step
-	@stop_next = 0		# break here before leaving...
+  @stop_next = 0    # break here before leaving...
       else
-	# nothing to do. skipped.
+  # nothing to do. skipped.
       end
       if @stop_next == 0 or check_break_points(file, nil, line, binding, id)
-	@no_step = nil
-	suspend_all
-	debug_command(file, line, id, binding)
+  @no_step = nil
+  suspend_all
+  debug_command(file, line, id, binding)
       end
 
     when 'call'
       @frames.unshift [binding, file, line, id]
       if check_break_points(file, klass, id.id2name, binding, id)
-	suspend_all
-	debug_command(file, line, id, binding)
+  suspend_all
+  debug_command(file, line, id, binding)
       end
 
     when 'c-call'
@@ -706,8 +706,8 @@ EOHELP
 
     when 'return', 'end'
       if @frames.size == @finish_pos
-	@stop_next = 1
-	@finish_pos = 0
+  @stop_next = 1
+  @finish_pos = 0
       end
       @frames.shift
 
@@ -753,7 +753,7 @@ class << DEBUGGER__
     MUTEX.synchronize do
       make_thread_list
       for th, in @thread_list
-	context(th).set_trace arg
+  context(th).set_trace arg
       end
     end
     arg
@@ -767,8 +767,8 @@ class << DEBUGGER__
     MUTEX.synchronize do
       make_thread_list
       for th, in @thread_list
-	next if th == Thread.current
-	context(th).set_suspend
+  next if th == Thread.current
+  context(th).set_suspend
       end
     end
     # Schedule other threads to suspend as soon as possible.
@@ -779,11 +779,11 @@ class << DEBUGGER__
     MUTEX.synchronize do
       make_thread_list
       @thread_list.each do |th,|
-	next if th == Thread.current
-	context(th).clear_suspend
+  next if th == Thread.current
+  context(th).clear_suspend
       end
       waiting.each do |th|
-	th.run
+  th.run
       end
       waiting.clear
     end
@@ -838,10 +838,10 @@ class << DEBUGGER__
     hash = {}
     for th in Thread::list
       if @thread_list.key? th
-	hash[th] = @thread_list[th]
+  hash[th] = @thread_list[th]
       else
-	@max_thread += 1
-	hash[th] = @max_thread
+  @max_thread += 1
+  hash[th] = @max_thread
       end
     end
     @thread_list = hash
@@ -861,36 +861,36 @@ class << DEBUGGER__
       make_thread_list
       th = get_thread($1.to_i)
       if th == Thread.current
-	@stdout.print "It's the current thread.\n"
+  @stdout.print "It's the current thread.\n"
       else
-	thread_list(@thread_list[th])
-	context(th).stop_next
-	th.run
-	return :cont
+  thread_list(@thread_list[th])
+  context(th).stop_next
+  th.run
+  return :cont
       end
 
     when /^stop\s+(\d+)/
       make_thread_list
       th = get_thread($1.to_i)
       if th == Thread.current
-	@stdout.print "It's the current thread.\n"
+  @stdout.print "It's the current thread.\n"
       elsif th.stop?
-	@stdout.print "Already stopped.\n"
+  @stdout.print "Already stopped.\n"
       else
-	thread_list(@thread_list[th])
-	context(th).suspend
+  thread_list(@thread_list[th])
+  context(th).suspend
       end
 
     when /^resume\s+(\d+)/
       make_thread_list
       th = get_thread($1.to_i)
       if th == Thread.current
-	@stdout.print "It's the current thread.\n"
+  @stdout.print "It's the current thread.\n"
       elsif !th.stop?
-	@stdout.print "Already running."
+  @stdout.print "Already running."
       else
-	thread_list(@thread_list[th])
-	th.run
+  thread_list(@thread_list[th])
+  th.run
       end
     end
   end