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

data/processor/command/shell.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 require 'irb'
 require 'rubygems'; require 'require_relative'
 require_relative '../command'
@@ -13,10 +13,10 @@ class Trepan::Command::IRBCommand < Trepan::Command
 starts an Interactive Ruby (IRB) session.
 
 If -d is added you can get access to debugger frame the global variables
-$trepan_frame and $trepan_cmdproc. 
+$trepan_frame and $trepan_cmdproc.
 
-#{NAME} is extended with methods 'cont', 'ne', and, 'q', 'step' which 
-run the corresponding debugger commands 'continue', 'next', 'exit' and 'step'. 
+#{NAME} is extended with methods 'cont', 'ne', and, 'q', 'step' which
+run the corresponding debugger commands 'continue', 'next', 'exit' and 'step'.
 
 To issue a debugger command, inside #{NAME} nested inside a debugger use
 'dbgr'. For example:
@@ -43,7 +43,7 @@ Here then is a loop to query VM stack values:
 
   # This method runs the command
   def run(args)
-    add_debugging = 
+    add_debugging =
       if args.size > 1
         '-d' == args[1]
       else
@@ -59,7 +59,7 @@ Here then is a loop to query VM stack values:
       throw :IRB_EXIT, :cont if $trepan_in_irb
     end
 
-    $trepan = @proc.dbgr 
+    $trepan = @proc.dbgr
     if add_debugging
       $trepan_cmdproc  = @proc
       $trepan_frame    = @proc.frame
@@ -72,32 +72,32 @@ Here then is a loop to query VM stack values:
             :RC => true}
 
     # ?? Should we set GNU readline to what we have,
-    # or let IRB make its own determination? 
+    # or let IRB make its own determination?
 
-    # Save the Readline history and set the Readline completion function 
-    # to be IRB's function 
-    if Trepan::GNU_readline? 
+    # Save the Readline history and set the Readline completion function
+    # to be IRB's function
+    if Trepan::GNU_readline?
       @proc.intf.save_history if @proc.intf.respond_to?(:save_history)
       require 'irb/completion'
       Readline.completion_proc = IRB::InputCompletor::CompletionProc
     end
 
-    # And just when you thought, we'd never get around to 
+    # And just when you thought, we'd never get around to
     # actually running irb...
     cont = IRB.start_session(@proc.frame.binding, @proc, conf)
     trap('SIGINT', save_trap) # Restore our old interrupt function.
 
-    # Restore the debuggers' Readline history and the Readline completion 
+    # Restore the debuggers' Readline history and the Readline completion
     # function
     if Trepan::GNU_readline? && @proc.dbgr.completion_proc
       @proc.intf.read_history if @proc.intf.respond_to?(:read_history)
-      Readline.completion_proc = @proc.dbgr.completion_proc 
+      Readline.completion_proc = @proc.dbgr.completion_proc
     end
 
     # Respect any backtrace limit set in irb.
     back_trace_limit = IRB.CurrentContext.back_trace_limit
     if settings[:maxstack] !=  back_trace_limit
