diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-05-07 23:12:57 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-05-07 23:12:57 +0000 |
| commit | fa9902f78dd3cdcd50e25f2e902508c8777a6fa9 (patch) | |
| tree | 85f34e58119c2c8cd0edfe566f6a7d40b7d8cba4 /src | |
| parent | fef8e26d6994bd131ebfb85ec4a1509acac217d9 (diff) | |
| download | open-axiom-fa9902f78dd3cdcd50e25f2e902508c8777a6fa9.tar.gz | |
* algebra/boolean.spad.pamphlet (true$Boolean): Simplify.
(=$Boolean): Likewise.
(equiv$Boolean): Likewise.
* interp/spad.lisp (|BooleanEquality|): Remove.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/algebra/boolean.spad.pamphlet | 18 | ||||
| -rw-r--r-- | src/interp/spad.lisp | 2 |
3 files changed, 17 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b5af683b..2c05c573 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2008-05-07 Bill Page <bill.page@newsynthesis.org> + Gabriel Dos Reis <gdr@cs.tamu.edu> + + * algebra/boolean.spad.pamphlet (true$Boolean): Simplify. + (=$Boolean): Likewise. + (equiv$Boolean): Likewise. + * interp/spad.lisp (|BooleanEquality|): Remove. + 2008-05-07 Gabriel Dos Reis <gdr@cs.tamu.edu> * algebra/boolean.spad.pamphlet (Boolean): Don't pretend to diff --git a/src/algebra/boolean.spad.pamphlet b/src/algebra/boolean.spad.pamphlet index c3781e73..538ff622 100644 --- a/src/algebra/boolean.spad.pamphlet +++ b/src/algebra/boolean.spad.pamphlet @@ -488,7 +488,7 @@ Boolean(): Join(OrderedSet, Finite, Logic, PropositionalLogic, ConvertibleTo Inp test a == a nt b == (b => false; true) - true == EQ(2,2)$Lisp --well, 1 is rather special + true == 'T false == NIL$Lisp sample() == true not b == (b => false; true) @@ -501,10 +501,10 @@ Boolean(): Join(OrderedSet, Finite, Logic, PropositionalLogic, ConvertibleTo Inp xor(a, b) == (a => nt b; b) nor(a, b) == (a => false; nt b) nand(a, b) == (a => nt b; true) - a = b == BooleanEquality(a, b)$Lisp + a = b == EQ(a, b)$Lisp implies(a, b) == (a => b; true) - equiv(a,b) == BooleanEquality(a, b)$Lisp - a < b == (b => not a; false) + equiv(a,b) == EQ(a, b)$Lisp + a < b == (b => nt a; false) size() == 2 index i == @@ -577,18 +577,18 @@ This is eventually forcibly replaced by a recompiled version. (DEFUN |BOOLEAN;nand;3$;14| (|a| |b| $) (COND (|a| (|BOOLEAN;nt| |b| $)) ('T 'T))) -(PUT '|BOOLEAN;=;2$B;15| '|SPADreplace| '|BooleanEquality|) +(PUT '|BOOLEAN;=;2$B;15| '|SPADreplace| 'EQ) -(DEFUN |BOOLEAN;=;2$B;15| (|a| |b| $) (|BooleanEquality| |a| |b|)) +(DEFUN |BOOLEAN;=;2$B;15| (|a| |b| $) (EQ |a| |b|)) (DEFUN |BOOLEAN;implies;3$;16| (|a| |b| $) (COND (|a| |b|) ('T 'T))) -(PUT '|BOOLEAN;equiv;3$;17| '|SPADreplace| '|BooleanEquality|) +(PUT '|BOOLEAN;equiv;3$;17| '|SPADreplace| 'EQ) -(DEFUN |BOOLEAN;equiv;3$;17| (|a| |b| $) (|BooleanEquality| |a| |b|)) +(DEFUN |BOOLEAN;equiv;3$;17| (|a| |b| $) (EQ |a| |b|)) (DEFUN |BOOLEAN;<;2$B;18| (|a| |b| $) - (COND (|b| (SPADCALL |a| (|getShellEntry| $ 9))) ('T 'NIL))) + (COND (|b| (|BOOLEAN;nt| |a| $)) ('T 'NIL))) (PUT '|BOOLEAN;size;Nni;19| '|SPADreplace| '(XLAM NIL 2)) diff --git a/src/interp/spad.lisp b/src/interp/spad.lisp index 0ac5ef98..ffc41c90 100644 --- a/src/interp/spad.lisp +++ b/src/interp/spad.lisp @@ -289,8 +289,6 @@ (defun \,difference (x y) (- x y)) (defun \,max (x y) (max x y)) (defun \,min (x y) (min x y)) -;; This is used in the domain Boolean (BOOLEAN.NRLIB/code.lsp) -(defun |BooleanEquality| (x y) (if x y (null y))) (defun S-PROCESS (X) (let ((|$Index| 0) |