debugger 1.4.0 → 1.5.0

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

@@ -8,14 +8,14 @@ module Debugger
     
     def execute
       if not @match[1]
-        errmsg "\"condition\" must be followed a breakpoint number and expression\n"
+        errmsg pr("condition.errors.syntax")
       else
         breakpoints = Debugger.breakpoints.sort_by{|b| b.id }
         largest = breakpoints.inject(0) do |tally, b|
           tally = b.id if b.id > tally
         end
         if 0 == largest
-          print "No breakpoints have been set.\n"
+          print pr("condition.errors.no_breakpoints")
           return
         end
         pos = get_int(@match[1], "Condition", 1, largest)
@@ -23,6 +23,11 @@ module Debugger
         breakpoints.each do |b|
           if b.id == pos 
             b.expr = @match[2].empty? ? nil : @match[2]
+            if b.expr
+              print pr("conditions.set_condition", id: b.id, expr: b.expr)
+            else
+              print pr("conditions.unset_condition", id: b.id)
+            end
             break
           end
         end

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

@@ -14,8 +14,7 @@ module Debugger
         line_number = get_int(@match[1], "Continue", 0, nil, 0)
         return unless line_number
         unless LineCache.trace_line_numbers(filename).member?(line_number)
-          errmsg("Line %d is not a stopping point in file \"%s\".\n", 
-                 line_number, filename) 
+          errmsg pr("continue.errors.unstopped_line", line: line_number, file: filename)
           return
         end
         @state.context.set_breakpoint(filename, line_number)

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

@@ -12,13 +12,13 @@ module Debugger
     
     def execute
       if not defined? Debugger::PROG_SCRIPT
-        errmsg "Don't know name of debugged program\n"
+        errmsg pr("restart.errors.undefined")
         return
       end
       prog_script = Debugger::PROG_SCRIPT
       if not defined? Debugger::RDEBUG_SCRIPT
         # FIXME? Should ask for confirmation? 
-        print "Debugger was not called from the outset...\n"
+        print_debug pr("restart.debug.outset")
         rdebug_script = prog_script
       else 
         rdebug_script = Debugger::RDEBUG_SCRIPT
@@ -26,15 +26,14 @@ module Debugger
       begin
         Dir.chdir(Debugger::INITIAL_DIR)
       rescue
-        print "Failed to change initial directory #{Debugger::INITIAL_DIR}"
+        print_debug pr("restart.debug.change_initial_dir", dir: Debugger::INITIAL_DIR)
       end
       if not File.exist?(File.expand_path(prog_script))
-        errmsg "Ruby program #{prog_script} doesn't exist\n"
+        errmsg pr("restart.errors.not_exist", prog: prog_script)
         return
       end
       if not File.executable?(prog_script) and rdebug_script == prog_script
-        print "Ruby program #{prog_script} doesn't seem to be executable...\n"
-        print "We'll add a call to Ruby.\n"
+        print_debug pr("restart.debug.not_executable", prog: prog_script)
         ruby = begin defined?(Gem) ? Gem.ruby : "ruby" rescue "ruby" end
         rdebug_script = "#{ruby} -I#{$:.join(' -I')} #{prog_script}"
       else
@@ -44,7 +43,7 @@ module Debugger
         argv = [prog_script] + @match[1].split(/[ \t]+/)
       else
         if not defined? Command.settings[:argv]
-          errmsg "Arguments have not been set. Use 'set args' to set them.\n"
+          errmsg pr("restart.errors.no_args")
           return
         else
           argv = Command.settings[:argv]
@@ -54,10 +53,10 @@ module Debugger
 
       # An execv would be preferable to the "exec" below.
       cmd = rdebug_script + args
-      print "Re exec'ing:\n\t#{cmd}\n"
+      print pr("restart.success", cmd: cmd)
       exec cmd
     rescue Errno::EOPNOTSUPP
-      print "Restart command is not available at this time.\n"
+      print pr("restart.errors.not_available")
     end
 
     class << self

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

@@ -1,22 +1,15 @@
 module Debugger
   module DisplayFunctions # :nodoc:
     def display_expression(exp)
