moved with-in-vocab back to rpc

diff --git a/core/vocabs/parser/parser.factor b/core/vocabs/parser/parser.factor
index 23b3feea9b5feaf2ca5cf1550becaee30f3f87cb..afa8f20f741a75ebb4904228a682d2bec4ba1718 100644 (file)
--- a/core/vocabs/parser/parser.factor
+++ b/core/vocabs/parser/parser.factor
@@ -1,62 +1,59 @@
 ! Copyright (C) 2007, 2009 Daniel Ehrenberg, Bruno Deferrari,
 ! Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs fry hashtables kernel namespaces sequences
+USING: assocs hashtables kernel namespaces sequences
 sets strings vocabs sorting accessors arrays ;
 IN: vocabs.parser
-
+ 
 ERROR: no-word-error name ;
-
+ 
 : word-restarts ( name possibilities -- restarts )
     natural-sort
     [ [ vocabulary>> "Use the " " vocabulary" surround ] keep ] { } map>assoc
     swap "Defer word in current vocabulary" swap 2array
     suffix ;
-
+ 
 : <no-word-error> ( name possibilities -- error restarts )
     [ drop \ no-word-error boa ] [ word-restarts ] 2bi ;
-
+ 
 SYMBOL: use
 SYMBOL: in
-
+ 
 : (use+) ( vocab -- )
     vocab-words use get push ;
-
+ 
 : use+ ( vocab -- )
     load-vocab (use+) ;
-
+ 
 : add-use ( seq -- ) [ use+ ] each ;
-
+ 
 : set-use ( seq -- )
     [ vocab-words ] V{ } map-as sift use set ;
-
+ 
 : add-qualified ( vocab prefix -- )
     [ load-vocab vocab-words ] [ CHAR: : suffix ] bi*
     [ swap [ prepend ] dip ] curry assoc-map
     use get push ;
-
+ 
 : partial-vocab ( words vocab -- assoc )
     load-vocab vocab-words
     [ dupd at [ no-word-error ] unless* ] curry { } map>assoc ;
-
+ 
 : add-words-from ( words vocab -- )
     partial-vocab use get push ;
-
+ 
 : partial-vocab-excluding ( words vocab -- assoc )
     load-vocab [ vocab-words keys swap diff ] keep partial-vocab ;
-
+ 
 : add-words-excluding ( words vocab -- )
     partial-vocab-excluding use get push ;
-
+ 
 : add-renamed-word ( word vocab new-name -- )
     [ load-vocab vocab-words dupd at [ ] [ no-word-error ] ?if ] dip
     associate use get push ;
-
+ 
 : check-vocab-string ( name -- name )
     dup string? [ "Vocabulary name must be a string" throw ] unless ;
-
+ 
 : set-in ( name -- )
-    check-vocab-string dup in set create-vocab (use+) ;
-
-: with-in ( vocab quot -- vocab ) over
-   [ '[ _ set-in @ ] in get swap dip set-in ] dip vocab ; inline
\ No newline at end of file
+    check-vocab-string dup in set create-vocab (use+) ;
\ No newline at end of file

diff --git a/extra/modules/rpc/rpc.factor b/extra/modules/rpc/rpc.factor
index 1c875339b2c684277ff7aa8977b0ba1eca358d35..c6b00efc4993da7d5e4d11616226a840d8a7b269 100644 (file)
--- a/extra/modules/rpc/rpc.factor
+++ b/extra/modules/rpc/rpc.factor
@@ -5,6 +5,9 @@ IN: modules.rpc
 
 DEFER: get-words
 
+: with-in-vocab ( vocab quot -- vocab ) over
+  [ '[ _ set-in @ ] in get swap dip set-in ] dip vocab ; inline
+
 : remote-quot ( addrspec vocabspec effect str -- quot )
    '[ _ 5000 <inet> binary
       [
@@ -20,4 +23,4 @@ DEFER: get-words
    dup "-remote" append [ 
       [ (( -- words )) [ "get-words" remote-quot ] keep call-effect ] 2keep
       [ rot first2 swap define-remote ] 2curry each
-   ] with-in ;
\ No newline at end of file
+   ] with-in-vocab ;
\ No newline at end of file