factor: trim using lists

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

diff --git a/basis/channels/channels.factor b/basis/channels/channels.factor
old mode 100755 (executable)
new mode 100644 (file)
index 545d8a0..8424d50
--- a/basis/channels/channels.factor
+++ b/basis/channels/channels.factor
@@ -2,8 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 !
 ! Channels - based on ideas from newsqueak
-USING: kernel sequences threads continuations
-random math accessors random ;
+USING: accessors kernel random sequences threads ;
 IN: channels
 
 TUPLE: channel receivers senders ;
@@ -17,7 +16,7 @@ GENERIC: from ( channel -- value )
 <PRIVATE
 
 : wait ( channel -- )
-    [ senders>> push ] curry
+    [ self ] dip senders>> push
     "channel send" suspend drop ;
 
 : (to) ( value receivers -- )
@@ -31,12 +30,12 @@ GENERIC: from ( channel -- value )
 
 PRIVATE>
 
-M: channel to ( value channel -- )
+M: channel to
     dup receivers>>
-    dup empty? [ drop dup wait to ] [ nip (to) ] if ;
+    [ dup wait to ] [ nip (to) ] if-empty ;
 
-M: channel from ( channel -- value )
-    [
-        notify senders>>
-        dup empty? [ drop ] [ (from) ] if
-    ] curry "channel receive" suspend ;
+M: channel from
+    [ self ] dip
+    notify senders>>
+    [ (from) ] unless-empty
+    "channel receive" suspend ;