ruby-debug 0.4-mswin32 → 0.4.1-mswin32

data/CHANGES

@@ -1,3 +1,7 @@
+0.4.1
+- New binding_n method for Kernel module.
+- Bugfixes.
+
 0.4 
 - Debugger.start method takes a block. If a block is specified, this method starts debugger, yields to the block
   and stops debugger at the end.
@@ -6,7 +10,7 @@
 - 'eval on/off' controls the evaluation of unknown command.
 - Debugger reads readline history file .rdebug_hist at startup and saves it at exit.
 - 'sa[ve] <file>' command can be used to save current breackpoints and catchpoint if any
-- 'sc[ript] <file' command can be used to run script file. Script files can contain only control commands.
+- 'sc[ript] <file>' command can be used to run script file. Script files can contain only control commands.
 - rdebug script accepts '--script FILE' parameter.
 - thread commands are available for the control port.
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/rdoctask'
 SO_NAME = "ruby_debug.so"
 
 # ------- Default Package ----------
-RUBY_DEBUG_VERSION = "0.4"
+RUBY_DEBUG_VERSION = "0.4.1"
 
 FILES = FileList[
   'Rakefile',

data/ext/ruby_debug.c

@@ -4,7 +4,7 @@
 #include <rubysig.h>
 #include <st.h>
 
-#define DEBUG_VERSION "0.4"
+#define DEBUG_VERSION "0.4.1"
 
 typedef struct {
     int thnum;
@@ -45,6 +45,9 @@ static VALUE cContext;
 static VALUE cFrame;
 static VALUE cBreakpoint;
 
+static VALUE file_separator;
+static VALUE alt_file_separator;
+
 static ID idAtLine;
 static ID idAtBreakpoint;
 static ID idAtCatchpoint;
@@ -54,6 +57,7 @@ static ID idBasename;
 static ID idEval;
 static ID idList;
 static ID idClear;
+static ID idIndex;
 
 static int thnum_max = 0;
 static int last_debugged_thnum = -1;
@@ -230,6 +234,27 @@ basename(VALUE filename)
     return rb_funcall(rb_cFile, idBasename, 1, filename);
 }
 
+static int
+filename_cmp(debug_breakpoint_t *debug_breakpoint, VALUE file)
+{
+    VALUE flag = Qnil;
+    
+    flag = rb_funcall(debug_breakpoint->source, idIndex, 1, file_separator);
+    if(alt_file_separator != Qnil && flag == Qnil)
+        flag = rb_funcall(debug_breakpoint->source, idIndex, 1, alt_file_separator);
+    if(flag == Qnil)
+        file = basename(file);
+    else
+        file = rb_file_expand_path(file, Qnil);
+    return(rb_str_cmp(debug_breakpoint->source, file) == 0);
+}
+
+static int
+classname_cmp(debug_breakpoint_t *debug_breakpoint, VALUE klass)
+{
+    return (klass != Qnil && rb_str_cmp(debug_breakpoint->source, rb_mod_name(klass)) == 0);
+}
+
 static int
 check_breakpoints(debug_context_t *debug_context, VALUE file, VALUE klass, VALUE pos)
 {
@@ -249,8 +274,7 @@ check_breakpoints(debug_context_t *debug_context, VALUE file, VALUE klass, VALUE
         if(debug_breakpoint->pos != pos && !(TYPE(pos) == T_STRING && 
             TYPE(debug_breakpoint->pos) == T_STRING && rb_str_cmp(debug_breakpoint->pos, pos) == 0))
             continue;
-        if((rb_str_cmp(debug_breakpoint->source, basename(file)) == 0) ||
-            (klass != Qnil && rb_str_cmp(debug_breakpoint->source, rb_mod_name(klass)) == 0))
+        if(filename_cmp(debug_breakpoint, file) || classname_cmp(debug_breakpoint, klass))
             return i;
     }
     return -1;
@@ -350,7 +374,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
     switch(event)
     {
     case RUBY_EVENT_LINE:
-        {
+    {
         set_frame_source(debug_context, file, line);
 
         if(RTEST(tracing) || debug_context->tracing )
@@ -402,14 +426,14 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
             call_at_line(context, debug_context->thnum, binding, file, line);
         }
         break;
-        }
+    }
     case RUBY_EVENT_C_CALL:
-        {
-            set_frame_source(debug_context, file, line);
-            break;
-        }
+    {
+        set_frame_source(debug_context, file, line);
+        break;
+    }
     case RUBY_EVENT_CALL:
-        {
+    {
         save_call_frame(self, file, line, mid, debug_context);
         breakpoint_index = check_breakpoints(debug_context, file, klass, rb_str_new2(rb_id2name(mid)));
         if(breakpoint_index != -1)
@@ -423,10 +447,10 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
             }
         }
         break;
-        }
+    }
     case RUBY_EVENT_RETURN:
     case RUBY_EVENT_END:
