byebug 1.0.3 → 1.1.0

data/lib/byebug/commands/control.rb

@@ -69,7 +69,7 @@ module Byebug
     end
   end
 
-  class InterruptCommand < Command # :nodoc:
+  class InterruptCommand < Command
     self.allow_in_control     = true
     self.allow_in_post_mortem = false
     self.event                = false

data/lib/byebug/commands/display.rb

@@ -1,7 +1,6 @@
 module Byebug
 
   module DisplayFunctions
-
     def display_expression(exp)
       print "%s = %s\n", exp, debug_silent_eval(exp).to_s
     end
@@ -79,7 +78,6 @@ module Byebug
   end
 
   class DeleteDisplayCommand < Command
-
     def regexp
       /^\s* undisp(?:lay)? \s* (?:(\S+))?$/x
     end

data/lib/byebug/commands/enable.rb

@@ -105,17 +105,11 @@ module Byebug
         end
 
         # general help
-        s = %{
+        str = %{
           Enable some things.
           This is used to cancel the effect of the "disable" command.
-          --
-          List of enable subcommands:
-          --
         }
-        for subcmd in Subcommands do
-          s += "enable #{subcmd.name} -- #{subcmd.short_help}\n"
-        end
-        return s
+        str += format_subcmds(Subcommands)
       end
     end
   end
@@ -179,19 +173,13 @@ module Byebug
         end
 
         # general help
-        s = %{
+        str = %{
           Disable some things.
 
           A disabled item is not forgotten, but has no effect until reenabled.
           Use the "enable" command to have it take effect again.
-          --
-          List of disable subcommands:
-          --
         }
-        for subcmd in Subcommands do
-          s += "disable #{subcmd.name} -- #{subcmd.short_help}\n"
-        end
-        return s
+        str += format_subcmds(Subcommads)
       end
     end
   end

data/lib/byebug/commands/eval.rb

@@ -34,7 +34,7 @@ module Byebug
     end
 
     # Set default value
-    Command.settings[:autoeval] = 1
+    Command.settings[:autoeval] = true
 
     def match(input)
       @input = input
@@ -104,6 +104,7 @@ module Byebug
   end
 
   class PutLCommand < Command
+    include Columnize
     self.allow_in_control = true
 
     def regexp
@@ -116,7 +117,7 @@ module Byebug
         vals = debug_eval(@match.post_match, b)
         if vals.is_a?(Array)
           vals = vals.map{|item| item.to_s}
-          print "#{columnize(vals, self.class.settings[:width])}\n"
+          print "#{columnize(vals, Command.settings[:width])}\n"
         else
           PP.pp(vals, out)
           print out.string
@@ -140,6 +141,7 @@ module Byebug
   end
 
   class PSCommand < Command
+    include Columnize
     self.allow_in_control = true
 
     include EvalFunctions
@@ -154,7 +156,7 @@ module Byebug
         vals = debug_eval(@match.post_match, b)
         if vals.is_a?(Array)
           vals = vals.map{|item| item.to_s}
-          print "#{columnize(vals.sort!, self.class.settings[:width])}\n"
+          print "#{columnize(vals.sort!, Command.settings[:width])}\n"
         else
           PP.pp(vals, out)
           print out.string

data/lib/byebug/commands/frame.rb

@@ -22,6 +22,7 @@ module Byebug
         errmsg "Adjusting would put us beyond the newest (innermost) frame.\n"
         return
       end
+
       if @state.frame_pos != abs_frame_pos then
         @state.previous_line = nil
         @state.frame_pos = abs_frame_pos
@@ -30,66 +31,60 @@ module Byebug
       @state.file = context.frame_file(@state.frame_pos)
       @state.line = context.frame_line(@state.frame_pos)
 
-      print_frame(@state.frame_pos, true)
+      print_frame(@state.frame_pos, false)
     end
 
     def get_frame_call(prefix, pos, context)
       id = context.frame_method(pos)
+      return "<main>" unless id
+
       klass = context.frame_class(pos)
-      call_str = ""
-      if id
-        args = context.frame_args(pos)
-        locals = context.frame_locals(pos)
-        if Command.settings[:callstyle] != :short && klass
-          if Command.settings[:callstyle] == :tracked
-            arg_info = context.frame_args_info(pos)
-          end
-          call_str << "#{klass}."
-        end
-        call_str << id.id2name
-        if args.any?
-          call_str << "("
-          args.each_with_index do |name, i|
-            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]+"..."
-              end
-              call_str += "%s#%s, " % [name, klass]
-            when :tracked
-              if arg_info && arg_info.size > i
-                call_str += "#{name}: #{arg_info[i].inspect}, "
-              else
-                call_str += "%s, " % name
-              end
+      if Command.settings[:callstyle] != :short && klass
+        call_str = "#{klass}.#{id.id2name}"
+      else
+        call_str = "#{id.id2name}"
+      end
+
+      args = context.frame_args(pos)
+      locals = context.frame_locals(pos)
+      if args.any?
+        call_str += "("
+        args.each_with_index do |name, i|
+          case Command.settings[:callstyle]
+          when :short
+            call_str += "#{name}, "
+          when :last
+            klass = locals[name].class
+            if klass.inspect.size > 20 + 3
+              klass = klass.inspect[0..20] + "..."
             end
-            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
+            call_str += "#{name}##{klass}, "
+          when :tracked
+            arg_info = context.frame_args_info(pos)
+            if arg_info && arg_info.size > i
+              call_str += "#{name}: #{arg_info[i].inspect}, "
+            else
+              call_str += "#{name}, "
             end
           end
-          call_str[-2..-1] = ")" # Strip off trailing ', ' if any
+          if call_str.size > Command.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
       end
       return call_str
     end
 
     def print_backtrace
       (0...@state.context.stack_size).each do |idx|
-        if idx == @state.frame_pos
-          print "--> "
-        else
-          print "    "
-        end
         print_frame(idx)
       end
     end
 
-    def print_frame(pos, adjust = false, context=@state.context)
+    def print_frame(pos, mark_current = true, context = @state.context)
       file = context.frame_file(pos)
       line = context.frame_line(pos)
       klass = context.frame_class(pos)
@@ -102,17 +97,22 @@ module Byebug
         end
       end
 
-      frame_num = "##{pos} "
-      call_str = get_frame_call(frame_num, pos, context)
-      file_line = "at #{CommandProcessor.canonic_file(file)}:#{line}\n"
-      print frame_num
-      unless call_str.empty?
-        print "#{call_str} "
-        if call_str.size + frame_num.size + file_line.size > self.class.settings[:width]
-          print "\n       "
-        end
+      if mark_current
+        frame_str = (pos == @state.frame_pos) ? "--> " : "    "
+      else
+        frame_str = ""
       end
-      print file_line
+
+      frame_str += sprintf "#%-2d ", pos
+      frame_str += get_frame_call(frame_str, pos, context)
+      file_line = "at #{CommandProcessor.canonic_file(file)}:#{line}"
+      if frame_str.size + file_line.size + 1 > Command.settings[:width]
+        frame_str += "\n      #{file_line}\n"
+      else
+        frame_str += " #{file_line}\n"
+      end
+
+      print frame_str
       #if ENV['EMACS'] && adjust
       #  fmt = (Byebug.annotate.to_i > 1 ?
       #         "\032\032source %s:%d\n" : "\032\032%s:%d\n")
@@ -183,13 +183,13 @@ module Byebug
 
       def help(cmd)
         s = if cmd == 'where'
-          %{
+            %{
             w[here]\tdisplay stack frames
-           }
+            }
             else
-          %{
+            %{
             bt|backtrace\t\talias for where - display stack frames
-           }
+            }
             end
         s += %{
             Print the entire stack frame. Each frame is numbered, the most
@@ -197,7 +197,7 @@ module Byebug
             command; "up" and "down" add or subtract respectively to frame
             numbers shown. The position of the current frame is marked with
             -->.
-              }
+            }
       end
     end
   end
