rbx-trepanning 0.0.8-universal-rubinius-1.2 → 0.1.0-universal-rubinius-1.2

data/app/rbx-llvm.rb

@@ -8,8 +8,6 @@ module CodeRay
     
     class LLVM < Scanner
       
-      include Streamable
-      
       register_for :llvm
       file_extension 'llvm'
 

data/app/run.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rbconfig'
 require 'rubygems'; require 'require_relative'
 module Trepanning
@@ -58,16 +58,12 @@ module Trepanning
     ## untrace_var(:$0, dollar_0_tracker)
   end
 
-  # Path name of Ruby interpreter we were invoked with.
-  def ruby_path
-    File.join(%w(bindir RUBY_INSTALL_NAME).map{|k| RbConfig::CONFIG[k]})
-  end
-
   # 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 prog_script.index(File::SEPARATOR)
-      # Don't search since this name has path separator components
+    if prog_script.start_with?(File::SEPARATOR) || prog_script.start_with?('.')
+      # Don't search since this name has path is explicitly absolute or
+      # relative.
       return prog_script
     end
     for dirname in ENV['PATH'].split(File::PATH_SEPARATOR) do
@@ -79,10 +75,18 @@ module Trepanning
   end
 end
 
+# Path name of Ruby interpreter we were invoked with. Is part of 
+# 1.9 but not necessarily 1.8.
+def RbConfig.ruby
+  File.join(RbConfig::CONFIG['bindir'],  
+            RbConfig::CONFIG['RUBY_INSTALL_NAME'] + 
+            RbConfig::CONFIG['EXEEXT'])
+end unless defined? RbConfig.ruby
+
 if __FILE__ == $0
   # Demo it.
   include  Trepanning
   puts whence_file('irb')
   puts whence_file('probably-does-not-exist')
-  puts ruby_path
+  puts RbConfig.ruby
 end

data/app/util.rb

@@ -12,25 +12,69 @@ class Trepan
       end
     end
 
+    # name is String and list is an Array of String.
+    # 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| 
+        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+then\s*$/, '')
+      elsif text =~ /^\s*(?:until|while)\s+/
+        text.gsub!(/^\s*(?:until|while)\s+/,'') 
+        text.gsub!(/\s+do\s*$/, '')
+      elsif text =~ /^\s*return\s+/
+        # EXPRESION in: return EXPRESSION
+        text.gsub!(/^\s*return\s+/,'')
+      elsif text =~ /^\s*case\s+/
+        # EXPRESSION in: case EXPESSION
+        text.gsub!(/^\s*case\s*/,'')
+      elsif text =~ /^\s*def\s*.*\(.+\)/
+        text.gsub!(/^\s*def\s*.*\((.*)\)/,'[\1]')
+      elsif text =~ /^\s*[A-Za-z_][A-Za-z0-9_\[\]]*\s*=[^=>]/
+        # RHS of an assignment statement.
+        text.gsub!(/^\s*[A-Za-z_][A-Za-z0-9_\[\]]*\s*=/,'')
+      end
+      return text
+    end
+
     # Find user portion of script skipping over Rubinius code loading.
     # Unless hidestack is off, we don't show parts of the frame below this.
     def find_main_script(locs)
       candidate = nil
       (locs.size-1).downto(0) do |i|
         loc = locs[i]
-        if 'main.' == loc.describe_receiver &&
+        if 'Object#' == loc.describe_receiver &&
             :__script__ == loc.name
-          if loc.method.active_path =~ /\/trepanx$/
+          if loc.method.active_path =~ /\/trepanx$/ ||
+            loc.method.active_path == 'kernel/loader.rb'
             # Might have been run from standalone trepanx.
             candidate = i
           else
-            return locs.size - i - 1 
+            return locs.size - i
           end
         end
       end
       candidate ? locs.size - candidate - 1 : nil
     end
-    module_function :find_main_script
+
+    # Suppress warnings. The main one we encounter is "already initialized
+    # constant" because perhaps another version readline has done that already.
+    def suppress_warnings
+      original_verbosity = $VERBOSE
+      $VERBOSE = nil
+      result = yield
+      $VERBOSE = original_verbosity
+      return result
+    end  
   end
 end
 
@@ -45,5 +89,11 @@ if __FILE__ == $0
   locs.each_with_index do |l, i| 
     puts "#{i}: #{l.describe}"
   end
-  puts "main script in above is #{locs.size() - 1 - find_main_script(locs)}"
+  ## puts "main script in above is #{locs.size() - 1 - find_main_script(locs)}"
+
+  list = %w(disassemble disable distance up)
+  p list
+  %w(dis disa u upper foo).each do |name|
+    puts "uniq_abbrev of #{name} is #{uniq_abbrev(list, name)}"
+  end
 end

data/bin/trepanx

