ruby-debug 0.10.4 → 0.10.5.rc1

data/test/data/breakpoints-basename.right

@@ -0,0 +1,10 @@
+example/breakpoints-basename.rb:1
+require File.expand_path("../a/example.rb", __FILE__)
+# break example/b/example.rb:1
+Breakpoint 1 file example/b/example.rb, line 1
+# c
+a
+Breakpoint 1 at example/b/example.rb:1
+example/b/example.rb:1
+puts "b"
+b

data/test/data/breakpoints.cmd

@@ -8,7 +8,6 @@ set callstyle last
 set autoeval off
 break 6
 break 10
-break 11
 continue
 where
 break Object.gcd

data/test/data/breakpoints.right

@@ -15,8 +15,6 @@ autoeval is off.
 Breakpoint 1 file gcd.rb, line 6
 # break 10
 Breakpoint 2 file gcd.rb, line 10
-# break 11
-*** Line 11 is not a stopping point in file "gcd.rb".
 # continue
 Breakpoint 1 at gcd.rb:6
 gcd.rb:6
@@ -40,7 +38,7 @@ return nil if a <= 0
 --> #0 Object.gcd(a#Fixnum, b#Fixnum) at line gcd.rb:10
     #1 at line gcd.rb:18
 # info program
-Program stopped. It stopped at a breakpoint.
+Program stopped. It stopped at breakpoint 2.
 # c 6
 Breakpoint 3 at Object:gcd
 gcd.rb:4

data/test/data/catch.cmd

@@ -14,4 +14,5 @@ info catch
 catch ZeroDivisionError
 c
 where
+info program
 quit

data/test/data/catch.right

@@ -36,4 +36,6 @@ pm.rb:5
     #1 at line pm.rb:8
 Warning: saved frames may be incomplete;
 compare debugger backtrace (bt) with Ruby caller(0).
