From f2d31d8bc90b46e0c3373d2980cfa6f730148d1e Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Thu, 24 Feb 2011 04:40:09 +0000
Subject: 	* 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.

---
 src/algebra/strap/LSAGG-.lsp | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'src/algebra/strap/LSAGG-.lsp')

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)))))) 
 
-- 
cgit v1.2.3