-      print "%s = %s\n", exp, debug_silent_eval(exp).to_s
+      print pr("display.result", n: @state.display.size, exp: exp, result: debug_silent_eval(exp))
     end
     
-    def active_display_expressions?
-      @state.display.select{|d| d[0]}.size > 0
-    end
-
     def print_display_expressions
-      n = 1
-      for d in @state.display
-        if d[0]
-          print "%d: ", n
-          display_expression(d[1])
-        end
-        n += 1
+      result = prc("display.result", @state.display) do |item, index|
+        is_active, expression = item
+        {n: index + 1, exp: expression, result: debug_silent_eval(expression)} if is_active
       end
+      print result
     end
   end
 
@@ -28,7 +21,6 @@ module Debugger
     def execute
       exp = @match[1]
       @state.display.push [true, exp]
-      print "%d: ", @state.display.size
       display_expression(exp)
     end
 
@@ -84,7 +76,7 @@ module Debugger
 
     def execute
       unless pos = @match[1]
-        if confirm("Clear all expressions? (y/n) ")
+        if confirm(pr("display.confirmations.clear_all"))
           for d in @state.display
             d[0] = false
           end
@@ -95,7 +87,7 @@ module Debugger
         if @state.display[pos-1]
           @state.display[pos-1][0] = nil
         else
-          errmsg "Display expression %d is not defined.\n", pos
+          errmsg pr("display.errors.undefined", expr: pos)
         end
       end
     end

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

@@ -4,29 +4,29 @@ module Debugger
     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 
+          errmsg pr("edit.errors.state")
+          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"
+        errmsg pr("edit.errors.file_line", file_line: @match[1])
         return
       end
       editor = ENV['EDITOR'] || 'ex'
       if File.readable?(file)
         system("#{editor} +#{line_number} #{file}")
       else
-        errmsg "File \"#{file}\" is not readable.\n"
+        errmsg pr("edit.errors.not_readable", file: file)
       end
     end
-    
+
     class << self
       def help_command
         'edit'

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

@@ -7,7 +7,7 @@ module Debugger
         tally = b.id if b.id > tally
       end
       if 0 == largest
-        errmsg "No breakpoints have been set.\n"
+        errmsg pr("toggle.errors.no_breakpoints")
         return
       end
       args.each do |pos|
@@ -18,11 +18,12 @@ module Debugger
             enabled = ("Enable" == is_enable)
             if enabled
               unless syntax_valid?(b.expr)
-                errmsg("Expression \"#{b.expr}\" syntactically incorrect; breakpoint remains disabled.\n")
+                errmsg pr("toggle.errors.expression", expr: b.expr)
                 break
               end
             end
             b.enabled = ("Enable" == is_enable)
+            print(pr("toggle.breakpoint_#{enabled ? "enabled" : "disabled"}", id: b.id))
             break
           end
         end
@@ -31,7 +32,7 @@ module Debugger
 
     def enable_disable_display(is_enable, args)
       if 0 == @state.display.size 
-        errmsg "No display expressions have been set.\n"
+        errmsg pr("toggle.errors.no_display")
         return
       end
       args.each do |pos|
@@ -64,8 +65,7 @@ Do \"info display\" to see current list of code numbers."],
     
     def execute
       if not @match[1]
-        errmsg "\"enable\" must be followed \"display\", \"breakpoints\"" +
-          " or breakpoint numbers.\n"
+        errmsg pr("toggle.errors.syntax", toggle: "enable")
       else
         args = @match[1].split(/[ \t]+/)
         param = args.shift
@@ -140,8 +140,7 @@ Do \"info display\" to see current list of code numbers."],
     
     def execute
       if not @match[1]
-        errmsg "\"disable\" must be followed \"display\", \"breakpoints\"" +
-          " or breakpoint numbers.\n"
+        errmsg pr("toggle.errors.syntax", toggle: "disable")
       else
         args = @match[1].split(/[ \t]+/)
         param = args.shift

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

@@ -23,8 +23,6 @@ module Debugger
   end
   
   class EvalCommand < Command # :nodoc:
