Update code for combinators.short-circuit

diff --git a/extra/boids/boids.factor b/extra/boids/boids.factor
index 4151b44cfb8d112849a16912e147b309c8245b93..e6c97b90ddf06a51757eeefa061dbedbd7201819 100644 (file)
--- a/extra/boids/boids.factor
+++ b/extra/boids/boids.factor
@@ -1,5 +1,5 @@
 
-USING: kernel namespaces
+USING: combinators.short-circuit kernel namespaces
        math
        math.constants
        math.functions

diff --git a/extra/boids/ui/ui.factor b/extra/boids/ui/ui.factor
index a1feac381dd21044c927e540b6c3e1ccccbdf9aa..3b28e79bcfca82b01ed6ab06e5428b15f3b67c56 100755 (executable)
--- a/extra/boids/ui/ui.factor
+++ b/extra/boids/ui/ui.factor
@@ -1,5 +1,5 @@
 
-USING: kernel namespaces
+USING: combinators.short-circuit kernel namespaces
        math
        math.functions
        math.vectors

diff --git a/extra/dns/forwarding/forwarding.factor b/extra/dns/forwarding/forwarding.factor
index 039b969ddde12f75f59d1f3bb8c1204c336a7d1c..87f982115300f01d931fc8833e54ff6e921b94af 100644 (file)
--- a/extra/dns/forwarding/forwarding.factor
+++ b/extra/dns/forwarding/forwarding.factor
@@ -1,5 +1,5 @@
 
-USING: kernel
+USING: combinators.short-circuit kernel
        combinators
        vectors
        sequences

diff --git a/extra/dns/server/server.factor b/extra/dns/server/server.factor
index 04b3ecfbee022960fb9db3571bfd3b040216b21f..16677d87613f49eee4d587f7cfb3eae3b0c47bf7 100644 (file)
--- a/extra/dns/server/server.factor
+++ b/extra/dns/server/server.factor
@@ -1,7 +1,7 @@
 
 USING: kernel combinators sequences sets math threads namespaces continuations
        debugger io io.sockets unicode.case accessors destructors
-       combinators.cleave combinators.lib
+       combinators.cleave combinators.lib combinators.short-circuit 
        newfx fry
        dns dns.util dns.misc ;
 

diff --git a/extra/ftp/server/server.factor b/extra/ftp/server/server.factor
index c71eadb72fd0fbd7c79a07f1035d19026e98153f..c5a5449b25e9fa5d9cb1e75238791633248cad43 100644 (file)
--- a/extra/ftp/server/server.factor
+++ b/extra/ftp/server/server.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors combinators io io.encodings.8-bit
+USING: combinators.short-circuit accessors combinators io io.encodings.8-bit
 io.encodings io.encodings.binary io.encodings.utf8 io.files
 io.sockets kernel math.parser namespaces sequences
 ftp io.unix.launcher.parser unicode.case splitting assocs

diff --git a/extra/inverse/inverse.factor b/extra/inverse/inverse.factor
index ef1f5759720d795524fdb795c1ef48ea56da97f5..43507046d64cae2ea32b90cb9e05d3e7db85d4bd 100755 (executable)
--- a/extra/inverse/inverse.factor
+++ b/extra/inverse/inverse.factor
@@ -2,7 +2,7 @@ USING: kernel words inspector slots quotations sequences assocs
 math arrays inference effects shuffle continuations debugger
 classes.tuple namespaces vectors bit-arrays byte-arrays strings
 sbufs math.functions macros sequences.private combinators
-mirrors combinators.lib ;
+mirrors combinators.lib combinators.short-circuit ;
 IN: inverse
 
 TUPLE: fail ;

diff --git a/extra/io/servers/connection/connection.factor b/extra/io/servers/connection/connection.factor
index b062322142ffb6ab52cba20eb87992c6d115c05e..0ff83261fba89a0c5fdf73d2876497634a722c6f 100755 (executable)
--- a/extra/io/servers/connection/connection.factor
+++ b/extra/io/servers/connection/connection.factor
@@ -6,7 +6,7 @@ quotations combinators combinators.lib logging calendar assocs
 fry accessors arrays io io.sockets io.encodings.ascii
 io.sockets.secure io.files io.streams.duplex io.timeouts
 io.encodings threads concurrency.combinators
-concurrency.semaphores ;
+concurrency.semaphores combinators.short-circuit ;
 IN: io.servers.connection
 
 TUPLE: threaded-server

