byebug 1.0.2 → 1.0.3

data/lib/byebug/commands/list.rb

@@ -18,37 +18,19 @@ module Byebug
     end
 
     def execute
-      listsize = Command.settings[:listsize]
-      if !@match || !(@match[1] || @match[2])
-        b = @state.previous_line ?
-        @state.previous_line + listsize : @state.line - (listsize/2)
-        e = b + listsize - 1
-      elsif @match[1] == '-'
-        b = if @state.previous_line
-              if  @state.previous_line > 0
-                @state.previous_line - listsize
-              else
-                @state.previous_line
-              end
-            else
-              @state.line - (listsize/2)
-            end
-        e = b + listsize - 1
-      elsif @match[1] == '='
-        @state.previous_line = nil
-        b = @state.line - (listsize/2)
-        e = b + listsize -1
-      else
-        b, e = @match[2].split(/[-,]/)
-        if e
-          b = b.to_i
-          e = e.to_i
-        else
-          b = b.to_i - (listsize/2)
-          e = b + listsize - 1
-        end
+      Byebug.source_reload if Command.settings[:reload_source_on_change]
+      lines = LineCache::getlines(@state.file,
+                                  Command.settings[:reload_source_on_change])
+      if !lines
+        errmsg "No sourcefile available for #{@state.file}\n"
+        return @state.previous_line
       end
-      @state.previous_line = display_list(b, e, @state.file, @state.line)
+
+      b, e = set_line_range(Command.settings[:listsize], lines.size)
+      return @state.previous_line if b < 0
+
+      print "[#{b}, #{e}] in #{@state.file}\n"
+      @state.previous_line = display_list(b, e, lines, @state.line)
     end
 
     class << self
@@ -69,28 +51,70 @@ module Byebug
 
     private
 
-      # Show FILE from line B to E where CURRENT is the current line number.
-      # If we can show from B to E then we return B, otherwise we return the
-      # previous line @state.previous_line.
-      def display_list(b, e, file, current)
-        print "[%d, %d] in %s\n", b, e, file
-        lines = LineCache::getlines(file,
-                                    Command.settings[:reload_source_on_change])
-        if lines
-          return @state.previous_line if b >= lines.size
-          e = lines.size if lines.size < e
-          [b, 1].max.upto(e) do |n|
-            if n > 0 && lines[n-1]
-              if n == current
-                print "=> %d  %s\n", n, lines[n-1].chomp
+      ##
+      # Set line range to be printed by list
+      #
+      # @param listsize - number of lines to be printed
+      # @param maxline - max line number that can be printed
+      #
+      def set_line_range(listsize, maxline)
+        if !@match || !(@match[1] || @match[2])
+          b = @state.previous_line ?
+          @state.previous_line + listsize : @state.line - (listsize/2)
+        elsif @match[1] == '-'
+          b = if @state.previous_line
+                if  @state.previous_line > 0
+                  @state.previous_line - listsize
+                else
+                  @state.previous_line
+                end
               else
-                print "   %d  %s\n", n, lines[n-1].chomp
+                @state.line - (listsize/2)
               end
+        elsif @match[1] == '='
+          @state.previous_line = nil
+          b = @state.line - (listsize/2)
+        else
+          b, e = @match[2].split(/[-,]/)
+          if e
+            b = b.to_i
+            e = e.to_i
+          else
+            b = b.to_i - (listsize/2)
+          end
+        end
+
+        if b > maxline
+          errmsg "Invalid line range"
+          return [ -1, -1 ]
+        end
+
+        b = [1, b].max
+        e ||=  b + listsize - 1
+
+        if e > maxline
+          e = maxline
+          b = e - listsize + 1
+          b = [1, b].max
+        end
+
+        return [ b, e ]
+      end
+
+      ##
+      # Show file lines in LINES from line B to line E where CURRENT is the
+      # current line number. If we can show from B to E then we return B,
+      # otherwise we return the previous line @state.previous_line.
+      #
+      def display_list(b, e, lines, current)
+        b.upto(e) do |n|
+          if n > 0 && lines[n-1]
+            if n == current
+              print "=> %d  %s\n", n, lines[n-1].chomp
+            else
+              print "   %d  %s\n", n, lines[n-1].chomp
             end
           end
-        else
-          errmsg "No sourcefile available for %s\n", file
-          return @state.previous_line
         end
         return e == lines.size ? @state.previous_line : b
       end

data/lib/byebug/commands/reload.rb

