From 75695563ca67ce5e1a802fb28d804c610e15b824 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Sat, 29 Dec 2007 22:29:59 -0500
Subject: [PATCH] Fixing interactor (temporarily)

---
 extra/ui/tools/interactor/interactor-docs.factor |  2 +-
 extra/ui/tools/interactor/interactor.factor      | 10 +++++-----
 extra/ui/tools/listener/listener.factor          |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 extra/ui/tools/interactor/interactor-docs.factor

diff --git a/extra/ui/tools/interactor/interactor-docs.factor b/extra/ui/tools/interactor/interactor-docs.factor
old mode 100644
new mode 100755
index d2265e38e0..78fb2d652e
--- a/extra/ui/tools/interactor/interactor-docs.factor
+++ b/extra/ui/tools/interactor/interactor-docs.factor
@@ -6,4 +6,4 @@ HELP: interactor
 $nl
 "Interactors are created by calling " { $link <interactor> } "."
 $nl
-"Interactors implement the " { $link stream-readln } ", " { $link stream-read } " and " { $link parse-interactive } " generic words." } ;
+"Interactors implement the " { $link stream-readln } ", " { $link stream-read } " and " { $link read-quot } " generic words." } ;
diff --git a/extra/ui/tools/interactor/interactor.factor b/extra/ui/tools/interactor/interactor.factor
index 45494124c8..5d7a8b67a5 100755
--- a/extra/ui/tools/interactor/interactor.factor
+++ b/extra/ui/tools/interactor/interactor.factor
@@ -3,9 +3,9 @@
 USING: arrays assocs combinators continuations documents
 ui.tools.workspace hashtables io io.styles kernel math
 math.vectors models namespaces parser prettyprint quotations
-sequences strings threads listener tuples ui.commands
-ui.gadgets ui.gadgets.editors
-ui.gadgets.presentations ui.gadgets.worlds ui.gestures ;
+sequences strings threads listener tuples ui.commands ui.gadgets
+ui.gadgets.editors ui.gadgets.presentations ui.gadgets.worlds
+ui.gestures definitions ;
 IN: ui.tools.interactor
 
 TUPLE: interactor
@@ -129,7 +129,7 @@ M: interactor stream-read-partial
 : try-parse ( str interactor -- quot/error/f )
     [
         [
-            [ restore-vars parse ] keep save-vars
+            [ restore-vars [ parse ] with-compilation-unit ] keep save-vars
         ] [
             >r f swap set-interactor-busy? drop r>
             dup delegate unexpected-eof? [ drop f ] when
@@ -143,7 +143,7 @@ M: interactor stream-read-partial
         { [ t ] [ handle-parse-error ] }
     } cond ;
 
-M: interactor parse-interactive
+M: interactor stream-read-quot
     [ save-vars ] keep
     [ [ handle-interactive ] interactor-yield ] keep
     restore-vars ;
diff --git a/extra/ui/tools/listener/listener.factor b/extra/ui/tools/listener/listener.factor
index 26910ac7b4..f53e657753 100755
--- a/extra/ui/tools/listener/listener.factor
+++ b/extra/ui/tools/listener/listener.factor
@@ -6,7 +6,7 @@ kernel models namespaces parser quotations sequences ui.commands
 ui.gadgets ui.gadgets.editors ui.gadgets.labelled
 ui.gadgets.panes ui.gadgets.buttons ui.gadgets.scrollers
 ui.gadgets.tracks ui.gestures ui.operations vocabs words
-prettyprint listener debugger threads generator ;
+prettyprint listener debugger threads compiler ;
 IN: ui.tools.listener
 
 TUPLE: listener-gadget input output stack ;