ruby-debug 0.7.3-mswin32 → 0.7.4-mswin32

data/CHANGES

@@ -1,3 +1,9 @@
+0.7.4
+- Added a workaround of the Ruby interpreter problem where a method created with Module#define_method 
+  and which raises an exception doesn't trigger a :return event, this way screwing the stack trace.
+- Fixed a situation of an array 'out of bounds' access.
+- Fixed the help for 'where' command.
+
 0.7.3
 - Fixed a case when a frame is not popped up properly.
 - Removed Context.ignore= method, since it can result with the segmentation fault error.
@@ -5,7 +11,7 @@
 - Fixed several cases of seg faults when accessing dyna_vars structure.
 
 0.7.2
-- Fixed Context#resume (a thread should be waked up only when it was running when it wsa suspened).
+- Fixed Context#resume (a thread should be waked up only when it was running when it was suspended).
 - When handling post-mortem exception, all threads must be suspended.
 
 0.7.1

data/ext/ruby_debug.c

@@ -4,7 +4,7 @@
 #include <rubysig.h>
 #include <st.h>
 
-#define DEBUG_VERSION "0.7.3"
+#define DEBUG_VERSION "0.7.4"
 
 #ifdef _WIN32
 struct FRAME {
@@ -71,6 +71,7 @@ RUBY_EXTERN struct RVarmap *ruby_dyna_vars;
 typedef struct {
     VALUE binding;
     ID id;
+    ID orig_id;
     int line;
     const char * file;
     short dead;
@@ -127,6 +128,7 @@ static VALUE tracing            = Qfalse;
 static VALUE locker             = Qnil;
 static VALUE post_mortem        = Qfalse;
 static VALUE keep_frame_binding = Qfalse;
+static VALUE debug              = Qfalse;
 
 static VALUE last_context = Qnil;
 static VALUE last_thread  = Qnil;
@@ -523,6 +525,7 @@ save_call_frame(rb_event_t event, VALUE self, char *file, int line, ID mid, debu
     debug_frame->line = line;
     debug_frame->binding = binding;
     debug_frame->id = mid;
+    debug_frame->orig_id = mid;
     debug_frame->dead = 0;
     debug_frame->self = self;
     debug_frame->info.runtime.frame = ruby_frame;
@@ -683,7 +686,7 @@ save_top_binding(debug_context_t *debug_context, VALUE binding)
 }
 
 inline static void
-set_frame_source(rb_event_t event, debug_context_t *debug_context, VALUE self, char *file, int line)
+set_frame_source(rb_event_t event, debug_context_t *debug_context, VALUE self, char *file, int line, ID mid)
 {
     debug_frame_t *top_frame;
     top_frame = get_top_frame(debug_context);
@@ -692,6 +695,7 @@ set_frame_source(rb_event_t event, debug_context_t *debug_context, VALUE self, c
         top_frame->self = self;
         top_frame->file = file;
         top_frame->line = line;
+        top_frame->id   = mid;
         top_frame->info.runtime.dyna_vars = event == RUBY_EVENT_C_CALL ? NULL : ruby_dyna_vars;
     }
 }
@@ -747,7 +751,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
     hook_count++;
 
     if (mid == ID_ALLOCATOR) return;
-
+    
     thread = rb_thread_current();
     thread_context_lookup(thread, &context, &debug_context);
 
@@ -785,23 +789,29 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
     /* ignore a skipped section of code */
     if(CTX_FL_TEST(debug_context, CTX_FL_SKIPPED)) goto cleanup;
 
-    if(!node && !(event == RUBY_EVENT_RETURN || event == RUBY_EVENT_C_RETURN))
-      goto cleanup;
-
     if(node)
     {
       file = node->nd_file;
       line = nd_line(node);
-    }
+      
+      if(debug == Qtrue)
+          fprintf(stderr, "%s:%d [%s] %s\n", file, line, get_event_name(event), rb_id2name(mid));
 
-    if(DID_MOVED)
-        CTX_FL_SET(debug_context, CTX_FL_MOVED);
+      if(DID_MOVED)
+          CTX_FL_SET(debug_context, CTX_FL_MOVED);
+    }
+    else if(event != RUBY_EVENT_RETURN && event != RUBY_EVENT_C_RETURN)
+    {
+        if(debug == Qtrue)
+            fprintf(stderr, "return [%s] %s\n", get_event_name(event), rb_id2name(mid));
+        goto cleanup;
+    }
 
     switch(event)
     {
     case RUBY_EVENT_LINE:
     {
-        set_frame_source(event, debug_context, self, file, line);
+        set_frame_source(event, debug_context, self, file, line, mid);
 
         if(RTEST(tracing) || CTX_FL_TEST(debug_context, CTX_FL_TRACING))
             rb_funcall(context, idAtTracing, 2, rb_str_new2(file), INT2FIX(line));
@@ -850,7 +860,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
     }
     case RUBY_EVENT_C_CALL:
     {
-        set_frame_source(event, debug_context, self, file, line);
+        set_frame_source(event, debug_context, self, file, line, mid);
         break;
     }
     case RUBY_EVENT_CALL:
@@ -883,8 +893,12 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
             debug_context->stop_next = 1;
             debug_context->stop_frame = 0;
         }
-        if(debug_context->stack_size > 0)
+        while(debug_context->stack_size > 0)
+        {
             debug_context->stack_size--;
+            if(debug_context->frames[debug_context->stack_size].orig_id == mid)
+                break;
+        }
         break;
     }
     case RUBY_EVENT_CLASS:
