trepanning 0.1.2 → 0.1.3

data/processor/command/{show_subcmd → info_subcmd}/macro.rb

@@ -3,7 +3,7 @@
 require_relative '../base/subcmd'
 require_relative '../../../app/complete'
 
-class Trepan::Subcommand::ShowMacro < Trepan::Subcommand
+class Trepan::Subcommand::InfoMacro < Trepan::Subcommand
   unless defined?(HELP)
     Trepanning::Subcommand.set_name_prefix(__FILE__, self)
     HELP = <<-HELP
@@ -18,8 +18,8 @@ In the second form, all macro names and their definitions are show.
 
 In the last form the only definitions of the given macro names is shown.
     HELP
-    SHORT_HELP = "Show defined macros"
-    MIN_ABBREV = 'ma'.size
+    SHORT_HELP = "Info defined macros"
+    MIN_ABBREV = 'mac'.size
   end
 
   def complete(prefix)
@@ -40,11 +40,11 @@ In the last form the only definitions of the given macro names is shown.
           string = @proc.macros[macro_name][1]
           msg "  #{@proc.ruby_format(string)}", {:unlimited => true}
         else
-          errmsg "%s is not a defined macro" % macro_name
+          errmsg '%s is not a defined macro' % macro_name
         end
       end
     elsif @proc.macros.empty?
-      msg "No macros defined."
+      msg 'No macros defined.'
     else
       msg columnize_commands(@proc.macros.keys.sort)
     end
@@ -54,8 +54,8 @@ end
 
 if __FILE__ == $0
   # Demo it.
-  $0 = __FILE__ + 'notagain' # So we don't run this agin
+  $0 = __FILE__ + 'notagain' # So we don't run this again
   require_relative '../../mock'
-  cmd = MockDebugger::sub_setup(Trepan::Subcommand::ShowMacro)
+  cmd = MockDebugger::sub_setup(Trepan::Subcommand::InfoMacro)
   cmd.run(cmd.prefix + %w(u foo))
 end

data/processor/command/info_subcmd/program.rb

@@ -6,6 +6,8 @@ class Trepan::Subcommand::InfoProgram < Trepan::Subcommand
   unless defined?(HELP)
     Trepanning::Subcommand.set_name_prefix(__FILE__, self)
     HELP         = 'Information about debugged program and its environment'
+    MIN_ARGS     = 0
+    MAX_ARGS     = 0
     MIN_ABBREV   = 'pr'.size
     NEED_STACK   = true
   end

data/processor/command/info_subcmd/registers.rb

@@ -46,7 +46,11 @@ info reg lfp       # show lfp(0)
       key_name    = PREFIX.join('') + subcmd_name
       remain_args = args[3..-1]
       if all_regs.member?(key_name)
-        @subcmds.subcmds[key_name].run(remain_args) 
+        subcmd = @subcmds.subcmds[key_name]
+        if @proc.ok_for_running(subcmd, subcmd.class.const_get('CMD'),
+                                remain_args.size)
+          @subcmds.subcmds[key_name].run(remain_args) 
+        end
       elsif unavailable_regs.member?(key_name)
         msg("info registers: %s can not be displayed for frame type %s." % 
             [subcmd_name, @proc.frame.type])

data/processor/command/info_subcmd/registers_subcmd/dfp.rb

@@ -5,16 +5,15 @@ require_relative 'helper'
 
 class Trepan::Subcommand::InfoRegistersDfp < Trepan::SubSubcommand
   unless defined?(HELP)
+    Trepanning::SubSubcommand.set_name_prefix(__FILE__, self)
     HELP         = 'Show the value of the VM dynamic frame pointer (DFP)'
     MIN_ABBREV   = 'df'.size
-    NAME         = File.basename(__FILE__, '.rb')
     NEED_STACK   = true
