byebug 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52c0fcdcfc3ae1fc8b58305e8a97b7e43c42718a
-  data.tar.gz: af47dacc0c4077a5ad12cf93df94d79a741f5230
+  metadata.gz: 489c114f27cc5006d198149fccf0ff0e6390cd2a
+  data.tar.gz: be024abb6bfc9d9f989e29e9f97da9cdca1a1daf
 SHA512:
-  metadata.gz: a61071fab34b13caceaea5e0b6883748c169c50d5c25a81bc16442a8f60cb34e055ff06e0f9b3200a619fd686615de4931c2c46bec0ab91f9ded756464cc59e9
-  data.tar.gz: 7e59c4643528ac5f7ff2817f0b69ea7b769fa38887f277cd05b9328103b894c5033fcf56026fd5077352ba3f665b782de6649a01d91c4e2c322ab3f679f0a2d5
+  metadata.gz: da63414df26b9564f6818645b1451f8780fcb324c7b30916675841b053fbfee0070f3e6c0a7d420e21fff5c07a0dd8a7c20b99cf1ed4dbba869d84c4089ea957
+  data.tar.gz: 4f5c740d9b6ea6e41115b43e982a2a1b1fc28b4c0baefa12ce0c796d005cd23e07df3fc5f43f539a9edc790385a7e4978e06d1dcf065c81f3210c6cc0fa6e37c

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.7.0
+
+* Callstack display: specifically mark c-frames
+* Callstack navigation: skip c-frames
+* Callstack navigation: autolist after navigation commands
+
+
 ## 1.6.1
 
 * Windows compatibiliy: compilation and terminal width issues
@@ -16,7 +23,7 @@
 * No more Byebug.start to get correct callstack information! Dropping `byebug`
 anywhere and inmediately printing the stack just works now. :)
 
-
+ 
 ## 1.4.2
 
 * Fixes crash when using "help command subcommand"

data/GUIDE.md

@@ -188,12 +188,12 @@ resumes execution.  Notice the difference between `display a` and
 after it is evaluated. To remove a display expression `undisplay` is used. If we
 give a display number, just that display expression is removed.
 
-We also used a new command `where`(see [backtrace]()) to show the call stack. In
+We also used a new command `where`(see [backtrace]()) to show the callstack. In
 the above situation, starting from the bottom line we see we called the `hanoi`
 method from line 34 of the file `hanoi.rb` and the `hanoi` method called itself
 two more times at line 4.
 
-In the call stack we show a _current frame_ mark, the frame number, the method
+In the callstack we show a _current frame_ mark, the frame number, the method
 being called, the names of the parameters, the types those parameters
 _currently_ have and the file-line position. Remember it's possible that when
 the program was called the parameters had different types, since the types of
@@ -205,16 +205,36 @@ Now let's move around the callstack.
 ```bash
 (byebug) undisplay
 Clear all expressions? (y/n) y
-(byebug:1) i_args
+(byebug) i_args
 NameError Exception: undefined local variable or method `i_args' for main:Object
-(byebug:1) frame -1
-#3 at hanoi.rb:34
-(byebug:1) i_args
-1
-(byebug:1) p n
+(byebug) frame -1
+[25, 34] in /home/davidr/Proyectos/byebug/old_doc/hanoi.rb
+   25:     exit 2
+   26:   end
+   27: end
+   28:
+   29: if n < 1 or n > 100
+   30:   puts "*** number of disks should be between 1 and 100"
+   31:   exit 2
+   32: end
+   33:
+=> 34: hanoi(n, :a, :b, :c)
+(byebug) i_args
+0
+(byebug) p n
 3