@@ -898,7 +912,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
         VALUE expn_class, aclass;
         int i;
 
-        set_frame_source(event, debug_context, self, file, line);
+        set_frame_source(event, debug_context, self, file, line, mid);
 
         if(post_mortem == Qtrue && self)
         {
@@ -1423,6 +1437,19 @@ debug_set_keep_frame_binding(VALUE self, VALUE value)
     return value;
 }
 
+static VALUE
+debug_debug(VALUE self)
+{
+    return debug;
+}
+
+static VALUE
+debug_set_debug(VALUE self, VALUE value)
+{
+    debug = RTEST(value) ? Qtrue : Qfalse;
+    return value;
+}
+
 static VALUE
 debug_thread_inherited(VALUE klass)
 {
@@ -2111,6 +2138,8 @@ Init_ruby_debug()
     rb_define_module_function(mDebugger, "post_mortem=", debug_set_post_mortem, 1);
     rb_define_module_function(mDebugger, "keep_frame_binding?", debug_keep_frame_binding, 0);
     rb_define_module_function(mDebugger, "keep_frame_binding=", debug_set_keep_frame_binding, 1);
+    rb_define_module_function(mDebugger, "debug", debug_debug, 0);
+    rb_define_module_function(mDebugger, "debug=", debug_set_debug, 1);
 
     cThreadsTable = rb_define_class_under(mDebugger, "ThreadsTable", rb_cObject);
 

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

@@ -26,7 +26,7 @@ module Debugger
       @state.file = @state.context.frame_file(@state.frame_pos)
       @state.line = @state.context.frame_line(@state.frame_pos)
       
-      print format_frame(@state.frame_pos)
+      print_frame(@state.frame_pos, true)
     end
 
     def get_int(str, cmd)
@@ -38,10 +38,10 @@ module Debugger
       end
     end
 
-    def format_frame(pos)
-      printf "\032\032" if ENV['EMACS']
+    def print_frame(pos, adjust = false)
       file, line, id = @state.context.frame_file(pos), @state.context.frame_line(pos), @state.context.frame_id(pos)
-      "#%d %s:%s%s\n" % [pos, file, line, (id ? ":in `#{id.id2name}'" : "")]
+      print "#%d %s:%d%s\n", pos, file, line, id ? " in `#{id.id2name}'" : ""
+      print "\032\032%s:%d\n", file, line if ENV['EMACS'] && adjust
     end
   end
 
@@ -59,13 +59,13 @@ module Debugger
         else
           print "    "
         end
-        print format_frame(idx)
+        print_frame(idx)
       end
     end
 
     class << self
       def help_command
-        %w|where frame|
+        %w|where backtrace|
       end
 
       def help(cmd)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: ruby-debug
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
-date: 2007-02-04 20:33:00 -05:00
+  version: 0.7.4
+date: 2007-02-05 17:50:34 -05:00
 summary: Fast Ruby debugger
 require_paths: 
 - lib