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

data/app/complete.rb

@@ -12,21 +12,21 @@ class Trepan
     def complete_token(complete_ary, prefix)
       complete_ary.select { |cmd| cmd.to_s.start_with?(prefix) }.map{|cmd| cmd.to_s}.sort
     end
-    
+
     def complete_token_with_next(complete_hash, prefix, cmd_prefix='')
       result = []
-      complete_hash.each do |cmd_name, cmd_obj| 
-        result << [cmd_name.to_s[cmd_prefix.size..-1], cmd_obj] if 
+      complete_hash.each do |cmd_name, cmd_obj|
+        result << [cmd_name.to_s[cmd_prefix.size..-1], cmd_obj] if
           cmd_name.to_s.start_with?(cmd_prefix + prefix)
       end
       result.sort{|a, b| a[0] <=> b[0]}
     end
-    
+
     # Find all starting matches in Hash +aliases+ that start with +prefix+,
     # but filter out any matches already in +expanded+.
     def complete_token_filtered(aliases, prefix, expanded)
       complete_ary = aliases.keys
-      complete_ary.select { |cmd| 
+      complete_ary.select { |cmd|
         cmd.to_s.start_with?(prefix) && ! expanded.member?(aliases[cmd])}.sort
     end
 
@@ -37,31 +37,31 @@ class Trepan
       complete_ary = aliases.keys
       expanded_ary = expanded.keys
       result = []
-      complete_ary.each do |cmd| 
-        if cmd.to_s.start_with?(prefix) && 
+      complete_ary.each do |cmd|
+        if cmd.to_s.start_with?(prefix) &&
             !expanded_ary.member?(aliases[cmd])
-          result << [cmd, commands[aliases[cmd]]] 
+          result << [cmd, commands[aliases[cmd]]]
         end
       end
       result
     end
 
     # Find the next token in str string from start_pos, we return
-    # the token and the next blank position after the token or 
+    # the token and the next blank position after the token or
     # str.size if this is the last token. Tokens are delimited by
     # white space.
     def next_token(str, start_pos)
       look_at = str[start_pos..-1]
       next_nonblank_pos = start_pos + (look_at =~ /\S/ || 0)
-      next_blank_pos = 
+      next_blank_pos =
         if next_match = str[next_nonblank_pos..-1] =~ /\s/
-          next_nonblank_pos + next_match 
+          next_nonblank_pos + next_match
         else
           str.size
         end
       return [next_blank_pos, str[next_nonblank_pos...next_blank_pos]]
     end
-    
+
   end
 end
 

data/app/default.rb

@@ -9,7 +9,7 @@ class Trepan
   DEFAULT_SETTINGS = {
     :cmdproc_opts    => {},    # Default Trepan::CmdProcessor settings
     :core_opts       => {},    # Default Trepan::Core settings
-    :delete_restore  => true,  # Delete restore profile after reading? 
+    :delete_restore  => true,  # Delete restore profile after reading?
     :initial_dir     => nil,   # If --cd option was given, we save it here.
     :nx              => false, # Don't run user startup file (e.g. .trepanxrc)
     :offset          => 0,     # skipping back +offset+ frames. This lets you start
@@ -18,7 +18,7 @@ class Trepan
     # Default values used only when 'server' or 'client'
     # (out-of-process debugging)
     :port            => 1955,
-    :host            => 'localhost', 
+    :host            => 'localhost',
 
     :restart_argv    => Rubinius::OS_ARGV,
                                # Command run when "restart" is given.
@@ -27,6 +27,7 @@ class Trepan
                                # command-line we need this to skip
                                # over some initial Rubinius loader
                                # commands.
+    :start_frame     => 1,
   } unless defined?(DEFAULT_SETTINGS)
 
   # Default settings for Trepan run from the command line.
@@ -36,7 +37,7 @@ class Trepan
     :nx       => false, # Don't run user startup file (e.g. .trepanxrc)
     :output   => nil,
     :port     => DEFAULT_SETTINGS[:port],
-    :host     => DEFAULT_SETTINGS[:host], 
+    :host     => DEFAULT_SETTINGS[:host],
     :server   => false, # Out-of-process debugging?
     :readline => true,  # Try to use GNU Readline?
     # Note that at most one of :server or :client can be true.
@@ -48,10 +49,10 @@ class Trepan
     :hide_stack => true,
   } unless defined?(DEFAULT_DEBUG_STR_SETTINGS)
 