@@ -5,12 +5,13 @@ module Byebug
     self.allow_in_control = true
 
     register_setting_get(:reload_source_on_change) do
-      Byebug.reload_source_on_change
+      Byebug.class_variable_get(:@@reload_source_on_change)
     end
 
     register_setting_set(:reload_source_on_change) do |value|
-      Byebug.reload_source_on_change = value
+      Byebug.class_variable_set(:@@reload_source_on_change, value)
     end
+    Command.settings[:reload_source_on_change] = true
 
     def regexp
       /^\s*r(?:eload)?$/
@@ -24,7 +25,7 @@ module Byebug
     private
 
     def source_reloading
-      Byebug.reload_source_on_change ? 'on' : 'off'
+      Command.settings[:reload_source_on_change] ? 'on' : 'off'
     end
 
     class << self

data/lib/byebug/commands/set.rb

@@ -74,15 +74,12 @@ module Byebug
         else
           return
         end
-        if defined?(Byebug::RDEBUG_SCRIPT)
-          # byebug was called initially. 1st arg is script name.
+      when /^args$/
+        if defined?(Byebug::BYEBUG_SCRIPT)
           Command.settings[:argv][1..-1] = args
         else
-          # byebug wasn't called initially. 1st arg is not script name.
           Command.settings[:argv] = args
         end
-      when /^args$/
-        Command.settings[:argv][1..-1] = args
       when /^autolist$/
         Command.settings[:autolist] = (set_on ? 1 : 0)
       when /^autoeval$/
@@ -142,19 +139,13 @@ module Byebug
         Command.settings[:tracing] = set_on
       when /^listsize$/
         listsize = get_int(args[0], "Set listsize", 1, nil, 10)
-        if listsize
-          self.class.settings[:listsize] = listsize
-        else
-          return
-        end
+        return unless listsize
+        self.class.settings[:listsize] = listsize
       when /^width$/
         width = get_int(args[0], "Set width", 10, nil, 80)
-        if width
-          self.class.settings[:width] = width
-          ENV['COLUMNS'] = width.to_s
-        else
-          return
-        end
+        return unless width
+        self.class.settings[:width] = width
+        ENV['COLUMNS'] = width.to_s
       else
         return print "Unknown setting #{@match[1]}.\n"
       end

data/lib/byebug/commands/show.rb

@@ -10,7 +10,7 @@ module Byebug
         return ("Annotation level is #{Byebug.annotate}")
       when /^args$/
         if Command.settings[:argv] and Command.settings[:argv].size > 0
-          if defined?(Byebug::RDEBUG_SCRIPT)
+          if defined?(Byebug::BYEBUG_SCRIPT)
             # byebug was called initially. 1st arg is script name.
             args = Command.settings[:argv][1..-1].join(' ')
           else
@@ -129,7 +129,7 @@ module Byebug
         end
       when /^listsize$/
         listlines = Command.settings[:listsize]
-        return "Number of source lines to list by default is #{listlines}."
+        return "Number of source lines to list is #{listlines}."
       when /^port$/
         return "server port is #{Byebug::PORT}."
       when /^trace$/

data/lib/byebug/commands/threads.rb

@@ -1,5 +1,6 @@
 module Byebug
-  module ThreadFunctions # :nodoc:
+
+  module ThreadFunctions
     def display_context(c, show_top_frame=true)
       c_flag = c.thread == Thread.current ? '+' : ' '
       c_flag = '$' if c.suspended?
@@ -41,7 +42,7 @@ module Byebug
     end
   end
 
-  class ThreadListCommand < Command # :nodoc:
+  class ThreadListCommand < Command
     self.allow_in_control = true
 
     def regexp
@@ -67,7 +68,7 @@ module Byebug
     end
   end
 
-  class ThreadStopCommand < Command # :nodoc:
+  class ThreadStopCommand < Command
     self.allow_in_control     = true
     self.allow_in_post_mortem = false
     self.need_context         = true
@@ -96,7 +97,7 @@ module Byebug
     end
   end
 
-  class ThreadResumeCommand < Command # :nodoc:
+  class ThreadResumeCommand < Command
     self.allow_in_post_mortem = false
     self.allow_in_control = true
     self.need_context = true
@@ -132,7 +133,7 @@ module Byebug
   # Thread switch Must come after "Thread resume" because "switch" is
   # optional
 
-  class ThreadSwitchCommand < Command # :nodoc:
+  class ThreadSwitchCommand < Command
     self.allow_in_control     = true
     self.allow_in_post_mortem = false
     self.need_context         = true
