From 977f775f6a923edd1eb52b7b1c3a3d963e62049d Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Wed, 27 Oct 2010 15:14:30 +0000
Subject: 	* algebra/boolean.spad.pamphlet (BooleanLogic) [~]: Add
 defaut.

---
 src/algebra/Makefile.in           |  9 +++++----
 src/algebra/Makefile.pamphlet     |  9 +++++----
 src/algebra/boolean.spad.pamphlet | 14 ++++++++------
 3 files changed, 18 insertions(+), 14 deletions(-)

(limited to 'src/algebra')

diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 3f5f1f82..e3b3ecf8 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -307,6 +307,7 @@ $(OUT)/PATMAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
 $(OUT)/REAL.$(FASLEXT): $(OUT)/KONVERT.$(FASLEXT)
 
 $(OUT)/LOGIC.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
+$(OUT)/BOOLE.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
 
 
 $(OUT)/SGROUP.$(FASLEXT) $(OUT)/SGROUP-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
@@ -374,7 +375,8 @@ axiom_algebra_layer_0 = \
   LIST     DIFFDOM  DIFFDOM- DIFFSPC  DIFFSPC- DIFFMOD  \
   LINEXP   PATMAB   REAL     CHARZ    LOGIC    LOGIC-   \
   RTVALUE  SYSPTR   PDDOM    PDDOM-   PDSPC    PDSPC-   \
-  DSEXT    DSEXT-   ORDTYPE  ORDTYPE- ORDSTRCT
+  DSEXT    DSEXT-   ORDTYPE  ORDTYPE- ORDSTRCT          \
+  BOOLE    BOOLE-
 
 axiom_algebra_layer_0_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_0))
@@ -394,7 +396,6 @@ $(OUT)/IEVALAB.$(FASLEXT) $(OUT)/IEVALAB-.$(FASLEXT): \
 $(OUT)/EVALAB.$(FASLEXT) $(OUT)/EVALAB-.$(FASLEXT): \
 	$(OUT)/IEVALAB.$(FASLEXT)
 
-$(OUT)/BOOLE.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
 $(OUT)/PROPLOG.$(FASLEXT): $(OUT)/BOOLE.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT)
 
 $(OUT)/MAYBE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT)
@@ -444,9 +445,9 @@ axiom_algebra_layer_1 = \
   GCDDOM   GCDDOM-  UFD      UFD-     ES        ES-      \
   PATAB    PPCURVE  PSCURVE  CACHSET  RESLATC   REF      \
   IDENT             BINDING  ALIST    BOOLEAN   PRIMARR  \
-  ORDRING  ORDRING-          FEVALAB  FEVALAB-           \
+  ORDRING  ORDRING-          FEVALAB  FEVALAB-  IARRAY1  \
   OSGROUP  MAYBE    DATAARY  PROPLOG  HOMOTOP   BYTEORD  \
-  FIELD    FIELD-   VECTCAT  VECTCAT- IARRAY1   BOOLE    \
+  FIELD    FIELD-   VECTCAT  VECTCAT- \
   PROPERTY ARITY    OPERCAT  OPERCAT- PAIR      STREAM   \
   RADCAT   RADCAT-  PDMOD    DMEXT    LZSTAGG   LZSTAGG-
 
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 7c77b8de..93881bc6 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -261,6 +261,7 @@ $(OUT)/PATMAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
 $(OUT)/REAL.$(FASLEXT): $(OUT)/KONVERT.$(FASLEXT)
 
 $(OUT)/LOGIC.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
+$(OUT)/BOOLE.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
 
 
 $(OUT)/SGROUP.$(FASLEXT) $(OUT)/SGROUP-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
@@ -328,7 +329,8 @@ axiom_algebra_layer_0 = \
   LIST     DIFFDOM  DIFFDOM- DIFFSPC  DIFFSPC- DIFFMOD  \
   LINEXP   PATMAB   REAL     CHARZ    LOGIC    LOGIC-   \
   RTVALUE  SYSPTR   PDDOM    PDDOM-   PDSPC    PDSPC-   \
-  DSEXT    DSEXT-   ORDTYPE  ORDTYPE- ORDSTRCT
+  DSEXT    DSEXT-   ORDTYPE  ORDTYPE- ORDSTRCT          \
+  BOOLE    BOOLE-
 
 axiom_algebra_layer_0_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_0))
@@ -353,7 +355,6 @@ $(OUT)/IEVALAB.$(FASLEXT) $(OUT)/IEVALAB-.$(FASLEXT): \
 $(OUT)/EVALAB.$(FASLEXT) $(OUT)/EVALAB-.$(FASLEXT): \
 	$(OUT)/IEVALAB.$(FASLEXT)
 
-$(OUT)/BOOLE.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
 $(OUT)/PROPLOG.$(FASLEXT): $(OUT)/BOOLE.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT)
 
 $(OUT)/MAYBE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT)
@@ -403,9 +404,9 @@ axiom_algebra_layer_1 = \
   GCDDOM   GCDDOM-  UFD      UFD-     ES        ES-      \
   PATAB    PPCURVE  PSCURVE  CACHSET  RESLATC   REF      \
   IDENT             BINDING  ALIST    BOOLEAN   PRIMARR  \
-  ORDRING  ORDRING-          FEVALAB  FEVALAB-           \
+  ORDRING  ORDRING-          FEVALAB  FEVALAB-  IARRAY1  \
   OSGROUP  MAYBE    DATAARY  PROPLOG  HOMOTOP   BYTEORD  \
-  FIELD    FIELD-   VECTCAT  VECTCAT- IARRAY1   BOOLE    \
+  FIELD    FIELD-   VECTCAT  VECTCAT- \
   PROPERTY ARITY    OPERCAT  OPERCAT- PAIR      STREAM   \
   RADCAT   RADCAT-  PDMOD    DMEXT    LZSTAGG   LZSTAGG-
 
diff --git a/src/algebra/boolean.spad.pamphlet b/src/algebra/boolean.spad.pamphlet
index 46897fc4..8833724a 100644
--- a/src/algebra/boolean.spad.pamphlet
+++ b/src/algebra/boolean.spad.pamphlet
@@ -22,12 +22,14 @@
 ++ Description:
 ++   This is the category of Boolean logic structures.
 BooleanLogic(): Category == Logic with
-  not: % -> %
-    ++ \spad{not x} returns the complement or negation of \spad{x}.
-  and: (%,%) -> %
-    ++ \spad{x and y} returns the conjunction of \spad{x} and \spad{y}.
-  or: (%,%) -> %
-    ++ \spad{x or y} returns the disjunction of \spad{x} and \spad{y}.
+    not: % -> %
+      ++ \spad{not x} returns the complement or negation of \spad{x}.
+    and: (%,%) -> %
+      ++ \spad{x and y} returns the conjunction of \spad{x} and \spad{y}.
+    or: (%,%) -> %
+      ++ \spad{x or y} returns the disjunction of \spad{x} and \spad{y}.
+  add
+    ~ x == not x
 @
 
 <<category PROPLOG PropositionalLogic>>=
-- 
cgit v1.2.3