-(byebug:1) down 2
-#1 Object.hanoi(n#Fixnum, a#Symbol, b#Symbol, c#Symbol) at hanoi.rb:4
+(byebug) down 2
+[1, 10] in /home/davidr/Proyectos/byebug/old_doc/hanoi.rb
+    1: # Solves the classic Towers of Hanoi puzzle.
+    2: def hanoi(n,a,b,c)
+    3:   if n-1 > 0
+=>  4:     hanoi(n-1, a, c, b)
+    5:   end
+    6:   puts "Move disk %s to %s" % [a, b]
+    7:   if n-1 > 0
+    8:     hanoi(n-1, c, b, a)
+    9:   end
+   10: end
 (byebug:1) p n
 2
 ```
@@ -325,15 +345,15 @@ Displaying frame's full file names is off.
 --> #0  TestTri.test_basic at test-triangle.rb:7
     #1  MiniTest::Unit::TestCase.run(runner#MiniTest::Unit) at .../2.0.0/minitest/unit.rb:1301
     #2  MiniTest::Unit.block in _run_suite(suite#Class, type#Symbol) at .../2.0.0/minitest/unit.rb:919
-    #3  Array.map(frame_no#Fixnum) at .../2.0.0/minitest/unit.rb:912
+     +-- #3  Array.map at .../2.0.0/minitest/unit.rb:912
     #4  MiniTest::Unit._run_suite(suite#Class, type#Symbol) at .../2.0.0/minitest/unit.rb:912
     #5  MiniTest::Unit.block in _run_suites(suites#Array, type#Symbol) at .../2.0.0/minitest/unit.rb:899
-    #6  Array.map(frame_no#Fixnum) at .../2.0.0/minitest/unit.rb:899
+     +-- #6  Array.map at .../2.0.0/minitest/unit.rb:899
     #7  MiniTest::Unit._run_suites(suites#Array, type#Symbol) at .../2.0.0/minitest/unit.rb:899
     #8  MiniTest::Unit._run_anything(type#Symbol) at .../2.0.0/minitest/unit.rb:867
     #9  MiniTest::Unit.run_tests at .../2.0.0/minitest/unit.rb:1060
     #10 MiniTest::Unit.block in _run(args#Array) at .../2.0.0/minitest/unit.rb:1047
-    #11 Array.each(frame_no#Fixnum) at .../2.0.0/minitest/unit.rb:1046
+     +-- #11 Array.each at .../2.0.0/minitest/unit.rb:1046
     #12 MiniTest::Unit._run(args#Array) at .../2.0.0/minitest/unit.rb:1046
     #13 MiniTest::Unit.run(args#Array) at .../2.0.0/minitest/unit.rb:1035
     #14 #<Class:MiniTest::Unit>.block in autorun at .../2.0.0/minitest/unit.rb:789
@@ -565,7 +585,7 @@ options and descriptions, use the `--help` option.
 
 ```bash
 $ byebug --help
-byebug 1.4.0
+byebug 1.6.1
 Usage: byebug [options] <script.rb> -- <script.rb parameters>
 
 Options:

data/ext/byebug/context.c

@@ -226,7 +226,6 @@ Context_frame_method(int argc, VALUE *argv, VALUE self)
 
   loc = dc_frame_location(context, frame_n);
   return rb_str_intern(rb_funcall(loc, rb_intern("label"), 0));
-
 }
 
 static VALUE

data/lib/byebug/commands/frame.rb

@@ -3,25 +3,48 @@ module Byebug
   # Mix-in module to assist in command parsing.
   module FrameFunctions
 
-    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 = context.stack_size + frame_pos
-        else
-          abs_frame_pos = frame_pos
-        end
+    def c_frame?(frame_no)
+      @state.context.frame_binding(frame_no).nil?
+    end
+
+    def switch_to_frame(frame_no)
+      if frame_no < 0
+        abs_frame_no = @state.context.stack_size + frame_no
       else
-        abs_frame_pos = @state.frame_pos + frame_pos
+        abs_frame_no = frame_no
+      end
+    end
+
+    def navigate_to_frame(jump_no)
+      return if jump_no == 0
+      total_jumps, current_jumps, new_pos = jump_no.abs, 0, @state.frame_pos
+      step = jump_no/total_jumps
+      loop do
+        new_pos += step
+        return new_pos if new_pos < 0 || new_pos >= @state.context.stack_size
+
+        next if c_frame?(new_pos)
+
+        current_jumps += 1
+        break if current_jumps == total_jumps
       end
+      return new_pos
+    end
 
-      if abs_frame_pos >= context.stack_size then
-        return errmsg "Adjusting would put us beyond the oldest frame.\n"
-      elsif abs_frame_pos < 0 then
-        return errmsg "Adjusting would put us beyond the newest frame.\n"
+    def adjust_frame(frame_pos, absolute)
+      if absolute
+        abs_frame_pos = switch_to_frame(frame_pos)
+        return errmsg "Can't navigate to c-frame\n" if c_frame?(abs_frame_pos)
+      else
+        abs_frame_pos = navigate_to_frame(frame_pos)
       end
 
-      if @state.frame_pos != abs_frame_pos then
+      return errmsg "Can't navigate beyond the oldest frame\n" if
+        abs_frame_pos >= @state.context.stack_size
+      return errmsg "Can't navigate beyond the newest frame\n" if
+        abs_frame_pos < 0
+
+      if @state.frame_pos != abs_frame_pos
         @state.previous_line = nil
         @state.frame_pos = abs_frame_pos
       end
@@ -29,7 +52,7 @@ module Byebug
       @state.file = @state.context.frame_file @state.frame_pos
       @state.line = @state.context.frame_line @state.frame_pos
 
-      print_frame @state.frame_pos, false
+      ListCommand.new(@state).execute
     end
 
     def get_frame_class(style, pos)
@@ -37,25 +60,40 @@ module Byebug
       return frame_class == '' ? '' : "#{frame_class}."
     end
 
