aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/strap/HOAGG-.lsp
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2011-02-27 00:57:26 +0000
committerdos-reis <gdr@axiomatics.org>2011-02-27 00:57:26 +0000
commite8ca9eab6dee408a68683147e9df2f0c81c4354e (patch)
treeff2edb143d41d09c3a5d57ac5485c3039368dea0 /src/algebra/strap/HOAGG-.lsp
parentdf02d2410007b60d0ee057da174552847c0005f0 (diff)
downloadopen-axiom-e8ca9eab6dee408a68683147e9df2f0c81c4354e.tar.gz
* interp/g-opt.boot (optCond): Recognize conjunction and
disjunction forms.
Diffstat (limited to 'src/algebra/strap/HOAGG-.lsp')
-rw-r--r--src/algebra/strap/HOAGG-.lsp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/algebra/strap/HOAGG-.lsp b/src/algebra/strap/HOAGG-.lsp
index e4089147..e501fcf8 100644
--- a/src/algebra/strap/HOAGG-.lsp
+++ b/src/algebra/strap/HOAGG-.lsp
@@ -48,7 +48,7 @@
(#2=#:G1403 (SPADCALL |c| (|shellEntry| $ 15))))
(LOOP
(COND
- ((ATOM #2#) (RETURN (COND (#1# NIL) (T #0#))))
+ ((ATOM #2#) (RETURN (AND (NOT #1#) #0#)))
(T (LET ((|x| (CAR #2#)))
(LET ((#3=#:G1379 (SPADCALL |x| |f|)))
(COND (#1# (SETQ #0# #3#)) (T (SETQ #0# (OR #0# #3#))))
@@ -60,7 +60,7 @@
(#2=#:G1404 (SPADCALL |c| (|shellEntry| $ 15))))
(LOOP
(COND
- ((ATOM #2#) (RETURN (COND (#1# T) (T #0#))))
+ ((ATOM #2#) (RETURN (OR #1# #0#)))
(T (LET ((|x| (CAR #2#)))
(LET ((#3=#:G1384 (SPADCALL |x| |f|)))
(COND
@@ -95,8 +95,7 @@
(#3=#:G1407 (SPADCALL |y| (|shellEntry| $ 15))))
(LOOP
(COND
- ((OR (ATOM #2#) (ATOM #3#))
- (RETURN (COND (#1# T) (T #0#))))
+ ((OR (ATOM #2#) (ATOM #3#)) (RETURN (OR #1# #0#)))
(T (LET ((|a| (CAR #2#)) (|b| (CAR #3#)))
(LET ((#4=#:G1393
(SPADCALL |a| |b| (|shellEntry| $ 34))))