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

data/interface/user.rb

@@ -27,12 +27,11 @@ class Trepan::UserInterface < Trepan::Interface
              end
   end
 
-  # Closes both input and output
-
   # Called when a dangerous action is about to be done, to make
   # sure it's okay. Expect a yes/no answer to `prompt' which is printed,
   # suffixed with a question mark and the default value.  The user
   # response converted to a boolean is returned.
+  # FIXME: make common routine for this and server.rb
   def confirm(prompt, default)
     default_str = default ? 'Y/n' : 'N/y'
     while true do
@@ -58,12 +57,6 @@ class Trepan::UserInterface < Trepan::Interface
   end
 
   def interactive? ; @input.interactive? end
-
-  def read_command(prompt='')
-    line = readline(prompt)
-    # FIXME: Do something with history?
-    return line
-  end
 end
 
 # Demo

data/interface/user.rbc

@@ -9,7 +9,7 @@ x
 10
 __script__
 i
-354
+351
 5
 7
 0
@@ -94,7 +94,7 @@ i
 83
 19
 9
-350
+347
 45
 7
 20
@@ -143,7 +143,7 @@ i
 85
 29
 9
-347
+344
 26
 93
 0
@@ -192,7 +192,7 @@ i
 1
 25
 8
-204
+203
 15
 92
 1
@@ -205,9 +205,8 @@ i
 20
 1
 47
-49
+101
 38
-0
 63
 2
 47
@@ -250,10 +249,10 @@ i
 41
 0
 9
-244
+243
 1
 8
-345
+342
 20
 0
 7
@@ -272,9 +271,8 @@ i
 20
 1
 47
-49
+101
 38
-0
 63
 2
 47
@@ -323,9 +321,8 @@ i
 20
 1
 47
-49
+101
 38
-0
 63
 2
 47
@@ -356,10 +353,10 @@ i
 36
 1
 8
-348
+345
 1
 8
-351
+348
 1
 15
 2
@@ -418,7 +415,7 @@ x
 13
 UserInterface
 i
-114
+100
 5
 66
 26
@@ -518,20 +515,6 @@ i
 49
 8
 4
-15
-99
-7
-15
-7
-16
-65
-67
-49
-7
-0
-49
-8
-4
 11
 I
 6
@@ -543,7 +526,7 @@ I
 0
 n
 p
-17
+15
 x
 12
 FILE_HISTORY
@@ -694,9 +677,9 @@ x
 6
 @input
 p
-11
+13
 I
-0
+-1
 I
 15
 I
@@ -716,6 +699,10 @@ I
 I
 1a
 I
+49
+I
+17
+I
 4c
 x
 57
@@ -943,45 +930,45 @@ n
 p
 21
 I
-0
+-1
 I
-24
+23
 I
 0
 I
-25
+24
 I
 f
 I
-26
+25
 I
 12
 I
-28
+27
 I
 34
 I
-29
+28
 I
 41
 I
-2a
+29
 I
 53
 I
-2c
+2b
 I
 5e
 I
-30
+2f
 I
 6f
 I
-31
+30
 I
 7d
 I
-33
+32
 I
 87
 x
@@ -1042,13 +1029,13 @@ finalize
 p
 5
 I
-0
+-1
 I
-36
+35
 I
 8
 I
-39
+38
 I
 c
 x
@@ -1097,9 +1084,9 @@ interactive?
 p
 3
 I
-0
+-1
 I
-3c
+3b
 I
 6
 x
@@ -1107,88 +1094,8 @@ x
 /home/rocky-rvm/.rvm/src/rbx-trepanning/interface/user.rb
 p
 0
-x
-12
-read_command
-M
-1
-n
-n
-x
-12
-read_command
-i
-24
-23
-0
-10
-10
-7
-0
-64
-19
-0
-15
-5
-20
-0
-47
-49
-1
-1
-19
-1
-15
-20
-1
-11
-11
-I
-4
-I
-2
-I
-0
-I
-1
-n
-p
-2
-s
-0
-
-x
-8
-readline
-p
-7
-I
-0
-I
-3e
-I
-a
-I
-3f
-I
-14
-I
-41
-I
-18
-x
-57
-/home/rocky-rvm/.rvm/src/rbx-trepanning/interface/user.rb
-p
-2
-x
-6
-prompt
-x
-4
-line
 p
-13
+11
 I
 2
 I
@@ -1200,21 +1107,17 @@ I
 I
 3a
 I
-24
+23
 I
 48
 I
-36
+35
 I
 56
 I
-3c
+3b
 I
 64
-I
-3e
-I
-72
 x
 57
 /home/rocky-rvm/.rvm/src/rbx-trepanning/interface/user.rb
@@ -1334,77 +1237,77 @@ I
 I
 45
 I
-46
+3f
 I
 55
 I
-47
+40
 I
 72
 I
-48
+41
 I
 7b
 I
-49
+42
 I
 86
 I
-4b
+44
 I
 9f
 I
-4c
+45
 I
 ac
 I
-4d
+46
 I
 bd
 I
-4f
+48
 I
-d0
+cf
 I
-51
+4a
 I
-e7
+e6
 I
-52
+4b
 I
-f4
+f3
 I
-53
+4c
 I
-100
+ff
 I
-54
+4d
 I
-110
+10e
 I
-55
+4e
 I
-127
+125
 I
-56
+4f
 I
-133
+131
 I
-57
+50
 I
-143
+140
 I
-58
+51
 I
-15b
+158
 I
-49
+42
 I
-15e
+15b
 I
-46
+3f
 I
-162
+15f
 x
 57
 /home/rocky-rvm/.rvm/src/rbx-trepanning/interface/user.rb

data/io/base_io.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 # classes to support communication to and from the debugger.  This
 # communcation might be to/from another process or another computer.
 # And reading may be from a debugger command script.
@@ -86,9 +86,63 @@ class Trepan
     # used to write to a debugger that is connected to this
     # `str' written will have a newline added to it
     #
-    def writeline( msg)
+    def writeline(msg)
       @output.write("%s\n" % msg)
     end
   end
+
+  # This is an abstract class that specifies debugger input output when
+  # handled by the same channel, e.g. a socket or tty.
+  #
+  class InOutBase
+    
+    def initialize(inout, opts={})
+      @opts = DEFAULT_OPTS.merge(opts)
+      @inout = inout
+    end
+    
+    def close
+      @inout.close() if @inout
+    end
+    
+    def eof? 
+      begin
+        @input.eof?
+      rescue IOError
+        true
+      end
+    end
+
+    def flush
+      @inout.flush
+    end
+    
+    # Read a line of input. EOFError will be raised on EOF.  
+    # 
+    # Note that we don't support prompting first. Instead, arrange to
+    # call DebuggerOutput.write() first with the prompt. If `use_raw'
+    # is set raw_input() will be used in that is supported by the
+    # specific input input. If this option is left nil as is normally
+    # expected the value from the class initialization is used.
+    def readline(use_raw=nil)
+      @input.readline
+    end
+
+    # Use this to set where to write to. output can be a 
+    # file object or a string. This code raises IOError on error.
+    # 
+    # Use this to set where to write to. output can be a 
+    # file object or a string. This code raises IOError on error.
+    def write(*args)
+      @inout.write(*args)
+    end
+    
+    # used to write to a debugger that is connected to this
+    # server; `str' written will have a newline added to it
+    def writeline( msg)
+      @inout.write("%s\n" % msg)
+    end
+  end
+
 end