Update vocabs for combinators.short-circuit

diff --git a/extra/combinators/lib/lib.factor b/extra/combinators/lib/lib.factor
index fe6b68638bf535783ebf4eee3cea8f450724d2ce..d9509b30f4915fe95d38b027702d395c23427506 100755 (executable)
--- a/extra/combinators/lib/lib.factor
+++ b/extra/combinators/lib/lib.factor
@@ -63,42 +63,42 @@ MACRO: napply ( n -- )
 ! short circuiting words
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: short-circuit ( quots quot default -- quot )
-    1quotation -rot { } map>assoc <reversed> alist>quot ;
+! : short-circuit ( quots quot default -- quot )
+!     1quotation -rot { } map>assoc <reversed> alist>quot ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-MACRO: 0&& ( quots -- quot )
-  [ '[ drop @ dup not ] [ drop f ] 2array ] map
-  { [ t ] [ ] }                       suffix
-  '[ f , cond ] ;
+! MACRO: 0&& ( quots -- quot )
+!   [ '[ drop @ dup not ] [ drop f ] 2array ] map
+!   { [ t ] [ ] }                       suffix
+!   '[ f , cond ] ;
 
-MACRO: 1&& ( quots -- quot )
-  [ '[ drop dup @ dup not ] [ drop drop f ] 2array ] map
-  { [ t ] [ nip ] }                                  suffix
-  '[ f , cond ] ;
+! MACRO: 1&& ( quots -- quot )
+!   [ '[ drop dup @ dup not ] [ drop drop f ] 2array ] map
+!   { [ t ] [ nip ] }                                  suffix
+!   '[ f , cond ] ;
 
-MACRO: 2&& ( quots -- quot )
-  [ '[ drop 2dup @ dup not ] [ drop 2drop f ] 2array ] map
-  { [ t ] [ 2nip ] }                                   suffix
-  '[ f , cond ] ;
+! MACRO: 2&& ( quots -- quot )
+!   [ '[ drop 2dup @ dup not ] [ drop 2drop f ] 2array ] map
+!   { [ t ] [ 2nip ] }                                   suffix
+!   '[ f , cond ] ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-MACRO: 0|| ( quots -- quot )
-  [ '[ drop @ dup ] [ ] 2array ] map
-  { [ drop t ] [ f ] } suffix
-  '[ f , cond ] ;
+! MACRO: 0|| ( quots -- quot )
+!   [ '[ drop @ dup ] [ ] 2array ] map
+!   { [ drop t ] [ f ] } suffix
+!   '[ f , cond ] ;
 
-MACRO: 1|| ( quots -- quot )
-  [ '[ drop dup @ dup ] [ nip ] 2array ] map
-  { [ drop drop t ] [ f ] }              suffix
-  '[ f , cond ] ;
+! MACRO: 1|| ( quots -- quot )
+!   [ '[ drop dup @ dup ] [ nip ] 2array ] map
+!   { [ drop drop t ] [ f ] }              suffix
+!   '[ f , cond ] ;
 
-MACRO: 2|| ( quots -- quot )
-  [ '[ drop 2dup @ dup ] [ 2nip ] 2array ] map
-  { [ drop 2drop t ] [ f ] }               suffix
-  '[ f , cond ] ;
+! MACRO: 2|| ( quots -- quot )
+!   [ '[ drop 2dup @ dup ] [ 2nip ] 2array ] map
+!   { [ drop 2drop t ] [ f ] }               suffix
+!   '[ f , cond ] ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! ifte

diff --git a/extra/http/parsers/parsers.factor b/extra/http/parsers/parsers.factor
index 33bfa4b202755c7f7c98a3c712806381e3816179..bc6e1148c352a4f71815a3194c633bbab8c314a1 100644 (file)
--- a/extra/http/parsers/parsers.factor
+++ b/extra/http/parsers/parsers.factor
@@ -1,4 +1,4 @@
-USING: math math.order math.parser kernel combinators.lib
+USING: combinators.short-circuit math math.order math.parser kernel combinators.lib
 sequences sequences.deep peg peg.parsers assocs arrays
 hashtables strings unicode.case namespaces ascii ;
 IN: http.parsers

diff --git a/extra/unicode/breaks/breaks.factor b/extra/unicode/breaks/breaks.factor
index b70d79b87235cb89188b12f546610d9761bd934a..745fb83c3c9c7b943ec4476bec40be563e084d47 100755 (executable)
--- a/extra/unicode/breaks/breaks.factor
+++ b/extra/unicode/breaks/breaks.factor
@@ -1,4 +1,4 @@
-USING: unicode.categories kernel math combinators splitting
+USING: combinators.short-circuit unicode.categories kernel math combinators splitting
 sequences math.parser io.files io assocs arrays namespaces
 math.ranges unicode.normalize values io.encodings.ascii
 unicode.syntax unicode.data compiler.units alien.syntax sets

diff --git a/extra/unicode/collation/collation.factor b/extra/unicode/collation/collation.factor
index 216f80c79d8cb13b10bf376fe8e45b381d993ff8..8deed708e661c30c1d4a53baca3897f74146bfb3 100755 (executable)
--- a/extra/unicode/collation/collation.factor
+++ b/extra/unicode/collation/collation.factor
@@ -1,4 +1,4 @@
-USING: sequences io.files io.encodings.ascii kernel values\r
+USING: combinators.short-circuit sequences io.files io.encodings.ascii kernel values\r
 splitting accessors math.parser ascii io assocs strings math\r
 namespaces sorting combinators math.order arrays\r
 unicode.normalize unicode.data combinators.lib locals\r

diff --git a/extra/unicode/data/data.factor b/extra/unicode/data/data.factor
index 5fb769e499bfbaa7d0a2da2723622c6346aacdbd..b6c6292e90338ecdacd0adcd5954160a9a88e4d0 100755 (executable)
--- a/extra/unicode/data/data.factor
+++ b/extra/unicode/data/data.factor
@@ -1,4 +1,4 @@
-USING: assocs math kernel sequences io.files hashtables
+USING: combinators.short-circuit assocs math kernel sequences io.files hashtables
 quotations splitting grouping arrays math.parser hash2 math.order
 byte-arrays words namespaces words compiler.units parser
 io.encodings.ascii values interval-maps ascii sets