diff --git a/extra/lcs/lcs.factor b/extra/lcs/lcs.factor
index 4b0fb53f5ec597113e6fb726983e4a91fb251d4b..2fa0b6cc712c6e64e76e570681cf713b463d7207 100755 (executable)
--- a/extra/lcs/lcs.factor
+++ b/extra/lcs/lcs.factor
@@ -1,5 +1,6 @@
 USING: sequences kernel math locals math.order math.ranges\r
-accessors combinators.lib arrays namespaces combinators ;\r
+accessors combinators.lib arrays namespaces combinators\r
+combinators.short-circuit ;\r
 IN: lcs\r
 \r
 <PRIVATE\r

diff --git a/extra/lisp/lisp.factor b/extra/lisp/lisp.factor
index e3d942d3903ccb2d9423d30f06c8f0b37d05ddaa..109083de378d0e6e24c9336840214193e4b4c1bf 100644 (file)
--- a/extra/lisp/lisp.factor
+++ b/extra/lisp/lisp.factor
@@ -3,7 +3,7 @@
 USING: kernel peg sequences arrays strings combinators.lib
 namespaces combinators math locals locals.private locals.backend accessors
 vectors syntax lisp.parser assocs parser sequences.lib words
-quotations fry lists inspector ;
+quotations fry lists inspector combinators.short-circuit ;
 IN: lisp
 
 DEFER: convert-form

diff --git a/extra/lisp/parser/parser.factor b/extra/lisp/parser/parser.factor
index 8fadb00e656656397287e4a088d0e1edc546ff48..428e1221daf7a58a88619f6181d5061442118302 100644 (file)
--- a/extra/lisp/parser/parser.factor
+++ b/extra/lisp/parser/parser.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 James Cash
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel peg peg.ebnf peg.expr math.parser sequences arrays strings
-combinators.lib math fry accessors lists ;
+combinators.lib math fry accessors lists combinators.short-circuit ;
 
 IN: lisp.parser
 

diff --git a/extra/lsys/strings/interpret/interpret.factor b/extra/lsys/strings/interpret/interpret.factor
index bcd87ca137a29d97a3505c8d969ea5b7824dba6b..1d992cc1e2b1a4c9d246d813cbe5e54a4e039193 100644 (file)
--- a/extra/lsys/strings/interpret/interpret.factor
+++ b/extra/lsys/strings/interpret/interpret.factor
@@ -1,6 +1,6 @@
 
 USING: kernel sequences quotations assocs math math.parser
-       combinators.lib vars lsys.strings ;
+       combinators.lib vars lsys.strings combinators.short-circuit ;
 
 IN: lsys.strings.interpret
 

diff --git a/extra/lsys/strings/rewrite/rewrite.factor b/extra/lsys/strings/rewrite/rewrite.factor
index eb76dbd75154842bcb3bef1a3c995f219c4041ac..622a86c4251c0370fd09c06b260db0855695510c 100644 (file)
--- a/extra/lsys/strings/rewrite/rewrite.factor
+++ b/extra/lsys/strings/rewrite/rewrite.factor
@@ -1,6 +1,6 @@
 
 USING: kernel sbufs strings sequences assocs math
-       combinators.lib vars lsys.strings ;
+       combinators.lib vars lsys.strings combinators.short-circuit ;
 
 IN: lsys.strings.rewrite
 

diff --git a/extra/lsys/strings/strings.factor b/extra/lsys/strings/strings.factor
index f184ca5dfc7a168fde05b35e053a361dde9f056d..603c6cc630f37f543ead78a76d2fb093a21e047f 100644 (file)
--- a/extra/lsys/strings/strings.factor
+++ b/extra/lsys/strings/strings.factor
@@ -1,5 +1,5 @@
 
-USING: kernel sequences math combinators.lib ;
+USING: kernel sequences math combinators.lib combinators.short-circuit ;
 
 IN: lsys.strings
 

diff --git a/extra/lsys/tortoise/graphics/graphics.factor b/extra/lsys/tortoise/graphics/graphics.factor
index d75915ae8e1e64bbbfb45c7d054338e8728569e8..ab679c83697d9c4015d6a32c3cf9bb1d3fbafb84 100644 (file)
--- a/extra/lsys/tortoise/graphics/graphics.factor
+++ b/extra/lsys/tortoise/graphics/graphics.factor
@@ -2,7 +2,7 @@
 USING: kernel math vectors sequences opengl.gl math.vectors math.order
        math.matrices vars opengl self pos ori turtle lsys.tortoise
 
-       lsys.strings.interpret ;
+       lsys.strings.interpret combinators.short-circuit ;
 
        ! lsys.strings
 

