ruby-debug 0.10.0 → 0.10.1

data/cli/ruby-debug/commands/display.rb

@@ -95,7 +95,7 @@ module Debugger
         if @state.display[pos-1]
           @state.display[pos-1][0] = nil
         else
-          print "Display expression %d is not defined\n", pos
+          errmsg "Display expression %d is not defined.\n", pos
         end
       end
     end

data/cli/ruby-debug/commands/edit.rb

@@ -0,0 +1,48 @@
+module Debugger
+  class Edit < Command # :nodoc:
+    self.allow_in_control = true
+    def regexp
+      /^\s* ed(?:it)? (?:\s+(.*))?$/ix
+    end
+    
+    def execute
+      if not @match[1] or @match[1].strip.empty?
+        unless @state.context
+          errmsg "We are not in a state that has an associated file.\n"
+          return 
+        end
+        file = @state.file
+        line_number = @state.line
+      elsif @pos_match = /([^:]+)[:]([0-9]+)/.match(@match[1])
+        file, line_number = @pos_match.captures
+      else
+        errmsg "Invalid file/line number specification: #{@match[1]}\n"
+        return
+      end
+      editor = ENV['EDITOR'] || 'ex'
+      if File.readable?(file)
+        system("#{editor} +#{line_number} #{file}")
+      else
+        errmsg "File \"#{file}\" is not readable.\n"
+      end
+    end
+    
+    class << self
+      def help_command
+        'edit'
+      end
+
+      def help(cmd)
+        %{
+          Edit specified file.
+
+With no argument, edits file containing most recent line listed.
+Editing targets can also be specified in this:
+  FILE:LINENUM, to edit at that line in that file,
+        }
+      end
+    end
+  end
+
+
+end # module Debugger

data/cli/ruby-debug/commands/enable.rb

@@ -3,9 +3,11 @@ module Debugger
   module EnableDisableFunctions # :nodoc:
     def enable_disable_breakpoints(is_enable, args)
       breakpoints = Debugger.breakpoints.sort_by{|b| b.id }
-      largest = breakpoints.inject(0){|largest, b| largest = b.id if b.id > largest}
+      largest = breakpoints.inject(0) do |largest, b| 
+        largest = b.id if b.id > largest
+      end
       if 0 == largest
-        print "No breakpoints have been set.\n"
+        errmsg "No breakpoints have been set.\n"
         return
       end
       args.each do |pos|
@@ -13,14 +15,25 @@ module Debugger
         return nil unless pos
         breakpoints.each do |b|
           if b.id == pos 
+            enabled = ("Enable" == is_enable)
+            if enabled
+              unless syntax_valid?(b.expr)
+                errmsg("Expression \"#{b.expr}\" syntactically incorrect; breakpoint remains disabled.\n")
+                break
+              end
+            end
             b.enabled = ("Enable" == is_enable)
-            return
+            break
           end
         end
       end
     end
 
     def enable_disable_display(is_enable, args)
+      if 0 == @state.display.size 
+        errmsg "No display expressions have been set.\n"
+        return
+      end
       args.each do |pos|
         pos = get_int(pos, "#{is_enable} display", 1, @state.display.size)
         return nil unless pos
@@ -31,14 +44,18 @@ module Debugger
   end
 
   class EnableCommand < Command # :nodoc:
-    SubcmdStruct=Struct.new(:name, :min, :short_help) unless
-      defined?(SubcmdStruct)
     Subcommands = 
       [
-       ['breakpoints', 2, "Enable specified breakpoints"],
-       ['display', 2, "Enable some expressions to be displayed when program stops"],
-      ].map do |name, min, short_help| 
-      SubcmdStruct.new(name, min, short_help)
+       ['breakpoints', 2, "Enable specified breakpoints",
+"Give breakpoint numbers (separated by spaces) as arguments.
+This is used to cancel the effect of the \"disable\" command."
+       ],
+       ['display', 2, 
+        "Enable some expressions to be displayed when program stops",
+"Arguments are the code numbers of the expressions to resume displaying.
+Do \"info display\" to see current list of code numbers."],
+      ].map do |name, min, short_help, long_help| 
+      SubcmdStruct.new(name, min, short_help, long_help)
     end unless defined?(Subcommands)
 
     def regexp
@@ -47,19 +64,17 @@ module Debugger
     
     def execute
       if not @match[1]
