Fixing interactor (temporarily)

db4
Slava Pestov 2007-12-29 22:29:59 -05:00
parent 2b37b76d65
commit 75695563ca
3 changed files with 7 additions and 7 deletions

2
extra/ui/tools/interactor/interactor-docs.factor Normal file → Executable file
View File

@ -6,4 +6,4 @@ HELP: interactor
$nl $nl
"Interactors are created by calling " { $link <interactor> } "." "Interactors are created by calling " { $link <interactor> } "."
$nl $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." } ;

View File

@ -3,9 +3,9 @@
USING: arrays assocs combinators continuations documents USING: arrays assocs combinators continuations documents
ui.tools.workspace hashtables io io.styles kernel math ui.tools.workspace hashtables io io.styles kernel math
math.vectors models namespaces parser prettyprint quotations math.vectors models namespaces parser prettyprint quotations
sequences strings threads listener tuples ui.commands sequences strings threads listener tuples ui.commands ui.gadgets
ui.gadgets ui.gadgets.editors ui.gadgets.editors ui.gadgets.presentations ui.gadgets.worlds
ui.gadgets.presentations ui.gadgets.worlds ui.gestures ; ui.gestures definitions ;
IN: ui.tools.interactor IN: ui.tools.interactor
TUPLE: interactor TUPLE: interactor
@ -129,7 +129,7 @@ M: interactor stream-read-partial
: try-parse ( str interactor -- quot/error/f ) : 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> >r f swap set-interactor-busy? drop r>
dup delegate unexpected-eof? [ drop f ] when dup delegate unexpected-eof? [ drop f ] when
@ -143,7 +143,7 @@ M: interactor stream-read-partial
{ [ t ] [ handle-parse-error ] } { [ t ] [ handle-parse-error ] }
} cond ; } cond ;
M: interactor parse-interactive M: interactor stream-read-quot
[ save-vars ] keep [ save-vars ] keep
[ [ handle-interactive ] interactor-yield ] keep [ [ handle-interactive ] interactor-yield ] keep
restore-vars ; restore-vars ;

View File

@ -6,7 +6,7 @@ kernel models namespaces parser quotations sequences ui.commands
ui.gadgets ui.gadgets.editors ui.gadgets.labelled ui.gadgets ui.gadgets.editors ui.gadgets.labelled
ui.gadgets.panes ui.gadgets.buttons ui.gadgets.scrollers ui.gadgets.panes ui.gadgets.buttons ui.gadgets.scrollers
ui.gadgets.tracks ui.gestures ui.operations vocabs words ui.gadgets.tracks ui.gestures ui.operations vocabs words
prettyprint listener debugger threads generator ; prettyprint listener debugger threads compiler ;
IN: ui.tools.listener IN: ui.tools.listener
TUPLE: listener-gadget input output stack ; TUPLE: listener-gadget input output stack ;