extra: minor combinator cleanup

diff --git a/extra/audio/aiff/aiff.factor b/extra/audio/aiff/aiff.factor
index dc448440bf5f3f945f001a3980f30deb1d573da6..cabacddc445fe24f293deada22b37fc89eafa02c 100644 (file)
--- a/extra/audio/aiff/aiff.factor
+++ b/extra/audio/aiff/aiff.factor
@@ -48,7 +48,7 @@ STRUCT: sound-data-chunk
 
 :: read-aiff-chunks ( -- comm ssnd )
     f :> comm! f :> ssnd!
-    [ { [ comm ssnd and not ] [ read-chunk ] } 0&& dup ]
+    [ { [ comm ssnd and not ] [ read-chunk ] } 0&& ]
     [ {
         {
             [ dup COMM-MAGIC common-chunk check-chunk ]
@@ -59,7 +59,7 @@ STRUCT: sound-data-chunk
             [ sound-data-chunk memory>struct ssnd! ]
         }
         [ drop ]
-    } cond ] while drop
+    } cond ] while*
     comm ssnd 2dup and [ invalid-audio-file ] unless ;
 
 : (read-aiff) ( -- audio )

diff --git a/extra/libudev/libudev.factor b/extra/libudev/libudev.factor
index dd2249a50e461601830e8f4733887a3879c4cffe..dac0f58aec1bf2eead1d77077d5369a1bb27a27c 100644 (file)
--- a/extra/libudev/libudev.factor
+++ b/extra/libudev/libudev.factor
@@ -95,8 +95,8 @@ FUNCTION: c-string udev_list_entry_get_value (
 
 ! Helper to iterate over all entries of a list.
 : udev_list_entry_foreach ( ... first_entry quot: ( ... x -- ... ) -- ... )
-    [ [ dup ] ] dip '[ _ keep udev_list_entry_get_next ]
-    while drop ; inline
+    '[ _ keep udev_list_entry_get_next dup ] loop drop ; inline
+
 
 ! Get all list entries _as_ a list
 : udev-list-entries ( first_entry -- seq )

diff --git a/extra/mediawiki/api/api.factor b/extra/mediawiki/api/api.factor
index e89fc58e84dd5301d5e5175b8a5a0ec736800b2d..afcbd1f7c6be7c4a12e471da8d7a12326b1bbd41 100644 (file)
--- a/extra/mediawiki/api/api.factor
+++ b/extra/mediawiki/api/api.factor
@@ -157,11 +157,11 @@ PRIVATE>
 :: call-continue ( params quot1: ( params -- obj assoc )
 quot2: ( ... -- ... ) -- seq )
     f f [
-        "continue" of dup
+        "continue" of
     ] [
         params assoc-union quot1 call
         [ quot2 call >alist append ] dip
-    ] do while drop ; inline
+    ] do while* ; inline
 
 : query ( params -- seq )
     [ (query) ] [ ] call-continue ;

diff --git a/extra/zeromq/examples/hwserver.factor b/extra/zeromq/examples/hwserver.factor
index 3c1fe43a5bb2d9d1a29248a74b2e5b4f3624b74f..f7251a55c86af59d4c41d7e31137bb16bacd967f 100644 (file)
--- a/extra/zeromq/examples/hwserver.factor
+++ b/extra/zeromq/examples/hwserver.factor
@@ -9,13 +9,14 @@ IN: zeromq.examples.hwserver
         <zmq-context> &dispose
         ZMQ_REP <zmq-socket> &dispose
         dup "tcp://*:5555" zmq-bind
-        [ t ] [
+        [
             dup
             [ 0 zmq-recv >string "Received " write print flush ]
             [ drop 1 seconds sleep ]
             [ "World" >byte-array 0 zmq-send ]
             tri
-        ] while drop
+            t
+        ] loop drop
     ] with-destructors ;
 
 MAIN: hwserver