trepanning 0.1.3 → 0.1.4

data/processor/command/info_subcmd/{globals.rb → variables_subcmd/globals.rb}

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require 'columnize'
-require_relative '../base/subcmd'
-require_relative '../../../app/frame'
+require_relative 'locals'
 
-class Trepan::Subcommand::InfoGlobals < Trepan::Subcommand
-  unless defined?(HELP)
+class Trepan::Subcommand::InfoVariablesGlobals <
+    Trepan::Subcommand::InfoVariablesLocals
+  Trepan::Util.suppress_warnings {
     Trepanning::Subcommand.set_name_prefix(__FILE__, self)
     HELP         = <<-EOH
 #{CMD}
@@ -18,14 +17,18 @@ EOH
     SHORT_HELP   = 'Show global variables'
     MIN_ARGS     = 0
     MAX_ARGS     = 1
-    MIN_ABBREV   = 'gl'.size 
     NEED_STACK   = true
+  }
+
+  def get_names
+    global_variables
   end
 
   def run(args)
-    if args.size == 3
+    if args.size == 2
       if 0 == 'names'.index(args[-1].downcase)
-        if global_variables.empty?
+        names = get_names()
+        if names.empty?
             msg "No global variables defined."
         else
           section "Global variable names:"
@@ -36,16 +39,17 @@ EOH
           msg mess
         end
       else
-        errmsg("unrecognized argument #{args[2]}")
+        errmsg("unrecognized argument: #{args[-1]}")
       end
-    elsif args.size == 2
-      if global_variables.empty?
+    elsif args.size == 1
+      names = get_names
+      if names.empty?
         msg "No global variables defined."
       else
         section "Global variables:"
-        global_variables.sort.each do |var_name| 
-          s = @proc.debug_eval(var_name)
-          msg("#{var_name} = #{s.inspect}")
+        names.sort.each do |var_name| 
+          s = @proc.debug_eval(var_name.to_s)
+          msg("#{var_name} = #{s.inspect}", :code=>true)
         end
       end
     else
@@ -56,8 +60,9 @@ end
 
 if __FILE__ == $0
   # Demo it.
-  require_relative '../../mock'
-  cmd = MockDebugger::sub_setup(Trepan::Subcommand::InfoGlobals, false)
+  require_relative '../../../mock'
+  cmd = MockDebugger::subsub_setup(Trepan::Subcommand::InfoVariablesGlobals, 
+                                   false)
   cmd.run(cmd.prefix)
   cmd.run(cmd.prefix + ['name'])
 end

data/processor/command/info_subcmd/variables_subcmd/instance.rb

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative 'locals'
+
+class Trepan::Subcommand::InfoVariablesInstance < 
+    Trepan::Subcommand::InfoVariablesLocals
+  Trepan::Util.suppress_warnings {
+    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+    HELP         = <<-EOH
+#{CMD}
+#{CMD} [names]
+
+Show instance variables of the current stack frame.
+Normally for each which show both the name and value. If you just
+want a list of names add parameter 'names'.
+EOH
+    SHORT_HELP   = 'Show instance variables of the current stack frame'
+    MIN_ARGS     = 0
+    MAX_ARGS     = 1
+    MIN_ABBREV   = 'iv'.size 
+    NEED_STACK   = true
+  }
+
+  def get_names
+    @proc.debug_eval('self.instance_variables')
+  end
+
+  def run(args)
+    run_for_type(args, 'instance', @proc.debug_eval('self'))
+  end
+end
+
+if __FILE__ == $0
+  # Demo it.
+  require_relative '../../mock'
+  cmd = 
+    MockDebugger::subsub_setup(Trepan::Subcommand::InfoVariables,
+                               Trepan::Subcommand::InfoVariablesInstance)
+  cmd.run(cmd.prefix)
+  cmd.run(cmd.prefix + ['name'])
+end

data/processor/command/info_subcmd/variables_subcmd/locals.rb