+    def get_frame_block_and_method(pos)
+      frame_deco_regexp = /((?:block(?: \(\d+ levels\))?|rescue) in )?(.+)/
+      frame_deco_method = "#{@state.context.frame_method pos}"
+      frame_block_and_method = frame_deco_regexp.match(frame_deco_method)[1..2]
+      return frame_block_and_method.map{ |x| x.nil? ? '' : x }
+    end
+
     def get_frame_args(style, pos)
       args = @state.context.frame_args pos
-      if args == [[:rest]]
-        frame_args = ''
-      elsif style == :short
-        frame_args = args.map { |_, name| name }.join(', ')
-      else
-        locals = @state.context.frame_locals pos
-        frame_args = args.map { |_, a| "#{a}##{locals[a].class}" }.join(', ')
+      return '' if args.empty?
+
+      locals = @state.context.frame_locals pos if style == :long
+      my_args = args.map do |arg|
+        case arg[0]
+          when :block
+            prefix, default = '&', 'block'
+          when :rest
+            prefix, default = '*', 'args'
+          else
+            prefix, default = '', nil
+        end
+        klass = style == :long && arg[1] ? "##{locals[arg[1]].class}" : ''
+        "#{prefix}#{arg[1] || default}#{klass}"
       end
-      return frame_args == '' ? '' :  "(#{frame_args})"
+
+      return "(#{my_args.join(', ')})"
     end
 
     def get_frame_call(prefix, pos)
+      frame_block, frame_method = get_frame_block_and_method(pos)
       frame_class = get_frame_class(Command.settings[:callstyle], pos)
-      frame_method = "#{@state.context.frame_method pos}"
       frame_args = get_frame_args(Command.settings[:callstyle], pos)
 
-      call_str = frame_class + frame_method + frame_args
+      call_str = frame_block + frame_class + frame_method + frame_args
 
       max_call_str_size = Command.settings[:width] - prefix.size
       if call_str.size > max_call_str_size
@@ -84,10 +122,11 @@ module Byebug
       end
 
       if mark_current
-        frame_str = (pos == @state.frame_pos) ? "--> " : "    "
+        frame_str = (pos == @state.frame_pos) ? '--> ' : '    '
       else
         frame_str = ""
       end
+      frame_str += c_frame?(pos) ? ' ͱ-- ' : ''
 
       frame_str += sprintf "#%-2d ", pos
       frame_str += get_frame_call frame_str, pos
@@ -121,9 +160,11 @@ module Byebug
         %{w[here]|bt|backtrace\tdisplay stack frames
 
           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;
+          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 -->.}
+          The position of the current frame is marked with -->. C-frames hang
+          from their most inmediate ruby frame to indicate that they are not
+          navigable}
       end
     end
   end
@@ -181,11 +222,8 @@ module Byebug
     end
 
     def execute
-      if not @match[1]
-        pos = 0
-      else
-        return unless pos = get_int(@match[1], "Frame")
-      end
+      return print_frame @state.frame_pos unless @match[1]
+      return unless pos = get_int(@match[1], "Frame")
       adjust_frame(pos, true)
     end
 

data/lib/byebug/commands/info.rb

@@ -139,8 +139,9 @@ module Byebug
     end
 
     def info_file_path(file)
+      print "File #{file}"
       path = LineCache.path(file)
-      print " - #{path}" if path and path != file
+      print " - #{path}\n" if path and path != file
     end
     private :info_file_path
 
@@ -173,35 +174,34 @@ module Byebug
     def info_file(*args)
       return info_files unless args[0]
 
-      param =  args[1] || 'basic'
-
-      subcmd = Command.find(InfoFileSubcommands, param)
-      return errmsg "Invalid parameter #{param}\n" unless subcmd
+      subcmd = Command.find(InfoFileSubcommands, args[1] || 'basic')
+      return errmsg "Invalid parameter #{args[1]}\n" unless subcmd
 
       unless LineCache::cached?(args[0])
-        unless LineCache::cached_script?(args[0])
-          return print "File #{args[0]} is not cached\n"
-        end
+        return print "File #{args[0]} is not cached\n" unless
+          LineCache::cached_script?(args[0])
         LineCache::cache(args[0], Command.settings[:autoreload])
       end
 
-      print "File #{args[0]}"
-      info_file_path(args[0]) if %w(all basic path).member?(subcmd.name)
-      print "\n"
-
-      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)
+      if %w(all basic).member?(subcmd.name)
+        info_file_path(args[0])
+        info_file_lines(args[0])
+        if subcmd.name == 'all'
+          info_file_breakpoints(args[0])
+          info_file_mtime(args[0])
+          info_file_sha1(args[0])
+        end
+      else
+        print "File #{args[0]}\n" if subcmd.name != 'path'
+        send("info_file_#{subcmd.name}", args[0])
+      end
     end
 
     def info_files(*args)
       files = LineCache::cached_files
       files += SCRIPT_LINES__.keys unless 'stat' == args[0]
       files.uniq.sort.each do |file|
