byebug 1.3.0 → 1.3.1

data/lib/byebug/commands/eval.rb

@@ -2,7 +2,7 @@ module Byebug
 
   module EvalFunctions
     def run_with_binding
-      binding = @state.context ? get_binding : TOPLEVEL_BINDING
+      binding = get_binding
       $__dbg_interface = @state.interface
       eval(<<-EOC, binding)
         __dbg_verbose_save=$VERBOSE; $VERBOSE=false

data/lib/byebug/commands/finish.rb

@@ -11,7 +11,7 @@ module Byebug
 
     def execute
       max_frame = @state.context.stack_size - @state.frame_pos
-      if !@match[1] or @match[1].empty?
+      if not @match[1]
         frame_pos = @state.frame_pos
       else
         frame_pos = get_int(@match[1], "Finish", 0, max_frame-1, 0)

data/lib/byebug/commands/frame.rb

@@ -16,10 +16,11 @@ module Byebug
       end
 
       if abs_frame_pos >= context.stack_size then
-        errmsg "Adjusting would put us beyond the oldest (initial) frame.\n"
-        return
+        return \
+          errmsg "Adjusting would put us beyond the oldest (initial) frame.\n"
       elsif abs_frame_pos < 0 then
-        errmsg "Adjusting would put us beyond the newest (innermost) frame.\n"
+        return \
+          errmsg "Adjusting would put us beyond the newest (innermost) frame.\n"
         return
       end
 
@@ -28,25 +29,26 @@ module Byebug
         @state.frame_pos = abs_frame_pos
       end
 
-      @state.file = context.frame_file(@state.frame_pos)
-      @state.line = context.frame_line(@state.frame_pos)
+      @state.file = @state.context.frame_file @state.frame_pos
+      @state.line = @state.context.frame_line @state.frame_pos
 
-      print_frame(@state.frame_pos, false)
+      print_frame @state.frame_pos, false
     end
 
-    def get_frame_call(prefix, pos, context)
-      id = context.frame_method(pos)
+    def get_frame_call(prefix, pos)
+      id = @state.context.frame_method(pos)
       return "<main>" unless id
 
-      klass = context.frame_class(pos)
+      klass = @state.context.frame_class(pos)
+
       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)
+      args = @state.context.frame_args pos
+      locals = @state.context.frame_locals pos
       if args.any?
         call_str += "("
         args.each_with_index do |name, i|
@@ -60,7 +62,7 @@ module Byebug
             end
             call_str += "#{name}##{klass}, "
           when :tracked
-            arg_info = context.frame_args_info(pos)
+            arg_info = context.frame_args_info pos
             if arg_info && arg_info.size > i
               call_str += "#{name}: #{arg_info[i].inspect}, "
             else
@@ -84,10 +86,9 @@ module Byebug
       end
     end
 
-    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)
+    def print_frame(pos, mark_current = true)
+      file = @state.context.frame_file pos
+      line = @state.context.frame_line pos
 
       unless Command.settings[:frame_fullpath]
         path_components = file.split(/[\\\/]/)
@@ -104,7 +105,7 @@ module Byebug
       end
 
       frame_str += sprintf "#%-2d ", pos
-      frame_str += get_frame_call(frame_str, pos, context)
+      frame_str += get_frame_call frame_str, pos
       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"
@@ -129,9 +130,10 @@ module Byebug
     # ignoring additional caller entries. sentinal is set by byebug, but if it's
     # 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)}"