@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require 'columnize'
+require_relative '../../base/subsubcmd'
+require_relative '../../../../app/frame'
+require_relative '../../../../app/util'
+
+class Trepan::Subcommand::InfoVariablesLocals < Trepan::SubSubcommand
+  Trepan::Util.suppress_warnings {
+    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+    HELP         = <<-EOH
+#{CMD}
+#{CMD} [names]
+
+Show local variables including parameters of the current stack frame.
+Normally for each which show both the name and value. If you just
+want a list of names add parameter 'names'.
+EOH
+    SHORT_HELP   = 'Show local variables of the current stack frame'
+    MIN_ARGS     = 0
+    MAX_ARGS     = 1
+    MIN_ABBREV   = 'lo'.size 
+    NEED_STACK   = true
+  }
+
+  def complete(prefix)
+    ['name']
+  end
+
+  def get_names
+    iseq = @proc.frame.iseq
+    0.upto(iseq.local_size-2).map do
+      |i|
+      iseq.local_name(i)
+    end
+  end
+
+  def run_for_type(args, type, klass=nil)
+    suffix = klass ? " for #{klass.to_s}" : '' rescue ''
+    if args.size == 2
+      if 0 == 'names'.index(args[-1].downcase)
+        if 'CFUNC' == @proc.frame.type
+          errmsg("info #{type} names not supported for C frames")
+        else
+          if names.empty?
+            msg "No #{type} variables defined."
+          else
+            section "#{type.capitalize} variable names#{suffix}:"
+            width = settings[:maxwidth]
+            mess = Columnize::columnize(names, 
+                                        @proc.settings[:maxwidth], '  ',
+                                        false, true, ' ' * 2).chomp
+            msg mess
+          end
+        end
+      else
+        errmsg("unrecognized argument: #{args[-1]}")
+      end
+    elsif args.size == 1
+      if 'CFUNC' == @proc.frame.type
+        argc = @proc.frame.argc
+        if argc > 0 
+          1.upto(argc).each do |i| 
+            msg "#{i}: #{@proc.frame.sp(argc-i+3).inspect}"
+          end
+        else
+          msg("No parameters in C call; showing other C locals is not supported.")
+        end
+      else
+        if names.empty?
+          msg "No #{type} variables defined#{suffix}."
+        else
+          section "#{type.capitalize} variables#{suffix}:"
+          names.each do |var_name| 
+            var_value = 
+              @proc.safe_rep(@proc.debug_eval_no_errmsg(var_name).inspect)
+            msg("#{var_name} = #{var_value}", :code => true)
+          end
+        end
+      end
+    else
+      errmsg("Wrong number of arguments #{args.size}")
+    end
+  end
+  def run(args)
+    run_for_type(args, 'local', @proc.debug_eval('self'))
+  end
+end
+
+if __FILE__ == $0
+  # Demo it.
+  require_relative '../../../mock'
+  require_relative '../variables'
+  cmd = MockDebugger::subsub_setup(Trepan::SubSubcommand::InfoVariables,
+                                   Trepan::SubSubcommand::InfoVariablesLocals
+                                   )
+  cmd.run([])
+  cmd.run(['name'])
+end

data/processor/command/kill.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../../app/complete'
 class Trepan::Command::KillCommand < Trepan::Command
 
@@ -25,7 +25,7 @@ Examples:
   #{NAME} kill # same as above
   #{NAME} -9   # same as above
   #{NAME}  9   # same as above
-  #{NAME}! 9   # same as above
+  #{NAME}! 9   # above, but unconditional
     HELP
 
     ALIASES      = %w(kill!)
@@ -35,9 +35,10 @@ Examples:
   end
   
   def complete(prefix)
-    completions = Signal.list.keys + 
+    completions = Signal.list.keys + Signal.list.keys.map{|k| k.downcase} +
       Signal.list.values.map{|i| i.to_s} + 
-      Signal.list.values.map{|i| (-i).to_s} 
+      Signal.list.values.map{|i| (-i).to_s} + 
+      ['unconditionally']
     Trepan::Complete.complete_token(completions, prefix)
   end
     
@@ -59,10 +60,10 @@ Examples:
       end
     end
     begin
-      @proc.intf.finalize  if 'KILL' == sig || Signal['KILL'] == sig
+      @proc.intf.finalize if 'KILL' == sig || Signal.list['KILL'] == sig
       Process.kill(sig, Process.pid)
-    rescue Errno::ESRCH
-      errmsg "Unable to send kill #{sig} to process #{Process.pid}"
+    rescue Errno::ESRCH, Errno::EINVAL, Errno::EPERM, RangeError
+      errmsg "Unable to send kill #{sig} to process #{Process.pid}: #{$!}"
     end
   end
 end
@@ -70,7 +71,7 @@ end
 if __FILE__ == $0
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
-  %w(fooo 1 -1 HUP -9).each do |arg| 
+  %w(fooo 100 1 -1 HUP -9).each do |arg| 
     puts "#{cmd.name} #{arg}"
     cmd.run([cmd.name, arg])
     puts '=' * 40

data/processor/command/list.rb

@@ -1,8 +1,8 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 # -*- coding: utf-8 -*-
 require 'linecache'
-require_relative 'base/cmd'
-require_relative '../../app/cmd_parse'
+require_relative '../command'
+require_relative '../list'
 
 class Trepan::Command::ListCommand < Trepan::Command
   unless defined?(HELP)