@@ -163,7 +164,7 @@ module Byebug
     end
   end
 
-  class ThreadCurrentCommand < Command # :nodoc:
+  class ThreadCurrentCommand < Command
     self.need_context = true
 
     def regexp

data/lib/byebug/context.rb

@@ -8,8 +8,16 @@ module Byebug
   end
 
   class Context
-    def frame_class(frame_no=0)
-      frame_self(frame_no).class
+    def frame_args(frame_no=0)
+      bind = frame_binding(frame_no)
+      return [] unless eval "__method__", bind
+      begin
+        eval "self.method(__method__).parameters.map{|(attr, mid)| mid}", bind
+      rescue NameError => e
+        print "(WARNING: retreving args from frame #{frame_no} => " \
+              "#{e.class} Exception: #{e.message})\n     "
+        return []
+      end
     end
 
     def interrupt

data/lib/byebug/helper.rb

@@ -11,15 +11,15 @@ module Byebug
       begin
         int = Integer(str)
         if min and int < min
-          print "%s argument '%s' needs to at least %s.\n" % [cmd, str, min]
+          print "#{cmd} argument \"#{str}\" needs to be at least #{min}.\n"
           return nil
         elsif max and int > max
-          print "%s argument '%s' needs to at most %s.\n" % [cmd, str, max]
+          print "#{cmd} argument \"#{str}\" needs to be at most #{max}.\n"
           return nil
         end
         return int
       rescue
-        print "%s argument '%s' needs to be a number.\n" % [cmd, str]
+        print "#{cmd} argument \"#{str}\" needs to be a number.\n"
         return nil
       end
     end

data/lib/byebug/processor.rb

@@ -147,7 +147,7 @@ module Byebug
 
     def at_tracing(context, file, line)
       # Don't trace ourselves
-      return if defined?(Byebug::BYEBUG_BIN) && Byebug::BYEBUG_BIN == file
+      return if defined?(Byebug::BYEBUG_SCRIPT) && Byebug::BYEBUG_SCRIPT == file
 
       file = CommandProcessor.canonic_file(file)
       tracing_plus = Command.settings[:tracing_plus]

data/lib/byebug/version.rb

@@ -1,4 +1,4 @@
 module Byebug
   # Current version of the gem
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/old_doc/byebug.texi

@@ -314,14 +314,13 @@ mark, e.g.\@code{q!}.
 @node Second Sample Session
 @section Sample Session 2: Delving Deeper (@code{where}, @code{frame}, @code{restart}, @code{autoeval}, @code{break}, @code{ps})
 
-In this section we'll introduce breakpoints, the call stack and
-restarting.  So far we've been doing pretty good in that we've not
-encountered a bug to fix. Let's try another simple example. Okay
-here's the program.
+In this section we'll introduce breakpoints, the call stack and restarting. So
+far we've been doing pretty good in that we've not encountered a bug to fix.
+Let's try another simple example. Okay here's the program.
 
-Below we will debug a simple Ruby program to solve the classic Towers
-of Hanoi puzzle. It is augmented by the bane of programming: some
-command-parameter processing with error checking.
+Below we will debug a simple Ruby program to solve the classic Towers of Hanoi
+puzzle. It is augmented by the bane of programming: some command-parameter
+processing with error checking.
 
 @smallexample
 $ @b{byebug hanoi.rb}
@@ -1115,9 +1114,9 @@ Restart byebug when your program terminates normally.
 
 @item --no-rewrite-program
 @cindex @option{--no-rewrite-program}
-Normally @code{byebug} will reset the program name @code{$0} from its
-name to the debugged program, and set the its name in variable
-@code{$RDEBUG_0}. In the unlikely even you don't want this use this option.
+Normally @code{byebug} will reset the program name @code{$0} from its name to
+the debugged program, and set the its name in variable @code{$BYEBUG_SCRIPT}. In
+the unlikely even you don't want this use this option.
 
 @item --no-stop
 @cindex @option{--no-stop}
@@ -2074,19 +2073,18 @@ frames in @value{DBG} commands.
 @cindex backtraces
 @cindex tracebacks
 @cindex stack traces
-A backtrace is essentially the same as the call stack: a summary of
-how your script got where it is.  It shows one line per frame, for
-many frames, starting with the place that you are stopped at (frame
-zero), followed by its caller (frame one), and on up the stack.
+A backtrace is essentially the same as the call stack: a summary of how your
+script got where it is.  It shows one line per frame, for many frames, starting
+with the place that you are stopped at (frame zero), followed by its caller
+(frame one), and on up the stack.
 
 @table @code
 @kindex where
 @kindex w @r{(@code{where})}
 @itemx where
 Print the entire stack frame; @code{info stack} is an alias for this command.
