diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-02-04 01:47:51 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-02-04 01:47:51 +0000 |
| commit | 65045e7285ed629a68ae63529fae61bbcf7bf890 (patch) | |
| tree | 736b7f67327b4a92953eb074d9965b5f9673a65a /src/algebra/boolean.spad.pamphlet | |
| parent | c0ab2c253aed35314d7cab2d68165268840dcb83 (diff) | |
| download | open-axiom-65045e7285ed629a68ae63529fae61bbcf7bf890.tar.gz | |
* algebra/boolean.spad.pamphlet (Boolean): Tidy.
Diffstat (limited to 'src/algebra/boolean.spad.pamphlet')
| -rw-r--r-- | src/algebra/boolean.spad.pamphlet | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/algebra/boolean.spad.pamphlet b/src/algebra/boolean.spad.pamphlet index 75b5b325..b4ecb100 100644 --- a/src/algebra/boolean.spad.pamphlet +++ b/src/algebra/boolean.spad.pamphlet @@ -375,20 +375,18 @@ Boolean(): Join(OrderedFinite, Logic, PropositionalLogic, ConvertibleTo InputFor test: % -> % ++ test(b) returns b and is provided for compatibility with the new compiler. == add - nt: % -> % - test a == a - nt b == (b => false; true) + nt(a: %): % == NOT(a)$Lisp true == 'T pretend % false == NIL$Lisp sample() == true - not b == NOT(b)$Lisp + not b == nt b _~ b == (b => false; true) _and(a, b) == AND(a,b)$Lisp - _/_\(a, b) == (a => b; false) + _/_\(a, b) == AND(a,b)$Lisp _or(a, b) == OR(a,b)$Lisp - _\_/(a, b) == (a => true; b) + _\_/(a, b) == OR(a,b)$Lisp xor(a, b) == (a => nt b; b) nor(a, b) == (a => false; nt b) nand(a, b) == (a => nt b; true) @@ -409,12 +407,14 @@ Boolean(): Join(OrderedFinite, Logic, PropositionalLogic, ConvertibleTo InputFor true convert(x:%):InputForm == - x => convert("true"::Symbol) - convert("false"::Symbol) + convert + x => 'true + 'false coerce(x:%):OutputForm == - x => message "true" - message "false" + outputForm + x => 'true + 'false @ |