From e88b83b32f33a5831f29478b98f5c45470a1d9ac Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Tue, 24 Jun 2008 08:35:36 -0500
Subject: [PATCH] Update vocabs for combinators.short-circuit

---
 extra/combinators/lib/lib.factor         | 52 ++++++++++++------------
 extra/http/parsers/parsers.factor        |  2 +-
 extra/unicode/breaks/breaks.factor       |  2 +-
 extra/unicode/collation/collation.factor |  2 +-
 extra/unicode/data/data.factor           |  2 +-
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/extra/combinators/lib/lib.factor b/extra/combinators/lib/lib.factor
index fe6b68638b..d9509b30f4 100755
--- 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 33bfa4b202..bc6e1148c3 100644
--- 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 b70d79b872..745fb83c3c 100755
--- 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 216f80c79d..8deed708e6 100755
--- 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
+USING: combinators.short-circuit sequences io.files io.encodings.ascii kernel values
 splitting accessors math.parser ascii io assocs strings math
 namespaces sorting combinators math.order arrays
 unicode.normalize unicode.data combinators.lib locals
diff --git a/extra/unicode/data/data.factor b/extra/unicode/data/data.factor
index 5fb769e499..b6c6292e90 100755
--- 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