-    self.allow_in_control = true
-    
     register_setting_get(:autoeval) do
       EvalCommand.unknown
     end
@@ -44,7 +42,7 @@ module Debugger
     def execute
       expr = @match ? @match.post_match : @input
       run_with_binding do |b|
-        print "%s\n", debug_eval(expr, b).inspect
+        print pr("eval.result", expr: expr, result: debug_eval(expr, b).inspect)
       end
     end
 

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

@@ -14,24 +14,23 @@ module Debugger
       end
 
       if abs_frame_pos >= context.stack_size then
-        errmsg "Adjusting would put us beyond the oldest (initial) frame.\n"
+        errmsg pr("frame.errors.too_low")
         return
       elsif abs_frame_pos < 0 then
-        errmsg "Adjusting would put us beyond the newest (innermost) frame.\n"
+        errmsg pr("frame.errors.too_high")
         return
       end
       if @state.frame_pos != abs_frame_pos then
         @state.previous_line = nil
         @state.frame_pos = abs_frame_pos
       end
-      
       @state.file = context.frame_file(@state.frame_pos)
       @state.line = context.frame_line(@state.frame_pos)
-      
-      print_frame(@state.frame_pos, true)
+
+      print_frame(nil, @state.frame_pos, true)
     end
-    
-    def get_frame_call(prefix, pos, context)
+
+    def get_frame_call(prefix_size, pos, context)
       id = context.frame_method(pos)
       klass = context.frame_class(pos)
       call_str = ""
@@ -42,19 +41,19 @@ module Debugger
           if Command.settings[:callstyle] == :tracked
             arg_info = context.frame_args_info(pos)
           end
-          call_str << "#{klass}." 
+          call_str << "#{klass}."
         end
         call_str << id.id2name
         if args.any?
           call_str << "("
           args.each_with_index do |name, i|
-            case Command.settings[:callstyle] 
+            case Command.settings[:callstyle]
             when :short
               call_str += "%s, " % [name]
             when :last
               klass = locals[name].class
               if klass.inspect.size > 20+3
-                klass = klass.inspect[0..20]+"..." 
+                klass = klass.inspect[0..20]+"..."
               end
               call_str += "%s#%s, " % [name, klass]
             when :tracked
@@ -64,91 +63,72 @@ module Debugger
                 call_str += "%s, " % name
               end
             end
-            if call_str.size > self.class.settings[:width] - prefix.size
+            if call_str.size > self.class.settings[:width] - prefix_size
               # Strip off trailing ', ' if any but add stuff for later trunc
               call_str[-2..-1] = ",...XX"
               break
             end
           end
-          call_str[-2..-1] = ")" # Strip off trailing ', ' if any 
+          call_str[-2..-1] = ")" # Strip off trailing ', ' if any
         end
       end
       return call_str
     end
 
-    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(/[\\\/]/)
-        if path_components.size > 3
-          path_components[0...-3] = '...'
-          file = path_components.join(File::ALT_SEPARATOR || File::SEPARATOR)
+    def print_frame(mark, pos, adjust = false, context = @state.context)
+      if print_frame?(context, pos)
+        print pr("frame.line", get_pr_arguments(mark, pos, context))
+        if ENV['EMACS'] && adjust
+          fmt = (Debugger.annotate.to_i > 1 ?
+                 "\032\032source %s:%d\n" : "\032\032%s:%d\n")
+          print fmt % [file, line]
         end
       end
-
-      frame_num = "#%d " % 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?
-        print call_str
-        print ' '
-        if call_str.size + frame_num.size + file_line.size > self.class.settings[:width]
-          print "\n       "
-        end
-      end
-      print file_line
-      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
 