@@ -41,8 +41,9 @@ A LOCATION is a either
 If the location form is used with a subsequent parameter, the
 parameter is the starting line number.  When there two numbers are
 given, the last number value is treated as a stopping line unless it
-is less than the start line, in which case it is taken to mean the
-number of lines to list instead.
+is positive and less than the start line. In this case, it is taken to
+mean the number of lines to list instead. If last is negative, we start
+that many lines back from first and list to first.
 
 Wherever a number is expected, it does not need to be a constant --
 just something that evaluates to a positive integer.
@@ -58,6 +59,7 @@ Some examples:
 #{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
+#{NAME} foo.rb 15 -5 # List lines 10..15 of foo
 #{NAME} FileUtils.cp # List lines around the FileUtils.cp function.
 #{NAME} .            # List lines centered from where we currently are stopped
 #{NAME} . 3          # List 3 lines starting from where we currently are stopped
@@ -81,110 +83,12 @@ enabled, while at line 255 there is an breakpoint 2 which is
 disabled.
     HELP
 
-    ALIASES       = %W(l #{NAME}> l>)
+    ALIASES       = %W(l #{NAME}> l> cat)
     CATEGORY      = 'files'
     MAX_ARGS      = 3
     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
-
-  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'
-      try_container = container
-      while try_container[0] != 'file' && frame.prev do
-        frame            = frame.prev
-        try_container = @proc.frame_container(frame, false)
-      end
-      container = try_container if try_container[0] == 'file'
-    end
-    
-    return container[1]
-  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
-        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 "Dunno what to do here"
-          return [nil] * 3
-        end
-      end
-    end
-
-    if last
-      last = adjust_last(first, last)
-    else
-      first = [1, first - center_correction].max 
-      last = first + listsize - 1 unless last
-    end
-    LineCache::cache(filename) unless LineCache::cached?(filename)
-    return iseq, filename, first, last
-  end
-
-  def no_frame_msg
-    errmsg("No Ruby program loaded.")
-    return nil, nil, nil
-  end
-    
   def run(args)
     if args.empty? and not frame
       errmsg("No Ruby program loaded.")
@@ -199,7 +103,7 @@ disabled.
       end
 
     iseq, filename, first, last = 
-      parse_list_cmd(@proc.cmd_argstr, listsize, center_correction)
+      @proc.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)
@@ -258,8 +162,6 @@ end
 
 if __FILE__ == $0
   if !(ARGV.size == 1 && ARGV[0] == 'noload')
-    ISEQS__        = {}
-    SCRIPT_ISEQS__ = {}
     ARGV[0..-1]    = ['noload']
     load(__FILE__)
   else    
@@ -339,6 +241,6 @@ if __FILE__ == $0
     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))
