diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-07-25 00:12:57 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-07-25 00:12:57 +0000 |
| commit | f5181e8acaf34cb5a26a30bd3901a19485933c6d (patch) | |
| tree | e30eb7600dbe651222f96e3d977e052285475227 /src/algebra/strap/BOOLEAN.lsp | |
| parent | c19e54f03e3230811e6c86998568ce63ccbc42c9 (diff) | |
| download | open-axiom-f5181e8acaf34cb5a26a30bd3901a19485933c6d.tar.gz | |
* interp/cattable.boot: Use %true for truth value in VM expressions.
* interp/clam.boot: Likewise.
* interp/define.boot: Likewise.
* interp/format.boot: Likewise.
* interp/functor.boot: Likewise.
* interp/g-opt.boot: Likewise.
* interp/mark.boot: Likewise.
* interp/pspad1.boot: Likewise.
* interp/pspad2.boot: Likewise.
* interp/slam.boot: Likewise.
* interp/wi1.boot: Likewise.
* interp/wi2.boot: Likewise.
* interp/sys-constants.boot: Remove $true and $false as unused.
Diffstat (limited to 'src/algebra/strap/BOOLEAN.lsp')
| -rw-r--r-- | src/algebra/strap/BOOLEAN.lsp | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp index 32d29e58..df73f473 100644 --- a/src/algebra/strap/BOOLEAN.lsp +++ b/src/algebra/strap/BOOLEAN.lsp @@ -114,41 +114,39 @@ (DECLARE (IGNORE $)) (OR |a| |b|)) -(DEFUN |BOOLEAN;xor;3$;10| (|a| |b| $) - (COND (|a| (NOT |b|)) ('T |b|))) +(DEFUN |BOOLEAN;xor;3$;10| (|a| |b| $) (COND (|a| (NOT |b|)) (T |b|))) -(DEFUN |BOOLEAN;nor;3$;11| (|a| |b| $) - (COND (|a| NIL) ('T (NOT |b|)))) +(DEFUN |BOOLEAN;nor;3$;11| (|a| |b| $) (COND (|a| NIL) (T (NOT |b|)))) -(DEFUN |BOOLEAN;nand;3$;12| (|a| |b| $) (COND (|a| (NOT |b|)) ('T T))) +(DEFUN |BOOLEAN;nand;3$;12| (|a| |b| $) (COND (|a| (NOT |b|)) (T T))) (DEFUN |BOOLEAN;=;3$;13| (|a| |b| $) (DECLARE (IGNORE $)) (EQ |a| |b|)) -(DEFUN |BOOLEAN;implies;3$;14| (|a| |b| $) (COND (|a| |b|) ('T T))) +(DEFUN |BOOLEAN;implies;3$;14| (|a| |b| $) (COND (|a| |b|) (T T))) (DEFUN |BOOLEAN;equiv;3$;15| (|a| |b| $) (DECLARE (IGNORE $)) (EQ |a| |b|)) -(DEFUN |BOOLEAN;<;3$;16| (|a| |b| $) (COND (|b| (NOT |a|)) ('T NIL))) +(DEFUN |BOOLEAN;<;3$;16| (|a| |b| $) (COND (|b| (NOT |a|)) (T NIL))) (DEFUN |BOOLEAN;size;Nni;17| ($) (DECLARE (IGNORE $)) 2) (DEFUN |BOOLEAN;index;Pi$;18| (|i| $) - (COND ((SPADCALL |i| (|getShellEntry| $ 26)) NIL) ('T T))) + (COND ((SPADCALL |i| (|getShellEntry| $ 26)) NIL) (T T))) -(DEFUN |BOOLEAN;lookup;$Pi;19| (|a| $) (COND (|a| 1) ('T 2))) +(DEFUN |BOOLEAN;lookup;$Pi;19| (|a| $) (COND (|a| 1) (T 2))) (DEFUN |BOOLEAN;random;$;20| ($) - (COND ((SPADCALL (|random|) (|getShellEntry| $ 26)) NIL) ('T T))) + (COND ((SPADCALL (|random|) (|getShellEntry| $ 26)) NIL) (T T))) (DEFUN |BOOLEAN;convert;$If;21| (|x| $) - (COND (|x| '|true|) ('T '|false|))) + (COND (|x| '|true|) (T '|false|))) (DEFUN |BOOLEAN;coerce;$Of;22| (|x| $) - (COND (|x| '|true|) ('T '|false|))) + (COND (|x| '|true|) (T '|false|))) (DEFUN |Boolean| () (DECLARE (SPECIAL |$ConstructorCache|)) @@ -157,12 +155,11 @@ (COND ((SETQ #0# (HGET |$ConstructorCache| '|Boolean|)) (|CDRwithIncrement| (CDAR #0#))) - ('T - (UNWIND-PROTECT - (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Boolean| - (LIST (CONS NIL (CONS 1 (|Boolean;|)))))) - (SETQ #0# T)) - (COND ((NOT #0#) (HREM |$ConstructorCache| '|Boolean|))))))))) + (T (UNWIND-PROTECT + (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Boolean| + (LIST (CONS NIL (CONS 1 (|Boolean;|)))))) + (SETQ #0# T)) + (COND ((NOT #0#) (HREM |$ConstructorCache| '|Boolean|))))))))) (DEFUN |Boolean;| () (LET ((|dv$| (LIST '|Boolean|)) ($ (|newShell| 39)) |