-    # Check if call stack is truncated.  This can happen if
-    # Debugger.start is not called low enough in the call stack. An
-    # array of additional callstack lines from caller is returned if
-    # definitely truncated, false if not, and nil if we don't know.
-    #
-    # We determine truncation based on a passed in sentinal set via
-    # caller which can be nil.  
-    #
-    # First we see if we can find our position in caller. If so, then
-    # we compare context position to that in caller using sentinal
-    # as a place to start ignoring additional caller entries. sentinal
-    # is set by rdebug, but if it's not set, i.e. nil then additional
-    # entries are presumably ones that we haven't recorded in context
-    def truncated_callstack?(context, sentinal=nil, cs=caller)
-      recorded_size = context.stack_size
-      to_find_fl = "#{context.frame_file(0)}:#{context.frame_line(0)}"
-      top_discard = false
-      cs.each_with_index do |fl, i|
-        fl.gsub!(/in `.*'$/, '')
-        fl.gsub!(/:$/, '')
-        if fl == to_find_fl
-          top_discard = i
-          break 
-        end
-      end
-      if top_discard
-        cs = cs[top_discard..-1]
-        return false unless cs
-        return cs unless sentinal
-        if cs.size > recorded_size+2 && cs[recorded_size+2] != sentinal 
-          # caller seems to truncate recursive calls and we don't.
-          # See if we can find sentinal in the first 0..recorded_size+1 entries
-          return false if cs[0..recorded_size+1].any?{ |f| f==sentinal }
-          return cs
+    private
+
+      def get_pr_arguments(mark, pos, context)
+        if print_frame?(context, pos)
+          mark = if mark == true
+            "--> "
+          elsif mark == false
+            "    "
+          else
+            mark
+          end
+
+          line = context.frame_line(pos)
+
+          file = context.frame_file(pos)
+          unless Command.settings[:full_path]
+            path_components = file.split(/[\\\/]/)
+            if path_components.size > 3
+              path_components[0...-3] = '...'
+              file = path_components.join(File::ALT_SEPARATOR || File::SEPARATOR)
+            end
+          end
+          file = CommandProcessor.canonic_file(file)
+
+          call_str = get_frame_call("##{pos}".size, pos, context)
+          call_str = unless call_str.empty?
+            padding = 10
+            approx_line_width = call_str.size + pos.to_s.size + file.to_s.size + line.to_s.size + padding
+            if approx_line_width > self.class.settings[:width]
+              call_str + "\n" + (" " * (mark.to_s.size + pos.to_s.size + 2))
+            else
+              call_str + " "
+            end
+          else
+            " "
+          end
+          {mark: mark, pos: pos, call_str: call_str, file: file, line: line}
         end
-        return false
       end
-      return nil
-    end
-
 
+      def print_frame?(context, pos)
+        context.frame_line(pos) && context.frame_file(pos)
+      end
   end
 
   # Implements debugger "where" or "backtrace" command.
@@ -158,18 +138,9 @@ module Debugger
     end
 
     def execute
-      (0...@state.context.stack_size).each do |idx|
-        if idx == @state.frame_pos
-          print "--> "
-        else
-          print "    "
-        end
-        print_frame(idx)
-
-      end
-      if truncated_callstack?(@state.context, Debugger.start_sentinal)
-#        print "Warning: saved frames may be incomplete; compare with caller(0).\n" 
-      end
+      print(prc("frame.line", (0...@state.context.stack_size)) do |item, _|
+        get_pr_arguments(item == @state.frame_pos, item, @state.context)
+      end)
     end
 
     class << self
@@ -181,18 +152,18 @@ module Debugger
         s = if cmd == 'where'
           %{
             w[here]\tdisplay stack frames
-            }
-            else
+          }
+        else
           %{
             bt|backtrace\t\talias for where - display stack frames
-         }
-            end
+          }
+        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 
+The position of the current frame is marked with -->.  }
+      end
     end
   end
 
@@ -243,11 +214,11 @@ The position of the current frame is marked with -->.  }
       end
     end
   end
-  
+
   class FrameCommand < Command # :nodoc:
     def regexp
-      / ^\s* 
-        f(?:rame)? 
+      / ^\s*
+        f(?:rame)?
         (?: \s+ (\S+))? \s*
         (?: thread \s+ (.*))? \s*
         $/x
@@ -290,10 +261,10 @@ The position of the current frame is marked with -->.  }
           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. 
+          things.
 
           If a thread number is given then we set the context for evaluating
-          expressions to that frame of that thread. 
+          expressions to that frame of that thread.
         }
       end
     end