diff --git a/extra/lsys/ui/ui.factor b/extra/lsys/ui/ui.factor
index c3b9190c3c45c6d0e3bc85fa2cd76671c2b95716..d15793c15a64306e6cdfbfd11c5a1a9620414c2a 100644 (file)
--- a/extra/lsys/ui/ui.factor
+++ b/extra/lsys/ui/ui.factor
@@ -16,7 +16,8 @@ USING: kernel namespaces threads math math.order math.vectors
        vars rewrite-closures
        self pos ori turtle opengl.camera
        lsys.tortoise lsys.tortoise.graphics
-       lsys.strings.rewrite lsys.strings.interpret ;
+       lsys.strings.rewrite lsys.strings.interpret
+       combinators.short-circuit ;
 
        ! lsys.strings
        ! lsys.strings.rewrite

diff --git a/extra/math/text/english/english.factor b/extra/math/text/english/english.factor
index 500e08f79d0bb1779a0e4aa1328b9ef6e96d33cb..b8256533bf438f946f6bfb128bb4eb7e263a7e74 100755 (executable)
--- a/extra/math/text/english/english.factor
+++ b/extra/math/text/english/english.factor
@@ -1,7 +1,8 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators.lib kernel math math.functions math.parser namespaces
-    sequences splitting grouping sequences.lib ;
+    sequences splitting grouping sequences.lib
+    combinators.short-circuit ;
 IN: math.text.english
 
 <PRIVATE

diff --git a/extra/peg/ebnf/ebnf.factor b/extra/peg/ebnf/ebnf.factor
index fc10a65024419b62a6bec1aaa59b97a3619fc9ca..e3d44585a7258c3d27e817115c4e7fe6e748188d 100644 (file)
--- a/extra/peg/ebnf/ebnf.factor
+++ b/extra/peg/ebnf/ebnf.factor
@@ -3,7 +3,8 @@
 USING: kernel compiler.units parser words arrays strings math.parser sequences \r
        quotations vectors namespaces math assocs continuations peg\r
        peg.parsers unicode.categories multiline combinators.lib \r
-       splitting accessors effects sequences.deep peg.search ;\r
+       splitting accessors effects sequences.deep peg.search\r
+       combinators.short-circuit ;\r
 IN: peg.ebnf\r
 \r
 TUPLE: ebnf-non-terminal symbol ;\r

diff --git a/extra/project-euler/014/014.factor b/extra/project-euler/014/014.factor
index ef8ef8c0f7b5e2f1db5aadf342ab297edbdf4239..b99e34d36f8d0fb80c7ba930c7fed12bc2fa14f6 100644 (file)
--- a/extra/project-euler/014/014.factor
+++ b/extra/project-euler/014/014.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays combinators.lib kernel math math.ranges namespaces sequences
-    sorting ;
+    sorting combinators.short-circuit ;
 IN: project-euler.014
 
 ! http://projecteuler.net/index.php?section=problems&id=14

diff --git a/extra/project-euler/017/017.factor b/extra/project-euler/017/017.factor
index ffff10d4fee0821e9815c4bfec3423dc3358fafa..cf58e88ffeb7648e6af0b5ab3dde92b5c372d074 100644 (file)
--- a/extra/project-euler/017/017.factor
+++ b/extra/project-euler/017/017.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel math.ranges math.text.english sequences sequences.lib strings
-    ascii ;
+    ascii combinators.short-circuit ;
 IN: project-euler.017
 
 ! http://projecteuler.net/index.php?section=problems&id=17

diff --git a/extra/project-euler/021/021.factor b/extra/project-euler/021/021.factor
index e6eadba264dc582089113213f78ad4de0a906b92..f09b0c0b4245f1892eaa59ba3594d6f37fc5e61b 100644 (file)
--- a/extra/project-euler/021/021.factor
+++ b/extra/project-euler/021/021.factor
@@ -1,7 +1,8 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators.lib kernel math math.functions math.ranges namespaces
-    project-euler.common sequences sequences.lib ;
+    project-euler.common sequences sequences.lib
+    combinators.short-circuit ;
 IN: project-euler.021
 
 ! http://projecteuler.net/index.php?section=problems&id=21

diff --git a/extra/project-euler/036/036.factor b/extra/project-euler/036/036.factor
index fbf6376eb324020c5d9e5ea5b08d0d5e878f8af8..4a4f906467807a23bc0e960009cff1ef5042b879 100644 (file)
--- a/extra/project-euler/036/036.factor
+++ b/extra/project-euler/036/036.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators.lib kernel math.parser math.ranges project-euler.common
-    sequences ;
+    sequences combinators.short-circuit ;
 IN: project-euler.036
 
 ! http://projecteuler.net/index.php?section=problems&id=36

