Generate more readable code for functor definitions.

	* interp/nruncomp.boot (washFunctorBody): New.
	(buildFunctor): Use it.  
	* interp/g-opt.boot (optBind): New.
	(optLIST): Likewise.

1 files changed, 13 insertions, 17 deletions

diff --git a/src/algebra/strap/ABELMON-.lsp b/src/algebra/strap/ABELMON-.lsp
index c0a9b85f..ce89d0ed 100644
--- a/src/algebra/strap/ABELMON-.lsp
+++ b/src/algebra/strap/ABELMON-.lsp
@@ -28,23 +28,19 @@
     ('T (SPADCALL |n| |x| (|getShellEntry| $ 18))))) 
 
 (DEFUN |AbelianMonoid&| (|#1|)
-  (PROG (|dv$1| |dv$| $ |pv$|)
-    (RETURN
-      (PROGN
-        (LETT |dv$1| (|devaluate| |#1|) . #0=(|AbelianMonoid&|))
-        (LETT |dv$| (LIST '|AbelianMonoid&| |dv$1|) . #0#)
-        (LETT $ (|newShell| 20) . #0#)
-        (|setShellEntry| $ 0 |dv$|)
-        (|setShellEntry| $ 3
-            (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
-        (|stuffDomainSlots| $)
-        (|setShellEntry| $ 6 |#1|)
-        (COND
-          ((|HasCategory| |#1| '(|Ring|)))
-          ('T
-           (|setShellEntry| $ 19
-               (CONS (|dispatchFunction| |ABELMON-;*;Nni2S;4|) $))))
-        $)))) 
+  (LET* ((|dv$1| (|devaluate| |#1|))
+         (|dv$| (LIST '|AbelianMonoid&| |dv$1|)) ($ (|newShell| 20))
+         (|pv$| (|buildPredVector| 0 0 NIL)))
+    (|setShellEntry| $ 0 |dv$|)
+    (|setShellEntry| $ 3 |pv$|)
+    (|stuffDomainSlots| $)
+    (|setShellEntry| $ 6 |#1|)
+    (COND
+      ((|HasCategory| |#1| '(|Ring|)))
+      ('T
+       (|setShellEntry| $ 19
+           (CONS (|dispatchFunction| |ABELMON-;*;Nni2S;4|) $))))
+    $)) 
 
 (MAKEPROP '|AbelianMonoid&| '|infovec|
     (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (0 . |Zero|)