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

data/interface/comcodes.rb

@@ -6,13 +6,15 @@ module Trepanning
   # Most of these go from debugged process to front-end
   # client interface. COMMAND goes the other way.
   module RemoteCommunication
-    PRINT         = '.'
-    COMMAND       = 'C'
-    CONFIRM_TRUE  = 'Y'
-    CONFIRM_FALSE = 'N'
-    CONFIRM_REPLY = '?'
-    QUIT          = 'q'
-    PROMPT        = 'p'
-    RESTART       = 'r'
+    unless defined?(PRINT)
+      PRINT         = '.'
+      COMMAND       = 'C'
+      CONFIRM_TRUE  = 'Y'
+      CONFIRM_FALSE = 'N'
+      CONFIRM_REPLY = '?'
+      QUIT          = 'q'
+      PROMPT        = 'p'
+      RESTART       = 'r'
+    end
   end
 end

data/interface/comcodes.rbc

@@ -123,27 +123,49 @@ x
 19
 RemoteCommunication
 i
-82
+114
 5
 66
-65
-7
+26
+93
+0
+15
+29
+17
 0
 7
+0
+98
 1
-64
-49
-2
-2
+1
+30
+8
+23
+25
+92
+0
+27
+8
+28
 15
+7
+2
+8
+29
+1
+9
+34
+1
+8
+113
 65
 7
-3
+0
 7
-4
+3
 64
 49
-2
+4
 2
 15
 65
@@ -153,7 +175,7 @@ i
 6
 64
 49
-2
+4
 2
 15
 65
@@ -163,7 +185,7 @@ i
 8
 64
 49
-2
+4
 2
 15
 65
@@ -173,7 +195,7 @@ i
 10
 64
 49
-2
+4
 2
 15
 65
@@ -183,7 +205,7 @@ i
 12
 64
 49
-2
+4
 2
 15
 65
@@ -193,7 +215,7 @@ i
 14
 64
 49
-2
+4
 2
 15
 65
@@ -203,11 +225,21 @@ i
 16
 64
 49
+4
 2
+15
+65
+7
+17
+7
+18
+64
+49
+4
 2
 11
 I
-3
+4
 I
 0
 I
@@ -216,10 +248,16 @@ I
 0
 n
 p
-17
+19
 x
 5
 PRINT
+x
+16
+vm_const_defined
+s
+8
+constant
 s
 1
 .
@@ -269,41 +307,45 @@ s
 1
 r
 p
-17
+19
 I
 2
 I
 9
 I
-c
+22
 I
 a
 I
-16
+2c
 I
 b
 I
-20
+36
 I
 c
 I
-2a
+40
 I
 d
 I
-34
+4a
 I
 e
 I
-3e
+54
 I
 f
 I
-48
+5e
 I
 10
 I
-52
+68
+I
+11
+I
+72
 x
 61
 /home/rocky-rvm/.rvm/src/rbx-trepanning/interface/comcodes.rb

data/interface/script.rbc

@@ -704,9 +704,9 @@ x
 10
 initialize
 p
-23
+25
 I
-0
+-1
 I
 15
 I
@@ -734,6 +734,10 @@ I
 I
 1d
 I
+56
+I
+1c
+I
 59
 I
 1e
@@ -809,7 +813,7 @@ close
 p
 5
 I
-0
+-1
 I
 26
 I
@@ -866,7 +870,7 @@ x
 p
 5
 I
-0
+-1
 I
 2f
 I
@@ -1050,9 +1054,9 @@ x
 5
 raise
 p
-17
+21
 I
-0
+-1
 I
 35
 I
@@ -1072,10 +1076,18 @@ I
 I
 3b
 I
+2a
+I
+3a
+I
 30
 I
 3c
 I
+40
+I
+39
+I
 43
 I
 40
@@ -1130,7 +1142,7 @@ p
 p
 3
 I
-0
+-1
 I
 46
 I
@@ -1275,7 +1287,7 @@ msg
 p
 17
 I