-        {
+    {
         if(RARRAY(debug_context->frames)->len == debug_context->stop_frame)
         {
             debug_context->stop_next = 1;
@@ -434,14 +458,14 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
         }
         rb_ary_shift(debug_context->frames);
         break;
-        }
+    }
     case RUBY_EVENT_CLASS:
-        {
-            save_call_frame(self, file, line, mid, debug_context);
-            break;
-        }
+    {
+        save_call_frame(self, file, line, mid, debug_context);
+        break;
+    }
     case RUBY_EVENT_RAISE:
-        {
+    {
         VALUE ancestors;
         VALUE expn_class, aclass;
         int i;
@@ -470,11 +494,11 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
         }
 
         break;
-        }
+    }
     case RUBY_EVENT_C_RETURN:
-        {
-            break;
-        }
+    {
+        break;
+    }
     }
 
     debugging--;
@@ -991,9 +1015,15 @@ Init_ruby_debug()
     idEval         = rb_intern("eval");
     idList         = rb_intern("list");
     idClear        = rb_intern("clear");
+    idIndex = rb_intern("index");
+
+    file_separator = rb_eval_string("File::SEPARATOR");
+    alt_file_separator = rb_eval_string("File::ALT_SEPARATOR");
 
     rb_global_variable(&threads_tbl);
     rb_global_variable(&breakpoints);
     rb_global_variable(&catchpoint);
     rb_global_variable(&waiting);
+    rb_global_variable(&file_separator);
+    rb_global_variable(&alt_file_separator);
 }

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

@@ -36,7 +36,8 @@ module Debugger
           end
           file = klass.name if klass
         else
-          file = File.basename(file)
+          file = File.expand_path(file) if file.index(File::SEPARATOR) || \
+            File::ALT_SEPARATOR && file.index(File::ALT_SEPARATOR)
         end
       end
       

data/lib/ruby-debug/interface.rb

@@ -32,7 +32,7 @@ module Debugger
       class << Debugger; self end.send('define_method', 'save_history') do
         open(save_file, 'w') do |file|
           Readline::HISTORY.each do |line|
-            file.puts line
+            file.puts line unless line.strip.empty?
           end
         end
       end

data/lib/ruby-debug/processor.rb

@@ -28,11 +28,11 @@ module Debugger
             return unless @interface
             __#{mname}(*args)
           end
-        rescue IOError
+        rescue IOError, Errno::EPIPE
           self.interface = nil
         rescue Exception
-          print "INTERNAL ERROR!!! #\{$!\}\n"
-          print $!.backtrace.map{|l| "\t#\{l\}"}.join("\n")
+          print "INTERNAL ERROR!!! #\{$!\}\n" rescue nil
+          print $!.backtrace.map{|l| "\t#\{l\}"}.join("\n") rescue nil
         end
       }
     end
@@ -162,10 +162,10 @@ module Debugger
           end
         end
       end
-    rescue IOError
+    rescue IOError, Errno::EPIPE
     rescue Exception
-      print "INTERNAL ERROR!!! #{$!}\n"
-      print $!.backtrace.map{|l| "\t#{l}"}.join("\n")
+      print "INTERNAL ERROR!!! #{$!}\n" rescue nil
+      print $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
     ensure
       @interface.close
     end

data/lib/ruby-debug.rb

@@ -64,6 +64,7 @@ module Debugger
     # Interrupts the last debugged thread
     def interrupt_last
       if context = last_context
+        return nil unless context.thread.alive?
         context.interrupt
       end
       context
@@ -187,7 +188,15 @@ module Debugger
 end
 
 module Kernel
+  # stops the current thread after a number of _steps_ made.
   def debugger(steps = 1)
     Debugger.current_context.stop_next = steps
   end
+  
+  # returns a binding of n-th call frame
+  def binding_n(n = 0)
+    frame = Debugger.current_context.frames[n+1]
+    raise "Unknown frame #{n}" unless frame
+    frame.binding 
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-debug
 version: !ruby/object:Gem::Version 
-  version: "0.4"
-date: 2006-08-24 23:57:48 -04:00
+  version: 0.4.1
+date: 2006-08-27 16:18:00 -04:00
 summary: Fast Ruby debugger
 require_paths: 
 - lib