rbx-trepanning 0.0.2-universal-rubinius-1.2 → 0.0.3-universal-rubinius-1.2

data/app/options.rbc

@@ -449,21 +449,23 @@ x
 12
 show_version
 i
-17
+19
 45
 0
 1
 47
-101
+49
 2
+0
 7
 3
 45
 4
 5
 47
-101
+49
 2
+0
 63
 3
 11
@@ -495,7 +497,7 @@ n
 p
 5
 I
--1
+0
 I
 24
 I
@@ -503,7 +505,7 @@ I
 I
 25
 I
-11
+13
 x
 54
 /home/rocky-rvm/.rvm/src/rbx-trepanning/app/options.rb
@@ -726,7 +728,7 @@ each
 p
 9
 I
--1
+0
 I
 28
 I
@@ -842,7 +844,7 @@ x
 13
 setup_options
 i
-132
+135
 57
 19
 0
@@ -853,16 +855,18 @@ i
 48
 0
 47
-101
+49
 1
+0
 7
 2
 45
 3
 4
 47
-101
+49
 1
+0
 7
 5
 63
@@ -903,8 +907,9 @@ i
 15
 16
 47
-101
+49
 1
+0
 63
 2
 56
@@ -1030,7 +1035,7 @@ x
 13
 setup_options
 i
-76
+78
 57
 19
 0
@@ -1059,7 +1064,7 @@ i
 5
 1
 8
-75
+77
 45
 0
 6
@@ -1069,7 +1074,7 @@ i
 7
 1
 9
-58
+59
 21
 2
 2
@@ -1078,8 +1083,9 @@ i
 20
 0
 47
-101
+49
 9
+0
 7
 10
 63
@@ -1088,7 +1094,7 @@ i
 11
 1
 8
-75
+77
 21
 2
 2
@@ -1097,8 +1103,9 @@ i
 20
 0
 47
-101
+49
 9
+0
 7
 12
 63
@@ -1180,11 +1187,11 @@ I
 I
 3f
 I
-3a
+3b
 I
 41
 I
-4c
+4e
 x
 54
 /home/rocky-rvm/.rvm/src/rbx-trepanning/app/options.rb
@@ -1253,7 +1260,11 @@ x
 3
 []=
 p
-3
+5
+I
+0
+I
+44
 I
 0
 I
@@ -1285,7 +1296,7 @@ x
 13
 setup_options
 i
-77
+79
 57
 19
 0
@@ -1299,7 +1310,7 @@ i
 2
 1
 9
-59
+60
 45
 0
 3
@@ -1325,7 +1336,7 @@ i
 2
 15
 8
-57
+58
 21
 2
 2
@@ -1334,8 +1345,9 @@ i
 20
 0
 47
-101
+49
 8
+0
 7
 9
 63
@@ -1344,7 +1356,7 @@ i
 10
 1
 8
-76
+78
 21
 2
 2
@@ -1353,8 +1365,9 @@ i
 20
 0
 47
-101
+49
 8
+0
 7
 12
 63
@@ -1432,11 +1445,11 @@ I
 I
 50
 I
-3b
+3c
 I
 53
 I
-4d
+4f
 x
 54
 /home/rocky-rvm/.rvm/src/rbx-trepanning/app/options.rb
@@ -1465,7 +1478,7 @@ x
 13
 setup_options
 i
-50
+51
 57
 19
 0
@@ -1479,7 +1492,7 @@ i
 2
 1
 9
-48
+49
 21
 2
 0
@@ -1503,8 +1516,9 @@ i
 20
 0
 47
-101
+49
 6
+0
 7
 7
 63
@@ -1513,7 +1527,7 @@ i
 8
 1
 8
-49
+50
 1
 11
 I
@@ -1575,11 +1589,11 @@ I
 I
 5a
 I
-30
+31
 I
 58
 I
-32
+33
 x
 54
 /home/rocky-rvm/.rvm/src/rbx-trepanning/app/options.rb
@@ -1654,7 +1668,11 @@ x
 4
 puts
 p
-5
+7
+I
+0
+I
+5d
 I
 0
 I
@@ -1742,7 +1760,11 @@ x
 4
 puts
 p
-5
+7
+I
+0
+I
+61
 I
 0
 I
@@ -1773,67 +1795,67 @@ I
 I
 37
 I
-e
+f
 I
 38
 I
-20
+22
 I
 3a
 I
-28
+2a
 I
 3b
 I
-2b
+2d
 I
 3a
 I
-31
+33
 I
 44
 I
-36
+38
 I
 45
 I