-  CMD_INITFILE_BASE = 
+  CMD_INITFILE_BASE =
     if RUBY_PLATFORM =~ /mswin/
       # Of course MS Windows has to be different
-      HOME_DIR     =  (ENV['HOME'] || 
+      HOME_DIR     =  (ENV['HOME'] ||
                        ENV['HOMEDRIVE'].to_s + ENV['HOMEPATH'].to_s).to_s
       'trepanx.ini'
     else

data/app/display.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 # Classes to support gdb-like display/undisplay.
 
 require 'rubygems'; require 'require_relative'
@@ -8,7 +8,7 @@ require_relative 'frame'
 # return suitable frame signature to key display expressions off of.
 def display_signature(frame)
   return nil unless frame
-  frame.vm_location.static_scope
+  frame.vm_location.constant_scope
 end
 
 # Manage a list of display expressions.

data/app/frame.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 class Trepan
 
   # Call-Stack frame methods
@@ -18,7 +18,7 @@ class Trepan
     def binding
       @binding ||= Binding.setup(@vm_location.variables,
                                  @vm_location.method,
-                                 @vm_location.static_scope)
+                                 @vm_location.constant_scope)
     end
 
     def describe(opts = {})
@@ -80,6 +80,19 @@ class Trepan
       method.local_names
     end
 
+    # Return true if frame1 and frame2 are at the same place.
+    # We use this for example in detecting tail recursion.
+    def location_equal(other_frame)
+      # if self && other_frame 
+      #   puts(self.vm_location.line, other_frame.vm_location.line, 
+      #        self.vm_location.ip, other_frame.vm_location.ip, 
+      #        self.vm_location.method.active_path, other_frame.vm_locaion.method.actionve_path)
+      # end
+      self && other_frame && self.vm_location.line == other_frame.vm_location.line &&
+        self.vm_location.ip == other_frame.vm_location.ip && 
+        self.vm_location.method.active_path == other_frame.vm_location.method.active_path
+    end
+
     def method
       @vm_location.method
     end
@@ -93,13 +106,13 @@ class Trepan
     end
 
     def eval?
-      static = @vm_location.static_scope
+      static = @vm_location.constant_scope
       static && static.script && static.script.eval_source
     end
 
     def eval_string
       return nil unless eval?
-      static = @vm_location.static_scope
+      static = @vm_location.constant_scope
       static.script.eval_source
     end
 

data/app/method.rb

@@ -1,9 +1,9 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 module Trepanning
   module Method
 
     module_function
-    ## FIXME: until the next two routines find their way back into 
+    ## FIXME: until the next two routines find their way back into
     ## Rubinius::CompiledMethod...
     ##
     # Locates the instruction address (IP) of the first instruction on
@@ -79,24 +79,24 @@ module Trepanning
       unless cm.kind_of?(Rubinius::CompiledMethod)
         return nil
       end
-      
+
       lines = lines_of_method(cm)
-      return cm if lines.member?(line) 
+      return cm if lines.member?(line)
       scope = cm.scope
-      return nil unless scope.current_script
-      cm  = scope.current_script.compiled_method
+      return nil unless scope and scope.current_script
+      cm  = scope.current_script.compiled_code
       lines = lines_of_method(cm)
       until lines.member?(line) do
         child = scope
         scope = scope.parent
         unless scope
           # child is the top-most scope. Search down from here.
-          cm = child.current_script.compiled_method
+          cm = child.current_script.compiled_code
           pair = locate_line(line, cm)
           ## pair = cm.locate_line(line)
           return pair ? pair[0] : nil
         end
