From f5181e8acaf34cb5a26a30bd3901a19485933c6d Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sun, 25 Jul 2010 00:12:57 +0000
Subject: 	* interp/cattable.boot: Use %true for truth value in VM
 expressions. 	* interp/clam.boot: Likewise. 	* interp/define.boot:
 Likewise. 	* interp/format.boot: Likewise. 	* interp/functor.boot:
 Likewise. 	* interp/g-opt.boot: Likewise. 	* interp/mark.boot: Likewise. 
 * interp/pspad1.boot: Likewise. 	* interp/pspad2.boot: Likewise. 
 * interp/slam.boot: Likewise. 	* interp/wi1.boot: Likewise. 	*
 interp/wi2.boot: Likewise. 	* interp/sys-constants.boot: Remove $true and
 $false as unused.

---
 src/algebra/strap/CLAGG.lsp | 109 +++++++++++++++++++++-----------------------
 1 file changed, 53 insertions(+), 56 deletions(-)

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

diff --git a/src/algebra/strap/CLAGG.lsp b/src/algebra/strap/CLAGG.lsp
index b917ed26..0b352d92 100644
--- a/src/algebra/strap/CLAGG.lsp
+++ b/src/algebra/strap/CLAGG.lsp
@@ -10,65 +10,62 @@
             (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|)))
                 (COND
                   (|Collection;CAT|)
-                  ('T
-                   (SETQ |Collection;CAT|
-                         (|Join| (|HomogeneousAggregate| '|t#1|)
-                                 (|mkCategory| '|domain|
-                                     '(((|construct|
-                                         ($ (|List| |t#1|)))
-                                        T)
-                                       ((|find|
-                                         ((|Union| |t#1| "failed")
-                                          (|Mapping| (|Boolean|) |t#1|)
-                                          $))
-                                        T)
-                                       ((|reduce|
-                                         (|t#1|
-                                          (|Mapping| |t#1| |t#1| |t#1|)
-                                          $))
+                  (T (SETQ |Collection;CAT|
+                           (|Join| (|HomogeneousAggregate| '|t#1|)
+                                   (|mkCategory| '|domain|
+                                    '(((|construct| ($ (|List| |t#1|)))
+                                       T)
+                                      ((|find|
+                                        ((|Union| |t#1| "failed")
+                                         (|Mapping| (|Boolean|) |t#1|)
+                                         $))
+                                       T)
+                                      ((|reduce|
+                                        (|t#1|
+                                         (|Mapping| |t#1| |t#1| |t#1|)
+                                         $))
+                                       (|has| $
+                                        (ATTRIBUTE |finiteAggregate|)))
+                                      ((|reduce|
+                                        (|t#1|
+                                         (|Mapping| |t#1| |t#1| |t#1|)
+                                         $ |t#1|))
+                                       (|has| $
+                                        (ATTRIBUTE |finiteAggregate|)))
+                                      ((|remove|
+                                        ($
+                                         (|Mapping| (|Boolean|) |t#1|)
+                                         $))
+                                       (|has| $
+                                        (ATTRIBUTE |finiteAggregate|)))
+                                      ((|select|
+                                        ($
+                                         (|Mapping| (|Boolean|) |t#1|)
+                                         $))
+                                       (|has| $
+                                        (ATTRIBUTE |finiteAggregate|)))
+                                      ((|reduce|
+                                        (|t#1|
+                                         (|Mapping| |t#1| |t#1| |t#1|)
+                                         $ |t#1| |t#1|))
+                                       (AND
+                                        (|has| |t#1| (|SetCategory|))
                                         (|has| $
-                                         (ATTRIBUTE |finiteAggregate|)))
-                                       ((|reduce|
-                                         (|t#1|
-                                          (|Mapping| |t#1| |t#1| |t#1|)
-                                          $ |t#1|))
+                                         (ATTRIBUTE |finiteAggregate|))))
+                                      ((|remove| ($ |t#1| $))
+                                       (AND
+                                        (|has| |t#1| (|SetCategory|))
                                         (|has| $
-                                         (ATTRIBUTE |finiteAggregate|)))
-                                       ((|remove|
-                                         ($
-                                          (|Mapping| (|Boolean|) |t#1|)
-                                          $))
+                                         (ATTRIBUTE |finiteAggregate|))))
+                                      ((|removeDuplicates| ($ $))
+                                       (AND
+                                        (|has| |t#1| (|SetCategory|))
                                         (|has| $
-                                         (ATTRIBUTE |finiteAggregate|)))
-                                       ((|select|
-                                         ($
-                                          (|Mapping| (|Boolean|) |t#1|)
-                                          $))
-                                        (|has| $
-                                         (ATTRIBUTE |finiteAggregate|)))
-                                       ((|reduce|
-                                         (|t#1|
-                                          (|Mapping| |t#1| |t#1| |t#1|)
-                                          $ |t#1| |t#1|))
-                                        (AND
-                                         (|has| |t#1| (|SetCategory|))
-                                         (|has| $
-                                          (ATTRIBUTE |finiteAggregate|))))
-                                       ((|remove| ($ |t#1| $))
-                                        (AND
-                                         (|has| |t#1| (|SetCategory|))
-                                         (|has| $
-                                          (ATTRIBUTE |finiteAggregate|))))
-                                       ((|removeDuplicates| ($ $))
-                                        (AND
-                                         (|has| |t#1| (|SetCategory|))
-                                         (|has| $
-                                          (ATTRIBUTE |finiteAggregate|)))))
-                                     '(((|ConvertibleTo| (|InputForm|))
-                                        (|has| |t#1|
-                                         (|ConvertibleTo|
-                                          (|InputForm|)))))
-                                     '((|List| |t#1|)) NIL))))))))
+                                         (ATTRIBUTE |finiteAggregate|)))))
+                                    '(((|ConvertibleTo| (|InputForm|))
+                                       (|has| |t#1|
+                                        (|ConvertibleTo| (|InputForm|)))))
+                                    '((|List| |t#1|)) NIL))))))))
     (|setShellEntry| #0# 0 (LIST '|Collection| (|devaluate| |t#1|)))
     #0#)) 
 
-- 
cgit v1.2.3