-        print "File #{file}"
         info_file_path(file)
-        print "\n"
         info_file_mtime(file)
       end
     end

data/lib/byebug/commands/set.rb

@@ -94,8 +94,8 @@ module Byebug
       when /^basename$/
         Command.settings[:basename] = set_on
       when /^callstyle$/
-        if args[0] and (args[0] == 'short' or arg[0] == 'long')
-          Command.settings[:callstyle] = arg[0].to_sym
+        if args[0] and (args[0] == 'short' or args[0] == 'long')
+          Command.settings[:callstyle] = args[0].to_sym
         else
           print "Invalid callstyle. Should be one of: \"short\" or \"long\"\n"
         end

data/lib/byebug/context.rb

@@ -13,10 +13,30 @@ module Byebug
       eval "local_variables.inject({}){|h, v| h[v] = eval(v.to_s); h}", bind
     end
 
+    def c_frame_args frame_no
+      myself = frame_self frame_no
+      return [] unless myself.to_s != 'main'
+      myself.send(:method, frame_method(frame_no)).parameters
+    end
+
+    def ruby_frame_args bind
+      return [] unless eval '__method__', bind
+      begin
+        eval "self.method(__method__).parameters", bind
+      rescue NameError => e
+        print "WARNING: Got exception #{e.class}: \"#{e.message}\" " \
+              "while retreving parameters from frame\n"
+        return []
+      end
+    end
+
     def frame_args frame_no = 0
       bind = frame_binding frame_no
-      return [] unless eval "__method__", bind
-      eval "self.method(__method__).parameters", bind
+      if bind.nil?
+        c_frame_args frame_no
+      else
+        ruby_frame_args bind
+      end
     end
 
     def handler

data/lib/byebug/processor.rb

@@ -46,12 +46,12 @@ module Byebug
       @display = []
 
       @mutex = Mutex.new
-      @last_cmd                      = nil
-      @last_file                     = nil   # Filename the last time we stopped
-      @last_line                     = nil   # line number the last time we stopped
-      @byebug_breakpoints_were_empty = false # Show breakpoints 1st time
-      @byebug_displays_were_empty    = true  # No display 1st time
-      @byebug_context_was_dead       = true  # Assume we haven't started.
+      @last_cmd               = nil   # To allow empty (just <RET>) commands
+      @last_file              = nil   # Filename the last time we stopped
+      @last_line              = nil   # line number the last time we stopped
+      @breakpoints_were_empty = false # Show breakpoints 1st time
+      @displays_were_empty    = true  # No display 1st time
+      @context_was_dead       = true  # Assume we haven't started.
     end
 
     def interface=(interface)
@@ -278,12 +278,11 @@ module Byebug
       end
 
       def preloop(commands, context)
-        @byebug_context_was_dead = true if context.dead? and not
-          @byebug_context_was_dead
+        @context_was_dead = true if context.dead? and not @context_was_dead
 
         if Byebug.annotate.to_i > 2
           aprint('stopped')
-          if @byebug_context_was_dead
+          if @context_was_dead
             aprint('exited')
             print "The program finished.\n"
           end
@@ -309,7 +308,7 @@ module Byebug
           end
           if not context.dead? and @@Show_annotations_run.find{|pat| cmd =~ pat}
             aprint 'starting'
-            @byebug_context_was_dead = false
+            @context_was_dead = false
           end
         end
       end
@@ -323,23 +322,23 @@ module Byebug
       end
 
       def breakpoint_annotations(commands, context)
-        unless Byebug.breakpoints.empty? and @byebug_breakpoints_were_empty
+        unless Byebug.breakpoints.empty? and @breakpoints_were_empty
           annotation('breakpoints', commands, context, "info breakpoints")
-          @byebug_breakpoints_were_empty = Byebug.breakpoints.empty?
+          @breakpoints_were_empty = Byebug.breakpoints.empty?
         end
       end
 
       def display_annotations(commands, context)
         return if display.empty?
-        #have_display = display.find{|d| d[0]}
-        #return unless have_display and @byebug_displays_were_empty
-        #@byebug_displays_were_empty = have_display
+        have_display = display.find{|d| d[0]}
+        return unless have_display and @displays_were_empty
+        @displays_were_empty = have_display
         annotation('display', commands, context, "display")
       end
 
       class State