-0
+-1
 I
 4a
 I
@@ -1446,7 +1458,7 @@ raise
 p
 11
 I
-0
+-1
 I
 59
 I

data/interface/user.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Interface when communicating with the user in the same process as
 # the debugged program.
@@ -10,21 +10,34 @@ require 'rubygems'; require 'require_relative'
 require_relative 'base_intf'
 require_relative '../io/input'
 
-# Moutput    = import_relative('dbg_output', '..io', 'pydbgr')
-
-# Interface when communicating with the user in the same
-# process as the debugged program.
+# Interface when communicating with the user.
 class Trepan::UserInterface < Trepan::Interface
 
-  FILE_HISTORY = '.trapan_hist' unless defined?(FILE_HISTORY)
+  DEFAULT_USER_OPTS = {
+    :readline   => true,                # Try to use GNU Readline?
+    
+    # The below are only used if we want and have readline support.
+    # See method Trepan::GNU_readline? below.
+    :histsize => 256,                   # Use gdb's default setting
+    :file_history   => '.trepanx_hist', # where history file lives
+                                        # Note a directory will 
+                                        # be appended
+    :history_save   => true             # do we save the history?
+  } unless defined?(DEFAULT_USER_OPTS)
 
   def initialize(inp=nil, out=nil, opts={})
     super(inp, out, opts)
+    @opts = DEFAULT_USER_OPTS.merge(opts)
     @input = if inp.class.ancestors.member?(Trepan::InputBase)
                inp
              else
-               Trepan::UserInput.open(inp)
+               Trepan::UserInput.open(inp, {:readline => opts[:readline]})
              end
+    if Trepan::GNU_readline? && opts[:complete]
+      Readline.completion_proc = opts[:complete]
+      read_history
+    end
+    at_exit { finalize }
   end
 
   # Called when a dangerous action is about to be done, to make
@@ -50,13 +63,66 @@ class Trepan::UserInterface < Trepan::Interface
     return YES.member?(response)
   end
 
+  # Read a saved Readline history file into Readline. The history
+  # file will be created if it doesn't already exist.
+  # Much of this code follows what's done in ruby-debug.
+  def read_history 
+    unless @histfile
+      dirname = ENV['HOME'] || ENV['HOMEPATH'] || File.expand_path('~')
+      @histfile = File.join(dirname, @opts[:file_history])
+    end
+    @histsize ||= (ENV['HISTSIZE'] ? ENV['HISTSIZE'].to_i : @opts[:histsize])
+    Readline.completion_proc = @opts[:complete]
+    if File.exists?(@histfile)
+      lines = IO::readlines(@histfile).last(@histsize).collect do  
+        |line| line.chomp 
+      end
+      Readline::HISTORY.push(*lines)
+      @history_io = File.new(@histfile, "a")
+    else
+      @history_io = File.new(@histfile, "w")
+    end
+    @history_io.sync = true
+    @history_save = @opts[:history_save]
+  end
+
+  def save_history 
+    if @histfile
+      lines = Readline::HISTORY.to_a
+      lines = lines[-@histsize, @histsize] if lines.size > @histsize
+      begin
+        open(@histfile, 'w') do |file|
+          Readline::HISTORY.to_a.last(@histsize).each do |line|
+            file.puts line
+          end 
+        end if defined?(@history_save) and @history_save
+      rescue
+      end
+    end
+  end
+
   def finalize(last_wishes=nil)
     # print exit annotation
-    # save history
+    if Trepan::GNU_readline? && @history_save
+      save_history 
+    end
     super
   end
 
   def interactive? ; @input.interactive? end
+
+  def read_command(prompt=''); readline(prompt) end
+
+  def readline(prompt='')
+    @output.flush
+    if @input.line_edit && @opts[:use_readline]
+      @input.readline(prompt)
+    else
+      @output.write(prompt) if prompt and prompt.size > 0
+      @input.readline
+    end
+  end
+
 end
 
 # Demo