trepanning 0.0.6 → 0.0.8

data/processor/command/show_subcmd/auto_subcmd/list.rb

@@ -15,22 +15,7 @@ end
 if __FILE__ == $0
   # Demo it.
   require_relative '../../../mock'
-  require_relative '../../../subcmd'
-  name = File.basename(__FILE__, '.rb')
-
-  # FIXME: DRY the below code
-  dbgr, show_cmd = MockDebugger::setup('show')
-  testcmdMgr     = Trepan::Subcmd.new(show_cmd)
-  auto_cmd       = Trepan::SubSubcommand::ShowAuto.new(dbgr.core.processor, 
-                                                       show_cmd)
-
-  # FIXME: remove the 'join' below
-  cmd_name       = Trepan::SubSubcommand::ShowAutoList::PREFIX.join('')
-  autox_cmd      = Trepan::SubSubcommand::ShowAutoList.new(show_cmd.proc, auto_cmd,
-                                                           cmd_name)
-  # require_relative '../../../../lib/trepanning'
-  # dbgr = Trepan.new(:set_restart => true)
-  # dbgr.debugger
-  autox_cmd.run([])
-
+  require_relative '../auto'
+  cmd = MockDebugger::subsub_setup(Trepan::SubSubcommand::ShowAuto,
+                                   Trepan::SubSubcommand::ShowAutoList)
 end

data/processor/command/show_subcmd/basename.rb

@@ -4,8 +4,10 @@ require_relative '../base/subcmd'
 
 class Trepan::Subcommand::ShowBasename < Trepan::ShowBoolSubcommand
   unless defined?(HELP)
-    HELP = "Show only file basename in showing file names"
+    HELP       = "Show only file basename in showing file names"
     MIN_ABBREV = 'ba'.size
+    NAME       = File.basename(__FILE__, '.rb')
+    PREFIX     = %W(show #{NAME})
   end
 
 end

data/processor/command/show_subcmd/hidelevel.rb

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative '../base/subsubcmd'
+
+class Trepan::Subcommand::ShowHidelevel < Trepan::ShowIntSubcommand
+  unless defined?(HELP)
+    HELP = 'Show the number of stack levels to hide'
+    MIN_ABBREV   = 'hide'.size
+    NAME         = File.basename(__FILE__, '.rb')
+    PREFIX       = %w(show hidelevel)
+  end
+  def run(args)
+    if @proc.settings[:hidelevel]
+      super
+    else
+      help = self.class.const_get(:HELP)
+      msg "%s is auto selection." % help[5..-1].capitalize
+    end
+  end
+
+end
+
+if __FILE__ == $0
+  # Demo it.
+  require_relative '../../mock'
+
+  # FIXME: DRY the below code
+  dbgr, cmd = MockDebugger::setup('show')
+  subcommand = Trepan::Subcommand::ShowHidelevel.new(cmd)
+
+  subcommand.run(subcommand.name)
+  subcommand.proc.settings[:hidelevel] = 1
+  subcommand.run(subcommand.name)
+  
+  # require_relative '../../../../lib/trepanning'
+  # dbgr = Trepan.new
+  # dbgr.debugger
+  subcommand.summary_help(subcommand.name)
+  puts
+  puts '-' * 20
+end

data/processor/command/show_subcmd/max.rb

@@ -27,6 +27,6 @@ if __FILE__ == $0
   cmd_args = ['show', name]
   show_cmd.instance_variable_set('@last_args', cmd_args)
   # require_relative '../../../lib/trepanning'
-  # Trepan.debug(:set_restart => true)
+  # Trepan.debug
   command.run(cmd_args)
 end

data/processor/command/show_subcmd/trace_subcmd/buffer.rb

@@ -77,7 +77,7 @@ if __FILE__ == $0
                                                               trace_cmd,
                                                               cmd_name)
   # require_relative '../../../../lib/trepanning'
-  # dbgr = Trepan.new(:set_restart => true)
+  # dbgr = Trepan.new
   # dbgr.debugger
   tb_cmd.run([])
 

data/processor/command/show_subcmd/trace_subcmd/print.rb

@@ -31,7 +31,7 @@ if __FILE__ == $0
                                                              trace_cmd,
                                                              cmd_name)
   # require_relative '../../../../lib/trepanning'
-  # dbgr = Trepan.new(:set_restart => true)
+  # dbgr = Trepan.new
   # dbgr.debugger
   tb_cmd.run([])
 

data/processor/command/source.rb

@@ -10,7 +10,7 @@ class Trepan::Command::SourceCommand < Trepan::Command
   unless defined?(HELP)
     NAME         = File.basename(__FILE__, '.rb')
     HELP = <<-HELP