-        attr_accessor :commands, :context, :display, :file
-        attr_accessor :frame_pos, :interface, :line, :previous_line
+        attr_accessor :commands, :context, :display, :file, :frame_pos
+        attr_accessor :interface, :line, :previous_line
 
         def initialize(commands, context, display, file, interface, line)
           @commands, @context, @display = commands, context, display
@@ -367,7 +366,7 @@ module Byebug
     def initialize(interface)
       super()
       @interface = interface
-      @byebug_context_was_dead = true # Assume we haven't started.
+      @context_was_dead = true # Assume we haven't started.
     end
 
     def process_commands(verbose=false)
@@ -377,12 +376,12 @@ module Byebug
       state = State.new(@interface, control_cmds)
       commands = control_cmds.map{|cmd| cmd.new(state) }
 
-      unless @byebug_context_was_dead
+      unless @context_was_dead
         if Byebug.annotate.to_i > 2
           aprint 'exited'
           print "The program finished.\n"
         end
-        @byebug_context_was_dead = true
+        @context_was_dead = true
       end
 
       while input = @interface.read_command(prompt(nil))
@@ -407,7 +406,7 @@ module Byebug
     # Note: have an unused 'context' parameter to match the local interface.
     def prompt(context)
       p = '(byebug:ctrl) '
-      p = afmt("pre-prompt")+p+"\n"+afmt("prompt") if
+      p = afmt("pre-prompt") + p + "\n" + afmt("prompt") if
         Byebug.annotate.to_i > 2
       return p
     end

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '1.6.1'
+  VERSION = '1.7.0'
 end

data/test/breakpoints_test.rb

@@ -71,8 +71,7 @@ class TestBreakpoints < TestDsl::TestCase
 
     it 'must stop at the correct file' do
       enter 'break 14', 'cont'
-      debug_file('breakpoint') {
-        $state.file.must_equal fullpath('breakpoint') }
+      debug_file('breakpoint') { $state.file.must_equal fullpath('breakpoint') }
     end
 
     describe 'show a message' do
@@ -161,7 +160,7 @@ class TestBreakpoints < TestDsl::TestCase
 
   describe 'set breakpoint to a method' do
     describe 'set breakpoint to an instance method' do
-      before { enter 'break A#b', 'cont' }
+      before { enter 'break BreakpointExample#b', 'cont' }
 
       it 'must stop at the correct line' do
         debug_file('breakpoint') { $state.line.must_equal 5 }
@@ -174,7 +173,7 @@ class TestBreakpoints < TestDsl::TestCase
     end
 
     describe 'set breakpoint to a class method' do
-      before { enter 'break A.a', 'cont' }
+      before { enter 'break BreakpointExample.a', 'cont' }
 
       it 'must stop at the correct line' do
         debug_file('breakpoint') { $state.line.must_equal 2 }

data/test/examples/breakpoint.rb

@@ -1,4 +1,4 @@
-class A
+class BreakpointExample
   def self.a
     4
   end

data/test/examples/breakpoint2.rb

@@ -3,5 +3,5 @@ c = 3
 e = 3 + 4
 f = e + 5
 
-A.a
-A.new.b
+BreakpointExample.a
+BreakpointExample.new.b

data/test/examples/finish.rb

@@ -1,6 +1,6 @@
 byebug
 
-class A
+class FinishExample
   def a
     b
   end
@@ -17,4 +17,4 @@ class A
   end
 end
 
-A.new.a
+FinishExample.new.a

data/test/examples/frame.rb

@@ -1,20 +1,28 @@
 byebug
 
-class A
+class FrameExample
+  def initialize(f)
+    @f = f
+  end
+
   def a
     b
   end
+
   def b
     c
     2
   end
+
   def c
     d('a')
     3
   end
+
   def d(e)
     5
   end
 end
 
-A.new.a
+local_var = "hola"
+FrameExample.new('f').a

data/test/examples/frame_deep.rb

@@ -1,4 +1,4 @@
-class A
+class FrameDeepExample
   def a
     z = 1
     z += b
@@ -17,4 +17,4 @@ class A
   end
 end
 
-A.new.a
+FrameDeepExample.new.a

data/test/examples/info.rb

@@ -9,7 +9,7 @@ z = 8
 z = 9
 bla("a" * 30, "b")
 
-class A
+class InfoExample
   def initialize
     @foo = "bar"
     @bla = "blabla"
@@ -33,6 +33,6 @@ class A
   end
 end
 
-A.new.b
-A.new.a
-A.new.c
+InfoExample.new.b
+InfoExample.new.a
+InfoExample.new.c

data/test/examples/jump.rb

@@ -1,6 +1,6 @@
 byebug
 
-class A
+class JumpExample
   def a
     a = 2
     b = 3
@@ -11,4 +11,4 @@ class A
   end
 end
 
-A.new.a
+JumpExample.new.a

data/test/examples/method.rb

@@ -1,5 +1,5 @@
 byebug
