From 5768bef1b2b7cd3fd38733a26a33ec2f0d8e6c01 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Wed, 5 May 2010 01:23:36 +0000
Subject: 	* interp/c-util.boot (backendCompileSPADSLAM): Generate more 
 readable Lisp code.

---
 src/algebra/strap/ALAGG.lsp | 61 +++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 33 deletions(-)

(limited to 'src/algebra/strap/ALAGG.lsp')

diff --git a/src/algebra/strap/ALAGG.lsp b/src/algebra/strap/ALAGG.lsp
index 79a6854d..330c0726 100644
--- a/src/algebra/strap/ALAGG.lsp
+++ b/src/algebra/strap/ALAGG.lsp
@@ -6,23 +6,19 @@
 (DEFPARAMETER |AssociationListAggregate;AL| 'NIL) 
 
 (DEFUN |AssociationListAggregate;| (|t#1| |t#2|)
-  (PROG (#0=#:G1398)
-    (RETURN
-      (PROG1 (LETT #0#
-                   (|sublisV|
-                       (PAIR '(|t#1| |t#2|)
-                             (LIST (|devaluate| |t#1|)
-                                   (|devaluate| |t#2|)))
-                       (|sublisV|
-                           (PAIR '(#1=#:G1397)
-                                 (LIST '(|Record| (|:| |key| |t#1|)
-                                         (|:| |entry| |t#2|))))
-                           (COND
-                             (|AssociationListAggregate;CAT|)
-                             ('T
-                              (LETT |AssociationListAggregate;CAT|
-                                    (|Join|
-                                     (|TableAggregate| '|t#1| '|t#2|)
+  (LET ((#0=#:G1398
+            (|sublisV|
+                (PAIR '(|t#1| |t#2|)
+                      (LIST (|devaluate| |t#1|) (|devaluate| |t#2|)))
+                (|sublisV|
+                    (PAIR '(#1=#:G1397)
+                          (LIST '(|Record| (|:| |key| |t#1|)
+                                     (|:| |entry| |t#2|))))
+                    (COND
+                      (|AssociationListAggregate;CAT|)
+                      ('T
+                       (LETT |AssociationListAggregate;CAT|
+                             (|Join| (|TableAggregate| '|t#1| '|t#2|)
                                      (|ListAggregate| '#1#)
                                      (|mkCategory| '|domain|
                                       '(((|assoc|
@@ -33,23 +29,22 @@
                                            |t#1| $))
                                          T))
                                       NIL 'NIL NIL))
-                                    . #2=(|AssociationListAggregate|)))))) . #2#)
-        (|setShellEntry| #0# 0
-            (LIST '|AssociationListAggregate| (|devaluate| |t#1|)
-                  (|devaluate| |t#2|))))))) 
+                             |AssociationListAggregate|)))))))
+    (|setShellEntry| #0# 0
+        (LIST '|AssociationListAggregate| (|devaluate| |t#1|)
+              (|devaluate| |t#2|)))
+    #0#)) 
 
 (DEFUN |AssociationListAggregate| (&REST #0=#:G1401 &AUX #1=#:G1399)
   (DSETQ #1# #0#)
-  (LET (#2=#:G1400)
+  (LET ((#2=#:G1400
+            (|assoc| (|devaluateList| #1#)
+                     |AssociationListAggregate;AL|)))
     (COND
-      ((SETQ #2#
-             (|assoc| (|devaluateList| #1#)
-                      |AssociationListAggregate;AL|))
-       (CDR #2#))
-      (T (SETQ |AssociationListAggregate;AL|
-               (|cons5| (CONS (|devaluateList| #1#)
-                              (SETQ #2#
-                                    (APPLY
-                                     #'|AssociationListAggregate;| #1#)))
-                        |AssociationListAggregate;AL|))
-         #2#)))) 
+      (#2# (CDR #2#))
+      (T (PROGN
+           (SETQ #2# (APPLY #'|AssociationListAggregate;| #1#))
+           (SETQ |AssociationListAggregate;AL|
+                 (|cons5| (CONS (|devaluateList| #1#) #2#)
+                          |AssociationListAggregate;AL|))
+           #2#))))) 
-- 
cgit v1.2.3