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

data/lib/trepanning.rb

@@ -1,6 +1,6 @@
 #!/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>
 require 'readline'
 require 'compiler/iseq'
 
@@ -17,7 +17,7 @@ require_relative '../interface/script'   # --command interface (includes I/O)
 require_relative '../interface/client'   # client interface (remote debugging)
 require_relative '../interface/server'   # server interface (remote debugging)
 require_relative '../io/null_output'
-  
+
 #
 # The Rubinius Trepan debugger.
 #
@@ -57,8 +57,8 @@ class Trepan
     @completion_proc = method(:completion_method)
 
     @in_deferred_checking = false
-        
-    @intf = 
+
+    @intf =
       if @settings[:server]
         @completion_proc = nil
         opts = Trepan::ServerInterface::DEFAULT_INIT_CONNECTION_OPTS.dup
@@ -110,17 +110,17 @@ class Trepan
       @loaded_hook = proc { |file|
         check_deferred_breakpoints
       }
-      
+
       @added_hook = proc { |mod, name, exec|
         check_deferred_breakpoints
       }
 
       # Use a few Rubinius-specific hooks to trigger checking
       # for deferred breakpoints.
-      
+
       Rubinius::CodeLoader.loaded_hook.add @loaded_hook
       Rubinius.add_method_hook.add @added_hook
-      
+
     end
 
     # Run user debugger command startup files.
@@ -131,10 +131,10 @@ class Trepan
   # such as called from GNU Readline with <TAB>.
   def completion_method(last_token, leading=Readline.line_buffer)
     completion = @processor.complete(leading, last_token)
-    if 1 == completion.size 
+    if 1 == completion.size
       completion_token = completion[0]
       if last_token.end_with?(' ')
-        if last_token.rstrip == completion_token 
+        if last_token.rstrip == completion_token
           # There is nothing more to complete
           []
         else
@@ -152,22 +152,21 @@ class Trepan
 
   ## HACK to skip over loader code. Until I find something better...
   def skip_loader
-    cmds = 
+    cmds =
       if @settings[:skip_loader] == :Xdebug
         ['continue Rubinius::CodeLoader.load_script',
-         'continue 67',
+         'next 6',
          # 'set kernelstep off',   # eventually would like 'on'
-         'step', 'set hidelevel -1'
+         'step',
         ]
       else
         ['next', 'next', 'next',
          # 'set kernelstep off',  # eventually would like 'on'
-         'set hidelevel -1',
          'step', ]
       end
 
     input = Trepan::StringArrayInput.open(cmds)
-    startup = Trepan::ScriptInterface.new('startup', 
+    startup = Trepan::ScriptInterface.new('startup',
                                           Trepan::OutputNull.new(nil),
                                           :input => input)
     @intf << startup
@@ -207,7 +206,7 @@ class Trepan
 
     process_cmdfile_setting(settings)
 
-    # Feed info (breakpoint, debugged program thread, channel and backtrace 
+    # Feed info (breakpoint, debugged program thread, channel and backtrace
     # info) to the debugger thread
     locs = Rubinius::VM.backtrace(@settings[:offset] + 1, true)
 
@@ -222,7 +221,7 @@ class Trepan
     # wait for the debugger to release us
     channel.receive
 
-    # Now that there is a debugger on the other end, set the debugged 
+    # Now that there is a debugger on the other end, set the debugged
     # program thread to call us when it hits a breakpoint.
     Thread.current.set_debugger_thread @thread
     self
@@ -260,7 +259,7 @@ class Trepan
 
   def process_cmdfile_setting(settings)
     settings[:cmdfiles].each do |item|
-      cmdfile, opts = 
+      cmdfile, opts =
         if item.kind_of?(Array)
           item
         else
@@ -285,7 +284,7 @@ class Trepan
       end
 
       # Wait for someone to stop
-      @breakpoint, @debugee_thread, @channel, @vm_locations = 
+      @breakpoint, @debugee_thread, @channel, @vm_locations =
         @local_channel.receive
 
       # Uncache all frames since we stopped at a new place
@@ -299,7 +298,7 @@ class Trepan
         status = @breakpoint.hit!(@vm_locations.first.variables)
         if status
           break
-        elsif @breakpoint.enabled? && status.nil? 
+        elsif @breakpoint.enabled? && status.nil?
           # A permanent breakpoint. Check the condition.
           break if @breakpoint.condition?(@current_frame.binding)
         end
@@ -309,7 +308,7 @@ class Trepan
       end
     end
 
-    event = 
+    event =
       if @breakpoint
         @breakpoint.event || 'brkpt'
       else
@@ -342,15 +341,15 @@ class Trepan
   end
 
   def add_deferred_breakpoint(klass_name, which, name, line)
-    dbp = Trepan::DeferredBreakpoint.new(self, @current_frame, klass_name, 
-                                         which, name, line, 
+    dbp = Trepan::DeferredBreakpoint.new(self, @current_frame, klass_name,
+                                         which, name, line,
                                          @deferred_breakpoints)
     @deferred_breakpoints << dbp
     # @processor.brkpts << dbp
   end
 
   def check_deferred_breakpoints
-    unless @in_deferred_checking 
+    unless @in_deferred_checking
       @in_deferred_checking = true
       @deferred_breakpoints.delete_if do |bp|
         bp.resolve!

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