-    PREFIX       = %W(info registers #{NAME})
   end
 
   include Registers
   def run(args)
-    register_array_index(PREFIX[-1], args)
+    register_array_index(PREFIX[-1], args[0])
   end
 end
 

data/processor/command/info_subcmd/registers_subcmd/helper.rb

@@ -1,18 +1,17 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 module Registers
-  def register_array_index(name, args, max_value=nil)
-    if args.size == 0
+  def register_array_index(name, arg, max_value=nil)
+    if !arg or arg.empty?
       # Form is: "info xx" which means "info xx 0"
       lookup_pos = position = 0
     else
-      position_str = args[0]
       opts = {
         :msg_on_error => 
-        "The 'info registers %s' command argument must eval to an integer. Got: %s" % [name, position_str],
-        # :min_value => 0,
-        :max_value => max_value
+        "The 'info registers %s' command argument must eval to an integer. Got: %s" % [name, arg],
+        :min_value => -10,
+        :max_value => max_value + 10
       }
-      position = @proc.get_an_int(position_str, opts)
+      position = @proc.get_an_int(arg, opts)
       return nil unless position
     end
     lookup_pos = 
@@ -28,7 +27,7 @@ module Registers
         # to do, possibly in the Ruby 1.9 interpeter, we'll handle
         # this here.  It is also conceivable to handle this in
         # thread_frame's sp handling.
-        position + 2
+        position + 3
       else
         position
       end

data/processor/command/info_subcmd/registers_subcmd/lfp.rb

@@ -1,21 +1,26 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../../base/subsubcmd'
 require_relative 'helper'
 
 class Trepan::Subcommand::InfoRegistersLfp < Trepan::SubSubcommand
   unless defined?(HELP)
-    HELP         = 'Show the value of the VM local frame pointer (LFP).
+    Trepanning::SubSubcommand.set_name_prefix(__FILE__, self)
+    HELP = <<EOH
+#{CMD} NUMBER
 
+Show the value of the VM local frame pointer (LFP).
 When a local variable is defined for the first time, this stack
 is pushed and the value for local variable is assigned to this stack entry.
 
 See also "info register sp".'
+EOH
 
     MIN_ABBREV   = 'lf'.size
-    NAME         = File.basename(__FILE__, '.rb')
+    MIN_ARGS     = 1
+    MAX_ARGS     = 1
     NEED_STACK   = true
-    PREFIX       = %w(info registers lfp)
+    SHORT_HELP   = "Show the value of the VM local frame pointer (LFP)."
   end
 
   include Registers
@@ -25,7 +30,7 @@ See also "info register sp".'
       msg "local_name not available for C function"
     else
       iseq = frame.iseq
-      index = register_array_index(PREFIX[-1], args, iseq.local_size-1)
+      index = register_array_index(PREFIX[-1], args[0], iseq.local_size-1)
       msg("local_name(%d)=%s" % [index, iseq.local_name(index)]) if index
     end
   end

data/processor/command/info_subcmd/registers_subcmd/pc.rb

@@ -1,19 +1,24 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../../base/subsubcmd'
 
 class Trepan::SubSubcommand::InfoRegistersPc < Trepan::SubSubcommand
   unless defined?(HELP)
-    HELP         = 'Show the value of the VM program counter (PC).
+    Trepanning::SubSubcommand.set_name_prefix(__FILE__, self)
+    HELP         = <<EOH
+#{CMD}
 
+Show the value of the VM program counter (PC).
 The VM program is an offset into the instruction sequence for the next
 VM instruction in the sequence to be executed. 
 
 See also "info disassemble" and "info registers".'
+EOH
     MIN_ABBREV   = 'pc'.size
-    NAME         = File.basename(__FILE__, '.rb')
     NEED_STACK   = true
-    PREFIX       = %W(info registers #{NAME})
+    MIN_ARGS     = 0
+    MAX_ARGS     = 0
+    SHORT_HELP   = 'Show the value of the VM program counter (PC).'
   end
 
   def run(args)

data/processor/command/info_subcmd/registers_subcmd/sp.rb

@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../../base/subsubcmd'
 require_relative 'helper'
 
 class Trepan::Subcommand::InfoRegistersSp < Trepan::SubSubcommand
   unless defined?(HELP)
-    NAME = File.basename(__FILE__, '.rb')
+    Trepanning::SubSubcommand.set_name_prefix(__FILE__, self)
     HELP = <<EOH
-usage: 
-   info register #{NAME} [NUMBER NUMBER ...|size]
+#{CMD} [NUMBER NUMBER ...|size]
 
 With no arguments, all SP values for the current frame of the debugged
 program are shown.  If a number is given, then the entry at that
@@ -26,7 +25,7 @@ EOH
 
     MIN_ABBREV   = 'sp'.size
     NEED_STACK   = true
-    PREFIX       = %W(info registers #{NAME})
+    SHORT_HELP   = "Show value(s) of the VM stack pointer (SP)."
   end
 
   include Registers

data/processor/command/info_subcmd/ruby.rb

@@ -15,8 +15,10 @@ See also constants: RUBY_DESCRIPTION, RUBY_VERSION, and RUBY_RELEASE_DATE."
     EOH
     MIN_ABBREV   = 'ru'.size
     NEED_STACK   = false
+    MIN_ARGS     = 0
+    MAX_ARGS     = 0
     SHORT_HELP   = 'Ruby version information'
-   end
+  end
 
   # def parse_options(args) # :nodoc
   #   options = {}

data/processor/command/info_subcmd/source.rb

@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require 'pp'
+require 'linecache'
+require 'columnize'
+require_relative '../base/subcmd'
+require_relative '../../../app/file'
+require_relative '../../../app/complete'
+
+class Trepan::Subcommand::InfoSource < Trepan::Subcommand
+  unless defined?(HELP)
+    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+    DEFAULT_FILE_ARGS = %w(size mtime sha1)
+
+    HELP = <<-EOH
+#{CMD} 
+
+Show information about the current source file. 
+EOH
+    MAX_ARGS     = 0
+    MIN_ABBREV   = 'so'.size  # Note we have "info frame"
+    NEED_STACK   = true
+  end
+
+  # completion %w(all brkpts iseq sha1 size stat)
+
+  include Trepanning
+
+  # Get file information
+  def run(args)
+    if not @proc.frame
+      errmsg('No frame - no default file.')
+      return false
+    end
+    frame_file = @proc.frame.source_container[1]
+    filename = LineCache::map_file(frame_file) || File.expand_path(frame_file)
+    canonic_name = @proc.canonic_file(filename)
+    canonic_name = LineCache::map_file(canonic_name) || canonic_name
+    m = filename
+    if LineCache::cached?(canonic_name)
+      m += ' is cached in debugger'
+      if canonic_name != filename
+        m += (' as:\n  ' + canonic_name)
+      end
+      m += '.'
+      msg(m)
+    end
+    max_line = LineCache::size(canonic_name)
+    msg 'File has %d lines.' % max_line if max_line
+    msg('SHA1 is %s.' % LineCache::sha1(canonic_name))
+    msg('Possible breakpoint line numbers:')
+    lines = LineCache.trace_line_numbers(canonic_name)
+    fmt_lines = columnize_numbers(lines)
+    msg(fmt_lines)
+    if SCRIPT_ISEQS__.member?(canonic_name)
+      msg("File contains instruction sequences:")
+      SCRIPT_ISEQS__[canonic_name].each do |iseq|
+        msg("\t%s %s" % [iseq, iseq.name.inspect])
+      end 
+    else
+      msg("Instruction sequences not recorded; there may be some, though.")
+    end
+    msg("Stat info:\n\t%s" % LineCache::stat(canonic_name).pretty_inspect)
+  end
+end
+
+if __FILE__ == $0
+  if !(ARGV.size == 1 && ARGV[0] == 'noload')
+    ISEQS__        = {}
+    SCRIPT_ISEQS__ = {}
+    ARGV[0..-1]    = ['noload']
+    load(__FILE__)
+  else    
+    require_relative '../../mock'
+    cmd = MockDebugger::sub_setup(Trepan::Subcommand::InfoSource, false)
+    cmd.run(cmd.prefix)
+  end
+end

data/processor/command/info_subcmd/stack.rb

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative '../base/subcmd'
+
+class Trepan::Subcommand::InfoStack < Trepan::Subcommand
+  unless defined?(HELP)
+    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+    HELP = 'Same thing as "backtrace"'
+    MIN_ABBREV   = 'st'.size
+    NEED_STACK   = true
+   end
+
+  def run(args)
+    @proc.commands['backtrace'].run(['backtrace'] + args[2..-1])
+  end
+end
+
+if __FILE__ == $0
+  # Demo it.
+  require_relative '../../mock'
+  cmd = MockDebugger::sub_setup(Trepan::Subcommand::InfoStack, false)
+  cmd.run(cmd.prefix)
+end

data/processor/command/kill.rb

@@ -50,18 +50,16 @@ Examples:
         errmsg("Signal name '#{sig}' is not a signal I know about.\n")
         return false
       end
-      if 'KILL' == sig || Signal['KILL'] == sig
-        @proc.intf.finalize
-      end
     else
-      if not (unconditional || confirm('Really quit?', false))
+      if unconditional || confirm('Really quit?', false)
+        sig = 'KILL'
+      else 
         msg('Kill not confirmed.')
         return
-      else 
-        sig = 'KILL'
       end
     end
     begin
+      @proc.intf.finalize  if 'KILL' == sig || Signal['KILL'] == sig
       Process.kill(sig, Process.pid)
     rescue Errno::ESRCH
       errmsg "Unable to send kill #{sig} to process #{Process.pid}"

data/processor/command/list.rb

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 require 'linecache'
 require_relative 'base/cmd'
+require_relative '../../app/cmd_parse'
 
 class Trepan::Command::ListCommand < Trepan::Command
   unless defined?(HELP)
@@ -49,11 +50,11 @@ just something that evaluates to a positive integer.
 Some examples:
 
 #{NAME} 5            # List centered around line 5
-#{NAME} 4+1          # Same as above.
+#{NAME} @5           # List lines centered around bytecode offset 5.
 #{NAME} 5>           # List starting at line 5
 #{NAME} foo.rb:5     # List centered around line 5 of foo.rb
 #{NAME} foo.rb 5     # Same as above.
-#{NAME} foo.rb:5>    # List starting around line 5 of foo.rb
+#{NAME}> foo.rb:5    # List starting around line 5 of foo.rb
 #{NAME} foo.rb  5 6  # list lines 5 and 6 of foo.rb
 #{NAME} foo.rb  5 2  # Same as above, since 2 < 5.
 #{NAME} foo.rb:5 2   # Same as above
@@ -63,7 +64,7 @@ Some examples:
                      # if . > 3. Otherwise we list from . to 3.
 #{NAME} -            # List lines previous to those just shown
 
-The output of the #{NAME} command give a line number, and some status
+The output of the #{NAME} command gives a line number, and some status
 information about the line and the text of the line. Here is some 
 hypothetical #{NAME} output modeled roughly around line 251 of one
 version of this code:
@@ -86,25 +87,19 @@ disabled.
     SHORT_HELP    = 'List source code'
   end
 
+  include Trepan::CmdParser
+  
   # If last is less than first, assume last is a count rather than an
   # end line number.
   def adjust_last(first, last)
     last < first ? first + last - 1 : last
   end
 
-  # What a f*cking mess. Necessitated I suppose because we want to 
-  # allow somewhat flexible parsing with either module names, files or none
-  # and optional line counts or end-line numbers.
-  
-  # Parses arguments for the "list" command and returns the tuple:
-  # filename, start, last
-  # or sets these to nil if there was some problem.
-  def parse_list_cmd(args, listsize, center_correction)
-    
+  def frame_filename
     frame = @proc.frame
     
     container = @proc.frame_container(frame, false)
-
+    
     # FIXME: put into a helper routine
     # See also duplicate code in print_location
     if container[0] != 'file'
@@ -115,84 +110,74 @@ disabled.
       end
       container = try_container if try_container[0] == 'file'
     end
-
-    filename = container[1]
-    
-    last = nil
-    if args.empty? and not frame
-      errmsg("No Ruby program loaded.")
-      return nil, nil, nil
-    end
     
-    if args.size > 0
-      if args[0] == '-'
-        return no_frame_msg unless @proc.line_no
-        first = [1, @proc.line_no - 2*listsize - 1].max
-      elsif args[0] == '.'
-        return no_frame_msg unless @proc.line_no
-        if args.size == 2
-          opts = {
-            :msg_on_error => 
-            "#{NAME} command last or count parameter expected, " +
-            'got: %s.' % args[2]
-          }
-          second = @proc.get_an_int(args[1], opts)
-          return nil, nil, nil unless second
-          first = @proc.frame_line 
-          last = adjust_last(first, second)
-        else
-          first = [1, @proc.frame_line - center_correction].max
-        end
+    return container[1]
+  end
 
-      else
-        modfunc, container, first = @proc.parse_position(args[0])
-        if first == nil and container == nil
-          # error should have been shown previously
-          return nil, nil, nil
-        end
-        if args.size == 1
-          first = 1 if !first and modfunc
-          first = [1, first - center_correction].max
-        elsif args.size == 2 or (args.size == 3 and modfunc)
-          opts = {
-            :msg_on_error => 
-            "#{NAME} command starting line expected, got %s." % args[-1]
-          }
-          last = @proc.get_an_int(args[1], opts)
-          return nil, nil, nil unless last
-          if modfunc
-            if first
-              first = last
-              if args.size == 3 and modfunc
-                opts[:msg_on_error] = 
-                  ("#{NAME} command last or count parameter expected, " +
-                   'got: %s.' % args[2])
-                last = @proc.get_an_int(args[2], opts)
-                return nil, nil, nil unless last
-              end
-            end
+
+  # What a f*cking mess. Necessitated I suppose because we want to 
+  # allow somewhat flexible parsing with either module names, files or none
+  # and optional line counts or end-line numbers.
+  
+  # Parses arguments for the "list" command and returns the tuple:
+  # filename, start, last
+  # or sets these to nil if there was some problem.
+  def parse_list_cmd(arg_str, listsize, center_correction)
+
+    iseq = nil
+    if arg_str.empty?
+      filename = frame_filename
+      first = [1, @proc.frame_line - center_correction].max
+    else
+      list_cmd_parse = parse_list(arg_str, 
+                                  :file_exists_proc => @proc.file_exists_proc)
+      last = list_cmd_parse.num
+      position  = list_cmd_parse.position
+
+      if position.is_a?(String)
+        if position == '-'
+          return no_frame_msg unless @proc.line_no
+          first = [1, @proc.line_no - 2*listsize - 1].max
+        elsif position == '.'
+          return no_frame_msg unless @proc.line_no
+          if (second = list_cmd_parse.num)
+            first = @proc.frame_line 
+            last = adjust_last(first, second)
+          else
+            first = [1, @proc.frame_line - center_correction].max
+            last = first + listsize - 1
           end
-          last = adjust_last(first, last)
-        elsif not modfunc
-          errmsg('At most 2 parameters allowed when no module' +
-                  ' name is found/given. Saw: %d parameters' % args.size)
-          return nil, nil, nil
+        end
+        filename = frame_filename
+      else
+        meth, filename, offset, offset_type = @proc.parse_position(position)
+        iseq = meth.iseq if meth
+        return unless filename
+        if offset_type == :line
+          first = offset
+        elsif meth
+          iseq, first, vm_offset = 
+            @proc.position_to_line_and_offset(meth.iseq, filename,
+                                              position,  offset_type)
+          return [nil] * 3 unless first
+        elsif !offset 
+          # Have just a filename. Go with line 1
+          first = 1
         else
-          errmsg(('At most 3 parameters allowed when a module' +
-                  ' name is given. Saw: %d parameters') % args.size)
-          return nil, nil, nil
+          errmsg "Dunno what to do here"
+          return [nil] * 3
         end
       end
-    elsif !@proc.line_no and @proc.frame
-      first = [1, @proc.frame_line - center_correction].max
+    end
+
+    if last
+      last = adjust_last(first, last)
     else
-      first = [1, @proc.line_no - center_correction].max 
+      first = [1, first - center_correction].max 
+      last = first + listsize - 1 unless last
     end
-    last = first + listsize - 1 unless last
-  
-    LineCache::cache(container[1]) unless 
-        'file' != container[0] || LineCache::cached?(container[1])
-    return container, first, last
+    LineCache::cache(filename) unless LineCache::cached?(filename)
+    return iseq, filename, first, last
   end
 
   def no_frame_msg
@@ -201,6 +186,10 @@ disabled.
   end
     
   def run(args)
+    if args.empty? and not frame
+      errmsg("No Ruby program loaded.")
+      return
+    end
     listsize = settings[:maxlist]
     center_correction = 
       if args[0][-1..-1] == '>'
@@ -209,22 +198,22 @@ disabled.
         (listsize-1) / 2
       end
 
-    container, first, last = 
-      parse_list_cmd(args[1..-1], listsize, center_correction)
-    frame = @proc.frame
-    return unless container
+    iseq, filename, first, last = 
+      parse_list_cmd(@proc.cmd_argstr, listsize, center_correction)
+    return unless filename
+    container = iseq ? iseq.source_container : ['file', filename]
     breaklist = @proc.brkpts.line_breaks(container)
 
     # We now have range information. Do the listing.
-    max_line = LineCache::size(container[1])
+    max_line = LineCache::size(filename)
     unless max_line 
-      errmsg('File "%s" not found.' % container[1])
+      errmsg('File "%s" not found.' % filename)
       return
     end
 
     if first > max_line
       errmsg('Bad line range [%d...%d]; file "%s" has only %d lines' %
-             [first, last, container[1], max_line])
+             [first, last, filename, max_line])
       return
     end
 
@@ -235,11 +224,12 @@ disabled.
 
     begin
       opts = {
-        :reload_on_change => @proc.reload_on_change,
+        :reload_on_change => settings[:reload],
         :output => settings[:highlight]
       }
+      frame = @proc.frame
       first.upto(last).each do |lineno|
-        line = LineCache::getline(container[1], lineno, opts)
+        line = LineCache::getline(filename, lineno, opts)
         unless line
           msg('[EOF]')
           break
@@ -256,7 +246,7 @@ disabled.
                ' ' 
              end
         s += (frame && lineno == @proc.frame_line &&
-              container == frame.source_container) ? '->' : a_pad
+              filename == frame.source_container[1]) ? '->' : a_pad
         msg(s + "\t" + line, {:unlimited => true})
         @proc.line_no = lineno
       end
@@ -278,69 +268,77 @@ if __FILE__ == $0
     require_relative '../frame'
     dbgr, cmd = MockDebugger::setup
     cmd.proc.send('frame_initialize')
-    LineCache::cache(__FILE__)
-    cmd.run([cmd.name])
-    cmd.run([cmd.name, __FILE__ + ':10'])
 
     def run_cmd(cmd, args)
+      cmd.proc.instance_variable_set('@cmd_argstr', args[1..-1].join(' '))
+      cmd.run(args)
+    end
+
+    LineCache::cache(__FILE__)
+    run_cmd(cmd, [cmd.name])
+    run_cmd(cmd, [cmd.name, __FILE__ + ':10'])
+
+    def run_cmd2(cmd, args)
       seps = '--' * 10
       puts "%s %s %s" % [seps, args.join(' '), seps]
-      cmd.run(args)
+      run_cmd(cmd,args)
     end
       
 
     load 'tmpdir.rb'
-    run_cmd(cmd, %w(list tmpdir.rb 10))
-    run_cmd(cmd, %w(list tmpdir.rb))
+    run_cmd2(cmd, %w(list tmpdir.rb 10))
+    run_cmd2(cmd, %w(list tmpdir.rb))
 
     # cmd.proc.frame = sys._getframe()
     # cmd.proc.setup()
-    # cmd.run(['list'])
+    # run_cmd2(['list'])
 
-    run_cmd(cmd, %w(list .))
-    run_cmd(cmd, %w(list 30))
+    run_cmd2(cmd, %w(list .))
+    run_cmd2(cmd, %w(list 30))
 
-    # cmd.run(['list', '9+1'])
+    # run_cmd2(['list', '9+1'])
 
-    run_cmd(cmd, %w(list> 10))
-    run_cmd(cmd, %w(list 3000))
-    run_cmd(cmd, %w(list run_cmd))
+    run_cmd2(cmd, %w(list> 10))
+    run_cmd2(cmd, %w(list 3000))
+    run_cmd2(cmd, %w(list run_cmd2))
 
     p = Proc.new do 
       |x,y| x + y
     end
-    run_cmd(cmd, %w(list p))
+    require 'thread_frame'
+    tf = RubyVM::ThreadFrame.current
+    cmd.proc.frame_setup(tf)
+    run_cmd2(cmd, %w(list p))
 
     # Function from a file found via an instruction sequence
-    run_cmd(cmd, %w(list Columnize.columnize))
+    run_cmd2(cmd, %w(list Columnize.columnize))
 
     # Use Class/method name. 15 isn't in the function - should this be okay?
-    run_cmd(cmd, %W(#{cmd.name} Columnize.columnize 15))
+    run_cmd2(cmd, %W(#{cmd.name} Columnize.columnize 15))
 
     # Start line and count, since 3 < 30
-    run_cmd(cmd, %W(#{cmd.name} Columnize.columnize 30 3))
+    run_cmd2(cmd, %W(#{cmd.name} Columnize.columnize 30 3))
 
     # Start line finish line 
-    run_cmd(cmd, %W(#{cmd.name} Columnize.columnize 40 50))
+    run_cmd2(cmd, %W(#{cmd.name} Columnize.columnize 40 50))
 
     # puts '--' * 10
-    # cmd.run([cmd.name, os.path.abspath(__file__)+':3', '4'])
+    # run_cmd2([cmd.name, os.path.abspath(__file__)+':3', '4'])
     # puts '--' * 10
-    # cmd.run([cmd.name, os.path.abspath(__file__)+':3', '12-10'])
-    # cmd.run([cmd.name, 'os.path:5'])
+    # run_cmd2([cmd.name, os.path.abspath(__file__)+':3', '12-10'])
+    # run_cmd2([cmd.name, 'os.path:5'])
 
-    require 'thread_frame'
-    tf = RubyVM::ThreadFrame.current
-    cmd.proc.frame_setup(tf)
     brkpt_cmd = cmd.proc.instance_variable_get('@commands')['break']
     brkpt_cmd.run(['break'])
     line = __LINE__
-    run_cmd(cmd, [cmd.name, __LINE__.to_s])
+    run_cmd2(cmd, [cmd.name, __LINE__.to_s])
 
     disable_cmd = cmd.proc.instance_variable_get('@commands')['disable']
     disable_cmd.run(['disable', '1'])
 
-    run_cmd(cmd, [cmd.name, line.to_s])
-    run_cmd(cmd, %W(#{cmd.name} run_cmd))
+    run_cmd2(cmd, [cmd.name, line.to_s])
+    run_cmd2(cmd, %W(#{cmd.name} run_cmd2))
+    run_cmd2(cmd, %W(#{cmd.name} run_cmd2))
+    run_cmd2(cmd, %W(#{cmd.name} @713))
   end
 end