+# info program
+Program stopped. It stopped at catchpoint `divided by 0' (ZeroDivisionError) .
 # quit

data/test/data/continue_bad.cmd

@@ -0,0 +1,4 @@
+set debuggertesting on
+set callstyle last
+# Invalid line number in continue command
+continue 3

data/test/data/continue_bad.right

@@ -0,0 +1,9 @@
+gcd.rb:4
+def gcd(a, b)
+# set debuggertesting on
+Currently testing the debugger is on.
+# set callstyle last
+Frame call-display style is last.
+# # Invalid line number in continue command
+# continue 3
+*** Line 3 is not a stopping point in file "gcd.rb".

data/test/data/ctrl.right

@@ -50,7 +50,8 @@ show autoreload -- Show if source code is reloaded when changed
 show basename -- Show if basename used in reporting files
 show callstyle -- Show paramater style used showing call frames
 show commands -- Show the history of commands you typed
-show forcestep -- Show if sure 'next/step' forces move to a new line
+show different -- Show if 'next/step' forces move to a new line
+show forcestep -- Deprecated. Please use 'different'
 show fullpath -- Show if full file names are displayed in frames
 show history -- Generic command for showing command history parameters
 show keep-frame-bindings -- Save frame binding on each call

data/test/data/dollar-0.right

@@ -1,2 +1,3 @@
-./dollar-0.rb
-./dollar-0.rb
+./example/dollar-0.rb
+./example/dollar-0.rb
+./example/dollar-0.rb

data/test/data/dollar-0a.right

@@ -1,2 +1,3 @@
 ./dollar-0.rb
 ./dollar-0.rb
+./dollar-0.rb

data/test/data/dollar-0b.right

@@ -1,2 +1,3 @@
 ../test/dollar-0.rb
 ../test/dollar-0.rb
+../test/dollar-0.rb

data/test/data/edit.cmd

@@ -4,7 +4,7 @@
 set debuggertesting on
 # Edit using current line position.
 edit
-edit gcd.rb:5
+edit example/gcd.rb:5
 # File should not exist
 edit foo
 # Add space to the end of 'edit'

data/test/data/edit.right

@@ -7,13 +7,13 @@ def gcd(a, b)
 Currently testing the debugger is on.
 # # Edit using current line position.
 # edit
-FAKE-EDITOR +4 ./gcd.rb
-# edit gcd.rb:5
-FAKE-EDITOR +5 gcd.rb
+FAKE-EDITOR +4 ./example/gcd.rb
+# edit example/gcd.rb:5
+FAKE-EDITOR +5 example/gcd.rb
 # # File should not exist
 # edit foo
 *** Invalid file/line number specification: foo
 # # Add space to the end of 'edit'
 # edit 
-FAKE-EDITOR +4 ./gcd.rb
+FAKE-EDITOR +4 ./example/gcd.rb
 # quit

data/test/data/emacs_basic.cmd

@@ -6,38 +6,5 @@
 set debuggertesting on
 set callstyle last
 set autoeval off
-break 6
-break 10
-continue
-where
-break Foo.bar
-break Object.gcd
-info break
-continue
-where
-info program
-c 10
-info break
-break foo
-info break
-disable  1
-info break
-enable breakpoint 1
-enable br 10
-delete 1
-# We should see breakpoint 2 but not 1
-info break
-# We should still be able to access 2
-disable 2
-enable
-enable foo
-disable bar
-disable
-# We should be able to delete 2
-delete 2 3
-info break
-# Should get a message about having no breakpoints.
-disable 1
-enable 1
-# finish
+list
 quit

data/test/data/emacs_basic.right

@@ -11,96 +11,14 @@ Currently testing the debugger is on.
 Frame call-display style is last.
 # set autoeval off
 autoeval is off.
-# break 6
-Breakpoint 1 file gcd.rb, line 6
-# break 10
-Breakpoint 2 file gcd.rb, line 10
-# continue
-Breakpoint 1 at gcd.rb:6
-gcd.rb:6
-if a > b
-# where
---> #0 Object.gcd(a#Fixnum, b#Fixnum) at line gcd.rb:6
-    #1 at line gcd.rb:18
-# break Foo.bar
-*** Unknown class Foo.
-# break Object.gcd
-Breakpoint 3 at Object::gcd
-# info break
-Num Enb What
-  1 y   at gcd.rb:6
-	breakpoint already hit 1 time
-  2 y   at gcd.rb:10
-  3 y   at Object:gcd
-# continue
-Breakpoint 2 at gcd.rb:10
-gcd.rb:10
-return nil if a <= 0
-# where
---> #0 Object.gcd(a#Fixnum, b#Fixnum) at line gcd.rb:10
-    #1 at line gcd.rb:18
-# info program
-Program stopped. It stopped at a breakpoint.
-# c 10
-Breakpoint 3 at Object:gcd
-gcd.rb:4
-def gcd(a, b)
-# info break
-Num Enb What
-  1 y   at gcd.rb:6
-	breakpoint already hit 1 time
-  2 y   at gcd.rb:10
-	breakpoint already hit 1 time
-  3 y   at Object:gcd
-	breakpoint already hit 1 time
-# break foo
-*** Invalid breakpoint location: foo.
-# info break
-Num Enb What
-  1 y   at gcd.rb:6
-	breakpoint already hit 1 time
-  2 y   at gcd.rb:10
-	breakpoint already hit 1 time
-  3 y   at Object:gcd
-	breakpoint already hit 1 time
-# disable  1
-# info break
-Num Enb What
-  1 n   at gcd.rb:6
-	breakpoint already hit 1 time
-  2 y   at gcd.rb:10
-	breakpoint already hit 1 time
-  3 y   at Object:gcd
-	breakpoint already hit 1 time
-# enable breakpoint 1
-# enable br 10
-Enable breakpoints argument '10' needs to at most 3.
-# delete 1
-# # We should see breakpoint 2 but not 1
-# info break
-Num Enb What
-  2 y   at gcd.rb:10
-	breakpoint already hit 1 time
-  3 y   at Object:gcd
-	breakpoint already hit 1 time
-# # We should still be able to access 2
-# disable 2
-# enable
-*** "enable" must be followed "display", "breakpoints" or breakpoint numbers.
-# enable foo
-Enable breakpoints argument 'foo' needs to be a number.
-# disable bar
-Disable breakpoints argument 'bar' needs to be a number.
-# disable
-*** "disable" must be followed "display", "breakpoints" or breakpoint numbers.
-# # We should be able to delete 2
-# delete 2 3
-# info break
-No breakpoints.
-# # Should get a message about having no breakpoints.
-# disable 1
-*** No breakpoints have been set.
-# enable 1
-*** No breakpoints have been set.
-# # finish
+# list
+[-1, 8] in gcd.rb
+   1  #!/usr/bin/env ruby
+   2  
+   3  # GCD. We assume positive numbers
+=> 4  def gcd(a, b)
+   5    # Make: a <= b
+   6    if a > b
+   7      a, b = [b, a]
+   8    end
 # quit

data/test/data/frame.cmd

@@ -3,9 +3,6 @@
 # ***************************************************
 set debuggertesting on
 set callstyle last
-# Invalid line number in continue command
-continue 3
-# This time, for sure!
 continue 6
 where
 up

data/test/data/frame.right

@@ -7,10 +7,6 @@ def gcd(a, b)
 Currently testing the debugger is on.
 # set callstyle last
 Frame call-display style is last.
-# # Invalid line number in continue command
-# continue 3
-*** Line 3 is not a stopping point in file "gcd.rb".
-# # This time, for sure!
 # continue 6
 gcd.rb:6
 if a > b

data/test/data/info-file-break.cmd

@@ -0,0 +1,4 @@
+set debuggertesting on
+set callstyle last
+info file ./example/gcd.rb break
+quit

data/test/data/info-file-break.right

@@ -0,0 +1,11 @@
+gcd.rb:4
+def gcd(a, b)
+# set debuggertesting on
+Currently testing the debugger is on.
+# set callstyle last
+Frame call-display style is last.
+# info file ./example/gcd.rb break
+File ./example/gcd.rb
+	breakpoint line numbers:
+4  6  6  7  10  10  12  12  13  15  18
+# quit

data/test/data/info-thread.right

@@ -9,16 +9,16 @@ Frame call-display style is last.
 # set autoeval off
 autoeval is off.
 # info threads terse
-+ 1 #<Thread:0xb7ceb708 run>	./gcd.rb:4
++ 1 #<Thread:0xb7ceb708 run> gcd.rb:4
 # info threads ver
 + 1 #<Thread:0xb7ceb708 run>	
 	#0 at line gcd.rb:4
 # info thread 1 t
-+ 1 #<Thread:0xb7ceb708 run>	./gcd.rb:4
++ 1 #<Thread:0xb7ceb708 run> gcd.rb:4
 # info threads
-+ 1 #<Thread:0xb7ceb708 run>	./gcd.rb:4
++ 1 #<Thread:0xb7ceb708 run> gcd.rb:4
 # info thread
-+ 1 #<Thread:0xb7ceb708 run>	./gcd.rb:4
++ 1 #<Thread:0xb7ceb708 run> gcd.rb:4
 # help info thread
 List info about thread NUM.
 

data/test/data/info-var-bug2.right

@@ -1,7 +1,7 @@
-info-var-bug2.rb:1
+example/info-var-bug2.rb:1
 s = '<%= PRODUCT[:name] %>'
 # step
-info-var-bug2.rb:2
+example/info-var-bug2.rb:2
 y = 0
 # info variables
 s = "<%= PRODUCT[:name] %>"

data/test/data/info.cmd

@@ -17,6 +17,5 @@ info break 10
 info break 1
 info break 1 2
 info break
-info file ./gcd.rb break
 i
 quit

data/test/data/info.right

@@ -29,7 +29,7 @@ info threads -- information of currently-known threads
 info variables -- Local and instance variables of the current stack frame
 # info args
 # info line
-Line 4 of "./gcd.rb"
+Line 4 of "gcd.rb"
 # info locals
 # info stack
 --> #0 at line gcd.rb:4
@@ -58,10 +58,6 @@ Num Enb What
 Num Enb What
   1 y   at gcd.rb:10
   2 y   at gcd.rb:12
-# info file ./gcd.rb break
-File ./gcd.rb
-	breakpoint line numbers:
-4  6  6  7  10  10  12  12  13  15  18
 # i
 *** "info" must be followed by the name of an info command:
 List of info subcommands:

data/test/data/linetrace-jruby.right

@@ -0,0 +1,23 @@
+gcd.rb:4
+def gcd(a, b)
+# # ********************************************************
+# # This tests the 'linetrace' command.
+# # ********************************************************
+# set basename on
+basename is on.
+# set linetrace on
+line tracing is on.
+# continue
+Tracing(1):gcd.rb:18 gcd(3,5)
+Tracing(1):gcd.rb:6 if a > b
+Tracing(1):gcd.rb:10 return nil if a <= 0
+Tracing(1):gcd.rb:12 if a == 1 or b-a == 0
+Tracing(1):gcd.rb:15 return gcd(b-a, a)
+Tracing(1):gcd.rb:6 if a > b
+Tracing(1):gcd.rb:10 return nil if a <= 0
+Tracing(1):gcd.rb:12 if a == 1 or b-a == 0
+Tracing(1):gcd.rb:15 return gcd(b-a, a)
+Tracing(1):gcd.rb:6 if a > b
+Tracing(1):gcd.rb:10 return nil if a <= 0
+Tracing(1):gcd.rb:12 if a == 1 or b-a == 0
+Tracing(1):gcd.rb:13 return a

data/test/data/list.right

@@ -6,7 +6,7 @@ def gcd(a, b)
 # set basename on
 basename is on.
 # list
-[-1, 8] in ./gcd.rb
+[-1, 8] in gcd.rb
    1  #!/usr/bin/env ruby
    2  
    3  # GCD. We assume positive numbers
@@ -16,7 +16,7 @@ basename is on.
    7      a, b = [b, a]
    8    end
 # list
-[9, 18] in ./gcd.rb
+[9, 18] in gcd.rb
    9  
    10    return nil if a <= 0
    11  
@@ -28,7 +28,7 @@ basename is on.
    17  
    18  gcd(3,5)
 # list
-[9, 18] in ./gcd.rb
+[9, 18] in gcd.rb
    9  
    10    return nil if a <= 0
    11  
@@ -40,7 +40,7 @@ basename is on.
    17  
    18  gcd(3,5)
 # list
-[9, 18] in ./gcd.rb
+[9, 18] in gcd.rb
    9  
    10    return nil if a <= 0
    11  
@@ -52,7 +52,7 @@ basename is on.
    17  
    18  gcd(3,5)
 # list -
-[-1, 8] in ./gcd.rb
+[-1, 8] in gcd.rb
    1  #!/usr/bin/env ruby
    2  
    3  # GCD. We assume positive numbers
@@ -62,7 +62,7 @@ basename is on.
    7      a, b = [b, a]
    8    end
 # list -
-[-1, 8] in ./gcd.rb
+[-1, 8] in gcd.rb
    1  #!/usr/bin/env ruby
    2  
    3  # GCD. We assume positive numbers
@@ -72,7 +72,7 @@ basename is on.
    7      a, b = [b, a]
    8    end
 # list -
-[-1, 8] in ./gcd.rb
+[-1, 8] in gcd.rb
    1  #!/usr/bin/env ruby
    2  
    3  # GCD. We assume positive numbers
@@ -82,7 +82,7 @@ basename is on.
    7      a, b = [b, a]
    8    end
 # list -
-[-1, 8] in ./gcd.rb
+[-1, 8] in gcd.rb
    1  #!/usr/bin/env ruby
    2  
    3  # GCD. We assume positive numbers
@@ -92,14 +92,14 @@ basename is on.
    7      a, b = [b, a]
    8    end
 # list 1
-[-4, 5] in ./gcd.rb
+[-4, 5] in gcd.rb
    1  #!/usr/bin/env ruby
    2  
    3  # GCD. We assume positive numbers
 => 4  def gcd(a, b)
    5    # Make: a <= b
 # list 20
-[15, 18] in ./gcd.rb
+[15, 18] in gcd.rb
    15    return gcd(b-a, a)
    16  end
    17  
@@ -107,21 +107,21 @@ basename is on.
 # set listsize 5
 Number of source lines to list by default is 5.
 # list 5
-[3, 7] in ./gcd.rb
+[3, 7] in gcd.rb
    3  # GCD. We assume positive numbers
 => 4  def gcd(a, b)
    5    # Make: a <= b
    6    if a > b
    7      a, b = [b, a]
 # list =
-[2, 6] in ./gcd.rb
+[2, 6] in gcd.rb
    2  
    3  # GCD. We assume positive numbers
 => 4  def gcd(a, b)
    5    # Make: a <= b
    6    if a > b
 # list 3-4
-[3, 4] in ./gcd.rb
+[3, 4] in gcd.rb
    3  # GCD. We assume positive numbers
 => 4  def gcd(a, b)
 #