-40
+43
 I
 44
 I
-46
+49
 I
 4b
 I
-57
+5a
 I
 56
 I
-5f
+62
 I
 57
 I
-62
+65
 I
 56
 I
-68
+6b
 I
 5d
 I
-76
+79
 I
 61
 I
-7b
+7e
 I
 62
 I
-7e
+81
 I
 61
 I
-84
+87
 x
 54
 /home/rocky-rvm/.rvm/src/rbx-trepanning/app/options.rb
@@ -1848,7 +1870,7 @@ new
 p
 5
 I
--1
+0
 I
 34
 I

data/interface/script.rbc

@@ -704,9 +704,9 @@ x
 10
 initialize
 p
-25
+23
 I
--1
+0
 I
 15
 I
@@ -734,10 +734,6 @@ I
 I
 1d
 I
-56
-I
-1c
-I
 59
 I
 1e
@@ -813,7 +809,7 @@ close
 p
 5
 I
--1
+0
 I
 26
 I
@@ -870,7 +866,7 @@ x
 p
 5
 I
--1
+0
 I
 2f
 I
@@ -1054,9 +1050,9 @@ x
 5
 raise
 p
-21
+17
 I
--1
+0
 I
 35
 I
@@ -1076,18 +1072,10 @@ I
 I
 3b
 I
-2a
-I
-3a
-I
 30
 I
 3c
 I
-40
-I
-39
-I
 43
 I
 40
@@ -1142,7 +1130,7 @@ p
 p
 3
 I
--1
+0
 I
 46
 I
@@ -1287,7 +1275,7 @@ msg
 p
 17
 I
--1
+0
 I
 4a
 I
@@ -1458,7 +1446,7 @@ raise
 p
 11
 I
--1
+0
 I
 59
 I

data/lib/trepanning.rb

@@ -19,7 +19,7 @@ require_relative '../io/null_output'
 #
 
 class Trepan
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   attr_accessor :breakpoint   # Breakpoint. The current breakpoint we are
                               # stopped at or nil if none.

data/lib/trepanning.rbc

@@ -673,7 +673,7 @@ x
 VERSION
 s
 5
-0.0.2
+0.0.3
 x
 9
 const_set

data/processor/command/finish.rb

@@ -8,25 +8,27 @@ class Trepan::Command::FinishCommand < Trepan::Command
   unless defined?(HELP)
     NAME = File.basename(__FILE__, '.rb')
     HELP = <<-HELP
-#{NAME} [levels]
+#{NAME}
+#{NAME}+
 
-Continue execution until leaving the current function. 
-Sometimes this is called 'step out'.
+Continue execution until leaving the current method.  Sometimes this
+is called 'step out'.
 
