diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-02-24 04:40:09 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-02-24 04:40:09 +0000 |
| commit | f2d31d8bc90b46e0c3373d2980cfa6f730148d1e (patch) | |
| tree | 986da80f585f5b6d221c61f54413ccf4c63d628f /src/algebra/strap/LSAGG-.lsp | |
| parent | 7eca3ee736c49024a85ad00ff9b0a912d640380c (diff) | |
| download | open-axiom-f2d31d8bc90b46e0c3373d2980cfa6f730148d1e.tar.gz | |
* interp/c-util.boot (isSimple): Accept constructor instantiations.
* algebra/formula.spad.pamphlet: Avoid Lispisms.
* algebra/mathml.spad.pamphlet: Likewise.
* algebra/op.spad.pamphlet: Likewise.
* algebra/sex.spad.pamphlet: Likewise.
Diffstat (limited to 'src/algebra/strap/LSAGG-.lsp')
| -rw-r--r-- | src/algebra/strap/LSAGG-.lsp | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp index 0fdf21f2..f7e85f4c 100644 --- a/src/algebra/strap/LSAGG-.lsp +++ b/src/algebra/strap/LSAGG-.lsp @@ -384,13 +384,12 @@ (PROG (|l| |q|) (RETURN (SEQ (COND - ((EQL |n| 2) - (COND - ((SPADCALL - (SPADCALL (SPADCALL |p| (|getShellEntry| $ 17)) - (|getShellEntry| $ 18)) - (SPADCALL |p| (|getShellEntry| $ 18)) |f|) - (SETQ |p| (SPADCALL |p| (|getShellEntry| $ 55))))))) + ((AND (EQL |n| 2) + (SPADCALL + (SPADCALL (SPADCALL |p| (|getShellEntry| $ 17)) + (|getShellEntry| $ 18)) + (SPADCALL |p| (|getShellEntry| $ 18)) |f|)) + (SETQ |p| (SPADCALL |p| (|getShellEntry| $ 55))))) (EXIT (COND ((< |n| 3) |p|) (T (SEQ (LETT |l| @@ -523,18 +522,18 @@ (COND ((NOT (NOT (SPADCALL |x| (|getShellEntry| $ 16)))) (RETURN NIL)) - (T (SEQ (COND - ((EQL |k| 1000) - (COND - ((SPADCALL |x| (|getShellEntry| $ 67)) - (EXIT (|error| "cyclic list")))))) - (SETQ |y| - (SPADCALL - (SPADCALL |x| (|getShellEntry| $ 18)) - |y| (|getShellEntry| $ 14))) - (EXIT (SETQ |x| - (SPADCALL |x| - (|getShellEntry| $ 17))))))) + (T (COND + ((AND (EQL |k| 1000) + (SPADCALL |x| (|getShellEntry| $ 67))) + (|error| "cyclic list")) + (T (SEQ (SETQ |y| + (SPADCALL + (SPADCALL |x| + (|getShellEntry| $ 18)) + |y| (|getShellEntry| $ 14))) + (EXIT (SETQ |x| + (SPADCALL |x| + (|getShellEntry| $ 17))))))))) (SETQ |k| (+ |k| 1)))) (EXIT (SPADCALL |y| (|getShellEntry| $ 55)))))) |