From a9ab3db167eb396f7ac11101fd126f2151d1587f Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Thu, 13 Oct 2011 11:42:45 -0700
Subject: [PATCH] =?UTF-8?q?ui.tools.listener:=20read-unsafe=20for=20intera?=
 =?UTF-8?q?ctor=E2=80=A0=20=E2=80=A0there's=20a=20failing=20test=20with=20?=
 =?UTF-8?q?this=20patch=20that=20needs=20investigation:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

===
resource:basis/ui/tools/listener/listener-tests.factor: 90

Unit Test: { [ t ] [ "promise" get 2 seconds ?promise-timeout text = ] }

wait-timeout
===
---
 basis/ui/tools/listener/listener.factor | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor
index 22d897238f..f07116d7cb 100644
--- a/basis/ui/tools/listener/listener.factor
+++ b/basis/ui/tools/listener/listener.factor
@@ -23,6 +23,7 @@ IN: ui.tools.listener
 ! evaluate-input resumes the thread.
 TUPLE: interactor < source-editor
 output history flag mailbox thread waiting token-model word-model popup ;
+INSTANCE: interactor noncopying-reader
 
 : register-self ( interactor -- )
     <mailbox> >>mailbox
@@ -150,15 +151,14 @@ M: interactor stream-readln
         3bi
     ] if ;
 
-M: interactor stream-read
-    swap [
-        drop ""
-    ] [
-        [ interactor-read dup [ "\n" join ] when ] dip short head
+M:: interactor stream-read-unsafe ( n buf interactor -- count )
+    n [ 0 ] [
+        interactor interactor-read dup [ "\n" join ] when
+        n short head-slice 0 buf copy
     ] if-zero ;
 
-M: interactor stream-read-partial
-    stream-read ;
+M: interactor stream-read-partial-unsafe
+    stream-read-unsafe ; inline
 
 M: interactor stream-read1
     dup interactor-read {