ruby-debug-base 0.9 → 0.9.1

data/CHANGES

@@ -1,3 +1,11 @@
+0.9.1
+- Fixed incorrent stack calculation.
+- Context#stop_next= method aliased as Context#step.
+- Added the 'force' parameter to Context#step_over.
+- Added the 'force' parameter to Context#step.
+- 'next+/step+' commands forces to move to another line
+- Added a new 'forcestep' setting.
+
 0.9
 - Kernel#debugger method will start the debugger if it's not running.
 - Added Context#stop_reason method.

data/ext/ruby_debug.c

@@ -4,7 +4,7 @@
 #include <rubysig.h>
 #include <st.h>
 
-#define DEBUG_VERSION "0.9"
+#define DEBUG_VERSION "0.9.1"
 
 #ifdef _WIN32
 struct FRAME {
@@ -50,15 +50,12 @@ RUBY_EXTERN struct RVarmap *ruby_dyna_vars;
 #define CTX_FL_WAS_RUNNING  (1<<6)
 #define CTX_FL_MOVED        (1<<7)
 #define CTX_FL_STEPPED      (1<<8)
+#define CTX_FL_FORCE_MOVE   (1<<9)
 
 #define CTX_FL_TEST(c,f)  ((c)->flags & (f))
 #define CTX_FL_SET(c,f)   do { (c)->flags |= (f); } while (0)
 #define CTX_FL_UNSET(c,f) do { (c)->flags &= ~(f); } while (0)
 
-#define DID_MOVED   (debug_context->last_line != line || \
-                          debug_context->last_file == NULL || \
-                          strcmp(debug_context->last_file, file) != 0)
-
 #define IS_STARTED  (threads_tbl != Qnil)
 #define FRAME_N(n)  (&debug_context->frames[debug_context->stack_size-(n)-1])
 #define GET_FRAME   (FRAME_N(check_frame_number(debug_context, frame)))
@@ -768,6 +765,7 @@ save_current_position(debug_context_t *debug_context)
     debug_context->last_line = debug_frame->line;
     CTX_FL_UNSET(debug_context, CTX_FL_MOVED);
     CTX_FL_UNSET(debug_context, CTX_FL_STEPPED);
+    CTX_FL_UNSET(debug_context, CTX_FL_FORCE_MOVE);
 }
 
 inline static char *
@@ -811,7 +809,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
     VALUE breakpoint = Qnil, binding = Qnil;
     debug_context_t *debug_context;
     char *file = NULL;
-    int line = 0;
+    int line = 0, moved = 0;
 
     hook_count++;
 
@@ -862,15 +860,24 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
       if(debug == Qtrue)
           fprintf(stderr, "%s:%d [%s] %s\n", file, line, get_event_name(event), rb_id2name(mid));
 
-      if(DID_MOVED)
+      if(debug_context->last_line != line || debug_context->last_file == NULL ||
+          strcmp(debug_context->last_file, file) != 0)
+      {
           CTX_FL_SET(debug_context, CTX_FL_MOVED);
+          moved = 1;
+      }
     }
     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));
+            fprintf(stderr, "nodeless [%s] %s\n", get_event_name(event), rb_id2name(mid));
         goto cleanup;
     }
+    else
+    {
+        if(debug == Qtrue)
+            fprintf(stderr, "nodeless [%s] %s\n", get_event_name(event), rb_id2name(mid));
+    }
     
     if(event != RUBY_EVENT_LINE)
         CTX_FL_SET(debug_context, CTX_FL_STEPPED);
@@ -895,10 +902,12 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
         if(debug_context->dest_frame == -1 ||
             debug_context->stack_size == debug_context->dest_frame)
         {
-            debug_context->stop_next--;
+            if(moved || !CTX_FL_TEST(debug_context, CTX_FL_FORCE_MOVE))
+                debug_context->stop_next--;
             if(debug_context->stop_next < 0)
                 debug_context->stop_next = -1;
-            if(CTX_FL_TEST(debug_context, CTX_FL_STEPPED) || CTX_FL_TEST(debug_context, CTX_FL_MOVED))
+            if(moved || (CTX_FL_TEST(debug_context, CTX_FL_STEPPED) && 
+                        !CTX_FL_TEST(debug_context, CTX_FL_FORCE_MOVE)))
             {
                 debug_context->stop_line--;
                 CTX_FL_UNSET(debug_context, CTX_FL_STEPPED);
@@ -978,7 +987,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
     case RUBY_EVENT_C_RETURN:
     {
         /* note if a block is given we fall through! */
-        if(!c_call_new_frame_p(klass, mid))
+        if(!node || !c_call_new_frame_p(klass, mid))
             break;
     }
     case RUBY_EVENT_RETURN:
@@ -1662,34 +1671,45 @@ debug_at_exit(VALUE self)
 
 /*
  *   call-seq:
- *      context.stop_next = steps
+ *      context.step(steps, force = false)
  *
- *   Stops the current context after a number +steps+ are made.
+ *   Stops the current context after a number of +steps+ are made.
+ *   +force+ parameter (if true) ensures that the cursor moves from the current line.
  */
 static VALUE
-context_stop_next(VALUE self, VALUE steps)
+context_stop_next(int argc, VALUE *argv, VALUE self)
 {
+    VALUE steps, force;
     debug_context_t *debug_context;
 
     debug_check_started();
-    Data_Get_Struct(self, debug_context_t, debug_context);
+
+    rb_scan_args(argc, argv, "11", &steps, &force);
     if(FIX2INT(steps) < 0)
         rb_raise(rb_eRuntimeError, "Steps argument can't be negative.");
+
+    Data_Get_Struct(self, debug_context_t, debug_context);
     debug_context->stop_next = FIX2INT(steps);
+    if(RTEST(force))
+        CTX_FL_SET(debug_context, CTX_FL_FORCE_MOVE);
+    else
+        CTX_FL_UNSET(debug_context, CTX_FL_FORCE_MOVE);
 
     return steps;
 }
 
 /*
  *   call-seq:
- *      context.step_over(steps)
+ *      context.step_over(steps, frame = nil, force = false)
  *
  *   Steps over a +steps+ number of times.
+ *   Make step over operation on +frame+, by default the current frame.
+ *   +force+ parameter (if true) ensures that the cursor moves from the current line.
  */
 static VALUE
 context_step_over(int argc, VALUE *argv, VALUE self)
 {
-    VALUE lines, frame;
+    VALUE lines, frame, force;
     debug_context_t *debug_context;
 
     debug_check_started();
@@ -1697,10 +1717,10 @@ context_step_over(int argc, VALUE *argv, VALUE self)
     if(debug_context->stack_size == 0)
         rb_raise(rb_eRuntimeError, "No frames collected.");
 
-    rb_scan_args(argc, argv, "11", &lines, &frame);
+    rb_scan_args(argc, argv, "12", &lines, &frame, &force);
     debug_context->stop_line = FIX2INT(lines);
     CTX_FL_UNSET(debug_context, CTX_FL_STEPPED);
-    if(argc == 1)
+    if(frame == Qnil)
     {
         debug_context->dest_frame = debug_context->stack_size;
     }
@@ -1710,6 +1730,10 @@ context_step_over(int argc, VALUE *argv, VALUE self)
             rb_raise(rb_eRuntimeError, "Destination frame is out of range.");
         debug_context->dest_frame = debug_context->stack_size - FIX2INT(frame);
     }
+    if(RTEST(force))
+        CTX_FL_SET(debug_context, CTX_FL_FORCE_MOVE);
+    else
+        CTX_FL_UNSET(debug_context, CTX_FL_FORCE_MOVE);
 
     return Qnil;
 }
@@ -2281,7 +2305,8 @@ static void
 Init_context()
 {
     cContext = rb_define_class_under(mDebugger, "Context", rb_cObject);
-    rb_define_method(cContext, "stop_next=", context_stop_next, 1);
+    rb_define_method(cContext, "stop_next=", context_stop_next, -1);
+    rb_define_method(cContext, "step", context_stop_next, -1);
     rb_define_method(cContext, "step_over", context_step_over, -1);
     rb_define_method(cContext, "stop_frame=", context_stop_frame, 1);
     rb_define_method(cContext, "thread", context_thread, 0);

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ruby-debug-base
 version: !ruby/object:Gem::Version 
-  version: "0.9"
-date: 2007-04-01 12:48:34 -04:00
+  version: 0.9.1
+date: 2007-04-02 21:55:54 -04:00
 summary: Fast Ruby debugger
 require_paths: 
 - lib