-        print "\"enable\" must be followed \"display\", \"breakpoints\"" +
+        errmsg "\"enable\" must be followed \"display\", \"breakpoints\"" +
           " or breakpoint numbers.\n"
       else
         args = @match[1].split(/[ \t]+/)
-        subcmd = args.shift.downcase
-        for try_subcmd in Subcommands do
-          if (subcmd.size >= try_subcmd.min) and
-              (try_subcmd.name[0..subcmd.size-1] == subcmd)
-            send("enable_#{try_subcmd.name}", args)
-            return
-          end
+        param = args.shift
+        subcmd = find(Subcommands, param)
+        if subcmd
+          send("enable_#{subcmd.name}", args)
+        else
+          send("enable_breakpoints", args.unshift(param))
         end
-        send("enable_breakpoints", args.unshift(subcmd))
       end
     end
     
@@ -76,7 +91,21 @@ module Debugger
         'enable'
       end
 
-      def help(cmd)
+      def help(args)
+        if args[1] 
+          s = args[1]
+          subcmd = Subcommands.find do |try_subcmd| 
+            (s.size >= try_subcmd.min) and
+              (try_subcmd.name[0..s.size-1] == s)
+          end
+          if subcmd
+            str = subcmd.short_help + '.'
+            str += "\n" + subcmd.long_help if subcmd.long_help
+            return str
+          else
+            return "Invalid 'enable' subcommand '#{args[1]}'."
+          end
+        end
         s = %{
           Enable some things.
           This is used to cancel the effect of the "disable" command.
@@ -93,14 +122,16 @@ module Debugger
   end
 
   class DisableCommand < Command # :nodoc:
-    SubcmdStruct=Struct.new(:name, :min, :short_help) unless
-      defined?(SubcmdStruct)
     Subcommands = 
       [
-       ['breakpoints', 2, "Disable specified breakpoints"],
-       ['display', 2, "Disable some display expressions when program stops"],
-      ].map do |name, min, short_help| 
-      SubcmdStruct.new(name, min, short_help)
+       ['breakpoints', 1, "Disable some breakpoints",
+"Arguments are breakpoint numbers with spaces in between.
+A disabled breakpoint is not forgotten, but has no effect until reenabled."],
+       ['display', 1, "Disable some display expressions when program stops",
+"Arguments are the code numbers of the expressions to stop displaying.
+Do \"info display\" to see current list of code numbers."],
+      ].map do |name, min, short_help, long_help| 
+      SubcmdStruct.new(name, min, short_help, long_help)
     end unless defined?(Subcommands)
 
     def regexp
@@ -109,19 +140,17 @@ module Debugger
     
     def execute
       if not @match[1]
-        print "\"disable\" must be followed \"display\", \"breakpoints\"" +
+        errmsg "\"disable\" must be followed \"display\", \"breakpoints\"" +
           " or breakpoint numbers.\n"
       else
         args = @match[1].split(/[ \t]+/)
-        subcmd = args.shift.downcase
-        for try_subcmd in Subcommands do
-          if (subcmd.size >= try_subcmd.min) and
-              (try_subcmd.name[0..subcmd.size-1] == subcmd)
-            send("disable_#{try_subcmd.name}", args)
-            return
-          end
+        param = args.shift
+        subcmd = find(Subcommands, param)
+        if subcmd
+          send("disable_#{subcmd.name}", args)
+        else
+          send("disable_breakpoints", args.unshift(param))
         end
-        send("disable_breakpoints", args.unshift(subcmd))
       end
     end
     
@@ -138,7 +167,21 @@ module Debugger
         'disable'
       end
 
-      def help(cmd)
+      def help(args)
+        if args[1] 
+          s = args[1]
+          subcmd = Subcommands.find do |try_subcmd| 
+            (s.size >= try_subcmd.min) and
+              (try_subcmd.name[0..s.size-1] == s)
+          end
+          if subcmd
+            str = subcmd.short_help + '.'
+            str += "\n" + subcmd.long_help if subcmd.long_help
+            return str
+          else
+            return "Invalid 'disable' subcommand '#{args[1]}'."
+          end
+        end
         s = %{
           Disable some things.
 

data/cli/ruby-debug/commands/eval.rb

@@ -8,7 +8,8 @@ module Debugger
         def dbg_print(*args)
           $__dbg_interface.print(*args)
         end
-        remove_method :puts if self.respond_to?(:puts)
+        remove_method :puts if self.respond_to?(:puts) &&
+          defined?(remove_method)
         def dbg_puts(*args)
           $__dbg_interface.print(*args)
           $__dbg_interface.print("\n")
@@ -22,7 +23,7 @@ module Debugger
   end
   
   class EvalCommand < Command # :nodoc:
-    self.control = true
+    self.allow_in_control = true
     
     register_setting_get(:autoeval) do
       EvalCommand.unknown
@@ -69,7 +70,7 @@ module Debugger
   end
 
   class PPCommand < Command # :nodoc:
-    self.control = true
+    self.allow_in_control = true
     
     def regexp
       /^\s*pp\s+/
@@ -99,7 +100,7 @@ module Debugger
   end
 
   class PutLCommand < Command # :nodoc:
-    self.control = true
+    self.allow_in_control = true
     
     def regexp
       /^\s*putl\s+/
@@ -135,7 +136,7 @@ module Debugger
   end
   
   class PSCommand < Command # :nodoc:
-    self.control = true
+    self.allow_in_control = true
     
     include EvalFunctions
     

data/cli/ruby-debug/commands/finish.rb

@@ -0,0 +1,42 @@
+module Debugger
+  # Implements the debugger 'finish' command.
+  class FinishCommand < Command
+    self.allow_in_post_mortem = false
+    self.need_context         = true
+    
+    def regexp
+      /^\s*fin(?:ish)? (?:\s+(.*))?$/x
+    end
+
+    def execute
+      max_frame = @state.context.stack_size - @state.frame_pos
+      if !@match[1] or @match[1].empty?
+        frame_pos = @state.frame_pos
+      else
+        frame_pos = get_int(@match[1], "Finish", 0, max_frame-1, 0)
+        return nil unless frame_pos
+      end
+      @state.context.stop_frame = frame_pos
+      @state.frame_pos = 0
+      @state.proceed
+    end
+
+    class << self
+      def help_command
+        'finish'
+      end
+
+      def help(cmd)
+        %{
+          fin[ish] [frame-number]\tExecute until selected stack frame returns.
+
+If no frame number is given, we run until the currently selected frame
+returns.  The currently selected frame starts out the most-recent
+frame or 0 if no frame positioning (e.g "up", "down" or "frame") has
+been performed. If a frame number is given we run until that frame
+returns.
+        }
+      end
+    end
+  end
+end

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

@@ -1,10 +1,11 @@
 module Debugger
   # Mix-in module to assist in command parsing.
   module FrameFunctions # :nodoc:
-    def adjust_frame(frame_pos, absolute)
+    def adjust_frame(frame_pos, absolute, context=@state.context)
+      @state.frame_pos = 0 if context != @state.context
       if absolute
         if frame_pos < 0
-          abs_frame_pos = @state.context.stack_size + frame_pos
+          abs_frame_pos = context.stack_size + frame_pos
         else
           abs_frame_pos = frame_pos
         end
@@ -12,11 +13,11 @@ module Debugger
         abs_frame_pos = @state.frame_pos + frame_pos
       end
 
-      if abs_frame_pos >= @state.context.stack_size then
-        print "Adjusting would put us beyond the oldest (initial) frame."
+      if abs_frame_pos >= context.stack_size then
+        errmsg "Adjusting would put us beyond the oldest (initial) frame.\n"
         return
       elsif abs_frame_pos < 0 then
-        print "Adjusting would put us beyond the newest (innermost) frame."
+        errmsg "Adjusting would put us beyond the newest (innermost) frame.\n"
         return
       end
       if @state.frame_pos != abs_frame_pos then
@@ -24,22 +25,22 @@ module Debugger
         @state.frame_pos = abs_frame_pos
       end
       
-      @state.file = @state.context.frame_file(@state.frame_pos)
-      @state.line = @state.context.frame_line(@state.frame_pos)
+      @state.file = context.frame_file(@state.frame_pos)
+      @state.line = context.frame_line(@state.frame_pos)
       
       print_frame(@state.frame_pos, true)
     end
     
-    def get_frame_call(prefix, pos)
-      id = @state.context.frame_method(pos)
-      klass = @state.context.frame_class(pos)
+    def get_frame_call(prefix, pos, context)
+      id = context.frame_method(pos)
+      klass = context.frame_class(pos)
       call_str = ""
       if id
-        args = @state.context.frame_args(pos)
-        locals = @state.context.frame_locals(pos)
+        args = context.frame_args(pos)
+        locals = context.frame_locals(pos)
         if Command.settings[:callstyle] != :short && klass
           if Command.settings[:callstyle] == :tracked
-            arg_info = @state.context.frame_args_info(pos)
+            arg_info = context.frame_args_info(pos)
           end
           call_str << "#{klass}." 
         end
@@ -75,10 +76,10 @@ module Debugger
       return call_str
     end
 
-    def print_frame(pos, adjust = false)
-      file = @state.context.frame_file(pos)
-      line = @state.context.frame_line(pos)
-      klass = @state.context.frame_class(pos)
+    def print_frame(pos, adjust = false, context=@state.context)
+      file = context.frame_file(pos)
+      line = context.frame_line(pos)
+      klass = context.frame_class(pos)
 
       unless Command.settings[:full_path]
         path_components = file.split(/[\\\/]/)
@@ -89,7 +90,7 @@ module Debugger
       end
 
       frame_num = "#%d " % pos
-      call_str = get_frame_call(frame_num, pos)
+      call_str = get_frame_call(frame_num, pos, context)
       file_line = "at line %s:%d\n" % [CommandProcessor.canonic_file(file), line]
       print frame_num
       unless call_str.empty?
@@ -100,12 +101,16 @@ module Debugger
         end
       end
       print file_line
-      print "\032\032%s:%d\n" % [CommandProcessor.canonic_file(file), 
-                                 line] if ENV['EMACS'] && adjust
+      if ENV['EMACS'] && adjust
+        fmt = (Debugger.annotate.to_i > 1 ?
+               "\032\032source %s:%d\n" : "\032\032%s:%d\n")
+        print fmt % [CommandProcessor.canonic_file(file), line]
+      end
     end
   end
 
-  class WhereCommand < Command # :nodoc:
+  # Implements debugger "where" or "backtrace" command.
+  class WhereCommand < Command
     def regexp
       /^\s*(?:w(?:here)?|bt|backtrace)$/
     end
@@ -127,16 +132,21 @@ module Debugger
       end
 
       def help(cmd)
-        if cmd == 'where'
+        s = if cmd == 'where'
           %{
-            w[here]\tdisplay frames
-          }
-        else
+            w[here]\tdisplay stack frames
+            }
+            else
           %{
-            bt|backtrace\t\talias for where
-          }
-        end
-      end
+            bt|backtrace\t\talias for where - display stack frames
+         }
+            end
+        s += %{
+Print the entire stack frame. Each frame is numbered, the most recent
+frame is 0. frame number can be referred to in the "frame" command;
+"up" and "down" add or subtract respectively to frame numbers shown.
+The position of the current frame is marked with -->.  } 
+      end 
     end
   end
 
