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/HOAGG.lsp | 121 ++++++++++++++++++++++----------------------
 1 file changed, 60 insertions(+), 61 deletions(-)

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

diff --git a/src/algebra/strap/HOAGG.lsp b/src/algebra/strap/HOAGG.lsp
index d256f98a..44e52b8b 100644
--- a/src/algebra/strap/HOAGG.lsp
+++ b/src/algebra/strap/HOAGG.lsp
@@ -10,70 +10,69 @@
             (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|)))
                 (COND
                   (|HomogeneousAggregate;CAT|)
-                  ('T
-                   (SETQ |HomogeneousAggregate;CAT|
-                         (|Join| (|Aggregate|)
-                                 (|mkCategory| '|domain|
-                                     '(((|map|
-                                         ($ (|Mapping| |t#1| |t#1|) $))
-                                        T)
-                                       ((|map!|
-                                         ($ (|Mapping| |t#1| |t#1|) $))
+                  (T (SETQ |HomogeneousAggregate;CAT|
+                           (|Join| (|Aggregate|)
+                                   (|mkCategory| '|domain|
+                                    '(((|map|
+                                        ($ (|Mapping| |t#1| |t#1|) $))
+                                       T)
+                                      ((|map!|
+                                        ($ (|Mapping| |t#1| |t#1|) $))
+                                       (|has| $
+                                        (ATTRIBUTE |shallowlyMutable|)))
+                                      ((|any?|
+                                        ((|Boolean|)
+                                         (|Mapping| (|Boolean|) |t#1|)
+                                         $))
+                                       (|has| $
+                                        (ATTRIBUTE |finiteAggregate|)))
+                                      ((|every?|
+                                        ((|Boolean|)
+                                         (|Mapping| (|Boolean|) |t#1|)
+                                         $))
+                                       (|has| $
+                                        (ATTRIBUTE |finiteAggregate|)))
+                                      ((|count|
+                                        ((|NonNegativeInteger|)
+                                         (|Mapping| (|Boolean|) |t#1|)
+                                         $))
+                                       (|has| $
+                                        (ATTRIBUTE |finiteAggregate|)))
+                                      ((|parts| ((|List| |t#1|) $))
+                                       (|has| $
+                                        (ATTRIBUTE |finiteAggregate|)))
+                                      ((|members| ((|List| |t#1|) $))
+                                       (|has| $
+                                        (ATTRIBUTE |finiteAggregate|)))
+                                      ((|count|
+                                        ((|NonNegativeInteger|) |t#1|
+                                         $))
+                                       (AND
+                                        (|has| |t#1| (|SetCategory|))
                                         (|has| $
-                                         (ATTRIBUTE |shallowlyMutable|)))
-                                       ((|any?|
-                                         ((|Boolean|)
-                                          (|Mapping| (|Boolean|) |t#1|)
-                                          $))
+                                         (ATTRIBUTE |finiteAggregate|))))
+                                      ((|member?|
+                                        ((|Boolean|) |t#1| $))
+                                       (AND
+                                        (|has| |t#1| (|SetCategory|))
                                         (|has| $
-                                         (ATTRIBUTE |finiteAggregate|)))
-                                       ((|every?|
-                                         ((|Boolean|)
-                                          (|Mapping| (|Boolean|) |t#1|)
-                                          $))
-                                        (|has| $
-                                         (ATTRIBUTE |finiteAggregate|)))
-                                       ((|count|
-                                         ((|NonNegativeInteger|)
-                                          (|Mapping| (|Boolean|) |t#1|)
-                                          $))
-                                        (|has| $
-                                         (ATTRIBUTE |finiteAggregate|)))
-                                       ((|parts| ((|List| |t#1|) $))
-                                        (|has| $
-                                         (ATTRIBUTE |finiteAggregate|)))
-                                       ((|members| ((|List| |t#1|) $))
-                                        (|has| $
-                                         (ATTRIBUTE |finiteAggregate|)))
-                                       ((|count|
-                                         ((|NonNegativeInteger|) |t#1|
-                                          $))
-                                        (AND
-                                         (|has| |t#1| (|SetCategory|))
-                                         (|has| $
-                                          (ATTRIBUTE |finiteAggregate|))))
-                                       ((|member?|
-                                         ((|Boolean|) |t#1| $))
-                                        (AND
-                                         (|has| |t#1| (|SetCategory|))
-                                         (|has| $
-                                          (ATTRIBUTE |finiteAggregate|)))))
-                                     '(((|CoercibleTo| (|OutputForm|))
+                                         (ATTRIBUTE |finiteAggregate|)))))
+                                    '(((|CoercibleTo| (|OutputForm|))
+                                       (|has| |t#1|
+                                        (|CoercibleTo| (|OutputForm|))))
+                                      ((|BasicType|)
+                                       (|has| |t#1| (|BasicType|)))
+                                      ((|SetCategory|)
+                                       (|has| |t#1| (|SetCategory|)))
+                                      ((|Evalable| |t#1|)
+                                       (AND
                                         (|has| |t#1|
-                                         (|CoercibleTo| (|OutputForm|))))
-                                       ((|BasicType|)
-                                        (|has| |t#1| (|BasicType|)))
-                                       ((|SetCategory|)
-                                        (|has| |t#1| (|SetCategory|)))
-                                       ((|Evalable| |t#1|)
-                                        (AND
-                                         (|has| |t#1|
-                                          (|Evalable| |t#1|))
-                                         (|has| |t#1| (|SetCategory|)))))
-                                     '((|Boolean|)
-                                       (|NonNegativeInteger|)
-                                       (|List| |t#1|))
-                                     NIL))))))))
+                                         (|Evalable| |t#1|))
+                                        (|has| |t#1| (|SetCategory|)))))
+                                    '((|Boolean|)
+                                      (|NonNegativeInteger|)
+                                      (|List| |t#1|))
+                                    NIL))))))))
     (|setShellEntry| #0# 0
         (LIST '|HomogeneousAggregate| (|devaluate| |t#1|)))
     #0#)) 
-- 
cgit v1.2.3