rb8-trepanning 0.1.5 → 0.1.6

data/processor/load_cmds.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net> 
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'tmpdir'
 
 # Part of Trepan::CmdProcess that loads up debugger commands from
-# builtin and user directories.  
+# builtin and user directories.
 # Sets @commands, @aliases, @macros
 require 'rubygems'; require 'require_relative'
 require_relative '../app/complete'
@@ -14,9 +14,9 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
                                  # indexed by alias name
   attr_reader   :commands        # Hash[String] of command objects
                                  # indexed by name
-  attr_reader   :macros          # Hash[String] of Proc objects 
+  attr_reader   :macros          # Hash[String] of Proc objects
                                  # indexed by macro name.
-  attr_reader   :leading_str     # leading part of string. Used in 
+  attr_reader   :leading_str     # leading part of string. Used in
                                  # command completion
 
   # "initialize" for multi-file class. Called from main.rb's "initialize".
@@ -27,13 +27,13 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
 
     cmd_dirs = [ File.join(File.dirname(__FILE__), 'command') ]
     cmd_dirs <<  @settings[:user_cmd_dir] if @settings[:user_cmd_dir]
-    cmd_dirs.each do |cmd_dir| 
+    cmd_dirs.each do |cmd_dir|
       load_debugger_commands(cmd_dir) if File.directory?(cmd_dir)
     end
   end
 
   # Loads in debugger commands by require'ing each ruby file in the
-  # 'command' directory. Then a new instance of each class of the 
+  # 'command' directory. Then a new instance of each class of the
   # form Trepan::xxCommand is added to @commands and that array
   # is returned.
   def load_debugger_commands(file_or_dir)
@@ -42,13 +42,13 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
       # change $0 so it doesn't get in the way of __FILE__ = $0
       old_dollar0 = $0
       $0 = ''
-      Dir.glob(File.join(dir, '*.rb')).each do |rb| 
+      Dir.glob(File.join(dir, '*.rb')).each do |rb|
         # We use require so that multiple calls have no effect.
         require rb
       end
       $0 = old_dollar0
     elsif File.readable?(file_or_dir)
-      # We use load in case we are reloading. 
+      # We use load in case we are reloading.
       # 'require' would not be effective here
       load file_or_dir
     else
@@ -61,7 +61,7 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
 
       # Add to list of commands and aliases.
       cmd_name = klass.const_get(:NAME)
-      if klass.constants.member?('ALIASES') || 
+      if klass.constants.member?('ALIASES') ||
           klass.constants.member?(:ALIASES)
         aliases= klass.const_get('ALIASES') || klass.const_get(:ALIASES)
         aliases.each {|a| @aliases[a] = cmd_name}
@@ -79,7 +79,7 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
     end
   end
 
-  # Looks up cmd_array[0] in @commands and runs that. We do lots of 
+  # Looks up cmd_array[0] in @commands and runs that. We do lots of
   # validity testing on cmd_array.
   def run_cmd(cmd_array)
     unless cmd_array.is_a?(Array)
@@ -87,12 +87,12 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
       return
     end
     if cmd_array.detect{|item| !item.is_a?(String)}
-      errmsg "run_cmd argument Array should only contain strings. " + 
+      errmsg "run_cmd argument Array should only contain strings. " +
         "Got #{cmd_array.inspect}"
       return
     end
     if cmd_array.empty?
-      errmsg "run_cmd Array should have at least one item. " + 
+      errmsg "run_cmd Array should have at least one item. " +
         "Got: #{cmd_array.inspect}"
       return
     end
@@ -103,7 +103,7 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
   end
 
   def save_commands(opts)
-    save_filename = opts[:filename] || 
+    save_filename = opts[:filename] ||
       File.join(Dir.tmpdir, "trepanning-save-#{$$}.txt")
     begin
       save_file = File.open(save_filename, 'w')
@@ -117,16 +117,16 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
       cmd_obj.save_command if cmd_obj.respond_to?(:save_command)
       next unless cmd_obj.is_a?(Trepan::SubcommandMgr)
       cmd_obj.subcmds.subcmds.each do |subcmd_name, subcmd_obj|
-        save_file.puts subcmd_obj.save_command if 
+        save_file.puts subcmd_obj.save_command if
           subcmd_obj.respond_to?(:save_command)
         next unless subcmd_obj.is_a?(Trepan::SubSubcommandMgr)
         subcmd_obj.subcmds.subcmds.each do |subsubcmd_name, subsubcmd_obj|
