ruby-debug 0.6.2 → 0.7

data/lib/ruby-debug.rb

@@ -259,10 +259,10 @@ module Debugger
     end
     
     def handle_post_mortem(exp)
-      return if exp.__debug_frames.empty?
+      return if exp.__debug_context.stack_size == 0
       orig_tracing = Debugger.tracing, Debugger.current_context.tracing
       Debugger.tracing = Debugger.current_context.tracing = false
-      processor.at_line(nil, exp.__debug_file, exp.__debug_line, exp.__debug_frames)
+      processor.at_line(exp.__debug_context, exp.__debug_file, exp.__debug_line)
     ensure
       Debugger.tracing, Debugger.current_context.tracing = orig_tracing
     end
@@ -271,7 +271,7 @@ module Debugger
 end
 
 class Exception # :nodoc:
-  attr_reader :__debug_file, :__debug_line, :__debug_binding, :__debug_frames
+  attr_reader :__debug_file, :__debug_line, :__debug_binding, :__debug_context
 end
 
 class DebugThread < Thread # :nodoc:
@@ -293,9 +293,7 @@ module Kernel
   # Returns a binding of n-th call frame
   #
   def binding_n(n = 0)
-    frame = Debugger.current_context.frames[-2 - n]
-    raise "Unknown frame #{n}" unless frame
-    frame.binding 
+    Debugger.current_context.frame_binding[n+1]
   end
 end
 
@@ -334,4 +332,4 @@ class Module
     end
     EOD
   end
-end
+end

data/lib/ruby-debug/command.rb

@@ -43,6 +43,8 @@ module Debugger
         @options ||= {}
       end
     end
+
+    @@display_stack_trace = false
     
     def initialize(state)
       @state = state
@@ -62,32 +64,46 @@ module Debugger
       @state.confirm(msg) == 'y'
     end
 
-    def debug_eval(str, b = @state.binding)
-      unless b
-        print "Can't evaluate in the current context.\nUse rdebug with -f option, or set Debugger.keep_frame_info = true.\n"
-        throw :debug_error
-      end
+    def debug_eval(str, b = get_binding)
       begin
         val = eval(str, b)
       rescue StandardError, ScriptError => e
