* algebra/Makefile.pamphlet (all-algstrap): New.

	* algebra/strap: Update cached Lisp translation.

1 files changed, 150 insertions, 58 deletions

diff --git a/src/algebra/strap/HOAGG-.lsp b/src/algebra/strap/HOAGG-.lsp
index de348637..93a5923b 100644
--- a/src/algebra/strap/HOAGG-.lsp
+++ b/src/algebra/strap/HOAGG-.lsp
@@ -3,21 +3,22 @@
 
 (DEFUN |HOAGG-;eval;ALA;1| (|u| |l| $)
   (SPADCALL (CONS #'|HOAGG-;eval;ALA;1!0| (VECTOR $ |l|)) |u|
-      (QREFELT $ 11))) 
+      (|getShellEntry| $ 12))) 
 
 (DEFUN |HOAGG-;eval;ALA;1!0| (|#1| $$)
-  (SPADCALL |#1| (QREFELT $$ 1) (QREFELT (QREFELT $$ 0) 9))) 
+  (SPADCALL |#1| (|getShellEntry| $$ 1)
+      (|getShellEntry| (|getShellEntry| $$ 0) 10))) 
 
 (DEFUN |HOAGG-;#;ANni;2| (|c| $)
-  (LENGTH (SPADCALL |c| (QREFELT $ 14)))) 
+  (LENGTH (SPADCALL |c| (|getShellEntry| $ 15)))) 
 
 (DEFUN |HOAGG-;any?;MAB;3| (|f| |c| $)
-  (PROG (|x| #0=#:G1409 #1=#:G1406 #2=#:G1404 #3=#:G1405)
+  (PROG (|x| #0=#:G1406 #1=#:G1403 #2=#:G1401 #3=#:G1402)
     (RETURN
       (SEQ (PROGN
              (LETT #3# NIL |HOAGG-;any?;MAB;3|)
              (SEQ (LETT |x| NIL |HOAGG-;any?;MAB;3|)
-                  (LETT #0# (SPADCALL |c| (QREFELT $ 14))
+                  (LETT #0# (SPADCALL |c| (|getShellEntry| $ 15))
                         |HOAGG-;any?;MAB;3|)
                   G190
                   (COND
@@ -42,12 +43,12 @@
              (COND (#3# #2#) ('T 'NIL))))))) 
 
 (DEFUN |HOAGG-;every?;MAB;4| (|f| |c| $)
-  (PROG (|x| #0=#:G1414 #1=#:G1412 #2=#:G1410 #3=#:G1411)
+  (PROG (|x| #0=#:G1411 #1=#:G1409 #2=#:G1407 #3=#:G1408)
     (RETURN
       (SEQ (PROGN
              (LETT #3# NIL |HOAGG-;every?;MAB;4|)
              (SEQ (LETT |x| NIL |HOAGG-;every?;MAB;4|)
-                  (LETT #0# (SPADCALL |c| (QREFELT $ 14))
+                  (LETT #0# (SPADCALL |c| (|getShellEntry| $ 15))
                         |HOAGG-;every?;MAB;4|)
                   G190
                   (COND
@@ -73,12 +74,12 @@
              (COND (#3# #2#) ('T 'T))))))) 
 
 (DEFUN |HOAGG-;count;MANni;5| (|f| |c| $)
-  (PROG (|x| #0=#:G1419 #1=#:G1417 #2=#:G1415 #3=#:G1416)
+  (PROG (|x| #0=#:G1416 #1=#:G1414 #2=#:G1412 #3=#:G1413)
     (RETURN
       (SEQ (PROGN
              (LETT #3# NIL |HOAGG-;count;MANni;5|)
              (SEQ (LETT |x| NIL |HOAGG-;count;MANni;5|)
-                  (LETT #0# (SPADCALL |c| (QREFELT $ 14))
+                  (LETT #0# (SPADCALL |c| (|getShellEntry| $ 15))
                         |HOAGG-;count;MANni;5|)
                   G190
                   (COND
@@ -105,36 +106,39 @@
                   G191 (EXIT NIL))
              (COND (#3# #2#) ('T 0))))))) 
 
-(DEFUN |HOAGG-;members;AL;6| (|x| $) (SPADCALL |x| (QREFELT $ 14))) 
+(DEFUN |HOAGG-;members;AL;6| (|x| $)
+  (SPADCALL |x| (|getShellEntry| $ 15))) 
 
 (DEFUN |HOAGG-;count;SANni;7| (|s| |x| $)
   (SPADCALL (CONS #'|HOAGG-;count;SANni;7!0| (VECTOR $ |s|)) |x|
-      (QREFELT $ 24))) 
+      (|getShellEntry| $ 25))) 
 
 (DEFUN |HOAGG-;count;SANni;7!0| (|#1| $$)
-  (SPADCALL (QREFELT $$ 1) |#1| (QREFELT (QREFELT $$ 0) 23))) 
+  (SPADCALL (|getShellEntry| $$ 1) |#1|
+      (|getShellEntry| (|getShellEntry| $$ 0) 24))) 
 
 (DEFUN |HOAGG-;member?;SAB;8| (|e| |c| $)
   (SPADCALL (CONS #'|HOAGG-;member?;SAB;8!0| (VECTOR $ |e|)) |c|
-      (QREFELT $ 26))) 
+      (|getShellEntry| $ 27))) 
 
 (DEFUN |HOAGG-;member?;SAB;8!0| (|#1| $$)
-  (SPADCALL (QREFELT $$ 1) |#1| (QREFELT (QREFELT $$ 0) 23))) 
+  (SPADCALL (|getShellEntry| $$ 1) |#1|
+      (|getShellEntry| (|getShellEntry| $$ 0) 24))) 
 
 (DEFUN |HOAGG-;=;2AB;9| (|x| |y| $)
-  (PROG (|b| #0=#:G1429 |a| #1=#:G1428 #2=#:G1425 #3=#:G1423
-             #4=#:G1424)
+  (PROG (|b| #0=#:G1426 |a| #1=#:G1425 #2=#:G1422 #3=#:G1420
+             #4=#:G1421)
     (RETURN
       (SEQ (COND
-             ((SPADCALL |x| (SPADCALL |y| (QREFELT $ 28))
-                  (QREFELT $ 29))
+             ((SPADCALL |x| (SPADCALL |y| (|getShellEntry| $ 29))
+                  (|getShellEntry| $ 30))
               (PROGN
                 (LETT #4# NIL |HOAGG-;=;2AB;9|)
                 (SEQ (LETT |b| NIL |HOAGG-;=;2AB;9|)
-                     (LETT #0# (SPADCALL |y| (QREFELT $ 14))
+                     (LETT #0# (SPADCALL |y| (|getShellEntry| $ 15))
                            |HOAGG-;=;2AB;9|)
                      (LETT |a| NIL |HOAGG-;=;2AB;9|)
-                     (LETT #1# (SPADCALL |x| (QREFELT $ 14))
+                     (LETT #1# (SPADCALL |x| (|getShellEntry| $ 15))
                            |HOAGG-;=;2AB;9|)
                      G190
                      (COND
@@ -150,7 +154,7 @@
                      (SEQ (EXIT (PROGN
                                   (LETT #2#
                                         (SPADCALL |a| |b|
-                                         (QREFELT $ 23))
+                                         (|getShellEntry| $ 24))
                                         |HOAGG-;=;2AB;9|)
                                   (COND
                                     (#4#
@@ -170,14 +174,15 @@
              ('T 'NIL)))))) 
 
 (DEFUN |HOAGG-;coerce;AOf;10| (|x| $)
-  (PROG (#0=#:G1433 |a| #1=#:G1434)
+  (PROG (#0=#:G1430 |a| #1=#:G1431)
     (RETURN
       (SEQ (SPADCALL
                (SPADCALL
                    (PROGN
                      (LETT #0# NIL |HOAGG-;coerce;AOf;10|)
                      (SEQ (LETT |a| NIL |HOAGG-;coerce;AOf;10|)
-                          (LETT #1# (SPADCALL |x| (QREFELT $ 14))
+                          (LETT #1#
+                                (SPADCALL |x| (|getShellEntry| $ 15))
                                 |HOAGG-;coerce;AOf;10|)
                           G190
                           (COND
@@ -189,13 +194,14 @@
                              (GO G191)))
                           (SEQ (EXIT (LETT #0#
                                       (CONS
-                                       (SPADCALL |a| (QREFELT $ 32))
+                                       (SPADCALL |a|
+                                        (|getShellEntry| $ 33))
                                        #0#)
                                       |HOAGG-;coerce;AOf;10|)))
                           (LETT #1# (CDR #1#) |HOAGG-;coerce;AOf;10|)
                           (GO G190) G191 (EXIT (NREVERSE0 #0#))))
-                   (QREFELT $ 34))
-               (QREFELT $ 35)))))) 
+                   (|getShellEntry| $ 35))
+               (|getShellEntry| $ 36)))))) 
 
 (DEFUN |HomogeneousAggregate&| (|#1| |#2|)
   (PROG (|dv$1| |dv$2| |dv$| $ |pv$|)
@@ -205,9 +211,9 @@
         (LETT |dv$2| (|devaluate| |#2|) . #0#)
         (LETT |dv$|
               (LIST '|HomogeneousAggregate&| |dv$1| |dv$2|) . #0#)
-        (LETT $ (GETREFV 38) . #0#)
-        (QSETREFV $ 0 |dv$|)
-        (QSETREFV $ 3
+        (LETT $ (|newShell| 38) . #0#)
+        (|setShellEntry| $ 0 |dv$|)
+        (|setShellEntry| $ 3
             (LETT |pv$|
                   (|buildPredVector| 0 0
                       (LIST (|HasAttribute| |#1| '|finiteAggregate|)
@@ -218,71 +224,157 @@
                             (|HasCategory| |#2|
                                 '(|CoercibleTo| (|OutputForm|))))) . #0#))
         (|stuffDomainSlots| $)
-        (QSETREFV $ 6 |#1|)
-        (QSETREFV $ 7 |#2|)
+        (|setShellEntry| $ 6 |#1|)
+        (|setShellEntry| $ 7 |#2|)
         (COND
           ((|testBitVector| |pv$| 3)
-           (QSETREFV $ 12
+           (|setShellEntry| $ 13
                (CONS (|dispatchFunction| |HOAGG-;eval;ALA;1|) $))))
         (COND
           ((|testBitVector| |pv$| 1)
            (PROGN
-             (QSETREFV $ 16
+             (|setShellEntry| $ 17
                  (CONS (|dispatchFunction| |HOAGG-;#;ANni;2|) $))
-             (QSETREFV $ 19
+             (|setShellEntry| $ 20
                  (CONS (|dispatchFunction| |HOAGG-;any?;MAB;3|) $))
-             (QSETREFV $ 20
+             (|setShellEntry| $ 21
                  (CONS (|dispatchFunction| |HOAGG-;every?;MAB;4|) $))
-             (QSETREFV $ 21
+             (|setShellEntry| $ 22
                  (CONS (|dispatchFunction| |HOAGG-;count;MANni;5|) $))
-             (QSETREFV $ 22
+             (|setShellEntry| $ 23
                  (CONS (|dispatchFunction| |HOAGG-;members;AL;6|) $))
              (COND
                ((|testBitVector| |pv$| 4)
                 (PROGN
-                  (QSETREFV $ 25
+                  (|setShellEntry| $ 26
                       (CONS (|dispatchFunction| |HOAGG-;count;SANni;7|)
                             $))
-                  (QSETREFV $ 27
+                  (|setShellEntry| $ 28
                       (CONS (|dispatchFunction| |HOAGG-;member?;SAB;8|)
                             $))
-                  (QSETREFV $ 30
+                  (|setShellEntry| $ 31
                       (CONS (|dispatchFunction| |HOAGG-;=;2AB;9|) $)))))
              (COND
                ((|testBitVector| |pv$| 5)
-                (QSETREFV $ 36
+                (|setShellEntry| $ 37
                     (CONS (|dispatchFunction| |HOAGG-;coerce;AOf;10|)
                           $)))))))
         $)))) 
 
 (MAKEPROP '|HomogeneousAggregate&| '|infovec|
     (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|)
-             (|List| 37) (0 . |eval|) (|Mapping| 7 7) (6 . |map|)
-             (12 . |eval|) (|List| 7) (18 . |parts|)
+             (|Equation| 7) (|List| 8) (0 . |eval|) (|Mapping| 7 7)
+             (6 . |map|) (12 . |eval|) (|List| 7) (18 . |parts|)
              (|NonNegativeInteger|) (23 . |#|) (|Boolean|)
-             (|Mapping| 17 7) (28 . |any?|) (34 . |every?|)
+             (|Mapping| 18 7) (28 . |any?|) (34 . |every?|)
              (40 . |count|) (46 . |members|) (51 . =) (57 . |count|)
              (63 . |count|) (69 . |any?|) (75 . |member?|) (81 . |#|)
              (86 . |size?|) (92 . =) (|OutputForm|) (98 . |coerce|)
              (|List| $) (103 . |commaSeparate|) (108 . |bracket|)
-             (113 . |coerce|) (|Equation| 7))
+             (113 . |coerce|))
           '#(|members| 118 |member?| 123 |every?| 129 |eval| 135
              |count| 141 |coerce| 153 |any?| 158 = 164 |#| 170)
           'NIL
           (CONS (|makeByteWordVec2| 1 'NIL)
                 (CONS '#()
                       (CONS '#()
-                            (|makeByteWordVec2| 36
-                                '(2 7 0 0 8 9 2 6 0 10 0 11 2 0 0 0 8
-                                  12 1 6 13 0 14 1 0 15 0 16 2 0 17 18
-                                  0 19 2 0 17 18 0 20 2 0 15 18 0 21 1
-                                  0 13 0 22 2 7 17 0 0 23 2 6 15 18 0
-                                  24 2 0 15 7 0 25 2 6 17 18 0 26 2 0
-                                  17 7 0 27 1 6 15 0 28 2 6 17 0 15 29
-                                  2 0 17 0 0 30 1 7 31 0 32 1 31 0 33
-                                  34 1 31 0 0 35 1 0 31 0 36 1 0 13 0
-                                  22 2 0 17 7 0 27 2 0 17 18 0 20 2 0 0
-                                  0 8 12 2 0 15 7 0 25 2 0 15 18 0 21 1
-                                  0 31 0 36 2 0 17 18 0 19 2 0 17 0 0
-                                  30 1 0 15 0 16)))))
+                            (|makeByteWordVec2| 37
+                                '(2 7 0 0 9 10 2 6 0 11 0 12 2 0 0 0 9
+                                  13 1 6 14 0 15 1 0 16 0 17 2 0 18 19
+                                  0 20 2 0 18 19 0 21 2 0 16 19 0 22 1
+                                  0 14 0 23 2 7 18 0 0 24 2 6 16 19 0
+                                  25 2 0 16 7 0 26 2 6 18 19 0 27 2 0
+                                  18 7 0 28 1 6 16 0 29 2 6 18 0 16 30
+                                  2 0 18 0 0 31 1 7 32 0 33 1 32 0 34
+                                  35 1 32 0 0 36 1 0 32 0 37 1 0 14 0
+                                  23 2 0 18 7 0 28 2 0 18 19 0 21 2 0 0
+                                  0 9 13 2 0 16 7 0 26 2 0 16 19 0 22 1
+                                  0 32 0 37 2 0 18 19 0 20 2 0 18 0 0
+                                  31 1 0 16 0 17)))))
           '|lookupComplete|)) 
+
+(SETQ |$CategoryFrame|
+      (|put| '|HomogeneousAggregate&| '|isFunctor|
+             '(((|coerce| ((|OutputForm|) $)) T (ELT $ 37))
+               ((= ((|Boolean|) $ $)) T (ELT $ 31))
+               ((|eval| ($ $ (|List| |#2|) (|List| |#2|))) T
+                (ELT $ NIL))
+               ((|eval| ($ $ |#2| |#2|)) T (ELT $ NIL))
+               ((|eval| ($ $ (|Equation| |#2|))) T (ELT $ NIL))
+               ((|eval| ($ $ (|List| (|Equation| |#2|)))) T (ELT $ 13))
+               ((|member?| ((|Boolean|) |#2| $)) T (ELT $ 28))
+               ((|count| ((|NonNegativeInteger|) |#2| $)) T (ELT $ 26))
+               ((|members| ((|List| |#2|) $)) T (ELT $ 23))
+               ((|count| ((|NonNegativeInteger|)
+                          (|Mapping| (|Boolean|) |#2|) $))
+                T (ELT $ 22))
+               ((|every?| ((|Boolean|) (|Mapping| (|Boolean|) |#2|) $))
+                T (ELT $ 21))
+               ((|any?| ((|Boolean|) (|Mapping| (|Boolean|) |#2|) $)) T
+                (ELT $ 20))
+               ((|#| ((|NonNegativeInteger|) $)) T (ELT $ 17)))
+             (|addModemap| '|HomogeneousAggregate&|
+                 '(|HomogeneousAggregate&| |#1| |#2|)
+                 '((CATEGORY |domain|
+                       (SIGNATURE |coerce| ((|OutputForm|) |#1|))
+                       (SIGNATURE = ((|Boolean|) |#1| |#1|))
+                       (SIGNATURE |eval|
+                           (|#1| |#1| (|List| |#2|) (|List| |#2|)))
+                       (SIGNATURE |eval| (|#1| |#1| |#2| |#2|))
+                       (SIGNATURE |eval| (|#1| |#1| (|Equation| |#2|)))
+                       (SIGNATURE |eval|
+                           (|#1| |#1| (|List| (|Equation| |#2|))))
+                       (SIGNATURE |member?| ((|Boolean|) |#2| |#1|))
+                       (SIGNATURE |count|
+                           ((|NonNegativeInteger|) |#2| |#1|))
+                       (SIGNATURE |members| ((|List| |#2|) |#1|))
+                       (SIGNATURE |count|
+                           ((|NonNegativeInteger|)
+                            (|Mapping| (|Boolean|) |#2|) |#1|))
+                       (SIGNATURE |every?|
+                           ((|Boolean|) (|Mapping| (|Boolean|) |#2|)
+                            |#1|))
+                       (SIGNATURE |any?|
+                           ((|Boolean|) (|Mapping| (|Boolean|) |#2|)
+                            |#1|))
+                       (SIGNATURE |#| ((|NonNegativeInteger|) |#1|)))
+                   (|HomogeneousAggregate| |#2|) (|Type|))
+                 T '|HomogeneousAggregate&|
+                 (|put| '|HomogeneousAggregate&| '|mode|
+                        '(|Mapping|
+                             (CATEGORY |domain|
+                                 (SIGNATURE |coerce|
+                                     ((|OutputForm|) |#1|))
+                                 (SIGNATURE = ((|Boolean|) |#1| |#1|))
+                                 (SIGNATURE |eval|
+                                     (|#1| |#1| (|List| |#2|)
+                                      (|List| |#2|)))
+                                 (SIGNATURE |eval|
+                                     (|#1| |#1| |#2| |#2|))
+                                 (SIGNATURE |eval|
+                                     (|#1| |#1| (|Equation| |#2|)))
+                                 (SIGNATURE |eval|
+                                     (|#1| |#1|
+                                      (|List| (|Equation| |#2|))))
+                                 (SIGNATURE |member?|
+                                     ((|Boolean|) |#2| |#1|))
+                                 (SIGNATURE |count|
+                                     ((|NonNegativeInteger|) |#2| |#1|))
+                                 (SIGNATURE |members|
+                                     ((|List| |#2|) |#1|))
+                                 (SIGNATURE |count|
+                                     ((|NonNegativeInteger|)
+                                      (|Mapping| (|Boolean|) |#2|)
+                                      |#1|))
+                                 (SIGNATURE |every?|
+                                     ((|Boolean|)
+                                      (|Mapping| (|Boolean|) |#2|)
+                                      |#1|))
+                                 (SIGNATURE |any?|
+                                     ((|Boolean|)
+                                      (|Mapping| (|Boolean|) |#2|)
+                                      |#1|))
+                                 (SIGNATURE |#|
+                                     ((|NonNegativeInteger|) |#1|)))
+                             (|HomogeneousAggregate| |#2|) (|Type|))
+                        |$CategoryFrame|))))