-      msg("\nSetting debugger's BACK_TRACE_LIMIT (%d) to match irb's last setting (%d)" % 
+      msg("\nSetting debugger's BACK_TRACE_LIMIT (%d) to match irb's last setting (%d)" %
           [settings[:maxstack], back_trace_limit])
       settings[:maxstack]= IRB.CurrentContext.back_trace_limit
     end
@@ -106,13 +106,13 @@ Here then is a loop to query VM stack values:
     when :continue
       @proc.continue
     when :finish
-      @proc.finish 
+      @proc.finish
     when :next
-      @proc.step ('next', 1, {})
+      @proc.step('next', 1, {})
     when :quit
       @proc.quit
     when :step
-      @proc.step ('step', 1, {})
+      @proc.step('step', 1, {})
     else
       @proc.print_location
     end

data/processor/default.rb

@@ -1,9 +1,12 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
 require_relative '../app/default'
 require_relative 'virtual'
 class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
 
+  computed_displaywidth = (ENV['COLUMNS'] || '80').to_i
+  computed_displaywidth = 80 unless computed_displaywidth >= 10
+
   DEFAULT_SETTINGS = {
     :abbrev        => true,       # Allow abbreviations of debugger commands?
     :autoeval      => true,       # Ruby eval non-debugger commands
@@ -33,7 +36,7 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
     :maxstring     => 150,        # Strings which are larger than this
                                   # will be truncated to this length when
                                   # printed
-    :maxwidth       => (ENV['COLUMNS'] || '80').to_i,
+    :maxwidth       => computed_displaywidth,
     :prompt         => 'trepanx', # core part of prompt. Additional info like
                                   # debug nesting and thread name is fixed
                                   # and added on.

data/processor/frame.rb

@@ -137,6 +137,43 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
     frame
   end
   
+  def print_stack_trace(frame=top_frame, opts={})
+    last_frame = nil
+    # TODO: handle indirect recursion.
+    direct_recursion_count = 0
+    count = opts[:count]
+    verbose = opts[:verbose]
+    
+    dbgr.each_frame(frame) do |frame|
+      if count and frame.number >= count
+        msg "(More stack frames follow...)" if count != stack_size
+        return 
+      end
+      if frame.location_equal(last_frame)
+        direct_recursion_count += 1
+      else
+        if direct_recursion_count > 0
+          msg("... above line repeated #{direct_recursion_count} times")
+          direct_recursion_count = 0
+        end
+        prefix = (frame == @frame) ? '-->' : '   '
+
+        ### FIXME: Move into a method.
+        msg "%s #%d %s" % [prefix, frame.number, 
+                           frame.describe(:show_ip => verbose, 
+                                          :basename => settings[:basename])]
+        if verbose
+          frame.local_variables.each do |local|
+            msg "       #{local} = #{frame.run(local.to_s).inspect}"
+          end
+        end
+        ### End FIXME
+
+      end
+      last_frame = frame
+    end
+  end
+
   def set_hide_level
     max_stack_size = @dbgr.vm_locations.size
     @hide_level = 

data/processor/help.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
   # class SubHelp
@@ -9,7 +9,7 @@ class Trepan
   #   end
 
   #   def load_sub_help_files(dir)
-  #     Dir.glob(dir, '*.txt').each do |txt| 
+  #     Dir.glob(dir, '*.txt').each do |txt|
   #       basename = File.basename(txt, '.txt')
   #       @list << basename
   #     end
@@ -33,16 +33,14 @@ class Trepan
       # 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 = subcmd.class.constants
-      if c.member?('HELP') and !c.member?('SHORT_HELP')
-        short_help = subcmd.class.const_get('HELP').split("\n")[0].chomp('.')
-        subcmd.class.const_set(:SHORT_HELP, short_help)
-      end
-      
+      short_help = get_const(self.class, 'SHORT_HELP')
+      short_help = get_const(self.class, 'HELP') unless short_help
+      short_help = short_help.split("\n")[0].chomp('.')
+
       '  %-12s -- %s' %
-          [abbrev_stringify(obj_const(subcmd, :NAME), 
+          [abbrev_stringify(obj_const(subcmd, :NAME),
                             obj_const(subcmd, :MIN_ABBREV)),
-           obj_const(subcmd, :SHORT_HELP)]
+           short_help]
     end
 
     # We were given cmd without a subcommand; cmd is something
@@ -77,7 +75,7 @@ Long description goes here.'
     MIN_ABBREV = 1
     NAME       = File.basename(__FILE__)
     def obj_const(obj, name)
-      obj.class.const_get(name) 
+      obj.class.const_get(name)
     end
     def msg(mess)
       puts mess

data/processor/load_cmds.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>
 require 'tmpdir'
+require 'redcard/rubinius'
 
 # 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'
@@ -15,11 +16,11 @@ class Trepan
                                    # 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".
     def load_cmds_initialize
       @commands = {}
@@ -28,28 +29,43 @@ class Trepan
 
       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
 
+    def get_class_aliases(klass)
+        if RedCard.check '1.9' and
+            klass.constants.member?(:ALIASES)
+          klass.const_get(:ALIASES)
+        elsif RedCard.check '1.8' and
+            klass.constants.member?('ALIASES')
+          klass.const_get('ALIASES')
+        else
+          []
+        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)
       if File.directory?(file_or_dir)
         dir = File.expand_path(file_or_dir)
-        # change $0 so it doesn't get in the way of __FILE__ = $0
-        old_dollar0 = $0
+        # Change $0 so it doesn't get in the way of __FILE__ = $0.
+        # In rubinius 2.0.0.rc1 (1.8.7 93c75658...) $0 is nil
+        # and this can cause an error when one restores $0 below.
+        # See https://github.com/rubinius/rubinius/issues/2450
+        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
@@ -60,12 +76,11 @@ class Trepan
         klass = Trepan::Command.const_get(name)
         cmd = klass.send(:new, self)
 
+      cmd_name = klass.const_get(:NAME)
+
         # Add to list of commands and aliases.
         cmd_name = klass.const_get(:NAME)
-        if klass.constants.member?('ALIASES')
-          aliases= klass.const_get('ALIASES')
-          aliases.each {|a| @aliases[a] = cmd_name}
-        end
+        get_class_aliases(klass).each {|a| @aliases[a] = cmd_name}
         @commands[cmd_name] = cmd
       end
     end
@@ -77,17 +92,14 @@ class Trepan
       # 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.each {|a| @aliases[a] = cmd_name}
-      end
+      get_class_aliases.each {|a| @aliases[a] = cmd_name}
       @commands[cmd_name] = cmd
     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)
@@ -95,12 +107,12 @@ class Trepan
         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
@@ -111,7 +123,7 @@ class Trepan
     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')
@@ -125,16 +137,16 @@ class Trepan
         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
 
@@ -181,16 +193,16 @@ class Trepan
     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) 