@@ -2,6 +2,7 @@
 # Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
 # Invoke debugger from the command line. 
 require 'rubygems'; require 'require_relative'
+require 'rbconfig' # For RbConfig.ruby
 require_relative '../app/run'
 require_relative '../app/options'
 require_relative '../app/client'
@@ -35,7 +36,6 @@ if File.basename(__FILE__) == File.basename($0)
 
     # FIXME: do we need to test defined? 
     # FIXME: Should (some of) these be instance variables?
-    Trepan::RUBY_PATH    = ruby_path
     Trepan::TREPAN_PATH  = trepan_path
 
     if ARGV.empty?
@@ -56,14 +56,14 @@ if File.basename(__FILE__) == File.basename($0)
     Trepan::PROG_SCRIPT = program_to_debug
 
     opts = {}
-    %w(cmdfiles highlight initial_dir host nx port readline server
+    %w(cmdfiles highlight initial_dir host nx port readline server traceprint
        ).each do |opt|
       opts[opt.to_sym] = options[opt.to_sym]
     end
 
     # Set global so others may use this debugger.
     $trepan = Trepan.new(opts)
-    debug_program($trepan, Trepan::RUBY_PATH, 
+    debug_program($trepan, RbConfig.ruby,
                   File.expand_path(program_to_debug))
   end
 end

data/data/irbrc

@@ -1,13 +1,13 @@
 # -*- Ruby -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 # We use this as the default startup file for irb inside trepan
 # Down the line we will have a way for folks to add/override this
 # with their own file.
 IRB.conf[:PROMPT_MODE] = :SIMPLE
 IRB.conf[:PROMPT][:SIMPLE] = 
-    {:PROMPT_C=>"trepanx ?> ",
-     :PROMPT_I=>"trepanx >> ",
-     :PROMPT_N=>"trepanx >> ",
+    {:PROMPT_C=>"trepan ?> ",
+     :PROMPT_I=>"trepan >> ",
+     :PROMPT_N=>"trepan >> ",
      :PROMPT_S=>nil,
      :RETURN=>"=> %s\n"}
 
@@ -20,22 +20,22 @@ IRB.conf[:PROMPT][:SIMPLE] =
 puts "You are in a trepan session. You should have access to program scope."
 puts "'dbgr', 'step', 'ne', 'q', 'cont' commands have been added."
 
-if defined?($trepanx) && $trepanx
-   puts 'You should have access to debugger state via global variable $trepanx'
+if defined?($trepan) && $trepan
+   puts 'You should have access to debugger state via global variable $trepan'
 end
-if defined?($trepanx_frame) && $trepanx_frame
-   puts 'You should have access to the program frame via global variable $trepanx_frame'
+if defined?($trepan_frame) && $trepan_frame
+   puts 'You should have access to the program frame via global variable $trepan_frame'
 end
-if defined?($trepanx_cmdproc) && $trepanx_cmdproc
-   puts 'You should have access to the command processor via global variable $trepanx_cmdproc'
+if defined?($trepan_cmdproc) && $trepan_cmdproc
+   puts 'You should have access to the command processor via global variable $trepan_cmdproc'
 end
 
 # Monkeypatch to save the current IRB statement to be run.
 class IRB::Context
-  alias_method :_trepanx_original_evaluate, :evaluate
+  alias_method :_trepan_original_evaluate, :evaluate
   def evaluate(line, line_no)
-    $trepanx_irb_statements = line
-    _trepanx_original_evaluate(line, line_no)
+    $trepan_irb_statements = line
+    _trepan_original_evaluate(line, line_no)
   end
 end
 

data/{interface/base_intf.rb → interface.rb}

@@ -16,7 +16,7 @@ class Trepan
   #  - another interface in another process or computer
   class Interface
 
-    attr_accessor :interactive, :history_io, :history_save, :input, :output
+    attr_accessor :history_io, :history_save, :interactive, :input, :output
 
     unless defined?(YES)
       YES = %w(y yes oui si yep ja)
@@ -59,6 +59,10 @@ 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/client.rb

@@ -46,6 +46,10 @@ class Trepan::ClientInterface < Trepan::Interface
       end
   end
 
+  def closed?
+    @inout.closed?
+  end
+
   def confirm(prompt, default)
     @user.confirm(prompt, default)
   end

data/interface/script.rb

@@ -5,17 +5,19 @@
 
 # Our local modules
 require 'rubygems'; require 'require_relative'
-require_relative 'base_intf'
+require_relative '../interface'
 require_relative '../io/input'
 require_relative '../io/string_array'
 
 # Interface when reading debugger scripts
 class Trepan::ScriptInterface < Trepan::Interface
+  attr_accessor :opts, :output
 
   DEFAULT_OPTS = {
     :abort_on_error => true,
     :confirm_val    => false,
-    :verbose        => false
+    :verbose        => false,
+    :basename       => false
   } unless defined?(DEFAULT_OPTS)
   
   def initialize(script_name, out=nil, opts={})
@@ -28,7 +30,7 @@ class Trepan::ScriptInterface < Trepan::Interface
     @input           = opts[:input] || 
       Trepan::UserInput.open(script_name, :line_edit => false)
     @buffer_output   = []
-    unless opts[:verbose] or out
+    unless @opts[:verbose] or out
       out = Trepan::StringArrayOutput.open(@buffer_output)
     end
     super(@input, out, @opts)
@@ -64,7 +66,7 @@ class Trepan::ScriptInterface < Trepan::Interface
     msg(mess)
     # FIXME: should we just set a flag and report eof? to be more
     # consistent with File and IO?
-    raise IOError if @opts[:abort_on_error]
+    raise ScriptError if @opts[:abort_on_error]
   end
 
   def interactive? ; false end
@@ -75,7 +77,13 @@ class Trepan::ScriptInterface < Trepan::Interface
     @input_lineno += 1
     line = readline
     if @opts[:verbose]
-      location = "%s line %s" % [@script_name, @input_lineno]
+      script_name = 
+        if @opts[:basename] 
+          File.basename(@script_name)
+        else 
+          @script_name
+        end
+      location = "%s line %s" % [script_name, @input_lineno]
       msg('+ %s: %s' % [location, line])
     end
     # Do something with history?

data/interface/server.rb

@@ -3,7 +3,7 @@
 
 # Our local modules
 require 'rubygems'; require 'require_relative'
-require_relative 'base_intf'
+require_relative '../interface'
 require_relative 'comcodes'
 require_relative '../io/input'
 require_relative '../io/tcpserver'
@@ -52,6 +52,10 @@ class Trepan::ServerInterface < Trepan::Interface
     end
   end
   
+  def closed?
+    @inout.closed?
+  end
+
   # Called when a dangerous action is about to be done to make sure
   # it's okay. `prompt' is printed; user response is returned.
   # FIXME: make common routine for this and user.rb

data/interface/user.rb

@@ -6,7 +6,7 @@
 # Our local modules
 
 require 'rubygems'; require 'require_relative'
-require_relative 'base_intf'
+require_relative '../interface'
 require_relative '../io/input'
 
 # Interface when communicating with the user.
@@ -39,6 +39,10 @@ class Trepan::UserInterface < Trepan::Interface
     at_exit { finalize }
   end
 
+  def closed?
+    @input.closed? && @output.closed?
+  end
+
   # Called when a dangerous action is about to be done, to make
   # sure it's okay. Expect a yes/no answer to `prompt' which is printed,
   # suffixed with a question mark and the default value.  The user
@@ -148,4 +152,7 @@ if __FILE__ == $0
       puts "EOF is now: %s" % intf.input.eof?.inspect
     end
   end
+  puts "User interface closed?: #{intf.closed?}"
+  intf.close
+  STDERR.puts "User interface closed?: #{intf.closed?}"
 end

data/io/input.rb

@@ -6,7 +6,7 @@
 # 
 
 require 'rubygems'; require 'require_relative'
-require_relative 'base_io'
+require_relative '../io'
 
 class Trepan
 

data/io/null_output.rb

@@ -1,35 +1,39 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Nukes output. Used for example in sourcing where you don't want
 # to see output.
 # 
 
 require 'rubygems'; require 'require_relative'
-require_relative 'base_io'
+require_relative '../io'
 
-class Trepan
-  class OutputNull < Trepan::OutputBase
-    def initialize(out, opts={})
-      super
-    end
-
-    def close
-    end
-
-    def flush
-    end
-
-    # Use this to set where to write to. output can be a 
-    # file object or a string. This code raises IOError on error.
-    def write(*args)
-    end
-
-    # used to write to a debugger that is connected to this
-    # `str' written will have a newline added to it
-    #
-    def writeline( msg)
-    end
+class Trepan::OutputNull < Trepan::OutputBase
+  def initialize(out, opts={})
+    @closed = false
+    super
+  end
+  
+  def close
+    @closed = true
+  end
+  
+  def closed?
+    !!@closed
+  end
+  
+  def flush
+  end
+  
+  # Use this to set where to write to. output can be a 
+  # file object or a string. This code raises IOError on error.
+  def write(*args)
+  end
+  
+  # used to write to a debugger that is connected to this
+  # `str' written will have a newline added to it
+  #
+  def writeline( msg)
   end
 end
 

data/io/string_array.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Simulate I/O using lists of strings.
 
 require 'rubygems'; require 'require_relative'
-require_relative 'base_io'
+require_relative '../io'
 
 # Simulate I/O using an array of strings. Sort of like StringIO, but
 # even simplier.
@@ -153,4 +153,3 @@ if __FILE__ == $0
   inp.close
   puts "Input is closed? #{inp.closed?}"
 end
-