-#{NAME} [-v][-Y|-N][-c] FILE
+#{NAME} [-v][-Y|-N][-c][q] FILE
 
 Read debugger commands from a file named FILE.  Optional -v switch
 (before the filename) causes each command in FILE to be echoed as it
@@ -33,6 +33,8 @@ unless option -c is given.
     verbose = false
     parms   = args[1..-1]
     opts    = {}
+    intf = @proc.dbgr.intf
+    output  = intf[-1].output
     parms.each do |arg|
       case arg
       when '-v'
@@ -43,6 +45,8 @@ unless option -c is given.
         opts[:confirm_val]    = false
       when '-c'
         opts[:abort_on_error] = false
+      when '-q'
+        output = Trepan::OutputNull.new(nil)
       end
     end
     
@@ -55,10 +59,7 @@ unless option -c is given.
     end
     
     # Push a new debugger interface.
-    intf = @proc.dbgr.intf
-    script_intf = Trepan::ScriptInterface.new(expanded_file,
-                                              intf[-1].output,
-                                              opts)
+    script_intf = Trepan::ScriptInterface.new(expanded_file, output, opts)
     intf << script_intf
     return false
   end

data/processor/command/undisplay.rb

@@ -8,7 +8,6 @@ class Trepan::Command::UndisplayCommand < Trepan::Command
   unless defined?(HELP)
     NAME = File.basename(__FILE__, '.rb')
     HELP = <<EOH
-
 undisplay DISPLAY_NUMBER ...
 Cancel some expressions to be displayed when program stops.
 Arguments are the code numbers of the expressions to stop displaying.

data/processor/default.rb

@@ -15,10 +15,14 @@ class Trepan
       :debugexcept   => true,      # Internal debugging of command exceptions
       :debugmacro    => false,     # debugging macros
       :debugskip     => false,     # Internal debugging of step/next skipping
-      :debugstack    => false,     # How hidden outer debugger stack frames
       :directory     =>            # last-resort path-search for files
                     '$cdir:$cwd',  # that are not fully qualified.
 
+      :hidestack     => nil,       # Fixnum. How many hidden outer
+                                   # debugger stack frames to hide?
+                                   # nil or -1 means compute value. 0
+                                   # means hide none. Less than 0 means show
+                                   # all stack entries.
       :maxlist       => 10,        # Number of source lines to list 
       :maxstack      => 10,        # backtrace limit
       :maxstring     => 150,       # Strings which are larger than this
@@ -34,7 +38,7 @@ class Trepan
       :tracebuffer   => false,     # save events to a trace buffer.
       :user_cmd_dir  => File.join(Trepanning::HOME_DIR, 'trepan', 'command'),
                                    # User command directory
-    } unless defined?(DEFAULT_SETTINGS)
+    } 
   end
 end
 

data/processor/frame.rb

@@ -1,5 +1,4 @@
 # Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require 'tempfile'
 require 'linecache'
 require_relative '../app/frame'
 class Trepan
@@ -44,8 +43,7 @@ class Trepan
       if frame 
         @frame = frame
         @frame_index = frame_num
-        frame_eval_remap if 'EVAL' == @frame.type
-        print_location
+        print_location unless @settings[:traceprint]
         @line_no = frame_line() - 1
         @frame
       else
@@ -67,23 +65,6 @@ class Trepan
       container
     end
 
-    # If frame type is EVAL, set up to remap the string to a temporary file.
-    def frame_eval_remap
-      to_str = Trepan::Frame::eval_string(@frame)
-      return nil unless to_str.is_a?(String)
-
-      # All systems go!
-      unless @remap_iseq.member?(@frame.iseq.sha1)
-        tempfile = Tempfile.new(['eval-', '.rb'])
-        tempfile.open.puts(to_str)
-
-        @remap_iseq[@frame.iseq.sha1] = ['file', tempfile.path]
-        tempfile.close
-        LineCache::cache(tempfile.path)
-      end
-      return true
-    end
-
     def frame_line
       if @event == 'vm-insn' && @frame.iseq
         pc_offset = @frame.pc_offset
@@ -111,7 +92,6 @@ class Trepan
           @hidelevels[@current_thread]
         end
       
-      frame_eval_remap if 'EVAL' == @frame.type
     end
 
     # Remove access to thread and frame variables
@@ -230,6 +210,7 @@ if __FILE__ == $0
   proc.adjust_frame(0, true)
   puts '*' * 10
   proc.top_frame.stack_size.times { proc.adjust_frame(1, false) }
+  puts '*' * 10
   proc.adjust_frame(proc.top_frame.stack_size-1, true)
   proc.top_frame.stack_size.times { proc.adjust_frame(-1, false) }
     

data/processor/location.rb

@@ -11,13 +11,24 @@ class Trepan
       @reload_on_change = nil
     end
 
