From 4d2e94d7512864a3ef79698daa1b2b90b694b790 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Mon, 26 Jul 2010 02:49:04 +0000
Subject: 	* interp/g-opt.boot (optCond): Simplify newly built
 COND-expression.

---
 src/algebra/strap/DFLOAT.lsp   | 62 ++++++++++++++++++------------------------
 src/algebra/strap/POLYCAT-.lsp |  6 ++--
 2 files changed, 30 insertions(+), 38 deletions(-)

(limited to 'src/algebra/strap')

diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp
index f1bc4f5c..defb150d 100644
--- a/src/algebra/strap/DFLOAT.lsp
+++ b/src/algebra/strap/DFLOAT.lsp
@@ -810,41 +810,33 @@
                 (T 0.0)))
              ((OR (SPADCALL |r| (|getShellEntry| $ 145)) (= |x| 1.0))
               1.0)
-             (T (COND
-                  ((SPADCALL |r| (|getShellEntry| $ 147)) |x|)
-                  (T (SEQ (LETT |n|
-                                (SPADCALL |r| (|getShellEntry| $ 148))
-                                |DFLOAT;**;$F$;88|)
-                          (LETT |d|
-                                (SPADCALL |r| (|getShellEntry| $ 149))
-                                |DFLOAT;**;$F$;88|)
-                          (EXIT (COND
-                                  ((MINUSP |x|)
-                                   (COND
-                                     ((ODDP |d|)
-                                      (COND
-                                        ((ODDP |n|)
-                                         (RETURN-FROM
-                                          |DFLOAT;**;$F$;88|
-                                           (-
-                                            (|DFLOAT;**;$F$;88| (- |x|)
-                                             |r| $))))
-                                        (T
-                                         (RETURN-FROM
-                                          |DFLOAT;**;$F$;88|
-                                           (|DFLOAT;**;$F$;88| (- |x|)
-                                            |r| $)))))
-                                     (T (|error| "negative root"))))
-                                  ((EQL |d| 2)
-                                   (EXPT (|DFLOAT;sqrt;2$;33| |x| $)
-                                    |n|))
-                                  (T (|DFLOAT;**;3$;36| |x|
-                                      (/
-                                       (FLOAT |n|
-                                        |$DoubleFloatMaximum|)
-                                       (FLOAT |d|
-                                        |$DoubleFloatMaximum|))
-                                      $))))))))))))) 
+             ((SPADCALL |r| (|getShellEntry| $ 147)) |x|)
+             (T (SEQ (LETT |n| (SPADCALL |r| (|getShellEntry| $ 148))
+                           |DFLOAT;**;$F$;88|)
+                     (LETT |d| (SPADCALL |r| (|getShellEntry| $ 149))
+                           |DFLOAT;**;$F$;88|)
+                     (EXIT (COND
+                             ((MINUSP |x|)
+                              (COND
+                                ((ODDP |d|)
+                                 (COND
+                                   ((ODDP |n|)
+                                    (RETURN-FROM |DFLOAT;**;$F$;88|
+                                      (-
+                                       (|DFLOAT;**;$F$;88| (- |x|) |r|
+                                        $))))
+                                   (T
+                                    (RETURN-FROM |DFLOAT;**;$F$;88|
+                                      (|DFLOAT;**;$F$;88| (- |x|) |r|
+                                       $)))))
+                                (T (|error| "negative root"))))
+                             ((EQL |d| 2)
+                              (EXPT (|DFLOAT;sqrt;2$;33| |x| $) |n|))
+                             (T (|DFLOAT;**;3$;36| |x|
+                                    (/
+                                     (FLOAT |n| |$DoubleFloatMaximum|)
+                                     (FLOAT |d| |$DoubleFloatMaximum|))
+                                    $))))))))))) 
 
 (DEFUN |DoubleFloat| ()
   (DECLARE (SPECIAL |$ConstructorCache|))
diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp
index 13c315ef..6430677d 100644
--- a/src/algebra/strap/POLYCAT-.lsp
+++ b/src/algebra/strap/POLYCAT-.lsp
@@ -745,7 +745,7 @@
                                                            "failed")))
                                                        (T
                                                         (LET
-                                                         ((#10=#:G1612
+                                                         ((#10=#:G1610
                                                            (CDR |nd|)))
                                                           (|check-subtype|
                                                            (NOT
@@ -809,14 +809,14 @@
                      (T (SEQ (LETT |i| 0 |POLYCAT-;conditionP;MU;27|)
                              (EXIT (CONS 0
                                     (LET
-                                     ((#14=#:G1611
+                                     ((#14=#:G1612
                                        (|makeSimpleArray|
                                         (|getVMType|
                                          (|getShellEntry| $ 6))
                                         (SIZE |monslist|))))
                                       (LET
                                        ((#15=#:G1728 |monslist|)
-                                        (#16=#:G1610 0))
+                                        (#16=#:G1611 0))
                                         (LOOP
                                           (COND
                                             ((ATOM #15#) (RETURN #14#))
-- 
cgit v1.2.3