ruby-debug 0.1.4 → 0.1.5

data/CHANGES

@@ -1,3 +1,7 @@
+0.1.5 (2006-06-13)
+- Now the check for a  breakpoint uses base filename of the source file.
+- Removed compilation warnings when compiling with -Wall
+
 0.1.4 (2006-06-12)
 - Remembers the previous command. Invoke it by typing a carriage return
   at the command prompt.

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/rdoctask'
 SO_NAME = "ruby_debug.so"
 
 # ------- Default Package ----------
-RUBY_DEBUG_VERSION = "0.1.4"
+RUBY_DEBUG_VERSION = "0.1.5"
 
 FILES = FileList[
   'Rakefile',
@@ -41,7 +41,7 @@ EOF
   spec.files = FILES.to_a  
 
   spec.required_ruby_version = '>= 1.8.2'
-	spec.date = DateTime.now
+  spec.date = DateTime.now
   spec.rubyforge_project = 'ruby-debug'
   
   # rdoc
@@ -55,16 +55,25 @@ Rake::GemPackageTask.new(default_spec) do |pkg|
   pkg.need_tar = true
 end
 
-task :default => :package
+task :default => [:package]
 
-# ---------  Publish to RubyForge  ----------------
 desc "Publish ruby-debug to RubyForge."
 task :publish do 
-	require 'rake/contrib/sshpublisher'
-	
-	# Get ruby-debug path
-	ruby_debug_path = File.expand_path(File.dirname(__FILE__))
+  require 'rake/contrib/sshpublisher'
+  
+  # Get ruby-debug path
+  ruby_debug_path = File.expand_path(File.dirname(__FILE__))
 
-	publisher = Rake::SshDirPublisher.new("kent@rubyforge.org",
-				"/var/www/gforge-projects/ruby-debug", ruby_debug_path)
+  publisher = Rake::SshDirPublisher.new("kent@rubyforge.org",
+        "/var/www/gforge-projects/ruby-debug", ruby_debug_path)
 end
+
+desc "Clear temp files"
+task :clean do
+  cd "ext" do
+    if File.exists?("Makefile")
+      sh "make clean"
+      rm "Makefile"
+    end
+  end
+end

data/ext/ruby_debug.c

@@ -4,7 +4,7 @@
 #include <rubysig.h>
 #include <st.h>
 
-#define DEBUG_VERSION "0.1.4"
+#define DEBUG_VERSION "0.1.5"
 
 typedef struct {
     int thnum;
@@ -48,6 +48,10 @@ static ID idAtBreakpoint;
 static ID idAtCatchpoint;
 static ID idAtTracing;
 static ID idBinding;
+static ID idBasename;
+static ID idEval;
+static ID idList;
+static ID idClear;
 
 static int thnum_max = 0;
 static int last_debugged_thnum = 0;
@@ -62,7 +66,7 @@ debug_is_started(VALUE self)
     return threads_tbl != Qnil ? Qtrue : Qfalse;
 }
 
-static VALUE
+static void
 debug_check_started()
 {
     if(threads_tbl == Qnil)
@@ -178,6 +182,12 @@ save_call_frame(VALUE self, VALUE file, VALUE line, ID mid, debug_context_t *deb
     rb_ary_unshift(debug_context->frames, frame);
 }
 
+static VALUE
+basename(VALUE filename)
+{
+    return rb_funcall(rb_cFile, idBasename, 1, filename);
+}
+
 static int
 check_breakpoints(VALUE context, VALUE file, VALUE klass, VALUE pos)
 {
@@ -194,8 +204,8 @@ check_breakpoints(VALUE context, VALUE file, VALUE klass, VALUE pos)
         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, file) == 0 ||
-            klass != Qnil && rb_str_cmp(debug_breakpoint->source, rb_mod_name(klass)) == 0)
+        if((rb_str_cmp(debug_breakpoint->source, basename(file)) == 0) ||
+            (klass != Qnil && rb_str_cmp(debug_breakpoint->source, rb_mod_name(klass)) == 0))
             return i;
     }
     return -1;