+
+      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? && 
+        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], 
+            return next_complete(str, next_blank_pos, match_pairs[0][1],
                                  last_token)
           else
             # FIXME: figure out what to do here.
@@ -202,7 +214,7 @@ class Trepan
       elsif cmd.respond_to?(:complete)
         matches = cmd.complete(token)
         return [] if matches.empty?
-        if str[next_blank_pos..-1].rstrip.empty? && 
+        if str[next_blank_pos..-1].rstrip.empty? &&
             (token.empty? || token == last_token)
           return matches
         else
@@ -224,14 +236,6 @@ if __FILE__ == $0
   end
 
   cmdproc = Trepan::CmdProcessor.new(nil)
-  cmddir = File.join(File.dirname(__FILE__), 'command')
-  cmdproc.instance_variable_set('@settings', {})
-  cmdproc.load_cmds_initialize
-  require 'columnize'
-  puts Columnize.columnize(cmdproc.commands.keys.sort)
-  puts '=' * 20
-  puts Columnize.columnize(cmdproc.aliases.keys.sort)
-  puts '=' * 20
 
   def cmdproc.errmsg(mess)
     puts "** #{mess}"
@@ -241,6 +245,15 @@ if __FILE__ == $0
     puts mess
   end
 
+  cmddir = File.join(File.dirname(__FILE__), 'command')
+  cmdproc.instance_variable_set('@settings', {})
+  cmdproc.load_cmds_initialize
+  require 'columnize'
+  puts Columnize.columnize(cmdproc.commands.keys.sort)
+  puts '=' * 20
+  puts Columnize.columnize(cmdproc.aliases.keys.sort)
+  puts '=' * 20
+
   cmdproc.run_cmd('foo')  # Invalid - not an Array
   cmdproc.run_cmd([])     # Invalid - empty Array
   cmdproc.run_cmd(['list', 5])  # Invalid - nonstring arg

data/processor/location.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; 
 require 'pathname'  # For cleanpath
 require 'linecache'
@@ -124,7 +124,7 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
     vm_location = @frame.vm_location
     filename = vm_location.method.active_path
     line_no  = @frame.line
-    static   = vm_location.static_scope
+    static   = vm_location.constant_scope
     opts[:compiled_method] = top_scope(@frame.method)
     
     if @frame.eval?

data/processor/mock.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 # Mock setup for commands.
 require 'rubygems'; require 'require_relative'
 
@@ -18,14 +18,14 @@ module MockDebugger
     attr_accessor :intf         # The way the outside world interfaces with us.
     attr_reader   :initial_dir  # String. Current directory when program
                                 # started. Used in restart program.
-    attr_accessor :restart_argv # How to restart us, empty or nil. 
+    attr_accessor :restart_argv # How to restart us, empty or nil.
                                 # Note restart[0] is typically $0.
     attr_reader   :settings     # Hash[:symbol] of things you can configure
     attr_accessor :processor
 
     # FIXME: move more stuff of here and into Trepan::CmdProcessor
     # These below should go into Trepan::CmdProcessor.
-    attr_reader :cmd_argstr, :cmd_name, :vm_locations, :current_frame, 
+    attr_reader :cmd_argstr, :cmd_name, :vm_locations, :current_frame,
                 :debugee_thread, :completion_proc
 
     def initialize(settings={:start_frame=>1})
@@ -45,7 +45,7 @@ module MockDebugger
       @completion_proc = Proc.new{|str| str}
 
       # Don't allow user commands in mocks.
-      ## @core.processor.settings[:user_cmd_dir] = nil 
+      ## @core.processor.settings[:user_cmd_dir] = nil
 
     end
 
@@ -54,7 +54,7 @@ module MockDebugger
     end
   end
 
-  # Common Mock debugger setup 
+  # Common Mock debugger setup
   def setup(name=nil, show_constants=true)
     unless name
       loc = Rubinius::VM.backtrace(1, true)[0]
@@ -72,7 +72,7 @@ module MockDebugger
     cmdproc = Trepan::CmdProcessor.new(dbgr)
     cmdproc.frame = dbgr.frame(0)
     dbgr.processor = cmdproc
-    
+
     cmdproc.load_cmds_initialize
     cmds = cmdproc.commands
     cmd  = cmds[name]
@@ -116,9 +116,8 @@ module MockDebugger
   module_function :subsub_setup
 
   def show_special_class_constants(cmd)
-    puts 'ALIASES: %s' % [cmd.class.const_get('ALIASES').inspect] if
-      cmd.class.constants.member?(:ALIASES)
-    %w(CATEGORY MIN_ARGS MAX_ARGS 
+    puts 'ALIASES: %s' % [cmd.proc.get_class_aliases(cmd.class).inspect]
+    %w(CATEGORY MIN_ARGS MAX_ARGS
        NAME NEED_STACK SHORT_HELP).each do |name|
       puts '%s: %s' % [name, cmd.class.const_get(name).inspect]
     end