+    def truncated_callstack?(sentinal=nil, cs=caller)
+      recorded_size = @state.context.stack_size
+      to_find_fl =
+        "#{@state.context.frame_file(0)}:#{@state.context.frame_line(0)}"
       top_discard = false
       cs.each_with_index do |fl, i|
         fl.gsub!(/in `.*'$/, '')
@@ -166,7 +168,7 @@ module Byebug
 
     def execute
       print_backtrace
-      if truncated_callstack?(@state.context, Byebug.start_sentinal)
+      if truncated_callstack?(Byebug.start_sentinal)
          print \
            "Warning: saved frames may be incomplete; compare with caller(0)\n"
       end
@@ -261,7 +263,7 @@ module Byebug
         %w(frame)
       end
 
-      def help(cmd)
+      def description
         %{
           f[rame][ frame-number]
 

data/lib/byebug/commands/info.rb

@@ -2,10 +2,8 @@ module Byebug
 
   module InfoFunctions
     def info_catch(*args)
-      unless @state.context
-        print "No frame selected.\n"
-        return
-      end
+      return print "No frame selected.\n" unless @state.context
+
       if Byebug.catchpoints and not Byebug.catchpoints.empty?
         Byebug.catchpoints.each do |exception, hits|
           print "#{exception}: #{exception.is_a?(Class)}\n"
@@ -69,7 +67,7 @@ module Byebug
     end
 
     def execute
-      return help(@match) unless @match[1]
+      return print InfoCommand.help(nil) unless @match[1]
 
       args = @match[1].split(/[ \t]+/)
       param = args.shift
@@ -82,12 +80,11 @@ module Byebug
     end
 
     def info_args(*args)
-      unless @state.context
-        print "No frame selected.\n"
-        return
-      end
-      locals = @state.context.frame_locals(@state.frame_pos)
-      args = @state.context.frame_args(@state.frame_pos)
+      return errmsg "No frame selected.\n" unless @state.context
+
+      locals = @state.context.frame_locals
+      args = @state.context.frame_args
+
       args.each do |name|
         s = "#{name} = #{locals[name].inspect}"
         pad_with_dots(s)
@@ -95,8 +92,20 @@ module Byebug
       end
     end
 
+    def info_breakpoint(brkpt)
+      expr = brkpt.expr.nil? ? '' : " if #{brkpt.expr}"
+      print "%-3d %-3s at %s:%s%s\n" %
+        [brkpt.id, brkpt.enabled? ? 'y' : 'n', brkpt.source, brkpt.pos, expr]
+      hits = brkpt.hit_count
+      if hits > 0
+        s = (hits > 1) ? 's' : ''
+        print "\tbreakpoint already hit #{hits} time#{s}\n"
+      end
+    end
+    private :info_breakpoint
+
     def info_breakpoints(*args)
-      return print "\"info breakpoints\" not available here.\n" unless
+      return errmsg "\"info breakpoints\" not available here.\n" unless
         @state.context
 
       return print "No breakpoints.\n" if Byebug.breakpoints.empty?
@@ -109,50 +118,34 @@ module Byebug
           brkpts.empty?
       end
       print "Num Enb What\n"
-      brkpts.each do |b|
-        print "%-3d %-3s at %s:%s%s\n", b.id,
-                                        b.enabled? ? 'y' : 'n',
-                                        b.source,
-                                        b.pos,
-                                        b.expr.nil? ? '' : " if #{b.expr}"
-        hits = b.hit_count
-        if hits > 0
-          s = (hits > 1) ? 's' : ''
-          print "\tbreakpoint already hit #{hits} time#{s}\n"
-        end
-      end
+      brkpts.each { |b| info_breakpoint(b) }
     end
 
     def info_display(*args)
-      unless @state.context
-        print "info display not available here.\n"
-        return
-      end
-      if @state.display.find{|d| d[0]}
-        print "Auto-display expressions now in effect:\n"
-        print "Num Enb Expression\n"
-        n = 1
-        for d in @state.display
-          print "%3d: %s  %s\n", n, (d[0] ? 'y' : 'n'), d[1] if
-            d[0] != nil
-          n += 1
-        end
-      else
-        print "There are no auto-display expressions now.\n"
+      return errmsg "\"info display\" not available here.\n" unless
+        @state.context
+
+      return print "There are no auto-display expressions now.\n" unless
+        @state.display.find{|d| d[0]}
+
+      print "Auto-display expressions now in effect:\n" \
+            "Num Enb Expression\n"
+      n = 1
+      for d in @state.display
+        print "%3d: %s  %s\n" % [n, (d[0] ? 'y' : 'n'), d[1]]
+        n += 1
       end
     end
 
     def info_file_path(file)
       path = LineCache.path(file)
-      if path != file
-        print " - #{path}"
-      end
+      print " - #{path}" if path and path != file
     end
     private :info_file_path
 
     def info_file_lines(file)
       lines = LineCache.size(file)
-      print "\t %d lines\n", lines if lines
+      print "\t #{lines} lines\n" if lines
     end
     private :info_file_lines
 
@@ -167,80 +160,69 @@ module Byebug
 
     def info_file_mtime(file)
       stat = LineCache.stat(file)
-      print "\t%s\n", stat.mtime if stat
+      print "\t#{stat.mtime}\n" if stat
     end
     private :info_file_mtime
 
     def info_file_sha1(file)
-      print "\t%s\n", LineCache.sha1(file)
+      print "\t#{LineCache.sha1(file)}\n"
     end
     private :info_file_sha1
 
     def info_file(*args)
       return info_files unless args[0]
-      file = args[0]
 
-      param =  args[1] ? args[1] : 'basic'
+      param =  args[1] || 'basic'
 
       subcmd = find(InfoFileSubcommands, param)
       return errmsg "Invalid parameter #{param}\n" unless subcmd
 
-      unless LineCache::cached?(file)
-        unless LineCache::cached_script?(file)
-          return print "File #{file} is not cached\n"
+      unless LineCache::cached?(args[0])
+        unless LineCache::cached_script?(args[0])
+          return print "File #{args[0]} is not cached\n"
         end
-        LineCache::cache(file, Command.settings[:autoreload])
+        LineCache::cache(args[0], Command.settings[:autoreload])
       end
 
-      print "File #{file}"
-      info_file_path(file) if %w(all basic path).member?(subcmd.name)
+      print "File #{args[0]}"
+      info_file_path(args[0]) if %w(all basic path).member?(subcmd.name)
       print "\n"
 
-      info_file_lines(file) if %w(all basic lines).member?(subcmd.name)
-      info_file_breakpoints(file) if %w(all breakpoints).member?(subcmd.name)
-      info_file_mtime(file) if %w(all mtime).member?(subcmd.name)
-      info_file_sha1(file) if %w(all sha1).member?(subcmd.name)
+      info_file_lines(args[0]) if %w(all basic lines).member?(subcmd.name)
+      info_file_breakpoints(args[0]) if %w(all breakpoints).member?(subcmd.name)
+      info_file_mtime(args[0]) if %w(all mtime).member?(subcmd.name)
+      info_file_sha1(args[0]) if %w(all sha1).member?(subcmd.name)
     end
 
     def info_files(*args)
       files = LineCache::cached_files
       files += SCRIPT_LINES__.keys unless 'stat' == args[0]
       files.uniq.sort.each do |file|
-        stat = LineCache::stat(file)
-        path = LineCache::path(file)
-        print "File %s", file
-        if path and path != file
-          print " - %s\n", path
-        else
-          print "\n"
-        end
-        print "\t%s\n", stat.mtime if stat
+        print "File #{file}"
+        info_file_path(file)
+        print "\n"
+        info_file_mtime(file)
       end
     end
 
     def info_instance_variables(*args)
-      unless @state.context
-        print "info instance_variables not available here.\n"
-        return
-      end
+      return errmsg "\"info instance_variables\" not available here.\n" unless
+        @state.context
+
       obj = debug_eval('self')
       var_list(obj.instance_variables)
     end
 
     def info_line(*args)
-      unless @state.context
-        errmsg "info line not available here.\n"
-        return
-      end
-      print "Line %d of \"%s\"\n",  @state.line, @state.file
+      return errmsg "\"info line\" not available here.\n" unless @state.context
+      print "Line #{@state.line} of \"#{@state.file}\"\n"
     end
 
     def info_locals(*args)
-      unless @state.context
-        errmsg "info line not available here.\n"
-        return
-      end
-      locals = @state.context.frame_locals(@state.frame_pos)
+      return errmsg "\"info locals\" not available here.\n" unless
+        @state.context
+
+      locals = @state.context.frame_locals
       locals.keys.sort.each do |name|
         ### FIXME: make a common routine
         begin
@@ -272,8 +254,8 @@ module Byebug
     private :info_stop_reason
 
     def info_program(*args)
-      return print "The program being debugged is not being run.\n" if
-        not @state.context
+      return errmsg "The program being debugged is not being run.\n" unless
+        @state.context
 
       return print "The program crashed.\n" + Byebug.last_exception ?
                    "Exception: #{Byebug.last_exception.inspect}" : "" + "\n" if
@@ -284,31 +266,26 @@ module Byebug
     end
 
     def info_stack(*args)
-      if not @state.context
-        errmsg "info stack not available here.\n"
-        return
-      end
+      return errmsg "\"info stack\" not available here.\n" unless @state.context
+
       print_backtrace
     end
 
     def info_global_variables(*args)
-      unless @state.context
-        errmsg "info global_variables not available here.\n"
-        return
-      end
+      return errmsg "\"info global_variables\" not available here.\n" unless
+        @state.context
+
       var_global
     end
 
     def info_variables(*args)
-      if not @state.context
-        errmsg "info variables not available here.\n"
-        return
-      end
+      return errmsg "\"info variables\" not available here.\n" unless
+        @state.context
+
       obj = debug_eval('self')
-      locals = @state.context.frame_locals(@state.frame_pos)
+      locals = @state.context.frame_locals
       locals[:self] = @state.context.frame_self(@state.frame_pos)
       locals.keys.sort.each do |name|
-        next if name =~ /^__dbg_/ # skip byebug pollution
         ### FIXME: make a common routine
         begin
           s = "#{name} = #{locals[name].inspect}"
@@ -320,37 +297,12 @@ module Byebug
           end
         end
         pad_with_dots(s)
-        s.gsub!('%', '%%')  # protect against printf format strings
         print "#{s}\n"
       end
       var_list(obj.instance_variables, obj.instance_eval{binding()})
       var_class_self
     end
 
-    def help(args)
-      if args[1]
-        subcmd = find(Subcommands, args[1])
-        if subcmd
-          str = subcmd.short_help + '.'
-          if 'file' == subcmd.name and args[2]
-            subsubcmd = find(InfoFileSubcommands, args[2])
-            if subsubcmd
-              str += "\nInvalid \"file\" attribute \"#{args[2]}\"."
-            else
-              str += "\n" + subsubcmd.short_help + '.'
-            end
-          else
-            str += "\n" + subcmd.long_help if subcmd.long_help
-          end
-        else
-          str = "Invalid \"info\" subcommand \"#{args[1]}\"."
-        end
-      else
-        str = InfoCommand.description + format_subcmds(Subcommands)
-      end
-      print str
-    end
-
     class << self
       def names
         %w(info)
@@ -360,10 +312,27 @@ module Byebug
         %{
           info[ subcommand]
 
-          Generic command for showing things about the program being
+          Generic command for showing things about the program being debugged.
         }
       end
+
+      def help(args)
+        return description + format_subcmds unless args and args[1]
+
+        return format_subcmd(args[1]) unless 'file' == args[1] and args[2]
+
+        str = subcmd.short_help + '.'
+        subsubcmd = find(InfoFileSubcommands, args[2])
+        if subsubcmd
+          str += "\nInvalid \"file\" attribute \"#{args[2]}\"."
+        else
+          str += "\n" + subsubcmd.short_help + '.'
+        end
+
+        return str
+      end
     end
+
   end
 
 end