@@ -213,7 +223,6 @@ create_binding(VALUE self)
 
     if(f_binding == NULL)
     {
-        ID idBinding = rb_intern("binding");
         NODE *body, *method;
         st_lookup(RCLASS(rb_mKernel)->m_tbl, idBinding, (st_data_t *)&body);
         method       = (NODE *)body->u2.value;
@@ -248,7 +257,7 @@ get_breakpoint_at(int index)
 static VALUE
 eval_expression(VALUE args)
 {
-    return rb_funcall(rb_mKernel, rb_intern("eval"), 2, RARRAY(args)->ptr[0], RARRAY(args)->ptr[1]);
+    return rb_funcall(rb_mKernel, idEval, 2, RARRAY(args)->ptr[0], RARRAY(args)->ptr[1]);
 }
 
 static int
@@ -271,7 +280,6 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
 {
     VALUE thread, context, binding, breakpoint;
     debug_context_t *debug_context;
-    debug_breakpoint_t *debug_breakpoint;
     VALUE file = Qnil, line = Qnil;
     int breakpoint_index = -1;
 
@@ -393,7 +401,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
         {
         VALUE ancestors;
         VALUE expn_class, aclass;
-        int i, found = 0;
+        int i;
 
         expn_class = rb_obj_class(ruby_errinfo);
         if( !NIL_P(rb_class_inherited_p(expn_class, rb_eSystemExit)) )
@@ -524,7 +532,7 @@ debug_set_catchpoint(VALUE self, VALUE value)
     debug_check_started();
 
     if (!NIL_P(value) && TYPE(value) != T_STRING) {
-    rb_raise(rb_eTypeError, "value of checkpoint must be String");
+        rb_raise(rb_eTypeError, "value of checkpoint must be String");
     }
     if(NIL_P(value))
     catchpoint = Qnil;
@@ -556,8 +564,8 @@ find_last_context_func(VALUE key, VALUE value, VALUE *result)
     Data_Get_Struct(value, debug_context_t, debug_context);
     if(debug_context->thnum == last_debugged_thnum)
     {
-    *result = value;
-    return ST_STOP;
+        *result = value;
+        return ST_STOP;
     }
     return ST_CONTINUE;
 }
@@ -573,7 +581,7 @@ find_last_context()
 static VALUE
 debug_interrupt_last(VALUE self)
 {
-    VALUE thread, context = Qnil;
+    VALUE context = Qnil;
     debug_context_t *debug_context;
 
     debug_check_started();
@@ -581,8 +589,8 @@ debug_interrupt_last(VALUE self)
     context = find_last_context();
     if(context != Qnil)
     {
-    Data_Get_Struct(context, debug_context_t, debug_context);
-    debug_context->stop_next = 1;
+        Data_Get_Struct(context, debug_context_t, debug_context);
+        debug_context->stop_next = 1;
     }
 
     return Qnil;
@@ -613,22 +621,22 @@ debug_contexts(VALUE self)
     debug_check_started();
 
     new_list = rb_ary_new();
-    list = rb_funcall(rb_cThread, rb_intern("list"), 0);
+    list = rb_funcall(rb_cThread, idList, 0);
     for(i = 0; i < RARRAY(list)->len; i++)
     {
-    thread = rb_ary_entry(list, i);
-    context = thread_context_lookup(thread);
-    rb_ary_push(new_list, context);
+        thread = rb_ary_entry(list, i);
+        context = thread_context_lookup(thread);
+        rb_ary_push(new_list, context);
     }
     /*
      * I wonder why rb_hash_clear is declared static?
      */
-    rb_funcall(threads_tbl, rb_intern("clear"), 0);
+    rb_funcall(threads_tbl, idClear, 0);
     for(i = 0; i < RARRAY(new_list)->len; i++)
     {
-    context = rb_ary_entry(new_list, i);
-    Data_Get_Struct(context, debug_context_t, debug_context);
-    rb_hash_aset(threads_tbl, debug_context->thread, context);
+        context = rb_ary_entry(new_list, i);
+        Data_Get_Struct(context, debug_context_t, debug_context);
+        rb_hash_aset(threads_tbl, debug_context->thread, context);
     }
 
     return new_list;
@@ -652,18 +660,18 @@ debug_suspend(VALUE self)
 
     for(i = 0; i < RARRAY(context_list)->len; i++)
     {
-    context = rb_ary_entry(context_list, i);
-    if(current == context)
-        continue;
-    Data_Get_Struct(context, debug_context_t, debug_context);
-    debug_context->suspend = 1;
+        context = rb_ary_entry(context_list, i);
+        if(current == context)
+            continue;
+        Data_Get_Struct(context, debug_context_t, debug_context);
+        debug_context->suspend = 1;
     }
     rb_thread_critical = saved_crit;
 
     if(rb_thread_critical == Qfalse)
     rb_thread_schedule();
 
-    return context;
+    return self;
 }
 
 static VALUE
@@ -685,11 +693,11 @@ debug_resume(VALUE self)
     current = thread_context_lookup(rb_thread_current());
     for(i = 0; i < RARRAY(context_list)->len; i++)
     {
-    context = rb_ary_entry(context_list, i);
-    if(current == context)
-        continue;
-    Data_Get_Struct(context, debug_context_t, debug_context);
-    debug_context->suspend = 0;
+        context = rb_ary_entry(context_list, i);
+        if(current == context)
+            continue;
+        Data_Get_Struct(context, debug_context_t, debug_context);
+        debug_context->suspend = 0;
     }
     for(i = 0; i < RARRAY(waiting)->len; i++)
     {
@@ -701,7 +709,7 @@ debug_resume(VALUE self)
 
     rb_thread_schedule();
 
-    return context;
+    return self;
 }
 
 static VALUE
@@ -971,6 +979,10 @@ Init_ruby_debug()
     idAtCatchpoint = rb_intern("at_catchpoint");
     idAtTracing    = rb_intern("at_tracing");
     idBinding      = rb_intern("binding");
+    idBasename     = rb_intern("basename");
+    idEval         = rb_intern("eval");
+    idList         = rb_intern("list");
+    idClear        = rb_intern("clear");
 
     rb_global_variable(&threads_tbl);
     rb_global_variable(&breakpoints);

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-debug
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
-date: 2006-07-12 20:47:26 -04:00
+  version: 0.1.5
+date: 2006-07-13 08:20:06 -04:00
 summary: Fast Ruby debugger
 require_paths: 
 - lib