diff --git a/extra/project-euler/043/043.factor b/extra/project-euler/043/043.factor
index 0c51146656d189c1cd1278b611d68c50e912426c..e095d94ead990691aa8b29e7546a1fe40669cadc 100644 (file)
--- a/extra/project-euler/043/043.factor
+++ b/extra/project-euler/043/043.factor
@@ -1,7 +1,8 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators.lib hashtables kernel math math.combinatorics math.parser
-    math.ranges project-euler.common sequences sequences.lib sorting sets ;
+    math.ranges project-euler.common sequences sequences.lib sorting
+    sets combinators.short-circuit ;
 IN: project-euler.043
 
 ! http://projecteuler.net/index.php?section=problems&id=43

diff --git a/extra/project-euler/052/052.factor b/extra/project-euler/052/052.factor
index 6c4b605bd9e89e8aae92c0e5680ff121f5004ce8..194530ea78c44538ba605a8c5f1b3dc7799985e6 100644 (file)
--- a/extra/project-euler/052/052.factor
+++ b/extra/project-euler/052/052.factor
@@ -1,6 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators.lib kernel math project-euler.common sequences sorting ;
+USING: combinators.lib kernel math project-euler.common sequences
+sorting combinators.short-circuit ;
 IN: project-euler.052
 
 ! http://projecteuler.net/index.php?section=problems&id=52

diff --git a/extra/project-euler/project-euler.factor b/extra/project-euler/project-euler.factor
index 9325e74d93f907b92f53b8177acd54f5f510d2ca..3101c900e314c8bd416826b99d9ed0f1a8f6604b 100644 (file)
--- a/extra/project-euler/project-euler.factor
+++ b/extra/project-euler/project-euler.factor
@@ -17,7 +17,7 @@ USING: definitions io io.files kernel math math.parser project-euler.ave-time
     project-euler.052 project-euler.053 project-euler.056 project-euler.059
     project-euler.067 project-euler.075 project-euler.079 project-euler.092
     project-euler.097 project-euler.134 project-euler.169 project-euler.173
-    project-euler.175 ;
+    project-euler.175 combinators.short-circuit ;
 IN: project-euler
 
 <PRIVATE

diff --git a/extra/regexp/regexp.factor b/extra/regexp/regexp.factor
index 99e6b887c8706d35c1c00fcf315ec595c7916ba7..bdf0c411b280ccc5a422540590b4085ea142e728 100755 (executable)
--- a/extra/regexp/regexp.factor
+++ b/extra/regexp/regexp.factor
@@ -1,7 +1,8 @@
 USING: arrays combinators kernel lists math math.parser
 namespaces parser parser-combinators parser-combinators.simple
 promises quotations sequences combinators.lib strings math.order
-assocs prettyprint.backend memoize unicode.case unicode.categories ;
+assocs prettyprint.backend memoize unicode.case unicode.categories
+combinators.short-circuit ;
 USE: io
 IN: regexp
 

diff --git a/extra/shell/shell.factor b/extra/shell/shell.factor
index 8ba5b66d5ac7f2a8fd28c2523e8fbdbbde61d86e..45c6f1fb4d533285110e6e68f13c2ef4e6c78e65 100644 (file)
--- a/extra/shell/shell.factor
+++ b/extra/shell/shell.factor
@@ -2,7 +2,8 @@
 USING: kernel parser words continuations namespaces debugger
        sequences combinators splitting prettyprint
        system io io.files io.launcher io.encodings.utf8 io.pipes sequences.deep
-       accessors multi-methods newfx shell.parser ;
+       accessors multi-methods newfx shell.parser
+       combinators.short-circuit ;
 
 IN: shell
 

diff --git a/extra/xmode/marker/marker.factor b/extra/xmode/marker/marker.factor
index 7d82842327e181631813b348155c1867ad7585a2..911397cc20e18b56e89b3270a9cb617c6bdaf0b0 100755 (executable)
--- a/extra/xmode/marker/marker.factor
+++ b/extra/xmode/marker/marker.factor
@@ -2,7 +2,8 @@ IN: xmode.marker
 USING: kernel namespaces xmode.rules xmode.tokens
 xmode.marker.state xmode.marker.context xmode.utilities
 xmode.catalog sequences math assocs combinators combinators.lib
-strings regexp splitting parser-combinators ascii unicode.case ;
+strings regexp splitting parser-combinators ascii unicode.case
+combinators.short-circuit ;
 
 ! Based on org.gjt.sp.jedit.syntax.TokenMarker