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

data/processor/command/backtrace.rb

@@ -61,22 +61,8 @@ See also 'set hidelevel'.
       errmsg "Wrong number of parameters. Expecting at most 2."
       return
     end
-    
-    @proc.dbgr.each_frame(@proc.top_frame) do |frame|
-      if count and frame.number >= count
-        msg "(More stack frames follow...)" if count != proc.stack_size
-        return 
-      end
 
-      prefix = (frame == @proc.frame) ? '-->' : '   '
-      msg "%s #%d %s" % [prefix, frame.number, 
-                         frame.describe(:show_ip => verbose)]
-      
-      if verbose
-        frame.local_variables.each do |local|
-          msg "       #{local} = #{frame.run(local.to_s).inspect}"
-        end
-      end
-    end
+    @proc.print_stack_trace(@proc.top_frame, 
+                            {:verbose => verbose, :count => count})
   end
 end

data/processor/command/base/submgr.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-# 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 'redcard/rubinius'
 require_relative '../../command'
 require_relative '../../subcmd'
 require_relative '../../help'
@@ -14,7 +15,7 @@ class Trepan::SubcommandMgr < Trepan::Command
     CATEGORY      = 'status'
     MIN_ARGS      = 0
     MAX_ARGS      = nil
-    NAME          = '?' # FIXME: Need to define this, but should 
+    NAME          = '?' # FIXME: Need to define this, but should
                         # pick this up from class/file name.
     NEED_STACK    = false
   end
@@ -33,6 +34,15 @@ class Trepan::SubcommandMgr < Trepan::Command
     load_debugger_subcommands(self)
   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
+
   # Create an instance of each of the debugger subcommands. Commands
   # are found by importing files in the directory 'name' + '_sub'. Some
   # files are excluded via an array set in initialize.  For each of
@@ -48,7 +58,7 @@ class Trepan::SubcommandMgr < Trepan::Command
     cmd_dir = File.dirname(__FILE__)
     subcmd_dir = File.join(cmd_dir, '..', name + '_subcmd')
     files = Dir.glob(File.join(subcmd_dir, '*.rb'))
-    files.each do |rb| 
+    files.each do |rb|
       basename = File.basename(rb, '.rb')
       if File.directory?(File.join(File.dirname(rb), basename + '_subcmd'))
         subcmd_names << name.capitalize + basename.capitalize
@@ -60,14 +70,12 @@ class Trepan::SubcommandMgr < Trepan::Command
 
     subcommands = {}
     cmd_names.each do |name|
-      next unless Trepan::Subcommand.constants.member?(name)
-      klass = Trepan::Subcommand.const_get(name)
+      next unless klass = get_const(Trepan::Subcommand, name)
       cmd = klass.send(:new, self)
       @subcmds.add(cmd)
     end
     subcmd_names.each do |name|
-      next unless Trepan::SubSubcommand.constants.member?(name)
-      subcmd_class = Trepan::SubSubcommand.const_get(name)
+      next unless subcmd_class = get_const(Trepan::SubSubcommand, name)
       begin
         cmd = subcmd_class.send(:new, self, parent)
       rescue Exception => exc
@@ -83,7 +91,7 @@ class Trepan::SubcommandMgr < Trepan::Command
   #        help cmd subcmd
   #        help cmd commands
   #
-  #  Our shtick is to give help for the overall command only if 
+  #  Our shtick is to give help for the overall command only if
   #  subcommand or 'commands' is not given. If a subcommand is given and
   #  found, then specific help for that is given. If 'commands' is given
   #  we will list the all the subcommands.
@@ -94,8 +102,8 @@ class Trepan::SubcommandMgr < Trepan::Command
       if doc
        return doc
       else
