ruby-debug-base19x 0.11.30.pre → 0.11.30.pre2

data/Rakefile

@@ -13,6 +13,7 @@ desc "Create the core ruby-debug shared library extension"
 task :lib do
   Dir.chdir("ext/ruby_debug") do
     system("#{Gem.ruby} extconf.rb && make")
+    exit $?.to_i if $?.to_i != 0
   end
 end
 

data/ext/ruby_debug/ruby_debug.c

@@ -9,7 +9,7 @@
 #include <insns_info.inc>
 #include "ruby_debug.h"
 
-#define DEBUG_VERSION "0.11.30.pre"
+#define DEBUG_VERSION "0.11.30.pre2"
 
 #define FRAME_N(n)  (&debug_context->frames[debug_context->stack_size-(n)-1])
 #define GET_FRAME   (FRAME_N(check_frame_number(debug_context, frame)))
@@ -476,7 +476,7 @@ call_at_line_unprotected(VALUE args)
 {
     VALUE context;
     context = *RARRAY_PTR(args);
-    return rb_funcall2(context, idAtLine, RARRAY_LEN(args) - 1, RARRAY_PTR(args) + 1);
+    return rb_funcall2(context, idAtLine, (int)RARRAY_LEN(args) - 1, RARRAY_PTR(args) + 1);
 }
 
 static VALUE
