From bc0711cbe596339d8bd26d0f7cd6b808a1d98977 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Mon, 3 Aug 2009 23:12:34 -0500
Subject: [PATCH] modules vocab in working order

---
 extra/modules/rpc-server/rpc-server-docs.factor |  2 +-
 extra/modules/rpc-server/rpc-server.factor      | 16 ++++++++--------
 extra/modules/rpc/rpc.factor                    |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/extra/modules/rpc-server/rpc-server-docs.factor b/extra/modules/rpc-server/rpc-server-docs.factor
index f1d4be4465..fc2c2344dd 100644
--- a/extra/modules/rpc-server/rpc-server-docs.factor
+++ b/extra/modules/rpc-server/rpc-server-docs.factor
@@ -2,4 +2,4 @@ USING: help.syntax help.markup modules.rpc-server modules.using ;
 IN: modules.rpc-server
 HELP: service
 { $syntax "IN: my-vocab service" }
-{ $description "Allows words defined in the vocabulary to be used as remote procedure calls by " { $link POSTPONE: USING*: } ;
\ No newline at end of file
+{ $description "Allows words defined in the vocabulary to be used as remote procedure calls by " { $link POSTPONE: USING*: } } ;
\ No newline at end of file
diff --git a/extra/modules/rpc-server/rpc-server.factor b/extra/modules/rpc-server/rpc-server.factor
index bafdc55335..073804fa8c 100644
--- a/extra/modules/rpc-server/rpc-server.factor
+++ b/extra/modules/rpc-server/rpc-server.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs combinators continuations effects
 io.encodings.binary io.servers.connection kernel namespaces
-sequences serialize sets threads vocabs vocabs.parser init ;
+sequences serialize sets threads vocabs vocabs.parser init io ;
 IN: modules.rpc-server
 
 <PRIVATE
@@ -11,21 +11,21 @@ SYMBOL: serving-vocabs serving-vocabs [ V{ } clone ] initialize
 
 : getter ( -- ) deserialize dup serving-vocabs get-global index
         [ vocab-words [ stack-effect ] { } assoc-map-as ]
-        [ \ no-vocab boa ] if serialize ;
+        [ \ no-vocab boa ] if serialize flush ;
 
 : doer ( -- ) deserialize dup vocabspec>> serving-vocabs get-global index
         [ [ args>> ] [ wordname>> ] [ vocabspec>> vocab-words ] tri at [ execute ] curry with-datastack ]
-        [ vocabspec>> \ no-vocab boa ] if serialize ;
+        [ vocabspec>> \ no-vocab boa ] if serialize flush ;
 
 PRIVATE>
 SYNTAX: service current-vocab name>> serving-vocabs get-global adjoin ;
 
 [ [ binary <threaded-server>
     "rpcs" >>name 9012 >>insecure
-    [ break deserialize {
-      { [ "getter" ] [ getter ] }
-      { [  "doer" ] [ doer ] }
-      { [ "loader" ] [ deserialize vocab serialize ] } 
+    [ deserialize {
+      { "getter" [ getter ] }
+      {  "doer" [ doer ] }
+      { "loader" [ deserialize vocab serialize flush ] } 
     } case ] >>handler
-    start-server ] in-thread drop
+    start-server ] in-thread
 ] "modules.rpc-server" add-init-hook
\ No newline at end of file
diff --git a/extra/modules/rpc/rpc.factor b/extra/modules/rpc/rpc.factor
index 75b5ef3fe5..b394090d55 100644
--- a/extra/modules/rpc/rpc.factor
+++ b/extra/modules/rpc/rpc.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs fry generalizations io.encodings.binary
 io.sockets kernel locals namespaces parser sequences serialize
-vocabs vocabs.parser words tools.continuations io ;
+vocabs vocabs.parser words io ;
 IN: modules.rpc
 
 TUPLE: rpc-request args vocabspec wordname ;
@@ -13,7 +13,7 @@ TUPLE: rpc-request args vocabspec wordname ;
 :: define-remote ( str effect addrspec vocabspec -- )
     str create-in effect [ in>> length ] [ out>> length ] bi
     '[ _ narray vocabspec str rpc-request boa addrspec 9012 <inet> binary
-    [ "doer" serialize serialize send-with-check ] with-client _ firstn ]
+    [ "doer" serialize send-with-check ] with-client _ firstn ]
     effect define-declared ;
 
 :: remote-vocab ( addrspec vocabspec -- vocab )