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/URAGG-.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/URAGG-.lsp')
| -rw-r--r-- | src/algebra/strap/URAGG-.lsp | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/src/algebra/strap/URAGG-.lsp b/src/algebra/strap/URAGG-.lsp index b1961279..acdd9c4a 100644 --- a/src/algebra/strap/URAGG-.lsp +++ b/src/algebra/strap/URAGG-.lsp @@ -163,10 +163,8 @@ (LET ((|i| |n|)) (SEQ (LOOP (COND - ((NOT (COND - ((PLUSP |i|) - (NOT (SPADCALL |l| (|shellEntry| $ 20)))) - (T NIL))) + ((NOT (AND (PLUSP |i|) + (NOT (SPADCALL |l| (|shellEntry| $ 20))))) (RETURN NIL)) (T (SEQ (SETQ |l| (SPADCALL |l| (|shellEntry| $ 14))) (EXIT (SETQ |i| (- |i| 1))))))) @@ -176,16 +174,13 @@ (LET ((|i| |n|)) (SEQ (LOOP (COND - ((NOT (COND - ((PLUSP |i|) - (NOT (SPADCALL |l| (|shellEntry| $ 20)))) - (T NIL))) + ((NOT (AND (PLUSP |i|) + (NOT (SPADCALL |l| (|shellEntry| $ 20))))) (RETURN NIL)) (T (SEQ (SETQ |l| (SPADCALL |l| (|shellEntry| $ 14))) (EXIT (SETQ |i| (- |i| 1))))))) - (EXIT (COND - ((ZEROP |i|) (NOT (SPADCALL |l| (|shellEntry| $ 20)))) - (T NIL)))))) + (EXIT (AND (ZEROP |i|) + (NOT (SPADCALL |l| (|shellEntry| $ 20)))))))) (DEFUN |URAGG-;size?;ANniB;14| (|l| |n| $) (LET ((|i| |n|)) @@ -197,9 +192,7 @@ (RETURN NIL)) (T (SEQ (SETQ |l| (SPADCALL |l| (|shellEntry| $ 14))) (EXIT (SETQ |i| (- |i| 1))))))) - (EXIT (COND - ((SPADCALL |l| (|shellEntry| $ 20)) (ZEROP |i|)) - (T NIL)))))) + (EXIT (AND (SPADCALL |l| (|shellEntry| $ 20)) (ZEROP |i|)))))) (DEFUN |URAGG-;#;ANni;15| (|x| $) (LET ((|k| 0)) @@ -377,10 +370,8 @@ (SPADCALL |y| (|shellEntry| $ 14))))))))) (SETQ |k| (+ |k| 1)))) - (EXIT (COND - ((SPADCALL |x| (|shellEntry| $ 20)) - (SPADCALL |y| (|shellEntry| $ 20))) - (T NIL))))))) + (EXIT (AND (SPADCALL |x| (|shellEntry| $ 20)) + (SPADCALL |y| (|shellEntry| $ 20)))))))) (DEFUN |URAGG-;node?;2AB;24| (|u| |v| $) (SEQ (LET ((|k| 0)) |