From 6c0cc18deacadb592fe3d68c5585979f6902cd1a Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Mon, 3 May 2010 20:51:40 +0000
Subject: 	Generate more readable code for functor definitions. 	*
 interp/nruncomp.boot (washFunctorBody): New. 	(buildFunctor): Use it. 
 * interp/g-opt.boot (optBind): New. 	(optLIST): Likewise.

---
 src/algebra/strap/LSAGG-.lsp | 58 ++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

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

diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp
index 52e52069..1e19097f 100644
--- a/src/algebra/strap/LSAGG-.lsp
+++ b/src/algebra/strap/LSAGG-.lsp
@@ -828,38 +828,32 @@
            #0# (EXIT #0#))))) 
 
 (DEFUN |ListAggregate&| (|#1| |#2|)
-  (PROG (|dv$1| |dv$2| |dv$| $ |pv$|)
-    (RETURN
-      (PROGN
-        (LETT |dv$1| (|devaluate| |#1|) . #0=(|ListAggregate&|))
-        (LETT |dv$2| (|devaluate| |#2|) . #0#)
-        (LETT |dv$| (LIST '|ListAggregate&| |dv$1| |dv$2|) . #0#)
-        (LETT $ (|newShell| 80) . #0#)
-        (|setShellEntry| $ 0 |dv$|)
-        (|setShellEntry| $ 3
-            (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
-        (|stuffDomainSlots| $)
-        (|setShellEntry| $ 6 |#1|)
-        (|setShellEntry| $ 7 |#2|)
-        (COND
-          ((|HasCategory| |#2| '(|SetCategory|))
-           (|setShellEntry| $ 64
-               (CONS (|dispatchFunction| |LSAGG-;reduce;MA3S;17|) $))))
-        (COND
-          ((|HasCategory| |#2| '(|SetCategory|))
-           (PROGN
-             (|setShellEntry| $ 73
-                 (CONS (|dispatchFunction| |LSAGG-;position;SA2I;23|)
-                       $))
-             (|setShellEntry| $ 76
-                 (CONS (|dispatchFunction|
-                           |LSAGG-;removeDuplicates!;2A;24|)
-                       $)))))
-        (COND
-          ((|HasCategory| |#2| '(|OrderedSet|))
-           (|setShellEntry| $ 78
-               (CONS (|dispatchFunction| |LSAGG-;<;2AB;25|) $))))
-        $)))) 
+  (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|))
+         (|dv$| (LIST '|ListAggregate&| |dv$1| |dv$2|))
+         ($ (|newShell| 80)) (|pv$| (|buildPredVector| 0 0 NIL)))
+    (|setShellEntry| $ 0 |dv$|)
+    (|setShellEntry| $ 3 |pv$|)
+    (|stuffDomainSlots| $)
+    (|setShellEntry| $ 6 |#1|)
+    (|setShellEntry| $ 7 |#2|)
+    (COND
+      ((|HasCategory| |#2| '(|SetCategory|))
+       (|setShellEntry| $ 64
+           (CONS (|dispatchFunction| |LSAGG-;reduce;MA3S;17|) $))))
+    (COND
+      ((|HasCategory| |#2| '(|SetCategory|))
+       (PROGN
+         (|setShellEntry| $ 73
+             (CONS (|dispatchFunction| |LSAGG-;position;SA2I;23|) $))
+         (|setShellEntry| $ 76
+             (CONS (|dispatchFunction|
+                       |LSAGG-;removeDuplicates!;2A;24|)
+                   $)))))
+    (COND
+      ((|HasCategory| |#2| '(|OrderedSet|))
+       (|setShellEntry| $ 78
+           (CONS (|dispatchFunction| |LSAGG-;<;2AB;25|) $))))
+    $)) 
 
 (MAKEPROP '|ListAggregate&| '|infovec|
     (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|)
-- 
cgit v1.2.3