aboutsummaryrefslogtreecommitdiff
path: root/src/algebra
diff options
context:
space:
mode:
Diffstat (limited to 'src/algebra')
-rw-r--r--src/algebra/Makefile.in2
-rw-r--r--src/algebra/Makefile.pamphlet2
-rw-r--r--src/algebra/boolean.spad.pamphlet4
-rw-r--r--src/algebra/strap/BOOLEAN.lsp9
-rw-r--r--src/algebra/strap/SINT.lsp14
5 files changed, 15 insertions, 16 deletions
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 91888d90..3f5f1f82 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -394,7 +394,7 @@ $(OUT)/IEVALAB.$(FASLEXT) $(OUT)/IEVALAB-.$(FASLEXT): \
$(OUT)/EVALAB.$(FASLEXT) $(OUT)/EVALAB-.$(FASLEXT): \
$(OUT)/IEVALAB.$(FASLEXT)
-$(OUT)/BOOLE.$(FASLEXT): $(OUT)/TYPE.$(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)
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 07f77df8..7c77b8de 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -353,7 +353,7 @@ $(OUT)/IEVALAB.$(FASLEXT) $(OUT)/IEVALAB-.$(FASLEXT): \
$(OUT)/EVALAB.$(FASLEXT) $(OUT)/EVALAB-.$(FASLEXT): \
$(OUT)/IEVALAB.$(FASLEXT)
-$(OUT)/BOOLE.$(FASLEXT): $(OUT)/TYPE.$(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)
diff --git a/src/algebra/boolean.spad.pamphlet b/src/algebra/boolean.spad.pamphlet
index 888ae786..46897fc4 100644
--- a/src/algebra/boolean.spad.pamphlet
+++ b/src/algebra/boolean.spad.pamphlet
@@ -21,7 +21,7 @@
++ Date Last Modified: April 04, 2010
++ Description:
++ This is the category of Boolean logic structures.
-BooleanLogic(): Category == Type with
+BooleanLogic(): Category == Logic with
not: % -> %
++ \spad{not x} returns the complement or negation of \spad{x}.
and: (%,%) -> %
@@ -461,7 +461,7 @@ Logic: Category == Type with
++ Description: \spadtype{Boolean} is the elementary logic with 2 values:
++ true and false
-Boolean(): Join(OrderedFinite, Logic, PropositionalLogic, ConvertibleTo InputForm) with
+Boolean(): Join(OrderedFinite, PropositionalLogic, ConvertibleTo InputForm) with
xor : (%, %) -> %
++ xor(a,b) returns the logical exclusive {\em or}
++ of Boolean \spad{a} and b.
diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp
index 30c0079c..370802b3 100644
--- a/src/algebra/strap/BOOLEAN.lsp
+++ b/src/algebra/strap/BOOLEAN.lsp
@@ -197,12 +197,13 @@
172 < 178 |/\\| 184)
'NIL
(CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0))
- (CONS '#(NIL NIL NIL NIL |SetCategory&| |OrderedType&|
- NIL |Logic&| |BasicType&| NIL NIL NIL)
+ (CONS '#(NIL NIL NIL NIL NIL |SetCategory&|
+ |OrderedType&| |Logic&| |BasicType&| NIL NIL
+ NIL)
(CONS '#((|OrderedFinite|) (|OrderedSet|)
(|PropositionalLogic|) (|Finite|)
- (|SetCategory|) (|OrderedType|)
- (|BooleanLogic|) (|Logic|) (|BasicType|)
+ (|BooleanLogic|) (|SetCategory|)
+ (|OrderedType|) (|Logic|) (|BasicType|)
(|ConvertibleTo| 33) (|Type|)
(|CoercibleTo| 35))
(|makeByteWordVec2| 38
diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp
index fa11e006..e6b37647 100644
--- a/src/algebra/strap/SINT.lsp
+++ b/src/algebra/strap/SINT.lsp
@@ -627,12 +627,11 @@
|Ring&| NIL NIL NIL NIL NIL NIL
|AbelianGroup&| NIL NIL NIL NIL NIL
|AbelianMonoid&| |Monoid&| NIL NIL NIL NIL NIL
- NIL |AbelianSemiGroup&| |SemiGroup&| NIL
+ NIL |AbelianSemiGroup&| |SemiGroup&| NIL NIL
|DifferentialSpace&| |OrderedType&|
- |SetCategory&| |Logic&| NIL NIL
- |RetractableTo&| |DifferentialDomain&|
- |BasicType&| NIL NIL NIL NIL NIL NIL NIL NIL
- NIL NIL NIL)
+ |SetCategory&| |Logic&| NIL |RetractableTo&|
+ |DifferentialDomain&| |BasicType&| NIL NIL NIL
+ NIL NIL NIL NIL NIL NIL NIL NIL)
(CONS '#((|IntegerNumberSystem|)
(|EuclideanDomain|)
(|UniqueFactorizationDomain|)
@@ -660,11 +659,10 @@
(|LeftLinearSet| $$)
(|RightLinearSet| $$)
(|AbelianSemiGroup|) (|SemiGroup|)
- (|LeftLinearSet| 5)
+ (|LeftLinearSet| 5) (|BooleanLogic|)
(|DifferentialSpace|) (|OrderedType|)
(|SetCategory|) (|Logic|)
- (|BooleanLogic|) (|RealConstant|)
- (|RetractableTo| 5)
+ (|RealConstant|) (|RetractableTo| 5)
(|DifferentialDomain| $$) (|BasicType|)
(|OpenMath|) (|ConvertibleTo| 100)
(|ConvertibleTo| 101)