factor: trim using lists

[factor.git] / basis / channels / remote / remote.factor

diff --git a/basis/channels/remote/remote.factor b/basis/channels/remote/remote.factor
index 4eab29fd81f15322cf6f5283c9663dfb5d4cb6ef..ef0b3b15f1b70d2ca1785dfba52ea579569c0874 100644 (file)
--- a/basis/channels/remote/remote.factor
+++ b/basis/channels/remote/remote.factor
@@ -2,9 +2,9 @@
 ! See http://factorcode.org/license.txt for BSD license.
 !
 ! Remote Channels
-USING: kernel init namespaces assocs arrays random
-sequences channels match concurrency.messaging
-concurrency.distributed threads accessors ;
+USING: accessors assocs channels concurrency.distributed
+concurrency.messaging init kernel match namespaces random
+threads ;
 IN: channels.remote
 
 <PRIVATE
@@ -21,7 +21,7 @@ PRIVATE>
 
 : unpublish ( id -- )
     remote-channels delete-at ;
-    
+
 <PRIVATE
 
 MATCH-VARS: ?from ?tag ?id ?value ;
@@ -34,7 +34,7 @@ TUPLE: from-message id ;
     [
         {
             { T{ to-message f ?id ?value  }
-            [ ?value ?id get-channel dup [ to f ] [ 2drop no-channel ] if ] }
+            [ ?value ?id get-channel [ to f ] [ drop no-channel ] if* ] }
             { T{ from-message f ?id }
             [ ?id get-channel [ from ] [ no-channel ] if* ] }
         } match-cond
@@ -43,27 +43,27 @@ TUPLE: from-message id ;
 : start-channel-node ( -- )
     "remote-channels" get-remote-thread [
         [ channel-thread t ] "Remote channels" spawn-server
-        "remote-channels" register-remote-thread 
+        "remote-channels" register-remote-thread
     ] unless ;
 
 PRIVATE>
 
 TUPLE: remote-channel node id ;
 
-C: <remote-channel> remote-channel 
+C: <remote-channel> remote-channel
 
 <PRIVATE
 
 : send-message ( message remote-channel -- value )
-    node>> "remote-channels" <remote-thread> 
+    node>> "remote-channels" <remote-thread>
     send-synchronous dup no-channel = [ no-channel throw ] when* ;
-    
+
 PRIVATE>
 
-M: remote-channel to ( value remote-channel -- )
+M: remote-channel to
     [ id>> swap to-message boa ] keep send-message drop ;
 
-M: remote-channel from ( remote-channel -- value )
+M: remote-channel from
     [ id>> from-message boa ] keep send-message ;
 
 [