rbx-trepanning 0.0.4-universal-rubinius-1.2 → 0.0.6-universal-rubinius-1.2

data/lib/trepanning.rb

@@ -4,6 +4,7 @@ require 'readline'
 require 'compiler/iseq'
 
 require 'rubygems'; require 'require_relative'
+require_relative '../app/complete'
 require_relative '../app/frame'
 require_relative '../app/util'           # get_dollar_0
 require_relative '../processor/main'
@@ -51,12 +52,17 @@ class Trepan
     cmdproc_settings = {:highlight => @settings[:highlight]}
 
     @processor = CmdProcessor.new(self, cmdproc_settings)
+    @completion_proc = method(:completion_method)
 
+    @in_deferred_checking = false
+        
     @intf = 
       if @settings[:server]
+        @completion_proc = nil
         opts = Trepan::ServerInterface::DEFAULT_INIT_CONNECTION_OPTS.dup
         opts[:port] = @settings[:port] if @settings[:port]
         opts[:host] = @settings[:host] if @settings[:host]
+        opts[:readline] = false
         puts("starting debugger in out-of-process mode port at " +
              "#{opts[:host]}:#{opts[:port]}")
         [Trepan::ServerInterface.new(nil, nil, opts)]
@@ -64,9 +70,13 @@ class Trepan
         opts = Trepan::ClientInterface::DEFAULT_INIT_CONNECTION_OPTS.dup
         opts[:port] = @settings[:port] if @settings[:port]
         opts[:host] = @settings[:host] if @settings[:host]
+        opts[:complete] = @completion_proc
+        opts[:readline] ||= @settings[:readline]
         [Trepan::ClientInterface.new(nil, nil, nil, nil, opts)]
       else
-        [Trepan::UserInterface.new(@input, @output)]
+        opts = {:complete => @completion_proc,
+                :readline => @settings[:readline]}
+        [Trepan::UserInterface.new(@input, @output, opts)]
       end
 
     process_cmdfile_setting(@settings)
@@ -83,19 +93,6 @@ class Trepan
       :show_bytecode => false,
     }
 
-    @history_path = File.expand_path("~/.trepanx")
-
-    if File.exists?(@history_path)
-      File.readlines(@history_path).each do |line|
-        Readline::HISTORY << line.strip
-      end
-      @history_io = File.new(@history_path, "a")
-    else
-      @history_io = File.new(@history_path, "w")
-    end
-
-    @history_io.sync = true
-
     @processor.dbgr = self
     @deferred_breakpoints = []
     @thread = nil
@@ -130,6 +127,45 @@ class Trepan
       @settings[:restore_profile] && File.readable?(@settings[:restore_profile])
   end
 
+  # The method is called when we want to do debugger command completion
+  # such as called from GNU Readline with <TAB>.
+  def completion_method(str, leading=Readline.line_buffer)
+    args =
+      if str.empty? && leading.end_with?(' ')
+        # A line ending with a blank means we want to get all completions
+        # of the *next* token, not the current token.
+        leading.split(' ').compact + ['']
+      else
+        # We split on a single blank rather than sequences of spaces
+        # because we need to keep the line exactly as it is except for the
+        # last token
+        leading.split(' ').compact
+      end
+    completion = @processor.complete(args)
+    if 1 == completion.size 
+      last_token = completion[0].split[-1]
+      if  last_token == str
+        # If we were at the end of a complete token add a space so that
+        # the next time, we'll complete any context after that.
+        [str + ' ']
+      elsif str.end_with?(' ') && str.strip == last_token 
+        # There is nothing more to complete
+        []
+      elsif str.empty? && completion[0] == leading
+        # There is also nothing more to complete
+        []
+      else
+        [last_token]
+      end
+    else
+      # We have multiple completions. Get the last token so that will
+      # be presented as a list of completions.
+      completion.map do |cmd|
+        cmd.split[-1]
+      end
+    end
+  end
+
   ## HACK to skip over loader code. Until I find something better...
   def skip_loader
     cmds = 
@@ -153,9 +189,9 @@ class Trepan
     @intf << startup
   end
 
-
+  attr_reader :completion_proc # GNU Readline completion proc
   attr_reader :variables, :current_frame, :breakpoints
-  attr_reader :vm_locations, :history_io, :debugee_thread
+  attr_reader :vm_locations, :debugee_thread
 
   def self.global(settings={})
     @global ||= new(settings)
@@ -208,7 +244,7 @@ class Trepan
   alias debugger start
 
   def stop(settings = {})
-    # Nothing for now...
+    Rubinius::VM.debug_channel = nil
   end
 
   def add_command_file(cmdfile, opts={}, stderr=$stderr)
@@ -313,15 +349,20 @@ class Trepan
   end
 
   def add_deferred_breakpoint(klass_name, which, name, line)
-    dbp = Trepanning::DeferredBreakpoint.new(self, @current_frame, klass_name, which, name,
-                                             line, @deferred_breakpoints)
+    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
-    @deferred_breakpoints.delete_if do |bp|
-      bp.resolve!
+    unless @in_deferred_checking 
+      @in_deferred_checking = true
+      @deferred_breakpoints.delete_if do |bp|
+        bp.resolve!
+      end
+      @in_deferred_checking = false
     end
   end