+    def canonic_container(container)
+      [container[0], canonic_file(container[1])]
+    end
+
+    def canonic_file(filename)
+      # For now we want resolved filenames 
+      @settings[:basename] ? File.basename(filename) : 
+        # Cache this?
+        Pathname.new(filename).cleanpath.to_s
+    end
+
     def resolve_file_with_dir(path_suffix)
-      settings[:directory].split(/:/).each do |dir|
+      @settings[:directory].split(/:/).each do |dir|
         dir = 
           if '$cwd' == dir
             Dir.pwd
           elsif '$cdir' == dir
-            @dbgr.initial_dir
+            RubyVM::OS_STARTUP_DIR
           else
             dir
           end
@@ -28,10 +39,11 @@ class Trepan
       nil
     end
 
-    # Get line +line_number+ from file named +filename+. Return "\n"
-    # there was a problem. Leading blanks are stripped off.
+    # Get line +line_number+ from file named +filename+. Return ''
+    # if there was a problem. Leading blanks are stripped off.
     def line_at(filename, line_number) # :nodoc:
       line = LineCache::getline(filename, line_number, @reload_on_change)
+
       unless line
         # Try using search directories (set with command "directory")
         if filename[0..0] != File::SEPARATOR
@@ -43,22 +55,28 @@ class Trepan
           end
         end
       end
-      return "\n" unless line
-      return line.lstrip.chomp
+      line ? line.lstrip.chomp : line
     end
 
     def loc_and_text(loc, frame, line_no, source_container)
-      if source_container[0] != 'file'
+      found_line = true
+      ## FIXME: condition is too long.
+      if source_container[0] == 'string' && frame.iseq && frame.iseq.source
+        file = LineCache::map_iseq(frame.iseq)
+        text = LineCache::getline(frame.iseq, line_no)
+        loc += " remapped #{canonic_file(file)}:#{line_no}"
+      elsif source_container[0] != 'file'
         via = loc
         while source_container[0] != 'file' && frame.prev do
           frame            = frame.prev
           source_container = frame_container(frame, false)
         end
         if source_container[0] == 'file'
-          line_no  = frame.source_location[0]
-          filename  = source_container[1]
-          loc      += " via #{canonic_file(filename)}:#{line_no}"
-          text      = line_at(filename, line_no)
+          line_no      = frame.source_location[0]
+          filename     = source_container[1]
+          loc         += " via #{canonic_file(filename)}:#{line_no}"
+          text         = line_at(filename, line_no)
+          found_line   = false
         end
       else
         container = source_container[1]
@@ -69,7 +87,7 @@ class Trepan
         
         text  = line_at(container, line_no)
       end
-      [loc, line_no, text]
+      [loc, line_no, text, found_line]
     end
 
     def print_location
@@ -94,9 +112,11 @@ class Trepan
       @line_no  = frame_line
 
       loc = source_location_info(source_container, @line_no, @frame)
-      loc, @line_no, text = loc_and_text(loc, @frame, @line_no, 
-                                         source_container)
-      msg "#{ev} (#{loc})"
+      loc, @line_no, text, found_line = 
+        loc_and_text(loc, @frame, @line_no, source_container)
+
+      ip_str = @frame.iseq ? " @#{frame.pc_offset}" : ''
+      msg "#{ev} (#{loc}#{ip_str})"
 
       if %w(return c-return).member?(@event)
         retval = Trepan::Frame.value_returned(@frame, @event)
@@ -107,14 +127,20 @@ class Trepan
         msg text
         @line_no -= 1
       end
+      unless found_line
+        # Can't find source line, so give assembly as consolation.
+        # This great idea comes from the Rubinius reference debugger.
+        run_command('disassemble')
+      end
     end
 
     def source_location_info(source_container, line_no, frame)
       filename  = source_container[1]
+      ## FIXME: condition is too long.
       canonic_filename = 
-        if (0 == filename.index('(eval')) && frame.prev &&
-            (eval_str = Trepan::Frame.eval_string(frame.prev))
-          'eval ' + safe_repr(eval_str, 15)
+        if 'string' == source_container[0] && frame.iseq && frame.iseq.source
+          eval_str = frame.iseq.source
+          'eval "' + safe_repr(eval_str.gsub(/\n/,';'), 15) + '"'
         else
           canonic_file(filename)
         end

data/processor/main.rb

@@ -122,17 +122,6 @@ class Trepan
       # FIXME: run start file and start commands.
     end
 
-    def canonic_container(container)
-      [container[0], canonic_file(container[1])]
-    end
-
-    def canonic_file(filename)
-      # For now we want resolved filenames 
-      @settings[:basename] ? File.basename(filename) : 
-        # Cache this?
-        Pathname.new(filename).cleanpath.to_s
-    end
-
     def compute_prompt
       thread_str = 
         if 1 == Thread.list.size

data/processor/mock.rb

