ruby-debug 0.5.2 → 0.5.3

data/CHANGES

@@ -1,3 +1,7 @@
+0.5.3
+- Added Module#post_mortem_method method, which wraps any method with Debugger.post_mortem block.
+- Added breakpoint id, which is not dependent on the breakpoint position in Debugger.breakpoints array.
+
 0.5.2
 - Fixes interoperability problems with rspec.
 - Made 'exit' as an alias to 'quit'

data/ext/ruby_debug.c

@@ -4,7 +4,7 @@
 #include <rubysig.h>
 #include <st.h>
 
-#define DEBUG_VERSION "0.5.2"
+#define DEBUG_VERSION "0.5.3"
 
 #define CTX_FL_MOVED        (1<<1)
 #define CTX_FL_SUSPEND      (1<<2)
@@ -43,6 +43,7 @@ typedef struct {
 } debug_frame_t;
 
 typedef struct {
+    int   id;
     VALUE source;
     VALUE pos;
     VALUE expr;
@@ -81,6 +82,7 @@ static ID idIndex;
 
 static int start_count = 0;
 static int thnum_max = 0;
+static int bkp_count = 0;
 static int last_debugged_thnum = -1;
 
 static VALUE create_binding(VALUE);
@@ -627,7 +629,6 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
         if(post_mortem == Qtrue && self)
         {
             binding = create_binding(self);
-            rb_ivar_set(ruby_errinfo, rb_intern("@__debug_binding"), binding);
             rb_ivar_set(ruby_errinfo, rb_intern("@__debug_file"), file);
             rb_ivar_set(ruby_errinfo, rb_intern("@__debug_line"), line);
             rb_ivar_set(ruby_errinfo, rb_intern("@__debug_binding"), binding);
@@ -784,6 +785,7 @@ debug_add_breakpoint(int argc, VALUE *argv, VALUE self)
 
     breakpoint = ALLOC(debug_breakpoint_t);
     breakpoint->source = StringValue(source);
+    breakpoint->id = ++bkp_count;
     breakpoint->pos = pos;
     breakpoint->expr = NIL_P(expr) ? expr: StringValue(expr);
     result = Data_Wrap_Struct(cBreakpoint, breakpoint_mark, xfree, breakpoint);
@@ -791,6 +793,36 @@ debug_add_breakpoint(int argc, VALUE *argv, VALUE self)
     return result;
 }
 
+/*
+ *   call-seq:
+ *      Debugger.remove_breakpoint(id) -> breakpoint
+ *   
+ *   Removes breakpoint by its id.
+ *   <i>id</i> is an identificator of a breakpoint.
+ */
+static VALUE
+debug_remove_breakpoint(VALUE self, VALUE id_value)
+{
+    int i;
+    int id;
+    VALUE breakpoint;
+    debug_breakpoint_t *debug_breakpoint;
+    
+    id = FIX2INT(id_value);
+    
+    for( i = 0; i < RARRAY(breakpoints)->len; i += 1 )
+    {
+        breakpoint = rb_ary_entry(breakpoints, i);
+        Data_Get_Struct(breakpoint, debug_breakpoint_t, debug_breakpoint);
+        if(debug_breakpoint->id == id)
+        {
+            rb_ary_delete_at(breakpoints, i);
+            return breakpoint;
+        }
+    }
+    return Qnil;
+}
+
 /*
  *   call-seq:
  *      Debugger.breakpoints -> array
@@ -1503,6 +1535,21 @@ breakpoint_expr(VALUE self)
     return breakpoint->expr;
 }
 
+/*
+ *   call-seq:
+ *      breakpoint.id -> int
+ *   
+ *   Returns id of the breakpoint.
+ */
+static VALUE
+breakpoint_id(VALUE self)
+{
+    debug_breakpoint_t *breakpoint;
+    
+    Data_Get_Struct(self, debug_breakpoint_t, breakpoint);
+    return INT2FIX(breakpoint->id);
+}
+
 /*
  *   Document-class: Context
  *   
@@ -1562,6 +1609,7 @@ Init_breakpoint()
     rb_define_method(cBreakpoint, "source", breakpoint_source, 0);
     rb_define_method(cBreakpoint, "pos", breakpoint_pos, 0);
     rb_define_method(cBreakpoint, "expr", breakpoint_expr, 0);
+    rb_define_method(cBreakpoint, "id", breakpoint_id, 0);
 }
 
 /*
@@ -1585,6 +1633,7 @@ Init_ruby_debug()
     rb_define_module_function(mDebugger, "started?", debug_is_started, 0);
     rb_define_module_function(mDebugger, "breakpoints", debug_breakpoints, 0);
     rb_define_module_function(mDebugger, "add_breakpoint", debug_add_breakpoint, -1);
+    rb_define_module_function(mDebugger, "remove_breakpoint", debug_remove_breakpoint, 1);
     rb_define_module_function(mDebugger, "catchpoint", debug_catchpoint, 0);
     rb_define_module_function(mDebugger, "catchpoint=", debug_set_catchpoint, 1);
     rb_define_module_function(mDebugger, "last_context", debug_last_interrupted, 0);

data/lib/ruby-debug.rb

@@ -77,7 +77,7 @@ module Debugger
     def interface=(value) # :nodoc:
       processor.interface = value
     end
-    
+
     #
     # Starts a remote debugger.
     #
@@ -256,7 +256,8 @@ module Debugger
     end
     
     def handle_post_mortem(exp)
-      processor.at_line(nil, exp.__debug_file, exp.__debug_line, exp.__debug_binding, exp.__debug_frames)
+      return if exp.__debug_frames.empty?
+      processor.at_line(nil, exp.__debug_file, exp.__debug_line, exp.__debug_frames.first.binding, exp.__debug_frames)
     end
     private :handle_post_mortem
   end
@@ -301,4 +302,22 @@ class Module
     end
     EOD
   end
+  
+  #
+  # Wraps the +meth+ method with Debugger.post_mortem {...} block.
+  #
+  def post_mortem_method(meth)
+    old_meth = "__postmortem_#{meth}"
+    old_meth = "#{$1}_set" if old_meth =~ /^(.+)=$/
+    alias_method old_meth.to_sym, meth
+    class_eval <<-EOD
+    def #{meth}(*args, &block)
+      Debugger.start do |dbg|
+        dbg.post_mortem do
+          #{old_meth}(*args, &block)
+        end
+      end
+    end
+    EOD
+  end
 end

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

@@ -46,8 +46,8 @@ module Debugger
         pos = pos.intern.id2name
       end
       
-      Debugger.add_breakpoint file, pos, expr
-      print "Set breakpoint %d at %s:%s\n", Debugger.breakpoints.size, file, pos.to_s
+      b = Debugger.add_breakpoint file, pos, expr
+      print "Set breakpoint %d at %s:%s\n", b.id, file, pos.to_s
     end
 
     class << self
@@ -74,11 +74,11 @@ module Debugger
     def execute
       unless Debugger.breakpoints.empty?
         print "Breakpoints:\n"
-        Debugger.breakpoints.each_with_index do |b, n|
+        Debugger.breakpoints.sort_by{|b| b.id }.each do |b|
           if b.expr.nil?
-            print "  %d %s:%s\n", n+1, b.source, b.pos
+            print "  %d %s:%s\n", b.id, b.source, b.pos
           else
-            print "  %d %s:%s if %s\n", n+1, b.source, b.pos, b.expr
+            print "  %d %s:%s if %s\n", b.id, b.source, b.pos, b.expr
           end
         end
         print "\n"
@@ -115,7 +115,7 @@ module Debugger
         end
       else
         pos = pos.to_i
-        unless Debugger.breakpoints.delete_at(pos-1)
+        unless Debugger.remove_breakpoint(pos)
           print "Breakpoint %d is not defined\n", pos
         end
       end

data/lib/ruby-debug/interface.rb

@@ -89,7 +89,7 @@ module Debugger
   
   class ScriptInterface # :nodoc:
     def initialize(file, out)
-      @file = open(file)
+      @file = file.respond_to?(:gets) ? file : open(file)
       @out = out
     end
     

data/lib/ruby-debug/processor.rb

@@ -11,6 +11,7 @@ module Debugger
       @display = []
       @mutex = Mutex.new
       @last_cmd = nil
+      @actions = []
     end
     
     def interface=(interface)
@@ -66,7 +67,7 @@ module Debugger
       process_commands(context, file, line, binding, frames)
     end
     protect :at_line
-
+    
     private
     
     def print(*args)
@@ -106,18 +107,20 @@ module Debugger
             @last_cmd = input
           end
           
-          if cmd = commands.find{ |c| c.match(input) }
-            if context.nil? && cmd.class.need_context
-              print "Command is unavailable\n"
-            else
-              cmd.execute
-            end
-          else
-            unknown_cmd = commands.find{|cmd| cmd.class.unknown }
-            if unknown_cmd
-              unknown_cmd.execute
+          input.split(";").each do |input|
+            if cmd = commands.find{ |c| c.match(input) }
+              if context.nil? && cmd.class.need_context
+                print "Command is unavailable\n"
+              else
+                cmd.execute
+              end
             else
-              print "Unknown command\n"
+              unknown_cmd = commands.find{|cmd| cmd.class.unknown }
+              if unknown_cmd
+                unknown_cmd.execute
+              else
+                print "Unknown command\n"
+              end
             end
           end
         end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.1
 specification_version: 1
 name: ruby-debug
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
-date: 2006-12-21 16:17:01 -05:00
+  version: 0.5.3
+date: 2007-01-21 03:38:07 -05:00
 summary: Fast Ruby debugger
 require_paths: 
 - lib