-class MethodEx
+class MethodExample
   def initialize
     @a = 'b'
     @c = 'd'
@@ -11,5 +11,5 @@ class MethodEx
     "asdf"
   end
 end
-a = MethodEx.new
+a = MethodExample.new
 a

data/test/frame_test.rb

@@ -1,76 +1,142 @@
 require_relative 'test_helper'
 
 class TestFrame < TestDsl::TestCase
+  describe 'when byebug started at the beginning' do
+    before do
+      @tst_file = fullpath('frame')
+      enter 'break 23', 'cont'
+    end
 
-  it 'must go up' do
-    enter 'break 16', 'cont', 'up'
-    debug_file('frame') { $state.line.must_equal 12 }
-  end
+    it 'must go up' do
+      enter 'up'
+      debug_file('frame') { $state.line.must_equal 18 }
+    end
 
-  it 'must go up by specific number of frames' do
-    enter 'break 16', 'cont', 'up 2'
-    debug_file('frame') { $state.line.must_equal 8 }
-  end
+    it 'must go up by specific number of frames' do
+      enter 'up 2'
+      debug_file('frame') { $state.line.must_equal 13 }
+    end
 
-  it 'must go down' do
-    enter 'break 16', 'cont', 'up', 'down'
-    debug_file('frame') { $state.line.must_equal 16 }
-  end
+    it 'must go down' do
+      enter 'up', 'down'
+      debug_file('frame') { $state.line.must_equal 23 }
+    end
 
-  it 'must go down by specific number of frames' do
-    enter 'break 16', 'cont', 'up 3', 'down 2'
-    debug_file('frame') { $state.line.must_equal 12 }
-  end
+    it 'must go down by specific number of frames' do
+      enter 'up 3', 'down 2'
+      debug_file('frame') { $state.line.must_equal 18 }
+    end
 
-  it 'must set frame' do
-    enter 'break 16', 'cont', 'frame 2'
-    debug_file('frame') { $state.line.must_equal 8 }
-  end
+    it 'must set frame' do
+      enter 'frame 2'
+      debug_file('frame') { $state.line.must_equal 13 }
+    end
 
-  it 'must set frame to the first one by default' do
-    enter 'break 16', 'cont', 'up', 'frame'
-    debug_file('frame') { $state.line.must_equal 16 }
-  end
+    it 'must print current stack frame when without arguments' do
+      enter 'up', 'frame'
+      debug_file('frame')
+      check_output_includes /#1  FrameExample\.c\s+at #{@tst_file}:18/
+    end
 
-  it 'must print current stack frame when without arguments' do
-    enter 'break A.d', 'cont', 'up', 'frame'
-    debug_file('frame')
-    check_output_includes /#0  A.d(e#String) at #{fullpath('frame')}:15/x
-  end
+    it 'must set frame to the first one' do
+      enter 'up', 'frame 0'
+      debug_file('frame') { $state.line.must_equal 23 }
+    end
 
-  it 'must set frame to the first one' do
-    enter 'break 16', 'cont', 'up', 'frame 0'
-    debug_file('frame') { $state.line.must_equal 16 }
-  end
+    it 'must set frame to the last one' do
+      enter 'bt', 'frame -1'
+      debug_file('frame') { $state.file.must_match /minitest\/unit.rb/ }
+      check_output_doesnt_include "at #{@tst_file}:"
+    end
 
-  it 'must set frame to the last one' do
-    enter 'break 16', 'cont', 'bt', 'frame -1'
-    debug_file('frame') { $state.file.must_match /minitest\/unit.rb/ }
-    check_output_doesnt_include "at #{fullpath('frame')}:"
-  end
+    it 'must not set frame if the frame number is too low' do
+      enter 'down'
+      debug_file('frame') { $state.line.must_equal 23 }
+      check_output_includes \
+        "Can't navigate beyond the newest frame", interface.error_queue
+    end
 
-  it 'must not set frame if the frame number is too low' do
-    enter 'break 16', 'cont', 'down'
-    debug_file('frame') { $state.line.must_equal 16 }
-    check_output_includes \
-      'Adjusting would put us beyond the newest frame.', interface.error_queue
-  end
+    it 'must not set frame if the frame number is too high' do
+      enter 'up 100'
+      debug_file('frame') { $state.line.must_equal 23 }
+      check_output_includes \
+        "Can't navigate beyond the oldest frame", interface.error_queue
+    end
+
+    describe 'fullpath' do
+      def short_path(fullpath)
+        separator = File::ALT_SEPARATOR || File::SEPARATOR
+        "...#{separator}" + fullpath.split(separator)[-3..-1].join(separator)
+      end
 