-        cm = scope.current_script.compiled_method
+        cm = scope.current_script.compiled_code
         lines = lines_of_method(cm)
       end
       return cm
@@ -104,10 +104,11 @@ module Trepanning
 
     def top_scope(cm)
       scope = cm.scope
+      return unless scope
       while true do
         scope = scope.parent
         break unless scope && scope.current_script
-        cm = scope.current_script.compiled_method
+        cm = scope.current_script.compiled_code
       end
       cm
     end
@@ -170,7 +171,7 @@ if __FILE__ == $0
   p find_method_with_line(cm, line+2)
   puts "top scope: #{top_scope(cm)}"
   ip = locate_line( __LINE__, cm)[1]
-  puts "Line #{__LINE__} has ip #{ip}" 
+  puts "Line #{__LINE__} has ip #{ip}"
   [-1, 0, 10, ip, 10000].each do |i|
     puts "IP #{i} is %svalid" % (valid_ip?(cm, i) ? '' : 'not ')
   end

data/app/options.rb

@@ -1,16 +1,15 @@
-
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 #=== Summary
-# Parses command-line options. 
+# Parses command-line options.
 
 require 'optparse'
 class Trepan
   require 'rubygems'; require 'require_relative'
   require_relative 'default'
 
-  VERSION = '0.1.0'
+  VERSION = '0.2.1'
   PROGRAM = 'trepanx' unless defined? Trepan::PROGRAM
 
   def self.show_version
@@ -20,7 +19,7 @@ class Trepan
   def self.copy_default_options
     options = {}
     DEFAULT_CMDLINE_SETTINGS.each do |key, value|
-      begin 
+      begin
         options[key] = value.clone
       rescue TypeError
         options[key] = value
@@ -45,8 +44,8 @@ EOB
           options[:client] = true
         end
       end
-      opts.on('-c', '--command FILE', String, 
-              'Execute debugger commands from FILE') do |cmdfile| 
+      opts.on('-c', '--command FILE', String,
+              'Execute debugger commands from FILE') do |cmdfile|
         if File.readable?(cmdfile)
           options[:cmdfiles] << cmdfile
         elsif File.exists?(cmdfile)
@@ -55,7 +54,7 @@ EOB
           stderr.puts "Command file '#{cmdfile}' does not exist."
         end
       end
-      opts.on('--cd DIR', String, 'Change current directory to DIR') do |dir| 
+      opts.on('--cd DIR', String, 'Change current directory to DIR') do |dir|
         if File.directory?(dir)
           if File.executable?(dir)
             options[:chdir] = dir
@@ -66,24 +65,24 @@ EOB
           stderr.puts "\"#{dir}\" is not a directory. Option --cd ignored."
         end
       end
-      opts.on('--basename', 
-              'Show only file basename in file locations') do 
+      opts.on('--basename',
+              'Show only file basename in file locations') do
         options[:basename] = true
       end
-      opts.on('-d', '--debug', 'Set $DEBUG=true') do 
+      opts.on('-d', '--debug', 'Set $DEBUG=true') do
         $DEBUG = true
       end
      opts.on('--[no-]highlight',
               'Use [no] syntax highlight output') do |v|
         options[:highlight] = ((v) ? :term : nil)
       end
-      opts.on('-h', '--host NAME', String, 
-              'Host or IP used in TCP connections for --server or --client. ' + 
-              "Default is #{DEFAULT_SETTINGS[:host].inspect}.") do 
-        |name_or_ip| 
+      opts.on('-h', '--host NAME', String,
+              'Host or IP used in TCP connections for --server or --client. ' +
+              "Default is #{DEFAULT_SETTINGS[:host].inspect}.") do
+        |name_or_ip|
         options[:host] = name_or_ip
       end