-When `levels' is specified, that many frame levels need to be
-popped. The default is 1.  Note that 'yield' and exceptions raised my
-reduce the number of stack frames. Also, if a thread is switched, we
-stop ignoring levels.
+Normally, stopping occurs just before the return on or yield out of a
+method. However sometimes one wants go to the calling method or place
+just beyond the current method.For this, suffix the command or an
+alias of it with a plus sign. The disadvantange of this is that you
+will no longer be in the scope of the method and so you won't be able
+to see variables of that method.
 
-'next>' is similar in that it stops at a return, but it doesn't
-guarantee the stack level is the same as or less than the current
-one. 
+Examples:
+  #{NAME}
+  #{NAME}+ 
 
-See the break command if you want to stop at a particular point in a
-program. In general, '#{NAME}', 'step' and 'next' may slow a program down
-while 'break' will have less overhead.
+See also commands:
+'continue', 'break', 'next', 'nexti', 'step' for other ways to continue.
     HELP
-    ALIASES      = %w(fin)
+    ALIASES      = %w(fin finish+ fin+)
     CATEGORY     = 'running'
     # execution_set = ['Running']
     MAX_ARGS     = 1   # Need at most this many. 
@@ -36,19 +38,19 @@ while 'break' will have less overhead.
 
   # This method runs the command
   def run(args) # :nodoc
-    opts = {}
+    opts = @proc.parse_next_step_suffix(args[0])
     if args.size == 1
       # Form is: "finish" which means "finish 1"
       level_count = 0
     else
       count_str = args[1]
-      opts = {
+      count_opts = {
         :msg_on_error => 
         "The '#{NAME}' command argument must eval to an integer. Got: %s" % 
         count_str,
         :min_value => 1
       }
-      count = @proc.get_an_int(count_str, opts)
+      count = @proc.get_an_int(count_str, count_opts)
       return unless count
       # step 1 is core.level_count = 0 or "stop next event"
       level_count = count - 1  
@@ -64,11 +66,11 @@ end
 if __FILE__ == $0
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
-  [%W(#{cmd.name} 1), %w(fin 2-1), %w(n foo)].each do |c|
-    cmd.proc.leave_cmd_loop = false
-    result = cmd.run(c)
-    puts 'Run result: %s' % result
-    puts 'leave_cmd_loop: %s' % cmd.proc.leave_cmd_loop
+  [%W(#{cmd.name}), %w(fin 2-1), %w(n foo)].each do |c|
+    cmd.proc.instance_variable_set('@return_to_program', false)
+    cmd.run(c)
+    puts 'return_to_program: %s' % cmd.proc.instance_variable_get('@return_to_program')
+    puts 'step_count: %s' % cmd.proc.instance_variable_get('@step_count')
   end
   [%w(fin), [cmd.name]].each do |c|
     cmd.proc.leave_cmd_loop = false

data/processor/command/list.rb

@@ -24,8 +24,8 @@ previously shown.
 If the command has a '>' suffix, then line centering is disabled and
 listing begins at the specificed location.
 
-The number of line to show is controled by the debugger listsize
-setting. Use 'set listsize' or 'show listsize' to see or set the
+The number of lines to show is controlled by the debugger "list size"
+setting. Use 'set max list' or 'show max list' to see or set the
 value.
 
 \"#{NAME} -\" shows lines before a previous listing. 

data/processor/command/step.rb

@@ -8,10 +8,32 @@ class Trepan::Command::StepCommand < Trepan::Command
   CATEGORY     = 'running'
   NAME         = File.basename(__FILE__, '.rb')
   HELP         = <<-HELP
+#{NAME}[+|-] [into]  [count]
+#{NAME} over [args..]
+#{NAME} out  [args..]
+
+Execute the current line, stopping at the next line.  Sometimes this
+is called 'step into'.
+
 Behaves like 'next', but if there is a method call on the current line,
-exception is stopped in the called method.
+execution is stopped in the called method.
+
+Examples: 
+  #{NAME}        # step 1 line
+  #{NAME} 1      # same as above
+  #{NAME} into   # same as above
+  #{NAME} into 1 # same as above
+  #{NAME} 5/5+0  # same as above
+  #{NAME}+       # same but force stopping on a new line
+  #{NAME}-       # same but force stopping on a new line a new frame added
+  #{NAME} over   # same as 'next'
+  #{NAME} out    # same as 'finish'
 
-See also 'continue', 'next' and 'nexti' commands.
+Related and similar is the 'next' (step over) and 'finish' (step out)
+commands.
+
+See also the commands:
+'continue', 'next', 'nexti' and 'finish' for other ways to progress execution.
       HELP
   NEED_RUNNING = true
   SHORT_HELP   = 'Step into next method call or to next line'
@@ -27,16 +49,22 @@ See also 'continue', 'next' and 'nexti' commands.
       step_count = 1
       opts = {}
     else
-      step_str = args[1]
-      opts = @proc.parse_next_step_suffix(step_str)
-      count_opts = {
-        :msg_on_error => 
-        "The #{NAME} command argument must eval to an integer. Got: %s" % 
-        step_str,
-        :min_value => 1
-      }
-      step_count = @proc.get_an_int(step_str, count_opts)
-      return unless step_count
+      replace_cmd = Keyword_to_related_cmd[args[1]]
+      if replace_cmd
+        cmd = @proc.commands[replace_cmd]
+        return cmd.run([replace_cmd] + args[2..-1])
+      else
+        step_str = args[1]
+        opts = @proc.parse_next_step_suffix(args[0])
+        count_opts = {
+          :msg_on_error => 
+          "The #{NAME} command argument must eval to an integer. Got: %s" % 
+          step_str,
+          :min_value => 1
+        }
+        step_count = @proc.get_an_int(step_str, count_opts)
+        return unless step_count
+      end
     end
     
     @proc.step('step', step_count, opts)
@@ -46,4 +74,11 @@ end
 if __FILE__ == $0
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
+  [%W(#{cmd.name}), %W(#{cmd.name} 2), %W(#{cmd.name} into 1+2),
+   %W(#{cmd.name} over)].each do |c|
+    cmd.proc.instance_variable_set('@return_to_program', false)
+    cmd.run(c)
+    puts 'return_to_program: %s' % cmd.proc.instance_variable_get('@return_to_program')
+    puts 'step_count: %s' % cmd.proc.instance_variable_get('@step_count')
+  end
 end