-  it 'must not set frame if the frame number is too high' do
-    enter 'break 16', 'cont', 'up 100'
-    debug_file('frame') { $state.line.must_equal 16 }
-    check_output_includes \
-      'Adjusting would put us beyond the oldest frame.', interface.error_queue
+      describe 'when set' do
+        temporary_change_hash Byebug::Command.settings, :frame_fullpath, true
+
+        it 'must display current backtrace with fullpaths' do
+          enter 'where'
+          debug_file 'frame'
+          check_output_includes \
+            /--> #0  FrameExample\.d\(e#String\)\s+at #{@tst_file}:23/,
+                /#1  FrameExample\.c\s+at #{@tst_file}:18/,
+                /#2  FrameExample\.b\s+at #{@tst_file}:13/
+        end
+      end
+
+      describe 'when unset' do
+        temporary_change_hash Byebug::Command.settings, :frame_fullpath, false
+
+        it 'must display current backtrace with shortpaths' do
+          enter 'where'
+          debug_file 'frame'
+          check_output_includes \
+            /--> #0  FrameExample\.d\(e#String\)\s+at #{short_path(@tst_file)}:23/,
+                /#1  FrameExample\.c\s+at #{short_path(@tst_file)}:18/,
+                /#2  FrameExample\.b\s+at #{short_path(@tst_file)}:13/,
+                /#3  FrameExample\.a\s+at #{short_path(@tst_file)}:9/
+        end
+      end
+    end
+
+    describe 'callstyle' do
+      describe 'long' do
+        temporary_change_hash Byebug::Command.settings, :callstyle, :long
+
+        it 'displays current backtrace with callstyle "long"' do
+          enter 'where'
+          debug_file 'frame'
+          check_output_includes \
+            /--> #0  FrameExample\.d\(e#String\)\s+at #{@tst_file}:23/,
+                /#1  FrameExample\.c\s+at #{@tst_file}:18/,
+                /#2  FrameExample\.b\s+at #{@tst_file}:13/,
+                /#3  FrameExample\.a\s+at #{@tst_file}:9/
+        end
+      end
+
+      describe 'short' do
+        temporary_change_hash Byebug::Command.settings, :callstyle, :short
+
+        it 'displays current backtrace with callstyle "short"' do
+            enter 'where'
+            debug_file 'frame'
+            check_output_includes /--> #0  d\(e\)\s+at #{@tst_file}:23/,
+                                      /#1  c\s+at #{@tst_file}:18/,
+                                      /#2  b\s+at #{@tst_file}:13/,
+                                      /#3  a\s+at #{@tst_file}:9/
+        end
+      end
+    end
   end
 
   describe 'when byebug is started deep in the callstack' do
+    before { @tst_file = fullpath('frame_deep') }
+
     it 'must print backtrace' do
       enter 'break 16', 'cont', 'where'
       debug_file 'frame_deep'
       check_output_includes \
-        /--> #0  A.d(e#String) at #{fullpath('frame_deep')}:16/x,
-            /#1  A.c at #{fullpath('frame_deep')}:13/x,
-            /#2  A.b at #{fullpath('frame_deep')}:8/x
+        /--> #0  FrameDeepExample\.d\(e#String\)\s+at #{@tst_file}:16/,
+            /#1  FrameDeepExample\.c\s+at #{@tst_file}:13/,
+            /#2  FrameDeepExample\.b\s+at #{@tst_file}:8/
     end
 
     it 'must go up' do
@@ -95,65 +161,37 @@ class TestFrame < TestDsl::TestCase
     end
   end
 
-  describe 'fullpath' do
-    def short_path(fullpath)
-      separator = File::ALT_SEPARATOR || File::SEPARATOR
-      "...#{separator}" + fullpath.split(separator)[-3..-1].join(separator)
+  describe 'c-frames (issue #10)' do
+    before do
+      @tst_file = fullpath('frame')
+      enter 'break 5', 'cont'
     end
 
-    describe 'when set' do
-      temporary_change_hash Byebug::Command.settings, :frame_fullpath, true
-
-      it 'must display current backtrace with fullpaths' do
-        enter 'break 16', 'cont', 'where'
-        debug_file 'frame'
-        check_output_includes \
-          /--> #0  A.d(e#String) at #{fullpath('frame')}:16/x,
-              /#1  A.c at #{fullpath('frame')}:12/x,
-              /#2  A.b at #{fullpath('frame')}:8/x
-      end
+    it 'must mark c-frames when printing the stack' do
+      enter 'where'
+      debug_file 'frame'
+      check_output_includes \
+        /--> #0  FrameExample.initialize\(f#String\)\s+at #{@tst_file}:5/,
+            /ͱ-- #1  Class.new\(\*args\)\s+at #{@tst_file}:28/,
+            /#2  <top \(required\)>\s+at #{@tst_file}:28/
     end
 