@@ -190,18 +200,31 @@ module Debugger
   
   class FrameCommand < Command # :nodoc:
     def regexp
-      /^\s* f(?:rame)? (?:\s+ (.*))? \s*$/x
+      / ^\s* 
+        f(?:rame)? 
+        (?: \s+ (\S+))? \s*
+        (?: thread \s+ (.*))? \s*
+        $/x
     end
 
     def execute
       if not @match[1]
-        print "Missing a frame number argument.\n"
+        errmsg "Missing a frame number argument.\n"
         return
       else
         pos = get_int(@match[1], "Frame")
         return unless pos
       end
-      adjust_frame(pos, true)
+      if @match[2]
+        context = parse_thread_num('frame', @match[2])
+        unless context
+          errmsg "Thread #{@match[2]} doesn't exist.\n"
+          return
+        end
+      else
+        context = @state.context
+      end
+      adjust_frame(pos, true, context)
     end
 
     class << self
@@ -211,12 +234,20 @@ module Debugger
 
       def help(cmd)
         %{
-          f[rame] frame-number
+          f[rame] frame-number [thread thread-number]
           Move the current frame to the specified frame number.
 
           A negative number indicates position from the other end.  So
           'frame -1' moves to the oldest frame, and 'frame 0' moves to
           the newest frame.
+
+          Without an argument, the command prints the current stack
+          frame. Since the current position is redisplayed, it may trigger a
+          resyncronization if there is a front end also watching over
+          things. 
+
+          If a thread number is given then we set the context for evaluating
+          expressions to that frame of that thread. 
         }
       end
     end