ruby-debug-base19 0.11.21 → 0.11.22

data/ext/ruby_debug/ruby_debug.c

@@ -726,7 +726,7 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
 
     hook_count++;
 
-    if ((iseq == NULL) && (event != RUBY_EVENT_RAISE))
+    if (((iseq == NULL) || (file == NULL)) && (event != RUBY_EVENT_RAISE))
         return;
     thread_context_lookup(thread->self, &context, &debug_context, 1);
 
@@ -1783,10 +1783,8 @@ context_frame_line(int argc, VALUE *argv, VALUE self)
 {
     VALUE frame;
     debug_context_t *debug_context;
-    debug_frame_t *debug_frame;
-    rb_control_frame_t *cfp;
-    rb_control_frame_t *cfp_end;
     rb_thread_t *th;
+    rb_control_frame_t *cfp;
     VALUE *pc;
 
     debug_check_started();
@@ -1794,14 +1792,9 @@ context_frame_line(int argc, VALUE *argv, VALUE self)
     Data_Get_Struct(self, debug_context_t, debug_context);
     GetThreadPtr(context_thread_0(debug_context), th);
 
-    debug_frame = get_top_frame(debug_context);
-    if (debug_frame == NULL)
-        return(INT2FIX(0));
-
     pc = GET_FRAME->info.runtime.last_pc;
-    cfp_end = RUBY_VM_END_CONTROL_FRAME(th);
     cfp = GET_FRAME->info.runtime.cfp;
-    while (cfp > (rb_control_frame_t*)th->stack)
+    while (cfp > th->cfp)
     {
         if ((cfp->iseq != NULL) && (pc >= cfp->iseq->iseq_encoded) && (pc < cfp->iseq->iseq_encoded + cfp->iseq->iseq_size))
             return(INT2FIX(rb_vm_get_sourceline(cfp)));
@@ -1923,7 +1916,11 @@ context_copy_locals(debug_context_t *debug_context, debug_frame_t *debug_frame,
     {
         /* Note rb_iseq_disasm() is instructive in coming up with this code */
         for (i = 0; i < iseq->local_table_size; i++)
-            rb_hash_aset(hash, rb_id2str(iseq->local_table[i]), *(cfp->dfp - iseq->local_size + i));
+        {
+            VALUE str = rb_id2str(iseq->local_table[i]);
+            if (str != 0)
+                rb_hash_aset(hash, str, *(cfp->dfp - iseq->local_size + i));
+        }
     }
 
     iseq = cfp->block_iseq;
@@ -1937,7 +1934,11 @@ context_copy_locals(debug_context_t *debug_context, debug_frame_t *debug_frame,
             if (block_frame->iseq == cfp->block_iseq)
             {
                 for (i = 0; i < iseq->local_table_size; i++)
-                    rb_hash_aset(hash, rb_id2str(iseq->local_table[i]), *(block_frame->dfp - iseq->local_table_size + i - 1));
+                {
+                    VALUE str = rb_id2str(iseq->local_table[i]);
+                    if (str != 0)
+                        rb_hash_aset(hash, str, *(block_frame->dfp - iseq->local_table_size + i - 1));
+                }
                 return(hash);
             }
             block_frame = RUBY_VM_NEXT_CONTROL_FRAME(block_frame);
@@ -2363,11 +2364,10 @@ FUNC_FASTCALL(do_jump)(rb_thread_t *th, rb_control_frame_t *cfp)
  *   Returns +true+ if jump to +line+ in filename +file+ was successful.
  */
 static VALUE
-context_jump(int argc, VALUE *argv, VALUE self)
+context_jump(VALUE self, VALUE line, VALUE file)
 {
     debug_context_t *debug_context;
     debug_frame_t *debug_frame;
-    VALUE line, file;
     int i;
     rb_thread_t *th;
     rb_control_frame_t *cfp;
@@ -2382,10 +2382,6 @@ context_jump(int argc, VALUE *argv, VALUE self)
     if (debug_frame == NULL)
         rb_raise(rb_eRuntimeError, "No frames collected.");
 
-    if (argc != 2)
-        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
-    rb_scan_args(argc, argv, "2", &line, &file);
-
     line = FIX2INT(line);
 
     /* find topmost frame of the debugged code */
@@ -2476,7 +2472,7 @@ Init_context()
              context_breakpoint, 0);      /* in breakpoint.c */
     rb_define_method(cContext, "set_breakpoint", 
              context_set_breakpoint, -1); /* in breakpoint.c */
-    rb_define_method(cContext, "jump", context_jump, -1);
+    rb_define_method(cContext, "jump", context_jump, 2);
 }
 
 /*

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-debug-base19
 version: !ruby/object:Gem::Version 
-  version: 0.11.21
+  version: 0.11.22
 platform: ruby
 authors: 
 - Kent Sibilev
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 -07:00
+date: 2009-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency