ruby-debug 0.5.2-mswin32 → 0.6-mswin32

data/ext/tags

@@ -0,0 +1,90 @@
+CTX_FL_SET	ruby_debug.c	/^#define CTX_FL_SET(c,f) do { (c)->flags |= (f); } /
+CTX_FL_TEST	ruby_debug.c	/^#define CTX_FL_TEST(c,f) ((c)->flags & (f))$/
+CTX_FL_UNSET	ruby_debug.c	/^#define CTX_FL_UNSET(c,f) do { (c)->flags &= ~(f);/
+Init_breakpoint	ruby_debug.c	/^Init_breakpoint()$/
+Init_context	ruby_debug.c	/^Init_context()$/
+Init_frame	ruby_debug.c	/^Init_frame()$/
+Init_ruby_debug	ruby_debug.c	/^Init_ruby_debug()$/
+VALUE	ruby_debug.c	/^    typedef VALUE (*bind_func_t)(VALUE);$/
+add_to_locked	ruby_debug.c	/^add_to_locked(VALUE thread)$/
+basename	ruby_debug.c	/^basename(VALUE filename)$/
+breakpoint_expr	ruby_debug.c	/^breakpoint_expr(VALUE self)$/
+breakpoint_id	ruby_debug.c	/^breakpoint_id(VALUE self)$/
+breakpoint_mark	ruby_debug.c	/^breakpoint_mark(void *data)$/
+breakpoint_pos	ruby_debug.c	/^breakpoint_pos(VALUE self)$/
+breakpoint_source	ruby_debug.c	/^breakpoint_source(VALUE self)$/
+call_at_line	ruby_debug.c	/^call_at_line(VALUE context, int thnum, VALUE bindi/
+call_at_line_unprotected	ruby_debug.c	/^call_at_line_unprotected(VALUE args)$/
+check_breakpoint_expression	ruby_debug.c	/^check_breakpoint_expression(VALUE breakpoint, VALU/
+check_breakpoints	ruby_debug.c	/^check_breakpoints(debug_context_t *debug_context, /
+classname_cmp	ruby_debug.c	/^classname_cmp(debug_breakpoint_t *debug_breakpoint/
+context_frames	ruby_debug.c	/^context_frames(VALUE self)$/
+context_ignore	ruby_debug.c	/^context_ignore(VALUE self)$/
+context_resume	ruby_debug.c	/^context_resume(VALUE self)$/
+context_set_ignore	ruby_debug.c	/^context_set_ignore(VALUE self, VALUE value)$/
+context_set_tracing	ruby_debug.c	/^context_set_tracing(VALUE self, VALUE value)$/
+context_step_over	ruby_debug.c	/^context_step_over(int argc, VALUE *argv, VALUE sel/
+context_stop_frame	ruby_debug.c	/^context_stop_frame(VALUE self, VALUE frame)$/
+context_stop_next	ruby_debug.c	/^context_stop_next(VALUE self, VALUE steps)$/
+context_suspend	ruby_debug.c	/^context_suspend(VALUE self)$/
+context_thnum	ruby_debug.c	/^context_thnum(VALUE self)$/
+context_thread	ruby_debug.c	/^context_thread(VALUE self)$/
+context_tracing	ruby_debug.c	/^context_tracing(VALUE self)$/
+create_binding	ruby_debug.c	/^create_binding(VALUE self)$/
+debug_add_breakpoint	ruby_debug.c	/^debug_add_breakpoint(int argc, VALUE *argv, VALUE /
+debug_at_exit	ruby_debug.c	/^debug_at_exit(VALUE self)$/
+debug_at_exit_c	ruby_debug.c	/^debug_at_exit_c(VALUE proc)$/
+debug_at_exit_i	ruby_debug.c	/^debug_at_exit_i(VALUE proc)$/
+debug_breakpoint_t	ruby_debug.c	/^} debug_breakpoint_t;$/
+debug_breakpoints	ruby_debug.c	/^debug_breakpoints(VALUE self)$/
+debug_catchpoint	ruby_debug.c	/^debug_catchpoint(VALUE self)$/
+debug_check_started	ruby_debug.c	/^debug_check_started()$/
+debug_context_create	ruby_debug.c	/^debug_context_create(VALUE thread)$/
+debug_context_mark	ruby_debug.c	/^debug_context_mark(void* data)$/
+debug_context_t	ruby_debug.c	/^} debug_context_t;$/
+debug_contexts	ruby_debug.c	/^debug_contexts(VALUE self)$/
+debug_current_context	ruby_debug.c	/^debug_current_context(VALUE self)$/
+debug_debug_load	ruby_debug.c	/^debug_debug_load(VALUE self, VALUE file)$/
+debug_event_hook	ruby_debug.c	/^debug_event_hook(rb_event_t event, NODE *node, VAL/
+debug_frame_create	ruby_debug.c	/^debug_frame_create(VALUE file, VALUE line, VALUE b/
+debug_frame_mark	ruby_debug.c	/^debug_frame_mark(void *data)$/
+debug_frame_t	ruby_debug.c	/^} debug_frame_t;$/
+debug_is_started	ruby_debug.c	/^debug_is_started(VALUE self)$/
+debug_last_interrupted	ruby_debug.c	/^debug_last_interrupted(VALUE self)$/
+debug_post_mortem	ruby_debug.c	/^debug_post_mortem(VALUE self)$/
+debug_remove_breakpoint	ruby_debug.c	/^debug_remove_breakpoint(VALUE self, VALUE id_value/
+debug_resume	ruby_debug.c	/^debug_resume(VALUE self)$/
+debug_set_catchpoint	ruby_debug.c	/^debug_set_catchpoint(VALUE self, VALUE value)$/
+debug_set_post_mortem	ruby_debug.c	/^debug_set_post_mortem(VALUE self, VALUE value)$/
+debug_set_tracing	ruby_debug.c	/^debug_set_tracing(VALUE self, VALUE value)$/
+debug_skip	ruby_debug.c	/^debug_skip(VALUE self)$/
+debug_start	ruby_debug.c	/^debug_start(VALUE self)$/
+debug_stop	ruby_debug.c	/^debug_stop(VALUE self)$/
+debug_stop_i	ruby_debug.c	/^debug_stop_i(VALUE self)$/
+debug_suspend	ruby_debug.c	/^debug_suspend(VALUE self)$/
+debug_tracing	ruby_debug.c	/^debug_tracing(VALUE self)$/
+eval_expression	ruby_debug.c	/^eval_expression(VALUE args)$/
+filename_cmp	ruby_debug.c	/^filename_cmp(debug_breakpoint_t *debug_breakpoint,/
+find_last_context_func	ruby_debug.c	/^find_last_context_func(VALUE key, VALUE value, VAL/
+frame_binding	ruby_debug.c	/^frame_binding(VALUE self)$/
+frame_file	ruby_debug.c	/^frame_file(VALUE self)$/
+frame_id	ruby_debug.c	/^frame_id(VALUE self)$/
+frame_line	ruby_debug.c	/^frame_line(VALUE self)$/
+get_breakpoint_at	ruby_debug.c	/^get_breakpoint_at(int index) $/
+is_in_locked	ruby_debug.c	/^is_in_locked(VALUE thread)$/
+locked_thread_t	ruby_debug.c	/^} locked_thread_t;$/
+remove_from_locked	ruby_debug.c	/^remove_from_locked()$/
+save_call_frame	ruby_debug.c	/^save_call_frame(VALUE self, VALUE file, VALUE line/
+save_current_position	ruby_debug.c	/^save_current_position(VALUE context)$/
+set_current_skipped_status	ruby_debug.c	/^set_current_skipped_status(VALUE status)$/
+set_frame_source	ruby_debug.c	/^set_frame_source(debug_context_t *debug_context, V/
+thread_cmp	ruby_debug.c	/^thread_cmp(VALUE a, VALUE b)$/
+thread_context_lookup	ruby_debug.c	/^thread_context_lookup(VALUE thread)$/
+thread_hash	ruby_debug.c	/^thread_hash(VALUE thread)$/
+threads_table_clear	ruby_debug.c	/^threads_table_clear(VALUE table)$/
+threads_table_clear_i	ruby_debug.c	/^threads_table_clear_i(VALUE key, VALUE value, VALU/
+threads_table_create	ruby_debug.c	/^threads_table_create()$/
+threads_table_free	ruby_debug.c	/^threads_table_free(void* data)$/
+threads_table_mark	ruby_debug.c	/^threads_table_mark(void* data)$/
+threads_table_mark_keyvalue	ruby_debug.c	/^threads_table_mark_keyvalue(VALUE key, VALUE value/
+threads_table_t	ruby_debug.c	/^} threads_table_t;$/

data/lib/ruby-debug.rb

@@ -36,8 +36,8 @@ module Debugger
       processor.at_tracing(self, file, line)
     end
 
-    def at_line(file, line, binding)
-      processor.at_line(self, file, line, binding)
+    def at_line(file, line)
+      processor.at_line(self, file, line)
     end
   end
 
@@ -77,7 +77,7 @@ module Debugger
     def interface=(value) # :nodoc:
       processor.interface = value
     end
-    
+
     #
     # Starts a remote debugger.
     #
@@ -170,7 +170,7 @@ module Debugger
     private :stop_main_thread
 
     def source_for(file) # :nodoc:
-      Dir.chdir File.dirname($0) do
+      finder = lambda do
         unless File.exists?(file)
           return (SCRIPT_LINES__[file] == true ? nil : SCRIPT_LINES__[file])
         end
@@ -187,6 +187,7 @@ module Debugger
 
         SCRIPT_LINES__[file]
       end
+      Dir.chdir(File.dirname($0)){finder.call} || finder.call
     end
     
     def source_reload
@@ -256,7 +257,12 @@ module Debugger
     end
     
     def handle_post_mortem(exp)
-      processor.at_line(nil, exp.__debug_file, exp.__debug_line, exp.__debug_binding, exp.__debug_frames)
+      return if exp.__debug_frames.empty?
+      orig_tracing = Debugger.tracing, Debugger.current_context.tracing
+      Debugger.tracing = Debugger.current_context.tracing = false
+      processor.at_line(nil, exp.__debug_file, exp.__debug_line, exp.__debug_frames)
+    ensure
+      Debugger.tracing, Debugger.current_context.tracing = orig_tracing
     end
     private :handle_post_mortem
   end
@@ -301,4 +307,22 @@ class Module
     end
     EOD
   end
+  
+  #
+  # Wraps the +meth+ method with Debugger.post_mortem {...} block.
+  #
+  def post_mortem_method(meth)
+    old_meth = "__postmortem_#{meth}"
+    old_meth = "#{$1}_set" if old_meth =~ /^(.+)=$/
+    alias_method old_meth.to_sym, meth
+    class_eval <<-EOD
+    def #{meth}(*args, &block)
+      Debugger.start do |dbg|
+        dbg.post_mortem do
+          #{old_meth}(*args, &block)
+        end
+      end
+    end
+    EOD
+  end
 end

data/lib/ruby-debug/command.rb

@@ -62,11 +62,15 @@ module Debugger
       @state.confirm(msg) == 'y'
     end
 
-    def debug_eval(str)
+    def debug_eval(str, b = @state.binding)
+      unless b
+        print "Can't evaluate in the current context.\n"
+        throw :debug_error
+      end
       begin
-        val = eval(str, @state.binding)
+        val = eval(str, b)
       rescue StandardError, ScriptError => e
-        at = eval("caller(1)", @state.binding)
+        at = eval("caller(1)", b)
         print "%s:%s\n", at.shift, e.to_s.sub(/\(eval\):1:(in `.*?':)?/, '')
         for i in at
           print "\tfrom %s\n", i
@@ -76,6 +80,7 @@ module Debugger
     end
 
     def debug_silent_eval(str)
+      return nil unless @state.binding
       begin
         eval(str, @state.binding)
       rescue StandardError, ScriptError

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

@@ -46,8 +46,8 @@ module Debugger
         pos = pos.intern.id2name
       end
       
-      Debugger.add_breakpoint file, pos, expr
-      print "Set breakpoint %d at %s:%s\n", Debugger.breakpoints.size, file, pos.to_s
+      b = Debugger.add_breakpoint file, pos, expr
+      print "Set breakpoint %d at %s:%s\n", b.id, file, pos.to_s
     end
 
     class << self
@@ -74,11 +74,11 @@ module Debugger
     def execute
       unless Debugger.breakpoints.empty?
         print "Breakpoints:\n"
-        Debugger.breakpoints.each_with_index do |b, n|
+        Debugger.breakpoints.sort_by{|b| b.id }.each do |b|
           if b.expr.nil?
-            print "  %d %s:%s\n", n+1, b.source, b.pos
+            print "  %d %s:%s\n", b.id, b.source, b.pos
           else
-            print "  %d %s:%s if %s\n", n+1, b.source, b.pos, b.expr
+            print "  %d %s:%s if %s\n", b.id, b.source, b.pos, b.expr
           end
         end
         print "\n"
@@ -115,7 +115,7 @@ module Debugger
         end
       else
         pos = pos.to_i
-        unless Debugger.breakpoints.delete_at(pos-1)
+        unless Debugger.remove_breakpoint(pos)
           print "Breakpoint %d is not defined\n", pos
         end
       end

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

@@ -35,7 +35,11 @@ module Debugger
     def execute
       unless @state.interface.kind_of?(LocalInterface)
         print "Command is available only in local mode.\n"
-        return
+        throw :debug_error
+      end
+      unless @state.binding
+        print "Can't evaluate in the current context.\n"
+        throw :debug_error
       end
       IRB.start_session(@state.binding)
     end

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

@@ -1,10 +1,17 @@
 module Debugger
   module VarFunctions # :nodoc:
-    def var_list(ary, bind = nil)
-      bind ||= @state.binding
+    def var_list(ary, bind = @state.binding)
       ary.sort!
       for v in ary
-        print "  %s => %s\n", v, eval(v, bind).inspect
+        print "  %s => %s\n", v, debug_eval(v, bind).inspect
+      end
+    end
+    
+    def var_consts(mod)
+      constants = mod.constants
+      constants.sort!
+      for c in constants
+        print " %s => %s\n", c, mod.const_get(c)
       end
     end
   end
@@ -21,7 +28,7 @@ module Debugger
       unless obj.kind_of? Module
         print "Should be Class/Module: %s\n", @match.post_match
       else
-        var_list(obj.constants, obj.module_eval{binding()})
+        var_consts(obj)
       end
     end
 
@@ -95,7 +102,7 @@ module Debugger
     end
 
     def execute
-      var_list(eval("local_variables", @state.binding))
+      var_list(debug_eval("local_variables"))
     end
 
     class << self

data/lib/ruby-debug/interface.rb

@@ -89,7 +89,7 @@ module Debugger
   
   class ScriptInterface # :nodoc:
     def initialize(file, out)
-      @file = open(file)
+      @file = file.respond_to?(:gets) ? file : open(file)
       @out = out
     end
     

data/lib/ruby-debug/processor.rb

@@ -11,6 +11,7 @@ module Debugger
       @display = []
       @mutex = Mutex.new
       @last_cmd = nil
+      @actions = []
     end
     
     def interface=(interface)
@@ -61,12 +62,12 @@ module Debugger
     end
     protect :at_tracing
 
-    def at_line(context, file, line, binding, frames = context.frames)
+    def at_line(context, file, line, frames = context.frames)
       print "%s:%d: %s", file, line, Debugger.line_at(file, line)
-      process_commands(context, file, line, binding, frames)
+      process_commands(context, file, line, frames)
     end
     protect :at_line
-
+    
     private
     
     def print(*args)
@@ -81,13 +82,13 @@ module Debugger
       end
     end
     
-    def process_commands(context, file, line, binding, frames)
+    def process_commands(context, file, line, frames)
       event_cmds = Command.commands.select{|cmd| cmd.event }
       state = State.new do |s|
         s.context = context
         s.file    = file
         s.line    = line
-        s.binding = binding
+        s.binding = frames.first.binding
         s.display = display
         s.interface = interface
         s.commands = event_cmds
@@ -106,18 +107,20 @@ module Debugger
             @last_cmd = input
           end
           
-          if cmd = commands.find{ |c| c.match(input) }
-            if context.nil? && cmd.class.need_context
-              print "Command is unavailable\n"
-            else
-              cmd.execute
-            end
-          else
-            unknown_cmd = commands.find{|cmd| cmd.class.unknown }
-            if unknown_cmd
-              unknown_cmd.execute
+          input.split(";").each do |input|
+            if cmd = commands.find{ |c| c.match(input) }
+              if context.nil? && cmd.class.need_context
+                print "Command is unavailable\n"
+              else
+                cmd.execute
+              end
             else
-              print "Unknown command\n"
+              unknown_cmd = commands.find{|cmd| cmd.class.unknown }
+              if unknown_cmd
+                unknown_cmd.execute
+              else
+                print "Unknown command\n"
+              end
             end
           end
         end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.1
 specification_version: 1
 name: ruby-debug
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
-date: 2006-12-21 16:17:18 -05:00
+  version: "0.6"
+date: 2007-01-26 15:22:44 -05:00
 summary: Fast Ruby debugger
 require_paths: 
 - lib
@@ -57,6 +57,7 @@ files:
 - lib/ruby-debug/commands/variables.rb
 - ext/extconf.rb
 - ext/ruby_debug.c
+- ext/tags
 - ext/win32
 - bin/rdebug
 - lib/ruby_debug.so