@@ -226,7 +226,7 @@ module Byebug
     end
   end
 
-  class DownCommand < Command # :nodoc:
+  class DownCommand < Command
     def regexp
       /^\s* down (?:\s+(.*))? .*$/x
     end
@@ -250,7 +250,7 @@ module Byebug
     end
   end
 
-  class FrameCommand < Command # :nodoc:
+  class FrameCommand < Command
     def regexp
       / ^\s*
         f(?:rame)?
@@ -273,9 +273,9 @@ module Byebug
       #    return
       #  end
       #else
-        context = @state.context
+      # context = @state.context
       #end
-      adjust_frame(pos, true, context)
+      adjust_frame(pos, true)
     end
 
     class << self
@@ -286,17 +286,16 @@ module Byebug
       def help(cmd)
         %{
           f[rame] [frame-number [thread thread-number]]
-          Move the current frame to the specified frame number, or the
-          0 if no frame-number has been given.
 
-          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.
+          Move the current frame to the specified frame number, or the 0 if no
+          frame-number has been given.
+
+          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.
+          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.

data/lib/byebug/commands/help.rb

@@ -2,6 +2,7 @@ module Byebug
 
   # Implements byebug "help" command.
   class HelpCommand < Command
+    include Columnize
     self.allow_in_control = true
 
     def regexp
@@ -34,7 +35,7 @@ module Byebug
           print "Available commands:\n"
           cmds = @state.commands.map{ |cmd| cmd.help_command }
           cmds = cmds.flatten.uniq.sort
-          print columnize(cmds, self.class.settings[:width])
+          print columnize(cmds, Command.settings[:width])
         end
       end
       print "\n"

data/lib/byebug/commands/info.rb

@@ -18,7 +18,9 @@ module Byebug
 
   # Implements byebug "info" command.
   class InfoCommand < Command
+    include Columnize
     self.allow_in_control = true
+
     Subcommands =
       [
        ['args', 1, 'Argument variables of current stack frame'],
@@ -74,20 +76,20 @@ module Byebug
       SubcmdStruct.new(name, min, short_help, long_help)
     end unless defined?(InfoFileSubcommands)
 
-#   InfoThreadSubcommands =
-#     [
-#      ['terse', 1, 'summary information'],
-#      ['verbose', 1, 'summary information and stack frame info'],
-#     ].map do |name, min, short_help, long_help|
-#     SubcmdStruct.new(name, min, short_help, long_help)
-#   end unless defined?(InfoThreadSubcommands)
+    InfoThreadSubcommands =
+      [
+       ['terse', 1, 'summary information'],
+       ['verbose', 1, 'summary information and stack frame info'],
+      ].map do |name, min, short_help, long_help|
+      SubcmdStruct.new(name, min, short_help, long_help)
+    end unless defined?(InfoThreadSubcommands)
 
     def regexp
       /^\s* i(?:nfo)? (?:\s+(.*))?$/ix
     end
 
     def execute
-      return print_subcmds(Subcommands) unless @match[1]
+      return print format_subcmds(Subcommands) unless @match[1]
 
       args = @match[1].split(/[ \t]+/)
       param = args.shift
@@ -166,28 +168,33 @@ module Byebug
         print " - #{path}"
       end
     end
+    private :info_file_path
 
     def info_file_lines(file)
       lines = LineCache.size(file)
       print "\t %d lines\n", lines if lines
     end
+    private :info_file_lines
 
     def info_file_breakpoints(file)
       breakpoints = LineCache.trace_line_numbers(file)
       if breakpoints
         print "\tbreakpoint line numbers:\n"
-        print columnize(breakpoints.to_a.sort, self.class.settings[:width])
+        print columnize(breakpoints.to_a.sort, Command.settings[:width])
       end
     end
+    private :info_file_breakpoints
 
     def info_file_mtime(file)
       stat = LineCache.stat(file)
       print "\t%s\n", stat.mtime if stat
     end
+    private :info_file_mtime
 
     def info_file_sha1(file)
       print "\t%s\n", LineCache.sha1(file)
     end
+    private :info_file_sha1
 
     def info_file(*args)
       return info_files unless args[0]
@@ -270,29 +277,30 @@ module Byebug
       end
     end
 
-    def info_program(*args)
-      if not @state.context
-        print "The program being debugged is not being run.\n"
-        return
-      elsif @state.context.dead?
-        print "The program crashed.\n"
-        if Byebug.last_exception
-          print("Exception: #{Byebug.last_exception.inspect}\n")
-        end
-        return
+    def info_stop_reason(stop_reason)
+      case stop_reason
+        when :step
+          print "It stopped after stepping, next'ing or initial start.\n"
+        when :breakpoint
+          print("It stopped at a breakpoint.\n")
+        when :catchpoint
+          print("It stopped at a catchpoint.\n")
+        else
+          print "unknown reason: %s\n" % @state.context.stop_reason.to_s
       end
+    end
+    private :info_stop_reason
+
+    def info_program(*args)
+      return print "The program being debugged is not being run.\n" if
+        not @state.context
+
+      return print "The program crashed.\n" + Byebug.last_exception ?
+                   "Exception: #{Byebug.last_exception.inspect}" : "" + "\n" if
+        @state.context.dead?
 
       print "Program stopped. "
-      case @state.context.stop_reason
-      when :step
-        print "It stopped after stepping, next'ing or initial start.\n"
-      when :breakpoint
-        print("It stopped at a breakpoint.\n")
-      when :catchpoint
-        print("It stopped at a catchpoint.\n")
-      else
-        print "unknown reason: %s\n" % @state.context.stop_reason.to_s
-      end
+      info_stop_reason @state.context.stop_reason
     end
 
     def info_stack(*args)
@@ -330,7 +338,7 @@ module Byebug
         if verbose and not c.ignored?
           (0...c.stack_size).each do |idx|
             print "\t"
-            print_frame(idx, false, c)
+            print_frame(idx, true, c)
           end
         end
       end
@@ -349,7 +357,7 @@ module Byebug
       if verbose and not c.ignored?
         (0...c.stack_size).each do |idx|
           print "\t"
-          print_frame(idx, false, c)
+          print_frame(idx, true, c)
         end
       end
     end
@@ -407,24 +415,17 @@ module Byebug
             return str += "\nInvalid \"file\" attribute \"#{args[2]}\"." \
               unless subsubcmd
 
-            str += "\n" + subsubcmd.short_help + '.'
+            return str += "\n" + subsubcmd.short_help + '.'
           else
-            str += "\n" + subcmd.long_help if subcmd.long_help
+            return str += "\n" + subcmd.long_help if subcmd.long_help
           end
-          return str
         end
 
         # general help
-        s = %{
+        str = %{
           Generic command for showing things about the program being debugged.
-          --
-          List of info subcommands:
-          --
         }
-        for subcmd in Subcommands do
-          s += "info #{subcmd.name} -- #{subcmd.short_help}\n"
-        end
-        return s
+        str += format_subcmds(Subcommands)
       end
     end
   end