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

data/ext/ruby_debug/extconf.rb

@@ -2,23 +2,31 @@ require "mkmf"
 require "ruby_core_source"
 
 hdrs = proc {
-  have_struct_member("rb_method_entry_t", "body", "method.h")
-  have_header("vm_core.h") and have_header("iseq.h") and have_header("insns.inc") and 
+  begin
+    have_struct_member("rb_method_entry_t", "called_id", "method.h") or
+    have_struct_member("rb_control_frame_t", "method_id", "method.h")
+  end and
+  begin
+    have_func("rb_method_entry", "method.h") or
+    have_func("rb_method_node", "node.h")
+  end and
+  have_header("vm_core.h") and have_header("iseq.h") and have_header("insns.inc") and
   have_header("insns_info.inc") and have_header("eval_intern.h")
+  if checking_for(checking_message("if rb_iseq_compile_with_option was added an argument filepath")) do
+    try_compile(<<SRC)
+#include <ruby.h>
+#include "vm_core.h"
+extern VALUE rb_iseq_new_main(NODE *node, VALUE filename, VALUE filepath);
+SRC
+    end
+  $defs << '-DRB_ISEQ_COMPILE_5ARGS'
+  end
 }
 
-if RUBY_VERSION == '1.9.1'
-  $CFLAGS << ' -DRUBY_VERSION_1_9_1'
-end
-
-if RUBY_REVISION >= 26959 # rb_iseq_compile_with_option was added an argument filepath  
-  $CFLAGS << ' -DRB_ISEQ_COMPILE_6ARGS'
-end
-
 dir_config("ruby")
 name = "ruby_debug"
 if (ENV['rvm_ruby_string'])
-  dest_dir = Config::CONFIG["rubyhdrdir"]
+  dest_dir = RbConfig::CONFIG["rubyhdrdir"]
   with_cppflags("-I" + dest_dir) {
     if hdrs.call
       create_makefile(name)

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.pre2"
+#define DEBUG_VERSION "0.11.30.pre3"
 
 #define FRAME_N(n)  (&debug_context->frames[debug_context->stack_size-(n)-1])
 #define GET_FRAME   (FRAME_N(check_frame_number(debug_context, frame)))
@@ -20,12 +20,12 @@
 
 #define STACK_SIZE_INCREMENT 128
 
-RUBY_EXTERN int rb_vm_get_sourceline(const rb_control_frame_t *cfp); /* from vm.c */
+int rb_vm_get_sourceline(const rb_control_frame_t *cfp); /* from vm.c */
 /* from iseq.c */
-#ifdef RB_ISEQ_COMPILE_6ARGS
-RUBY_EXTERN VALUE rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE filepath, VALUE line, VALUE opt);
+#ifdef RB_ISEQ_COMPILE_5ARGS
+VALUE rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE filepath, VALUE line, VALUE opt);
 #else
-RUBY_EXTERN VALUE rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE line, VALUE opt);
+VALUE rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE line, VALUE opt);
 #endif
 
 typedef struct {
@@ -137,7 +137,7 @@ real_class(VALUE klass)
 inline static void *
 ruby_method_ptr(VALUE class, ID meth_id)
 {
-#ifdef RUBY_VERSION_1_9_1
+#ifndef HAVE_RB_METHOD_ENTRY
     NODE *body, *method;
     st_lookup(RCLASS_M_TBL(class), meth_id, (st_data_t *)&body);
     method = (NODE *)body->u2.value;
@@ -191,6 +191,20 @@ context_thread_0(debug_context_t *debug_context)
     return id2ref(debug_context->thread_id);
 }
 
+static inline const rb_data_type_t *
+threadptr_data_type(void)
+{
+    static const rb_data_type_t *thread_data_type;
+    if (!thread_data_type) {
+  VALUE current_thread = rb_thread_current();
+  thread_data_type = RTYPEDDATA_TYPE(current_thread);
+    }
+    return thread_data_type;
+}
+
+#define ruby_threadptr_data_type *threadptr_data_type()
+#define ruby_current_thread ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()))
+
 static int
 is_in_locked(VALUE thread_id)
 {
@@ -687,7 +701,7 @@ create_catch_table(debug_context_t *debug_context, unsigned long cont)
     GET_THREAD()->parse_in_eval++;
     GET_THREAD()->mild_compile_error++;
     /* compiling with option Qfalse (no options) prevents debug hook calls during this catch routine */
-#ifdef RB_ISEQ_COMPILE_6ARGS
+#ifdef RB_ISEQ_COMPILE_5ARGS
     catch_table->iseq = rb_iseq_compile_with_option(
         rb_str_new_cstr("begin\nend"), rb_str_new_cstr("(exception catcher)"), Qnil, INT2FIX(1), Qfalse);
 #else
@@ -726,7 +740,7 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
     char *file = (char*)rb_sourcefile();
     int line = rb_sourceline();
     int moved = 0;
-#ifdef RUBY_VERSION_1_9_1
+#ifndef HAVE_RB_METHOD_ENTRY
     NODE *node = NULL;
 #else
     rb_method_entry_t *me = NULL;
@@ -748,7 +762,7 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
 
     if (mid == ID_ALLOCATOR) return;
 
-#ifdef RUBY_VERSION_1_9_1
+#ifndef HAVE_RB_METHOD_ENTRY
     node = rb_method_node(klass, mid);
 #else
     me = rb_method_entry(klass, mid);
@@ -861,6 +875,7 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
             {
                 rb_control_frame_t *cfp = top_frame->info.runtime.cfp;
                 VALUE hit_count;
+                int c_hit_count;
                 rb_iseq_t *iseq = cfp->iseq; 
 
                 if (iseq != NULL) {
@@ -870,7 +885,7 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
                 }
                 
                 /* send catchpoint notification */                
-                int c_hit_count = FIX2INT(rb_hash_aref(rdebug_catchpoints, debug_context->catch_table.mod_name)) + 1;
+                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;
@@ -963,7 +978,7 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
     case RUBY_EVENT_C_RETURN:
     {
         /* note if a block is given we fall through! */
-#ifdef RUBY_VERSION_1_9_1
+#ifndef HAVE_RB_METHOD_ENTRY
         if(!node || !c_call_new_frame_p(klass, mid))
 #else
         if(!me || !c_call_new_frame_p(klass, mid))
@@ -999,6 +1014,10 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
     }
     case RUBY_EVENT_RAISE:
     {
+        VALUE ancestors;
+        VALUE expn_class, aclass;
+        int i;
+
         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 */
@@ -1006,10 +1025,6 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
           break;    
         }
 
-        VALUE ancestors;
-        VALUE expn_class, aclass;
-        int i;
-
         if(debug == Qtrue) {
           fprintf(stderr, "stack_size %d\n", debug_context->stack_size);
           for (i = 0; i < debug_context->stack_size; i++) {

metadata

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