@@ -72,6 +72,31 @@ module MockDebugger
   end
   module_function :setup
 
+  def sub_setup(sub_class, run=true)
+    sub_name = sub_class.const_get('PREFIX')
+    dbgr, cmd = setup(sub_name[0], false)
+    cmd.proc.frame_setup(RubyVM::ThreadFrame::current.prev)
+    sub_cmd = sub_class.new(cmd)
+    sub_cmd.summary_help(sub_cmd.name)
+    puts
+    sub_cmd.run([cmd.name]) if run
+    return sub_cmd
+  end
+  module_function :sub_setup
+
+  def subsub_setup(sub_class, subsub_class, run=true)
+    subsub_name = subsub_class.const_get('PREFIX')
+    dbgr, cmd = setup(subsub_name[0], false)
+    cmd.proc.frame_setup(RubyVM::ThreadFrame::current.prev)
+    sub_cmd = sub_class.new(dbgr.core.processor, cmd)
+    subsub_cmd = subsub_class.new(cmd.proc, sub_cmd, subsub_name.join(''))
+    subsub_cmd.summary_help(subsub_cmd.name)
+    puts
+    subsub_cmd.run([]) if run
+    return subsub_cmd
+  end
+  module_function :subsub_setup
+
   def show_special_class_constants(cmd)
     puts 'ALIASES: %s' % [cmd.class.const_get('ALIASES').inspect] if
       cmd.class.constants.member?(:ALIASES)

data/processor/validate.rb

@@ -151,6 +151,24 @@ class Trepan
       nil
     end
 
+    def parse_num_or_offset(position_str)
+      opts = {
+        :msg_on_error => 
+        "argument '%s' does not seem to eval to a method or an integer." % 
+        position_str,
+        :min_value => 0 
+      }
+      use_offset = 
+        if position_str.size > 0 && position_str[0].downcase == 'o'
+          position_str[0] = ''
+          true
+        else
+          false
+        end
+      position = get_an_int(position_str, opts)
+      [position, use_offset]
+    end
+
     # Parse a breakpoint position. Return
     # - the position - a Fixnum
     # - the instruction sequence to use
@@ -167,11 +185,16 @@ class Trepan
               File.basename(container[1])
             iseq = @frame.iseq
           else
-            errmsg "Unable to find instruction sequence for position #{position} in #{container[1]}"
+            errmsg("Unable to find instruction sequence for" + 
+                   " position #{position} in #{container[1]}")
             return [nil, nil, nil, true]
           end
         end
-        use_offset = false 
+        if args.empty? || 'if' == args[0]
+          use_offset = false 
+        else
+          position, use_offset = parse_num_or_offset(args[0])
+        end
       else
         iseq = object_iseq(first)
         position_str = 
@@ -190,20 +213,7 @@ class Trepan
             iseq = @frame.iseq unless container
             first
           end
-        use_offset = 
-          if position_str.size > 0 && position_str[0].downcase == 'o'
-            position_str[0] = ''
-            true
-          else
-            false
-          end
-        opts = {
-          :msg_on_error => 
-          "argument '%s' does not seem to eval to a method or an integer." % 
-          position_str,
-          :min_value => 0
-        }
-        position  = get_an_int(position_str, opts)
+        position, use_offset = parse_num_or_offset(position_str)
       end
       condition = 'true'
       if args.size > 0 && 'if' == args[0] 
@@ -344,11 +354,15 @@ if __FILE__ == $0
   else    
     require 'thread_frame'
     require_relative '../app/mock'
+    require_relative './default'
+    require_relative 'frame'
     require_relative 'main' # Have to include before defining CmdProcessor!
                             # FIXME
 
     proc = Trepan::CmdProcessor.new(Trepan::MockCore.new())
-    proc.settings[:directory] = '$cwd'
+    proc.frame_initialize
+    proc.instance_variable_set('@settings', 
+                               Trepan::CmdProcessor::DEFAULT_SETTINGS)
     proc.frame_setup(RubyVM::ThreadFrame.current)
     onoff = %w(1 0 on off)
     onoff.each { |val| puts "onoff(#{val}) = #{proc.get_onoff(val)}" }
@@ -374,7 +388,7 @@ if __FILE__ == $0
     end
     puts '=' * 40
     # require_relative '../lib/trepanning'
-    # dbgr = Trepan.new(:set_restart => true)
+    # dbgr = Trepan.new
     # dbgr.debugger
 
     # FIXME:
@@ -389,6 +403,8 @@ if __FILE__ == $0
     p proc.breakpoint_position(%w(1))
     p proc.breakpoint_position(%w(2 if a > b))
     p proc.get_int_list(%w(1+0 3-1 3))
+    require 'trepanning'
+    debugger
     p proc.get_int_list(%w(a 2 3))
   end
 end