-        errmsg('Sorry - author mess up. ' + 
-               'No help registered for command' + 
+        errmsg('Sorry - author mess up. ' +
+               'No help registered for command' +
                @name)
         return nil
       end
@@ -119,9 +127,9 @@ class Trepan::SubcommandMgr < Trepan::Command
         if doc
           return doc
         else
-          errmsg('Sorry - author mess up. ' + 
-                 'No help registered for subcommand: ' + 
-                 subcmd_name + ', of command: ' + 
+          errmsg('Sorry - author mess up. ' +
+                 'No help registered for subcommand: ' +
+                 subcmd_name + ', of command: ' +
                  @name)
           return nil
         end
@@ -144,7 +152,7 @@ class Trepan::SubcommandMgr < Trepan::Command
 
   # Return an Array of subcommands that can start with +arg+. If none
   # found we just return +arg+.
-  # FIXME: Not used any more? 
+  # FIXME: Not used any more?
   def complete(prefix)
     Trepan::Complete.complete_token(@subcmds.subcmds.keys, prefix)
   end

data/processor/command/base/subsubcmd.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 # A base class for debugger subcommands of subcommands.
 #
 # Note: don't end classname with Command (capital C as in SubCommand),
-# since main will think this a command name like QuitCommand 
-#                                                    ^   
+# since main will think this a command name like QuitCommand
+#                                                    ^
 
 # Base Class for Trepan subcommands. We pull in some helper
 # functions for command from module cmdfns.
@@ -28,21 +28,19 @@ class Trepan
     end
 
     def string_in_show
-      help_constant_sym = if self.class.constants.member?('SHORT_HELP') 
-                            :SHORT_HELP 
-                          else :HELP
-                          end
-      str = my_const(help_constant_sym)
+      help = get_const(self.class, 'SHORT_HELP')
+      help = get_const(self.class, 'HELP') unless help
+      help = help.split[0] if !help
       %w(Show Set).each do |word|
-        if 0 == str.index(word)
-          str = str[word.size+1 ..-1].capitalize
+        if 0 == help.index(word)
+          help = help[word.size+1 ..-1].capitalize
           break
         end
       end
-      str
+      help
     end
 
-    # Set a Boolean-valued debugger setting. 
+    # Set a Boolean-valued debugger setting.
     def run_set_bool(args, default=true)
       set_val = args.size < 2 ? 'on' : args[1]
       setting = @name.gsub(/^(set|show)/,'')
@@ -100,7 +98,7 @@ module Trepanning
 
       short_dirname = dirname[0...-'_subcmd'.size]
       short_parent_dirname = parent_dirname[0...-'_subcmd'.size]
-      prefix = klass.const_set('PREFIX', %W(#{short_parent_dirname} 
+      prefix = klass.const_set('PREFIX', %W(#{short_parent_dirname}
                                             #{short_dirname} #{name}))
       klass.const_set('CMD', prefix.join(' '))
     end

data/processor/command/base/subsubmgr.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
+require 'redcard/rubinius'
 require_relative 'subcmd'
 require_relative '../../subcmd'
 require_relative '../../help'
@@ -13,7 +14,7 @@ class Trepan::SubSubcommandMgr < Trepan::Subcommand
     CATEGORY      = 'status'
     MIN_ARGS      = 0
     MAX_ARGS      = nil
-    NAME          = '?' # FIXME: Need to define this, but should 
+    NAME          = '?' # FIXME: Need to define this, but should
                         # pick this up from class/file name.
     NEED_STACK    = false
   end
@@ -21,10 +22,29 @@ class Trepan::SubSubcommandMgr < Trepan::Subcommand
   attr_accessor :pname
   attr_accessor :subcmds  # Array of instantiated Trepan::Subcommand objects
 
+  # Work around Ruby 1.8/1.9 incompatibility
+  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
+
   # Initialize show subcommands. Note: instance variable name
   # has to be setcmds ('set' + 'cmds') for subcommand completion
   # to work.
-  # FIXME: do we need proc still? 
+  # FIXME: do we need proc still?
   def initialize(proc, parent)
     name     = obj_const(self, :NAME)
     @name    = name.to_sym
@@ -38,11 +58,11 @@ class Trepan::SubSubcommandMgr < Trepan::Subcommand
     # 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
-    self.class.const_set('SHORT_HELP', 
-                         self.class.const_get('HELP')) if
-      c.member?('HELP') and !c.member?('SHORT_HELP')
-    
+    if !get_const(self.class, 'SHORT_HELP') and (help = get_const(self.class, 'HELP'))
+        help = help.split
+        set_const(self.class, 'SHORT_HELP', help)
+    end
+
     load_debugger_subsubcommands(name, self)
   end
 
@@ -60,7 +80,7 @@ class Trepan::SubSubcommandMgr < Trepan::Subcommand
     cmd_dir = File.dirname(__FILE__)
     subcmd_dir = File.join(cmd_dir, '..', @pname + '_subcmd', name + '_subcmd')
     files = Dir.glob(File.join(subcmd_dir, '*.rb'))
-    files.each do |rb| 
+    files.each do |rb|
       cmd_names << name.capitalize + File.basename(rb, '.rb').capitalize
       require rb
     end if File.directory?(subcmd_dir)
@@ -69,9 +89,8 @@ class Trepan::SubSubcommandMgr < Trepan::Subcommand
     cmd_names.each do |subname|
       cmd_name = "#{pname}#{subname.downcase}"
       subclass_name = "#{@pname.capitalize}#{subname}"
-      next unless 
-        Trepan::SubSubcommand.constants.member?(subclass_name)
-      cmd = self.instance_eval("Trepan::SubSubcommand::" + subclass_name + 
+      next unless subcmd_class = get_const(Trepan::SubSubcommand, subclass_name)
+      cmd = self.instance_eval("Trepan::SubSubcommand::" + subclass_name +
                                ".new(self, @parent, '#{cmd_name}')")
       @subcmds.add(cmd, cmd_name)
     end
@@ -83,7 +102,7 @@ class Trepan::SubSubcommandMgr < Trepan::Subcommand
   #        help cmd subcmd
   #        help cmd commands
   #
-  #  Our shtick is to give help for the overall command only if 
+  #  Our shtick is to give help for the overall command only if
   #  subcommand or 'commands' is not given. If a subcommand is given and
   #  found, then specific help for that is given. If 'commands' is given
   #  we will list the all the subcommands.
@@ -94,8 +113,8 @@ class Trepan::SubSubcommandMgr < Trepan::Subcommand
       if doc
        return doc
       else
-        errmsg('Sorry - author mess up. ' + 
-               'No help registered for command' + 
+        errmsg('Sorry - author mess up. ' +
+               'No help registered for command' +
                @name)
         return nil
       end
@@ -113,7 +132,7 @@ class Trepan::SubSubcommandMgr < Trepan::Subcommand
     end
 
     # "help cmd subcmd". Give help specific for that subcommand if
-    # the command matches uniquely, or show a list of matching 
+    # the command matches uniquely, or show a list of matching
     # subcommands
     keyprefix_str  = prefix.join('')
     key_str        = keyprefix_str + subcmd_name
@@ -123,9 +142,9 @@ class Trepan::SubSubcommandMgr < Trepan::Subcommand
       if doc
         return doc
       else
-        errmsg('Sorry - author mess up. ' + 
-               'No help registered for subcommand: ' + 
-               subcmd_name + ', of command: ' + 
+        errmsg('Sorry - author mess up. ' +
+               'No help registered for subcommand: ' +
+               subcmd_name + ', of command: ' +
                @name)
         return nil
       end

data/processor/command/disassemble.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
 require_relative '../command'
 require_relative '../../app/method'
@@ -19,7 +19,7 @@ class Trepan::Command::DisassembleCommand < Trepan::Command
 Disassembles Rubinius VM instructions. By default, the bytecode for the
 current line is disassembled only.
 
-If a method name is given, disassemble just that method. 
+If a method name is given, disassemble just that method.
 
 If a line number given, then disassemble just that line number if it
 has bytecode assocated with that line. Note that if a line has
@@ -54,7 +54,7 @@ Examples:
     prefixes = []
     disasm = ''
     cm.decode.each do |insn|
-      show_line = 
+      show_line =
         if insn.ip >= next_line_ip
           next_line_ip = lines.at(next_i+1)
           line_no = lines.at(next_i)
@@ -63,11 +63,11 @@ Examples:
         else
           false
         end
-          
+
       prefixes << Trepan::ISeq::disasm_prefix(insn.ip, frame_ip, cm)
       str = insn.to_s
       if show_line
-        str += 
+        str +=
           if insn.instance_variable_get('@comment')
             ' '
           elsif str[-1..-1] !~/\s/
@@ -75,7 +75,7 @@ Examples:
           else
             ''
           end
-        str += "# line: #{line_no}"  
+        str += "# line: #{line_no}"
       end
       disasm += "#{str}\n"
     end
@@ -92,15 +92,15 @@ Examples:
         errmsg 'Highlighting requested but CodeRay is not installed.'
       end
     end
-      
+
     disasm.split("\n").each_with_index do |inst, i|
-      msg ("#{prefixes[i]} #{inst}", :unlimited => true)
+      msg("#{prefixes[i]} #{inst}", :unlimited => true)
     end
   end
 
   def parse_options(options, args) # :nodoc
     parser = OptionParser.new do |opts|
-      opts.on('-a', '--all', 
+      opts.on('-a', '--all',
               'show entire method') do
         options[:all] = true
       end
@@ -114,7 +114,7 @@ Examples:
 
   end
 
-  # Run command. 
+  # Run command.
   def run(args)
     my_args = args[1..-1]
     options = parse_options(DEFAULT_OPTIONS.dup, my_args)
@@ -133,7 +133,7 @@ Examples:
           disassemble_method(cm.executable)
         else
           opts = {:msg_on_error => false }
-          line_num = @proc.get_an_int(arg, opts) 
+          line_num = @proc.get_an_int(arg, opts)
           if line_num
             cm = find_method_with_line(current_method, line_num)
             if cm

data/processor/command/help.rb

@@ -28,7 +28,7 @@ info line command.
     'breakpoints' => 'Making the program stop at certain points',
     'data'        => 'Examining data',
     'files'       => 'Specifying and examining files',
-    'running'     => 'Running the program', 
+    'running'     => 'Running the program',
     'status'      => 'Status inquiries',
     'support'     => 'Support facilities',
     'stack'       => 'Examining the call stack',
@@ -50,15 +50,15 @@ info line command.
   end
 
   def complete(prefix)
-    matches = Trepan::Complete.complete_token(CATEGORIES.keys + %w(* all) + 
+    matches = Trepan::Complete.complete_token(CATEGORIES.keys + %w(* all) +
                                               @proc.commands.keys, prefix)
-    aliases = Trepan::Complete.complete_token_filtered(@proc.aliases, prefix, 
+    aliases = Trepan::Complete.complete_token_filtered(@proc.aliases, prefix,
                                                        matches)
     (matches + aliases).sort
-  end    
+  end
 
   def complete_token_with_next(prefix)
-    complete(prefix).map do |cmd| 
+    complete(prefix).map do |cmd|
       [cmd, @proc.commands.member?(cmd) ? @proc.commands[cmd] : nil]
     end
   end
@@ -79,7 +79,7 @@ Type "help REGEXP" for the list of commands matching /^#{REGEXP}/.
 Type "help CLASS *" for the list of all commands in class CLASS.
 Type "help" followed by a command name for full documentation.
 '
-    msg(final_msg)  
+    msg(final_msg)
   end
 
   # This method runs the command
@@ -105,27 +105,27 @@ Type "help" followed by a command name for full documentation.
       elsif CATEGORIES.member?(cmd_name)
         show_category(args[1], args[2..-1])
       elsif @proc.commands.member?(cmd_name) or @proc.aliases.member?(cmd_name)
-        real_name = 
-          if @proc.commands.member?(cmd_name) 
+        real_name =
+          if @proc.commands.member?(cmd_name)
             cmd_name
           else
             @proc.aliases[cmd_name]
           end
         cmd_obj = @proc.commands[real_name]
-        help_text = 
-          cmd_obj.respond_to?(:help) ? cmd_obj.help(args) : 
+        help_text =
+          cmd_obj.respond_to?(:help) ? cmd_obj.help(args) :
           cmd_obj.class.const_get(:HELP)
         if help_text
-          msg(help_text) 
-          if cmd_obj.class.constants.member?('ALIASES') and
-              args.size == 2
-            msg "Aliases: #{cmd_obj.class.const_get(:ALIASES).join(', ')}"
+          msg(help_text)
+          aliases=@proc.get_class_aliases(cmd_obj.class)
+          if !aliases.empty? and args.size == 2
+            msg "Aliases: #{aliases.join(', ')}"
           end
         end
       elsif @proc.macros.member?(cmd_name)
         msg "#{cmd_name} is a macro which expands to:"
         msg "  #{@proc.macros[cmd_name]}", {:unlimited => true}
-      else 
+      else
         matches = @proc.commands.keys.grep(/^#{cmd_name}/).sort rescue []
         if matches.empty?
           errmsg("No commands found matching /^#{cmd_name}/. Try \"help\".")
@@ -146,37 +146,37 @@ Type "help" followed by a command name for full documentation.
 
   # Show short help for all commands in `category'.
   def show_category(category, args)
-    
+
     if args.size == 1 && args[0] == '*'
       section "Commands in class %s:" % category
-      
+
       cmds = @proc.commands.keys.select do |cmd_name|
         category == @proc.commands[cmd_name].category
       end.sort
       width = settings[:maxwidth]
       msg columnize_commands(cmds)
-      return 
+      return
     end
-    
+
     section "Command class: %s" % category
     @proc.commands.keys.sort.each do |name|
       next if category != @proc.commands[name].category
       msg("%-13s -- %s" % [name, @proc.commands[name].short_help])
     end
   end
-  
+
   def syntax_files
-    @syntax_files ||= Dir.glob(File.join(HELP_DIR, '*.txt')).map do |txt| 
+    @syntax_files ||= Dir.glob(File.join(HELP_DIR, '*.txt')).map do |txt|
       basename = File.basename(txt, '.txt')
     end
   end
-  
+
   def show_command_syntax(args)
     if args.size == 2
       @syntax_summary_help ||= {}
       section "List of syntax help"
       syntax_files.each do |name|
-        @syntax_summary_help[name] ||= 
+        @syntax_summary_help[name] ||=
           File.open(File.join(HELP_DIR, "#{name}.txt")).readline.chomp
         msg "  %-8s -- %s" % [name, @syntax_summary_help[name]]
       end
@@ -184,7 +184,7 @@ Type "help" followed by a command name for full documentation.
       args[2..-1].each do |name|
         if syntax_files.member?(name)
           @syntax_help ||= {}
-          @syntax_help[name] = 
+          @syntax_help[name] =
             File.open(File.join(HELP_DIR, "#{name}.txt")).readlines[2..-1].join
           section "Help for #{name}:"
           msg @syntax_help[name]