diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-02-26 22:32:20 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-02-26 22:32:20 +0000 |
| commit | df02d2410007b60d0ee057da174552847c0005f0 (patch) | |
| tree | 4c3b60abff83bfae3bc9e209f081688493e2dafc /src/algebra/strap/HOAGG-.lsp | |
| parent | e8a84fdadd3c571f757a204f019e102d038ba277 (diff) | |
| download | open-axiom-df02d2410007b60d0ee057da174552847c0005f0.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-.lsp | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/algebra/strap/HOAGG-.lsp b/src/algebra/strap/HOAGG-.lsp index 7e964eea..e4089147 100644 --- a/src/algebra/strap/HOAGG-.lsp +++ b/src/algebra/strap/HOAGG-.lsp @@ -88,25 +88,24 @@ (SPADCALL |x| (|shellEntry| $ 15))) (DEFUN |HOAGG-;=;2AB;7| (|x| |y| $) - (COND - ((SPADCALL |x| (SPADCALL |y| (|shellEntry| $ 32)) - (|shellEntry| $ 33)) - (LET ((#0=#:G1394 NIL) (#1=#:G1395 T) - (#2=#:G1406 (SPADCALL |x| (|shellEntry| $ 15))) - (#3=#:G1407 (SPADCALL |y| (|shellEntry| $ 15)))) - (LOOP - (COND - ((OR (ATOM #2#) (ATOM #3#)) (RETURN (COND (#1# T) (T #0#)))) - (T (LET ((|a| (CAR #2#)) (|b| (CAR #3#))) - (LET ((#4=#:G1393 (SPADCALL |a| |b| - (|shellEntry| $ 34)))) - (COND - (#1# (SETQ #0# #4#)) - (T (SETQ #0# (AND #0# #4#)))) - (SETQ #1# NIL))))) - (SETQ #2# (CDR #2#)) - (SETQ #3# (CDR #3#))))) - (T NIL))) + (AND (SPADCALL |x| (SPADCALL |y| (|shellEntry| $ 32)) + (|shellEntry| $ 33)) + (LET ((#0=#:G1394 NIL) (#1=#:G1395 T) + (#2=#:G1406 (SPADCALL |x| (|shellEntry| $ 15))) + (#3=#:G1407 (SPADCALL |y| (|shellEntry| $ 15)))) + (LOOP + (COND + ((OR (ATOM #2#) (ATOM #3#)) + (RETURN (COND (#1# T) (T #0#)))) + (T (LET ((|a| (CAR #2#)) (|b| (CAR #3#))) + (LET ((#4=#:G1393 + (SPADCALL |a| |b| (|shellEntry| $ 34)))) + (COND + (#1# (SETQ #0# #4#)) + (T (SETQ #0# (AND #0# #4#)))) + (SETQ #1# NIL))))) + (SETQ #2# (CDR #2#)) + (SETQ #3# (CDR #3#)))))) (DEFUN |HOAGG-;count;SANni;8| (|s| |x| $) (SPADCALL (CONS #'|HOAGG-;count;SANni;8!0| (VECTOR $ |s|)) |x| |