-Each frame is numbered and can be referred to in the @code{frame}
-command; @code{up} and @code{down} add or subtract respectively to
-frame numbers shown.  The position of the current frame is marked with
+Each frame is numbered and can be referred to in the @code{frame} command;
+@code{up} and @code{down} add or subtract respectively to frame numbers shown.  The position of the current frame is marked with
 @code{-->}.
 
 @smallexample
@@ -2113,33 +2111,30 @@ Similar, but print only the outermost @var{n} frames.
 @node Selection
 @subsection Selecting a frame (@samp{up}, @samp{down}, @samp{frame})
 
-Commands for listing source code in your script work on whichever
-stack frame is selected at the moment.  Here are the commands for
-selecting a stack frame; all of them finish by printing a brief
-description of the stack frame just selected.
+Commands for listing source code in your script work on whichever stack frame is
+selected at the moment.  Here are the commands for selecting a stack frame; all
+of them finish by printing a brief description of the stack frame just selected.
 
 @table @code
 @kindex up @ovar{n}
 @item up @ovar{n}
-Move @var{n} frames up the stack.  For positive numbers @var{n}, this
-advances toward the outermost frame, to higher frame numbers, to
-frames that have existed longer.  Using a negative @var{n} is the same thing
-as issuing a @code{down} command of the absolute value of the @var{n}.
-Using zero for @var{n} does no frame adjustment, but since the current
-position is redisplayed, it may trigger a resynchronization if there is
-a front end also watching over things.
+Move @var{n} frames up the stack.  For positive numbers @var{n}, this advances
+toward the outermost frame, to higher frame numbers, to frames that have existed
+longer.  Using a negative @var{n} is the same thing as issuing a @code{down}
+command of the absolute value of the @var{n}.  Using zero for @var{n} does no
+frame adjustment, but since the current position is redisplayed, it may trigger
+a resynchronization if there is a front end also watching over things.
 
 @var{n} defaults to one. You may abbreviate @code{up} as @code{u}.
 
 @kindex down @ovar{n}
 @item down @ovar{n}
-Move @var{n} frames down the stack.  For positive numbers @var{n}, this
-advances toward the innermost frame, to lower frame numbers, to frames
-that were created more recently.  Using a negative @var{n} is the same
-as issuing a @code{up} command of the absolute value of the @var{n}.
-Using zero for @var{n} does no frame adjustment, but since the current
-position is redisplayed, it may trigger a resynchronization if there is
-a front end also watching over things.
+Move @var{n} frames down the stack.  For positive numbers @var{n}, this advances
+toward the innermost frame, to lower frame numbers, to frames that were created
+more recently.  Using a negative @var{n} is the same as issuing a @code{up}
+command of the absolute value of the @var{n}.  Using zero for @var{n} does no
+frame adjustment, but since the current position is redisplayed, it may trigger
+a resynchronization if there is a front end also watching over things.
 
 @var{n} defaults to one.
 @end table
@@ -2148,22 +2143,21 @@ a front end also watching over things.
 @kindex frame @r{[}@ovar{n} @r{[}thread @var{thread-num}@r{]}@r{]}
 @cindex current stack frame
 @item frame @ovar{n} @r{[}thread @var{thread-num}@r{]}
-The @code{frame} command allows you to move from one stack frame to
-another, and to print the stack frame you select.  @var{n} is the the
-stack frame number or 0 if no frame number is given; @code{frame 0}
-then will always show the current and most recent stack frame.
-
-If a negative number is given, counting is from the other end of the
-stack frame, so @code{frame -1} shows the least-recent, outermost or
-most ``main'' stack frame.
-
-Without an argument, @code{frame} prints the current stack
-frame. Since the current position is redisplayed, it may trigger a
-resynchronization 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.
+The @code{frame} command allows you to move from one stack frame to another, and
+to print the stack frame you select.  @var{n} is the the stack frame number or 0
+if no frame number is given; @code{frame 0} then will always show the current
+and most recent stack frame.
+
+If a negative number is given, counting is from the other end of the stack
+frame, so @code{frame -1} shows the least-recent, outermost or most ``main''
+stack frame.
+
+Without an argument, @code{frame} prints the current stack frame. Since the
+current position is redisplayed, it may trigger a resynchronization 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 table
 
 @node Stopping