-          save_file.puts subsubcmd_obj.save_command if 
+          save_file.puts subsubcmd_obj.save_command if
             subsubcmd_obj.respond_to?(:save_command)
         end
       end
     end
-    save_file.puts "!FileUtils.rm #{save_filename.inspect}" if 
+    save_file.puts "!FileUtils.rm #{save_filename.inspect}" if
       opts[:erase]
     save_file.close
 
@@ -140,90 +140,15 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
     # command, but I don't know it. And eval works.
     klass = self.instance_eval("Trepan::Command::#{command}")
     cmd = klass.send(:new, self)
-    
+
     # Add to list of commands and aliases.
     cmd_name = klass.const_get(:NAME)
     if klass.constants.member?(:ALIASES)
-      aliases= klass.const_get(:ALIASES)  
+      aliases= klass.const_get(:ALIASES)
       aliases.each {|a| @aliases[a] = cmd_name}
     end
     @commands[cmd_name] = cmd
   end
-
-  # Handle initial completion. We draw from the commands, aliases,
-  # and macros for completion. However we won't include aliases which
-  # are prefixes of other commands.
-  def complete(str, last_token)
-    @leading_str = str
-    next_blank_pos, token = Trepan::Complete.next_token(str, 0)
-    return [''] if token.empty? && !last_token.empty?
-    match_pairs = Trepan::Complete.complete_token_with_next(@commands,
-                                                            token)
-    match_hash = {}
-    match_pairs.each do |pair|
-      match_hash[pair[0]] = pair[1]
-    end
-    alias_pairs = Trepan::Complete.
-      complete_token_filtered_with_next(@aliases, token, match_hash,
-                                        @commands)
-    match_pairs += alias_pairs
-    if str[next_blank_pos..-1].empty?
-      return match_pairs.map{|pair| pair[0]}.sort
-    else
-      alias_pairs.each do |pair|
-        match_hash[pair[0]] = pair[1]
-      end
-    end
-    if match_pairs.size > 1
-      # FIXME: figure out what to do here.
-      # Matched multiple items in the middle of the string
-      # We can't handle this so do nothing.
-      return []
-      # return match_pairs.map do |name, cmd|
-      #   ["#{name} #{args[1..-1].join(' ')}"]
-      # end
-    end
-    # match_pairs.size == 1
-    next_complete(str, next_blank_pos, match_pairs[0][1], last_token)
-  end
-
-  def next_complete(str, next_blank_pos, cmd, last_token)
-    next_blank_pos, token = Trepan::Complete.next_token(str, next_blank_pos)
-    return [] if token.empty? && !last_token.empty?
-    
-    if cmd.respond_to?(:complete_token_with_next) 
-      match_pairs = cmd.complete_token_with_next(token)
-      return [] if match_pairs.empty?
-      if str[next_blank_pos..-1].rstrip.empty? && 
-          (token.empty? || token == last_token)
-        return match_pairs.map { |completion, junk| completion }
-      else
-        if match_pairs.size == 1
-          return next_complete(str, next_blank_pos, match_pairs[0][1], 
-                               last_token)
-        else
-          # FIXME: figure out what to do here.
-          # Matched multiple items in the middle of the string
-          # We can't handle this so do nothing.
-          return []
-        end
-      end
-    elsif cmd.respond_to?(:complete)
-      matches = cmd.complete(token)
-      return [] if matches.empty?
-      if str[next_blank_pos..-1].rstrip.empty? && 
-          (token.empty? || token == last_token)
-        return matches
-      else
-        # FIXME: figure out what to do here.
-        # Matched multiple items in the middle of the string
-        # We can't handle this so do nothing.
-        return []
-      end
-    else
-      return []
-    end
-  end
 end
 
 if __FILE__ == $0
@@ -251,8 +176,4 @@ if __FILE__ == $0
   cmdproc.run_cmd('foo')  # Invalid - not an Array
   cmdproc.run_cmd([])     # Invalid - empty Array
   cmdproc.run_cmd(['list', 5])  # Invalid - nonstring arg
-  p cmdproc.complete("d", 'd')
-  require 'ruby-debug'; Debugger.start; debugger
-  p cmdproc.complete("sho d", 'd')
-  p cmdproc.complete('', '')
 end

data/processor/location.rb

@@ -1,5 +1,5 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require 'rubygems'; 
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
+require 'rubygems';
 begin
   require 'linecache'
 rescue LoadError
@@ -16,17 +16,20 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
     unless defined?(EVENT2ICON)
       # Event icons used in printing locations.
       EVENT2ICON = {
-        'brkpt'          => 'xx',
+        'breakpoint'     => 'xx',
         'tbrkpt'         => 'x1',
         'c-call'         => 'C>',
         'c-return'       => '<C',
         'step-call'      => '->',
         'call'           => '->',
+        'catchpoint'     => '!!',
         'class'          => '::',
         'coverage'       => '[]',
         'debugger-call'  => ':o',
         'end'            => '-|',
         'line'           => '--',
+        'step'           => '--',
+        'post-mortem'    => ':/',
         'raise'          => '!!',
         'return'         => '<-',
         'start'          => '>>',
@@ -35,17 +38,17 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
         'unknown'        => '?!',
         'vm'             => 'VM',
         'vm-insn'        => '..',
-      } 
+      }
     end
 
   def canonic_file(filename, resolve=true)
-    # For now we want resolved filenames 
-    if @settings[:basename] 
+    # For now we want resolved filenames
+    if @settings[:basename]
       return File.basename(filename)
     end
     if resolve
       filename = LineCache::unmap_file(filename)
-      if !File.exist?(filename) 
+      if !File.exist?(filename)
         if (try_filename = resolve_file_with_dir(filename))
           filename = try_filename if File.exist?(filename)
         end
@@ -58,10 +61,10 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
   def current_source_text
     LineCache::getline(@frame.file, @frame.line).chomp
   end
-  
+
   def resolve_file_with_dir(path_suffix)
     settings[:directory].split(/:/).each do |dir|
-      dir = 
+      dir =
         if '$cwd' == dir
           Dir.pwd
         else
@@ -73,10 +76,10 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
     end
     nil
   end
-  
+
   # Get line +line_number+ from file named +filename+. Return "\n"
   # there was a problem. Leading blanks are stripped off.
-  def line_at(filename, line_number, 
+  def line_at(filename, line_number,
               opts = {
                 :reload_on_change => @settings[:reload],
                 :output => @settings[:highlight]
@@ -87,9 +90,9 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
     unless line
       # Try using search directories (set with command "directory")
       if filename[0..0] != File::SEPARATOR
-        try_filename = resolve_file_with_dir(filename) 
-        if try_filename && 
-            line = LineCache::getline(try_filename, line_number, opts) 
+        try_filename = resolve_file_with_dir(filename)
+        if try_filename &&
+            line = LineCache::getline(try_filename, line_number, opts)
           LineCache::remap_file(filename, try_filename)
         end
       end
@@ -97,16 +100,16 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
     return nil unless line
     return line.lstrip.chomp
   end
-  
+
   def loc_and_text(opts=
                    {:reload_on_change => @settings[:reload],
                      :output => @settings[:highlight]
                    })
-  
+
     loc = source_location_info
     line_no  = @frame.line
     filename = @frame.file
-  
+
 #    if @frame.eval?
 #      file = LineCache::map_script(static.script)
 #      text = LineCache::getline(static.script, line_no, opts)
@@ -120,40 +123,40 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
 #    end
     [loc, line_no, text]
   end
-  
+
   def format_location(event=@event, frame=@frame, frame_index=@frame.index)
     text      = nil
     ev        = if event.nil? || 0 != frame_index
-                  '  ' 
+                  '  '
                 else
                   (EVENT2ICON[event] || event)
                 end
-    
+
     @line_no  = frame.line
     loc, @line_no, text = loc_and_text
-    
+
     "#{ev} (#{loc}"
   end
-  
+
   # FIXME: Use above format_location routine
   def print_location
     text      = nil
     ev        = if @event.nil? || 0 != @frame.index
-                  '  ' 
+                  '  '
                 else
                   (EVENT2ICON[@event] || @event)
                 end
-    
+
     @line_no  = @frame.line
     loc, @line_no, text = loc_and_text
-    
+
     msg "#{ev} (#{loc})"
-    
+
     # if %w(return c-return).member?(@core.event)
     #   retval = Trepan::Frame.value_returned(@frame, @core.event)
-    #   msg 'R=> %s' % retval.inspect 
+    #   msg 'R=> %s' % retval.inspect
     # end
-    
+
     if text && !text.strip.empty?
       old_maxstring = @settings[:maxstring]
       @settings[:maxstring] = -1
@@ -162,10 +165,10 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
       @line_no -= 1
     end
   end
-  
+
   def source_location_info
     filename  = @frame.file
-    canonic_filename = 
+    canonic_filename =
       ## if @frame.eval?
       ##  'eval ' + safe_repr(@frame.eval_string.gsub("\n", ';').inspect, 20)
       ## else
@@ -173,7 +176,7 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
       ## end
     loc = "#{canonic_filename}:#{@frame.line}"
     return loc
-  end 
+  end
 end
 
 if __FILE__ == $0 && caller.size == 0

data/processor/msg.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 # I/O related command processor methods
 require 'rubygems'; require 'require_relative'
 require_relative '../app/util'
@@ -23,8 +23,8 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
       message = safe_rep(message) unless opts[:unlimited]
     end
     if @settings[:highlight] && defined?(Term::ANSIColor)
-      message = 
-        Term::ANSIColor.italic + message + Term::ANSIColor.reset 
+      message =
+        Term::ANSIColor.italic + message + Term::ANSIColor.reset
     end
     @intf.errmsg(message)
   end
@@ -65,8 +65,8 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
   def section(message, opts={})
     message = safe_rep(message) unless opts[:unlimited]
     if @settings[:highlight] && defined?(Term::ANSIColor)
-      message = 
-        Term::ANSIColor.bold + message + Term::ANSIColor.reset 
+      message =
+        Term::ANSIColor.bold + message + Term::ANSIColor.reset
     end
     @intf.msg(message)
   end

data/processor/validate.rb

@@ -1,8 +1,9 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Trepan command input validation routines.  A String type is
 # usually passed in as the argument to validation routines.
 
+require 'rbconfig'
 require 'rubygems'
 require 'require_relative'
 begin
@@ -23,7 +24,7 @@ require_relative 'msg'      # for errmsg, msg
 
 module Trepan
   class CmdProcessor < VirtualCmdProcessor
-  
+
     attr_reader :file_exists_proc  # Like File.exists? but checks using
                                    # cached files
 
@@ -36,7 +37,7 @@ module Trepan
     def confirm(msg, default)
       @settings[:confirm] ? @intf.confirm(msg, default) : true
     end
-    
+
   # Like cmdfns.get_an_int(), but if there's a stack frame use that
     # in evaluation.
     def get_an_int(arg, opts={})
@@ -60,19 +61,19 @@ module Trepan
       end
       return ret_value
     end
-    
+
     unless defined?(DEFAULT_GET_INT_OPTS)
       DEFAULT_GET_INT_OPTS = {
         :min_value => 0, :default => 1, :cmdname => nil, :max_value => nil}
     end
-    
+
     # If argument parameter 'arg' is not given, then use what is in
     # opts[:default]. If String 'arg' evaluates to an integer between
     # least min_value and at_most, use that. Otherwise report an
     # error.  If there's a stack frame use that for bindings in
     # evaluation.
     def get_int(arg, opts={})
-      
+
       return default unless arg
       opts = DEFAULT_GET_INT_OPTS.merge(opts)
       val = arg ? get_int_noerr(arg) : opts[:default]
@@ -85,7 +86,7 @@ module Trepan
         end
         return nil
       end
-      
+
       if val < opts[:min_value]
         if opts[:cmdname]
           errmsg(("Command '%s' expects an integer at least" +
@@ -110,11 +111,11 @@ module Trepan
       end
       return val
     end
-    
+
     def get_int_list(args, opts={})
       args.map{|arg| get_an_int(arg, opts)}.compact
     end
-    
+
     # Eval arg and it is an integer return the value. Otherwise
     # return nil
     def get_int_noerr(arg)
@@ -122,10 +123,10 @@ module Trepan
       val = Integer(eval(arg, b))
     rescue SyntaxError
       nil
-    rescue 
+    rescue
       nil
     end
-    
+
     def get_thread_from_string(id_or_num_str)
       if id_or_num_str == '.'
         Thread.current
@@ -140,7 +141,7 @@ module Trepan
         end
       end
     end
-    
+
     # Parse a breakpoint position. On success return:
     #   - the Method the position is in
     #   - the file name - a Fixnum
@@ -155,7 +156,7 @@ module Trepan
                         end
       return [nil] * 5 unless break_cmd_parse
       tail = [break_cmd_parse.condition, break_cmd_parse.negate]
-      cm, file, line, position_type = 
+      cm, file, line, position_type =
         parse_position(break_cmd_parse.position)
       if cm or file or line
         return [cm, file, line, position_type] + tail
@@ -163,7 +164,7 @@ module Trepan
       errmsg("Unable to get breakpoint position for #{position_str}")
       return [nil] * 5
     end
-    
+
     # Return true if arg is 'on' or 1 and false arg is 'off' or 0.
     # Any other value is raises TypeError.
     def get_onoff(arg, default=nil, print_error=true)
@@ -179,16 +180,16 @@ module Trepan
       darg = arg.downcase
       return true  if arg == '1' || darg == 'on'
       return false if arg == '0' || darg =='off'
-      
+
       errmsg("Expecting 'on', 1, 'off', or 0. Got: %s." % arg.to_s) if
         print_error
       raise TypeError
     end
-    
+
     include Trepan::CmdParser
-    
+
     def get_method(meth)
-      start_binding = 
+      start_binding =
         begin
           @frame.binding
         rescue
@@ -205,13 +206,13 @@ module Trepan
         end
       end
     end
-    
-    # FIXME: this is a ? method but we return 
-    # the method value. 
+
+    # FIXME: this is a ? method but we return
+    # the method value.
     def method?(meth)
       get_method(meth)
     end
-    
+
     # parse_position(self)->(meth, filename, offset, offset_type)
     # See app/cmd_parser.kpeg for the syntax of a position which
     # should include things like:
@@ -219,6 +220,14 @@ module Trepan
     # Make sure it works for C:\foo\bar.py:12
     def parse_position(info)
       info = parse_location(info) if info.kind_of?(String)
+      ## FIXME: push into parse
+      if RbConfig::CONFIG['target_os'].start_with?('mingw') and
+          info =~ /^[A-Za-z]:/
+        drive_letter = info[0..1]
+        info = info[2..-1]
+      else
+        drive_leter = nil
+      end
       case info.container_type
       when :fn
         unless info.container
@@ -227,7 +236,7 @@ module Trepan
         end
         if cm = method?(info.container)
           ## Add bogus - canonic_file: active-path
-          return [cm, 'bogus', info.position, 
+          return [cm, 'bogus', info.position,
                   info.position_type]
         else
           return [nil] * 4
@@ -235,13 +244,13 @@ module Trepan
       when :file
         ## filename = canonic_file(info.container)
         filename = info.container
-        # cm = 
-        #   if canonic_file(@frame.file) == filename 
+        # cm =
+        #   if canonic_file(@frame.file) == filename
         #     cm = @frame.method
         #     if :line == info.position_type
         #       find_method_with_line(cm, info.position)
         #     end
-        #   else 
+        #   else
         #     LineCache.compiled_method(filename)
         #   end
         return nil, filename,  info.position, info.position_type
@@ -265,9 +274,9 @@ module Trepan
         return [nil] * 4
       end
     end
-    
+
     def parse_method(meth_str)
-      begin 
+      begin
         meth_for_string(meth_str, @frame.binding)
       rescue NameError
         nil
@@ -275,7 +284,7 @@ module Trepan
         nil
       end
     end
-    
+
     def validate_initialize
       ## top_srcdir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
       ## @dbgr_script_iseqs, @dbgr_iseqs = filter_scripts(top_srcdir)
@@ -296,15 +305,15 @@ if __FILE__ == $0
   # FIXME have to pull in main for its initalize routine
   DIRNAME = File.dirname(__FILE__)
   load File.join(DIRNAME, 'main.rb')
-  
+
   require_relative 'mock'
   dbgr, cmd = MockDebugger::setup('exit', false)
   cmdproc  = cmd.proc
   onoff = %w(1 0 on off)
   onoff.each { |val| puts "onoff(#{val}) = #{cmdproc.get_onoff(val)}" }
   cmdproc.frame.instance_variable_set('@binding', binding)
-  %w(1 1E bad 1+1 -5).each do |val| 
-    puts "get_int_noerr(#{val}) = #{cmdproc.get_int_noerr(val).inspect}" 
+  %w(1 1E bad 1+1 -5).each do |val|
+    puts "get_int_noerr(#{val}) = #{cmdproc.get_int_noerr(val).inspect}"
   end
   def foo; 5 end
   def cmdproc.errmsg(msg)
@@ -322,7 +331,7 @@ if __FILE__ == $0
 
   puts "To be continued...."
   exit
-  
+
   cmdproc.method?('cmdproc.errmsg')
   puts '=' * 40
   ['Array.map', 'Trepan::CmdProcessor.new',
@@ -330,11 +339,11 @@ if __FILE__ == $0
     puts "#{str} should be true: #{cmdproc.method?(str).inspect}"
   end
   puts '=' * 40
-  
+
   # FIXME:
   # Array#foo should be false: true
   # Trepan::CmdProcessor.allocate should be false: true
-  
+
   ['food', '.errmsg'].each do |str|
     puts "#{str} should be false: #{cmdproc.method?(str).inspect}"
   end