From ba40acda282a056caf07c1593733528a4d97d0f8 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Thu, 23 Apr 2009 22:39:31 -0500
Subject: [PATCH] Merge Joe Groff's booleans vocab into kernel

---
 basis/booleans/booleans-docs.factor      | 7 -------
 basis/booleans/booleans-tests.factor     | 7 -------
 basis/booleans/booleans.factor           | 5 -----
 core/combinators/combinators-docs.factor | 2 ++
 core/kernel/kernel-docs.factor           | 3 +++
 core/kernel/kernel.factor                | 6 ++++--
 6 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 basis/booleans/booleans-docs.factor
 delete mode 100644 basis/booleans/booleans-tests.factor
 delete mode 100644 basis/booleans/booleans.factor

diff --git a/basis/booleans/booleans-docs.factor b/basis/booleans/booleans-docs.factor
deleted file mode 100644
index d3e9dfaed3..0000000000
--- a/basis/booleans/booleans-docs.factor
+++ /dev/null
@@ -1,7 +0,0 @@
-! (c)2009 Joe Groff, see bsd license
-USING: help.markup help.syntax ;
-IN: booleans
-
-HELP: boolean
-{ $class-description "A union of the " { $link POSTPONE: t } " and " { $link POSTPONE: f } " classes." } ;
-
diff --git a/basis/booleans/booleans-tests.factor b/basis/booleans/booleans-tests.factor
deleted file mode 100644
index 4b3154236d..0000000000
--- a/basis/booleans/booleans-tests.factor
+++ /dev/null
@@ -1,7 +0,0 @@
-! (c)2009 Joe Groff, see bsd license
-USING: booleans tools.test ;
-IN: booleans.tests
-
-[ t ] [ t boolean? ] unit-test
-[ t ] [ f boolean? ] unit-test
-[ f ] [ 1 boolean? ] unit-test
diff --git a/basis/booleans/booleans.factor b/basis/booleans/booleans.factor
deleted file mode 100644
index 0ec7db33bf..0000000000
--- a/basis/booleans/booleans.factor
+++ /dev/null
@@ -1,5 +0,0 @@
-! (c)2009 Joe Groff, see bsd license
-USING: kernel ;
-IN: booleans
-
-UNION: boolean POSTPONE: t POSTPONE: f ;
diff --git a/core/combinators/combinators-docs.factor b/core/combinators/combinators-docs.factor
index e02103697d..cbef25ac38 100644
--- a/core/combinators/combinators-docs.factor
+++ b/core/combinators/combinators-docs.factor
@@ -198,6 +198,8 @@ ARTICLE: "booleans" "Booleans"
 "In Factor, any object that is not " { $link f } " has a true value, and " { $link f } " has a false value. The " { $link t } " object is the canonical true value."
 { $subsection f }
 { $subsection t }
+"A union class of the above:"
+{ $subsection boolean }
 "There are some logical operations on booleans:"
 { $subsection >boolean }
 { $subsection not }
diff --git a/core/kernel/kernel-docs.factor b/core/kernel/kernel-docs.factor
index 371edcf995..1d8c09a9b2 100644
--- a/core/kernel/kernel-docs.factor
+++ b/core/kernel/kernel-docs.factor
@@ -129,6 +129,9 @@ HELP: ?
 { $values { "?" "a generalized boolean" } { "true" object } { "false" object } { "true/false" "one two input objects" } }
 { $description "Chooses between two values depending on the boolean value of " { $snippet "cond" } "." } ;
 
+HELP: boolean
+{ $class-description "A union of the " { $link POSTPONE: t } " and " { $link POSTPONE: f } " classes." } ;
+
 HELP: >boolean
 { $values { "obj" "a generalized boolean" } { "?" "a boolean" } }
 { $description "Convert a generalized boolean into a boolean. That is, " { $link f } " retains its value, whereas anything else becomes " { $link t } "." } ;
diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor
index baccf56059..6245080225 100644
--- a/core/kernel/kernel.factor
+++ b/core/kernel/kernel.factor
@@ -176,12 +176,14 @@ PRIVATE>
 : tri-curry@ ( x y z q -- p' q' r' ) [curry] tri@ ; inline
 
 ! Booleans
+UNION: boolean POSTPONE: t POSTPONE: f ;
+
+: >boolean ( obj -- ? ) [ t ] [ f ] if ; inline
+
 : not ( obj -- ? ) [ f ] [ t ] if ; inline
 
 : and ( obj1 obj2 -- ? ) over ? ; inline
 
-: >boolean ( obj -- ? ) [ t ] [ f ] if ; inline
-
 : or ( obj1 obj2 -- ? ) dupd ? ; inline
 
 : xor ( obj1 obj2 -- ? ) [ f swap ? ] when* ; inline