@@ -536,8 +536,8 @@ int
 filename_cmp(VALUE source, char *file)
 {
     char *source_ptr, *file_ptr;
-    int s_len, f_len, min_len;
-    int s,f;
+    long s_len, f_len, min_len;
+    long s,f;
     int dirsep_flag = 0;
 
     s_len = RSTRING_LEN(source);
@@ -644,8 +644,10 @@ inline static int
 c_call_new_frame_p(VALUE klass, ID mid)
 {
     klass = real_class(klass);
+//    if ((klass == rb_mKernel) && (strcmp(rb_id2name(mid), "raise") == 0)) return 0;
+
     if(rb_block_given_p()) return 1;
-    if(klass == rb_cProc || klass == rb_mKernel || klass == rb_cModule) return 1;
+    if(klass == rb_cProc || klass == rb_mKernel || klass == rb_cModule /*|| klass == rb_cFixnum*/) return 1;
     return 0;
 }
 
@@ -851,6 +853,36 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
     {
     case RUBY_EVENT_LINE:
     {
+        if (CTX_FL_TEST(debug_context, CTX_FL_CATCHING))
+        {
+            debug_frame_t *top_frame = get_top_frame(debug_context);
+            
+            if (top_frame != NULL)
+            {
+                rb_control_frame_t *cfp = top_frame->info.runtime.cfp;
+                VALUE hit_count;
+                rb_iseq_t *iseq = cfp->iseq; 
+
+                if (iseq != NULL) {
+                    /* restore the proper catch table */
+                    iseq->catch_table_size = debug_context->catch_table.old_catch_table_size;
+                    iseq->catch_table = debug_context->catch_table.old_catch_table;
+                }
+                
+                /* send catchpoint notification */                
+                int c_hit_count = FIX2INT(rb_hash_aref(rdebug_catchpoints, debug_context->catch_table.mod_name)) + 1;
+                hit_count = INT2FIX(c_hit_count);
+                rb_hash_aset(rdebug_catchpoints, debug_context->catch_table.mod_name, hit_count);
+                debug_context->stop_reason = CTX_STOP_CATCHPOINT;
+                rb_funcall(context, idAtCatchpoint, 1, debug_context->catch_table.errinfo);
+                if(self && binding == Qnil)
+                    binding = create_binding(self);
+                save_top_binding(debug_context, binding);
+                call_at_line(context, debug_context, rb_str_new2(top_frame->file), INT2FIX(top_frame->line));
+            }
+            
+            break;
+        }
         if(debug_context->stack_size == 0 || 
            get_top_frame(debug_context)->info.runtime.block_iseq != thread->cfp->block_iseq ||
            get_top_frame(debug_context)->info.runtime.cfp->iseq != thread->cfp->iseq)
@@ -967,11 +999,23 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
     }
     case RUBY_EVENT_RAISE:
     {
+        if (CTX_FL_TEST(debug_context, CTX_FL_CATCHING)) {
+          /* we're re-raising exception after processing line event, 
+          now allow the next exception to be caught, don't setup catchers */
+          CTX_FL_UNSET(debug_context, CTX_FL_CATCHING);
+          break;    
+        }
+
         VALUE ancestors;
         VALUE expn_class, aclass;
         int i;
 
-//        set_frame_source(event, debug_context, self, file, line, mid);
+        if(debug == Qtrue) {
+          fprintf(stderr, "stack_size %d\n", debug_context->stack_size);
+          for (i = 0; i < debug_context->stack_size; i++) {
+             fprintf(stderr, "%s:%d, iseq: %p\n", FRAME_N(i)->file, FRAME_N(i)->line, FRAME_N(i)->info.runtime.cfp->iseq); 
+          }
+        }
 
         if(post_mortem == Qtrue && self)
         {
@@ -1025,19 +1069,24 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
             {
                 debug_frame_t *top_frame = get_top_frame(debug_context);
                 rb_control_frame_t *cfp = top_frame->info.runtime.cfp;
-
-                /* send catchpoint notification */
-                int c_hit_count = FIX2INT(rb_hash_aref(rdebug_catchpoints, mod_name)) + 1;
-                hit_count = INT2FIX(c_hit_count);
-                rb_hash_aset(rdebug_catchpoints, mod_name, hit_count);
-                debug_context->stop_reason = CTX_STOP_CATCHPOINT;
-                rb_funcall(context, idAtCatchpoint, 1, rb_errinfo());
-
-                if(self && binding == Qnil)
-                    binding = create_binding(self);
-                save_top_binding(debug_context, binding);
-                call_at_line(context, debug_context, rb_str_new2(file), INT2FIX(line));
-                break;
+                rb_iseq_t *iseq = cfp->iseq;
+                
+                debug_context->catch_table.mod_name = mod_name;
+                debug_context->catch_table.errinfo = rb_errinfo();
+                CTX_FL_SET(debug_context, CTX_FL_CATCHING);
+                if (iseq != NULL) {
+                                    
+                   /* save the current catch table */
+                    debug_context->catch_table.old_catch_table_size = iseq->catch_table_size;
+                    debug_context->catch_table.old_catch_table = iseq->catch_table;
+                    
+
+                    /* create a new catch table to catch this exception, and put it in the current iseq */
+                    iseq->catch_table_size = 1;
+                    iseq->catch_table =
+                    create_catch_table(debug_context, top_frame->info.runtime.last_pc - cfp->iseq->iseq_encoded - insn_len(BIN(trace)));
+                    break;    
+                }
             }
         }
 
@@ -1691,7 +1740,7 @@ check_frame_number(debug_context_t *debug_context, VALUE frame)
     return frame_n;
 }
 
-static int 
+static long 
 optional_frame_position(int argc, VALUE *argv) {
   unsigned int i_scanned;
   VALUE level;
@@ -2317,7 +2366,7 @@ FUNC_FASTCALL(do_jump)(rb_thread_t *th, rb_control_frame_t *cfp)
            +1 for target frame
            +1 for array terminator
          */
-        int frames = jump_cfp - cfp + 2;
+        long frames = jump_cfp - cfp + 2;
         debug_context->old_iseq_catch = (iseq_catch_t*)malloc(frames * sizeof(iseq_catch_t));
         MEMZERO(debug_context->old_iseq_catch, iseq_catch_t, frames);
         frames = 0;
@@ -2361,7 +2410,7 @@ context_jump(VALUE self, VALUE line, VALUE file)
 {
     debug_context_t *debug_context;
     debug_frame_t *debug_frame;
-    int i;
+    unsigned i;
     rb_thread_t *th;
     rb_control_frame_t *cfp;
     rb_control_frame_t *cfp_end;
@@ -2385,7 +2434,7 @@ context_jump(VALUE self, VALUE line, VALUE file)
         if (cfp->pc == debug_frame->info.runtime.last_pc)
         {
             cfp_start = cfp;
-            if ((cfp->pc - cfp->iseq->iseq_encoded) >= (cfp->iseq->iseq_size - 1))
+            if ((unsigned)(cfp->pc - cfp->iseq->iseq_encoded) >= (cfp->iseq->iseq_size - 1))
                 return(INT2FIX(1)); /* no space for opt_call_c_function hijack */
             break;
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-base19x
 version: !ruby/object:Gem::Version
-  version: 0.11.30.pre
+  version: 0.11.30.pre2
   prerelease: 8
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-10 00:00:00.000000000Z
+date: 2011-08-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
-  requirement: &70174364715960 !ruby/object:Gem::Requirement
+  requirement: &70261391956160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70174364715960
+  version_requirements: *70261391956160
 - !ruby/object:Gem::Dependency
   name: ruby_core_source
-  requirement: &70174364715480 !ruby/object:Gem::Requirement
+  requirement: &70261391955680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70174364715480
+  version_requirements: *70261391955680
 - !ruby/object:Gem::Dependency
   name: linecache19
-  requirement: &70174364715000 !ruby/object:Gem::Requirement
+  requirement: &70261391955200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.5.11
   type: :runtime
   prerelease: false
-  version_requirements: *70174364715000
+  version_requirements: *70261391955200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70174364714540 !ruby/object:Gem::Requirement
+  requirement: &70261391971120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70174364714540
+  version_requirements: *70261391971120
 description: ! 'ruby-debug is a fast implementation of the standard Ruby debugger
   debug.rb.