-        at = eval("caller(1)", b)
-        print "%s:%s\n", at.shift, e.to_s.sub(/\(eval\):1:(in `.*?':)?/, '')
-        for i in at
-          print "\tfrom %s\n", i
-        end
+        if @@display_stack_trace
+          at = eval("caller(1)", b)
+	  print "%s:%s\n", at.shift, e.to_s.sub(/\(eval\):1:(in `.*?':)?/, '')
+          for i in at
+            print "\tfrom %s\n", i
+          end
+	else
+	  print "Exception #{e.class}: #{e.message}\n"
+	end
         throw :debug_error
       end
     end
 
     def debug_silent_eval(str)
-      return nil unless @state.binding
       begin
-        eval(str, @state.binding)
+        eval(str, get_binding)
       rescue StandardError, ScriptError
         nil
       end
     end
 
+    def hbinding(hash)
+      code = hash.keys.map{|k| "#{k} = hash['#{k}']"}.join(';') + ';binding'
+      if obj = @state.context.frame_self(@state.frame_pos)
+        obj.instance_eval code
+      else
+        eval code
+      end
+    end
+    private :hbinding
+ 
+    def get_binding
+      binding = @state.context.frame_binding(@state.frame_pos)
+      binding || hbinding(@state.context.frame_locals(@state.frame_pos))
+    end
+
     def line_at(file, line)
       Debugger.line_at(file, line)
     end
@@ -98,4 +114,4 @@ module Debugger
   end
   
   Command.load_commands
-end
+end

data/lib/ruby-debug/commands/breakpoints.rb

@@ -81,7 +81,6 @@ module Debugger
             print "  %d %s:%s if %s\n", b.id, b.source, b.pos, b.expr
           end
         end
-        print "\n"
       else
         print "No breakpoints\n"
       end
@@ -133,4 +132,4 @@ module Debugger
       end
     end
   end
-end
+end

data/lib/ruby-debug/commands/eval.rb

@@ -1,22 +1,20 @@
 module Debugger
   class EvalCommand < Command # :nodoc:
+    self.control = true
+
     def match(input)
       @input = input
       super
     end
     
     def regexp
-      /^\s*(p|e(?:val)?)(?:\s+(on|off)$|\s+)/
+      /^\s*(p|e(?:val)?)\s+/
     end
 
     def execute
-      if @match && @match[1] != 'p' && %w[on off].include?(@match[2])
-        self.class.unknown = @match[2] == 'on'
-        print "Evaluation of unknown command is #{self.class.unknown ? 'on': 'off'}.\n"
-        return
-      end
       expr = @match ? @match.post_match : @input
-      print "%s\n", debug_eval(expr).inspect
+      binding = @state.context ? get_binding : TOPLEVEL_BINDING
+      print "%s\n", debug_eval(expr, binding).inspect
     end
 
     class << self
@@ -33,7 +31,6 @@ module Debugger
           %{
             e[val] expression\tevaluate expression and print its value,
             \t\t\talias for p.
-            e[val] on/off\t\twhen 'on', debugger will evaluate every unknown command.
           }
         end
       end
@@ -63,4 +60,4 @@ module Debugger
       end
     end
   end
-end
+end

data/lib/ruby-debug/commands/frame.rb

@@ -3,7 +3,7 @@ module Debugger
     def adjust_frame(frame_pos, absolute)
       if absolute
         if frame_pos < 0
-          abs_frame_pos = @state.frames.size + frame_pos
+          abs_frame_pos = @state.context.stack_size + frame_pos
         else
           abs_frame_pos = frame_pos
         end
@@ -11,7 +11,7 @@ module Debugger
         abs_frame_pos = @state.frame_pos + frame_pos
       end
 
-      if abs_frame_pos >= @state.frames.size then
+      if abs_frame_pos >= @state.context.stack_size then
         print "Adjusting would put us beyond the oldest (initial) frame.\n"
         return
       elsif abs_frame_pos < 0 then
@@ -22,9 +22,11 @@ module Debugger
         @state.previous_line = nil
         @state.frame_pos = abs_frame_pos
       end
-      frame = @state.frames[-1-@state.frame_pos]
-      @state.binding, @state.file, @state.line = frame.binding, frame.file, frame.line
-      print format_frame(frame, @state.frame_pos)
+      
+      @state.file = @state.context.frame_file(@state.frame_pos)
+      @state.line = @state.context.frame_line(@state.frame_pos)
+      
+      print format_frame(@state.frame_pos)
     end
 
     def get_int(str, cmd)
@@ -36,10 +38,10 @@ module Debugger
       end
     end
 
-    def format_frame(frame, pos)
+    def format_frame(pos)
       printf "\032\032" if ENV['EMACS']
-      file, line, id = frame.file, frame.line, frame.id
-      "#%d %s:%s%s\n" % [pos + 1, file, line, (id ? ":in `#{id.id2name}'" : "")]
+      file, line, id = @state.context.frame_file(pos), @state.context.frame_line(pos), @state.context.frame_id(pos)
+      "#%d %s:%s%s\n" % [pos, file, line, (id ? ":in `#{id.id2name}'" : "")]
     end
   end
 
@@ -51,13 +53,13 @@ module Debugger
     end
 
     def execute
-      @state.frames.reverse.each_with_index do |frame, idx|
+      (0...@state.context.stack_size).each do |idx|
         if idx == @state.frame_pos
           print "--> "
         else
           print "    "
         end
-        print format_frame(frame, idx)
+        print format_frame(idx)
       end
     end
 
@@ -99,7 +101,7 @@ module Debugger
 
     class << self
       def help_command
-        up
+        'up'
       end
 
       def help(cmd)
@@ -114,7 +116,7 @@ module Debugger
     include FrameFunctions
 
     def regexp
-      /^\s* d(?:own)? (?:\s+(.*))? .*$/x
+      /^\s* d(?!isp)(?:own)? (?:\s+(.*))? .*$/x
     end
 
     def execute
@@ -154,7 +156,7 @@ module Debugger
         pos = get_int(@match[1], "Frame")
         return unless pos
       end
-      adjust_frame(pos < 0 ? pos : pos-1, true)
+      adjust_frame(pos, true)
     end
 
     class << self
@@ -174,4 +176,4 @@ module Debugger
       end
     end
   end
-end
+end

data/lib/ruby-debug/commands/irb.rb

@@ -37,11 +37,7 @@ module Debugger
         print "Command is available only in local mode.\n"
         throw :debug_error
       end
-      unless @state.binding
-        print "Can't evaluate in the current context.\n"
-        throw :debug_error
-      end
-      IRB.start_session(@state.binding)
+      IRB.start_session(get_binding)
     end
     
     class << self

data/lib/ruby-debug/commands/list.rb

@@ -15,14 +15,6 @@ module Debugger
         @state.previous_line = nil
         b = @state.line - 5
         e = b + 9
-      elsif @match[2] == 'on'
-        self.class.always_run = true
-        print "Listing is on.\n"
-        return
-      elsif @match[2] == 'off'
-        self.class.always_run = false
-        print "Listing is off.\n"
-        return
       else
         b, e = @match[2].split(/[-,]/)
         if e
@@ -110,4 +102,4 @@ module Debugger
       end
     end
   end
-end
+end

data/lib/ruby-debug/commands/settings.rb

@@ -0,0 +1,41 @@
+module Debugger
+  class SetCommand < Command # :nodoc:
+    self.control = true
+
+    def regexp
+      /^set \s+ (.+) \s*/x
+    end
+
+    def execute
+      case @match[1]
+      when /^(no)?autolist$/
+        ListCommand.always_run = $1.nil?
+        print "Listing is #{$1.nil? ? 'on' : 'off'}.\n"
+      when /^(no)?autoeval$/
+        EvalCommand.unknown = $1.nil?
+        print "Evaluation of unrecognized command is #{$1.nil? ? 'on' : 'off'}.\n"
+      when /^(no)?trace$/
+        @@display_stack_trace = $1.nil?
+	print "Display stack trace is #{$1.nil? ? 'on' : 'off'}.\n"
+      else
+        print "Unknown setting.\n"
+      end
+    end
+
+    class << self
+      def help_command
+        "set"
+      end
+
+      def help(cmd)
+        %{
+           set <setting>, where <setting>:
+           autolist - execute 'list' command on every breakpoint
+           autoeval - evaluate every unrecognized command
+           trace    - display stack trace when 'eval' raises exception
+           To disable setting, use 'no' prefix, like 'noautolist'
+	}
+      end
+    end
+  end
+end

data/lib/ruby-debug/commands/stepping.rb

@@ -58,7 +58,7 @@ module Debugger
     end
 
     def execute
-      if @state.frame_pos == @state.frames.size
+      if @state.frame_pos == @state.context.stack_size - 1
         print "\"finish\" not meaningful in the outermost frame.\n"
       else
         @state.context.stop_frame = @state.frame_pos
@@ -101,4 +101,4 @@ module Debugger
       end
     end
   end
-end
+end

data/lib/ruby-debug/commands/threads.rb

@@ -2,13 +2,13 @@ module Debugger
   module ThreadFunctions # :nodoc:
     def display_context(c)
       c_flag = c.thread == Thread.current ? '+' : ' '
+      c_flag = '$' if c.suspended?
       d_flag = debugger_thread?(c) ? '!' : ' '
       print "%s%s", c_flag, d_flag
       print "%d ", c.thnum
       print "%s\t", c.thread.inspect
-      last_frame = c.frames.last
-      if last_frame
-        print "%s:%d", last_frame.file, last_frame.line
+      if c.stack_size > 0
+        print "%s:%d", c.frame_file(0), c.frame_line(0)
       end
       print "\n"
     end
@@ -100,11 +100,9 @@ module Debugger
         print "It's the current thread.\n"
       when debugger_thread?(c)
         print "Can't stop the debugger thread.\n"
-      when c.thread.stop?
-        print "Already stopped.\n"
       else
-        display_context(c)
         c.suspend
+        display_context(c)
       end
     end
 
@@ -167,8 +165,8 @@ module Debugger
       when !c.thread.stop?
         print "Already running."
       else
-        display_context(c)
         c.resume
+        display_context(c)
       end
     end
 
@@ -184,4 +182,4 @@ module Debugger
       end
     end
   end
-end
+end

data/lib/ruby-debug/commands/tmate.rb

@@ -8,12 +8,11 @@ module Debugger
       def execute
         if @match[1]
           frm_n = @match[1].to_i
-          if frm_n > @state.frames.size || frm_n == 0
+          if frm_n > @state.context.stack_size || frm_n == 0
             print "Wrong frame number\n"
             return
           end
-          frame = @state.frames[-frm_n]
-          file, line = frame.file, frame.line
+          file, line = @state.context.frame_file(frm_n-1), @state.context.frame_line(frm_n-1)
         else
           file, line = @state.file, @state.line
         end
@@ -34,4 +33,4 @@ module Debugger
       end
     end
   end
-end
+end

data/lib/ruby-debug/commands/variables.rb

@@ -1,9 +1,15 @@
 module Debugger
   module VarFunctions # :nodoc:
-    def var_list(ary, bind = @state.binding)
+    def var_list(ary, b = get_binding)
       ary.sort!
       for v in ary
-        print "  %s => %s\n", v, debug_eval(v, bind).inspect
+        print "  %s => %s\n", v, debug_eval(v, b).inspect
+      end
+    end
+
+    def var_locals(locals)
+      locals.keys.sort.each do |name|
+        print "  %s => %s\n", name, locals[name]
       end
     end
     
@@ -102,7 +108,7 @@ module Debugger
     end
 
     def execute
-      var_list(debug_eval("local_variables"))
+      var_locals(@state.context.frame_locals(@state.frame_pos))
     end
 
     class << self
@@ -117,4 +123,4 @@ module Debugger
       end
     end
   end
-end
+end