+    run_cmd2(cmd, %W(#{cmd.name} @0))
   end
 end

data/processor/command/macro.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../eval'
 class Trepan::Command::MacroCommand < Trepan::Command
 
@@ -10,25 +10,43 @@ class Trepan::Command::MacroCommand < Trepan::Command
 #{NAME} MACRO-NAME PROC-OBJECT
 
 Define MACRO-NAME as a debugger macro. Debugger macros get a list of
-arguments. 
+arguments. Debugger macros get a list of arguments which you supply
+without parenthesis or commas. See below for an example.
 
-The macro should return either a String or an Array of Strings which
-is substituted for the command.  If the return is a String, that gets
-tokenized by a simple String#split .  Note that macro processing is
-done right after splitting on ;; so if the macro returns a string
-containing ;; this will not be handled on the string returned.
+The macro (really a Ruby Proc) should return either a String or an
+Array of Strings. The string in both cases are strings of debugger
+commands.  If the return is a String, that gets tokenized by a simple
+String#split .  Note that macro processing is done right after
+splitting on ;; so if the macro returns a string containing ;; this
+will not be handled on the string returned.
 
 If instead, Array of Strings is returned, then the first string is
-unshifted from the array and executed. The remaning strings are pushed
+shifted from the array and executed. The remaining strings are pushed
 onto the command queue. In contrast to the first string, subsequent
 strings can contain other macros, and ;; in those strings will be
 split into separate commands.
 
-Here is an example. The below creates a macro called finish+ which
+Here is an example. The below creates a macro called fin+ which
 issues two commands 'finish' followed by 'step':
 
   macro fin+ Proc.new{|*args| %w(finish step)}
 
+If you wanted to parameterize the argument of the 'finish' command
+you could do that this way:
+
+  macro fin+ Proc.new{|*args| ['finish \#{args[0]}' 'step']}
+
+Invoking with 
+  fin+ 3
+
+would expand to ["finish 3", "step"]
+
+If you were to add another parameter for 'step', the note that the 
+invocation might be 
+  fin+ 3 2
+
+rather than 'fin+(3,2)' or 'fin+ 3, 2'.
+
 Here is another example using arguments. I use the following to debug
 a debugger command:
 

data/processor/command/next.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 
 class Trepan::Command::NextCommand < Trepan::Command
 

data/processor/command/nocache.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative '../command'
 class Trepan::Command::NoCacheCommand < Trepan::Command
 
   unless defined?(HELP)

data/processor/command/parsetree.rb

@@ -3,7 +3,7 @@
 begin
   require 'rubygems'
   require 'parse_tree'
-  require_relative 'base/cmd'
+  require_relative '../command'
   require_relative '../../app/cmd_parse'
   class Trepan::Command::ParseTreeCommand < Trepan::Command
     

data/processor/command/pp.rb

@@ -2,7 +2,7 @@
 # Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'
 require 'pp'
-require_relative 'base/cmd'
+require_relative '../command'
 class Trepan::Command::PPCommand < Trepan::Command
 
   unless defined?(HELP)

data/processor/command/pr.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 class Trepan::Command::PrCommand < Trepan::Command
 
   unless defined?(HELP)

data/processor/command/ps.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../eval'
 class Trepan::Command::PsCommand < Trepan::Command
 

data/processor/command/quit.rb

@@ -1,5 +1,5 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative '../command'
 class Trepan::Command::QuitCommand < Trepan::Command
 
   unless defined?(HELP)
@@ -16,7 +16,7 @@ to the OS. If no exit code is given, 0 is used.
 
 Examples: 
   #{NAME}                 # quit prompting if we are interactive
-  #{NAME} conditionally   # quit without prompting
+  #{NAME} unconditionally # quit without prompting
   #{NAME}!                # same as above
   #{NAME} 0               # same as "quit"
   #{NAME}! 1              # unconditional quit setting exit code 1
@@ -36,7 +36,7 @@ See also the commands "exit" and "kill".
   # This method runs the command
   def run(args)
     unconditional = 
-      if args.size > 1 && args[1] == 'unconditionally'
+      if args.size > 1 && args[-1] == 'unconditionally'
         args.shift
         true
       elsif args[0][-1] == '!'
@@ -48,8 +48,17 @@ See also the commands "exit" and "kill".
       msg('Quit not confirmed.')
       return
     end
-
-    exitrc = (args.size > 1) ? exitrc = Integer(args[1]) rescue 0 : 0
+    
+    if (args.size > 1)
+      if  args[1] =~ /\d+/
+        exitrc = args[1].to_i;
+      else
+        errmsg "Bad an Integer return type \"#{args[1]}\"";
+        return;
+      end
+    else
+      exitrc = 0
+    end
     # No graceful way to stop threads...
     @proc.finalize
     @proc.dbgr.intf[-1].finalize
@@ -60,6 +69,8 @@ end
 if __FILE__ == $0
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
-  fork { cmd.run([cmd.name]) }
+  Process.fork { cmd.run([cmd.name]) } if 
+    Process.respond_to?(:fork) 
+  cmd.run([cmd.name, 'foo'])
   cmd.run([cmd.name, '5'])
 end

data/processor/command/raise.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 class Trepan::Command::RaiseCommand < Trepan::Command
 
   unless defined?(HELP)

data/processor/command/reload.rb

@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative 'base/submgr'
+require_relative '../../app/util'
 
 class Trepan::Command::ReloadCommand < Trepan::SubcommandMgr
-  # Silence already initialized constant .. warnings
-  old_verbose = $VERBOSE  
-  $VERBOSE    = nil
-  NAME          = File.basename(__FILE__, '.rb')
-  ALIASES       = %w(rel)
-  HELP = 'Reload information'
-  CATEGORY      = 'data'
-  NEED_STACK    = false
-  SHORT_HELP    = 'Reload information'
-  $VERBOSE      = old_verbose 
+  Trepan::Util.suppress_warnings {
+    NAME          = File.basename(__FILE__, '.rb')
+    ALIASES       = %w(rel)
+    HELP          = 'Reload information'
+    CATEGORY      = 'data'
+    NEED_STACK    = false
+    SHORT_HELP    = 'Reload information'
+  }
+
   def initialize(proc)
     super
   end

data/processor/command/restart.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../../app/run'
 class Trepan::Command::RestartCommand < Trepan::Command
 

data/processor/command/save.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 class Trepan::Command::SaveCommand < Trepan::Command
 
   unless defined?(HELP)

data/processor/command/server.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'optparse'
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../../app/default'
 require_relative '../../interface/server'   # server interface (remote debugging)
 class Trepan::Command::ServerCommand < Trepan::Command