rbx-trepanning 0.2.0-universal-rubinius-2.0 → 0.2.1-universal-rubinius-2.0

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/options.rb

@@ -9,7 +9,7 @@ class Trepan
   require 'rubygems'; require 'require_relative'
   require_relative 'default'
 
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
   PROGRAM = 'trepanx' unless defined? Trepan::PROGRAM
 
   def self.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/lib/trepanning.rb

@@ -162,7 +162,6 @@ class Trepan
       else
         ['next', 'next', 'next',
          # 'set kernelstep off',  # eventually would like 'on'
-         'set hidelevel -1',
          'step', ]
       end
 

data/processor.rb

@@ -1,13 +1,13 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-# The main "driver" class for a command processor. Other parts of the 
+# The main "driver" class for a command processor. Other parts of the
 # command class and debugger command objects are pulled in from here.
 
 require 'set'
 
 require 'rubygems'; require 'require_relative'
-## %w(default display eventbuf eval load_cmds location frame hook msg 
+## %w(default display eventbuf eval load_cmds location frame hook msg
 ##    validate).each do
-%w(default breakpoint disassemble display eval eventbuf load_cmds location 
+%w(default breakpoint disassemble display eval eventbuf load_cmds location
    frame hook msg running stepping validate).each do
   |mod_str|
   require_relative "processor/#{mod_str}"
@@ -31,7 +31,7 @@ class Trepan
                                    ## FIXME 1.9.2 has attr_reader !
     attr_accessor :debug_nest      # Number of nested debugs. Used in showing
                                    # prompt.
-    attr_accessor :different_pos   # Same type as settings[:different] 
+    attr_accessor :different_pos   # Same type as settings[:different]
                                    # this is the temporary value for the
                                    # next stop while settings is the default
                                    # value to use.
@@ -39,8 +39,8 @@ class Trepan
     attr_reader   :intf            # Current interface
                                    # Trepan::Core instance)
     attr_accessor :leave_cmd_loop  # Commands set this to signal to leave
-                                   # the command loop (which often continues to 
-                                   # run the debugged program). 
+                                   # the command loop (which often continues to
+                                   # run the debugged program).
     attr_accessor :line_no         # Last line shown in "list" command
     attr_accessor :next_level      # Fixnum. frame.stack_size has to
                                    # be <= than this.  If next'ing,
@@ -48,7 +48,7 @@ class Trepan
     attr_accessor :next_thread     # Thread. If non-nil then in
                                    # stepping the thread has to be
                                    # this thread.
-    attr_accessor :pass_exception  # Pass an exception back 
+    attr_accessor :pass_exception  # Pass an exception back
     attr_accessor :prompt          # String print before requesting input
     attr_reader   :settings        # Hash[:symbol] of command
                                    # processor settings
@@ -57,7 +57,7 @@ class Trepan
     # The following are used in to force stopping at a different line
     # number. FIXME: could generalize to a position object.
     attr_accessor :last_pos       # Last position. 6-Tuple: of
-                                  # [location, container, stack_size, 
+                                  # [location, container, stack_size,
                                   #  current_thread, pc_offset]
 
 
@@ -71,7 +71,7 @@ class Trepan
       @next_level      = 32000
       @next_thread     = nil
       @user_variables = 0
-      
+
 
       start_cmds       = settings.delete(:start_cmds)
       start_file       = settings.delete(:start_file)
@@ -81,18 +81,18 @@ class Trepan
 
       # FIXME: Rework using a general "set substitute file" command and
       # a global default profile which gets read.
-      prelude_file = File.expand_path(File.join(File.dirname(__FILE__), 
+      prelude_file = File.expand_path(File.join(File.dirname(__FILE__),
                                                 %w(.. data prelude.rb)))
 
       # Start with empty thread and frame info.
-      frame_teardown 
+      frame_teardown
 
       # Run initialization routines for each of the "submodule"s.
       # load_cmds has to come first.
       ## %w(load_cmds breakpoint display eventbuf frame running validate
       ##   ).each do |submod|
-      %w(load_cmds breakpoint display eventbuf frame running 
-         stepping validate).each do 
+      %w(load_cmds breakpoint display eventbuf frame running
+         stepping validate).each do
         |submod|
         self.send("#{submod}_initialize")
       end
@@ -115,7 +115,7 @@ class Trepan
     end
 
     def compute_prompt
-      "(#{@settings[:prompt]}): " 
+      "(#{@settings[:prompt]}): "
     end
 
     # Check that we meed the criteria that cmd specifies it needs
@@ -124,13 +124,13 @@ class Trepan
       # Check we have frame is not null
       min_args = cmd.class.const_get(:MIN_ARGS)
       if nargs < min_args
-        errmsg(("Command '%s' needs at least %d argument(s); " + 
+        errmsg(("Command '%s' needs at least %d argument(s); " +
                 "got %d.") % [name, min_args, nargs])
         return false
       end
       max_args = cmd.class.const_get(:MAX_ARGS)
       if max_args and nargs > max_args
-        errmsg(("Command '%s' needs at most %d argument(s); " + 
+        errmsg(("Command '%s' needs at most %d argument(s); " +
                 "got %d.") % [name, max_args, nargs])
         return false
       end
@@ -154,14 +154,14 @@ class Trepan
       return true if @intf.input_eof? && intf_size == 1
       while intf_size > 1 || !@intf.input_eof?
         begin
-          @current_command = 
+          @current_command =
             if @cmd_queue.empty?
               # Leave trailing blanks on for the "complete" command
-              read_command.chomp 
+              read_command.chomp
             else
               @cmd_queue.shift
             end
-          if @current_command.empty? 
+          if @current_command.empty?
             next unless @last_command && intf.interactive?;
           end
           next if @current_command[0..0] == '#' # Skip comment lines
@@ -200,7 +200,7 @@ class Trepan
       @unconditional_prehooks.run
       if breakpoint?
         delete_breakpoint(@brkpt) if @brkpt.temp?
-        @last_pos = [@frame.vm_location, @stack_size, @current_thread, @event] 
+        @last_pos = [@frame.vm_location, @stack_size, @current_thread, @event]
       end
 
       if stepping_skip? # || @stack_size <= @hide_level
@@ -219,12 +219,12 @@ class Trepan
 
       @leave_cmd_loop = false
       print_location unless @settings[:traceprint]
-      # if 'trace-var' == @event 
+      # if 'trace-var' == @event
       #   msg "Note: we are stopped *after* the above location."
       # end
 
       @eventbuf.add_mark if @settings[:tracebuffer]
-      
+
       @return_to_program = false
       @cmdloop_prehooks.run
       return false
@@ -239,7 +239,7 @@ class Trepan
 #          if settings[:traceprint]
 #            @return_to_program = 'step'
 #          else
-            if !skip_command 
+            if !skip_command
               break if process_command_and_quit?()
             end
 #          end
@@ -274,7 +274,7 @@ class Trepan
     # Run current_command, a String. @last_command is set after the
     # command is run if it is a command.
     def run_command(current_command)
-      eval_command = 
+      eval_command =
         if current_command[0..0] == '!'
           current_command[0] = ''
         else
@@ -295,7 +295,7 @@ class Trepan
           break unless @macros.member?(macro_cmd_name)
           current_command = @macros[macro_cmd_name][0].call(*args[1..-1])
           msg current_command.inspect if settings[:debugmacro]
-          if current_command.is_a?(Array) && 
+          if current_command.is_a?(Array) &&
               current_command.all? {|val| val.is_a?(String)}
             args = (first=current_command.shift).split
             @cmd_queue += current_command
@@ -310,21 +310,21 @@ class Trepan
         end
 
         @cmd_name = args[0]
-        run_cmd_name = 
+        run_cmd_name =
           if @aliases.member?(@cmd_name)
-            @aliases[@cmd_name] 
+            @aliases[@cmd_name]
           else
             @cmd_name
           end
-        
+
         run_cmd_name = uniq_abbrev(@commands.keys, run_cmd_name) if
           !@commands.member?(run_cmd_name) && @settings[:abbrev]
-          
+
         if @commands.member?(run_cmd_name)
           cmd = @commands[run_cmd_name]
           if ok_for_running(cmd, run_cmd_name, args.size-1)
             @cmd_argstr = current_command[@cmd_name.size..-1].lstrip
-            cmd.run(args) 
+            cmd.run(args)
             @last_command = current_command
           end
           return false
@@ -346,7 +346,7 @@ class Trepan
 
     # Error message when a command doesn't exist
     def undefined_command(cmd_name)
-      begin 
+      begin
         errmsg('Undefined command: "%s". Try "help".' % cmd_name)
       rescue
         $stderr.puts 'Undefined command: "%s". Try "help".' % cmd_name
@@ -398,7 +398,7 @@ if __FILE__ == $0
   #   end
   #   $input = ['1+2']
   #   cmdproc.process_command_and_quit?
-  #   $input = ['!s = 5']  # ! means eval line 
+  #   $input = ['!s = 5']  # ! means eval line
   #   cmdproc.process_command_and_quit?
   # end
 end

data/processor/command.rb

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 # Base class of all commands. Code common to all commands is here.
 # Note: don't end classname with Command (capital C) since main
-# will think this a command name like QuitCommand 
+# will think this a command name like QuitCommand
 require 'rubygems'; require 'require_relative'
+require 'redcard/rubinius'
 require 'columnize'
 require_relative '../app/complete'
 
@@ -31,7 +32,7 @@ class Trepan
     # List commands arranged in an aligned columns
     def columnize_commands(commands)
       width = settings[:maxwidth]
-      Columnize::columnize(commands, width, ' ' * 4, 
+      Columnize::columnize(commands, width, ' ' * 4,
                            true, true, ' ' * 2).chomp
     end
 
@@ -53,7 +54,7 @@ class Trepan
     end
 
     def obj_const(obj, name)
-      obj.class.const_get(name) 
+      obj.class.const_get(name)
     end
 
     def msg(message, opts={})
@@ -65,15 +66,33 @@ class Trepan
       @proc.msg_nocr(msg, opts)
     end
 
+    def get_const(klass, name)
+      name = name.to_sym if RedCard.check '1.9'
+      if klass.constants.member?(name)
+        klass.const_get(name)
+      else
+        nil
+      end
+    end
+
+    def set_const(klass, name, val)
+      name = name.to_sym if RedCard.check '1.9'
+      if klass.constants.member?(name)
+        klass.const_set(name, val)
+      else
+        nil
+    end
+    end
+
     def my_const(name)
       # Set class constant SHORT_HELP to be the first line of HELP
       # unless it has been defined in the class already.
       # The below was the simplest way I could find to do this since
       # we are the super class but want to set the subclass's constant.
       # defined? didn't seem to work here.
-      c = self.class.constants
-      if c.member?('HELP') and !c.member?('SHORT_HELP')
-        short_help = self.class.const_get(:HELP).split("\n")[0].chomp('.')
+      short_help = get_const(self.class, 'SHORT_HELP')
+      if !short_help and (help = get_const(self.class, 'HELP'))
+        short_help = help
         self.class.const_set(:SHORT_HELP, short_help)
       end
       self.class.const_get(name)
@@ -97,18 +116,18 @@ class Trepan
     end
 
     def short_help
-      help_constant_sym = if self.class.constants.member?('SHORT_HELP') 
-                            :SHORT_HELP 
+      help_constant_sym = if self.class.constants.member?('SHORT_HELP')
+                            :SHORT_HELP
                           else :HELP
                           end
       my_const(help_constant_sym)
     end
 
     # Define a method called 'complete' on the singleton class.
-    def self.completion(ary) 
-      self.send(:define_method, 
-                :complete, 
-                Proc.new {|prefix| 
+    def self.completion(ary)
+      self.send(:define_method,
+                :complete,
+                Proc.new {|prefix|
                   Trepan::Complete.complete_token(ary, prefix) })
     end