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/ABELGRP-.lsp | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

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

diff --git a/src/algebra/strap/ABELGRP-.lsp b/src/algebra/strap/ABELGRP-.lsp
index c07f070e..65266dc4 100644
--- a/src/algebra/strap/ABELGRP-.lsp
+++ b/src/algebra/strap/ABELGRP-.lsp
@@ -33,23 +33,19 @@
          (|getShellEntry| $ 24))))) 
 
 (DEFUN |AbelianGroup&| (|#1|)
-  (PROG (|dv$1| |dv$| $ |pv$|)
-    (RETURN
-      (PROGN
-        (LETT |dv$1| (|devaluate| |#1|) . #0=(|AbelianGroup&|))
-        (LETT |dv$| (LIST '|AbelianGroup&| |dv$1|) . #0#)
-        (LETT $ (|newShell| 27) . #0#)
-        (|setShellEntry| $ 0 |dv$|)
-        (|setShellEntry| $ 3
-            (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
-        (|stuffDomainSlots| $)
-        (|setShellEntry| $ 6 |#1|)
-        (COND
-          ((|HasCategory| |#1| '(|Ring|)))
-          ('T
-           (|setShellEntry| $ 26
-               (CONS (|dispatchFunction| |ABELGRP-;*;I2S;4|) $))))
-        $)))) 
+  (LET* ((|dv$1| (|devaluate| |#1|))
+         (|dv$| (LIST '|AbelianGroup&| |dv$1|)) ($ (|newShell| 27))
+         (|pv$| (|buildPredVector| 0 0 NIL)))
+    (|setShellEntry| $ 0 |dv$|)
+    (|setShellEntry| $ 3 |pv$|)
+    (|stuffDomainSlots| $)
+    (|setShellEntry| $ 6 |#1|)
+    (COND
+      ((|HasCategory| |#1| '(|Ring|)))
+      ('T
+       (|setShellEntry| $ 26
+           (CONS (|dispatchFunction| |ABELGRP-;*;I2S;4|) $))))
+    $)) 
 
 (MAKEPROP '|AbelianGroup&| '|infovec|
     (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (0 . -) (5 . +)
-- 
cgit v1.2.3