factor: trim using lists

[factor.git] / basis / concurrency / flags / flags-tests.factor

diff --git a/basis/concurrency/flags/flags-tests.factor b/basis/concurrency/flags/flags-tests.factor
index a66629331652532fed94f07fdbd0fb24496deed3..ecb64002124ef34cfff612076b846c62f2cd26db 100644 (file)
--- a/basis/concurrency/flags/flags-tests.factor
+++ b/basis/concurrency/flags/flags-tests.factor
@@ -1,53 +1,48 @@
-IN: concurrency.flags.tests\r
-USING: tools.test concurrency.flags concurrency.combinators\r
-kernel threads locals accessors calendar ;\r
-\r
-:: flag-test-1 ( -- val )\r
-    [let | f [ <flag> ] |\r
-        [ f raise-flag ] "Flag test" spawn drop\r
-        f lower-flag\r
-        f value>>\r
-    ] ;\r
-\r
-[ f ] [ flag-test-1 ] unit-test\r
-\r
-:: flag-test-2 ( -- )\r
-    [let | f [ <flag> ] |\r
-        [ 1 seconds sleep f raise-flag ] "Flag test" spawn drop\r
-        f lower-flag\r
-        f value>>\r
-    ] ;\r
-\r
-[ f ] [ flag-test-2 ] unit-test\r
-\r
-:: flag-test-3 ( -- val )\r
-    [let | f [ <flag> ] |\r
-        f raise-flag\r
-        f value>>\r
-    ] ;\r
-\r
-[ t ] [ flag-test-3 ] unit-test\r
-\r
-:: flag-test-4 ( -- val )\r
-    [let | f [ <flag> ] |\r
-        [ f raise-flag ] "Flag test" spawn drop\r
-        f wait-for-flag\r
-        f value>>\r
-    ] ;\r
-\r
-[ t ] [ flag-test-4 ] unit-test\r
-\r
-:: flag-test-5 ( -- val )\r
-    [let | f [ <flag> ] |\r
-        [ 1 seconds sleep f raise-flag ] "Flag test" spawn drop\r
-        f wait-for-flag\r
-        f value>>\r
-    ] ;\r
-\r
-[ t ] [ flag-test-5 ] unit-test\r
-\r
-[ ] [\r
-    { 1 2 } <flag>\r
-    [ [ 1 seconds sleep raise-flag ] curry "Flag test" spawn drop ]\r
-    [ [ wait-for-flag drop ] curry parallel-each ] bi\r
-] unit-test\r
+USING: tools.test concurrency.flags concurrency.combinators
+kernel threads accessors calendar ;
+IN: concurrency.flags.tests
+
+:: flag-test-1 ( -- val )
+    <flag> :> f
+    [ f raise-flag ] "Flag test" spawn drop
+    f lower-flag
+    f value>> ;
+
+{ f } [ flag-test-1 ] unit-test
+
+:: flag-test-2 ( -- ? )
+    <flag> :> f
+    [ 1 seconds sleep f raise-flag ] "Flag test" spawn drop
+    f lower-flag
+    f value>> ;
+
+{ f } [ flag-test-2 ] unit-test
+
+:: flag-test-3 ( -- val )
+    <flag> :> f
+    f raise-flag
+    f value>> ;
+
+{ t } [ flag-test-3 ] unit-test
+
+:: flag-test-4 ( -- val )
+    <flag> :> f
+    [ f raise-flag ] "Flag test" spawn drop
+    f wait-for-flag
+    f value>> ;
+
+{ t } [ flag-test-4 ] unit-test
+
+:: flag-test-5 ( -- val )
+    <flag> :> f
+    [ 1 seconds sleep f raise-flag ] "Flag test" spawn drop
+    f wait-for-flag
+    f value>> ;
+
+{ t } [ flag-test-5 ] unit-test
+
+{ } [
+    { 1 2 } <flag>
+    [ [ 1 seconds sleep raise-flag ] curry "Flag test" spawn drop ]
+    [ [ wait-for-flag drop ] curry parallel-each ] bi
+] unit-test