diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-02-27 00:57:26 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-02-27 00:57:26 +0000 |
| commit | e8ca9eab6dee408a68683147e9df2f0c81c4354e (patch) | |
| tree | ff2edb143d41d09c3a5d57ac5485c3039368dea0 /src/algebra/strap/INTDOM-.lsp | |
| parent | df02d2410007b60d0ee057da174552847c0005f0 (diff) | |
| download | open-axiom-e8ca9eab6dee408a68683147e9df2f0c81c4354e.tar.gz | |
* interp/g-opt.boot (optCond): Recognize conjunction and
disjunction forms.
Diffstat (limited to 'src/algebra/strap/INTDOM-.lsp')
| -rw-r--r-- | src/algebra/strap/INTDOM-.lsp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/algebra/strap/INTDOM-.lsp b/src/algebra/strap/INTDOM-.lsp index b2cee617..ccb1ee57 100644 --- a/src/algebra/strap/INTDOM-.lsp +++ b/src/algebra/strap/INTDOM-.lsp @@ -41,10 +41,11 @@ (COND ((SPADCALL |x| (|shellEntry| $ 13)) (SPADCALL |y| (|shellEntry| $ 13))) - ((OR (SPADCALL |y| (|shellEntry| $ 13)) - (EQL (CAR (SPADCALL |x| |y| (|shellEntry| $ 15))) 1)) - NIL) - (T (NOT (EQL (CAR (SPADCALL |y| |x| (|shellEntry| $ 15))) 1))))) + (T (AND (NOT (SPADCALL |y| (|shellEntry| $ 13))) + (AND (NOT (EQL (CAR (SPADCALL |x| |y| (|shellEntry| $ 15))) + 1)) + (NOT (EQL (CAR (SPADCALL |y| |x| (|shellEntry| $ 15))) + 1))))))) (DEFUN |IntegralDomain&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) |