-    describe 'when unset' do
-      temporary_change_hash Byebug::Command.settings, :frame_fullpath, false
-
-      it 'must display current backtrace with shortpaths' do
-        enter 'set nofullpath', 'break 16', 'cont', 'where'
-        debug_file 'frame'
-        check_output_includes \
-          /--> #0  A.d(e#String) at #{short_path(fullpath('frame'))}:16/x,
-              /#1  A.c at #{short_path(fullpath('frame'))}:12/x,
-              /#2  A.b at #{short_path(fullpath('frame'))}:8/x
-      end
+    it 'must not navigate "up" to c-frames' do
+      enter 'up', 'eval local_var'
+      debug_file 'frame'
+      check_output_includes '"hola"'
     end
-  end
 
-  describe 'callstyle' do
-    describe 'long' do
-      temporary_change_hash Byebug::Command.settings, :callstyle, :long
-
-      it 'displays current backtrace with callstyle "long"' do
-        enter 'break 16', 'cont', 'where'
-        debug_file 'frame'
-        check_output_includes \
-          /--> #0 A.d(e#String) at #{fullpath('frame')}:16/x,
-              /#1 A.c at #{fullpath('frame')}:12/x          ,
-              /#2 A.b at #{fullpath('frame')}:8/x           ,
-              /#3 A.a at #{fullpath('frame')}:5/x
-      end
+    it 'must not navigate "down" to c-frames' do
+      enter 'up', 'down', 'eval f'
+      debug_file 'frame'
+      check_output_includes '"f"'
     end
 
-    describe 'short' do
-      temporary_change_hash Byebug::Command.settings, :callstyle, :short
-
-      it 'displays current backtrace with callstyle "short"' do
-          enter 'break 16', 'cont', 'where'
-          debug_file 'frame'
-          check_output_includes /--> #0 d(e) at #{fullpath('frame')}:16/x,
-                                    /#1 c at #{fullpath('frame')}:12/x,
-                                    /#2 b at #{fullpath('frame')}:8/x,
-                                    /#3 a at #{fullpath('frame')}:5/x
-      end
+    it 'must not jump straigh to c-frames' do
+      enter 'frame 1'
+      debug_file 'frame'
+      check_output_includes "Can't navigate to c-frame", interface.error_queue
     end
   end
 
@@ -163,5 +201,4 @@ class TestFrame < TestDsl::TestCase
       debug_file('post_mortem') { $state.line.must_equal 8 }
     end
   end
-
 end

data/test/info_test.rb

@@ -233,9 +233,9 @@ class TestInfo < TestDsl::TestCase
     it 'must show stack info' do
       enter 'set fullpath', 'break 20', 'cont', 'info stack'
       debug_file 'info'
-      check_output_includes /--> #0  A.a at #{fullpath('info')}:20/x,
-                                /#1  A.b at #{fullpath('info')}:30/x,
-                                /#2  <main> at #{fullpath('info')}:36/x
+      check_output_includes /--> #0  InfoExample.a\s+at #{fullpath('info')}:20/,
+                                /#1  InfoExample.b\s+at #{fullpath('info')}:30/,
+                                /#2  <top \(required\)>\s+at #{fullpath('info')}:36/
     end
   end
 
@@ -255,7 +255,7 @@ class TestInfo < TestDsl::TestCase
       debug_file 'info'
       check_output_includes 'a = "1111111111111111111111...',
                             'b = 2',
-                            /self = #<A:\S+.../,
+                            /self = #<InfoExample:\S+.../,
                             '@bla = "blabla"',
                             '@foo = "bar"'
     end
@@ -264,7 +264,7 @@ class TestInfo < TestDsl::TestCase
       enter 'break 26', 'cont', 'info variables'
       debug_file 'info'
       check_output_includes 'a = *Error in evaluation*',
-                            /self = #<A:\S+.../,
+                            /self = #<InfoExample:\S+.../,
                             '@bla = "blabla"',
                             '@foo = "bar"'
     end

data/test/method_test.rb

@@ -5,14 +5,14 @@ class TestMethod < TestDsl::TestCase
 
   describe 'show instance method of a class' do
     it 'must show using full command name' do
-      enter 'break 15', 'cont', 'method MethodEx'
+      enter 'break 15', 'cont', 'method MethodExample'
       debug_file 'method'
       check_output_includes /bla/
       check_output_doesnt_include /foo/
     end
 
     it 'must show using shortcut' do
-      enter 'break 15', 'cont', 'm MethodEx'
+      enter 'break 15', 'cont', 'm MethodExample'
       debug_file 'method'
       check_output_includes /bla/
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - David Rodríguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
@@ -314,3 +314,4 @@ test_files:
 - test/test_helper.rb
 - test/trace_test.rb
 - test/variables_test.rb
+has_rdoc: