trepanning 0.1.6 → 1.93.32

data/app/run.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2013 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rbconfig'
 module Trepanning
 
@@ -60,6 +60,14 @@ module Trepanning
   # Do a shell-like path lookup for prog_script and return the results.
   # If we can't find anything return prog_script.
   def whence_file(prog_script)
+    if RbConfig::CONFIG['target_os'].start_with?('mingw')
+      if (prog_script =~ /^[a-zA-Z][:]/)
+        start = prog_script[2..2]
+        if [File::ALT_SEPARATOR, File::SEPARATOR].member?(start)
+          return prog_script
+        end
+      end
+    end
     if prog_script.start_with?(File::SEPARATOR) || prog_script.start_with?('.')
       # Don't search since this name has path is explicitly absolute or
       # relative.

data/app/util.rb

@@ -3,7 +3,7 @@
 class Trepan
   module Util
 
-    module_function 
+    module_function
     def safe_repr(str, max, elipsis='... ')
       if str.is_a?(String) && max > 0 && str.size > max && !str.index("\n")
         "%s%s%s" % [ str[0...max/2], elipsis,  str[str.size-max/2..str.size]]
@@ -16,20 +16,20 @@ class Trepan
     # If name is a unique leading prefix of one of the entries of list,
     # then return that. Otherwise return name.
     def uniq_abbrev(list, name)
-      candidates = list.select do |try_name| 
+      candidates = list.select do |try_name|
         try_name.start_with?(name)
       end
       candidates.size == 1 ? candidates.first : name
     end
 
     # extract the "expression" part of a line of source code.
-    # 
+    #
     def extract_expression(text)
       if text =~ /^\s*(?:if|elsif|unless)\s+/
-        text.gsub!(/^\s*(?:if|elsif|unless)\s+/,'') 
+        text.gsub!(/^\s*(?:if|elsif|unless)\s+/,'')
         text.gsub!(/\s+then\s*$/, '')
       elsif text =~ /^\s*(?:until|while)\s+/
-        text.gsub!(/^\s*(?:until|while)\s+/,'') 
+        text.gsub!(/^\s*(?:until|while)\s+/,'')
         text.gsub!(/\s+do\s*$/, '')
       elsif text =~ /^\s*return\s+/
         # EXPRESION in: return EXPRESSION
@@ -54,7 +54,7 @@ class Trepan
       result = yield
       $VERBOSE = original_verbosity
       return result
-    end  
+    end
   end
 end
 
@@ -68,7 +68,7 @@ if __FILE__ == $0
   puts safe_repr(string.inspect, 17, '')
   # ------------------------------------
   # extract_expression
-  ['if condition("if")', 
+  ['if condition("if")',
    'until until_termination',
    'return return_value',
     'nothing_to_be.done'

data/bin/trepan

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-# Invoke debugger from the command line. 
+# Invoke debugger from the command line.
 require 'rbconfig' # For RbConfig.ruby
 require_relative '../app/run'
 require_relative '../app/options'
@@ -12,12 +12,12 @@ if File.basename(__FILE__) == File.basename($0)
   include Trepanning
 
   # One way to get local variables is to create a block which is run
-  # once.  
-  # 
+  # once.
+  #
   # Note however that since there are constants below, we can't
   # wrap all of this in a procedure as that would be defining
   # constants dynamically.
-  1.times do 
+  1.times do
     | ; trepan_path, program_to_debug |
     # options = DEFAULT_CMDLINE_SETTINGS.merge({}) seems to change up
     # DEFAULT_CMDLINE_SETTINGS when options[:key] is changed. The
@@ -32,7 +32,7 @@ if File.basename(__FILE__) == File.basename($0)
       trepan_path += '.cmd' unless trepan_path =~ /\.cmd$/i
     end
 
-    # FIXME: do we need to test defined? 
+    # FIXME: do we need to test defined?
     # FIXME: Should (some of) these be instance variables?
     Trepan::TREPAN_PATH  = trepan_path
 
@@ -49,12 +49,12 @@ if File.basename(__FILE__) == File.basename($0)
     end
 
     program_to_debug = (Trepan::PROG_UNRESOLVED_SCRIPT = ARGV.shift).dup
-    program_to_debug = whence_file(Trepan::PROG_UNRESOLVED_SCRIPT) unless 
+    program_to_debug = whence_file(Trepan::PROG_UNRESOLVED_SCRIPT) unless
       File.exist?(Trepan::PROG_UNRESOLVED_SCRIPT)
     Trepan::PROG_SCRIPT = program_to_debug
 
     opts = {}
-    %w(cmdfiles highlight initial_dir host nx port post_mortem
+    %w(basename cmdfiles highlight initial_dir host nx port post_mortem
        readline server traceprint
       ).each do |opt|
       opts[opt.to_sym] = options[opt.to_sym]

data/interface.rb

@@ -59,10 +59,6 @@ class Trepan
     end
 
     def finalize(last_wishes=nil)
-      if @output && !@output.closed?
-        msg "%sThat's all, folks..." % 
-          (defined?(Trepan::PROGRAM) ? "#{Trepan::PROGRAM}: " : '')
-      end
       close
     end
 

data/interface/user.rb

@@ -12,12 +12,12 @@ class Trepan::UserInterface < Trepan::Interface
 
   DEFAULT_USER_OPTS = {
     :readline   => true,                # Try to use GNU Readline?
-    
+
     # The below are only used if we want and have readline support.
     # See method Trepan::GNU_readline? below.
     :histsize => 256,                   # Use gdb's default setting
     :file_history   => '.trepan_hist',  # where history file lives
-                                        # Note a directory will 
+                                        # Note a directory will
                                         # be appended
     :history_save   => true             # do we save the history?
   } unless defined?(DEFAULT_USER_OPTS)
@@ -49,14 +49,14 @@ class Trepan::UserInterface < Trepan::Interface
   def confirm(prompt, default)
     default_str = default ? 'Y/n' : 'N/y'
     while true do
-      begin 
+      begin
         response = readline('%s (%s) ' % [prompt, default_str])
       rescue EOFError
         return default
       end
       response = response.strip.downcase
 
-      # We don't catch "Yes, I'm sure" or "NO!", but I leave that 
+      # We don't catch "Yes, I'm sure" or "NO!", but I leave that
       # as an exercise for the reader.
       break if YES_OR_NO.member?(response)
       msg "Please answer 'yes' or 'no'. Try again."
@@ -67,7 +67,7 @@ class Trepan::UserInterface < Trepan::Interface
   # Read a saved Readline history file into Readline. The history
   # file will be created if it doesn't already exist.
   # Much of this code follows what's done in ruby-debug.
-  def read_history 
+  def read_history
     unless @histfile
       dirname = ENV['HOME'] || ENV['HOMEPATH'] || File.expand_path('~')
       @histfile = File.join(dirname, @opts[:file_history])
@@ -75,8 +75,8 @@ class Trepan::UserInterface < Trepan::Interface
     @histsize ||= (ENV['HISTSIZE'] ? ENV['HISTSIZE'].to_i : @opts[:histsize])
     Readline.completion_proc = @opts[:complete]
     if File.exists?(@histfile)
-      lines = IO::readlines(@histfile).last(@histsize).collect do  
-        |line| line.chomp 
+      lines = IO::readlines(@histfile).last(@histsize).collect do
+        |line| line.chomp
       end
       Readline::HISTORY.push(*lines)
       @history_io = File.new(@histfile, "a")
@@ -87,7 +87,7 @@ class Trepan::UserInterface < Trepan::Interface
     @history_save = @opts[:history_save]
   end
 
-  def save_history 
+  def save_history
     if @histfile
       lines = Readline::HISTORY.to_a
       lines = lines[-@histsize, @histsize] if lines.size > @histsize
@@ -95,7 +95,7 @@ class Trepan::UserInterface < Trepan::Interface
         open(@histfile, 'w') do |file|
           Readline::HISTORY.to_a.last(@histsize).each do |line|
             file.puts line
-          end 
+          end
         end if defined?(@history_save) and @history_save
       rescue
       end
@@ -105,7 +105,7 @@ class Trepan::UserInterface < Trepan::Interface
   def finalize(last_wishes=nil)
     # ?? print gdb-style exit annotation if annotate = 2?
     if Trepan::GNU_readline? && @history_save
-      save_history 
+      save_history
     end
     super
   end
@@ -113,7 +113,7 @@ class Trepan::UserInterface < Trepan::Interface
   def interactive? ; @input.interactive? end
 
   def read_command(prompt='')
-    readline(prompt) 
+    readline(prompt)
   end
 
   def readline(prompt='')

data/io/input.rb

@@ -3,7 +3,7 @@
 
 # Debugger user/command-oriented input possibly attached to IO-style
 # input or GNU Readline.
-# 
+#
 
 require_relative '../io'
 
@@ -28,20 +28,20 @@ class Trepan
     def closed?; @input.closed? end
     def eof?; @eof end
 
-    def interactive? 
+    def interactive?
       @input.respond_to?(:isatty) && @input.isatty
     end
-    # Read a line of input. EOFError will be raised on EOF.  
+    # Read a line of input. EOFError will be raised on EOF.
     def readline(prompt='')
       raise EOFError if eof?
-      begin 
+      begin
         if @line_edit && @use_readline
           line = Readline.readline(prompt, true)
         else
-          # Prompt should be empty and should have been 
+          # Prompt should be empty and should have been
           # handled by caller.
           unless prompt.empty?
-            raise RuntimeError, 
+            raise RuntimeError,
             "Internal error: prompt '#{prompt}' should have been handled by caller" unless prompt.empty?
           end
           line = @input.gets
@@ -58,28 +58,28 @@ class Trepan
       raise EOFError if eof?
       return line
     end
-    
+
     class << self
-      # Use this to set where to read from. 
+      # Use this to set where to read from.
       #
       # Set opts[:line_edit] if you want this input to interact with
       # GNU-like readline library. By default, we will assume to try
-      # using readline. 
+      # using readline.
       def open(inp=nil, opts={})
         inp ||= STDIN
         inp = File.new(inp, 'r') if inp.is_a?(String)
-        opts[:line_edit] = @line_edit = 
+        opts[:line_edit] = @line_edit =
           inp.respond_to?(:isatty) && inp.isatty && Trepan::GNU_readline?
         self.new(inp, opts)
       end
 
       def finalize
         if defined?(RbReadline) && !@@readline_finalized
-          begin 
+          begin
             RbReadline.rl_cleanup_after_signal()
           rescue
           end
-          begin 
+          begin
             RbReadline.rl_deprep_terminal()
           rescue
           end
@@ -101,7 +101,7 @@ def Trepan::GNU_readline?
     return false
   end
 end
-    
+
 # Demo
 if __FILE__ == $0
   puts 'Have GNU is: %s'  % Trepan::GNU_readline?

data/lib/trepanning.rb

@@ -18,10 +18,10 @@ require_relative '../interface/server'   # server interface (remote debugging)
 # "filename" parameter when the instruction sequence was
 # generated. Each value is an array of instruction sequences that
 # share that name.
-SCRIPT_ISEQS__ = {} unless 
-  defined?(SCRIPT_ISEQS__) && SCRIPT_ISEQS__.is_a?(Hash)
-ISEQS__        = {} unless 
-  defined?(ISEQS__) && ISEQS__.is_a?(Hash)
+SCRIPT_ISEQS__ = {} unless
+    defined?(SCRIPT_ISEQS__) && SCRIPT_ISEQS__.is_a?(Hash)
+ISEQS__        = {} unless
+    defined?(ISEQS__) && ISEQS__.is_a?(Hash)
 
 class Trepan
 
@@ -40,7 +40,7 @@ class Trepan
   def initialize(settings={})
 
     # FIXME: Tracing through intialization code is slow. Need to figure
-    # out better ways to do this. 
+    # out better ways to do this.
     th = Thread.current
     th.exec_event_tracing = true
 
@@ -50,7 +50,7 @@ class Trepan
 
     @completion_proc = method(:completion_method)
 
-    @intf = 
+    @intf =
       if @settings[:server]
         @completion_proc = nil
         opts = Trepan::ServerInterface::DEFAULT_INIT_CONNECTION_OPTS.dup
@@ -79,9 +79,10 @@ class Trepan
     @settings[:core_opts][:cmdproc_opts] ||= {}
     @settings[:core_opts][:cmdproc_opts][:highlight] ||= settings[:highlight]
     @settings[:core_opts][:cmdproc_opts][:traceprint] = settings[:traceprint]
+    @settings[:core_opts][:cmdproc_opts][:basename] = settings[:basename]
 
     @core = Core.new(self, @settings[:core_opts])
-    
+
     if @settings[:initial_dir]
       Dir.chdir(@settings[:initial_dir])
     else
@@ -92,11 +93,11 @@ class Trepan
 
     unless @settings[:client]
       @trace_filter = Trace::Filter.new
-      %w(debugger start stop).each do |m| 
+      %w(debugger start stop).each do |m|
         @trace_filter << self.method(m.to_sym)
       end
-      %w(debugger event_processor trace_var_processor).each do 
-        |m| 
+      %w(debugger event_processor trace_var_processor).each do
+        |m|
         @trace_filter << @core.method(m)
       end
       @trace_filter << @trace_filter.method(:add_trace_func)
@@ -107,9 +108,9 @@ class Trepan
     # Run user debugger command startup files.
     add_startup_files unless @settings[:nx]
 
-    at_exit do 
+    at_exit do
       clear_trace_func
-      @intf[-1].close 
+      @intf[-1].close
     end
     th.exec_event_tracing = false
   end
@@ -118,10 +119,10 @@ class Trepan
   # such as called from GNU Readline with <TAB>.
   def completion_method(last_token, leading=Readline.line_buffer)
     completion = @core.processor.complete(leading, last_token)
-    if 1 == completion.size 
+    if 1 == completion.size
       completion_token = completion[0]
       if last_token.end_with?(' ')
-        if last_token.rstrip == completion_token 
+        if last_token.rstrip == completion_token
           # There is nothing more to complete
           []
         else
@@ -137,7 +138,7 @@ class Trepan
     end
   end
 
-  # To call from inside a Ruby program, there is one-time setup that 
+  # To call from inside a Ruby program, there is one-time setup that
   # needs to be done first:
   #    require 'trepanning'
   #    mydbg = Trepan.new()
@@ -151,9 +152,9 @@ class Trepan
   #    mydbg.debugger(:immediate=>true)   # enter debugger here
   #    ... work, work, work
   #
-  # However to enter the debugger on the next event after the 
+  # However to enter the debugger on the next event after the
   # debugger() call:
-  #  
+  #
   #    ... work, work, work
   #    mydbg.debugger  # Don't stop here...
   #    work            # but stop here.
@@ -170,7 +171,7 @@ class Trepan
   #
   #   :hide_stack - boolean. If true, omit stack frames before the
   #                          debugger call
-  # 
+  #
   #   :debugme    - boolean. Allow tracing into this routine. You
   #                          generally won't want this. It slows things
   #                          down horribly.
@@ -178,7 +179,7 @@ class Trepan
   def debugger(opts={}, &block)
     # FIXME: one option we may want to pass is the initial trace filter.
     if opts[:hide_stack]
-      @core.processor.hidelevels[Thread.current] = 
+      @core.processor.hidelevels[Thread.current] =
         RubyVM::Frame.current.stack_size
     end
     # unless defined?(PROG_UNRESOLVED_SCRIPT)
@@ -195,9 +196,9 @@ class Trepan
       # Stop immediately after this method returns. But if opts[:debugme]
       # is set, we can stop in this method.
       RubyVM::Frame::current.trace_off = true unless opts[:debugme]
-      @trace_filter.set_trace_func(@core.event_proc) 
+      @trace_filter.set_trace_func(@core.event_proc)
       Trace.event_masks[0] |= @core.step_events
-      @core.debugger(1) 
+      @core.debugger(1)
     else
       RubyVM::Frame::current.trace_off = true unless opts[:debugme]
 
@@ -213,7 +214,7 @@ class Trepan
   def start
     @trace_filter.add_trace_func(@core.event_proc)
   end
-  
+
   # Remove all of our trace events
   def stop(opts={})
     # FIXME: should do something in the middle when
@@ -249,7 +250,7 @@ class Trepan
 
   def process_cmdfile_setting(settings)
     settings[:cmdfiles].each do |item|
-      cmdfile, opts = 
+      cmdfile, opts =
         if item.kind_of?(Array)
           item
         else
@@ -262,10 +263,10 @@ class Trepan
   # As a simplification for creating a debugger object, and then
   # calling using the object to invoke the debugger, we allow this
   # two-step process in one step. That is, instead of
-  #  
+  #
   #  require 'trepanning'
   #  mydbg = Trepan.new()
-  #  ... 
+  #  ...
   #  mydbg.debugger
 
   # You can run:
@@ -275,7 +276,7 @@ class Trepan
   #
   # See debugger for options that can be passed. By default :hide_stack is
   # set.
-  # 
+  #
   # Likewise for mydbg.debugger{ ... }
 
   def self.debug(opts={}, &block)
@@ -289,16 +290,16 @@ class Trepan
   end
 
   def self.debug_str(string, opts = DEFAULT_DEBUG_STR_SETTINGS)
-    $trepanning = Trepan.new(opts) unless 
+    $trepanning = Trepan.new(opts) unless
       $trepanning && $trepanning.is_a?(Trepan)
     $trepanning.core.processor.settings[:different] = false
-    # Perhaps we should do a remap file to string right here? 
+    # Perhaps we should do a remap file to string right here?
     $trepanning.debugger(opts) { eval(string) }
   end
 end
 
 module Kernel
-  # Same as Trepan.debug. 
+  # Same as Trepan.debug.
   # FIXME figure out a way to remove duplication.
   def debugger(opts={}, &block)
     opts = {:hide_stack => false}.merge(opts)