-      opts.on('-I', '--include PATH', String, 'Add PATH to $LOAD_PATH') do 
+      opts.on('-I', '--include PATH', String, 'Add PATH to $LOAD_PATH') do
         |path|
         $LOAD_PATH.unshift(path)
       end
@@ -91,10 +90,10 @@ EOB
               "Do not run debugger initialization file #{CMD_INITFILE}") do
         options[:nx] = true
       end
-      opts.on('-p', '--port NUMBER', Integer, 
-              'Port number used in TCP connections for --server or --client. ' + 
-              "Default is #{DEFAULT_SETTINGS[:port]}.") do 
-        |num| 
+      opts.on('-p', '--port NUMBER', Integer,
+              'Port number used in TCP connections for --server or --client. ' +
+              "Default is #{DEFAULT_SETTINGS[:port]}.") do
+        |num|
         options[:port] = num
       end
       opts.on('--[no-]readline',
@@ -125,9 +124,9 @@ EOB
       opts.on_tail('-?', '--help', 'Show this message') do
         options[:help] = true
         stdout.puts opts
-        exit 
+        exit
       end
-      opts.on_tail('-v', '--version', 
+      opts.on_tail('-v', '--version',
                    'print the version') do
         options[:version] = true
         stdout.puts show_version

data/app/util.rb

@@ -1,9 +1,10 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
+require 'redcard/rubinius'
 
 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 +17,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
@@ -46,14 +47,20 @@ class Trepan
       return text
     end
 
+
+    def rubinius_internal?(loc)
+      ('Object#' == loc.describe_receiver &&
+       :__script__ == loc.name && RedCard.check('1.8')) or
+        ('Rubinius::Loader#' == loc.describe_receiver && RedCard.check('1.9'))
+    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 'Object#' == loc.describe_receiver &&
-            :__script__ == loc.name
+        if rubinius_internal?(loc)
           if loc.method.active_path =~ /\/trepanx$/ ||
             loc.method.active_path == 'kernel/loader.rb'
             # Might have been run from standalone trepanx.
@@ -74,7 +81,7 @@ class Trepan
       result = yield
       $VERBOSE = original_verbosity
       return result
-    end  
+    end
   end
 end
 
@@ -86,7 +93,7 @@ if __FILE__ == $0
   puts safe_repr(string.inspect, 17)
   puts safe_repr(string.inspect, 17, '')
   locs = Rubinius::VM.backtrace(0)
-  locs.each_with_index do |l, i| 
+  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)}"

data/interface/user.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Interface when communicating with the user.
 
@@ -120,7 +120,7 @@ class Trepan::UserInterface < Trepan::Interface
 
   def readline(prompt='')
     @output.flush
-    if @input.line_edit && @opts[:readline]
+    if @input.line_edit && @input.use_readline
       @input.readline(prompt)
     else
       @output.write(prompt) if prompt and prompt.size > 0

data/io/input.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Debugger user/command-oriented input possibly attached to IO-style
 # input or GNU Readline.
@@ -14,6 +14,8 @@ class Trepan
   # input or GNU Readline.
   class UserInput < Trepan::InputBase
 
+    attr_reader   :use_readline
+
     @@readline_finalized = false
 
     def initialize(inp, opts={})
@@ -37,8 +39,16 @@ class Trepan
         if @line_edit && @use_readline
           line = Readline.readline(prompt, true)
         else
-          line = @input.gets
+          # Prompt should be empty and should have been 
+          # handled by caller.
+          unless prompt.empty?
+            raise RuntimeError, 
+            "Internal error: prompt '#{prompt}' should have been handled by caller" unless prompt.empty?
           end
+          line = @input.gets
+        end
+      rescue Interrupt
+        return ''
       rescue EOFError
       rescue => e
         puts $!.backtrace
@@ -65,7 +75,7 @@ class Trepan
       end
 
       def finalize
-       if defined?(RbReadline) && !@@readline_finalized
+        if defined?(RbReadline) && !@@readline_finalized
           begin 
             RbReadline.rl_cleanup_after_signal()
           rescue