diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-08-17 08:59:26 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-08-17 08:59:26 +0000 |
| commit | 5e504b6abaef6cf7e7c58c17e26bec33856b60c0 (patch) | |
| tree | fc93b37d696d3c1ca38437a5ad9a815a85fe46b7 /src | |
| parent | ffb91646c6f11e84fa886aa5abc2de61ba291cc1 (diff) | |
| download | open-axiom-5e504b6abaef6cf7e7c58c17e26bec33856b60c0.tar.gz | |
* algebra/Makefile.pamphlet (all-algstrap): New.
* algebra/strap: Update cached Lisp translation.
Diffstat (limited to 'src')
88 files changed, 8789 insertions, 1841 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d95e174b..7ba6f171 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * algebra/Makefile.pamphlet (all-algstrap): New. + * algebra/strap: Update cached Lisp translation. + 2008-08-16 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/sys-driver.boot (openDatabases): Rename from RESTART0. diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 197ac760..14a4c8db 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -1135,6 +1135,14 @@ user-stamp: bootstrap-stamp $(axiom_algebra_layer_user_objects) + +.PHONY: all-algstrap +all-algstrap: $(addsuffix .NRLIB/code.lsp,$(axiom_algebra_bootstrap)) + for a in $(axiom_algebra_bootstrap); do \ + old=$(srcdir)/strap/$$a.lsp; new=$$a.NRLIB/code.lsp; \ + if cmp -s $$new $$old; then cp -p $$new $$old || exit 1; fi; \ + done + mostlyclean-local: @rm -f $(OUT)/*.$(FASLEXT) $(OUT)/*.daase @rm -rf *.NRLIB diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index fc95ce65..c2f97a52 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -2239,6 +2239,14 @@ check: <<diagrams.tex (OUT from IN)>> <<stages>> + +.PHONY: all-algstrap +all-algstrap: $(addsuffix .NRLIB/code.lsp,$(axiom_algebra_bootstrap)) + for a in $(axiom_algebra_bootstrap); do \ + old=$(srcdir)/strap/$$a.lsp; new=$$a.NRLIB/code.lsp; \ + if cmp -s $$new $$old; then cp -p $$new $$old || exit 1; fi; \ + done + mostlyclean-local: @rm -f $(OUT)/*.$(FASLEXT) $(OUT)/*.daase @rm -rf *.NRLIB diff --git a/src/algebra/strap/ABELGRP-.lsp b/src/algebra/strap/ABELGRP-.lsp index ca331722..04d5e41c 100644 --- a/src/algebra/strap/ABELGRP-.lsp +++ b/src/algebra/strap/ABELGRP-.lsp @@ -2,19 +2,22 @@ (/VERSIONCHECK 2) (DEFUN |ABELGRP-;-;3S;1| (|x| |y| $) - (SPADCALL |x| (SPADCALL |y| (QREFELT $ 7)) (QREFELT $ 8))) + (SPADCALL |x| (SPADCALL |y| (|getShellEntry| $ 7)) + (|getShellEntry| $ 8))) (DEFUN |ABELGRP-;subtractIfCan;2SU;2| (|x| |y| $) - (CONS 0 (SPADCALL |x| |y| (QREFELT $ 10)))) + (CONS 0 (SPADCALL |x| |y| (|getShellEntry| $ 10)))) (DEFUN |ABELGRP-;*;Nni2S;3| (|n| |x| $) - (SPADCALL |n| |x| (QREFELT $ 14))) + (SPADCALL |n| |x| (|getShellEntry| $ 14))) (DEFUN |ABELGRP-;*;I2S;4| (|n| |x| $) (COND ((ZEROP |n|) (|spadConstant| $ 17)) - ((< 0 |n|) (SPADCALL |n| |x| (QREFELT $ 20))) - ('T (SPADCALL (- |n|) (SPADCALL |x| (QREFELT $ 7)) (QREFELT $ 20))))) + ((< 0 |n|) (SPADCALL |n| |x| (|getShellEntry| $ 20))) + ('T + (SPADCALL (- |n|) (SPADCALL |x| (|getShellEntry| $ 7)) + (|getShellEntry| $ 20))))) (DEFUN |AbelianGroup&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -22,15 +25,16 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|AbelianGroup&|)) (LETT |dv$| (LIST '|AbelianGroup&| |dv$1|) . #0#) - (LETT $ (GETREFV 22) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 22) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) (COND ((|HasCategory| |#1| '(|Ring|))) ('T - (QSETREFV $ 21 + (|setShellEntry| $ 21 (CONS (|dispatchFunction| |ABELGRP-;*;I2S;4|) $)))) $)))) @@ -51,3 +55,38 @@ 0 0 13 0 21 2 0 11 0 0 12 2 0 0 0 0 9 2 0 0 13 0 21 2 0 0 15 0 16))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|AbelianGroup&| '|isFunctor| + '(((* ($ (|Integer|) $)) T (ELT $ 21)) + ((- ($ $ $)) T (ELT $ 9)) ((- ($ $)) T (ELT $ NIL)) + ((|subtractIfCan| ((|Union| $ "failed") $ $)) T + (ELT $ 12)) + ((* ($ (|NonNegativeInteger|) $)) T (ELT $ 16)) + ((* ($ (|PositiveInteger|) $)) T (ELT $ NIL))) + (|addModemap| '|AbelianGroup&| '(|AbelianGroup&| |#1|) + '((CATEGORY |domain| + (SIGNATURE * (|#1| (|Integer|) |#1|)) + (SIGNATURE - (|#1| |#1| |#1|)) + (SIGNATURE - (|#1| |#1|)) + (SIGNATURE |subtractIfCan| + ((|Union| |#1| "failed") |#1| |#1|)) + (SIGNATURE * (|#1| (|NonNegativeInteger|) |#1|)) + (SIGNATURE * (|#1| (|PositiveInteger|) |#1|))) + (|AbelianGroup|)) + T '|AbelianGroup&| + (|put| '|AbelianGroup&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE * (|#1| (|Integer|) |#1|)) + (SIGNATURE - (|#1| |#1| |#1|)) + (SIGNATURE - (|#1| |#1|)) + (SIGNATURE |subtractIfCan| + ((|Union| |#1| "failed") |#1| + |#1|)) + (SIGNATURE * + (|#1| (|NonNegativeInteger|) |#1|)) + (SIGNATURE * + (|#1| (|PositiveInteger|) |#1|))) + (|AbelianGroup|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/ABELGRP.lsp b/src/algebra/strap/ABELGRP.lsp index f667c2d5..c1c07bac 100644 --- a/src/algebra/strap/ABELGRP.lsp +++ b/src/algebra/strap/ABELGRP.lsp @@ -4,13 +4,13 @@ (DEFPARAMETER |AbelianGroup;AL| 'NIL) (DEFUN |AbelianGroup| () - (LET (#:G1388) + (LET (#:G1397) (COND (|AbelianGroup;AL|) (T (SETQ |AbelianGroup;AL| (|AbelianGroup;|)))))) (DEFUN |AbelianGroup;| () - (PROG (#0=#:G1386) + (PROG (#0=#:G1395) (RETURN (PROG1 (LETT #0# (|Join| (|CancellationAbelianMonoid|) @@ -21,4 +21,9 @@ |AbelianGroup|) (SETELT #0# 0 '(|AbelianGroup|)))))) +(SETQ |$CategoryFrame| + (|put| '|AbelianGroup| '|isCategory| T + (|addModemap| '|AbelianGroup| '(|AbelianGroup|) + '((|Category|)) T '|AbelianGroup| |$CategoryFrame|))) + (MAKEPROP '|AbelianGroup| 'NILADIC T) diff --git a/src/algebra/strap/ABELMON-.lsp b/src/algebra/strap/ABELMON-.lsp index a38826e3..82017e64 100644 --- a/src/algebra/strap/ABELMON-.lsp +++ b/src/algebra/strap/ABELMON-.lsp @@ -2,17 +2,17 @@ (/VERSIONCHECK 2) (DEFUN |ABELMON-;zero?;SB;1| (|x| $) - (SPADCALL |x| (|spadConstant| $ 7) (QREFELT $ 9))) + (SPADCALL |x| (|spadConstant| $ 7) (|getShellEntry| $ 9))) (DEFUN |ABELMON-;*;Pi2S;2| (|n| |x| $) - (SPADCALL |n| |x| (QREFELT $ 12))) + (SPADCALL |n| |x| (|getShellEntry| $ 12))) (DEFUN |ABELMON-;sample;S;3| ($) (|spadConstant| $ 7)) (DEFUN |ABELMON-;*;Nni2S;4| (|n| |x| $) (COND ((ZEROP |n|) (|spadConstant| $ 7)) - ('T (SPADCALL |n| |x| (QREFELT $ 17))))) + ('T (SPADCALL |n| |x| (|getShellEntry| $ 17))))) (DEFUN |AbelianMonoid&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -20,15 +20,16 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|AbelianMonoid&|)) (LETT |dv$| (LIST '|AbelianMonoid&| |dv$1|) . #0#) - (LETT $ (GETREFV 19) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 19) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) (COND ((|HasCategory| |#1| '(|Ring|))) ('T - (QSETREFV $ 18 + (|setShellEntry| $ 18 (CONS (|dispatchFunction| |ABELMON-;*;Nni2S;4|) $)))) $)))) @@ -47,3 +48,29 @@ 16 6 13 6 17 2 0 0 11 0 18 1 0 8 0 10 0 0 0 15 2 0 0 11 0 18 2 0 0 13 0 14))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|AbelianMonoid&| '|isFunctor| + '(((* ($ (|NonNegativeInteger|) $)) T (ELT $ 18)) + ((|zero?| ((|Boolean|) $)) T (ELT $ 10)) + ((|sample| ($)) T (ELT $ 15)) + ((* ($ (|PositiveInteger|) $)) T (ELT $ 14))) + (|addModemap| '|AbelianMonoid&| '(|AbelianMonoid&| |#1|) + '((CATEGORY |domain| + (SIGNATURE * (|#1| (|NonNegativeInteger|) |#1|)) + (SIGNATURE |zero?| ((|Boolean|) |#1|)) + (SIGNATURE |sample| (|#1|)) + (SIGNATURE * (|#1| (|PositiveInteger|) |#1|))) + (|AbelianMonoid|)) + T '|AbelianMonoid&| + (|put| '|AbelianMonoid&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE * + (|#1| (|NonNegativeInteger|) |#1|)) + (SIGNATURE |zero?| ((|Boolean|) |#1|)) + (SIGNATURE |sample| (|#1|)) + (SIGNATURE * + (|#1| (|PositiveInteger|) |#1|))) + (|AbelianMonoid|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/ABELMON.lsp b/src/algebra/strap/ABELMON.lsp index 5de5fbba..e13a5932 100644 --- a/src/algebra/strap/ABELMON.lsp +++ b/src/algebra/strap/ABELMON.lsp @@ -4,13 +4,13 @@ (DEFPARAMETER |AbelianMonoid;AL| 'NIL) (DEFUN |AbelianMonoid| () - (LET (#:G1388) + (LET (#:G1397) (COND (|AbelianMonoid;AL|) (T (SETQ |AbelianMonoid;AL| (|AbelianMonoid;|)))))) (DEFUN |AbelianMonoid;| () - (PROG (#0=#:G1386) + (PROG (#0=#:G1395) (RETURN (PROG1 (LETT #0# (|Join| (|AbelianSemiGroup|) @@ -25,4 +25,9 @@ |AbelianMonoid|) (SETELT #0# 0 '(|AbelianMonoid|)))))) +(SETQ |$CategoryFrame| + (|put| '|AbelianMonoid| '|isCategory| T + (|addModemap| '|AbelianMonoid| '(|AbelianMonoid|) + '((|Category|)) T '|AbelianMonoid| |$CategoryFrame|))) + (MAKEPROP '|AbelianMonoid| 'NILADIC T) diff --git a/src/algebra/strap/ABELSG-.lsp b/src/algebra/strap/ABELSG-.lsp index 6c9c3182..4f99c6ad 100644 --- a/src/algebra/strap/ABELSG-.lsp +++ b/src/algebra/strap/ABELSG-.lsp @@ -2,7 +2,7 @@ (/VERSIONCHECK 2) (DEFUN |ABELSG-;*;Pi2S;1| (|n| |x| $) - (SPADCALL |n| |x| (QREFELT $ 9))) + (SPADCALL |n| |x| (|getShellEntry| $ 9))) (DEFUN |AbelianSemiGroup&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -10,15 +10,16 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|AbelianSemiGroup&|)) (LETT |dv$| (LIST '|AbelianSemiGroup&| |dv$1|) . #0#) - (LETT $ (GETREFV 11) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 11) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) (COND ((|HasCategory| |#1| '(|Ring|))) ('T - (QSETREFV $ 10 + (|setShellEntry| $ 10 (CONS (|dispatchFunction| |ABELSG-;*;Pi2S;1|) $)))) $)))) @@ -33,3 +34,20 @@ '(2 8 6 7 6 9 2 0 0 7 0 10 2 0 0 7 0 10))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|AbelianSemiGroup&| '|isFunctor| + '(((* ($ (|PositiveInteger|) $)) T (ELT $ 10))) + (|addModemap| '|AbelianSemiGroup&| + '(|AbelianSemiGroup&| |#1|) + '((CATEGORY |domain| + (SIGNATURE * (|#1| (|PositiveInteger|) |#1|))) + (|AbelianSemiGroup|)) + T '|AbelianSemiGroup&| + (|put| '|AbelianSemiGroup&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE * + (|#1| (|PositiveInteger|) |#1|))) + (|AbelianSemiGroup|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/ABELSG.lsp b/src/algebra/strap/ABELSG.lsp index 6ad00a8f..04305129 100644 --- a/src/algebra/strap/ABELSG.lsp +++ b/src/algebra/strap/ABELSG.lsp @@ -4,13 +4,13 @@ (DEFPARAMETER |AbelianSemiGroup;AL| 'NIL) (DEFUN |AbelianSemiGroup| () - (LET (#:G1387) + (LET (#:G1396) (COND (|AbelianSemiGroup;AL|) (T (SETQ |AbelianSemiGroup;AL| (|AbelianSemiGroup;|)))))) (DEFUN |AbelianSemiGroup;| () - (PROG (#0=#:G1385) + (PROG (#0=#:G1394) (RETURN (PROG1 (LETT #0# (|Join| (|SetCategory|) @@ -21,4 +21,10 @@ |AbelianSemiGroup|) (SETELT #0# 0 '(|AbelianSemiGroup|)))))) +(SETQ |$CategoryFrame| + (|put| '|AbelianSemiGroup| '|isCategory| T + (|addModemap| '|AbelianSemiGroup| '(|AbelianSemiGroup|) + '((|Category|)) T '|AbelianSemiGroup| + |$CategoryFrame|))) + (MAKEPROP '|AbelianSemiGroup| 'NILADIC T) diff --git a/src/algebra/strap/ALAGG.lsp b/src/algebra/strap/ALAGG.lsp index e42de7db..e0bdfbf1 100644 --- a/src/algebra/strap/ALAGG.lsp +++ b/src/algebra/strap/ALAGG.lsp @@ -5,9 +5,9 @@ (DEFPARAMETER |AssociationListAggregate;AL| 'NIL) -(DEFUN |AssociationListAggregate| (&REST #0=#:G1397 &AUX #1=#:G1395) +(DEFUN |AssociationListAggregate| (&REST #0=#:G1399 &AUX #1=#:G1397) (DSETQ #1# #0#) - (LET (#2=#:G1396) + (LET (#2=#:G1398) (COND ((SETQ #2# (|assoc| (|devaluateList| #1#) @@ -22,7 +22,7 @@ #2#)))) (DEFUN |AssociationListAggregate;| (|t#1| |t#2|) - (PROG (#0=#:G1394) + (PROG (#0=#:G1396) (RETURN (PROG1 (LETT #0# (|sublisV| @@ -30,7 +30,7 @@ (LIST (|devaluate| |t#1|) (|devaluate| |t#2|))) (|sublisV| - (PAIR '(#1=#:G1393) + (PAIR '(#1=#:G1395) (LIST '(|Record| (|:| |key| |t#1|) (|:| |entry| |t#2|)))) (COND @@ -53,3 +53,10 @@ (SETELT #0# 0 (LIST '|AssociationListAggregate| (|devaluate| |t#1|) (|devaluate| |t#2|))))))) + +(SETQ |$CategoryFrame| + (|put| '|AssociationListAggregate| '|isCategory| T + (|addModemap| '|AssociationListAggregate| + '(|AssociationListAggregate| |#1| |#2|) + '((|Category|) (|SetCategory|) (|SetCategory|)) T + '|AssociationListAggregate| |$CategoryFrame|))) diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp index bca63812..7a141b8b 100644 --- a/src/algebra/strap/BOOLEAN.lsp +++ b/src/algebra/strap/BOOLEAN.lsp @@ -38,9 +38,9 @@ (DEFUN |BOOLEAN;nand;3$;14| (|a| |b| $) (COND (|a| (|BOOLEAN;nt| |b| $)) ('T 'T))) -(PUT '|BOOLEAN;=;2$B;15| '|SPADreplace| 'EQ) +(PUT '|BOOLEAN;=;3$;15| '|SPADreplace| 'EQ) -(DEFUN |BOOLEAN;=;2$B;15| (|a| |b| $) (EQ |a| |b|)) +(DEFUN |BOOLEAN;=;3$;15| (|a| |b| $) (EQ |a| |b|)) (DEFUN |BOOLEAN;implies;3$;16| (|a| |b| $) (COND (|a| |b|) ('T 'T))) @@ -48,7 +48,7 @@ (DEFUN |BOOLEAN;equiv;3$;17| (|a| |b| $) (EQ |a| |b|)) -(DEFUN |BOOLEAN;<;2$B;18| (|a| |b| $) +(DEFUN |BOOLEAN;<;3$;18| (|a| |b| $) (COND (|b| (|BOOLEAN;nt| |a| $)) ('T 'NIL))) (PUT '|BOOLEAN;size;Nni;19| '|SPADreplace| '(XLAM NIL 2)) @@ -79,7 +79,7 @@ (DEFUN |Boolean| () (PROG () (RETURN - (PROG (#0=#:G1421) + (PROG (#0=#:G1423) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|Boolean|) |Boolean|) @@ -116,8 +116,8 @@ |BOOLEAN;and;3$;8| |BOOLEAN;/\\;3$;9| |BOOLEAN;or;3$;10| |BOOLEAN;\\/;3$;11| |BOOLEAN;xor;3$;12| |BOOLEAN;nor;3$;13| |BOOLEAN;nand;3$;14| (|Boolean|) - |BOOLEAN;=;2$B;15| |BOOLEAN;implies;3$;16| - |BOOLEAN;equiv;3$;17| |BOOLEAN;<;2$B;18| + |BOOLEAN;=;3$;15| |BOOLEAN;implies;3$;16| + |BOOLEAN;equiv;3$;17| |BOOLEAN;<;3$;18| (|NonNegativeInteger|) |BOOLEAN;size;Nni;19| (|Integer|) (0 . |even?|) (|PositiveInteger|) |BOOLEAN;index;Pi$;20| |BOOLEAN;lookup;$Pi;21| |BOOLEAN;random;$;22| (|String|) @@ -153,4 +153,64 @@ 0 0 13))))) '|lookupComplete|)) +(SETQ |$CategoryFrame| + (|put| '|Boolean| '|isFunctor| + '(((|test| ($ $)) T (ELT $ 6)) + ((|nor| ($ $ $)) T (ELT $ 17)) + ((|nand| ($ $ $)) T (ELT $ 18)) + ((|xor| ($ $ $)) T (ELT $ 16)) ((^ ($ $)) T (ELT $ 10)) + ((|false| ($)) T (CONST $ 8)) + ((|true| ($)) T (CONST $ 7)) + ((|convert| ((|InputForm|) $)) T (ELT $ 37)) + ((|equiv| ($ $ $)) T (ELT $ 22)) + ((|implies| ($ $ $)) T (ELT $ 21)) + ((|or| ($ $ $)) T (ELT $ 14)) + ((|and| ($ $ $)) T (ELT $ 12)) + ((|not| ($ $)) T (ELT $ 9)) ((~ ($ $)) T (ELT $ 11)) + ((|/\\| ($ $ $)) T (ELT $ 13)) + ((|\\/| ($ $ $)) T (ELT $ 15)) + ((|size| ((|NonNegativeInteger|))) T (ELT $ 25)) + ((|index| ($ (|PositiveInteger|))) T (ELT $ 29)) + ((|lookup| ((|PositiveInteger|) $)) T (ELT $ 30)) + ((|random| ($)) T (ELT $ 31)) + ((|min| ($ $ $)) T (ELT $ NIL)) + ((|max| ($ $ $)) T (ELT $ NIL)) + ((<= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((>= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((> ((|Boolean|) $ $)) T (ELT $ NIL)) + ((< ((|Boolean|) $ $)) T (ELT $ 23)) + ((|latex| ((|String|) $)) T (ELT $ NIL)) + ((|hash| ((|SingleInteger|) $)) T (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ 40)) + ((= ((|Boolean|) $ $)) T (ELT $ 20)) + ((~= ((|Boolean|) $ $)) T (ELT $ NIL))) + (|addModemap| '|Boolean| '(|Boolean|) + '((|Join| (|OrderedSet|) (|Finite|) (|Logic|) + (|PropositionalLogic|) + (|ConvertibleTo| (|InputForm|)) + (CATEGORY |domain| + (SIGNATURE |true| ($) |constant|) + (SIGNATURE |false| ($) |constant|) + (SIGNATURE ^ ($ $)) + (SIGNATURE |xor| ($ $ $)) + (SIGNATURE |nand| ($ $ $)) + (SIGNATURE |nor| ($ $ $)) + (SIGNATURE |test| ($ $))))) + T '|Boolean| + (|put| '|Boolean| '|mode| + '(|Mapping| + (|Join| (|OrderedSet|) (|Finite|) + (|Logic|) (|PropositionalLogic|) + (|ConvertibleTo| (|InputForm|)) + (CATEGORY |domain| + (SIGNATURE |true| ($) |constant|) + (SIGNATURE |false| ($) + |constant|) + (SIGNATURE ^ ($ $)) + (SIGNATURE |xor| ($ $ $)) + (SIGNATURE |nand| ($ $ $)) + (SIGNATURE |nor| ($ $ $)) + (SIGNATURE |test| ($ $))))) + |$CategoryFrame|)))) + (MAKEPROP '|Boolean| 'NILADIC T) diff --git a/src/algebra/strap/CABMON.lsp b/src/algebra/strap/CABMON.lsp index d1059b38..0d547bd5 100644 --- a/src/algebra/strap/CABMON.lsp +++ b/src/algebra/strap/CABMON.lsp @@ -4,14 +4,14 @@ (DEFPARAMETER |CancellationAbelianMonoid;AL| 'NIL) (DEFUN |CancellationAbelianMonoid| () - (LET (#:G1387) + (LET (#:G1396) (COND (|CancellationAbelianMonoid;AL|) (T (SETQ |CancellationAbelianMonoid;AL| (|CancellationAbelianMonoid;|)))))) (DEFUN |CancellationAbelianMonoid;| () - (PROG (#0=#:G1385) + (PROG (#0=#:G1394) (RETURN (PROG1 (LETT #0# (|Join| (|AbelianMonoid|) @@ -23,4 +23,10 @@ |CancellationAbelianMonoid|) (SETELT #0# 0 '(|CancellationAbelianMonoid|)))))) +(SETQ |$CategoryFrame| + (|put| '|CancellationAbelianMonoid| '|isCategory| T + (|addModemap| '|CancellationAbelianMonoid| + '(|CancellationAbelianMonoid|) '((|Category|)) T + '|CancellationAbelianMonoid| |$CategoryFrame|))) + (MAKEPROP '|CancellationAbelianMonoid| 'NILADIC T) diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp index 1395d670..e96dad54 100644 --- a/src/algebra/strap/CHAR.lsp +++ b/src/algebra/strap/CHAR.lsp @@ -14,17 +14,17 @@ (DEFUN |CHAR;size;Nni;3| ($) 256) (DEFUN |CHAR;index;Pi$;4| (|n| $) - (PROG (#0=#:G1389) + (PROG (#0=#:G1398) (RETURN (SPADCALL (PROG1 (LETT #0# (- |n| 1) |CHAR;index;Pi$;4|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (QREFELT $ 11))))) + (|getShellEntry| $ 11))))) (DEFUN |CHAR;lookup;$Pi;5| (|c| $) - (PROG (#0=#:G1391) + (PROG (#0=#:G1400) (RETURN - (PROG1 (LETT #0# (+ 1 (SPADCALL |c| (QREFELT $ 14))) + (PROG1 (LETT #0# (+ 1 (SPADCALL |c| (|getShellEntry| $ 14))) |CHAR;lookup;$Pi;5|) (|check-subtype| (> #0# 0) '(|PositiveInteger|) #0#))))) @@ -37,7 +37,8 @@ (DEFUN |CHAR;ord;$Nni;7| (|c| $) (CHAR-CODE |c|)) (DEFUN |CHAR;random;$;8| ($) - (SPADCALL (RANDOM (SPADCALL (QREFELT $ 10))) (QREFELT $ 11))) + (SPADCALL (RANDOM (SPADCALL (|getShellEntry| $ 10))) + (|getShellEntry| $ 11))) (PUT '|CHAR;space;$;9| '|SPADreplace| '(XLAM NIL (CHAR " " 0))) @@ -56,22 +57,22 @@ (DEFUN |CHAR;coerce;$Of;12| (|c| $) |c|) (DEFUN |CHAR;digit?;$B;13| (|c| $) - (SPADCALL |c| (|spadConstant| $ 23) (QREFELT $ 25))) + (SPADCALL |c| (|spadConstant| $ 23) (|getShellEntry| $ 25))) (DEFUN |CHAR;hexDigit?;$B;14| (|c| $) - (SPADCALL |c| (|spadConstant| $ 27) (QREFELT $ 25))) + (SPADCALL |c| (|spadConstant| $ 27) (|getShellEntry| $ 25))) (DEFUN |CHAR;upperCase?;$B;15| (|c| $) - (SPADCALL |c| (|spadConstant| $ 29) (QREFELT $ 25))) + (SPADCALL |c| (|spadConstant| $ 29) (|getShellEntry| $ 25))) (DEFUN |CHAR;lowerCase?;$B;16| (|c| $) - (SPADCALL |c| (|spadConstant| $ 31) (QREFELT $ 25))) + (SPADCALL |c| (|spadConstant| $ 31) (|getShellEntry| $ 25))) (DEFUN |CHAR;alphabetic?;$B;17| (|c| $) - (SPADCALL |c| (|spadConstant| $ 33) (QREFELT $ 25))) + (SPADCALL |c| (|spadConstant| $ 33) (|getShellEntry| $ 25))) (DEFUN |CHAR;alphanumeric?;$B;18| (|c| $) - (SPADCALL |c| (|spadConstant| $ 35) (QREFELT $ 25))) + (SPADCALL |c| (|spadConstant| $ 35) (|getShellEntry| $ 25))) (DEFUN |CHAR;latex;$S;19| (|c| $) (STRCONC "\\mbox{`" (STRCONC (MAKE-FULL-CVEC 1 |c|) "'}"))) @@ -79,7 +80,8 @@ (DEFUN |CHAR;char;S$;20| (|s| $) (COND ((EQL (QCSIZE |s|) 1) - (SPADCALL |s| (SPADCALL |s| (QREFELT $ 40)) (QREFELT $ 41))) + (SPADCALL |s| (SPADCALL |s| (|getShellEntry| $ 40)) + (|getShellEntry| $ 41))) ('T (|userError| "String is not a single character")))) (PUT '|CHAR;upperCase;2$;21| '|SPADreplace| 'CHAR-UPCASE) @@ -93,7 +95,7 @@ (DEFUN |Character| () (PROG () (RETURN - (PROG (#0=#:G1412) + (PROG (#0=#:G1421) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|Character|) @@ -114,8 +116,9 @@ (PROGN (LETT |dv$| '(|Character|) . #0=(|Character|)) (LETT $ (|newShell| 46) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|haddProp| |$ConstructorCache| '|Character| NIL (CONS 1 $)) (|stuffDomainSlots| $) $)))) @@ -165,4 +168,85 @@ 0 1 2 0 6 0 0 8))))) '|lookupComplete|)) +(SETQ |$CategoryFrame| + (|put| '|Character| '|isFunctor| + '(((|alphanumeric?| ((|Boolean|) $)) T (ELT $ 36)) + ((|lowerCase?| ((|Boolean|) $)) T (ELT $ 32)) + ((|upperCase?| ((|Boolean|) $)) T (ELT $ 30)) + ((|alphabetic?| ((|Boolean|) $)) T (ELT $ 34)) + ((|hexDigit?| ((|Boolean|) $)) T (ELT $ 28)) + ((|digit?| ((|Boolean|) $)) T (ELT $ 26)) + ((|lowerCase| ($ $)) T (ELT $ 44)) + ((|upperCase| ($ $)) T (ELT $ 43)) + ((|escape| ($)) T (ELT $ 19)) + ((|quote| ($)) T (ELT $ 18)) + ((|space| ($)) T (ELT $ 17)) + ((|char| ($ (|String|))) T (ELT $ 42)) + ((|char| ($ (|NonNegativeInteger|))) T (ELT $ 11)) + ((|ord| ((|NonNegativeInteger|) $)) T (ELT $ 14)) + ((|size| ((|NonNegativeInteger|))) T (ELT $ 10)) + ((|index| ($ (|PositiveInteger|))) T (ELT $ 13)) + ((|lookup| ((|PositiveInteger|) $)) T (ELT $ 15)) + ((|random| ($)) T (ELT $ 16)) + ((|min| ($ $ $)) T (ELT $ NIL)) + ((|max| ($ $ $)) T (ELT $ NIL)) + ((<= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((>= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((> ((|Boolean|) $ $)) T (ELT $ NIL)) + ((< ((|Boolean|) $ $)) T (ELT $ 8)) + ((|latex| ((|String|) $)) T (ELT $ 38)) + ((|hash| ((|SingleInteger|) $)) T (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ 21)) + ((= ((|Boolean|) $ $)) T (ELT $ 7)) + ((~= ((|Boolean|) $ $)) T (ELT $ NIL))) + (|addModemap| '|Character| '(|Character|) + '((|Join| (|OrderedFinite|) + (CATEGORY |domain| + (SIGNATURE |ord| + ((|NonNegativeInteger|) $)) + (SIGNATURE |char| + ($ (|NonNegativeInteger|))) + (SIGNATURE |char| ($ (|String|))) + (SIGNATURE |space| ($)) + (SIGNATURE |quote| ($)) + (SIGNATURE |escape| ($)) + (SIGNATURE |upperCase| ($ $)) + (SIGNATURE |lowerCase| ($ $)) + (SIGNATURE |digit?| ((|Boolean|) $)) + (SIGNATURE |hexDigit?| ((|Boolean|) $)) + (SIGNATURE |alphabetic?| + ((|Boolean|) $)) + (SIGNATURE |upperCase?| ((|Boolean|) $)) + (SIGNATURE |lowerCase?| ((|Boolean|) $)) + (SIGNATURE |alphanumeric?| + ((|Boolean|) $))))) + T '|Character| + (|put| '|Character| '|mode| + '(|Mapping| + (|Join| (|OrderedFinite|) + (CATEGORY |domain| + (SIGNATURE |ord| + ((|NonNegativeInteger|) $)) + (SIGNATURE |char| + ($ (|NonNegativeInteger|))) + (SIGNATURE |char| ($ (|String|))) + (SIGNATURE |space| ($)) + (SIGNATURE |quote| ($)) + (SIGNATURE |escape| ($)) + (SIGNATURE |upperCase| ($ $)) + (SIGNATURE |lowerCase| ($ $)) + (SIGNATURE |digit?| + ((|Boolean|) $)) + (SIGNATURE |hexDigit?| + ((|Boolean|) $)) + (SIGNATURE |alphabetic?| + ((|Boolean|) $)) + (SIGNATURE |upperCase?| + ((|Boolean|) $)) + (SIGNATURE |lowerCase?| + ((|Boolean|) $)) + (SIGNATURE |alphanumeric?| + ((|Boolean|) $))))) + |$CategoryFrame|)))) + (MAKEPROP '|Character| 'NILADIC T) diff --git a/src/algebra/strap/CLAGG-.lsp b/src/algebra/strap/CLAGG-.lsp index 0306e826..8664a956 100644 --- a/src/algebra/strap/CLAGG-.lsp +++ b/src/algebra/strap/CLAGG-.lsp @@ -2,15 +2,15 @@ (/VERSIONCHECK 2) (DEFUN |CLAGG-;#;ANni;1| (|c| $) - (LENGTH (SPADCALL |c| (QREFELT $ 9)))) + (LENGTH (SPADCALL |c| (|getShellEntry| $ 9)))) (DEFUN |CLAGG-;count;MANni;2| (|f| |c| $) - (PROG (|x| #0=#:G1406 #1=#:G1403 #2=#:G1401 #3=#:G1402) + (PROG (|x| #0=#:G1403 #1=#:G1400 #2=#:G1398 #3=#:G1399) (RETURN (SEQ (PROGN (LETT #3# NIL |CLAGG-;count;MANni;2|) (SEQ (LETT |x| NIL |CLAGG-;count;MANni;2|) - (LETT #0# (SPADCALL |c| (QREFELT $ 9)) + (LETT #0# (SPADCALL |c| (|getShellEntry| $ 9)) |CLAGG-;count;MANni;2|) G190 (COND @@ -38,12 +38,12 @@ (COND (#3# #2#) ('T 0))))))) (DEFUN |CLAGG-;any?;MAB;3| (|f| |c| $) - (PROG (|x| #0=#:G1411 #1=#:G1409 #2=#:G1407 #3=#:G1408) + (PROG (|x| #0=#:G1408 #1=#:G1406 #2=#:G1404 #3=#:G1405) (RETURN (SEQ (PROGN (LETT #3# NIL |CLAGG-;any?;MAB;3|) (SEQ (LETT |x| NIL |CLAGG-;any?;MAB;3|) - (LETT #0# (SPADCALL |c| (QREFELT $ 9)) + (LETT #0# (SPADCALL |c| (|getShellEntry| $ 9)) |CLAGG-;any?;MAB;3|) G190 (COND @@ -68,12 +68,12 @@ (COND (#3# #2#) ('T 'NIL))))))) (DEFUN |CLAGG-;every?;MAB;4| (|f| |c| $) - (PROG (|x| #0=#:G1416 #1=#:G1414 #2=#:G1412 #3=#:G1413) + (PROG (|x| #0=#:G1413 #1=#:G1411 #2=#:G1409 #3=#:G1410) (RETURN (SEQ (PROGN (LETT #3# NIL |CLAGG-;every?;MAB;4|) (SEQ (LETT |x| NIL |CLAGG-;every?;MAB;4|) - (LETT #0# (SPADCALL |c| (QREFELT $ 9)) + (LETT #0# (SPADCALL |c| (|getShellEntry| $ 9)) |CLAGG-;every?;MAB;4|) G190 (COND @@ -99,35 +99,44 @@ (COND (#3# #2#) ('T 'T))))))) (DEFUN |CLAGG-;find;MAU;5| (|f| |c| $) - (SPADCALL |f| (SPADCALL |c| (QREFELT $ 9)) (QREFELT $ 18))) + (SPADCALL |f| (SPADCALL |c| (|getShellEntry| $ 9)) + (|getShellEntry| $ 18))) (DEFUN |CLAGG-;reduce;MAS;6| (|f| |x| $) - (SPADCALL |f| (SPADCALL |x| (QREFELT $ 9)) (QREFELT $ 21))) + (SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9)) + (|getShellEntry| $ 21))) (DEFUN |CLAGG-;reduce;MA2S;7| (|f| |x| |s| $) - (SPADCALL |f| (SPADCALL |x| (QREFELT $ 9)) |s| (QREFELT $ 23))) + (SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9)) |s| + (|getShellEntry| $ 23))) (DEFUN |CLAGG-;remove;M2A;8| (|f| |x| $) - (SPADCALL (SPADCALL |f| (SPADCALL |x| (QREFELT $ 9)) (QREFELT $ 25)) - (QREFELT $ 26))) + (SPADCALL (SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9)) + (|getShellEntry| $ 25)) + (|getShellEntry| $ 26))) (DEFUN |CLAGG-;select;M2A;9| (|f| |x| $) - (SPADCALL (SPADCALL |f| (SPADCALL |x| (QREFELT $ 9)) (QREFELT $ 28)) - (QREFELT $ 26))) + (SPADCALL (SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9)) + (|getShellEntry| $ 28)) + (|getShellEntry| $ 26))) (DEFUN |CLAGG-;remove;S2A;10| (|s| |x| $) (SPADCALL (CONS #'|CLAGG-;remove;S2A;10!0| (VECTOR $ |s|)) |x| - (QREFELT $ 31))) + (|getShellEntry| $ 31))) (DEFUN |CLAGG-;remove;S2A;10!0| (|#1| $$) - (SPADCALL |#1| (QREFELT $$ 1) (QREFELT (QREFELT $$ 0) 30))) + (SPADCALL |#1| (|getShellEntry| $$ 1) + (|getShellEntry| (|getShellEntry| $$ 0) 30))) (DEFUN |CLAGG-;reduce;MA3S;11| (|f| |x| |s1| |s2| $) - (SPADCALL |f| (SPADCALL |x| (QREFELT $ 9)) |s1| |s2| (QREFELT $ 33))) + (SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9)) |s1| |s2| + (|getShellEntry| $ 33))) (DEFUN |CLAGG-;removeDuplicates;2A;12| (|x| $) - (SPADCALL (SPADCALL (SPADCALL |x| (QREFELT $ 9)) (QREFELT $ 35)) - (QREFELT $ 26))) + (SPADCALL + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 9)) + (|getShellEntry| $ 35)) + (|getShellEntry| $ 26))) (DEFUN |Collection&| (|#1| |#2|) (PROG (|dv$1| |dv$2| |dv$| $ |pv$|) @@ -136,9 +145,9 @@ (LETT |dv$1| (|devaluate| |#1|) . #0=(|Collection&|)) (LETT |dv$2| (|devaluate| |#2|) . #0#) (LETT |dv$| (LIST '|Collection&| |dv$1| |dv$2|) . #0#) - (LETT $ (GETREFV 37) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 + (LETT $ (|newShell| 37) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 (LIST (|HasCategory| |#2| @@ -146,40 +155,40 @@ (|HasCategory| |#2| '(|SetCategory|)) (|HasAttribute| |#1| '|finiteAggregate|))) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) - (QSETREFV $ 7 |#2|) + (|setShellEntry| $ 6 |#1|) + (|setShellEntry| $ 7 |#2|) (COND ((|testBitVector| |pv$| 3) (PROGN - (QSETREFV $ 11 + (|setShellEntry| $ 11 (CONS (|dispatchFunction| |CLAGG-;#;ANni;1|) $)) - (QSETREFV $ 13 + (|setShellEntry| $ 14 (CONS (|dispatchFunction| |CLAGG-;count;MANni;2|) $)) - (QSETREFV $ 15 + (|setShellEntry| $ 15 (CONS (|dispatchFunction| |CLAGG-;any?;MAB;3|) $)) - (QSETREFV $ 16 + (|setShellEntry| $ 16 (CONS (|dispatchFunction| |CLAGG-;every?;MAB;4|) $)) - (QSETREFV $ 19 + (|setShellEntry| $ 19 (CONS (|dispatchFunction| |CLAGG-;find;MAU;5|) $)) - (QSETREFV $ 22 + (|setShellEntry| $ 22 (CONS (|dispatchFunction| |CLAGG-;reduce;MAS;6|) $)) - (QSETREFV $ 24 + (|setShellEntry| $ 24 (CONS (|dispatchFunction| |CLAGG-;reduce;MA2S;7|) $)) - (QSETREFV $ 27 + (|setShellEntry| $ 27 (CONS (|dispatchFunction| |CLAGG-;remove;M2A;8|) $)) - (QSETREFV $ 29 + (|setShellEntry| $ 29 (CONS (|dispatchFunction| |CLAGG-;select;M2A;9|) $)) (COND ((|testBitVector| |pv$| 2) (PROGN - (QSETREFV $ 32 + (|setShellEntry| $ 32 (CONS (|dispatchFunction| |CLAGG-;remove;S2A;10|) $)) - (QSETREFV $ 34 + (|setShellEntry| $ 34 (CONS (|dispatchFunction| |CLAGG-;reduce;MA3S;11|) $)) - (QSETREFV $ 36 + (|setShellEntry| $ 36 (CONS (|dispatchFunction| |CLAGG-;removeDuplicates;2A;12|) $)))))))) @@ -188,7 +197,7 @@ (MAKEPROP '|Collection&| '|infovec| (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) (|List| 7) (0 . |parts|) (|NonNegativeInteger|) (5 . |#|) - (|Mapping| 14 7) (10 . |count|) (|Boolean|) (16 . |any?|) + (|Boolean|) (|Mapping| 12 7) (10 . |count|) (16 . |any?|) (22 . |every?|) (|Union| 7 '"failed") (28 . |find|) (34 . |find|) (|Mapping| 7 7 7) (40 . |reduce|) (46 . |reduce|) (52 . |reduce|) (59 . |reduce|) @@ -204,18 +213,122 @@ (CONS '#() (CONS '#() (|makeByteWordVec2| 36 - '(1 6 8 0 9 1 0 10 0 11 2 0 10 12 0 13 - 2 0 14 12 0 15 2 0 14 12 0 16 2 8 17 - 12 0 18 2 0 17 12 0 19 2 8 7 20 0 21 + '(1 6 8 0 9 1 0 10 0 11 2 0 10 13 0 14 + 2 0 12 13 0 15 2 0 12 13 0 16 2 8 17 + 13 0 18 2 0 17 13 0 19 2 8 7 20 0 21 2 0 7 20 0 22 3 8 7 20 0 7 23 3 0 7 - 20 0 7 24 2 8 0 12 0 25 1 6 0 8 26 2 - 0 0 12 0 27 2 8 0 12 0 28 2 0 0 12 0 - 29 2 7 14 0 0 30 2 6 0 12 0 31 2 0 0 + 20 0 7 24 2 8 0 13 0 25 1 6 0 8 26 2 + 0 0 13 0 27 2 8 0 13 0 28 2 0 0 13 0 + 29 2 7 12 0 0 30 2 6 0 13 0 31 2 0 0 7 0 32 4 8 7 20 0 7 7 33 4 0 7 20 0 7 - 7 34 1 8 0 0 35 1 0 0 0 36 2 0 0 12 0 - 29 1 0 0 0 36 2 0 0 7 0 32 2 0 0 12 0 + 7 34 1 8 0 0 35 1 0 0 0 36 2 0 0 13 0 + 29 1 0 0 0 36 2 0 0 7 0 32 2 0 0 13 0 27 4 0 7 20 0 7 7 34 3 0 7 20 0 7 24 - 2 0 7 20 0 22 2 0 17 12 0 19 2 0 14 - 12 0 16 2 0 10 12 0 13 2 0 14 12 0 15 + 2 0 7 20 0 22 2 0 17 13 0 19 2 0 12 + 13 0 16 2 0 10 13 0 14 2 0 12 13 0 15 1 0 10 0 11))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|Collection&| '|isFunctor| + '(((|removeDuplicates| ($ $)) T (ELT $ 36)) + ((|remove| ($ |#2| $)) T (ELT $ 32)) + ((|reduce| + (|#2| (|Mapping| |#2| |#2| |#2|) $ |#2| |#2|)) + T (ELT $ 34)) + ((|select| ($ (|Mapping| (|Boolean|) |#2|) $)) T + (ELT $ 29)) + ((|remove| ($ (|Mapping| (|Boolean|) |#2|) $)) T + (ELT $ 27)) + ((|reduce| (|#2| (|Mapping| |#2| |#2| |#2|) $ |#2|)) T + (ELT $ 24)) + ((|reduce| (|#2| (|Mapping| |#2| |#2| |#2|) $)) T + (ELT $ 22)) + ((|find| ((|Union| |#2| "failed") + (|Mapping| (|Boolean|) |#2|) $)) + T (ELT $ 19)) + ((|count| ((|NonNegativeInteger|) |#2| $)) T + (ELT $ NIL)) + ((|count| ((|NonNegativeInteger|) + (|Mapping| (|Boolean|) |#2|) $)) + T (ELT $ 14)) + ((|every?| ((|Boolean|) (|Mapping| (|Boolean|) |#2|) $)) + T (ELT $ 16)) + ((|any?| ((|Boolean|) (|Mapping| (|Boolean|) |#2|) $)) T + (ELT $ 15)) + ((|#| ((|NonNegativeInteger|) $)) T (ELT $ 11))) + (|addModemap| '|Collection&| '(|Collection&| |#1| |#2|) + '((CATEGORY |domain| + (SIGNATURE |removeDuplicates| (|#1| |#1|)) + (SIGNATURE |remove| (|#1| |#2| |#1|)) + (SIGNATURE |reduce| + (|#2| (|Mapping| |#2| |#2| |#2|) |#1| |#2| + |#2|)) + (SIGNATURE |select| + (|#1| (|Mapping| (|Boolean|) |#2|) |#1|)) + (SIGNATURE |remove| + (|#1| (|Mapping| (|Boolean|) |#2|) |#1|)) + (SIGNATURE |reduce| + (|#2| (|Mapping| |#2| |#2| |#2|) |#1| |#2|)) + (SIGNATURE |reduce| + (|#2| (|Mapping| |#2| |#2| |#2|) |#1|)) + (SIGNATURE |find| + ((|Union| |#2| "failed") + (|Mapping| (|Boolean|) |#2|) |#1|)) + (SIGNATURE |count| + ((|NonNegativeInteger|) |#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|))) + (|Collection| |#2|) (|Type|)) + T '|Collection&| + (|put| '|Collection&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |removeDuplicates| + (|#1| |#1|)) + (SIGNATURE |remove| (|#1| |#2| |#1|)) + (SIGNATURE |reduce| + (|#2| (|Mapping| |#2| |#2| |#2|) + |#1| |#2| |#2|)) + (SIGNATURE |select| + (|#1| (|Mapping| (|Boolean|) |#2|) + |#1|)) + (SIGNATURE |remove| + (|#1| (|Mapping| (|Boolean|) |#2|) + |#1|)) + (SIGNATURE |reduce| + (|#2| (|Mapping| |#2| |#2| |#2|) + |#1| |#2|)) + (SIGNATURE |reduce| + (|#2| (|Mapping| |#2| |#2| |#2|) + |#1|)) + (SIGNATURE |find| + ((|Union| |#2| "failed") + (|Mapping| (|Boolean|) |#2|) + |#1|)) + (SIGNATURE |count| + ((|NonNegativeInteger|) |#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|))) + (|Collection| |#2|) (|Type|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/CLAGG.lsp b/src/algebra/strap/CLAGG.lsp index eb1fd581..1866f458 100644 --- a/src/algebra/strap/CLAGG.lsp +++ b/src/algebra/strap/CLAGG.lsp @@ -5,8 +5,8 @@ (DEFPARAMETER |Collection;AL| 'NIL) -(DEFUN |Collection| (#0=#:G1398) - (LET (#1=#:G1399) +(DEFUN |Collection| (#0=#:G1395) + (LET (#1=#:G1396) (COND ((SETQ #1# (|assoc| (|devaluate| #0#) |Collection;AL|)) (CDR #1#)) @@ -17,7 +17,7 @@ #1#)))) (DEFUN |Collection;| (|t#1|) - (PROG (#0=#:G1397) + (PROG (#0=#:G1394) (RETURN (PROG1 (LETT #0# (|sublisV| @@ -102,3 +102,9 @@ '((|List| |t#1|)) NIL)) . #1=(|Collection|))))) . #1#) (SETELT #0# 0 (LIST '|Collection| (|devaluate| |t#1|))))))) + +(SETQ |$CategoryFrame| + (|put| '|Collection| '|isCategory| T + (|addModemap| '|Collection| '(|Collection| |#1|) + '((|Category|) (|Type|)) T '|Collection| + |$CategoryFrame|))) diff --git a/src/algebra/strap/COMRING.lsp b/src/algebra/strap/COMRING.lsp index fc0f6ace..f0fb429e 100644 --- a/src/algebra/strap/COMRING.lsp +++ b/src/algebra/strap/COMRING.lsp @@ -4,13 +4,13 @@ (DEFPARAMETER |CommutativeRing;AL| 'NIL) (DEFUN |CommutativeRing| () - (LET (#:G1387) + (LET (#:G1396) (COND (|CommutativeRing;AL|) (T (SETQ |CommutativeRing;AL| (|CommutativeRing;|)))))) (DEFUN |CommutativeRing;| () - (PROG (#0=#:G1385) + (PROG (#0=#:G1394) (RETURN (PROG1 (LETT #0# (|Join| (|Ring|) (|BiModule| '$ '$) @@ -19,4 +19,9 @@ |CommutativeRing|) (SETELT #0# 0 '(|CommutativeRing|)))))) +(SETQ |$CategoryFrame| + (|put| '|CommutativeRing| '|isCategory| T + (|addModemap| '|CommutativeRing| '(|CommutativeRing|) + '((|Category|)) T '|CommutativeRing| |$CategoryFrame|))) + (MAKEPROP '|CommutativeRing| 'NILADIC T) diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index 84f447f4..f7fd7c17 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -71,7 +71,7 @@ (DEFUN |DFLOAT;precision;Pi;10| ($) (FLOAT-DIGITS 0.0)) (DEFUN |DFLOAT;bits;Pi;11| ($) - (PROG (#0=#:G1419) + (PROG (#0=#:G1421) (RETURN (COND ((EQL (FLOAT-RADIX 0.0) 2) (FLOAT-DIGITS 0.0)) @@ -317,9 +317,9 @@ (DEFUN |DFLOAT;float;2IPi$;72| (|ma| |ex| |b| $) (* |ma| (EXPT (FLOAT |b| MOST-POSITIVE-LONG-FLOAT) |ex|))) -(PUT '|DFLOAT;convert;$Df;73| '|SPADreplace| '(XLAM (|x|) |x|)) +(PUT '|DFLOAT;convert;2$;73| '|SPADreplace| '(XLAM (|x|) |x|)) -(DEFUN |DFLOAT;convert;$Df;73| (|x| $) |x|) +(DEFUN |DFLOAT;convert;2$;73| (|x| $) |x|) (DEFUN |DFLOAT;convert;$F;74| (|x| $) (SPADCALL |x| (|getShellEntry| $ 103))) @@ -348,7 +348,7 @@ (EXIT |theta|)))))))) (DEFUN |DFLOAT;retract;$F;77| (|x| $) - (PROG (#0=#:G1494) + (PROG (#0=#:G1496) (RETURN (SPADCALL |x| (PROG1 (LETT #0# (- (FLOAT-DIGITS 0.0) 1) @@ -357,7 +357,7 @@ (FLOAT-RADIX 0.0) (|getShellEntry| $ 107))))) (DEFUN |DFLOAT;retractIfCan;$U;78| (|x| $) - (PROG (#0=#:G1499) + (PROG (#0=#:G1501) (RETURN (CONS 0 (SPADCALL |x| @@ -393,7 +393,7 @@ (DEFUN |DFLOAT;abs;2$;82| (|x| $) (FLOAT-SIGN 1.0 |x|)) (DEFUN |DFLOAT;manexp| (|x| $) - (PROG (|s| #0=#:G1520 |me| |two53|) + (PROG (|s| #0=#:G1522 |me| |two53|) (RETURN (SEQ (EXIT (COND ((ZEROP |x|) (CONS 0 0)) @@ -429,9 +429,9 @@ #0# (EXIT #0#))))) (DEFUN |DFLOAT;rationalApproximation;$2NniF;84| (|f| |d| |b| $) - (PROG (|#G103| |nu| |ex| BASE #0=#:G1523 |de| |tol| |#G104| |q| |r| - |p2| |q2| #1=#:G1541 |#G105| |#G106| |p0| |p1| |#G107| - |#G108| |q0| |q1| |#G109| |#G110| |s| |t| #2=#:G1539) + (PROG (|#G103| |nu| |ex| BASE #0=#:G1525 |de| |tol| |#G104| |q| |r| + |p2| |q2| #1=#:G1543 |#G105| |#G106| |p0| |p1| |#G107| + |#G108| |q0| |q1| |#G109| |#G110| |s| |t| #2=#:G1541) (RETURN (SEQ (EXIT (SEQ (PROGN (LETT |#G103| (|DFLOAT;manexp| |f| $) @@ -552,7 +552,7 @@ #1# (EXIT #1#))))) (DEFUN |DFLOAT;**;$F$;85| (|x| |r| $) - (PROG (|n| |d| #0=#:G1550) + (PROG (|n| |d| #0=#:G1552) (RETURN (SEQ (EXIT (COND ((ZEROP |x|) @@ -618,7 +618,7 @@ (DEFUN |DoubleFloat| () (PROG () (RETURN - (PROG (#0=#:G1563) + (PROG (#0=#:G1565) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|DoubleFloat|) @@ -692,7 +692,7 @@ (|DoubleFloatSpecialFunctions|) (47 . |Gamma|) |DFLOAT;Gamma;2$;69| (52 . |Beta|) |DFLOAT;Beta;3$;70| |DFLOAT;wholePart;$I;71| |DFLOAT;float;2IPi$;72| - |DFLOAT;convert;$Df;73| (|Float|) (58 . |convert|) + |DFLOAT;convert;2$;73| (|Float|) (58 . |convert|) |DFLOAT;convert;$F;74| (|Fraction| 26) (|NonNegativeInteger|) |DFLOAT;rationalApproximation;$2NniF;84| @@ -757,8 +757,8 @@ |DivisionRing&| |IntegralDomain&| |Algebra&| |Algebra&| |DifferentialRing&| NIL |OrderedRing&| |Module&| NIL NIL |Module&| NIL - NIL NIL |Ring&| NIL NIL NIL NIL NIL NIL NIL - |AbelianGroup&| NIL NIL |AbelianMonoid&| + NIL |Ring&| NIL NIL NIL NIL NIL NIL NIL + |AbelianGroup&| NIL NIL NIL |AbelianMonoid&| |Monoid&| NIL |OrderedSet&| |AbelianSemiGroup&| |SemiGroup&| |TranscendentalFunctionCategory&| NIL @@ -780,17 +780,16 @@ (|CharacteristicZero|) (|OrderedRing|) (|Module| 105) (|EntireRing|) (|CommutativeRing|) (|Module| $$) - (|OrderedAbelianGroup|) (|BiModule| 105 105) (|BiModule| $$ $$) - (|Ring|) - (|OrderedCancellationAbelianMonoid|) + (|Ring|) (|OrderedAbelianGroup|) (|RightModule| 105) (|LeftModule| 105) (|LeftModule| $$) (|Rng|) (|RightModule| $$) - (|OrderedAbelianMonoid|) + (|OrderedCancellationAbelianMonoid|) (|AbelianGroup|) - (|OrderedAbelianSemiGroup|) + (|OrderedAbelianMonoid|) (|CancellationAbelianMonoid|) + (|OrderedAbelianSemiGroup|) (|AbelianMonoid|) (|Monoid|) (|PatternMatchable| 102) (|OrderedSet|) (|AbelianSemiGroup|) (|SemiGroup|) @@ -869,4 +868,269 @@ 106 0 1 2 0 0 24 0 31))))) '|lookupComplete|)) +(SETQ |$CategoryFrame| + (|put| '|DoubleFloat| '|isFunctor| + '(((|rationalApproximation| + ((|Fraction| (|Integer|)) $ (|NonNegativeInteger|) + (|NonNegativeInteger|))) + T (ELT $ 107)) + ((|rationalApproximation| + ((|Fraction| (|Integer|)) $ (|NonNegativeInteger|))) + T (ELT $ 108)) + ((|doubleFloatFormat| ((|String|) (|String|))) T + (ELT $ 8)) + ((|Beta| ($ $ $)) T (ELT $ 98)) + ((|Gamma| ($ $)) T (ELT $ 96)) + ((|atan| ($ $ $)) T (ELT $ 109)) + ((|log10| ($ $)) T (ELT $ 57)) + ((|log2| ($ $)) T (ELT $ 30)) + ((|hash| ((|Integer|) $)) T (ELT $ 90)) + ((|exp1| ($)) T (ELT $ 38)) + ((/ ($ $ (|Integer|))) T (ELT $ 55)) + ((|convert| ((|InputForm|) $)) T (ELT $ 45)) + ((|tan| ($ $)) T (ELT $ 65)) + ((|sin| ($ $)) T (ELT $ 63)) + ((|sec| ($ $)) T (ELT $ 67)) + ((|csc| ($ $)) T (ELT $ 68)) + ((|cot| ($ $)) T (ELT $ 66)) + ((|cos| ($ $)) T (ELT $ 64)) + ((|acos| ($ $)) T (ELT $ 70)) + ((|acot| ($ $)) T (ELT $ 73)) + ((|acsc| ($ $)) T (ELT $ 72)) + ((|asec| ($ $)) T (ELT $ 74)) + ((|asin| ($ $)) T (ELT $ 69)) + ((|atan| ($ $)) T (ELT $ 71)) + ((|cosh| ($ $)) T (ELT $ 76)) + ((|coth| ($ $)) T (ELT $ 79)) + ((|csch| ($ $)) T (ELT $ 78)) + ((|sech| ($ $)) T (ELT $ 80)) + ((|sinh| ($ $)) T (ELT $ 75)) + ((|tanh| ($ $)) T (ELT $ 77)) + ((|acosh| ($ $)) T (ELT $ 82)) + ((|acoth| ($ $)) T (ELT $ 85)) + ((|acsch| ($ $)) T (ELT $ 84)) + ((|asech| ($ $)) T (ELT $ 86)) + ((|asinh| ($ $)) T (ELT $ 81)) + ((|atanh| ($ $)) T (ELT $ 83)) + ((|log| ($ $)) T (ELT $ 62)) + ((|exp| ($ $)) T (ELT $ 61)) ((** ($ $ $)) T (ELT $ 59)) + ((|pi| ($)) T (ELT $ 39)) + ((|OMwrite| ((|Void|) (|OpenMathDevice|) $ (|Boolean|))) + T (ELT $ 23)) + ((|OMwrite| ((|Void|) (|OpenMathDevice|) $)) T + (ELT $ 22)) + ((|OMwrite| ((|String|) $ (|Boolean|))) T (ELT $ 21)) + ((|OMwrite| ((|String|) $)) T (ELT $ 19)) + ((|differentiate| ($ $)) T (ELT $ 93)) + ((D ($ $)) T (ELT $ NIL)) + ((|differentiate| ($ $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((D ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((|max| ($)) + (AND (|not| (|has| $ (ATTRIBUTE |arbitraryExponent|))) + (|not| (|has| $ (ATTRIBUTE |arbitraryPrecision|)))) + (ELT $ 33)) + ((|min| ($)) + (AND (|not| (|has| $ (ATTRIBUTE |arbitraryExponent|))) + (|not| (|has| $ (ATTRIBUTE |arbitraryPrecision|)))) + (ELT $ 34)) + ((|decreasePrecision| ((|PositiveInteger|) (|Integer|))) + (|has| $ (ATTRIBUTE |arbitraryPrecision|)) (ELT $ NIL)) + ((|increasePrecision| ((|PositiveInteger|) (|Integer|))) + (|has| $ (ATTRIBUTE |arbitraryPrecision|)) (ELT $ NIL)) + ((|precision| ((|PositiveInteger|) (|PositiveInteger|))) + (|has| $ (ATTRIBUTE |arbitraryPrecision|)) (ELT $ NIL)) + ((|digits| ((|PositiveInteger|) (|PositiveInteger|))) + (|has| $ (ATTRIBUTE |arbitraryPrecision|)) (ELT $ NIL)) + ((|bits| ((|PositiveInteger|) (|PositiveInteger|))) + (|has| $ (ATTRIBUTE |arbitraryPrecision|)) (ELT $ NIL)) + ((|precision| ((|PositiveInteger|))) T (ELT $ 29)) + ((|digits| ((|PositiveInteger|))) T (ELT $ NIL)) + ((|bits| ((|PositiveInteger|))) T (ELT $ 32)) + ((|mantissa| ((|Integer|) $)) T (ELT $ 27)) + ((|exponent| ((|Integer|) $)) T (ELT $ 28)) + ((|base| ((|PositiveInteger|))) T (ELT $ 25)) + ((|order| ((|Integer|) $)) T (ELT $ 35)) + ((|float| ($ (|Integer|) (|Integer|) + (|PositiveInteger|))) + T (ELT $ 100)) + ((|float| ($ (|Integer|) (|Integer|))) T (ELT $ NIL)) + ((|round| ($ $)) T (ELT $ NIL)) + ((|truncate| ($ $)) T (ELT $ NIL)) + ((|fractionPart| ($ $)) T (ELT $ NIL)) + ((|wholePart| ((|Integer|) $)) T (ELT $ 99)) + ((|floor| ($ $)) T (ELT $ NIL)) + ((|ceiling| ($ $)) T (ELT $ NIL)) + ((|norm| ($ $)) T (ELT $ NIL)) + ((|patternMatch| + ((|PatternMatchResult| (|Float|) $) $ + (|Pattern| (|Float|)) + (|PatternMatchResult| (|Float|) $))) + T (ELT $ NIL)) + ((|convert| ((|Pattern| (|Float|)) $)) T (ELT $ NIL)) + ((** ($ $ (|Fraction| (|Integer|)))) T (ELT $ 128)) + ((|nthRoot| ($ $ (|Integer|))) T (ELT $ NIL)) + ((|sqrt| ($ $)) T (ELT $ 56)) + ((|retract| ((|Fraction| (|Integer|)) $)) T (ELT $ 110)) + ((|retractIfCan| + ((|Union| (|Fraction| (|Integer|)) "failed") $)) + T (ELT $ 112)) + ((|coerce| ($ (|Fraction| (|Integer|)))) T (ELT $ NIL)) + ((|retract| ((|Integer|) $)) T (ELT $ 113)) + ((|retractIfCan| ((|Union| (|Integer|) "failed") $)) T + (ELT $ 115)) + ((|coerce| ($ (|Integer|))) T (ELT $ 60)) + ((|convert| ((|DoubleFloat|) $)) T (ELT $ 101)) + ((|convert| ((|Float|) $)) T (ELT $ 104)) + ((< ((|Boolean|) $ $)) T (ELT $ 46)) + ((> ((|Boolean|) $ $)) T (ELT $ NIL)) + ((>= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((<= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((|max| ($ $ $)) T (ELT $ 52)) + ((|min| ($ $ $)) T (ELT $ 53)) + ((|positive?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|negative?| ((|Boolean|) $)) T (ELT $ 88)) + ((|sign| ((|Integer|) $)) T (ELT $ 116)) + ((|abs| ($ $)) T (ELT $ 117)) ((/ ($ $ $)) T (ELT $ 87)) + ((|coerce| ($ (|Fraction| (|Integer|)))) T (ELT $ NIL)) + ((* ($ (|Fraction| (|Integer|)) $)) T (ELT $ NIL)) + ((* ($ $ (|Fraction| (|Integer|)))) T (ELT $ NIL)) + ((** ($ $ (|Integer|))) T (ELT $ 58)) + ((^ ($ $ (|Integer|))) T (ELT $ NIL)) + ((|inv| ($ $)) T (ELT $ NIL)) + ((|prime?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|squareFree| ((|Factored| $) $)) T (ELT $ NIL)) + ((|squareFreePart| ($ $)) T (ELT $ NIL)) + ((|factor| ((|Factored| $) $)) T (ELT $ NIL)) + ((|multiEuclidean| + ((|Union| (|List| $) "failed") (|List| $) $)) + T (ELT $ NIL)) + ((|extendedEuclidean| + ((|Union| (|Record| (|:| |coef1| $) + (|:| |coef2| $)) + "failed") + $ $ $)) + T (ELT $ NIL)) + ((|extendedEuclidean| + ((|Record| (|:| |coef1| $) (|:| |coef2| $) + (|:| |generator| $)) + $ $)) + T (ELT $ NIL)) + ((|rem| ($ $ $)) T (ELT $ NIL)) + ((|quo| ($ $ $)) T (ELT $ NIL)) + ((|divide| + ((|Record| (|:| |quotient| $) (|:| |remainder| $)) + $ $)) + T (ELT $ NIL)) + ((|euclideanSize| ((|NonNegativeInteger|) $)) T + (ELT $ NIL)) + ((|sizeLess?| ((|Boolean|) $ $)) T (ELT $ NIL)) + ((|expressIdealMember| + ((|Union| (|List| $) "failed") (|List| $) $)) + T (ELT $ NIL)) + ((|principalIdeal| + ((|Record| (|:| |coef| (|List| $)) + (|:| |generator| $)) + (|List| $))) + T (ELT $ NIL)) + ((|gcdPolynomial| + ((|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| $))) + T (ELT $ NIL)) + ((|lcm| ($ (|List| $))) T (ELT $ NIL)) + ((|lcm| ($ $ $)) T (ELT $ NIL)) + ((|gcd| ($ (|List| $))) T (ELT $ NIL)) + ((|gcd| ($ $ $)) T (ELT $ NIL)) + ((|unit?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|associates?| ((|Boolean|) $ $)) T (ELT $ NIL)) + ((|unitCanonical| ($ $)) T (ELT $ NIL)) + ((|unitNormal| + ((|Record| (|:| |unit| $) (|:| |canonical| $) + (|:| |associate| $)) + $)) + T (ELT $ NIL)) + ((|exquo| ((|Union| $ "failed") $ $)) T (ELT $ NIL)) + ((|coerce| ($ $)) T (ELT $ NIL)) + ((|coerce| ($ (|Integer|))) T (ELT $ 60)) + ((|characteristic| ((|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|One| ($)) T (CONST $ 37)) + ((|one?| ((|Boolean|) $)) T (ELT $ NIL)) + ((** ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((^ ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((|recip| ((|Union| $ "failed") $)) T (ELT $ 92)) + ((* ($ $ $)) T (ELT $ 50)) + ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL)) + ((^ ($ $ (|PositiveInteger|))) T (ELT $ NIL)) + ((* ($ (|Integer|) $)) T (ELT $ 51)) + ((- ($ $ $)) T (ELT $ 49)) ((- ($ $)) T (ELT $ 47)) + ((|subtractIfCan| ((|Union| $ "failed") $ $)) T + (ELT $ NIL)) + ((* ($ (|NonNegativeInteger|) $)) T (ELT $ NIL)) + ((|zero?| ((|Boolean|) $)) T (ELT $ 89)) + ((|sample| ($)) T (CONST $ NIL)) + ((|Zero| ($)) T (CONST $ 36)) + ((* ($ (|PositiveInteger|) $)) T (ELT $ 31)) + ((+ ($ $ $)) T (ELT $ 48)) + ((|latex| ((|String|) $)) T (ELT $ NIL)) + ((|hash| ((|SingleInteger|) $)) T (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ 42)) + ((= ((|Boolean|) $ $)) T (ELT $ 54)) + ((~= ((|Boolean|) $ $)) T (ELT $ NIL))) + (|addModemap| '|DoubleFloat| '(|DoubleFloat|) + '((|Join| (|FloatingPointSystem|) (|DifferentialRing|) + (|OpenMath|) + (|TranscendentalFunctionCategory|) + (|ConvertibleTo| (|InputForm|)) + (CATEGORY |domain| + (SIGNATURE / ($ $ (|Integer|))) + (SIGNATURE ** ($ $ $)) + (SIGNATURE |exp1| ($)) + (SIGNATURE |hash| ((|Integer|) $)) + (SIGNATURE |log2| ($ $)) + (SIGNATURE |log10| ($ $)) + (SIGNATURE |atan| ($ $ $)) + (SIGNATURE |Gamma| ($ $)) + (SIGNATURE |Beta| ($ $ $)) + (SIGNATURE |doubleFloatFormat| + ((|String|) (|String|))) + (SIGNATURE |rationalApproximation| + ((|Fraction| (|Integer|)) $ + (|NonNegativeInteger|))) + (SIGNATURE |rationalApproximation| + ((|Fraction| (|Integer|)) $ + (|NonNegativeInteger|) + (|NonNegativeInteger|)))))) + T '|DoubleFloat| + (|put| '|DoubleFloat| '|mode| + '(|Mapping| + (|Join| (|FloatingPointSystem|) + (|DifferentialRing|) (|OpenMath|) + (|TranscendentalFunctionCategory|) + (|ConvertibleTo| (|InputForm|)) + (CATEGORY |domain| + (SIGNATURE / ($ $ (|Integer|))) + (SIGNATURE ** ($ $ $)) + (SIGNATURE |exp1| ($)) + (SIGNATURE |hash| + ((|Integer|) $)) + (SIGNATURE |log2| ($ $)) + (SIGNATURE |log10| ($ $)) + (SIGNATURE |atan| ($ $ $)) + (SIGNATURE |Gamma| ($ $)) + (SIGNATURE |Beta| ($ $ $)) + (SIGNATURE |doubleFloatFormat| + ((|String|) (|String|))) + (SIGNATURE + |rationalApproximation| + ((|Fraction| (|Integer|)) $ + (|NonNegativeInteger|))) + (SIGNATURE + |rationalApproximation| + ((|Fraction| (|Integer|)) $ + (|NonNegativeInteger|) + (|NonNegativeInteger|)))))) + |$CategoryFrame|)))) + (MAKEPROP '|DoubleFloat| 'NILADIC T) diff --git a/src/algebra/strap/DIFRING-.lsp b/src/algebra/strap/DIFRING-.lsp index 1fb59bfb..8f7e8ff9 100644 --- a/src/algebra/strap/DIFRING-.lsp +++ b/src/algebra/strap/DIFRING-.lsp @@ -1,14 +1,15 @@ (/VERSIONCHECK 2) -(DEFUN |DIFRING-;D;2S;1| (|r| $) (SPADCALL |r| (QREFELT $ 7))) +(DEFUN |DIFRING-;D;2S;1| (|r| $) (SPADCALL |r| (|getShellEntry| $ 7))) (DEFUN |DIFRING-;differentiate;SNniS;2| (|r| |n| $) (PROG (|i|) (RETURN (SEQ (SEQ (LETT |i| 1 |DIFRING-;differentiate;SNniS;2|) G190 (COND ((QSGREATERP |i| |n|) (GO G191))) - (SEQ (EXIT (LETT |r| (SPADCALL |r| (QREFELT $ 7)) + (SEQ (EXIT (LETT |r| + (SPADCALL |r| (|getShellEntry| $ 7)) |DIFRING-;differentiate;SNniS;2|))) (LETT |i| (QSADD1 |i|) |DIFRING-;differentiate;SNniS;2|) @@ -16,7 +17,7 @@ (EXIT |r|))))) (DEFUN |DIFRING-;D;SNniS;3| (|r| |n| $) - (SPADCALL |r| |n| (QREFELT $ 11))) + (SPADCALL |r| |n| (|getShellEntry| $ 11))) (DEFUN |DifferentialRing&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -24,11 +25,12 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|DifferentialRing&|)) (LETT |dv$| (LIST '|DifferentialRing&| |dv$1|) . #0#) - (LETT $ (GETREFV 13) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 13) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) $)))) (MAKEPROP '|DifferentialRing&| '|infovec| @@ -44,3 +46,33 @@ '(1 6 0 0 7 2 6 0 0 9 11 2 0 0 0 9 10 2 0 0 0 9 12 1 0 0 0 8))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|DifferentialRing&| '|isFunctor| + '(((D ($ $ (|NonNegativeInteger|))) T (ELT $ 12)) + ((|differentiate| ($ $ (|NonNegativeInteger|))) T + (ELT $ 10)) + ((D ($ $)) T (ELT $ 8)) + ((|differentiate| ($ $)) T (ELT $ NIL))) + (|addModemap| '|DifferentialRing&| + '(|DifferentialRing&| |#1|) + '((CATEGORY |domain| + (SIGNATURE D (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE D (|#1| |#1|)) + (SIGNATURE |differentiate| (|#1| |#1|))) + (|DifferentialRing|)) + T '|DifferentialRing&| + (|put| '|DifferentialRing&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE D + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE D (|#1| |#1|)) + (SIGNATURE |differentiate| + (|#1| |#1|))) + (|DifferentialRing|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/DIFRING.lsp b/src/algebra/strap/DIFRING.lsp index 3c823149..621d91b3 100644 --- a/src/algebra/strap/DIFRING.lsp +++ b/src/algebra/strap/DIFRING.lsp @@ -4,13 +4,13 @@ (DEFPARAMETER |DifferentialRing;AL| 'NIL) (DEFUN |DifferentialRing| () - (LET (#:G1387) + (LET (#:G1396) (COND (|DifferentialRing;AL|) (T (SETQ |DifferentialRing;AL| (|DifferentialRing;|)))))) (DEFUN |DifferentialRing;| () - (PROG (#0=#:G1385) + (PROG (#0=#:G1394) (RETURN (PROG1 (LETT #0# (|Join| (|Ring|) @@ -25,4 +25,10 @@ |DifferentialRing|) (SETELT #0# 0 '(|DifferentialRing|)))))) +(SETQ |$CategoryFrame| + (|put| '|DifferentialRing| '|isCategory| T + (|addModemap| '|DifferentialRing| '(|DifferentialRing|) + '((|Category|)) T '|DifferentialRing| + |$CategoryFrame|))) + (MAKEPROP '|DifferentialRing| 'NILADIC T) diff --git a/src/algebra/strap/DIVRING-.lsp b/src/algebra/strap/DIVRING-.lsp index e3efca81..88bef6a2 100644 --- a/src/algebra/strap/DIVRING-.lsp +++ b/src/algebra/strap/DIVRING-.lsp @@ -2,25 +2,27 @@ (/VERSIONCHECK 2) (DEFUN |DIVRING-;^;SIS;1| (|x| |n| $) - (SPADCALL |x| |n| (QREFELT $ 8))) + (SPADCALL |x| |n| (|getShellEntry| $ 8))) (DEFUN |DIVRING-;**;SIS;2| (|x| |n| $) (COND ((ZEROP |n|) (|spadConstant| $ 10)) - ((SPADCALL |x| (QREFELT $ 12)) + ((SPADCALL |x| (|getShellEntry| $ 12)) (COND ((< |n| 0) (|error| "division by zero")) ('T |x|))) ((< |n| 0) - (SPADCALL (SPADCALL |x| (QREFELT $ 14)) (- |n|) (QREFELT $ 17))) - ('T (SPADCALL |x| |n| (QREFELT $ 17))))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 14)) (- |n|) + (|getShellEntry| $ 17))) + ('T (SPADCALL |x| |n| (|getShellEntry| $ 17))))) (DEFUN |DIVRING-;*;F2S;3| (|q| |x| $) (SPADCALL - (SPADCALL (SPADCALL |q| (QREFELT $ 20)) + (SPADCALL (SPADCALL |q| (|getShellEntry| $ 20)) (SPADCALL - (SPADCALL (SPADCALL |q| (QREFELT $ 21)) (QREFELT $ 22)) - (QREFELT $ 14)) - (QREFELT $ 23)) - |x| (QREFELT $ 24))) + (SPADCALL (SPADCALL |q| (|getShellEntry| $ 21)) + (|getShellEntry| $ 22)) + (|getShellEntry| $ 14)) + (|getShellEntry| $ 23)) + |x| (|getShellEntry| $ 24))) (DEFUN |DivisionRing&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -28,11 +30,12 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|DivisionRing&|)) (LETT |dv$| (LIST '|DivisionRing&| |dv$1|) . #0#) - (LETT $ (GETREFV 27) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 27) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) $)))) (MAKEPROP '|DivisionRing&| '|infovec| @@ -54,3 +57,64 @@ 23 2 6 0 0 0 24 2 0 0 0 7 9 2 0 0 0 7 18 2 0 0 19 0 25))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|DivisionRing&| '|isFunctor| + '(((^ ($ $ (|Integer|))) T (ELT $ 9)) + ((** ($ $ (|Integer|))) T (ELT $ 18)) + ((* ($ $ (|Fraction| (|Integer|)))) T (ELT $ NIL)) + ((* ($ (|Fraction| (|Integer|)) $)) T (ELT $ 25)) + ((** ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((^ ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((* ($ $ $)) T (ELT $ NIL)) + ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL)) + ((^ ($ $ (|PositiveInteger|))) T (ELT $ NIL)) + ((* ($ (|Integer|) $)) T (ELT $ NIL)) + ((* ($ (|NonNegativeInteger|) $)) T (ELT $ NIL)) + ((* ($ (|PositiveInteger|) $)) T (ELT $ NIL))) + (|addModemap| '|DivisionRing&| '(|DivisionRing&| |#1|) + '((CATEGORY |domain| + (SIGNATURE ^ (|#1| |#1| (|Integer|))) + (SIGNATURE ** (|#1| |#1| (|Integer|))) + (SIGNATURE * + (|#1| |#1| (|Fraction| (|Integer|)))) + (SIGNATURE * + (|#1| (|Fraction| (|Integer|)) |#1|)) + (SIGNATURE ** + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE ^ (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE * (|#1| |#1| |#1|)) + (SIGNATURE ** (|#1| |#1| (|PositiveInteger|))) + (SIGNATURE ^ (|#1| |#1| (|PositiveInteger|))) + (SIGNATURE * (|#1| (|Integer|) |#1|)) + (SIGNATURE * (|#1| (|NonNegativeInteger|) |#1|)) + (SIGNATURE * (|#1| (|PositiveInteger|) |#1|))) + (|DivisionRing|)) + T '|DivisionRing&| + (|put| '|DivisionRing&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE ^ (|#1| |#1| (|Integer|))) + (SIGNATURE ** (|#1| |#1| (|Integer|))) + (SIGNATURE * + (|#1| |#1| + (|Fraction| (|Integer|)))) + (SIGNATURE * + (|#1| (|Fraction| (|Integer|)) + |#1|)) + (SIGNATURE ** + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE ^ + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE * (|#1| |#1| |#1|)) + (SIGNATURE ** + (|#1| |#1| (|PositiveInteger|))) + (SIGNATURE ^ + (|#1| |#1| (|PositiveInteger|))) + (SIGNATURE * (|#1| (|Integer|) |#1|)) + (SIGNATURE * + (|#1| (|NonNegativeInteger|) |#1|)) + (SIGNATURE * + (|#1| (|PositiveInteger|) |#1|))) + (|DivisionRing|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/DIVRING.lsp b/src/algebra/strap/DIVRING.lsp index 2523c524..ca4bf2ab 100644 --- a/src/algebra/strap/DIVRING.lsp +++ b/src/algebra/strap/DIVRING.lsp @@ -4,17 +4,17 @@ (DEFPARAMETER |DivisionRing;AL| 'NIL) (DEFUN |DivisionRing| () - (LET (#:G1390) + (LET (#:G1399) (COND (|DivisionRing;AL|) (T (SETQ |DivisionRing;AL| (|DivisionRing;|)))))) (DEFUN |DivisionRing;| () - (PROG (#0=#:G1388) + (PROG (#0=#:G1397) (RETURN (PROG1 (LETT #0# (|sublisV| - (PAIR '(#1=#:G1387) + (PAIR '(#1=#:G1396) (LIST '(|Fraction| (|Integer|)))) (|Join| (|EntireRing|) (|Algebra| '#1#) (|mkCategory| '|domain| @@ -25,4 +25,9 @@ |DivisionRing|) (SETELT #0# 0 '(|DivisionRing|)))))) +(SETQ |$CategoryFrame| + (|put| '|DivisionRing| '|isCategory| T + (|addModemap| '|DivisionRing| '(|DivisionRing|) + '((|Category|)) T '|DivisionRing| |$CategoryFrame|))) + (MAKEPROP '|DivisionRing| 'NILADIC T) diff --git a/src/algebra/strap/ENTIRER.lsp b/src/algebra/strap/ENTIRER.lsp index 1de80763..50101a98 100644 --- a/src/algebra/strap/ENTIRER.lsp +++ b/src/algebra/strap/ENTIRER.lsp @@ -4,13 +4,13 @@ (DEFPARAMETER |EntireRing;AL| 'NIL) (DEFUN |EntireRing| () - (LET (#:G1387) + (LET (#:G1396) (COND (|EntireRing;AL|) (T (SETQ |EntireRing;AL| (|EntireRing;|)))))) (DEFUN |EntireRing;| () - (PROG (#0=#:G1385) + (PROG (#0=#:G1394) (RETURN (PROG1 (LETT #0# (|Join| (|Ring|) (|BiModule| '$ '$) @@ -19,4 +19,9 @@ |EntireRing|) (SETELT #0# 0 '(|EntireRing|)))))) +(SETQ |$CategoryFrame| + (|put| '|EntireRing| '|isCategory| T + (|addModemap| '|EntireRing| '(|EntireRing|) + '((|Category|)) T '|EntireRing| |$CategoryFrame|))) + (MAKEPROP '|EntireRing| 'NILADIC T) diff --git a/src/algebra/strap/ES-.lsp b/src/algebra/strap/ES-.lsp index da5d43a9..975f0090 100644 --- a/src/algebra/strap/ES-.lsp +++ b/src/algebra/strap/ES-.lsp @@ -19,7 +19,7 @@ (SPADCALL (|ES-;listk| |f| $) (|getShellEntry| $ 27))) (DEFUN |ES-;allk| (|l| $) - (PROG (#0=#:G1419 |f| #1=#:G1420) + (PROG (#0=#:G1421 |f| #1=#:G1422) (RETURN (SEQ (SPADCALL (ELT $ 32) (PROGN @@ -42,7 +42,7 @@ (|getShellEntry| $ 35)))))) (DEFUN |ES-;operators;SL;7| (|f| $) - (PROG (#0=#:G1423 |k| #1=#:G1424) + (PROG (#0=#:G1425 |k| #1=#:G1426) (RETURN (SEQ (PROGN (LETT #0# NIL |ES-;operators;SL;7|) @@ -65,7 +65,7 @@ G191 (EXIT (NREVERSE0 #0#)))))))) (DEFUN |ES-;height;SNni;8| (|f| $) - (PROG (#0=#:G1429 |k| #1=#:G1430) + (PROG (#0=#:G1431 |k| #1=#:G1432) (RETURN (SEQ (SPADCALL (ELT $ 42) (PROGN @@ -91,7 +91,7 @@ 0 (|getShellEntry| $ 45)))))) (DEFUN |ES-;freeOf?;SSB;9| (|x| |s| $) - (PROG (#0=#:G1434 |k| #1=#:G1435) + (PROG (#0=#:G1436 |k| #1=#:G1437) (RETURN (SEQ (SPADCALL (SPADCALL |s| @@ -120,7 +120,7 @@ (|getShellEntry| $ 50)))))) (DEFUN |ES-;distribute;2S;10| (|x| $) - (PROG (#0=#:G1438 |k| #1=#:G1439) + (PROG (#0=#:G1440 |k| #1=#:G1441) (RETURN (SEQ (|ES-;unwrap| (PROGN @@ -202,7 +202,7 @@ (SPADCALL |x| (LIST |e|) (|getShellEntry| $ 80))) (DEFUN |ES-;eval;SLLS;24| (|x| |ls| |lf| $) - (PROG (#0=#:G1459 |f| #1=#:G1460) + (PROG (#0=#:G1461 |f| #1=#:G1462) (RETURN (SEQ (SPADCALL |x| |ls| (PROGN @@ -230,7 +230,7 @@ (|getShellEntry| $$ 0))) (DEFUN |ES-;eval;SLLS;25| (|x| |ls| |lf| $) - (PROG (#0=#:G1463 |f| #1=#:G1464) + (PROG (#0=#:G1465 |f| #1=#:G1466) (RETURN (SEQ (SPADCALL |x| |ls| (PROGN @@ -258,7 +258,7 @@ (|getShellEntry| $$ 0))) (DEFUN |ES-;eval;SLLS;26| (|x| |ls| |lf| $) - (PROG (#0=#:G1468 |s| #1=#:G1469) + (PROG (#0=#:G1470 |s| #1=#:G1471) (RETURN (SEQ (SPADCALL |x| (PROGN @@ -282,7 +282,7 @@ |lf| (|getShellEntry| $ 68)))))) (DEFUN |ES-;map;MKS;27| (|fn| |k| $) - (PROG (#0=#:G1484 |x| #1=#:G1485 |l|) + (PROG (#0=#:G1486 |x| #1=#:G1487 |l|) (RETURN (SEQ (COND ((SPADCALL @@ -327,7 +327,7 @@ ('T (|error| "Unknown operator")))) (DEFUN |ES-;mainKernel;SU;29| (|x| $) - (PROG (|l| |kk| #0=#:G1501 |n| |k|) + (PROG (|l| |kk| #0=#:G1503 |n| |k|) (RETURN (SEQ (COND ((NULL (LETT |l| (SPADCALL |x| (|getShellEntry| $ 39)) @@ -367,7 +367,7 @@ (EXIT (CONS 0 |k|))))))))) (DEFUN |ES-;allKernels| (|f| $) - (PROG (|l| |k| #0=#:G1514 |u| |s0| |n| |arg| |t| |s|) + (PROG (|l| |k| #0=#:G1516 |u| |s0| |n| |arg| |t| |s|) (RETURN (SEQ (LETT |s| (SPADCALL @@ -441,7 +441,7 @@ ('T (|ES-;okkernel| |op| |args| $)))) (DEFUN |ES-;okkernel| (|op| |l| $) - (PROG (#0=#:G1521 |f| #1=#:G1522) + (PROG (#0=#:G1523 |f| #1=#:G1524) (RETURN (SEQ (SPADCALL (SPADCALL |op| |l| @@ -472,7 +472,7 @@ (|getShellEntry| $ 88)))))) (DEFUN |ES-;elt;BoLS;33| (|op| |args| $) - (PROG (|u| #0=#:G1538 |v|) + (PROG (|u| #0=#:G1540 |v|) (RETURN (SEQ (EXIT (COND ((NULL (SPADCALL |op| (|getShellEntry| $ 99))) @@ -552,7 +552,7 @@ (SPADCALL (QCDR |k|) |op| (|getShellEntry| $ 52))))))))) (DEFUN |ES-;unwrap| (|l| |x| $) - (PROG (|k| #0=#:G1565) + (PROG (|k| #0=#:G1567) (RETURN (SEQ (SEQ (LETT |k| NIL |ES-;unwrap|) (LETT #0# (NREVERSE |l|) |ES-;unwrap|) G190 @@ -572,7 +572,7 @@ (EXIT |x|))))) (DEFUN |ES-;distribute;3S;39| (|x| |y| $) - (PROG (|ky| #0=#:G1570 |k| #1=#:G1571) + (PROG (|ky| #0=#:G1572 |k| #1=#:G1573) (RETURN (SEQ (LETT |ky| (SPADCALL |y| (|getShellEntry| $ 57)) |ES-;distribute;3S;39|) @@ -624,7 +624,7 @@ (|getShellEntry| $ 122))))))) (DEFUN |ES-;mkKerLists| (|leq| $) - (PROG (|eq| #0=#:G1588 |k| |lk| |lv|) + (PROG (|eq| #0=#:G1590 |k| |lk| |lv|) (RETURN (SEQ (LETT |lk| NIL |ES-;mkKerLists|) (LETT |lv| NIL |ES-;mkKerLists|) @@ -794,3 +794,282 @@ 53 1 0 0 15 55 1 0 0 0 17 1 0 20 10 22))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|ExpressionSpace&| '|isFunctor| + '(((|odd?| ((|Boolean|) $)) T (ELT $ 131)) + ((|even?| ((|Boolean|) $)) T (ELT $ 129)) + ((|eval| ($ $ (|BasicOperator|) (|Mapping| $ $))) T + (ELT $ 77)) + ((|eval| ($ $ (|BasicOperator|) + (|Mapping| $ (|List| $)))) + T (ELT $ 71)) + ((|eval| ($ $ (|List| (|BasicOperator|)) + (|List| (|Mapping| $ (|List| $))))) + T (ELT $ 85)) + ((|eval| ($ $ (|List| (|BasicOperator|)) + (|List| (|Mapping| $ $)))) + T (ELT $ 83)) + ((|eval| ($ $ (|Symbol|) (|Mapping| $ $))) T (ELT $ 75)) + ((|eval| ($ $ (|Symbol|) (|Mapping| $ (|List| $)))) T + (ELT $ 69)) + ((|eval| ($ $ (|List| (|Symbol|)) + (|List| (|Mapping| $ (|List| $))))) + T (ELT $ NIL)) + ((|eval| ($ $ (|List| (|Symbol|)) + (|List| (|Mapping| $ $)))) + T (ELT $ 84)) + ((|freeOf?| ((|Boolean|) $ (|Symbol|))) T (ELT $ 51)) + ((|freeOf?| ((|Boolean|) $ $)) T (ELT $ 59)) + ((|map| ($ (|Mapping| $ $) (|Kernel| $))) T (ELT $ 89)) + ((|kernel| ($ (|BasicOperator|) (|List| $))) T + (ELT $ 100)) + ((|kernel| ($ (|BasicOperator|) $)) T (ELT $ 61)) + ((|is?| ((|Boolean|) $ (|Symbol|))) T (ELT $ 116)) + ((|is?| ((|Boolean|) $ (|BasicOperator|))) T + (ELT $ 117)) + ((|belong?| ((|Boolean|) (|BasicOperator|))) T + (ELT $ 22)) + ((|operator| ((|BasicOperator|) (|BasicOperator|))) T + (ELT $ 91)) + ((|operators| ((|List| (|BasicOperator|)) $)) T + (ELT $ 38)) + ((|tower| ((|List| (|Kernel| $)) $)) T (ELT $ 30)) + ((|mainKernel| ((|Union| (|Kernel| $) "failed") $)) T + (ELT $ 93)) + ((|height| ((|NonNegativeInteger|) $)) T (ELT $ 46)) + ((|distribute| ($ $ $)) T (ELT $ 119)) + ((|distribute| ($ $)) T (ELT $ 53)) + ((|paren| ($ (|List| $))) T (ELT $ 56)) + ((|paren| ($ $)) T (ELT $ 19)) + ((|box| ($ (|List| $))) T (ELT $ 55)) + ((|box| ($ $)) T (ELT $ 17)) + ((|subst| ($ $ (|List| (|Kernel| $)) (|List| $))) T + (ELT $ NIL)) + ((|subst| ($ $ (|List| (|Equation| $)))) T (ELT $ 123)) + ((|subst| ($ $ (|Equation| $))) T (ELT $ 81)) + ((|elt| ($ (|BasicOperator|) (|List| $))) T (ELT $ 109)) + ((|elt| ($ (|BasicOperator|) $ $ $ $)) T (ELT $ 65)) + ((|elt| ($ (|BasicOperator|) $ $ $)) T (ELT $ 64)) + ((|elt| ($ (|BasicOperator|) $ $)) T (ELT $ 63)) + ((|elt| ($ (|BasicOperator|) $)) T (ELT $ 62)) + ((|eval| ($ $ (|List| $) (|List| $))) T (ELT $ NIL)) + ((|eval| ($ $ $ $)) T (ELT $ NIL)) + ((|eval| ($ $ (|Equation| $))) T (ELT $ NIL)) + ((|eval| ($ $ (|List| (|Equation| $)))) T (ELT $ 121)) + ((|eval| ($ $ (|List| (|Kernel| $)) (|List| $))) T + (ELT $ NIL)) + ((|eval| ($ $ (|Kernel| $) $)) T (ELT $ NIL)) + ((|retract| ((|Kernel| $) $)) T (ELT $ 112)) + ((|retractIfCan| ((|Union| (|Kernel| $) "failed") $)) T + (ELT $ 113))) + (|addModemap| '|ExpressionSpace&| + '(|ExpressionSpace&| |#1|) + '((CATEGORY |domain| + (SIGNATURE |odd?| ((|Boolean|) |#1|)) + (SIGNATURE |even?| ((|Boolean|) |#1|)) + (SIGNATURE |eval| + (|#1| |#1| (|BasicOperator|) + (|Mapping| |#1| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| (|BasicOperator|) + (|Mapping| |#1| (|List| |#1|)))) + (SIGNATURE |eval| + (|#1| |#1| (|List| (|BasicOperator|)) + (|List| (|Mapping| |#1| (|List| |#1|))))) + (SIGNATURE |eval| + (|#1| |#1| (|List| (|BasicOperator|)) + (|List| (|Mapping| |#1| |#1|)))) + (SIGNATURE |eval| + (|#1| |#1| (|Symbol|) (|Mapping| |#1| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| (|Symbol|) + (|Mapping| |#1| (|List| |#1|)))) + (SIGNATURE |eval| + (|#1| |#1| (|List| (|Symbol|)) + (|List| (|Mapping| |#1| (|List| |#1|))))) + (SIGNATURE |eval| + (|#1| |#1| (|List| (|Symbol|)) + (|List| (|Mapping| |#1| |#1|)))) + (SIGNATURE |freeOf?| + ((|Boolean|) |#1| (|Symbol|))) + (SIGNATURE |freeOf?| ((|Boolean|) |#1| |#1|)) + (SIGNATURE |map| + (|#1| (|Mapping| |#1| |#1|) (|Kernel| |#1|))) + (SIGNATURE |kernel| + (|#1| (|BasicOperator|) (|List| |#1|))) + (SIGNATURE |kernel| + (|#1| (|BasicOperator|) |#1|)) + (SIGNATURE |is?| ((|Boolean|) |#1| (|Symbol|))) + (SIGNATURE |is?| + ((|Boolean|) |#1| (|BasicOperator|))) + (SIGNATURE |belong?| + ((|Boolean|) (|BasicOperator|))) + (SIGNATURE |operator| + ((|BasicOperator|) (|BasicOperator|))) + (SIGNATURE |operators| + ((|List| (|BasicOperator|)) |#1|)) + (SIGNATURE |tower| + ((|List| (|Kernel| |#1|)) |#1|)) + (SIGNATURE |mainKernel| + ((|Union| (|Kernel| |#1|) "failed") |#1|)) + (SIGNATURE |height| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |distribute| (|#1| |#1| |#1|)) + (SIGNATURE |distribute| (|#1| |#1|)) + (SIGNATURE |paren| (|#1| (|List| |#1|))) + (SIGNATURE |paren| (|#1| |#1|)) + (SIGNATURE |box| (|#1| (|List| |#1|))) + (SIGNATURE |box| (|#1| |#1|)) + (SIGNATURE |subst| + (|#1| |#1| (|List| (|Kernel| |#1|)) + (|List| |#1|))) + (SIGNATURE |subst| + (|#1| |#1| (|List| (|Equation| |#1|)))) + (SIGNATURE |subst| + (|#1| |#1| (|Equation| |#1|))) + (SIGNATURE |elt| + (|#1| (|BasicOperator|) (|List| |#1|))) + (SIGNATURE |elt| + (|#1| (|BasicOperator|) |#1| |#1| |#1| |#1|)) + (SIGNATURE |elt| + (|#1| (|BasicOperator|) |#1| |#1| + |#1|)) + (SIGNATURE |elt| + (|#1| (|BasicOperator|) |#1| |#1|)) + (SIGNATURE |elt| (|#1| (|BasicOperator|) |#1|)) + (SIGNATURE |eval| + (|#1| |#1| (|List| |#1|) (|List| |#1|))) + (SIGNATURE |eval| (|#1| |#1| |#1| |#1|)) + (SIGNATURE |eval| (|#1| |#1| (|Equation| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| (|List| (|Equation| |#1|)))) + (SIGNATURE |eval| + (|#1| |#1| (|List| (|Kernel| |#1|)) + (|List| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| (|Kernel| |#1|) |#1|)) + (SIGNATURE |retract| ((|Kernel| |#1|) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Kernel| |#1|) "failed") |#1|))) + (|ExpressionSpace|)) + T '|ExpressionSpace&| + (|put| '|ExpressionSpace&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |odd?| ((|Boolean|) |#1|)) + (SIGNATURE |even?| ((|Boolean|) |#1|)) + (SIGNATURE |eval| + (|#1| |#1| (|BasicOperator|) + (|Mapping| |#1| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| (|BasicOperator|) + (|Mapping| |#1| (|List| |#1|)))) + (SIGNATURE |eval| + (|#1| |#1| + (|List| (|BasicOperator|)) + (|List| + (|Mapping| |#1| (|List| |#1|))))) + (SIGNATURE |eval| + (|#1| |#1| + (|List| (|BasicOperator|)) + (|List| (|Mapping| |#1| |#1|)))) + (SIGNATURE |eval| + (|#1| |#1| (|Symbol|) + (|Mapping| |#1| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| (|Symbol|) + (|Mapping| |#1| (|List| |#1|)))) + (SIGNATURE |eval| + (|#1| |#1| (|List| (|Symbol|)) + (|List| + (|Mapping| |#1| (|List| |#1|))))) + (SIGNATURE |eval| + (|#1| |#1| (|List| (|Symbol|)) + (|List| (|Mapping| |#1| |#1|)))) + (SIGNATURE |freeOf?| + ((|Boolean|) |#1| (|Symbol|))) + (SIGNATURE |freeOf?| + ((|Boolean|) |#1| |#1|)) + (SIGNATURE |map| + (|#1| (|Mapping| |#1| |#1|) + (|Kernel| |#1|))) + (SIGNATURE |kernel| + (|#1| (|BasicOperator|) + (|List| |#1|))) + (SIGNATURE |kernel| + (|#1| (|BasicOperator|) |#1|)) + (SIGNATURE |is?| + ((|Boolean|) |#1| (|Symbol|))) + (SIGNATURE |is?| + ((|Boolean|) |#1| + (|BasicOperator|))) + (SIGNATURE |belong?| + ((|Boolean|) (|BasicOperator|))) + (SIGNATURE |operator| + ((|BasicOperator|) + (|BasicOperator|))) + (SIGNATURE |operators| + ((|List| (|BasicOperator|)) |#1|)) + (SIGNATURE |tower| + ((|List| (|Kernel| |#1|)) |#1|)) + (SIGNATURE |mainKernel| + ((|Union| (|Kernel| |#1|) + "failed") + |#1|)) + (SIGNATURE |height| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |distribute| + (|#1| |#1| |#1|)) + (SIGNATURE |distribute| (|#1| |#1|)) + (SIGNATURE |paren| + (|#1| (|List| |#1|))) + (SIGNATURE |paren| (|#1| |#1|)) + (SIGNATURE |box| (|#1| (|List| |#1|))) + (SIGNATURE |box| (|#1| |#1|)) + (SIGNATURE |subst| + (|#1| |#1| + (|List| (|Kernel| |#1|)) + (|List| |#1|))) + (SIGNATURE |subst| + (|#1| |#1| + (|List| (|Equation| |#1|)))) + (SIGNATURE |subst| + (|#1| |#1| (|Equation| |#1|))) + (SIGNATURE |elt| + (|#1| (|BasicOperator|) + (|List| |#1|))) + (SIGNATURE |elt| + (|#1| (|BasicOperator|) |#1| |#1| + |#1| |#1|)) + (SIGNATURE |elt| + (|#1| (|BasicOperator|) |#1| |#1| + |#1|)) + (SIGNATURE |elt| + (|#1| (|BasicOperator|) |#1| |#1|)) + (SIGNATURE |elt| + (|#1| (|BasicOperator|) |#1|)) + (SIGNATURE |eval| + (|#1| |#1| (|List| |#1|) + (|List| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| |#1| |#1|)) + (SIGNATURE |eval| + (|#1| |#1| (|Equation| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| + (|List| (|Equation| |#1|)))) + (SIGNATURE |eval| + (|#1| |#1| + (|List| (|Kernel| |#1|)) + (|List| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| (|Kernel| |#1|) |#1|)) + (SIGNATURE |retract| + ((|Kernel| |#1|) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Kernel| |#1|) + "failed") + |#1|))) + (|ExpressionSpace|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/ES.lsp b/src/algebra/strap/ES.lsp index 53f77b8c..2e5d6f51 100644 --- a/src/algebra/strap/ES.lsp +++ b/src/algebra/strap/ES.lsp @@ -4,17 +4,17 @@ (DEFPARAMETER |ExpressionSpace;AL| 'NIL) (DEFUN |ExpressionSpace| () - (LET (#:G1400) + (LET (#:G1411) (COND (|ExpressionSpace;AL|) (T (SETQ |ExpressionSpace;AL| (|ExpressionSpace;|)))))) (DEFUN |ExpressionSpace;| () - (PROG (#0=#:G1398) + (PROG (#0=#:G1409) (RETURN (PROG1 (LETT #0# (|sublisV| - (PAIR '(#1=#:G1396 #2=#:G1397) + (PAIR '(#1=#:G1407 #2=#:G1408) (LIST '(|Kernel| $) '(|Kernel| $))) (|Join| (|OrderedSet|) (|RetractableTo| '#1#) (|InnerEvalable| '#2# '$) @@ -152,4 +152,9 @@ |ExpressionSpace|) (SETELT #0# 0 '(|ExpressionSpace|)))))) +(SETQ |$CategoryFrame| + (|put| '|ExpressionSpace| '|isCategory| T + (|addModemap| '|ExpressionSpace| '(|ExpressionSpace|) + '((|Category|)) T '|ExpressionSpace| |$CategoryFrame|))) + (MAKEPROP '|ExpressionSpace| 'NILADIC T) diff --git a/src/algebra/strap/EUCDOM-.lsp b/src/algebra/strap/EUCDOM-.lsp index 8a08bd2e..e6bb8358 100644 --- a/src/algebra/strap/EUCDOM-.lsp +++ b/src/algebra/strap/EUCDOM-.lsp @@ -198,7 +198,7 @@ (|getShellEntry| $ 30)))))))))))))))) (DEFUN |EUCDOM-;principalIdeal;LR;9| (|l| $) - (PROG (|uca| |v| |u| #0=#:G1478 |vv| #1=#:G1479) + (PROG (|uca| |v| |u| #0=#:G1480 |vv| #1=#:G1481) (RETURN (SEQ (COND ((SPADCALL |l| NIL (|getShellEntry| $ 39)) @@ -258,7 +258,7 @@ (QVELT |u| 2)))))))))) (DEFUN |EUCDOM-;expressIdealMember;LSU;10| (|l| |z| $) - (PROG (#0=#:G1494 #1=#:G1495 |pid| |q| #2=#:G1496 |v| #3=#:G1497) + (PROG (#0=#:G1496 #1=#:G1497 |pid| |q| #2=#:G1498 |v| #3=#:G1499) (RETURN (SEQ (COND ((SPADCALL |z| (|spadConstant| $ 27) @@ -326,9 +326,9 @@ (EXIT (NREVERSE0 #2#))))))))))))))) (DEFUN |EUCDOM-;multiEuclidean;LSU;11| (|l| |z| $) - (PROG (|n| |l1| |l2| #0=#:G1392 #1=#:G1516 #2=#:G1503 #3=#:G1501 - #4=#:G1502 #5=#:G1393 #6=#:G1517 #7=#:G1506 #8=#:G1504 - #9=#:G1505 |u| |v1| |v2|) + (PROG (|n| |l1| |l2| #0=#:G1394 #1=#:G1518 #2=#:G1505 #3=#:G1503 + #4=#:G1504 #5=#:G1395 #6=#:G1519 #7=#:G1508 #8=#:G1506 + #9=#:G1507 |u| |v1| |v2|) (RETURN (SEQ (LETT |n| (LENGTH |l|) |EUCDOM-;multiEuclidean;LSU;11|) (EXIT (COND @@ -516,3 +516,102 @@ 0 0 0 0 21 3 0 36 0 0 0 37 2 0 31 0 0 32 2 0 16 0 0 17 2 0 45 41 0 46))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|EuclideanDomain&| '|isFunctor| + '(((|multiEuclidean| + ((|Union| (|List| $) "failed") (|List| $) $)) + T (ELT $ 53)) + ((|extendedEuclidean| + ((|Union| (|Record| (|:| |coef1| $) + (|:| |coef2| $)) + "failed") + $ $ $)) + T (ELT $ 37)) + ((|extendedEuclidean| + ((|Record| (|:| |coef1| $) (|:| |coef2| $) + (|:| |generator| $)) + $ $)) + T (ELT $ 32)) + ((|rem| ($ $ $)) T (ELT $ 15)) + ((|quo| ($ $ $)) T (ELT $ 14)) + ((|sizeLess?| ((|Boolean|) $ $)) T (ELT $ 11)) + ((|expressIdealMember| + ((|Union| (|List| $) "failed") (|List| $) $)) + T (ELT $ 46)) + ((|principalIdeal| + ((|Record| (|:| |coef| (|List| $)) + (|:| |generator| $)) + (|List| $))) + T (ELT $ 44)) + ((|gcd| ($ (|List| $))) T (ELT $ NIL)) + ((|gcd| ($ $ $)) T (ELT $ 21)) + ((|exquo| ((|Union| $ "failed") $ $)) T (ELT $ 17))) + (|addModemap| '|EuclideanDomain&| + '(|EuclideanDomain&| |#1|) + '((CATEGORY |domain| + (SIGNATURE |multiEuclidean| + ((|Union| (|List| |#1|) "failed") + (|List| |#1|) |#1|)) + (SIGNATURE |extendedEuclidean| + ((|Union| (|Record| (|:| |coef1| |#1|) + (|:| |coef2| |#1|)) + "failed") + |#1| |#1| |#1|)) + (SIGNATURE |extendedEuclidean| + ((|Record| (|:| |coef1| |#1|) + (|:| |coef2| |#1|) + (|:| |generator| |#1|)) + |#1| |#1|)) + (SIGNATURE |rem| (|#1| |#1| |#1|)) + (SIGNATURE |quo| (|#1| |#1| |#1|)) + (SIGNATURE |sizeLess?| ((|Boolean|) |#1| |#1|)) + (SIGNATURE |expressIdealMember| + ((|Union| (|List| |#1|) "failed") + (|List| |#1|) |#1|)) + (SIGNATURE |principalIdeal| + ((|Record| (|:| |coef| (|List| |#1|)) + (|:| |generator| |#1|)) + (|List| |#1|))) + (SIGNATURE |gcd| (|#1| (|List| |#1|))) + (SIGNATURE |gcd| (|#1| |#1| |#1|)) + (SIGNATURE |exquo| + ((|Union| |#1| "failed") |#1| |#1|))) + (|EuclideanDomain|)) + T '|EuclideanDomain&| + (|put| '|EuclideanDomain&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |multiEuclidean| + ((|Union| (|List| |#1|) "failed") + (|List| |#1|) |#1|)) + (SIGNATURE |extendedEuclidean| + ((|Union| + (|Record| (|:| |coef1| |#1|) + (|:| |coef2| |#1|)) + "failed") + |#1| |#1| |#1|)) + (SIGNATURE |extendedEuclidean| + ((|Record| (|:| |coef1| |#1|) + (|:| |coef2| |#1|) + (|:| |generator| |#1|)) + |#1| |#1|)) + (SIGNATURE |rem| (|#1| |#1| |#1|)) + (SIGNATURE |quo| (|#1| |#1| |#1|)) + (SIGNATURE |sizeLess?| + ((|Boolean|) |#1| |#1|)) + (SIGNATURE |expressIdealMember| + ((|Union| (|List| |#1|) "failed") + (|List| |#1|) |#1|)) + (SIGNATURE |principalIdeal| + ((|Record| + (|:| |coef| (|List| |#1|)) + (|:| |generator| |#1|)) + (|List| |#1|))) + (SIGNATURE |gcd| (|#1| (|List| |#1|))) + (SIGNATURE |gcd| (|#1| |#1| |#1|)) + (SIGNATURE |exquo| + ((|Union| |#1| "failed") |#1| + |#1|))) + (|EuclideanDomain|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/EUCDOM.lsp b/src/algebra/strap/EUCDOM.lsp index c58fa54c..2597fe0b 100644 --- a/src/algebra/strap/EUCDOM.lsp +++ b/src/algebra/strap/EUCDOM.lsp @@ -1,53 +1,58 @@ -(|/VERSIONCHECK| 2) -(DEFPARAMETER |EuclideanDomain;AL| (QUOTE NIL)) +(/VERSIONCHECK 2) -(DEFUN |EuclideanDomain| NIL - (LET (#:G83585) - (COND +(DEFPARAMETER |EuclideanDomain;AL| 'NIL) + +(DEFUN |EuclideanDomain| () + (LET (#:G1411) + (COND (|EuclideanDomain;AL|) (T (SETQ |EuclideanDomain;AL| (|EuclideanDomain;|)))))) -(DEFUN |EuclideanDomain;| NIL - (PROG (#1=#:G83583) - (RETURN - (PROG1 - (LETT #1# - (|Join| - (|PrincipalIdealDomain|) - (|mkCategory| - (QUOTE |domain|) - (QUOTE ( - ((|sizeLess?| ((|Boolean|) |$| |$|)) T) - ((|euclideanSize| ((|NonNegativeInteger|) |$|)) T) - ((|divide| - ((|Record| - (|:| |quotient| |$|) - (|:| |remainder| |$|)) - |$| |$|)) T) - ((|quo| (|$| |$| |$|)) T) - ((|rem| (|$| |$| |$|)) T) - ((|extendedEuclidean| - ((|Record| - (|:| |coef1| |$|) - (|:| |coef2| |$|) - (|:| |generator| |$|)) - |$| |$|)) T) - ((|extendedEuclidean| - ((|Union| - (|Record| (|:| |coef1| |$|) (|:| |coef2| |$|)) - "failed") - |$| |$| |$|)) T) - ((|multiEuclidean| - ((|Union| - (|List| |$|) - "failed") - (|List| |$|) |$|)) T))) - NIL - (QUOTE ((|List| |$|) (|NonNegativeInteger|) (|Boolean|))) - NIL)) - |EuclideanDomain|) - (SETELT #1# 0 (QUOTE (|EuclideanDomain|))))))) +(DEFUN |EuclideanDomain;| () + (PROG (#0=#:G1409) + (RETURN + (PROG1 (LETT #0# + (|Join| (|PrincipalIdealDomain|) + (|mkCategory| '|domain| + '(((|sizeLess?| ((|Boolean|) $ $)) T) + ((|euclideanSize| + ((|NonNegativeInteger|) $)) + T) + ((|divide| + ((|Record| (|:| |quotient| $) + (|:| |remainder| $)) + $ $)) + T) + ((|quo| ($ $ $)) T) + ((|rem| ($ $ $)) T) + ((|extendedEuclidean| + ((|Record| (|:| |coef1| $) + (|:| |coef2| $) + (|:| |generator| $)) + $ $)) + T) + ((|extendedEuclidean| + ((|Union| + (|Record| (|:| |coef1| $) + (|:| |coef2| $)) + "failed") + $ $ $)) + T) + ((|multiEuclidean| + ((|Union| (|List| $) "failed") + (|List| $) $)) + T)) + NIL + '((|List| $) (|NonNegativeInteger|) + (|Boolean|)) + NIL)) + |EuclideanDomain|) + (SETELT #0# 0 '(|EuclideanDomain|)))))) -(MAKEPROP (QUOTE |EuclideanDomain|) (QUOTE NILADIC) T) +(SETQ |$CategoryFrame| + (|put| '|EuclideanDomain| '|isCategory| T + (|addModemap| '|EuclideanDomain| '(|EuclideanDomain|) + '((|Category|)) T '|EuclideanDomain| |$CategoryFrame|))) +(MAKEPROP '|EuclideanDomain| 'NILADIC T) diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp index e886e7ff..56e49451 100644 --- a/src/algebra/strap/FFIELDC-.lsp +++ b/src/algebra/strap/FFIELDC-.lsp @@ -44,7 +44,7 @@ (CONS 0 (SPADCALL |x| (|getShellEntry| $ 28)))) (DEFUN |FFIELDC-;createPrimitiveElement;S;8| ($) - (PROG (|sm1| |start| |i| #0=#:G1441 |e| |found|) + (PROG (|sm1| |start| |i| #0=#:G1443 |e| |found|) (RETURN (SEQ (LETT |sm1| (- (SPADCALL (|getShellEntry| $ 36)) 1) |FFIELDC-;createPrimitiveElement;S;8|) @@ -81,7 +81,7 @@ (EXIT |e|))))) (DEFUN |FFIELDC-;primitive?;SB;9| (|a| $) - (PROG (|explist| |q| |exp| #0=#:G1453 |equalone|) + (PROG (|explist| |q| |exp| #0=#:G1455 |equalone|) (RETURN (SEQ (COND ((SPADCALL |a| (|getShellEntry| $ 14)) 'NIL) @@ -116,7 +116,7 @@ (EXIT (SPADCALL |equalone| (|getShellEntry| $ 45)))))))))) (DEFUN |FFIELDC-;order;SPi;10| (|e| $) - (PROG (|lof| |rec| #0=#:G1461 |primeDivisor| |j| #1=#:G1462 |a| + (PROG (|lof| |rec| #0=#:G1463 |primeDivisor| |j| #1=#:G1464 |a| |goon| |ord|) (RETURN (SEQ (COND @@ -184,7 +184,7 @@ (EXIT |ord|)))))))) (DEFUN |FFIELDC-;discreteLog;SNni;11| (|b| $) - (PROG (|faclist| |gen| |groupord| |f| #0=#:G1482 |fac| |t| #1=#:G1483 + (PROG (|faclist| |gen| |groupord| |f| #0=#:G1484 |fac| |t| #1=#:G1485 |exp| |exptable| |n| |end| |i| |rho| |found| |disc1| |c| |mult| |disclog| |a|) (RETURN @@ -341,8 +341,8 @@ (EXIT |disclog|)))))))))))) (DEFUN |FFIELDC-;discreteLog;2SU;12| (|logbase| |b| $) - (PROG (|groupord| |faclist| |f| #0=#:G1501 |fac| |primroot| |t| - #1=#:G1502 |exp| |rhoHelp| #2=#:G1500 |rho| |disclog| + (PROG (|groupord| |faclist| |f| #0=#:G1503 |fac| |primroot| |t| + #1=#:G1504 |exp| |rhoHelp| #2=#:G1502 |rho| |disclog| |mult| |a|) (RETURN (SEQ (EXIT (COND @@ -470,7 +470,7 @@ (SPADCALL |f| (|getShellEntry| $ 78))) (DEFUN |FFIELDC-;factorSquareFreePolynomial| (|f| $) - (PROG (|flist| |u| #0=#:G1515 #1=#:G1512 #2=#:G1510 #3=#:G1511) + (PROG (|flist| |u| #0=#:G1517 #1=#:G1514 #2=#:G1512 #3=#:G1513) (RETURN (SEQ (COND ((SPADCALL |f| (|spadConstant| $ 79) @@ -613,3 +613,105 @@ 8 0 0 0 46 1 0 32 33 34 1 0 0 0 39 1 0 15 0 40))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|FiniteFieldCategory&| '|isFunctor| + '(((|order| ((|PositiveInteger|) $)) T (ELT $ 53)) + ((|discreteLog| ((|NonNegativeInteger|) $)) T + (ELT $ 61)) + ((|primitive?| ((|Boolean|) $)) T (ELT $ 52)) + ((|createPrimitiveElement| ($)) T (ELT $ 46)) + ((|conditionP| + ((|Union| (|Vector| $) "failed") (|Matrix| $))) + T (ELT $ 34)) + ((|charthRoot| ($ $)) T (ELT $ 39)) + ((|differentiate| ($ $)) T (ELT $ 8)) + ((|differentiate| ($ $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|init| ($)) T (ELT $ 9)) + ((|nextItem| ((|Union| $ "failed") $)) T (ELT $ 16)) + ((|discreteLog| + ((|Union| (|NonNegativeInteger|) "failed") $ $)) + T (ELT $ 72)) + ((|order| ((|OnePointCompletion| (|PositiveInteger|)) $)) + T (ELT $ 21)) + ((|charthRoot| ((|Union| $ "failed") $)) T (ELT $ 40)) + ((|gcdPolynomial| + ((|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| $))) + T (ELT $ 94))) + (|addModemap| '|FiniteFieldCategory&| + '(|FiniteFieldCategory&| |#1|) + '((CATEGORY |domain| + (SIGNATURE |order| ((|PositiveInteger|) |#1|)) + (SIGNATURE |discreteLog| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |primitive?| ((|Boolean|) |#1|)) + (SIGNATURE |createPrimitiveElement| (|#1|)) + (SIGNATURE |conditionP| + ((|Union| (|Vector| |#1|) "failed") + (|Matrix| |#1|))) + (SIGNATURE |charthRoot| (|#1| |#1|)) + (SIGNATURE |differentiate| (|#1| |#1|)) + (SIGNATURE |differentiate| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |init| (|#1|)) + (SIGNATURE |nextItem| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE |discreteLog| + ((|Union| (|NonNegativeInteger|) "failed") + |#1| |#1|)) + (SIGNATURE |order| + ((|OnePointCompletion| (|PositiveInteger|)) + |#1|)) + (SIGNATURE |charthRoot| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE |gcdPolynomial| + ((|SparseUnivariatePolynomial| |#1|) + (|SparseUnivariatePolynomial| |#1|) + (|SparseUnivariatePolynomial| |#1|)))) + (|FiniteFieldCategory|)) + T '|FiniteFieldCategory&| + (|put| '|FiniteFieldCategory&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |order| + ((|PositiveInteger|) |#1|)) + (SIGNATURE |discreteLog| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |primitive?| + ((|Boolean|) |#1|)) + (SIGNATURE |createPrimitiveElement| + (|#1|)) + (SIGNATURE |conditionP| + ((|Union| (|Vector| |#1|) + "failed") + (|Matrix| |#1|))) + (SIGNATURE |charthRoot| (|#1| |#1|)) + (SIGNATURE |differentiate| + (|#1| |#1|)) + (SIGNATURE |differentiate| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |init| (|#1|)) + (SIGNATURE |nextItem| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE |discreteLog| + ((|Union| (|NonNegativeInteger|) + "failed") + |#1| |#1|)) + (SIGNATURE |order| + ((|OnePointCompletion| + (|PositiveInteger|)) + |#1|)) + (SIGNATURE |charthRoot| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE |gcdPolynomial| + ((|SparseUnivariatePolynomial| + |#1|) + (|SparseUnivariatePolynomial| + |#1|) + (|SparseUnivariatePolynomial| + |#1|)))) + (|FiniteFieldCategory|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/FFIELDC.lsp b/src/algebra/strap/FFIELDC.lsp index 9099175c..dce56f05 100644 --- a/src/algebra/strap/FFIELDC.lsp +++ b/src/algebra/strap/FFIELDC.lsp @@ -4,13 +4,13 @@ (DEFPARAMETER |FiniteFieldCategory;AL| 'NIL) (DEFUN |FiniteFieldCategory| () - (LET (#:G1395) + (LET (#:G1404) (COND (|FiniteFieldCategory;AL|) (T (SETQ |FiniteFieldCategory;AL| (|FiniteFieldCategory;|)))))) (DEFUN |FiniteFieldCategory;| () - (PROG (#0=#:G1393) + (PROG (#0=#:G1402) (RETURN (PROG1 (LETT #0# (|Join| (|FieldOfPrimeCharacteristic|) (|Finite|) @@ -57,4 +57,10 @@ |FiniteFieldCategory|) (SETELT #0# 0 '(|FiniteFieldCategory|)))))) +(SETQ |$CategoryFrame| + (|put| '|FiniteFieldCategory| '|isCategory| T + (|addModemap| '|FiniteFieldCategory| + '(|FiniteFieldCategory|) '((|Category|)) T + '|FiniteFieldCategory| |$CategoryFrame|))) + (MAKEPROP '|FiniteFieldCategory| 'NILADIC T) diff --git a/src/algebra/strap/FPS-.lsp b/src/algebra/strap/FPS-.lsp index 56751bc4..1ec37dce 100644 --- a/src/algebra/strap/FPS-.lsp +++ b/src/algebra/strap/FPS-.lsp @@ -2,17 +2,18 @@ (/VERSIONCHECK 2) (DEFUN |FPS-;float;2IS;1| (|ma| |ex| $) - (SPADCALL |ma| |ex| (SPADCALL (QREFELT $ 8)) (QREFELT $ 10))) + (SPADCALL |ma| |ex| (SPADCALL (|getShellEntry| $ 8)) + (|getShellEntry| $ 10))) (DEFUN |FPS-;digits;Pi;2| ($) - (PROG (#0=#:G1389) + (PROG (#0=#:G1398) (RETURN (PROG1 (LETT #0# (MAX 1 (QUOTIENT2 (SPADCALL 4004 - (- (SPADCALL (QREFELT $ 13)) 1) - (QREFELT $ 14)) + (- (SPADCALL (|getShellEntry| $ 13)) 1) + (|getShellEntry| $ 14)) 13301)) |FPS-;digits;Pi;2|) (|check-subtype| (> #0# 0) '(|PositiveInteger|) #0#))))) @@ -23,15 +24,15 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|FloatingPointSystem&|)) (LETT |dv$| (LIST '|FloatingPointSystem&| |dv$1|) . #0#) - (LETT $ (GETREFV 17) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 + (LETT $ (|newShell| 17) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 (LIST (|HasAttribute| |#1| '|arbitraryExponent|) (|HasAttribute| |#1| '|arbitraryPrecision|))) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) $)))) (MAKEPROP '|FloatingPointSystem&| '|infovec| @@ -48,3 +49,41 @@ 13 2 9 0 7 0 14 0 6 0 15 2 0 0 9 9 11 0 0 7 16))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|FloatingPointSystem&| '|isFunctor| + '(((|digits| ((|PositiveInteger|) (|PositiveInteger|))) T + (ELT $ NIL)) + ((|digits| ((|PositiveInteger|))) T (ELT $ 16)) + ((|float| ($ (|Integer|) (|Integer|) + (|PositiveInteger|))) + T (ELT $ NIL)) + ((|float| ($ (|Integer|) (|Integer|))) T (ELT $ 11))) + (|addModemap| '|FloatingPointSystem&| + '(|FloatingPointSystem&| |#1|) + '((CATEGORY |domain| + (SIGNATURE |digits| + ((|PositiveInteger|) (|PositiveInteger|))) + (SIGNATURE |digits| ((|PositiveInteger|))) + (SIGNATURE |float| + (|#1| (|Integer|) (|Integer|) + (|PositiveInteger|))) + (SIGNATURE |float| + (|#1| (|Integer|) (|Integer|)))) + (|FloatingPointSystem|)) + T '|FloatingPointSystem&| + (|put| '|FloatingPointSystem&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |digits| + ((|PositiveInteger|) + (|PositiveInteger|))) + (SIGNATURE |digits| + ((|PositiveInteger|))) + (SIGNATURE |float| + (|#1| (|Integer|) (|Integer|) + (|PositiveInteger|))) + (SIGNATURE |float| + (|#1| (|Integer|) (|Integer|)))) + (|FloatingPointSystem|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/FPS.lsp b/src/algebra/strap/FPS.lsp index 75e426f7..a2329d35 100644 --- a/src/algebra/strap/FPS.lsp +++ b/src/algebra/strap/FPS.lsp @@ -4,13 +4,13 @@ (DEFPARAMETER |FloatingPointSystem;AL| 'NIL) (DEFUN |FloatingPointSystem| () - (LET (#:G1387) + (LET (#:G1396) (COND (|FloatingPointSystem;AL|) (T (SETQ |FloatingPointSystem;AL| (|FloatingPointSystem;|)))))) (DEFUN |FloatingPointSystem;| () - (PROG (#0=#:G1385) + (PROG (#0=#:G1394) (RETURN (PROG1 (LETT #0# (|Join| (|RealNumberSystem|) @@ -78,4 +78,10 @@ |FloatingPointSystem|) (SETELT #0# 0 '(|FloatingPointSystem|)))))) +(SETQ |$CategoryFrame| + (|put| '|FloatingPointSystem| '|isCategory| T + (|addModemap| '|FloatingPointSystem| + '(|FloatingPointSystem|) '((|Category|)) T + '|FloatingPointSystem| |$CategoryFrame|))) + (MAKEPROP '|FloatingPointSystem| 'NILADIC T) diff --git a/src/algebra/strap/GCDDOM-.lsp b/src/algebra/strap/GCDDOM-.lsp index b5c3cd1f..8d0c8ea7 100644 --- a/src/algebra/strap/GCDDOM-.lsp +++ b/src/algebra/strap/GCDDOM-.lsp @@ -5,64 +5,68 @@ (PROG (LCM) (RETURN (SEQ (COND - ((OR (SPADCALL |y| (|spadConstant| $ 7) (QREFELT $ 9)) - (SPADCALL |x| (|spadConstant| $ 7) (QREFELT $ 9))) + ((OR (SPADCALL |y| (|spadConstant| $ 7) + (|getShellEntry| $ 9)) + (SPADCALL |x| (|spadConstant| $ 7) + (|getShellEntry| $ 9))) (|spadConstant| $ 7)) ('T (SEQ (LETT LCM (SPADCALL |y| - (SPADCALL |x| |y| (QREFELT $ 10)) - (QREFELT $ 12)) + (SPADCALL |x| |y| (|getShellEntry| $ 10)) + (|getShellEntry| $ 12)) |GCDDOM-;lcm;3S;1|) (EXIT (COND ((QEQCAR LCM 0) - (SPADCALL |x| (QCDR LCM) (QREFELT $ 13))) + (SPADCALL |x| (QCDR LCM) + (|getShellEntry| $ 13))) ('T (|error| "bad gcd in lcm computation"))))))))))) (DEFUN |GCDDOM-;lcm;LS;2| (|l| $) (SPADCALL (ELT $ 15) |l| (|spadConstant| $ 16) (|spadConstant| $ 7) - (QREFELT $ 19))) + (|getShellEntry| $ 19))) (DEFUN |GCDDOM-;gcd;LS;3| (|l| $) (SPADCALL (ELT $ 10) |l| (|spadConstant| $ 7) (|spadConstant| $ 16) - (QREFELT $ 19))) + (|getShellEntry| $ 19))) (DEFUN |GCDDOM-;gcdPolynomial;3Sup;4| (|p1| |p2| $) - (PROG (|e2| |e1| |c1| |p| |c2| #0=#:G1406) + (PROG (|e2| |e1| |c1| |p| |c2| #0=#:G1415) (RETURN (SEQ (COND - ((SPADCALL |p1| (QREFELT $ 24)) - (SPADCALL |p2| (QREFELT $ 25))) - ((SPADCALL |p2| (QREFELT $ 24)) - (SPADCALL |p1| (QREFELT $ 25))) + ((SPADCALL |p1| (|getShellEntry| $ 24)) + (SPADCALL |p2| (|getShellEntry| $ 25))) + ((SPADCALL |p2| (|getShellEntry| $ 24)) + (SPADCALL |p1| (|getShellEntry| $ 25))) ('T - (SEQ (LETT |c1| (SPADCALL |p1| (QREFELT $ 26)) + (SEQ (LETT |c1| (SPADCALL |p1| (|getShellEntry| $ 26)) |GCDDOM-;gcdPolynomial;3Sup;4|) - (LETT |c2| (SPADCALL |p2| (QREFELT $ 26)) + (LETT |c2| (SPADCALL |p2| (|getShellEntry| $ 26)) |GCDDOM-;gcdPolynomial;3Sup;4|) (LETT |p1| (PROG2 (LETT #0# (SPADCALL |p1| |c1| - (QREFELT $ 27)) + (|getShellEntry| $ 27)) |GCDDOM-;gcdPolynomial;3Sup;4|) (QCDR #0#) (|check-union| (QEQCAR #0# 0) (|SparseUnivariatePolynomial| - (QREFELT $ 6)) + (|getShellEntry| $ 6)) #0#)) |GCDDOM-;gcdPolynomial;3Sup;4|) (LETT |p2| (PROG2 (LETT #0# (SPADCALL |p2| |c2| - (QREFELT $ 27)) + (|getShellEntry| $ 27)) |GCDDOM-;gcdPolynomial;3Sup;4|) (QCDR #0#) (|check-union| (QEQCAR #0# 0) (|SparseUnivariatePolynomial| - (QREFELT $ 6)) + (|getShellEntry| $ 6)) #0#)) |GCDDOM-;gcdPolynomial;3Sup;4|) - (SEQ (LETT |e1| (SPADCALL |p1| (QREFELT $ 29)) + (SEQ (LETT |e1| + (SPADCALL |p1| (|getShellEntry| $ 29)) |GCDDOM-;gcdPolynomial;3Sup;4|) (EXIT (COND ((< 0 |e1|) @@ -72,16 +76,17 @@ (SPADCALL |p1| (SPADCALL (|spadConstant| $ 16) |e1| - (QREFELT $ 32)) - (QREFELT $ 33)) + (|getShellEntry| $ 32)) + (|getShellEntry| $ 33)) |GCDDOM-;gcdPolynomial;3Sup;4|) (QCDR #0#) (|check-union| (QEQCAR #0# 0) (|SparseUnivariatePolynomial| - (QREFELT $ 6)) + (|getShellEntry| $ 6)) #0#)) |GCDDOM-;gcdPolynomial;3Sup;4|))))) - (SEQ (LETT |e2| (SPADCALL |p2| (QREFELT $ 29)) + (SEQ (LETT |e2| + (SPADCALL |p2| (|getShellEntry| $ 29)) |GCDDOM-;gcdPolynomial;3Sup;4|) (EXIT (COND ((< 0 |e2|) @@ -91,45 +96,50 @@ (SPADCALL |p2| (SPADCALL (|spadConstant| $ 16) |e2| - (QREFELT $ 32)) - (QREFELT $ 33)) + (|getShellEntry| $ 32)) + (|getShellEntry| $ 33)) |GCDDOM-;gcdPolynomial;3Sup;4|) (QCDR #0#) (|check-union| (QEQCAR #0# 0) (|SparseUnivariatePolynomial| - (QREFELT $ 6)) + (|getShellEntry| $ 6)) #0#)) |GCDDOM-;gcdPolynomial;3Sup;4|))))) (LETT |e1| (MIN |e1| |e2|) |GCDDOM-;gcdPolynomial;3Sup;4|) - (LETT |c1| (SPADCALL |c1| |c2| (QREFELT $ 10)) + (LETT |c1| + (SPADCALL |c1| |c2| (|getShellEntry| $ 10)) |GCDDOM-;gcdPolynomial;3Sup;4|) (LETT |p1| (COND - ((OR (EQL (SPADCALL |p1| (QREFELT $ 34)) 0) - (EQL (SPADCALL |p2| (QREFELT $ 34)) 0)) - (SPADCALL |c1| 0 (QREFELT $ 32))) + ((OR (EQL (SPADCALL |p1| + (|getShellEntry| $ 34)) + 0) + (EQL (SPADCALL |p2| + (|getShellEntry| $ 34)) + 0)) + (SPADCALL |c1| 0 (|getShellEntry| $ 32))) ('T (SEQ (LETT |p| (SPADCALL |p1| |p2| - (QREFELT $ 35)) + (|getShellEntry| $ 35)) |GCDDOM-;gcdPolynomial;3Sup;4|) (EXIT (COND ((EQL (SPADCALL |p| - (QREFELT $ 34)) + (|getShellEntry| $ 34)) 0) (SPADCALL |c1| 0 - (QREFELT $ 32))) + (|getShellEntry| $ 32))) ('T (SEQ (LETT |c2| (SPADCALL (SPADCALL |p1| - (QREFELT $ 36)) + (|getShellEntry| $ 36)) (SPADCALL |p2| - (QREFELT $ 36)) - (QREFELT $ 10)) + (|getShellEntry| $ 36)) + (|getShellEntry| $ 10)) |GCDDOM-;gcdPolynomial;3Sup;4|) (EXIT (SPADCALL @@ -139,28 +149,32 @@ (LETT #0# (SPADCALL (SPADCALL |c2| |p| - (QREFELT $ 37)) + (|getShellEntry| $ + 37)) (SPADCALL |p| - (QREFELT $ 36)) - (QREFELT $ 27)) + (|getShellEntry| $ + 36)) + (|getShellEntry| $ + 27)) |GCDDOM-;gcdPolynomial;3Sup;4|) (QCDR #0#) (|check-union| (QEQCAR #0# 0) (|SparseUnivariatePolynomial| - (QREFELT $ 6)) + (|getShellEntry| $ + 6)) #0#)) - (QREFELT $ 38)) - (QREFELT $ 37)) - (QREFELT $ 25)))))))))) + (|getShellEntry| $ 38)) + (|getShellEntry| $ 37)) + (|getShellEntry| $ 25)))))))))) |GCDDOM-;gcdPolynomial;3Sup;4|) (EXIT (COND ((ZEROP |e1|) |p1|) ('T (SPADCALL (SPADCALL (|spadConstant| $ 16) |e1| - (QREFELT $ 32)) - |p1| (QREFELT $ 39)))))))))))) + (|getShellEntry| $ 32)) + |p1| (|getShellEntry| $ 39)))))))))))) (DEFUN |GcdDomain&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -168,11 +182,12 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|GcdDomain&|)) (LETT |dv$| (LIST '|GcdDomain&| |dv$1|) . #0#) - (LETT $ (GETREFV 42) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 42) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) $)))) (MAKEPROP '|GcdDomain&| '|infovec| @@ -206,3 +221,43 @@ 20 21 2 0 0 0 0 14 2 0 40 40 40 41 1 0 0 20 22))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|GcdDomain&| '|isFunctor| + '(((|gcdPolynomial| + ((|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| $))) + T (ELT $ 41)) + ((|lcm| ($ (|List| $))) T (ELT $ 21)) + ((|lcm| ($ $ $)) T (ELT $ 14)) + ((|gcd| ($ (|List| $))) T (ELT $ 22)) + ((|gcd| ($ $ $)) T (ELT $ NIL))) + (|addModemap| '|GcdDomain&| '(|GcdDomain&| |#1|) + '((CATEGORY |domain| + (SIGNATURE |gcdPolynomial| + ((|SparseUnivariatePolynomial| |#1|) + (|SparseUnivariatePolynomial| |#1|) + (|SparseUnivariatePolynomial| |#1|))) + (SIGNATURE |lcm| (|#1| (|List| |#1|))) + (SIGNATURE |lcm| (|#1| |#1| |#1|)) + (SIGNATURE |gcd| (|#1| (|List| |#1|))) + (SIGNATURE |gcd| (|#1| |#1| |#1|))) + (|GcdDomain|)) + T '|GcdDomain&| + (|put| '|GcdDomain&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |gcdPolynomial| + ((|SparseUnivariatePolynomial| + |#1|) + (|SparseUnivariatePolynomial| + |#1|) + (|SparseUnivariatePolynomial| + |#1|))) + (SIGNATURE |lcm| (|#1| (|List| |#1|))) + (SIGNATURE |lcm| (|#1| |#1| |#1|)) + (SIGNATURE |gcd| (|#1| (|List| |#1|))) + (SIGNATURE |gcd| (|#1| |#1| |#1|))) + (|GcdDomain|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/GCDDOM.lsp b/src/algebra/strap/GCDDOM.lsp index 1756b55f..a7f120d3 100644 --- a/src/algebra/strap/GCDDOM.lsp +++ b/src/algebra/strap/GCDDOM.lsp @@ -4,11 +4,11 @@ (DEFPARAMETER |GcdDomain;AL| 'NIL) (DEFUN |GcdDomain| () - (LET (#:G1393) + (LET (#:G1402) (COND (|GcdDomain;AL|) (T (SETQ |GcdDomain;AL| (|GcdDomain;|)))))) (DEFUN |GcdDomain;| () - (PROG (#0=#:G1391) + (PROG (#0=#:G1400) (RETURN (PROG1 (LETT #0# (|Join| (|IntegralDomain|) @@ -29,4 +29,9 @@ |GcdDomain|) (SETELT #0# 0 '(|GcdDomain|)))))) +(SETQ |$CategoryFrame| + (|put| '|GcdDomain| '|isCategory| T + (|addModemap| '|GcdDomain| '(|GcdDomain|) '((|Category|)) + T '|GcdDomain| |$CategoryFrame|))) + (MAKEPROP '|GcdDomain| 'NILADIC T) 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|)))) diff --git a/src/algebra/strap/HOAGG.lsp b/src/algebra/strap/HOAGG.lsp index 1dc9a3bf..e3473740 100644 --- a/src/algebra/strap/HOAGG.lsp +++ b/src/algebra/strap/HOAGG.lsp @@ -5,8 +5,8 @@ (DEFPARAMETER |HomogeneousAggregate;AL| 'NIL) -(DEFUN |HomogeneousAggregate| (#0=#:G1399) - (LET (#1=#:G1400) +(DEFUN |HomogeneousAggregate| (#0=#:G1396) + (LET (#1=#:G1397) (COND ((SETQ #1# (|assoc| (|devaluate| #0#) |HomogeneousAggregate;AL|)) (CDR #1#)) @@ -17,7 +17,7 @@ #1#)))) (DEFUN |HomogeneousAggregate;| (|t#1|) - (PROG (#0=#:G1398) + (PROG (#0=#:G1395) (RETURN (PROG1 (LETT #0# (|sublisV| @@ -110,3 +110,10 @@ . #1=(|HomogeneousAggregate|))))) . #1#) (SETELT #0# 0 (LIST '|HomogeneousAggregate| (|devaluate| |t#1|))))))) + +(SETQ |$CategoryFrame| + (|put| '|HomogeneousAggregate| '|isCategory| T + (|addModemap| '|HomogeneousAggregate| + '(|HomogeneousAggregate| |#1|) + '((|Category|) (|Type|)) T '|HomogeneousAggregate| + |$CategoryFrame|))) diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp index 569cd271..404c69e7 100644 --- a/src/algebra/strap/ILIST.lsp +++ b/src/algebra/strap/ILIST.lsp @@ -41,25 +41,25 @@ (DEFUN |ILIST;setfirst!;$2S;10| (|x| |s| $) (COND - ((SPADCALL |x| (QREFELT $ 17)) + ((SPADCALL |x| (|getShellEntry| $ 17)) (|error| "Cannot update an empty list")) ('T (QCAR (RPLACA |x| |s|))))) (DEFUN |ILIST;setelt;$first2S;11| (|x| T2 |s| $) (COND - ((SPADCALL |x| (QREFELT $ 17)) + ((SPADCALL |x| (|getShellEntry| $ 17)) (|error| "Cannot update an empty list")) ('T (QCAR (RPLACA |x| |s|))))) (DEFUN |ILIST;setrest!;3$;12| (|x| |y| $) (COND - ((SPADCALL |x| (QREFELT $ 17)) + ((SPADCALL |x| (|getShellEntry| $ 17)) (|error| "Cannot update an empty list")) ('T (QCDR (RPLACD |x| |y|))))) (DEFUN |ILIST;setelt;$rest2$;13| (|x| T3 |y| $) (COND - ((SPADCALL |x| (QREFELT $ 17)) + ((SPADCALL |x| (|getShellEntry| $ 17)) (|error| "Cannot update an empty list")) ('T (QCDR (RPLACD |x| |y|))))) @@ -79,7 +79,7 @@ (DEFUN |ILIST;reverse;2$;17| (|x| $) (REVERSE |x|)) -(DEFUN |ILIST;minIndex;$I;18| (|x| $) (QREFELT $ 7)) +(DEFUN |ILIST;minIndex;$I;18| (|x| $) (|getShellEntry| $ 7)) (DEFUN |ILIST;rest;$Nni$;19| (|x| |n| $) (PROG (|i|) @@ -96,15 +96,16 @@ (DEFUN |ILIST;copy;2$;20| (|x| $) (PROG (|i| |y|) (RETURN - (SEQ (LETT |y| (SPADCALL (QREFELT $ 16)) |ILIST;copy;2$;20|) + (SEQ (LETT |y| (SPADCALL (|getShellEntry| $ 16)) + |ILIST;copy;2$;20|) (SEQ (LETT |i| 0 |ILIST;copy;2$;20|) G190 (COND - ((NULL (SPADCALL (NULL |x|) (QREFELT $ 33))) + ((NULL (SPADCALL (NULL |x|) (|getShellEntry| $ 33))) (GO G191))) (SEQ (COND ((EQ |i| 1000) (COND - ((SPADCALL |x| (QREFELT $ 34)) + ((SPADCALL |x| (|getShellEntry| $ 34)) (|error| "cyclic list"))))) (LETT |y| (CONS (QCAR |x|) |y|) |ILIST;copy;2$;20|) @@ -117,44 +118,50 @@ (PROG (|s| |y| |z|) (RETURN (SEQ (LETT |y| NIL |ILIST;coerce;$Of;21|) - (LETT |s| (SPADCALL |x| (QREFELT $ 36)) + (LETT |s| (SPADCALL |x| (|getShellEntry| $ 36)) |ILIST;coerce;$Of;21|) (SEQ G190 (COND ((NULL (NEQ |x| |s|)) (GO G191))) (SEQ (LETT |y| (CONS (SPADCALL - (SPADCALL |x| (QREFELT $ 13)) - (QREFELT $ 38)) + (SPADCALL |x| + (|getShellEntry| $ 13)) + (|getShellEntry| $ 38)) |y|) |ILIST;coerce;$Of;21|) - (EXIT (LETT |x| (SPADCALL |x| (QREFELT $ 18)) + (EXIT (LETT |x| + (SPADCALL |x| (|getShellEntry| $ 18)) |ILIST;coerce;$Of;21|))) NIL (GO G190) G191 (EXIT NIL)) (LETT |y| (NREVERSE |y|) |ILIST;coerce;$Of;21|) (EXIT (COND - ((SPADCALL |s| (QREFELT $ 17)) - (SPADCALL |y| (QREFELT $ 40))) + ((SPADCALL |s| (|getShellEntry| $ 17)) + (SPADCALL |y| (|getShellEntry| $ 40))) ('T (SEQ (LETT |z| (SPADCALL (SPADCALL - (SPADCALL |x| (QREFELT $ 13)) - (QREFELT $ 38)) - (QREFELT $ 42)) + (SPADCALL |x| + (|getShellEntry| $ 13)) + (|getShellEntry| $ 38)) + (|getShellEntry| $ 42)) |ILIST;coerce;$Of;21|) (SEQ G190 (COND ((NULL (NEQ |s| - (SPADCALL |x| (QREFELT $ 18)))) + (SPADCALL |x| + (|getShellEntry| $ 18)))) (GO G191))) (SEQ (LETT |x| - (SPADCALL |x| (QREFELT $ 18)) + (SPADCALL |x| + (|getShellEntry| $ 18)) |ILIST;coerce;$Of;21|) (EXIT (LETT |z| (CONS (SPADCALL - (SPADCALL |x| (QREFELT $ 13)) - (QREFELT $ 38)) + (SPADCALL |x| + (|getShellEntry| $ 13)) + (|getShellEntry| $ 38)) |z|) |ILIST;coerce;$Of;21|))) NIL (GO G190) G191 (EXIT NIL)) @@ -162,13 +169,13 @@ (SPADCALL |y| (SPADCALL (SPADCALL (NREVERSE |z|) - (QREFELT $ 43)) - (QREFELT $ 44)) - (QREFELT $ 45)) - (QREFELT $ 40))))))))))) + (|getShellEntry| $ 43)) + (|getShellEntry| $ 44)) + (|getShellEntry| $ 45)) + (|getShellEntry| $ 40))))))))))) (DEFUN |ILIST;=;2$B;22| (|x| |y| $) - (PROG (#0=#:G1469) + (PROG (#0=#:G1466) (RETURN (SEQ (EXIT (COND ((EQ |x| |y|) 'T) @@ -179,13 +186,12 @@ ((NULL |x|) 'NIL) ('T (SPADCALL (NULL |y|) - (QREFELT $ 33))))) + (|getShellEntry| $ 33))))) (GO G191))) (SEQ (EXIT (COND - ((NULL - (SPADCALL (QCAR |x|) (QCAR |y|) - (QREFELT $ 47))) + ((SPADCALL (QCAR |x|) (QCAR |y|) + (|getShellEntry| $ 47)) (PROGN (LETT #0# 'NIL |ILIST;=;2$B;22|) @@ -209,12 +215,12 @@ (SEQ (LETT |s| "\\left[" |ILIST;latex;$S;23|) (SEQ G190 (COND - ((NULL (SPADCALL (NULL |x|) (QREFELT $ 33))) + ((NULL (SPADCALL (NULL |x|) (|getShellEntry| $ 33))) (GO G191))) (SEQ (LETT |s| (STRCONC |s| (SPADCALL (QCAR |x|) - (QREFELT $ 50))) + (|getShellEntry| $ 50))) |ILIST;latex;$S;23|) (LETT |x| (QCDR |x|) |ILIST;latex;$S;23|) (EXIT (COND @@ -225,16 +231,16 @@ (EXIT (STRCONC |s| " \\right]")))))) (DEFUN |ILIST;member?;S$B;24| (|s| |x| $) - (PROG (#0=#:G1477) + (PROG (#0=#:G1474) (RETURN (SEQ (EXIT (SEQ (SEQ G190 (COND ((NULL (SPADCALL (NULL |x|) - (QREFELT $ 33))) + (|getShellEntry| $ 33))) (GO G191))) (SEQ (EXIT (COND ((SPADCALL |s| (QCAR |x|) - (QREFELT $ 47)) + (|getShellEntry| $ 52)) (PROGN (LETT #0# 'T |ILIST;member?;S$B;24|) @@ -254,15 +260,16 @@ (COND ((NULL |y|) |x|) ('T - (SEQ (PUSH (SPADCALL |y| (QREFELT $ 13)) |x|) - (QRPLACD |x| (SPADCALL |y| (QREFELT $ 18))) + (SEQ (PUSH (SPADCALL |y| (|getShellEntry| $ 13)) |x|) + (QRPLACD |x| + (SPADCALL |y| (|getShellEntry| $ 18))) (EXIT |x|))))) ('T (SEQ (LETT |z| |x| |ILIST;concat!;3$;25|) (SEQ G190 (COND ((NULL (SPADCALL (NULL (QCDR |z|)) - (QREFELT $ 33))) + (|getShellEntry| $ 33))) (GO G191))) (SEQ (EXIT (LETT |z| (QCDR |z|) |ILIST;concat!;3$;25|))) @@ -275,7 +282,7 @@ (SEQ (LETT |p| |l| |ILIST;removeDuplicates!;2$;26|) (SEQ G190 (COND - ((NULL (SPADCALL (NULL |p|) (QREFELT $ 33))) + ((NULL (SPADCALL (NULL |p|) (|getShellEntry| $ 33))) (GO G191))) (SEQ (LETT |pp| |p| |ILIST;removeDuplicates!;2$;26|) (LETT |f| (QCAR |p|) @@ -289,12 +296,12 @@ (NULL (LETT |pr| (QCDR |pp|) |ILIST;removeDuplicates!;2$;26|)) - (QREFELT $ 33))) + (|getShellEntry| $ 33))) (GO G191))) (SEQ (EXIT (COND ((SPADCALL (QCAR |pr|) |f| - (QREFELT $ 47)) + (|getShellEntry| $ 52)) (QRPLACD |pp| (QCDR |pr|))) ('T (LETT |pp| |pr| @@ -304,7 +311,7 @@ (EXIT |l|))))) (DEFUN |ILIST;sort!;M2$;27| (|f| |l| $) - (|ILIST;mergeSort| |f| |l| (SPADCALL |l| (QREFELT $ 9)) $)) + (|ILIST;mergeSort| |f| |l| (SPADCALL |l| (|getShellEntry| $ 9)) $)) (DEFUN |ILIST;merge!;M3$;28| (|f| |p| |q| $) (PROG (|r| |t|) @@ -333,7 +340,7 @@ ((NULL |p|) 'NIL) ('T (SPADCALL (NULL |q|) - (QREFELT $ 33))))) + (|getShellEntry| $ 33))))) (GO G191))) (SEQ (EXIT (COND ((SPADCALL (QCAR |p|) (QCAR |q|) @@ -356,7 +363,7 @@ (EXIT |r|)))))))) (DEFUN |ILIST;split!;$I$;29| (|p| |n| $) - (PROG (#0=#:G1506 |q|) + (PROG (#0=#:G1503 |q|) (RETURN (SEQ (COND ((< |n| 1) (|error| "index out of range")) @@ -367,22 +374,22 @@ |ILIST;split!;$I$;29|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (QREFELT $ 32)) + (|getShellEntry| $ 32)) |ILIST;split!;$I$;29|) (LETT |q| (QCDR |p|) |ILIST;split!;$I$;29|) (QRPLACD |p| NIL) (EXIT |q|)))))))) (DEFUN |ILIST;mergeSort| (|f| |p| |n| $) - (PROG (#0=#:G1510 |l| |q|) + (PROG (#0=#:G1507 |l| |q|) (RETURN (SEQ (COND ((EQL |n| 2) (COND ((SPADCALL - (SPADCALL (SPADCALL |p| (QREFELT $ 18)) - (QREFELT $ 13)) - (SPADCALL |p| (QREFELT $ 13)) |f|) - (LETT |p| (SPADCALL |p| (QREFELT $ 28)) + (SPADCALL (SPADCALL |p| (|getShellEntry| $ 18)) + (|getShellEntry| $ 13)) + (SPADCALL |p| (|getShellEntry| $ 13)) |f|) + (LETT |p| (SPADCALL |p| (|getShellEntry| $ 28)) |ILIST;mergeSort|))))) (EXIT (COND ((< |n| 3) |p|) @@ -393,7 +400,9 @@ (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) |ILIST;mergeSort|) - (LETT |q| (SPADCALL |p| |l| (QREFELT $ 58)) + (LETT |q| + (SPADCALL |p| |l| + (|getShellEntry| $ 59)) |ILIST;mergeSort|) (LETT |p| (|ILIST;mergeSort| |f| |p| |l| $) |ILIST;mergeSort|) @@ -401,13 +410,14 @@ (|ILIST;mergeSort| |f| |q| (- |n| |l|) $) |ILIST;mergeSort|) - (EXIT (SPADCALL |f| |p| |q| (QREFELT $ 57))))))))))) + (EXIT (SPADCALL |f| |p| |q| + (|getShellEntry| $ 58))))))))))) -(DEFUN |IndexedList| (&REST #0=#:G1525 &AUX #1=#:G1523) +(DEFUN |IndexedList| (&REST #0=#:G1519 &AUX #1=#:G1517) (DSETQ #1# #0#) (PROG () (RETURN - (PROG (#2=#:G1524) + (PROG (#2=#:G1518) (RETURN (COND ((LETT #2# @@ -424,67 +434,68 @@ ((NOT #2#) (HREM |$ConstructorCache| '|IndexedList|))))))))))) (DEFUN |IndexedList;| (|#1| |#2|) - (PROG (|dv$1| |dv$2| |dv$| $ #0=#:G1522 #1=#:G1520 |pv$|) + (PROG (|dv$1| |dv$2| |dv$| $ |pv$|) (RETURN (PROGN - (LETT |dv$1| (|devaluate| |#1|) . #2=(|IndexedList|)) - (LETT |dv$2| (|devaluate| |#2|) . #2#) - (LETT |dv$| (LIST '|IndexedList| |dv$1| |dv$2|) . #2#) - (LETT $ (GETREFV 72) . #2#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 + (LETT |dv$1| (|devaluate| |#1|) . #0=(|IndexedList|)) + (LETT |dv$2| (|devaluate| |#2|) . #0#) + (LETT |dv$| (LIST '|IndexedList| |dv$1| |dv$2|) . #0#) + (LETT $ (|newShell| 73) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 - (LIST (|HasCategory| |#1| - '(|ConvertibleTo| (|InputForm|))) - (|HasCategory| |#1| '(|OrderedSet|)) - (|HasCategory| (|Integer|) '(|OrderedSet|)) - (LETT #0# - (|HasCategory| |#1| '(|SetCategory|)) . #2#) - (OR (|HasCategory| |#1| '(|OrderedSet|)) - #0#) - (AND #0# - (|HasCategory| |#1| - (LIST '|Evalable| - (|devaluate| |#1|)))) - (OR (AND (|HasCategory| |#1| + (LIST (OR (AND (|HasCategory| |#1| '(|OrderedSet|)) (|HasCategory| |#1| (LIST '|Evalable| (|devaluate| |#1|)))) - (AND #0# + (AND (|HasCategory| |#1| + '(|SetCategory|)) (|HasCategory| |#1| (LIST '|Evalable| (|devaluate| |#1|))))) - (LETT #1# - (|HasCategory| |#1| - '(|CoercibleTo| (|OutputForm|))) . #2#) - (OR (AND #0# + (OR (AND (|HasCategory| |#1| + '(|SetCategory|)) (|HasCategory| |#1| (LIST '|Evalable| (|devaluate| |#1|)))) - #1#))) . #2#)) + (|HasCategory| |#1| + '(|CoercibleTo| (|OutputForm|)))) + (|HasCategory| |#1| + '(|ConvertibleTo| (|InputForm|))) + (OR (|HasCategory| |#1| '(|OrderedSet|)) + (|HasCategory| |#1| '(|SetCategory|))) + (|HasCategory| |#1| '(|OrderedSet|)) + (|HasCategory| (|Integer|) '(|OrderedSet|)) + (|HasCategory| |#1| '(|SetCategory|)) + (AND (|HasCategory| |#1| '(|SetCategory|)) + (|HasCategory| |#1| + (LIST '|Evalable| + (|devaluate| |#1|)))) + (|HasCategory| |#1| + '(|CoercibleTo| (|OutputForm|))))) . #0#)) (|haddProp| |$ConstructorCache| '|IndexedList| (LIST |dv$1| |dv$2|) (CONS 1 $)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) - (QSETREFV $ 7 |#2|) + (|setShellEntry| $ 6 |#1|) + (|setShellEntry| $ 7 |#2|) (COND - ((|testBitVector| |pv$| 8) - (QSETREFV $ 46 + ((|testBitVector| |pv$| 9) + (|setShellEntry| $ 46 (CONS (|dispatchFunction| |ILIST;coerce;$Of;21|) $)))) (COND - ((|testBitVector| |pv$| 4) + ((|testBitVector| |pv$| 7) (PROGN - (QSETREFV $ 48 + (|setShellEntry| $ 48 (CONS (|dispatchFunction| |ILIST;=;2$B;22|) $)) - (QSETREFV $ 51 + (|setShellEntry| $ 51 (CONS (|dispatchFunction| |ILIST;latex;$S;23|) $)) - (QSETREFV $ 52 + (|setShellEntry| $ 53 (CONS (|dispatchFunction| |ILIST;member?;S$B;24|) $))))) (COND - ((|testBitVector| |pv$| 4) - (QSETREFV $ 54 + ((|testBitVector| |pv$| 7) + (|setShellEntry| $ 55 (CONS (|dispatchFunction| |ILIST;removeDuplicates!;2$;26|) $)))) @@ -505,42 +516,42 @@ (5 . |cyclic?|) |ILIST;copy;2$;20| (10 . |cycleEntry|) (|OutputForm|) (15 . |coerce|) (|List| $) (20 . |bracket|) (|List| 37) (25 . |list|) (30 . |commaSeparate|) - (35 . |overbar|) (40 . |concat!|) (46 . |coerce|) (51 . =) - (57 . =) (|String|) (63 . |latex|) (68 . |latex|) - (73 . |member?|) |ILIST;concat!;3$;25| - (79 . |removeDuplicates!|) (|Mapping| 11 6 6) - |ILIST;sort!;M2$;27| |ILIST;merge!;M3$;28| - |ILIST;split!;$I$;29| (|Mapping| 6 6 6) (|Equation| 6) - (|List| 60) (|Mapping| 11 6) (|Void|) - (|UniversalSegment| 30) '"last" '"value" (|Mapping| 6 6) - (|InputForm|) (|SingleInteger|) (|List| 30) - (|Union| 6 '"failed")) - '#(~= 84 |value| 90 |third| 95 |tail| 100 |swap!| 105 - |split!| 112 |sorted?| 118 |sort!| 129 |sort| 140 |size?| - 151 |setvalue!| 157 |setrest!| 163 |setlast!| 169 - |setfirst!| 175 |setelt| 181 |setchildren!| 223 |select!| - 229 |select| 235 |second| 241 |sample| 246 |reverse!| 250 - |reverse| 255 |rest| 260 |removeDuplicates!| 271 - |removeDuplicates| 276 |remove!| 281 |remove| 293 |reduce| - 305 |qsetelt!| 326 |qelt| 333 |possiblyInfinite?| 339 - |position| 344 |parts| 363 |nodes| 368 |node?| 373 |new| - 379 |more?| 385 |minIndex| 391 |min| 396 |merge!| 402 - |merge| 415 |members| 428 |member?| 433 |maxIndex| 439 - |max| 444 |map!| 450 |map| 456 |list| 469 |less?| 474 - |leaves| 480 |leaf?| 485 |latex| 490 |last| 495 |insert!| - 506 |insert| 520 |indices| 534 |index?| 539 |hash| 545 - |first| 550 |find| 561 |fill!| 567 |explicitlyFinite?| 573 - |every?| 578 |eval| 584 |eq?| 610 |entry?| 616 |entries| - 622 |empty?| 627 |empty| 632 |elt| 636 |distance| 679 - |delete!| 685 |delete| 697 |cyclic?| 709 |cycleTail| 714 - |cycleSplit!| 719 |cycleLength| 724 |cycleEntry| 729 - |count| 734 |copyInto!| 746 |copy| 753 |convert| 758 - |construct| 763 |concat!| 768 |concat| 780 |coerce| 803 - |children| 808 |child?| 813 |any?| 819 >= 825 > 831 = 837 - <= 843 < 849 |#| 855) + (35 . |overbar|) (40 . |concat!|) (46 . |coerce|) + (51 . ~=) (57 . =) (|String|) (63 . |latex|) + (68 . |latex|) (73 . =) (79 . |member?|) + |ILIST;concat!;3$;25| (85 . |removeDuplicates!|) + (|Mapping| 11 6 6) |ILIST;sort!;M2$;27| + |ILIST;merge!;M3$;28| |ILIST;split!;$I$;29| + (|Mapping| 6 6 6) (|Equation| 6) (|List| 61) + (|Mapping| 11 6) (|Void|) (|UniversalSegment| 30) '"last" + '"value" (|Mapping| 6 6) (|InputForm|) (|SingleInteger|) + (|List| 30) (|Union| 6 '"failed")) + '#(~= 90 |value| 96 |third| 101 |tail| 106 |swap!| 111 + |split!| 118 |sorted?| 124 |sort!| 135 |sort| 146 |size?| + 157 |setvalue!| 163 |setrest!| 169 |setlast!| 175 + |setfirst!| 181 |setelt| 187 |setchildren!| 229 |select!| + 235 |select| 241 |second| 247 |sample| 252 |reverse!| 256 + |reverse| 261 |rest| 266 |removeDuplicates!| 277 + |removeDuplicates| 282 |remove!| 287 |remove| 299 |reduce| + 311 |qsetelt!| 332 |qelt| 339 |possiblyInfinite?| 345 + |position| 350 |parts| 369 |nodes| 374 |node?| 379 |new| + 385 |more?| 391 |minIndex| 397 |min| 402 |merge!| 408 + |merge| 421 |members| 434 |member?| 439 |maxIndex| 445 + |max| 450 |map!| 456 |map| 462 |list| 475 |less?| 480 + |leaves| 486 |leaf?| 491 |latex| 496 |last| 501 |insert!| + 512 |insert| 526 |indices| 540 |index?| 545 |hash| 551 + |first| 556 |find| 567 |fill!| 573 |explicitlyFinite?| 579 + |every?| 584 |eval| 590 |eq?| 616 |entry?| 622 |entries| + 628 |empty?| 633 |empty| 638 |elt| 642 |distance| 685 + |delete!| 691 |delete| 703 |cyclic?| 715 |cycleTail| 720 + |cycleSplit!| 725 |cycleLength| 730 |cycleEntry| 735 + |count| 740 |copyInto!| 752 |copy| 759 |convert| 764 + |construct| 769 |concat!| 774 |concat| 786 |coerce| 809 + |children| 814 |child?| 819 |any?| 825 >= 831 > 837 = 843 + <= 849 < 855 |#| 861) '((|shallowlyMutable| . 0) (|finiteAggregate| . 0)) - (CONS (|makeByteWordVec2| 9 - '(0 0 0 0 0 0 0 0 0 0 2 0 0 7 5 0 0 7 9 1 5)) + (CONS (|makeByteWordVec2| 5 + '(0 0 0 0 0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4)) (CONS '#(|ListAggregate&| |StreamAggregate&| |ExtensibleLinearAggregate&| |FiniteLinearAggregate&| @@ -564,58 +575,310 @@ (|EltableAggregate| 30 6) (|Evalable| 6) (|SetCategory|) (|Type|) (|Eltable| 30 6) (|InnerEvalable| 6 6) - (|CoercibleTo| 37) (|ConvertibleTo| 68) + (|CoercibleTo| 37) (|ConvertibleTo| 69) (|BasicType|)) - (|makeByteWordVec2| 71 + (|makeByteWordVec2| 72 '(1 11 0 0 33 1 0 11 0 34 1 0 0 0 36 1 6 37 0 38 1 37 0 39 40 1 41 0 37 42 1 37 0 39 43 1 37 0 0 44 2 41 0 0 37 45 1 0 37 0 46 2 6 11 0 0 47 2 0 11 0 0 - 48 1 6 49 0 50 1 0 49 0 51 2 0 11 6 0 - 52 1 0 0 0 54 2 4 11 0 0 1 1 0 6 0 1 - 1 0 6 0 1 1 0 0 0 1 3 0 63 0 30 30 1 - 2 0 0 0 30 58 1 2 11 0 1 2 0 11 55 0 - 1 1 2 0 0 1 2 0 0 55 0 56 1 2 0 0 1 2 - 0 0 55 0 1 2 0 11 0 8 1 2 0 6 0 6 1 2 - 0 0 0 0 23 2 0 6 0 6 1 2 0 6 0 6 21 3 - 0 6 0 30 6 1 3 0 6 0 64 6 1 3 0 6 0 - 65 6 1 3 0 0 0 19 0 24 3 0 6 0 14 6 - 22 3 0 6 0 66 6 1 2 0 0 0 39 1 2 0 0 - 62 0 1 2 0 0 62 0 1 1 0 6 0 1 0 0 0 1 - 1 0 0 0 28 1 0 0 0 29 2 0 0 0 8 32 1 - 0 0 0 18 1 4 0 0 54 1 4 0 0 1 2 4 0 6 - 0 1 2 0 0 62 0 1 2 4 0 6 0 1 2 0 0 62 - 0 1 4 4 6 59 0 6 6 1 2 0 6 59 0 1 3 0 - 6 59 0 6 1 3 0 6 0 30 6 1 2 0 6 0 30 - 1 1 0 11 0 1 2 4 30 6 0 1 3 4 30 6 0 - 30 1 2 0 30 62 0 1 1 0 25 0 27 1 0 39 - 0 1 2 4 11 0 0 1 2 0 0 8 6 1 2 0 11 0 - 8 1 1 3 30 0 31 2 2 0 0 0 1 2 2 0 0 0 - 1 3 0 0 55 0 0 57 2 2 0 0 0 1 3 0 0 - 55 0 0 1 1 0 25 0 1 2 4 11 6 0 52 1 3 - 30 0 1 2 2 0 0 0 1 2 0 0 67 0 1 3 0 0 - 59 0 0 1 2 0 0 67 0 1 1 0 0 6 1 2 0 - 11 0 8 1 1 0 25 0 1 1 0 11 0 1 1 4 49 - 0 51 2 0 0 0 8 1 1 0 6 0 1 3 0 0 6 0 - 30 1 3 0 0 0 0 30 1 3 0 0 0 0 30 1 3 - 0 0 6 0 30 1 1 0 70 0 1 2 0 11 30 0 1 - 1 4 69 0 1 2 0 0 0 8 1 1 0 6 0 13 2 0 - 71 62 0 1 2 0 0 0 6 1 1 0 11 0 1 2 0 - 11 62 0 1 3 6 0 0 6 6 1 3 6 0 0 25 25 - 1 2 6 0 0 60 1 2 6 0 0 61 1 2 0 11 0 - 0 12 2 4 11 6 0 1 1 0 25 0 1 1 0 11 0 - 17 0 0 0 16 2 0 6 0 30 1 3 0 6 0 30 6 - 1 2 0 0 0 64 1 2 0 6 0 65 1 2 0 0 0 - 19 20 2 0 6 0 14 15 2 0 6 0 66 1 2 0 - 30 0 0 1 2 0 0 0 64 1 2 0 0 0 30 1 2 - 0 0 0 64 1 2 0 0 0 30 1 1 0 11 0 34 1 - 0 0 0 1 1 0 0 0 1 1 0 8 0 1 1 0 0 0 - 36 2 4 8 6 0 1 2 0 8 62 0 1 3 0 0 0 0 - 30 1 1 0 0 0 35 1 1 68 0 1 1 0 0 25 - 26 2 0 0 0 0 53 2 0 0 0 6 1 1 0 0 39 - 1 2 0 0 0 6 1 2 0 0 6 0 10 2 0 0 0 0 - 1 1 8 37 0 46 1 0 39 0 1 2 4 11 0 0 1 - 2 0 11 62 0 1 2 2 11 0 0 1 2 2 11 0 0 - 1 2 4 11 0 0 48 2 2 11 0 0 1 2 2 11 0 - 0 1 1 0 8 0 9))))) + 48 1 6 49 0 50 1 0 49 0 51 2 6 11 0 0 + 52 2 0 11 6 0 53 1 0 0 0 55 2 7 11 0 + 0 1 1 0 6 0 1 1 0 6 0 1 1 0 0 0 1 3 0 + 64 0 30 30 1 2 0 0 0 30 59 1 5 11 0 1 + 2 0 11 56 0 1 1 5 0 0 1 2 0 0 56 0 57 + 1 5 0 0 1 2 0 0 56 0 1 2 0 11 0 8 1 2 + 0 6 0 6 1 2 0 0 0 0 23 2 0 6 0 6 1 2 + 0 6 0 6 21 3 0 6 0 30 6 1 3 0 6 0 65 + 6 1 3 0 6 0 66 6 1 3 0 0 0 19 0 24 3 + 0 6 0 14 6 22 3 0 6 0 67 6 1 2 0 0 0 + 39 1 2 0 0 63 0 1 2 0 0 63 0 1 1 0 6 + 0 1 0 0 0 1 1 0 0 0 28 1 0 0 0 29 2 0 + 0 0 8 32 1 0 0 0 18 1 7 0 0 55 1 7 0 + 0 1 2 7 0 6 0 1 2 0 0 63 0 1 2 7 0 6 + 0 1 2 0 0 63 0 1 4 7 6 60 0 6 6 1 2 0 + 6 60 0 1 3 0 6 60 0 6 1 3 0 6 0 30 6 + 1 2 0 6 0 30 1 1 0 11 0 1 2 7 30 6 0 + 1 3 7 30 6 0 30 1 2 0 30 63 0 1 1 0 + 25 0 27 1 0 39 0 1 2 7 11 0 0 1 2 0 0 + 8 6 1 2 0 11 0 8 1 1 6 30 0 31 2 5 0 + 0 0 1 2 5 0 0 0 1 3 0 0 56 0 0 58 2 5 + 0 0 0 1 3 0 0 56 0 0 1 1 0 25 0 1 2 7 + 11 6 0 53 1 6 30 0 1 2 5 0 0 0 1 2 0 + 0 68 0 1 3 0 0 60 0 0 1 2 0 0 68 0 1 + 1 0 0 6 1 2 0 11 0 8 1 1 0 25 0 1 1 0 + 11 0 1 1 7 49 0 51 2 0 0 0 8 1 1 0 6 + 0 1 3 0 0 6 0 30 1 3 0 0 0 0 30 1 3 0 + 0 0 0 30 1 3 0 0 6 0 30 1 1 0 71 0 1 + 2 0 11 30 0 1 1 7 70 0 1 2 0 0 0 8 1 + 1 0 6 0 13 2 0 72 63 0 1 2 0 0 0 6 1 + 1 0 11 0 1 2 0 11 63 0 1 3 8 0 0 6 6 + 1 3 8 0 0 25 25 1 2 8 0 0 61 1 2 8 0 + 0 62 1 2 0 11 0 0 12 2 7 11 6 0 1 1 0 + 25 0 1 1 0 11 0 17 0 0 0 16 2 0 6 0 + 30 1 3 0 6 0 30 6 1 2 0 0 0 65 1 2 0 + 6 0 66 1 2 0 0 0 19 20 2 0 6 0 14 15 + 2 0 6 0 67 1 2 0 30 0 0 1 2 0 0 0 65 + 1 2 0 0 0 30 1 2 0 0 0 65 1 2 0 0 0 + 30 1 1 0 11 0 34 1 0 0 0 1 1 0 0 0 1 + 1 0 8 0 1 1 0 0 0 36 2 7 8 6 0 1 2 0 + 8 63 0 1 3 0 0 0 0 30 1 1 0 0 0 35 1 + 3 69 0 1 1 0 0 25 26 2 0 0 0 0 54 2 0 + 0 0 6 1 1 0 0 39 1 2 0 0 0 6 1 2 0 0 + 6 0 10 2 0 0 0 0 1 1 9 37 0 46 1 0 39 + 0 1 2 7 11 0 0 1 2 0 11 63 0 1 2 5 11 + 0 0 1 2 5 11 0 0 1 2 7 11 0 0 48 2 5 + 11 0 0 1 2 5 11 0 0 1 1 0 8 0 9))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|IndexedList| '|isFunctor| + '(((|coerce| ((|OutputForm|) $)) + (|has| |#1| (|CoercibleTo| (|OutputForm|))) (ELT $ 46)) + ((~= ((|Boolean|) $ $)) (|has| |#1| (|SetCategory|)) + (ELT $ NIL)) + ((= ((|Boolean|) $ $)) (|has| |#1| (|SetCategory|)) + (ELT $ 48)) + ((|hash| ((|SingleInteger|) $)) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|latex| ((|String|) $)) (|has| |#1| (|SetCategory|)) + (ELT $ 51)) + ((|list| ($ |#1|)) T (ELT $ NIL)) + ((|concat!| ($ $ |#1|)) T (ELT $ NIL)) + ((|concat!| ($ $ $)) T (ELT $ 54)) + ((|delete!| ($ $ (|Integer|))) T (ELT $ NIL)) + ((|delete!| ($ $ (|UniversalSegment| (|Integer|)))) T + (ELT $ NIL)) + ((|remove!| ($ (|Mapping| (|Boolean|) |#1|) $)) T + (ELT $ NIL)) + ((|insert!| ($ |#1| $ (|Integer|))) T (ELT $ NIL)) + ((|insert!| ($ $ $ (|Integer|))) T (ELT $ NIL)) + ((|merge!| ($ (|Mapping| (|Boolean|) |#1| |#1|) $ $)) T + (ELT $ 58)) + ((|select!| ($ (|Mapping| (|Boolean|) |#1|) $)) T + (ELT $ NIL)) + ((|remove!| ($ |#1| $)) (|has| |#1| (|SetCategory|)) + (ELT $ NIL)) + ((|removeDuplicates!| ($ $)) + (|has| |#1| (|SetCategory|)) (ELT $ 55)) + ((|merge!| ($ $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|merge| ($ (|Mapping| (|Boolean|) |#1| |#1|) $ $)) T + (ELT $ NIL)) + ((|reverse| ($ $)) T (ELT $ 29)) + ((|sort| ($ (|Mapping| (|Boolean|) |#1| |#1|) $)) T + (ELT $ NIL)) + ((|sorted?| + ((|Boolean|) (|Mapping| (|Boolean|) |#1| |#1|) $)) + T (ELT $ NIL)) + ((|position| + ((|Integer|) (|Mapping| (|Boolean|) |#1|) $)) + T (ELT $ NIL)) + ((|position| ((|Integer|) |#1| $)) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|position| ((|Integer|) |#1| $ (|Integer|))) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|merge| ($ $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|sort| ($ $)) (|has| |#1| (|OrderedSet|)) (ELT $ NIL)) + ((|sorted?| ((|Boolean|) $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|copyInto!| ($ $ $ (|Integer|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|reverse!| ($ $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ 28)) + ((|sort!| ($ (|Mapping| (|Boolean|) |#1| |#1|) $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ 57)) + ((|sort!| ($ $)) + (AND (|has| $ (ATTRIBUTE |shallowlyMutable|)) + (|has| |#1| (|OrderedSet|))) + (ELT $ NIL)) + ((|min| ($ $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|max| ($ $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((<= ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((>= ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((> ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((< ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|possiblyInfinite?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|explicitlyFinite?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|qsetelt!| (|#1| $ (|Integer|) |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|setelt| (|#1| $ (|Integer|) |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|qelt| (|#1| $ (|Integer|))) T (ELT $ NIL)) + ((|elt| (|#1| $ (|Integer|) |#1|)) T (ELT $ NIL)) + ((|elt| (|#1| $ (|Integer|))) T (ELT $ NIL)) + ((|entries| ((|List| |#1|) $)) T (ELT $ NIL)) + ((|index?| ((|Boolean|) (|Integer|) $)) T (ELT $ NIL)) + ((|indices| ((|List| (|Integer|)) $)) T (ELT $ NIL)) + ((|entry?| ((|Boolean|) |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|maxIndex| ((|Integer|) $)) + (|has| (|Integer|) (|OrderedSet|)) (ELT $ NIL)) + ((|minIndex| ((|Integer|) $)) + (|has| (|Integer|) (|OrderedSet|)) (ELT $ 31)) + ((|fill!| ($ $ |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|swap!| ((|Void|) $ (|Integer|) (|Integer|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|convert| ((|InputForm|) $)) + (|has| |#1| (|ConvertibleTo| (|InputForm|))) + (ELT $ NIL)) + ((|removeDuplicates| ($ $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|remove| ($ |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|reduce| + (|#1| (|Mapping| |#1| |#1| |#1|) $ |#1| |#1|)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|select| ($ (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|remove| ($ (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|reduce| (|#1| (|Mapping| |#1| |#1| |#1|) $ |#1|)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|reduce| (|#1| (|Mapping| |#1| |#1| |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|find| ((|Union| |#1| "failed") + (|Mapping| (|Boolean|) |#1|) $)) + T (ELT $ NIL)) + ((|construct| ($ (|List| |#1|))) T (ELT $ 26)) + ((|new| ($ (|NonNegativeInteger|) |#1|)) T (ELT $ NIL)) + ((|concat| ($ $ |#1|)) T (ELT $ NIL)) + ((|concat| ($ (|List| $))) T (ELT $ NIL)) + ((|map| ($ (|Mapping| |#1| |#1| |#1|) $ $)) T + (ELT $ NIL)) + ((|elt| ($ $ (|UniversalSegment| (|Integer|)))) T + (ELT $ NIL)) + ((|delete| ($ $ (|Integer|))) T (ELT $ NIL)) + ((|delete| ($ $ (|UniversalSegment| (|Integer|)))) T + (ELT $ NIL)) + ((|insert| ($ |#1| $ (|Integer|))) T (ELT $ NIL)) + ((|insert| ($ $ $ (|Integer|))) T (ELT $ NIL)) + ((|setelt| + (|#1| $ (|UniversalSegment| (|Integer|)) |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|split!| ($ $ (|Integer|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ 59)) + ((|setelt| (|#1| $ "last" |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|setlast!| (|#1| $ |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|setelt| ($ $ "rest" $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ 24)) + ((|setrest!| ($ $ $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ 23)) + ((|setelt| (|#1| $ "first" |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ 22)) + ((|setfirst!| (|#1| $ |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ 21)) + ((|cycleSplit!| ($ $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|cycleTail| ($ $)) T (ELT $ NIL)) + ((|cycleLength| ((|NonNegativeInteger|) $)) T + (ELT $ NIL)) + ((|cycleEntry| ($ $)) T (ELT $ 36)) + ((|third| (|#1| $)) T (ELT $ NIL)) + ((|second| (|#1| $)) T (ELT $ NIL)) + ((|tail| ($ $)) T (ELT $ NIL)) + ((|last| ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((|elt| (|#1| $ "last")) T (ELT $ NIL)) + ((|last| (|#1| $)) T (ELT $ NIL)) + ((|rest| ($ $ (|NonNegativeInteger|))) T (ELT $ 32)) + ((|elt| ($ $ "rest")) T (ELT $ 20)) + ((|rest| ($ $)) T (ELT $ 18)) + ((|first| ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((|elt| (|#1| $ "first")) T (ELT $ 15)) + ((|first| (|#1| $)) T (ELT $ 13)) + ((|concat| ($ |#1| $)) T (ELT $ 10)) + ((|concat| ($ $ $)) T (ELT $ NIL)) + ((|setvalue!| (|#1| $ |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|setelt| (|#1| $ "value" |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|setchildren!| ($ $ (|List| $))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|node?| ((|Boolean|) $ $)) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|child?| ((|Boolean|) $ $)) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|distance| ((|Integer|) $ $)) T (ELT $ NIL)) + ((|leaves| ((|List| |#1|) $)) T (ELT $ NIL)) + ((|cyclic?| ((|Boolean|) $)) T (ELT $ 34)) + ((|elt| (|#1| $ "value")) T (ELT $ NIL)) + ((|value| (|#1| $)) T (ELT $ NIL)) + ((|leaf?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|nodes| ((|List| $) $)) T (ELT $ NIL)) + ((|children| ((|List| $) $)) T (ELT $ NIL)) + ((|eval| ($ $ (|List| |#1|) (|List| |#1|))) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ |#1| |#1|)) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ (|Equation| |#1|))) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ (|List| (|Equation| |#1|)))) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|member?| ((|Boolean|) |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ 53)) + ((|count| ((|NonNegativeInteger|) |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|members| ((|List| |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|parts| ((|List| |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ 27)) + ((|count| ((|NonNegativeInteger|) + (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|every?| ((|Boolean|) (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|any?| ((|Boolean|) (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|map!| ($ (|Mapping| |#1| |#1|) $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|map| ($ (|Mapping| |#1| |#1|) $)) T (ELT $ NIL)) + ((|#| ((|NonNegativeInteger|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ 9)) + ((|sample| ($)) T (CONST $ NIL)) + ((|size?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|more?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|less?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|empty?| ((|Boolean|) $)) T (ELT $ 17)) + ((|empty| ($)) T (ELT $ 16)) + ((|copy| ($ $)) T (ELT $ 35)) + ((|eq?| ((|Boolean|) $ $)) T (ELT $ 12))) + (|addModemap| '|IndexedList| '(|IndexedList| |#1| |#2|) + '((|ListAggregate| |#1|) (|Type|) (|Integer|)) T + '|IndexedList| + (|put| '|IndexedList| '|mode| + '(|Mapping| (|ListAggregate| |#1|) (|Type|) + (|Integer|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/INS-.lsp b/src/algebra/strap/INS-.lsp index b5a58e4f..a342958f 100644 --- a/src/algebra/strap/INS-.lsp +++ b/src/algebra/strap/INS-.lsp @@ -8,129 +8,152 @@ (DEFUN |INS-;differentiate;2S;2| (|x| $) (|spadConstant| $ 9)) (DEFUN |INS-;even?;SB;3| (|x| $) - (SPADCALL (SPADCALL |x| (QREFELT $ 12)) (QREFELT $ 13))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 12)) + (|getShellEntry| $ 13))) (DEFUN |INS-;positive?;SB;4| (|x| $) - (SPADCALL (|spadConstant| $ 9) |x| (QREFELT $ 15))) + (SPADCALL (|spadConstant| $ 9) |x| (|getShellEntry| $ 15))) (PUT '|INS-;copy;2S;5| '|SPADreplace| '(XLAM (|x|) |x|)) (DEFUN |INS-;copy;2S;5| (|x| $) |x|) (DEFUN |INS-;bit?;2SB;6| (|x| |i| $) - (SPADCALL (SPADCALL |x| (SPADCALL |i| (QREFELT $ 18)) (QREFELT $ 19)) - (QREFELT $ 12))) + (SPADCALL + (SPADCALL |x| (SPADCALL |i| (|getShellEntry| $ 18)) + (|getShellEntry| $ 19)) + (|getShellEntry| $ 12))) (DEFUN |INS-;mask;2S;7| (|n| $) - (SPADCALL (SPADCALL (|spadConstant| $ 21) |n| (QREFELT $ 19)) - (QREFELT $ 22))) + (SPADCALL (SPADCALL (|spadConstant| $ 21) |n| (|getShellEntry| $ 19)) + (|getShellEntry| $ 22))) (PUT '|INS-;rational?;SB;8| '|SPADreplace| '(XLAM (|x|) 'T)) (DEFUN |INS-;rational?;SB;8| (|x| $) 'T) (DEFUN |INS-;euclideanSize;SNni;9| (|x| $) - (PROG (#0=#:G1412 #1=#:G1413) + (PROG (#0=#:G1421 #1=#:G1422) (RETURN (COND - ((SPADCALL |x| (|spadConstant| $ 9) (QREFELT $ 25)) + ((SPADCALL |x| (|spadConstant| $ 9) (|getShellEntry| $ 25)) (|error| "euclideanSize called on zero")) - ((SPADCALL |x| (|spadConstant| $ 9) (QREFELT $ 15)) - (PROG1 (LETT #0# (- (SPADCALL |x| (QREFELT $ 27))) + ((SPADCALL |x| (|spadConstant| $ 9) (|getShellEntry| $ 15)) + (PROG1 (LETT #0# (- (SPADCALL |x| (|getShellEntry| $ 27))) |INS-;euclideanSize;SNni;9|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#))) ('T - (PROG1 (LETT #1# (SPADCALL |x| (QREFELT $ 27)) + (PROG1 (LETT #1# (SPADCALL |x| (|getShellEntry| $ 27)) |INS-;euclideanSize;SNni;9|) (|check-subtype| (>= #1# 0) '(|NonNegativeInteger|) #1#))))))) (DEFUN |INS-;convert;SF;10| (|x| $) - (SPADCALL (SPADCALL |x| (QREFELT $ 27)) (QREFELT $ 30))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 27)) + (|getShellEntry| $ 30))) (DEFUN |INS-;convert;SDf;11| (|x| $) - (FLOAT (SPADCALL |x| (QREFELT $ 27)) MOST-POSITIVE-LONG-FLOAT)) + (FLOAT (SPADCALL |x| (|getShellEntry| $ 27)) + MOST-POSITIVE-LONG-FLOAT)) (DEFUN |INS-;convert;SIf;12| (|x| $) - (SPADCALL (SPADCALL |x| (QREFELT $ 27)) (QREFELT $ 35))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 27)) + (|getShellEntry| $ 35))) -(DEFUN |INS-;retract;SI;13| (|x| $) (SPADCALL |x| (QREFELT $ 27))) +(DEFUN |INS-;retract;SI;13| (|x| $) + (SPADCALL |x| (|getShellEntry| $ 27))) (DEFUN |INS-;convert;SP;14| (|x| $) - (SPADCALL (SPADCALL |x| (QREFELT $ 27)) (QREFELT $ 39))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 27)) + (|getShellEntry| $ 39))) -(DEFUN |INS-;factor;SF;15| (|x| $) (SPADCALL |x| (QREFELT $ 43))) +(DEFUN |INS-;factor;SF;15| (|x| $) + (SPADCALL |x| (|getShellEntry| $ 43))) -(DEFUN |INS-;squareFree;SF;16| (|x| $) (SPADCALL |x| (QREFELT $ 46))) +(DEFUN |INS-;squareFree;SF;16| (|x| $) + (SPADCALL |x| (|getShellEntry| $ 46))) -(DEFUN |INS-;prime?;SB;17| (|x| $) (SPADCALL |x| (QREFELT $ 49))) +(DEFUN |INS-;prime?;SB;17| (|x| $) + (SPADCALL |x| (|getShellEntry| $ 49))) -(DEFUN |INS-;factorial;2S;18| (|x| $) (SPADCALL |x| (QREFELT $ 52))) +(DEFUN |INS-;factorial;2S;18| (|x| $) + (SPADCALL |x| (|getShellEntry| $ 52))) (DEFUN |INS-;binomial;3S;19| (|n| |m| $) - (SPADCALL |n| |m| (QREFELT $ 54))) + (SPADCALL |n| |m| (|getShellEntry| $ 54))) (DEFUN |INS-;permutation;3S;20| (|n| |m| $) - (SPADCALL |n| |m| (QREFELT $ 56))) + (SPADCALL |n| |m| (|getShellEntry| $ 56))) (DEFUN |INS-;retractIfCan;SU;21| (|x| $) - (CONS 0 (SPADCALL |x| (QREFELT $ 27)))) + (CONS 0 (SPADCALL |x| (|getShellEntry| $ 27)))) (DEFUN |INS-;init;S;22| ($) (|spadConstant| $ 9)) (DEFUN |INS-;nextItem;SU;23| (|n| $) (COND - ((SPADCALL |n| (QREFELT $ 61)) (CONS 0 (|spadConstant| $ 21))) - ((SPADCALL (|spadConstant| $ 9) |n| (QREFELT $ 15)) - (CONS 0 (SPADCALL |n| (QREFELT $ 18)))) - ('T (CONS 0 (SPADCALL (|spadConstant| $ 21) |n| (QREFELT $ 62)))))) + ((SPADCALL |n| (|getShellEntry| $ 61)) + (CONS 0 (|spadConstant| $ 21))) + ((SPADCALL (|spadConstant| $ 9) |n| (|getShellEntry| $ 15)) + (CONS 0 (SPADCALL |n| (|getShellEntry| $ 18)))) + ('T + (CONS 0 + (SPADCALL (|spadConstant| $ 21) |n| (|getShellEntry| $ 62)))))) (DEFUN |INS-;patternMatch;SP2Pmr;24| (|x| |p| |l| $) - (SPADCALL |x| |p| |l| (QREFELT $ 67))) + (SPADCALL |x| |p| |l| (|getShellEntry| $ 67))) (DEFUN |INS-;rational;SF;25| (|x| $) - (SPADCALL (SPADCALL |x| (QREFELT $ 27)) (QREFELT $ 71))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 27)) + (|getShellEntry| $ 71))) (DEFUN |INS-;rationalIfCan;SU;26| (|x| $) - (CONS 0 (SPADCALL (SPADCALL |x| (QREFELT $ 27)) (QREFELT $ 71)))) + (CONS 0 + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 27)) + (|getShellEntry| $ 71)))) (DEFUN |INS-;symmetricRemainder;3S;27| (|x| |n| $) (PROG (|r|) (RETURN - (SEQ (LETT |r| (SPADCALL |x| |n| (QREFELT $ 75)) + (SEQ (LETT |r| (SPADCALL |x| |n| (|getShellEntry| $ 75)) |INS-;symmetricRemainder;3S;27|) (EXIT (COND - ((SPADCALL |r| (|spadConstant| $ 9) (QREFELT $ 25)) + ((SPADCALL |r| (|spadConstant| $ 9) + (|getShellEntry| $ 25)) |r|) ('T (SEQ (COND ((SPADCALL |n| (|spadConstant| $ 9) - (QREFELT $ 15)) - (LETT |n| (SPADCALL |n| (QREFELT $ 18)) + (|getShellEntry| $ 15)) + (LETT |n| + (SPADCALL |n| (|getShellEntry| $ 18)) |INS-;symmetricRemainder;3S;27|))) (EXIT (COND ((SPADCALL (|spadConstant| $ 9) |r| - (QREFELT $ 15)) + (|getShellEntry| $ 15)) (COND ((SPADCALL |n| - (SPADCALL 2 |r| (QREFELT $ 77)) - (QREFELT $ 15)) - (SPADCALL |r| |n| (QREFELT $ 62))) + (SPADCALL 2 |r| + (|getShellEntry| $ 77)) + (|getShellEntry| $ 15)) + (SPADCALL |r| |n| + (|getShellEntry| $ 62))) ('T |r|))) ((NULL (SPADCALL (|spadConstant| $ 9) (SPADCALL (SPADCALL 2 |r| - (QREFELT $ 77)) - |n| (QREFELT $ 78)) - (QREFELT $ 15))) - (SPADCALL |r| |n| (QREFELT $ 78))) + (|getShellEntry| $ 77)) + |n| (|getShellEntry| $ 78)) + (|getShellEntry| $ 15))) + (SPADCALL |r| |n| + (|getShellEntry| $ 78))) ('T |r|))))))))))) (DEFUN |INS-;invmod;3S;28| (|a| |b| $) (PROG (|q| |r| |r1| |c| |c1| |d| |d1|) (RETURN (SEQ (COND - ((SPADCALL |a| (QREFELT $ 80)) - (LETT |a| (SPADCALL |a| |b| (QREFELT $ 81)) + ((SPADCALL |a| (|getShellEntry| $ 80)) + (LETT |a| (SPADCALL |a| |b| (|getShellEntry| $ 81)) |INS-;invmod;3S;28|))) (LETT |c| |a| |INS-;invmod;3S;28|) (LETT |c1| (|spadConstant| $ 21) |INS-;invmod;3S;28|) @@ -138,20 +161,24 @@ (LETT |d1| (|spadConstant| $ 9) |INS-;invmod;3S;28|) (SEQ G190 (COND - ((NULL (SPADCALL (SPADCALL |d| (QREFELT $ 61)) - (QREFELT $ 13))) + ((NULL (SPADCALL + (SPADCALL |d| (|getShellEntry| $ 61)) + (|getShellEntry| $ 13))) (GO G191))) - (SEQ (LETT |q| (SPADCALL |c| |d| (QREFELT $ 82)) + (SEQ (LETT |q| + (SPADCALL |c| |d| (|getShellEntry| $ 82)) |INS-;invmod;3S;28|) (LETT |r| (SPADCALL |c| - (SPADCALL |q| |d| (QREFELT $ 83)) - (QREFELT $ 62)) + (SPADCALL |q| |d| + (|getShellEntry| $ 83)) + (|getShellEntry| $ 62)) |INS-;invmod;3S;28|) (LETT |r1| (SPADCALL |c1| - (SPADCALL |q| |d1| (QREFELT $ 83)) - (QREFELT $ 62)) + (SPADCALL |q| |d1| + (|getShellEntry| $ 83)) + (|getShellEntry| $ 62)) |INS-;invmod;3S;28|) (LETT |c| |d| |INS-;invmod;3S;28|) (LETT |c1| |d1| |INS-;invmod;3S;28|) @@ -159,24 +186,27 @@ (EXIT (LETT |d1| |r1| |INS-;invmod;3S;28|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT (COND - ((SPADCALL |c| (|spadConstant| $ 21) (QREFELT $ 25)) + ((SPADCALL |c| (|spadConstant| $ 21) + (|getShellEntry| $ 25)) (COND - ((SPADCALL |c1| (QREFELT $ 80)) - (SPADCALL |c1| |b| (QREFELT $ 78))) + ((SPADCALL |c1| (|getShellEntry| $ 80)) + (SPADCALL |c1| |b| (|getShellEntry| $ 78))) ('T |c1|))) ('T (|error| "inverse does not exist")))))))) (DEFUN |INS-;powmod;4S;29| (|x| |n| |p| $) - (PROG (|y| #0=#:G1470 |z|) + (PROG (|y| #0=#:G1479 |z|) (RETURN (SEQ (EXIT (SEQ (COND - ((SPADCALL |x| (QREFELT $ 80)) - (LETT |x| (SPADCALL |x| |p| (QREFELT $ 81)) + ((SPADCALL |x| (|getShellEntry| $ 80)) + (LETT |x| + (SPADCALL |x| |p| + (|getShellEntry| $ 81)) |INS-;powmod;4S;29|))) (EXIT (COND - ((SPADCALL |x| (QREFELT $ 61)) + ((SPADCALL |x| (|getShellEntry| $ 61)) (|spadConstant| $ 9)) - ((SPADCALL |n| (QREFELT $ 61)) + ((SPADCALL |n| (|getShellEntry| $ 61)) (|spadConstant| $ 21)) ('T (SEQ (LETT |y| (|spadConstant| $ 21) @@ -186,10 +216,11 @@ (SEQ G190 NIL (SEQ (COND - ((SPADCALL |n| (QREFELT $ 12)) + ((SPADCALL |n| + (|getShellEntry| $ 12)) (LETT |y| (SPADCALL |y| |z| |p| - (QREFELT $ 85)) + (|getShellEntry| $ 85)) |INS-;powmod;4S;29|))) (EXIT (COND @@ -198,10 +229,10 @@ (SPADCALL |n| (SPADCALL (|spadConstant| $ 21) - (QREFELT $ 18)) - (QREFELT $ 19)) + (|getShellEntry| $ 18)) + (|getShellEntry| $ 19)) |INS-;powmod;4S;29|) - (QREFELT $ 61)) + (|getShellEntry| $ 61)) (PROGN (LETT #0# |y| |INS-;powmod;4S;29|) @@ -209,7 +240,7 @@ ('T (LETT |z| (SPADCALL |z| |z| |p| - (QREFELT $ 85)) + (|getShellEntry| $ 85)) |INS-;powmod;4S;29|))))) NIL (GO G190) G191 (EXIT NIL))))))))) #0# (EXIT #0#))))) @@ -220,11 +251,12 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|IntegerNumberSystem&|)) (LETT |dv$| (LIST '|IntegerNumberSystem&| |dv$1|) . #0#) - (LETT $ (GETREFV 87) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 87) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) $)))) (MAKEPROP '|IntegerNumberSystem&| '|infovec| @@ -296,3 +328,164 @@ 36 0 0 7 8 2 0 11 0 0 20 2 0 0 0 0 55))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|IntegerNumberSystem&| '|isFunctor| + '(((|invmod| ($ $ $)) T (ELT $ 84)) + ((|powmod| ($ $ $ $)) T (ELT $ 86)) + ((|mask| ($ $)) T (ELT $ 23)) + ((|copy| ($ $)) T (ELT $ 17)) + ((|rationalIfCan| + ((|Union| (|Fraction| (|Integer|)) "failed") $)) + T (ELT $ 74)) + ((|rational| ((|Fraction| (|Integer|)) $)) T (ELT $ 72)) + ((|rational?| ((|Boolean|) $)) T (ELT $ 24)) + ((|symmetricRemainder| ($ $ $)) T (ELT $ 79)) + ((|bit?| ((|Boolean|) $ $)) T (ELT $ 20)) + ((|even?| ((|Boolean|) $)) T (ELT $ 14)) + ((|init| ($)) T (ELT $ 60)) + ((|nextItem| ((|Union| $ "failed") $)) T (ELT $ 64)) + ((|convert| ((|DoubleFloat|) $)) T (ELT $ 33)) + ((|convert| ((|Float|) $)) T (ELT $ 31)) + ((|permutation| ($ $ $)) T (ELT $ 57)) + ((|factorial| ($ $)) T (ELT $ 53)) + ((|binomial| ($ $ $)) T (ELT $ 55)) + ((|patternMatch| + ((|PatternMatchResult| (|Integer|) $) $ + (|Pattern| (|Integer|)) + (|PatternMatchResult| (|Integer|) $))) + T (ELT $ 69)) + ((|convert| ((|Pattern| (|Integer|)) $)) T (ELT $ 40)) + ((|convert| ((|InputForm|) $)) T (ELT $ 36)) + ((|retract| ((|Integer|) $)) T (ELT $ 37)) + ((|retractIfCan| ((|Union| (|Integer|) "failed") $)) T + (ELT $ 59)) + ((|convert| ((|Integer|) $)) T (ELT $ NIL)) + ((|differentiate| ($ $)) T (ELT $ 10)) + ((|differentiate| ($ $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|positive?| ((|Boolean|) $)) T (ELT $ 16)) + ((|euclideanSize| ((|NonNegativeInteger|) $)) T + (ELT $ 28)) + ((|factor| ((|Factored| $) $)) T (ELT $ 45)) + ((|squareFree| ((|Factored| $) $)) T (ELT $ 47)) + ((|prime?| ((|Boolean|) $)) T (ELT $ 50)) + ((|characteristic| ((|NonNegativeInteger|))) T + (ELT $ 8))) + (|addModemap| '|IntegerNumberSystem&| + '(|IntegerNumberSystem&| |#1|) + '((CATEGORY |domain| + (SIGNATURE |invmod| (|#1| |#1| |#1|)) + (SIGNATURE |powmod| (|#1| |#1| |#1| |#1|)) + (SIGNATURE |mask| (|#1| |#1|)) + (SIGNATURE |copy| (|#1| |#1|)) + (SIGNATURE |rationalIfCan| + ((|Union| (|Fraction| (|Integer|)) "failed") + |#1|)) + (SIGNATURE |rational| + ((|Fraction| (|Integer|)) |#1|)) + (SIGNATURE |rational?| ((|Boolean|) |#1|)) + (SIGNATURE |symmetricRemainder| + (|#1| |#1| |#1|)) + (SIGNATURE |bit?| ((|Boolean|) |#1| |#1|)) + (SIGNATURE |even?| ((|Boolean|) |#1|)) + (SIGNATURE |init| (|#1|)) + (SIGNATURE |nextItem| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE |convert| ((|DoubleFloat|) |#1|)) + (SIGNATURE |convert| ((|Float|) |#1|)) + (SIGNATURE |permutation| (|#1| |#1| |#1|)) + (SIGNATURE |factorial| (|#1| |#1|)) + (SIGNATURE |binomial| (|#1| |#1| |#1|)) + (SIGNATURE |patternMatch| + ((|PatternMatchResult| (|Integer|) |#1|) + |#1| (|Pattern| (|Integer|)) + (|PatternMatchResult| (|Integer|) |#1|))) + (SIGNATURE |convert| + ((|Pattern| (|Integer|)) |#1|)) + (SIGNATURE |convert| ((|InputForm|) |#1|)) + (SIGNATURE |retract| ((|Integer|) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Integer|) "failed") |#1|)) + (SIGNATURE |convert| ((|Integer|) |#1|)) + (SIGNATURE |differentiate| (|#1| |#1|)) + (SIGNATURE |differentiate| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |positive?| ((|Boolean|) |#1|)) + (SIGNATURE |euclideanSize| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |factor| ((|Factored| |#1|) |#1|)) + (SIGNATURE |squareFree| + ((|Factored| |#1|) |#1|)) + (SIGNATURE |prime?| ((|Boolean|) |#1|)) + (SIGNATURE |characteristic| + ((|NonNegativeInteger|)))) + (|IntegerNumberSystem|)) + T '|IntegerNumberSystem&| + (|put| '|IntegerNumberSystem&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |invmod| (|#1| |#1| |#1|)) + (SIGNATURE |powmod| + (|#1| |#1| |#1| |#1|)) + (SIGNATURE |mask| (|#1| |#1|)) + (SIGNATURE |copy| (|#1| |#1|)) + (SIGNATURE |rationalIfCan| + ((|Union| (|Fraction| (|Integer|)) + "failed") + |#1|)) + (SIGNATURE |rational| + ((|Fraction| (|Integer|)) |#1|)) + (SIGNATURE |rational?| + ((|Boolean|) |#1|)) + (SIGNATURE |symmetricRemainder| + (|#1| |#1| |#1|)) + (SIGNATURE |bit?| + ((|Boolean|) |#1| |#1|)) + (SIGNATURE |even?| ((|Boolean|) |#1|)) + (SIGNATURE |init| (|#1|)) + (SIGNATURE |nextItem| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE |convert| + ((|DoubleFloat|) |#1|)) + (SIGNATURE |convert| ((|Float|) |#1|)) + (SIGNATURE |permutation| + (|#1| |#1| |#1|)) + (SIGNATURE |factorial| (|#1| |#1|)) + (SIGNATURE |binomial| + (|#1| |#1| |#1|)) + (SIGNATURE |patternMatch| + ((|PatternMatchResult| (|Integer|) + |#1|) + |#1| (|Pattern| (|Integer|)) + (|PatternMatchResult| (|Integer|) + |#1|))) + (SIGNATURE |convert| + ((|Pattern| (|Integer|)) |#1|)) + (SIGNATURE |convert| + ((|InputForm|) |#1|)) + (SIGNATURE |retract| + ((|Integer|) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Integer|) "failed") + |#1|)) + (SIGNATURE |convert| + ((|Integer|) |#1|)) + (SIGNATURE |differentiate| + (|#1| |#1|)) + (SIGNATURE |differentiate| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |positive?| + ((|Boolean|) |#1|)) + (SIGNATURE |euclideanSize| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |factor| + ((|Factored| |#1|) |#1|)) + (SIGNATURE |squareFree| + ((|Factored| |#1|) |#1|)) + (SIGNATURE |prime?| + ((|Boolean|) |#1|)) + (SIGNATURE |characteristic| + ((|NonNegativeInteger|)))) + (|IntegerNumberSystem|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/INS.lsp b/src/algebra/strap/INS.lsp index c951d143..3d827807 100644 --- a/src/algebra/strap/INS.lsp +++ b/src/algebra/strap/INS.lsp @@ -4,18 +4,18 @@ (DEFPARAMETER |IntegerNumberSystem;AL| 'NIL) (DEFUN |IntegerNumberSystem| () - (LET (#:G1403) + (LET (#:G1412) (COND (|IntegerNumberSystem;AL|) (T (SETQ |IntegerNumberSystem;AL| (|IntegerNumberSystem;|)))))) (DEFUN |IntegerNumberSystem;| () - (PROG (#0=#:G1401) + (PROG (#0=#:G1410) (RETURN (PROG1 (LETT #0# (|sublisV| - (PAIR '(#1=#:G1395 #2=#:G1396 #3=#:G1397 - #4=#:G1398 #5=#:G1399 #6=#:G1400) + (PAIR '(#1=#:G1404 #2=#:G1405 #3=#:G1406 + #4=#:G1407 #5=#:G1408 #6=#:G1409) (LIST '(|Integer|) '(|Integer|) '(|Integer|) '(|InputForm|) '(|Pattern| (|Integer|)) @@ -72,4 +72,10 @@ |IntegerNumberSystem|) (SETELT #0# 0 '(|IntegerNumberSystem|)))))) +(SETQ |$CategoryFrame| + (|put| '|IntegerNumberSystem| '|isCategory| T + (|addModemap| '|IntegerNumberSystem| + '(|IntegerNumberSystem|) '((|Category|)) T + '|IntegerNumberSystem| |$CategoryFrame|))) + (MAKEPROP '|IntegerNumberSystem| 'NILADIC T) diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp index 06ad04a0..27b4a15a 100644 --- a/src/algebra/strap/INT.lsp +++ b/src/algebra/strap/INT.lsp @@ -97,20 +97,20 @@ (DEFUN |INT;coerce;$Of;16| (|x| $) (SPADCALL |x| (|getShellEntry| $ 36))) -(PUT '|INT;coerce;I$;17| '|SPADreplace| '(XLAM (|m|) |m|)) +(PUT '|INT;coerce;2$;17| '|SPADreplace| '(XLAM (|m|) |m|)) -(DEFUN |INT;coerce;I$;17| (|m| $) |m|) +(DEFUN |INT;coerce;2$;17| (|m| $) |m|) -(PUT '|INT;convert;$I;18| '|SPADreplace| '(XLAM (|x|) |x|)) +(PUT '|INT;convert;2$;18| '|SPADreplace| '(XLAM (|x|) |x|)) -(DEFUN |INT;convert;$I;18| (|x| $) |x|) +(DEFUN |INT;convert;2$;18| (|x| $) |x|) (PUT '|INT;length;2$;19| '|SPADreplace| 'INTEGER-LENGTH) (DEFUN |INT;length;2$;19| (|a| $) (INTEGER-LENGTH |a|)) (DEFUN |INT;addmod;4$;20| (|a| |b| |p| $) - (PROG (|c| #0=#:G1427) + (PROG (|c| #0=#:G1429) (RETURN (SEQ (EXIT (SEQ (SEQ (LETT |c| (+ |a| |b|) |INT;addmod;4$;20|) (EXIT (COND @@ -163,9 +163,9 @@ (COND ((MINUSP |b|) (- |r| |b|)) ('T (+ |r| |b|)))) ('T |r|))))) -(PUT '|INT;reducedSystem;MM;29| '|SPADreplace| '(XLAM (|m|) |m|)) +(PUT '|INT;reducedSystem;2M;29| '|SPADreplace| '(XLAM (|m|) |m|)) -(DEFUN |INT;reducedSystem;MM;29| (|m| $) |m|) +(DEFUN |INT;reducedSystem;2M;29| (|m| $) |m|) (DEFUN |INT;reducedSystem;MVR;30| (|m| |v| $) (CONS |m| '|vec|)) @@ -205,9 +205,9 @@ (DEFUN |INT;*;3$;39| (|x| |y| $) (* |x| |y|)) -(PUT '|INT;*;I2$;40| '|SPADreplace| '*) +(PUT '|INT;*;3$;40| '|SPADreplace| '*) -(DEFUN |INT;*;I2$;40| (|m| |y| $) (* |m| |y|)) +(DEFUN |INT;*;3$;40| (|m| |y| $) (* |m| |y|)) (PUT '|INT;**;$Nni$;41| '|SPADreplace| 'EXPT) @@ -270,7 +270,7 @@ (SPADCALL |p| (|getShellEntry| $ 97))) (DEFUN |INT;factorPolynomial| (|p| $) - (PROG (|pp| #0=#:G1498) + (PROG (|pp| #0=#:G1500) (RETURN (SEQ (LETT |pp| (SPADCALL |p| (|getShellEntry| $ 98)) |INT;factorPolynomial|) @@ -313,7 +313,7 @@ (DEFUN |Integer| () (PROG () (RETURN - (PROG (#0=#:G1523) + (PROG (#0=#:G1525) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|Integer|) |Integer|) @@ -340,7 +340,7 @@ (|stuffDomainSlots| $) (|setShellEntry| $ 71 (|setShellEntry| $ 70 - (CONS (|dispatchFunction| |INT;*;I2$;40|) $))) + (CONS (|dispatchFunction| |INT;*;3$;40|) $))) $)))) (MAKEPROP '|Integer| '|infovec| @@ -360,13 +360,13 @@ |INT;base;$;10| |INT;copy;2$;11| |INT;inc;2$;12| |INT;dec;2$;13| |INT;hash;2$;14| |INT;negative?;$B;15| (|OutputForm|) (48 . |outputForm|) |INT;coerce;$Of;16| - |INT;coerce;I$;17| |INT;convert;$I;18| |INT;length;2$;19| + |INT;coerce;2$;17| |INT;convert;2$;18| |INT;length;2$;19| |INT;addmod;4$;20| |INT;submod;4$;21| |INT;mulmod;4$;22| (|Float|) (53 . |coerce|) |INT;convert;$F;23| (|DoubleFloat|) |INT;convert;$Df;24| (|InputForm|) (58 . |convert|) |INT;convert;$If;25| |INT;convert;$S;26| |INT;latex;$S;27| |INT;positiveRemainder;3$;28| - (|Matrix| 11) (|Matrix| $) |INT;reducedSystem;MM;29| + (|Matrix| 11) (|Matrix| $) |INT;reducedSystem;2M;29| (|Vector| 11) (|Record| (|:| |mat| 55) (|:| |vec| 58)) (|Vector| $) |INT;reducedSystem;MVR;30| |INT;abs;2$;31| |INT;random;$;32| |INT;random;2$;33| |INT;=;2$B;34| @@ -439,8 +439,8 @@ |UniqueFactorizationDomain&| NIL NIL |GcdDomain&| |IntegralDomain&| |Algebra&| NIL NIL |DifferentialRing&| |OrderedRing&| NIL NIL - |Module&| NIL NIL |Ring&| NIL NIL NIL NIL NIL - |AbelianGroup&| NIL NIL |AbelianMonoid&| + |Module&| NIL |Ring&| NIL NIL NIL NIL NIL + |AbelianGroup&| NIL NIL NIL |AbelianMonoid&| |Monoid&| NIL NIL |OrderedSet&| |AbelianSemiGroup&| |SemiGroup&| NIL |SetCategory&| NIL NIL NIL NIL NIL NIL NIL @@ -455,15 +455,15 @@ (|LinearlyExplicitRingOver| 11) (|DifferentialRing|) (|OrderedRing|) (|CommutativeRing|) (|EntireRing|) - (|Module| $$) (|OrderedAbelianGroup|) - (|BiModule| $$ $$) (|Ring|) - (|OrderedCancellationAbelianMonoid|) + (|Module| $$) (|BiModule| $$ $$) + (|Ring|) (|OrderedAbelianGroup|) (|LeftModule| $$) (|Rng|) (|RightModule| $$) - (|OrderedAbelianMonoid|) + (|OrderedCancellationAbelianMonoid|) (|AbelianGroup|) - (|OrderedAbelianSemiGroup|) + (|OrderedAbelianMonoid|) (|CancellationAbelianMonoid|) + (|OrderedAbelianSemiGroup|) (|AbelianMonoid|) (|Monoid|) (|StepThrough|) (|PatternMatchable| 11) (|OrderedSet|) (|AbelianSemiGroup|) @@ -525,4 +525,183 @@ 71 2 0 0 72 0 1 2 0 0 130 0 1))))) '|lookupComplete|)) +(SETQ |$CategoryFrame| + (|put| '|Integer| '|isFunctor| + '(((|OMwrite| ((|Void|) (|OpenMathDevice|) $ (|Boolean|))) + T (ELT $ 24)) + ((|OMwrite| ((|Void|) (|OpenMathDevice|) $)) T + (ELT $ 23)) + ((|OMwrite| ((|String|) $ (|Boolean|))) T (ELT $ 22)) + ((|OMwrite| ((|String|) $)) T (ELT $ 20)) + ((|convert| ((|String|) $)) T (ELT $ 52)) + ((|invmod| ($ $ $)) T (ELT $ NIL)) + ((|powmod| ($ $ $ $)) T (ELT $ NIL)) + ((|mulmod| ($ $ $ $)) T (ELT $ 43)) + ((|submod| ($ $ $ $)) T (ELT $ 42)) + ((|addmod| ($ $ $ $)) T (ELT $ 41)) + ((|mask| ($ $)) T (ELT $ NIL)) + ((|dec| ($ $)) T (ELT $ 32)) + ((|inc| ($ $)) T (ELT $ 31)) + ((|copy| ($ $)) T (ELT $ 30)) + ((|hash| ($ $)) T (ELT $ 33)) + ((|random| ($ $)) T (ELT $ 64)) + ((|random| ($)) T (ELT $ 63)) + ((|rationalIfCan| + ((|Union| (|Fraction| (|Integer|)) "failed") $)) + T (ELT $ NIL)) + ((|rational| ((|Fraction| (|Integer|)) $)) T + (ELT $ NIL)) + ((|rational?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|symmetricRemainder| ($ $ $)) T (ELT $ NIL)) + ((|positiveRemainder| ($ $ $)) T (ELT $ 54)) + ((|bit?| ((|Boolean|) $ $)) T (ELT $ NIL)) + ((|shift| ($ $ $)) T (ELT $ 81)) + ((|length| ($ $)) T (ELT $ 40)) + ((|base| ($)) T (ELT $ 29)) + ((|even?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|odd?| ((|Boolean|) $)) T (ELT $ 74)) + ((|init| ($)) T (CONST $ NIL)) + ((|nextItem| ((|Union| $ "failed") $)) T (ELT $ NIL)) + ((|convert| ((|DoubleFloat|) $)) T (ELT $ 48)) + ((|convert| ((|Float|) $)) T (ELT $ 46)) + ((|permutation| ($ $ $)) T (ELT $ NIL)) + ((|factorial| ($ $)) T (ELT $ NIL)) + ((|binomial| ($ $ $)) T (ELT $ NIL)) + ((|patternMatch| + ((|PatternMatchResult| (|Integer|) $) $ + (|Pattern| (|Integer|)) + (|PatternMatchResult| (|Integer|) $))) + T (ELT $ NIL)) + ((|convert| ((|Pattern| (|Integer|)) $)) T (ELT $ NIL)) + ((|convert| ((|InputForm|) $)) T (ELT $ 51)) + ((|reducedSystem| ((|Matrix| (|Integer|)) (|Matrix| $))) + T (ELT $ 57)) + ((|reducedSystem| + ((|Record| (|:| |mat| (|Matrix| (|Integer|))) + (|:| |vec| (|Vector| (|Integer|)))) + (|Matrix| $) (|Vector| $))) + T (ELT $ 61)) + ((|retract| ((|Integer|) $)) T (ELT $ NIL)) + ((|retractIfCan| ((|Union| (|Integer|) "failed") $)) T + (ELT $ NIL)) + ((|coerce| ($ (|Integer|))) T (ELT $ 38)) + ((|convert| ((|Integer|) $)) T (ELT $ 39)) + ((|differentiate| ($ $)) T (ELT $ NIL)) + ((D ($ $)) T (ELT $ NIL)) + ((|differentiate| ($ $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((D ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((|abs| ($ $)) T (ELT $ 62)) + ((|sign| ((|Integer|) $)) T (ELT $ NIL)) + ((|negative?| ((|Boolean|) $)) T (ELT $ 34)) + ((|positive?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|min| ($ $ $)) T (ELT $ 76)) + ((|max| ($ $ $)) T (ELT $ 75)) + ((<= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((>= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((> ((|Boolean|) $ $)) T (ELT $ NIL)) + ((< ((|Boolean|) $ $)) T (ELT $ 66)) + ((|principalIdeal| + ((|Record| (|:| |coef| (|List| $)) + (|:| |generator| $)) + (|List| $))) + T (ELT $ NIL)) + ((|expressIdealMember| + ((|Union| (|List| $) "failed") (|List| $) $)) + T (ELT $ NIL)) + ((|sizeLess?| ((|Boolean|) $ $)) T (ELT $ NIL)) + ((|euclideanSize| ((|NonNegativeInteger|) $)) T + (ELT $ NIL)) + ((|divide| + ((|Record| (|:| |quotient| $) (|:| |remainder| $)) + $ $)) + T (ELT $ 78)) + ((|quo| ($ $ $)) T (ELT $ 79)) + ((|rem| ($ $ $)) T (ELT $ 80)) + ((|extendedEuclidean| + ((|Record| (|:| |coef1| $) (|:| |coef2| $) + (|:| |generator| $)) + $ $)) + T (ELT $ NIL)) + ((|extendedEuclidean| + ((|Union| (|Record| (|:| |coef1| $) + (|:| |coef2| $)) + "failed") + $ $ $)) + T (ELT $ NIL)) + ((|multiEuclidean| + ((|Union| (|List| $) "failed") (|List| $) $)) + T (ELT $ NIL)) + ((|factor| ((|Factored| $) $)) T (ELT $ 104)) + ((|squareFreePart| ($ $)) T (ELT $ NIL)) + ((|squareFree| ((|Factored| $) $)) T (ELT $ NIL)) + ((|prime?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|gcdPolynomial| + ((|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| $))) + T (ELT $ 118)) + ((|lcm| ($ (|List| $))) T (ELT $ NIL)) + ((|lcm| ($ $ $)) T (ELT $ NIL)) + ((|gcd| ($ (|List| $))) T (ELT $ NIL)) + ((|gcd| ($ $ $)) T (ELT $ 85)) + ((|unit?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|associates?| ((|Boolean|) $ $)) T (ELT $ NIL)) + ((|unitCanonical| ($ $)) T (ELT $ 88)) + ((|unitNormal| + ((|Record| (|:| |unit| $) (|:| |canonical| $) + (|:| |associate| $)) + $)) + T (ELT $ 87)) + ((|exquo| ((|Union| $ "failed") $ $)) T (ELT $ 83)) + ((|coerce| ($ $)) T (ELT $ NIL)) + ((|coerce| ($ (|Integer|))) T (ELT $ 38)) + ((|characteristic| ((|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|One| ($)) T (CONST $ 28)) + ((|one?| ((|Boolean|) $)) T (ELT $ 26)) + ((** ($ $ (|NonNegativeInteger|))) T (ELT $ 73)) + ((^ ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((|recip| ((|Union| $ "failed") $)) T (ELT $ 84)) + ((* ($ $ $)) T (ELT $ 70)) + ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL)) + ((^ ($ $ (|PositiveInteger|))) T (ELT $ NIL)) + ((* ($ (|Integer|) $)) T (ELT $ 71)) + ((- ($ $ $)) T (ELT $ 69)) ((- ($ $)) T (ELT $ 67)) + ((|subtractIfCan| ((|Union| $ "failed") $ $)) T + (ELT $ NIL)) + ((* ($ (|NonNegativeInteger|) $)) T (ELT $ NIL)) + ((|zero?| ((|Boolean|) $)) T (ELT $ 25)) + ((|sample| ($)) T (CONST $ NIL)) + ((|Zero| ($)) T (CONST $ 27)) + ((* ($ (|PositiveInteger|) $)) T (ELT $ NIL)) + ((+ ($ $ $)) T (ELT $ 68)) + ((|latex| ((|String|) $)) T (ELT $ 53)) + ((|hash| ((|SingleInteger|) $)) T (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ 37)) + ((= ((|Boolean|) $ $)) T (ELT $ 65)) + ((~= ((|Boolean|) $ $)) T (ELT $ NIL))) + (|addModemap| '|Integer| '(|Integer|) + '((|Join| (|IntegerNumberSystem|) + (|ConvertibleTo| (|String|)) (|OpenMath|) + (CATEGORY |domain| + (SIGNATURE |random| ($ $)) + (ATTRIBUTE |canonical|) + (ATTRIBUTE |canonicalsClosed|) + (ATTRIBUTE |noetherian|) + (ATTRIBUTE |infinite|)))) + T '|Integer| + (|put| '|Integer| '|mode| + '(|Mapping| + (|Join| (|IntegerNumberSystem|) + (|ConvertibleTo| (|String|)) + (|OpenMath|) + (CATEGORY |domain| + (SIGNATURE |random| ($ $)) + (ATTRIBUTE |canonical|) + (ATTRIBUTE |canonicalsClosed|) + (ATTRIBUTE |noetherian|) + (ATTRIBUTE |infinite|)))) + |$CategoryFrame|)))) + (MAKEPROP '|Integer| 'NILADIC T) diff --git a/src/algebra/strap/INTDOM-.lsp b/src/algebra/strap/INTDOM-.lsp index 7c1f5677..b275668b 100644 --- a/src/algebra/strap/INTDOM-.lsp +++ b/src/algebra/strap/INTDOM-.lsp @@ -5,26 +5,30 @@ (VECTOR (|spadConstant| $ 7) |x| (|spadConstant| $ 7))) (DEFUN |INTDOM-;unitCanonical;2S;2| (|x| $) - (QVELT (SPADCALL |x| (QREFELT $ 10)) 1)) + (QVELT (SPADCALL |x| (|getShellEntry| $ 10)) 1)) (DEFUN |INTDOM-;recip;SU;3| (|x| $) (COND - ((SPADCALL |x| (QREFELT $ 13)) (CONS 1 "failed")) - ('T (SPADCALL (|spadConstant| $ 7) |x| (QREFELT $ 15))))) + ((SPADCALL |x| (|getShellEntry| $ 13)) (CONS 1 "failed")) + ('T (SPADCALL (|spadConstant| $ 7) |x| (|getShellEntry| $ 15))))) (DEFUN |INTDOM-;unit?;SB;4| (|x| $) - (COND ((QEQCAR (SPADCALL |x| (QREFELT $ 17)) 1) 'NIL) ('T 'T))) + (COND + ((QEQCAR (SPADCALL |x| (|getShellEntry| $ 17)) 1) 'NIL) + ('T 'T))) (DEFUN |INTDOM-;associates?;2SB;5| (|x| |y| $) - (SPADCALL (QVELT (SPADCALL |x| (QREFELT $ 10)) 1) - (QVELT (SPADCALL |y| (QREFELT $ 10)) 1) (QREFELT $ 19))) + (SPADCALL (QVELT (SPADCALL |x| (|getShellEntry| $ 10)) 1) + (QVELT (SPADCALL |y| (|getShellEntry| $ 10)) 1) + (|getShellEntry| $ 19))) (DEFUN |INTDOM-;associates?;2SB;6| (|x| |y| $) (COND - ((SPADCALL |x| (QREFELT $ 13)) (SPADCALL |y| (QREFELT $ 13))) - ((OR (SPADCALL |y| (QREFELT $ 13)) - (OR (QEQCAR (SPADCALL |x| |y| (QREFELT $ 15)) 1) - (QEQCAR (SPADCALL |y| |x| (QREFELT $ 15)) 1))) + ((SPADCALL |x| (|getShellEntry| $ 13)) + (SPADCALL |y| (|getShellEntry| $ 13))) + ((OR (SPADCALL |y| (|getShellEntry| $ 13)) + (OR (QEQCAR (SPADCALL |x| |y| (|getShellEntry| $ 15)) 1) + (QEQCAR (SPADCALL |y| |x| (|getShellEntry| $ 15)) 1))) 'NIL) ('T 'T))) @@ -34,23 +38,24 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|IntegralDomain&|)) (LETT |dv$| (LIST '|IntegralDomain&| |dv$1|) . #0#) - (LETT $ (GETREFV 21) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 21) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) (COND ((|HasCategory| |#1| '(|Field|))) ('T - (QSETREFV $ 9 + (|setShellEntry| $ 9 (CONS (|dispatchFunction| |INTDOM-;unitNormal;SR;1|) $)))) (COND ((|HasAttribute| |#1| '|canonicalUnitNormal|) - (QSETREFV $ 20 + (|setShellEntry| $ 20 (CONS (|dispatchFunction| |INTDOM-;associates?;2SB;5|) $))) ('T - (QSETREFV $ 20 + (|setShellEntry| $ 20 (CONS (|dispatchFunction| |INTDOM-;associates?;2SB;6|) $)))) $)))) @@ -77,3 +82,47 @@ 11 1 0 12 0 18 1 0 14 0 16 2 0 12 0 0 20))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|IntegralDomain&| '|isFunctor| + '(((|unit?| ((|Boolean|) $)) T (ELT $ 18)) + ((|associates?| ((|Boolean|) $ $)) T (ELT $ 20)) + ((|unitCanonical| ($ $)) T (ELT $ 11)) + ((|unitNormal| + ((|Record| (|:| |unit| $) (|:| |canonical| $) + (|:| |associate| $)) + $)) + T (ELT $ 9)) + ((|recip| ((|Union| $ "failed") $)) T (ELT $ 16))) + (|addModemap| '|IntegralDomain&| '(|IntegralDomain&| |#1|) + '((CATEGORY |domain| + (SIGNATURE |unit?| ((|Boolean|) |#1|)) + (SIGNATURE |associates?| + ((|Boolean|) |#1| |#1|)) + (SIGNATURE |unitCanonical| (|#1| |#1|)) + (SIGNATURE |unitNormal| + ((|Record| (|:| |unit| |#1|) + (|:| |canonical| |#1|) + (|:| |associate| |#1|)) + |#1|)) + (SIGNATURE |recip| + ((|Union| |#1| "failed") |#1|))) + (|IntegralDomain|)) + T '|IntegralDomain&| + (|put| '|IntegralDomain&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |unit?| ((|Boolean|) |#1|)) + (SIGNATURE |associates?| + ((|Boolean|) |#1| |#1|)) + (SIGNATURE |unitCanonical| + (|#1| |#1|)) + (SIGNATURE |unitNormal| + ((|Record| (|:| |unit| |#1|) + (|:| |canonical| |#1|) + (|:| |associate| |#1|)) + |#1|)) + (SIGNATURE |recip| + ((|Union| |#1| "failed") |#1|))) + (|IntegralDomain|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/INTDOM.lsp b/src/algebra/strap/INTDOM.lsp index 9f770345..ea971300 100644 --- a/src/algebra/strap/INTDOM.lsp +++ b/src/algebra/strap/INTDOM.lsp @@ -4,13 +4,13 @@ (DEFPARAMETER |IntegralDomain;AL| 'NIL) (DEFUN |IntegralDomain| () - (LET (#:G1393) + (LET (#:G1402) (COND (|IntegralDomain;AL|) (T (SETQ |IntegralDomain;AL| (|IntegralDomain;|)))))) (DEFUN |IntegralDomain;| () - (PROG (#0=#:G1391) + (PROG (#0=#:G1400) (RETURN (PROG1 (LETT #0# (|Join| (|CommutativeRing|) (|Algebra| '$) @@ -31,4 +31,9 @@ |IntegralDomain|) (SETELT #0# 0 '(|IntegralDomain|)))))) +(SETQ |$CategoryFrame| + (|put| '|IntegralDomain| '|isCategory| T + (|addModemap| '|IntegralDomain| '(|IntegralDomain|) + '((|Category|)) T '|IntegralDomain| |$CategoryFrame|))) + (MAKEPROP '|IntegralDomain| 'NILADIC T) diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp index 65f503c0..f2072d86 100644 --- a/src/algebra/strap/ISTRING.lsp +++ b/src/algebra/strap/ISTRING.lsp @@ -37,40 +37,48 @@ (SPADCALL (SPADCALL (SPADCALL |s| - (SPADCALL (QREFELT $ 6) (- |i| 1) (QREFELT $ 20)) - (QREFELT $ 21)) - |t| (QREFELT $ 16)) - (SPADCALL |s| (SPADCALL |i| (QREFELT $ 22)) (QREFELT $ 21)) - (QREFELT $ 16))) + (SPADCALL (|getShellEntry| $ 6) (- |i| 1) + (|getShellEntry| $ 20)) + (|getShellEntry| $ 21)) + |t| (|getShellEntry| $ 16)) + (SPADCALL |s| (SPADCALL |i| (|getShellEntry| $ 22)) + (|getShellEntry| $ 21)) + (|getShellEntry| $ 16))) -(DEFUN |ISTRING;coerce;$Of;10| (|s| $) (SPADCALL |s| (QREFELT $ 26))) +(DEFUN |ISTRING;coerce;$Of;10| (|s| $) + (SPADCALL |s| (|getShellEntry| $ 26))) -(DEFUN |ISTRING;minIndex;$I;11| (|s| $) (QREFELT $ 6)) +(DEFUN |ISTRING;minIndex;$I;11| (|s| $) (|getShellEntry| $ 6)) (DEFUN |ISTRING;upperCase!;2$;12| (|s| $) - (SPADCALL (ELT $ 31) |s| (QREFELT $ 33))) + (SPADCALL (ELT $ 31) |s| (|getShellEntry| $ 33))) (DEFUN |ISTRING;lowerCase!;2$;13| (|s| $) - (SPADCALL (ELT $ 36) |s| (QREFELT $ 33))) + (SPADCALL (ELT $ 36) |s| (|getShellEntry| $ 33))) (DEFUN |ISTRING;latex;$S;14| (|s| $) (STRCONC "\\mbox{``" (STRCONC |s| "''}"))) (DEFUN |ISTRING;replace;$Us2$;15| (|s| |sg| |t| $) - (PROG (|l| |m| |n| |h| #0=#:G1770 |r| #1=#:G1776 #2=#:G1777 |i| - #3=#:G1778 |k|) + (PROG (|l| |m| |n| |h| #0=#:G1434 |r| #1=#:G1440 #2=#:G1441 |i| + #3=#:G1442 |k|) (RETURN - (SEQ (LETT |l| (- (SPADCALL |sg| (QREFELT $ 39)) (QREFELT $ 6)) + (SEQ (LETT |l| + (- (SPADCALL |sg| (|getShellEntry| $ 39)) + (|getShellEntry| $ 6)) |ISTRING;replace;$Us2$;15|) - (LETT |m| (SPADCALL |s| (QREFELT $ 13)) + (LETT |m| (SPADCALL |s| (|getShellEntry| $ 13)) |ISTRING;replace;$Us2$;15|) - (LETT |n| (SPADCALL |t| (QREFELT $ 13)) + (LETT |n| (SPADCALL |t| (|getShellEntry| $ 13)) |ISTRING;replace;$Us2$;15|) (LETT |h| (COND - ((SPADCALL |sg| (QREFELT $ 40)) - (- (SPADCALL |sg| (QREFELT $ 41)) (QREFELT $ 6))) - ('T (- (SPADCALL |s| (QREFELT $ 42)) (QREFELT $ 6)))) + ((SPADCALL |sg| (|getShellEntry| $ 40)) + (- (SPADCALL |sg| (|getShellEntry| $ 41)) + (|getShellEntry| $ 6))) + ('T + (- (SPADCALL |s| (|getShellEntry| $ 42)) + (|getShellEntry| $ 6)))) |ISTRING;replace;$Us2$;15|) (COND ((OR (OR (< |l| 0) (NULL (< |h| |m|))) (< |h| (- |l| 1))) @@ -81,7 +89,8 @@ |ISTRING;replace;$Us2$;15|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (SPADCALL (QREFELT $ 43)) (QREFELT $ 9)) + (SPADCALL (|getShellEntry| $ 43)) + (|getShellEntry| $ 9)) |ISTRING;replace;$Us2$;15|) (SEQ (LETT |i| 0 |ISTRING;replace;$Us2$;15|) (LETT #1# (- |l| 1) |ISTRING;replace;$Us2$;15|) @@ -119,19 +128,22 @@ (DEFUN |ISTRING;setelt;$I2C;16| (|s| |i| |c| $) (SEQ (COND - ((OR (< |i| (QREFELT $ 6)) - (< (SPADCALL |s| (QREFELT $ 42)) |i|)) + ((OR (< |i| (|getShellEntry| $ 6)) + (< (SPADCALL |s| (|getShellEntry| $ 42)) |i|)) (|error| "index out of range")) - ('T (SEQ (QESET |s| (- |i| (QREFELT $ 6)) |c|) (EXIT |c|)))))) + ('T + (SEQ (QESET |s| (- |i| (|getShellEntry| $ 6)) |c|) + (EXIT |c|)))))) (DEFUN |ISTRING;substring?;2$IB;17| (|part| |whole| |startpos| $) - (PROG (|np| |nw| |iw| |ip| #0=#:G1788 #1=#:G1787 #2=#:G1783) + (PROG (|np| |nw| |iw| |ip| #0=#:G1452 #1=#:G1451 #2=#:G1447) (RETURN (SEQ (EXIT (SEQ (LETT |np| (QCSIZE |part|) |ISTRING;substring?;2$IB;17|) (LETT |nw| (QCSIZE |whole|) |ISTRING;substring?;2$IB;17|) - (LETT |startpos| (- |startpos| (QREFELT $ 6)) + (LETT |startpos| + (- |startpos| (|getShellEntry| $ 6)) |ISTRING;substring?;2$IB;17|) (EXIT (COND ((< |startpos| 0) @@ -178,29 +190,31 @@ (DEFUN |ISTRING;position;2$2I;18| (|s| |t| |startpos| $) (PROG (|r|) (RETURN - (SEQ (LETT |startpos| (- |startpos| (QREFELT $ 6)) + (SEQ (LETT |startpos| (- |startpos| (|getShellEntry| $ 6)) |ISTRING;position;2$2I;18|) (EXIT (COND ((< |startpos| 0) (|error| "index out of bounds")) ((NULL (< |startpos| (QCSIZE |t|))) - (- (QREFELT $ 6) 1)) + (- (|getShellEntry| $ 6) 1)) ('T (SEQ (LETT |r| (STRPOS |s| |t| |startpos| NIL) |ISTRING;position;2$2I;18|) (EXIT (COND - ((EQ |r| NIL) (- (QREFELT $ 6) 1)) - ('T (+ |r| (QREFELT $ 6))))))))))))) + ((EQ |r| NIL) + (- (|getShellEntry| $ 6) 1)) + ('T (+ |r| (|getShellEntry| $ 6))))))))))))) (DEFUN |ISTRING;position;C$2I;19| (|c| |t| |startpos| $) - (PROG (|r| #0=#:G1799 #1=#:G1798) + (PROG (|r| #0=#:G1463 #1=#:G1462) (RETURN - (SEQ (EXIT (SEQ (LETT |startpos| (- |startpos| (QREFELT $ 6)) + (SEQ (EXIT (SEQ (LETT |startpos| + (- |startpos| (|getShellEntry| $ 6)) |ISTRING;position;C$2I;19|) (EXIT (COND ((< |startpos| 0) (|error| "index out of bounds")) ((NULL (< |startpos| (QCSIZE |t|))) - (- (QREFELT $ 6) 1)) + (- (|getShellEntry| $ 6) 1)) ('T (SEQ (SEQ (LETT |r| |startpos| @@ -216,25 +230,27 @@ ((CHAR= (CHAR |t| |r|) |c|) (PROGN (LETT #1# - (+ |r| (QREFELT $ 6)) + (+ |r| + (|getShellEntry| $ 6)) |ISTRING;position;C$2I;19|) (GO #1#)))))) (LETT |r| (+ |r| 1) |ISTRING;position;C$2I;19|) (GO G190) G191 (EXIT NIL)) - (EXIT (- (QREFELT $ 6) 1)))))))) + (EXIT (- (|getShellEntry| $ 6) 1)))))))) #1# (EXIT #1#))))) (DEFUN |ISTRING;position;Cc$2I;20| (|cc| |t| |startpos| $) - (PROG (|r| #0=#:G1806 #1=#:G1805) + (PROG (|r| #0=#:G1470 #1=#:G1469) (RETURN - (SEQ (EXIT (SEQ (LETT |startpos| (- |startpos| (QREFELT $ 6)) + (SEQ (EXIT (SEQ (LETT |startpos| + (- |startpos| (|getShellEntry| $ 6)) |ISTRING;position;Cc$2I;20|) (EXIT (COND ((< |startpos| 0) (|error| "index out of bounds")) ((NULL (< |startpos| (QCSIZE |t|))) - (- (QREFELT $ 6) 1)) + (- (|getShellEntry| $ 6) 1)) ('T (SEQ (SEQ (LETT |r| |startpos| @@ -248,47 +264,52 @@ (EXIT (COND ((SPADCALL (CHAR |t| |r|) |cc| - (QREFELT $ 49)) + (|getShellEntry| $ 49)) (PROGN (LETT #1# - (+ |r| (QREFELT $ 6)) + (+ |r| + (|getShellEntry| $ 6)) |ISTRING;position;Cc$2I;20|) (GO #1#)))))) (LETT |r| (+ |r| 1) |ISTRING;position;Cc$2I;20|) (GO G190) G191 (EXIT NIL)) - (EXIT (- (QREFELT $ 6) 1)))))))) + (EXIT (- (|getShellEntry| $ 6) 1)))))))) #1# (EXIT #1#))))) (DEFUN |ISTRING;suffix?;2$B;21| (|s| |t| $) (PROG (|n| |m|) (RETURN - (SEQ (LETT |n| (SPADCALL |t| (QREFELT $ 42)) + (SEQ (LETT |n| (SPADCALL |t| (|getShellEntry| $ 42)) |ISTRING;suffix?;2$B;21|) - (LETT |m| (SPADCALL |s| (QREFELT $ 42)) + (LETT |m| (SPADCALL |s| (|getShellEntry| $ 42)) |ISTRING;suffix?;2$B;21|) (EXIT (COND ((< |n| |m|) 'NIL) ('T - (SPADCALL |s| |t| (- (+ (QREFELT $ 6) |n|) |m|) - (QREFELT $ 46))))))))) + (SPADCALL |s| |t| + (- (+ (|getShellEntry| $ 6) |n|) |m|) + (|getShellEntry| $ 46))))))))) (DEFUN |ISTRING;split;$CL;22| (|s| |c| $) (PROG (|n| |j| |i| |l|) (RETURN - (SEQ (LETT |n| (SPADCALL |s| (QREFELT $ 42)) + (SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 42)) |ISTRING;split;$CL;22|) - (SEQ (LETT |i| (QREFELT $ 6) |ISTRING;split;$CL;22|) G190 + (SEQ (LETT |i| (|getShellEntry| $ 6) |ISTRING;split;$CL;22|) + G190 (COND ((OR (> |i| |n|) (NULL (SPADCALL - (SPADCALL |s| |i| (QREFELT $ 52)) |c| - (QREFELT $ 53)))) + (SPADCALL |s| |i| + (|getShellEntry| $ 52)) + |c| (|getShellEntry| $ 53)))) (GO G191))) (SEQ (EXIT 0)) (LETT |i| (+ |i| 1) |ISTRING;split;$CL;22|) (GO G190) G191 (EXIT NIL)) - (LETT |l| (SPADCALL (QREFELT $ 55)) |ISTRING;split;$CL;22|) + (LETT |l| (SPADCALL (|getShellEntry| $ 55)) + |ISTRING;split;$CL;22|) (SEQ G190 (COND ((NULL (COND @@ -297,18 +318,18 @@ (SPADCALL (< (LETT |j| (SPADCALL |c| |s| |i| - (QREFELT $ 48)) + (|getShellEntry| $ 48)) |ISTRING;split;$CL;22|) - (QREFELT $ 6)) - (QREFELT $ 56))))) + (|getShellEntry| $ 6)) + (|getShellEntry| $ 56))))) (GO G191))) (SEQ (LETT |l| (SPADCALL (SPADCALL |s| (SPADCALL |i| (- |j| 1) - (QREFELT $ 20)) - (QREFELT $ 21)) - |l| (QREFELT $ 57)) + (|getShellEntry| $ 20)) + (|getShellEntry| $ 21)) + |l| (|getShellEntry| $ 57)) |ISTRING;split;$CL;22|) (EXIT (SEQ (LETT |i| |j| |ISTRING;split;$CL;22|) G190 @@ -316,8 +337,9 @@ ((OR (> |i| |n|) (NULL (SPADCALL - (SPADCALL |s| |i| (QREFELT $ 52)) - |c| (QREFELT $ 53)))) + (SPADCALL |s| |i| + (|getShellEntry| $ 52)) + |c| (|getShellEntry| $ 53)))) (GO G191))) (SEQ (EXIT 0)) (LETT |i| (+ |i| 1) @@ -328,28 +350,33 @@ ((NULL (< |n| |i|)) (LETT |l| (SPADCALL - (SPADCALL |s| (SPADCALL |i| |n| (QREFELT $ 20)) - (QREFELT $ 21)) - |l| (QREFELT $ 57)) + (SPADCALL |s| + (SPADCALL |i| |n| (|getShellEntry| $ 20)) + (|getShellEntry| $ 21)) + |l| (|getShellEntry| $ 57)) |ISTRING;split;$CL;22|))) - (EXIT (SPADCALL |l| (QREFELT $ 58))))))) + (EXIT (SPADCALL |l| (|getShellEntry| $ 58))))))) (DEFUN |ISTRING;split;$CcL;23| (|s| |cc| $) (PROG (|n| |j| |i| |l|) (RETURN - (SEQ (LETT |n| (SPADCALL |s| (QREFELT $ 42)) + (SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 42)) |ISTRING;split;$CcL;23|) - (SEQ (LETT |i| (QREFELT $ 6) |ISTRING;split;$CcL;23|) G190 + (SEQ (LETT |i| (|getShellEntry| $ 6) + |ISTRING;split;$CcL;23|) + G190 (COND ((OR (> |i| |n|) (NULL (SPADCALL - (SPADCALL |s| |i| (QREFELT $ 52)) |cc| - (QREFELT $ 49)))) + (SPADCALL |s| |i| + (|getShellEntry| $ 52)) + |cc| (|getShellEntry| $ 49)))) (GO G191))) (SEQ (EXIT 0)) (LETT |i| (+ |i| 1) |ISTRING;split;$CcL;23|) (GO G190) G191 (EXIT NIL)) - (LETT |l| (SPADCALL (QREFELT $ 55)) |ISTRING;split;$CcL;23|) + (LETT |l| (SPADCALL (|getShellEntry| $ 55)) + |ISTRING;split;$CcL;23|) (SEQ G190 (COND ((NULL (COND @@ -358,18 +385,18 @@ (SPADCALL (< (LETT |j| (SPADCALL |cc| |s| |i| - (QREFELT $ 50)) + (|getShellEntry| $ 50)) |ISTRING;split;$CcL;23|) - (QREFELT $ 6)) - (QREFELT $ 56))))) + (|getShellEntry| $ 6)) + (|getShellEntry| $ 56))))) (GO G191))) (SEQ (LETT |l| (SPADCALL (SPADCALL |s| (SPADCALL |i| (- |j| 1) - (QREFELT $ 20)) - (QREFELT $ 21)) - |l| (QREFELT $ 57)) + (|getShellEntry| $ 20)) + (|getShellEntry| $ 21)) + |l| (|getShellEntry| $ 57)) |ISTRING;split;$CcL;23|) (EXIT (SEQ (LETT |i| |j| |ISTRING;split;$CcL;23|) G190 @@ -377,8 +404,9 @@ ((OR (> |i| |n|) (NULL (SPADCALL - (SPADCALL |s| |i| (QREFELT $ 52)) - |cc| (QREFELT $ 49)))) + (SPADCALL |s| |i| + (|getShellEntry| $ 52)) + |cc| (|getShellEntry| $ 49)))) (GO G191))) (SEQ (EXIT 0)) (LETT |i| (+ |i| 1) @@ -389,93 +417,105 @@ ((NULL (< |n| |i|)) (LETT |l| (SPADCALL - (SPADCALL |s| (SPADCALL |i| |n| (QREFELT $ 20)) - (QREFELT $ 21)) - |l| (QREFELT $ 57)) + (SPADCALL |s| + (SPADCALL |i| |n| (|getShellEntry| $ 20)) + (|getShellEntry| $ 21)) + |l| (|getShellEntry| $ 57)) |ISTRING;split;$CcL;23|))) - (EXIT (SPADCALL |l| (QREFELT $ 58))))))) + (EXIT (SPADCALL |l| (|getShellEntry| $ 58))))))) (DEFUN |ISTRING;leftTrim;$C$;24| (|s| |c| $) (PROG (|n| |i|) (RETURN - (SEQ (LETT |n| (SPADCALL |s| (QREFELT $ 42)) + (SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 42)) |ISTRING;leftTrim;$C$;24|) - (SEQ (LETT |i| (QREFELT $ 6) |ISTRING;leftTrim;$C$;24|) G190 + (SEQ (LETT |i| (|getShellEntry| $ 6) + |ISTRING;leftTrim;$C$;24|) + G190 (COND ((OR (> |i| |n|) (NULL (SPADCALL - (SPADCALL |s| |i| (QREFELT $ 52)) |c| - (QREFELT $ 53)))) + (SPADCALL |s| |i| + (|getShellEntry| $ 52)) + |c| (|getShellEntry| $ 53)))) (GO G191))) (SEQ (EXIT 0)) (LETT |i| (+ |i| 1) |ISTRING;leftTrim;$C$;24|) (GO G190) G191 (EXIT NIL)) - (EXIT (SPADCALL |s| (SPADCALL |i| |n| (QREFELT $ 20)) - (QREFELT $ 21))))))) + (EXIT (SPADCALL |s| + (SPADCALL |i| |n| (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))))))) (DEFUN |ISTRING;leftTrim;$Cc$;25| (|s| |cc| $) (PROG (|n| |i|) (RETURN - (SEQ (LETT |n| (SPADCALL |s| (QREFELT $ 42)) + (SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 42)) |ISTRING;leftTrim;$Cc$;25|) - (SEQ (LETT |i| (QREFELT $ 6) |ISTRING;leftTrim;$Cc$;25|) + (SEQ (LETT |i| (|getShellEntry| $ 6) + |ISTRING;leftTrim;$Cc$;25|) G190 (COND ((OR (> |i| |n|) (NULL (SPADCALL - (SPADCALL |s| |i| (QREFELT $ 52)) |cc| - (QREFELT $ 49)))) + (SPADCALL |s| |i| + (|getShellEntry| $ 52)) + |cc| (|getShellEntry| $ 49)))) (GO G191))) (SEQ (EXIT 0)) (LETT |i| (+ |i| 1) |ISTRING;leftTrim;$Cc$;25|) (GO G190) G191 (EXIT NIL)) - (EXIT (SPADCALL |s| (SPADCALL |i| |n| (QREFELT $ 20)) - (QREFELT $ 21))))))) + (EXIT (SPADCALL |s| + (SPADCALL |i| |n| (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))))))) (DEFUN |ISTRING;rightTrim;$C$;26| (|s| |c| $) - (PROG (|j| #0=#:G1830) + (PROG (|j| #0=#:G1494) (RETURN - (SEQ (SEQ (LETT |j| (SPADCALL |s| (QREFELT $ 42)) + (SEQ (SEQ (LETT |j| (SPADCALL |s| (|getShellEntry| $ 42)) + |ISTRING;rightTrim;$C$;26|) + (LETT #0# (|getShellEntry| $ 6) |ISTRING;rightTrim;$C$;26|) - (LETT #0# (QREFELT $ 6) |ISTRING;rightTrim;$C$;26|) G190 (COND ((OR (< |j| #0#) (NULL (SPADCALL - (SPADCALL |s| |j| (QREFELT $ 52)) |c| - (QREFELT $ 53)))) + (SPADCALL |s| |j| + (|getShellEntry| $ 52)) + |c| (|getShellEntry| $ 53)))) (GO G191))) (SEQ (EXIT 0)) (LETT |j| (+ |j| -1) |ISTRING;rightTrim;$C$;26|) (GO G190) G191 (EXIT NIL)) (EXIT (SPADCALL |s| - (SPADCALL (SPADCALL |s| (QREFELT $ 28)) |j| - (QREFELT $ 20)) - (QREFELT $ 21))))))) + (SPADCALL (SPADCALL |s| (|getShellEntry| $ 28)) + |j| (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))))))) (DEFUN |ISTRING;rightTrim;$Cc$;27| (|s| |cc| $) - (PROG (|j| #0=#:G1834) + (PROG (|j| #0=#:G1498) (RETURN - (SEQ (SEQ (LETT |j| (SPADCALL |s| (QREFELT $ 42)) + (SEQ (SEQ (LETT |j| (SPADCALL |s| (|getShellEntry| $ 42)) + |ISTRING;rightTrim;$Cc$;27|) + (LETT #0# (|getShellEntry| $ 6) |ISTRING;rightTrim;$Cc$;27|) - (LETT #0# (QREFELT $ 6) |ISTRING;rightTrim;$Cc$;27|) G190 (COND ((OR (< |j| #0#) (NULL (SPADCALL - (SPADCALL |s| |j| (QREFELT $ 52)) |cc| - (QREFELT $ 49)))) + (SPADCALL |s| |j| + (|getShellEntry| $ 52)) + |cc| (|getShellEntry| $ 49)))) (GO G191))) (SEQ (EXIT 0)) (LETT |j| (+ |j| -1) |ISTRING;rightTrim;$Cc$;27|) (GO G190) G191 (EXIT NIL)) (EXIT (SPADCALL |s| - (SPADCALL (SPADCALL |s| (QREFELT $ 28)) |j| - (QREFELT $ 20)) - (QREFELT $ 21))))))) + (SPADCALL (SPADCALL |s| (|getShellEntry| $ 28)) + |j| (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))))))) (DEFUN |ISTRING;concat;L$;28| (|l| $) - (PROG (#0=#:G1842 #1=#:G1837 #2=#:G1835 #3=#:G1836 |t| |s| #4=#:G1843 + (PROG (#0=#:G1506 #1=#:G1501 #2=#:G1499 #3=#:G1500 |t| |s| #4=#:G1507 |i|) (RETURN (SEQ (LETT |t| @@ -493,7 +533,8 @@ (GO G191))) (SEQ (EXIT (PROGN (LETT #1# - (SPADCALL |s| (QREFELT $ 13)) + (SPADCALL |s| + (|getShellEntry| $ 13)) |ISTRING;concat;L$;28|) (COND (#3# @@ -508,9 +549,10 @@ (LETT #0# (CDR #0#) |ISTRING;concat;L$;28|) (GO G190) G191 (EXIT NIL)) (COND (#3# #2#) ('T 0))) - (SPADCALL (QREFELT $ 43)) (QREFELT $ 9)) + (SPADCALL (|getShellEntry| $ 43)) + (|getShellEntry| $ 9)) |ISTRING;concat;L$;28|) - (LETT |i| (QREFELT $ 6) |ISTRING;concat;L$;28|) + (LETT |i| (|getShellEntry| $ 6) |ISTRING;concat;L$;28|) (SEQ (LETT |s| NIL |ISTRING;concat;L$;28|) (LETT #4# |l| |ISTRING;concat;L$;28|) G190 (COND @@ -519,9 +561,11 @@ (LETT |s| (CAR #4#) |ISTRING;concat;L$;28|) NIL)) (GO G191))) - (SEQ (SPADCALL |t| |s| |i| (QREFELT $ 66)) + (SEQ (SPADCALL |t| |s| |i| (|getShellEntry| $ 66)) (EXIT (LETT |i| - (+ |i| (SPADCALL |s| (QREFELT $ 13))) + (+ |i| + (SPADCALL |s| + (|getShellEntry| $ 13))) |ISTRING;concat;L$;28|))) (LETT #4# (CDR #4#) |ISTRING;concat;L$;28|) (GO G190) G191 (EXIT NIL)) @@ -530,11 +574,12 @@ (DEFUN |ISTRING;copyInto!;2$I$;29| (|y| |x| |s| $) (PROG (|m| |n|) (RETURN - (SEQ (LETT |m| (SPADCALL |x| (QREFELT $ 13)) + (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 13)) |ISTRING;copyInto!;2$I$;29|) - (LETT |n| (SPADCALL |y| (QREFELT $ 13)) + (LETT |n| (SPADCALL |y| (|getShellEntry| $ 13)) + |ISTRING;copyInto!;2$I$;29|) + (LETT |s| (- |s| (|getShellEntry| $ 6)) |ISTRING;copyInto!;2$I$;29|) - (LETT |s| (- |s| (QREFELT $ 6)) |ISTRING;copyInto!;2$I$;29|) (COND ((OR (< |s| 0) (< |n| (+ |s| |m|))) (EXIT (|error| "index out of range")))) @@ -542,24 +587,30 @@ (DEFUN |ISTRING;elt;$IC;30| (|s| |i| $) (COND - ((OR (< |i| (QREFELT $ 6)) (< (SPADCALL |s| (QREFELT $ 42)) |i|)) + ((OR (< |i| (|getShellEntry| $ 6)) + (< (SPADCALL |s| (|getShellEntry| $ 42)) |i|)) (|error| "index out of range")) - ('T (CHAR |s| (- |i| (QREFELT $ 6)))))) + ('T (CHAR |s| (- |i| (|getShellEntry| $ 6)))))) (DEFUN |ISTRING;elt;$Us$;31| (|s| |sg| $) (PROG (|l| |h|) (RETURN - (SEQ (LETT |l| (- (SPADCALL |sg| (QREFELT $ 39)) (QREFELT $ 6)) + (SEQ (LETT |l| + (- (SPADCALL |sg| (|getShellEntry| $ 39)) + (|getShellEntry| $ 6)) |ISTRING;elt;$Us$;31|) (LETT |h| (COND - ((SPADCALL |sg| (QREFELT $ 40)) - (- (SPADCALL |sg| (QREFELT $ 41)) (QREFELT $ 6))) - ('T (- (SPADCALL |s| (QREFELT $ 42)) (QREFELT $ 6)))) + ((SPADCALL |sg| (|getShellEntry| $ 40)) + (- (SPADCALL |sg| (|getShellEntry| $ 41)) + (|getShellEntry| $ 6))) + ('T + (- (SPADCALL |s| (|getShellEntry| $ 42)) + (|getShellEntry| $ 6)))) |ISTRING;elt;$Us$;31|) (COND ((OR (< |l| 0) - (NULL (< |h| (SPADCALL |s| (QREFELT $ 13))))) + (NULL (< |h| (SPADCALL |s| (|getShellEntry| $ 13))))) (EXIT (|error| "index out of bound")))) (EXIT (SUBSTRING |s| |l| (MAX 0 (+ (- |h| |l|) 1)))))))) @@ -571,40 +622,44 @@ ((ZEROP |n|) 0) ((EQL |n| 1) (SPADCALL - (SPADCALL |s| (QREFELT $ 6) (QREFELT $ 52)) - (QREFELT $ 68))) + (SPADCALL |s| (|getShellEntry| $ 6) + (|getShellEntry| $ 52)) + (|getShellEntry| $ 68))) ('T (* (* (SPADCALL - (SPADCALL |s| (QREFELT $ 6) - (QREFELT $ 52)) - (QREFELT $ 68)) + (SPADCALL |s| (|getShellEntry| $ 6) + (|getShellEntry| $ 52)) + (|getShellEntry| $ 68)) (SPADCALL - (SPADCALL |s| (- (+ (QREFELT $ 6) |n|) 1) - (QREFELT $ 52)) - (QREFELT $ 68))) + (SPADCALL |s| + (- (+ (|getShellEntry| $ 6) |n|) 1) + (|getShellEntry| $ 52)) + (|getShellEntry| $ 68))) (SPADCALL (SPADCALL |s| - (+ (QREFELT $ 6) (QUOTIENT2 |n| 2)) - (QREFELT $ 52)) - (QREFELT $ 68)))))))))) + (+ (|getShellEntry| $ 6) + (QUOTIENT2 |n| 2)) + (|getShellEntry| $ 52)) + (|getShellEntry| $ 68)))))))))) (DEFUN |ISTRING;match;2$CNni;33| (|pattern| |target| |wildcard| $) (|stringMatch| |pattern| |target| (CHARACTER |wildcard|))) (DEFUN |ISTRING;match?;2$CB;34| (|pattern| |target| |dontcare| $) - (PROG (|n| |m| #0=#:G1857 #1=#:G1859 |s| #2=#:G1860 #3=#:G1868 |i| - |p| #4=#:G1861 |q|) + (PROG (|n| |m| #0=#:G1521 #1=#:G1524 |s| #2=#:G1525 #3=#:G1534 |i| + |p| #4=#:G1526 |q|) (RETURN - (SEQ (EXIT (SEQ (LETT |n| (SPADCALL |pattern| (QREFELT $ 42)) + (SEQ (EXIT (SEQ (LETT |n| + (SPADCALL |pattern| (|getShellEntry| $ 42)) |ISTRING;match?;2$CB;34|) (LETT |p| (PROG1 (LETT #0# (SPADCALL |dontcare| |pattern| (LETT |m| (SPADCALL |pattern| - (QREFELT $ 28)) + (|getShellEntry| $ 28)) |ISTRING;match?;2$CB;34|) - (QREFELT $ 48)) + (|getShellEntry| $ 48)) |ISTRING;match?;2$CB;34|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) @@ -612,18 +667,20 @@ (EXIT (COND ((EQL |p| (- |m| 1)) (SPADCALL |pattern| |target| - (QREFELT $ 14))) + (|getShellEntry| $ 14))) ('T (SEQ (COND - ((NULL (EQL |p| |m|)) + ((SPADCALL |p| |m| + (|getShellEntry| $ 71)) (COND ((NULL (SPADCALL (SPADCALL |pattern| (SPADCALL |m| (- |p| 1) - (QREFELT $ 20)) - (QREFELT $ 21)) - |target| (QREFELT $ 71))) + (|getShellEntry| $ 20)) + (|getShellEntry| $ 21)) + |target| + (|getShellEntry| $ 72))) (EXIT 'NIL))))) (LETT |i| |p| |ISTRING;match?;2$CB;34|) @@ -631,7 +688,8 @@ (PROG1 (LETT #1# (SPADCALL |dontcare| |pattern| - (+ |p| 1) (QREFELT $ 48)) + (+ |p| 1) + (|getShellEntry| $ 48)) |ISTRING;match?;2$CB;34|) (|check-subtype| (>= #1# 0) '(|NonNegativeInteger|) #1#)) @@ -639,21 +697,21 @@ (SEQ G190 (COND ((NULL - (SPADCALL (EQL |q| (- |m| 1)) - (QREFELT $ 56))) + (SPADCALL |q| (- |m| 1) + (|getShellEntry| $ 71))) (GO G191))) (SEQ (LETT |s| (SPADCALL |pattern| (SPADCALL (+ |p| 1) (- |q| 1) - (QREFELT $ 20)) - (QREFELT $ 21)) + (|getShellEntry| $ 20)) + (|getShellEntry| $ 21)) |ISTRING;match?;2$CB;34|) (LETT |i| (PROG1 (LETT #2# (SPADCALL |s| |target| |i| - (QREFELT $ 47)) + (|getShellEntry| $ 47)) |ISTRING;match?;2$CB;34|) (|check-subtype| (>= #2# 0) '(|NonNegativeInteger|) #2#)) @@ -670,7 +728,7 @@ (LETT |i| (+ |i| (SPADCALL |s| - (QREFELT $ 13))) + (|getShellEntry| $ 13))) |ISTRING;match?;2$CB;34|) (LETT |p| |q| |ISTRING;match?;2$CB;34|) @@ -680,7 +738,7 @@ (LETT #4# (SPADCALL |dontcare| |pattern| (+ |q| 1) - (QREFELT $ 48)) + (|getShellEntry| $ 48)) |ISTRING;match?;2$CB;34|) (|check-subtype| (>= #4# 0) @@ -689,23 +747,25 @@ |ISTRING;match?;2$CB;34|))))))) NIL (GO G190) G191 (EXIT NIL)) (COND - ((NULL (EQL |p| |n|)) + ((SPADCALL |p| |n| + (|getShellEntry| $ 71)) (COND ((NULL (SPADCALL (SPADCALL |pattern| (SPADCALL (+ |p| 1) |n| - (QREFELT $ 20)) - (QREFELT $ 21)) - |target| (QREFELT $ 51))) + (|getShellEntry| $ 20)) + (|getShellEntry| $ 21)) + |target| + (|getShellEntry| $ 51))) (EXIT 'NIL))))) (EXIT 'T))))))) #3# (EXIT #3#))))) -(DEFUN |IndexedString| (#0=#:G1875) +(DEFUN |IndexedString| (#0=#:G1541) (PROG () (RETURN - (PROG (#1=#:G1876) + (PROG (#1=#:G1542) (RETURN (COND ((LETT #1# @@ -728,9 +788,9 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|IndexedString|)) (LETT |dv$| (LIST '|IndexedString| |dv$1|) . #0#) - (LETT $ (|newShell| 84) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 + (LETT $ (|newShell| 85) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 (LIST (OR (AND (|HasCategory| (|Character|) @@ -767,7 +827,7 @@ (|haddProp| |$ConstructorCache| '|IndexedString| (LIST |dv$1|) (CONS 1 $)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) $)))) (MAKEPROP '|IndexedString| '|infovec| @@ -797,28 +857,28 @@ |ISTRING;leftTrim;$Cc$;25| |ISTRING;rightTrim;$C$;26| |ISTRING;rightTrim;$Cc$;27| |ISTRING;copyInto!;2$I$;29| |ISTRING;concat;L$;28| (96 . |ord|) |ISTRING;hash;$I;32| - |ISTRING;match;2$CNni;33| (101 . |prefix?|) - |ISTRING;match?;2$CB;34| (|List| 8) (|List| 75) - (|Equation| 8) (|Mapping| 8 8 8) (|InputForm|) + |ISTRING;match;2$CNni;33| (101 . ~=) (107 . |prefix?|) + |ISTRING;match?;2$CB;34| (|List| 8) (|Equation| 8) + (|List| 75) (|Mapping| 8 8 8) (|InputForm|) (|SingleInteger|) (|Mapping| 11 8) (|Mapping| 11 8 8) (|Void|) (|Union| 8 '"failed") (|List| 18)) - '#(~= 107 |upperCase!| 113 |upperCase| 118 |trim| 123 |swap!| - 135 |suffix?| 142 |substring?| 148 |split| 155 |sorted?| - 167 |sort!| 178 |sort| 189 |size?| 200 |setelt| 206 - |select| 220 |sample| 226 |rightTrim| 230 |reverse!| 242 - |reverse| 247 |replace| 252 |removeDuplicates| 259 - |remove| 264 |reduce| 276 |qsetelt!| 297 |qelt| 304 - |prefix?| 310 |position| 316 |parts| 349 |new| 354 |more?| - 360 |minIndex| 366 |min| 371 |merge| 377 |members| 390 - |member?| 395 |maxIndex| 401 |max| 406 |match?| 412 - |match| 419 |map!| 426 |map| 432 |lowerCase!| 445 - |lowerCase| 450 |less?| 455 |leftTrim| 461 |latex| 473 - |insert| 478 |indices| 492 |index?| 497 |hash| 503 |first| - 513 |find| 518 |fill!| 524 |every?| 530 |eval| 536 |eq?| - 562 |entry?| 568 |entries| 574 |empty?| 579 |empty| 584 - |elt| 588 |delete| 613 |count| 625 |copyInto!| 637 |copy| - 644 |convert| 649 |construct| 654 |concat| 659 |coerce| - 682 |any?| 692 >= 698 > 704 = 710 <= 716 < 722 |#| 728) + '#(~= 113 |upperCase!| 119 |upperCase| 124 |trim| 129 |swap!| + 141 |suffix?| 148 |substring?| 154 |split| 161 |sorted?| + 173 |sort!| 184 |sort| 195 |size?| 206 |setelt| 212 + |select| 226 |sample| 232 |rightTrim| 236 |reverse!| 248 + |reverse| 253 |replace| 258 |removeDuplicates| 265 + |remove| 270 |reduce| 282 |qsetelt!| 303 |qelt| 310 + |prefix?| 316 |position| 322 |parts| 355 |new| 360 |more?| + 366 |minIndex| 372 |min| 377 |merge| 383 |members| 396 + |member?| 401 |maxIndex| 407 |max| 412 |match?| 418 + |match| 425 |map!| 432 |map| 438 |lowerCase!| 451 + |lowerCase| 456 |less?| 461 |leftTrim| 467 |latex| 479 + |insert| 484 |indices| 498 |index?| 503 |hash| 509 |first| + 519 |find| 524 |fill!| 530 |every?| 536 |eval| 542 |eq?| + 568 |entry?| 574 |entries| 580 |empty?| 585 |empty| 590 + |elt| 594 |delete| 619 |count| 631 |copyInto!| 643 |copy| + 650 |convert| 655 |construct| 660 |concat| 665 |coerce| + 688 |any?| 698 >= 704 > 710 = 716 <= 722 < 728 |#| 734) '((|shallowlyMutable| . 0) (|finiteAggregate| . 0)) (CONS (|makeByteWordVec2| 5 '(0 0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4)) @@ -841,51 +901,307 @@ (|EltableAggregate| 18 8) (|Evalable| 8) (|SetCategory|) (|Type|) (|Eltable| 18 8) (|InnerEvalable| 8 8) - (|CoercibleTo| 25) (|ConvertibleTo| 77) + (|CoercibleTo| 25) (|ConvertibleTo| 78) (|BasicType|)) - (|makeByteWordVec2| 83 + (|makeByteWordVec2| 84 '(2 19 0 18 18 20 1 19 0 18 22 1 25 0 24 26 0 29 0 30 1 8 0 0 31 2 0 0 32 0 33 0 29 0 35 1 8 0 0 36 1 19 18 0 39 1 19 11 0 40 1 19 18 0 41 1 0 18 0 42 0 8 0 43 2 29 11 8 0 49 2 8 11 0 0 53 0 54 0 55 1 11 0 0 56 2 54 0 2 0 57 1 - 54 0 0 58 1 8 7 0 68 2 0 11 0 0 71 2 - 7 11 0 0 1 1 0 0 0 34 1 0 0 0 1 2 0 0 - 0 8 1 2 0 0 0 29 1 3 0 81 0 18 18 1 2 - 0 11 0 0 51 3 0 11 0 0 18 46 2 0 59 0 - 29 61 2 0 59 0 8 60 1 5 11 0 1 2 0 11 - 80 0 1 1 5 0 0 1 2 0 0 80 0 1 1 5 0 0 - 1 2 0 0 80 0 1 2 0 11 0 7 1 3 0 8 0 - 19 8 1 3 0 8 0 18 8 45 2 0 0 79 0 1 0 - 0 0 1 2 0 0 0 8 64 2 0 0 0 29 65 1 0 - 0 0 1 1 0 0 0 1 3 0 0 0 19 0 44 1 7 0 - 0 1 2 7 0 8 0 1 2 0 0 79 0 1 4 7 8 76 - 0 8 8 1 3 0 8 76 0 8 1 2 0 8 76 0 1 3 - 0 8 0 18 8 1 2 0 8 0 18 1 2 0 11 0 0 - 71 3 7 18 8 0 18 48 2 7 18 8 0 1 3 0 - 18 29 0 18 50 3 0 18 0 0 18 47 2 0 18 - 79 0 1 1 0 73 0 1 2 0 0 7 8 9 2 0 11 - 0 7 1 1 6 18 0 28 2 5 0 0 0 1 2 5 0 0 - 0 1 3 0 0 80 0 0 1 1 0 73 0 1 2 7 11 - 8 0 1 1 6 18 0 42 2 5 0 0 0 1 3 0 11 - 0 0 8 72 3 0 7 0 0 8 70 2 0 0 32 0 33 - 3 0 0 76 0 0 1 2 0 0 32 0 1 1 0 0 0 - 37 1 0 0 0 1 2 0 11 0 7 1 2 0 0 0 8 - 62 2 0 0 0 29 63 1 7 24 0 38 3 0 0 8 - 0 18 1 3 0 0 0 0 18 23 1 0 83 0 1 2 0 - 11 18 0 1 1 7 78 0 1 1 0 18 0 69 1 6 - 8 0 1 2 0 82 79 0 1 2 0 0 0 8 1 2 0 - 11 79 0 1 3 8 0 0 73 73 1 3 8 0 0 8 8 - 1 2 8 0 0 74 1 2 8 0 0 75 1 2 0 11 0 - 0 1 2 7 11 8 0 1 1 0 73 0 1 1 0 11 0 - 12 0 0 0 10 2 0 0 0 0 1 2 0 0 0 19 21 - 2 0 8 0 18 52 3 0 8 0 18 8 1 2 0 0 0 - 18 1 2 0 0 0 19 1 2 7 7 8 0 1 2 0 7 - 79 0 1 3 0 0 0 0 18 66 1 0 0 0 17 1 3 - 77 0 1 1 0 0 73 1 1 0 0 59 67 2 0 0 0 - 0 16 2 0 0 0 8 1 2 0 0 8 0 1 1 9 25 0 - 27 1 0 0 8 1 2 0 11 79 0 1 2 5 11 0 0 - 1 2 5 11 0 0 1 2 7 11 0 0 14 2 5 11 0 - 0 1 2 5 11 0 0 15 1 0 7 0 13))))) + 54 0 0 58 1 8 7 0 68 2 18 11 0 0 71 2 + 0 11 0 0 72 2 7 11 0 0 1 1 0 0 0 34 1 + 0 0 0 1 2 0 0 0 8 1 2 0 0 0 29 1 3 0 + 82 0 18 18 1 2 0 11 0 0 51 3 0 11 0 0 + 18 46 2 0 59 0 29 61 2 0 59 0 8 60 1 + 5 11 0 1 2 0 11 81 0 1 1 5 0 0 1 2 0 + 0 81 0 1 1 5 0 0 1 2 0 0 81 0 1 2 0 + 11 0 7 1 3 0 8 0 19 8 1 3 0 8 0 18 8 + 45 2 0 0 80 0 1 0 0 0 1 2 0 0 0 8 64 + 2 0 0 0 29 65 1 0 0 0 1 1 0 0 0 1 3 0 + 0 0 19 0 44 1 7 0 0 1 2 7 0 8 0 1 2 0 + 0 80 0 1 4 7 8 77 0 8 8 1 3 0 8 77 0 + 8 1 2 0 8 77 0 1 3 0 8 0 18 8 1 2 0 8 + 0 18 1 2 0 11 0 0 72 3 7 18 8 0 18 48 + 2 7 18 8 0 1 3 0 18 29 0 18 50 3 0 18 + 0 0 18 47 2 0 18 80 0 1 1 0 74 0 1 2 + 0 0 7 8 9 2 0 11 0 7 1 1 6 18 0 28 2 + 5 0 0 0 1 2 5 0 0 0 1 3 0 0 81 0 0 1 + 1 0 74 0 1 2 7 11 8 0 1 1 6 18 0 42 2 + 5 0 0 0 1 3 0 11 0 0 8 73 3 0 7 0 0 8 + 70 2 0 0 32 0 33 3 0 0 77 0 0 1 2 0 0 + 32 0 1 1 0 0 0 37 1 0 0 0 1 2 0 11 0 + 7 1 2 0 0 0 8 62 2 0 0 0 29 63 1 7 24 + 0 38 3 0 0 8 0 18 1 3 0 0 0 0 18 23 1 + 0 84 0 1 2 0 11 18 0 1 1 7 79 0 1 1 0 + 18 0 69 1 6 8 0 1 2 0 83 80 0 1 2 0 0 + 0 8 1 2 0 11 80 0 1 3 8 0 0 74 74 1 3 + 8 0 0 8 8 1 2 8 0 0 76 1 2 8 0 0 75 1 + 2 0 11 0 0 1 2 7 11 8 0 1 1 0 74 0 1 + 1 0 11 0 12 0 0 0 10 2 0 0 0 0 1 2 0 + 0 0 19 21 2 0 8 0 18 52 3 0 8 0 18 8 + 1 2 0 0 0 18 1 2 0 0 0 19 1 2 7 7 8 0 + 1 2 0 7 80 0 1 3 0 0 0 0 18 66 1 0 0 + 0 17 1 3 78 0 1 1 0 0 74 1 1 0 0 59 + 67 2 0 0 0 0 16 2 0 0 0 8 1 2 0 0 8 0 + 1 1 9 25 0 27 1 0 0 8 1 2 0 11 80 0 1 + 2 5 11 0 0 1 2 5 11 0 0 1 2 7 11 0 0 + 14 2 5 11 0 0 1 2 5 11 0 0 15 1 0 7 0 + 13))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|IndexedString| '|isFunctor| + '(((~= ((|Boolean|) $ $)) + (|has| (|Character|) (|SetCategory|)) (ELT $ NIL)) + ((= ((|Boolean|) $ $)) + (|has| (|Character|) (|SetCategory|)) (ELT $ 14)) + ((|coerce| ((|OutputForm|) $)) + (|has| (|Character|) (|CoercibleTo| (|OutputForm|))) + (ELT $ 27)) + ((|hash| ((|SingleInteger|) $)) + (|has| (|Character|) (|SetCategory|)) (ELT $ NIL)) + ((|latex| ((|String|) $)) + (|has| (|Character|) (|SetCategory|)) (ELT $ 38)) + ((|hash| ((|Integer|) $)) T (ELT $ 69)) + ((|elt| ($ $ $)) T (ELT $ NIL)) + ((|rightTrim| ($ $ (|CharacterClass|))) T (ELT $ 65)) + ((|rightTrim| ($ $ (|Character|))) T (ELT $ 64)) + ((|leftTrim| ($ $ (|CharacterClass|))) T (ELT $ 63)) + ((|leftTrim| ($ $ (|Character|))) T (ELT $ 62)) + ((|trim| ($ $ (|CharacterClass|))) T (ELT $ NIL)) + ((|trim| ($ $ (|Character|))) T (ELT $ NIL)) + ((|split| ((|List| $) $ (|CharacterClass|))) T + (ELT $ 61)) + ((|split| ((|List| $) $ (|Character|))) T (ELT $ 60)) + ((|coerce| ($ (|Character|))) T (ELT $ NIL)) + ((|position| + ((|Integer|) (|CharacterClass|) $ (|Integer|))) + T (ELT $ 50)) + ((|position| ((|Integer|) $ $ (|Integer|))) T + (ELT $ 47)) + ((|replace| ($ $ (|UniversalSegment| (|Integer|)) $)) T + (ELT $ 44)) + ((|match?| ((|Boolean|) $ $ (|Character|))) T + (ELT $ 73)) + ((|match| ((|NonNegativeInteger|) $ $ (|Character|))) T + (ELT $ 70)) + ((|substring?| ((|Boolean|) $ $ (|Integer|))) T + (ELT $ 46)) + ((|suffix?| ((|Boolean|) $ $)) T (ELT $ 51)) + ((|prefix?| ((|Boolean|) $ $)) T (ELT $ 72)) + ((|upperCase!| ($ $)) T (ELT $ 34)) + ((|upperCase| ($ $)) T (ELT $ NIL)) + ((|lowerCase!| ($ $)) T (ELT $ 37)) + ((|lowerCase| ($ $)) T (ELT $ NIL)) + ((< ((|Boolean|) $ $)) + (|has| (|Character|) (|OrderedSet|)) (ELT $ 15)) + ((> ((|Boolean|) $ $)) + (|has| (|Character|) (|OrderedSet|)) (ELT $ NIL)) + ((>= ((|Boolean|) $ $)) + (|has| (|Character|) (|OrderedSet|)) (ELT $ NIL)) + ((<= ((|Boolean|) $ $)) + (|has| (|Character|) (|OrderedSet|)) (ELT $ NIL)) + ((|max| ($ $ $)) (|has| (|Character|) (|OrderedSet|)) + (ELT $ NIL)) + ((|min| ($ $ $)) (|has| (|Character|) (|OrderedSet|)) + (ELT $ NIL)) + ((|sort!| ($ $)) + (AND (|has| $ (ATTRIBUTE |shallowlyMutable|)) + (|has| (|Character|) (|OrderedSet|))) + (ELT $ NIL)) + ((|sort!| ($ (|Mapping| (|Boolean|) (|Character|) + (|Character|)) + $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|reverse!| ($ $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|copyInto!| ($ $ $ (|Integer|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ 66)) + ((|sorted?| ((|Boolean|) $)) + (|has| (|Character|) (|OrderedSet|)) (ELT $ NIL)) + ((|sort| ($ $)) (|has| (|Character|) (|OrderedSet|)) + (ELT $ NIL)) + ((|merge| ($ $ $)) (|has| (|Character|) (|OrderedSet|)) + (ELT $ NIL)) + ((|position| ((|Integer|) (|Character|) $ (|Integer|))) + (|has| (|Character|) (|SetCategory|)) (ELT $ 48)) + ((|position| ((|Integer|) (|Character|) $)) + (|has| (|Character|) (|SetCategory|)) (ELT $ NIL)) + ((|position| + ((|Integer|) (|Mapping| (|Boolean|) (|Character|)) + $)) + T (ELT $ NIL)) + ((|sorted?| + ((|Boolean|) + (|Mapping| (|Boolean|) (|Character|) + (|Character|)) + $)) + T (ELT $ NIL)) + ((|sort| ($ (|Mapping| (|Boolean|) (|Character|) + (|Character|)) + $)) + T (ELT $ NIL)) + ((|reverse| ($ $)) T (ELT $ NIL)) + ((|merge| ($ (|Mapping| (|Boolean|) (|Character|) + (|Character|)) + $ $)) + T (ELT $ NIL)) + ((|setelt| + ((|Character|) $ (|UniversalSegment| (|Integer|)) + (|Character|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|insert| ($ $ $ (|Integer|))) T (ELT $ 23)) + ((|insert| ($ (|Character|) $ (|Integer|))) T + (ELT $ NIL)) + ((|delete| ($ $ (|UniversalSegment| (|Integer|)))) T + (ELT $ NIL)) + ((|delete| ($ $ (|Integer|))) T (ELT $ NIL)) + ((|elt| ($ $ (|UniversalSegment| (|Integer|)))) T + (ELT $ 21)) + ((|map| ($ (|Mapping| (|Character|) (|Character|) + (|Character|)) + $ $)) + T (ELT $ NIL)) + ((|concat| ($ (|List| $))) T (ELT $ 67)) + ((|concat| ($ $ $)) T (ELT $ 16)) + ((|concat| ($ (|Character|) $)) T (ELT $ NIL)) + ((|concat| ($ $ (|Character|))) T (ELT $ NIL)) + ((|new| ($ (|NonNegativeInteger|) (|Character|))) T + (ELT $ 9)) + ((|construct| ($ (|List| (|Character|)))) T (ELT $ NIL)) + ((|find| ((|Union| (|Character|) "failed") + (|Mapping| (|Boolean|) (|Character|)) $)) + T (ELT $ NIL)) + ((|reduce| + ((|Character|) + (|Mapping| (|Character|) (|Character|) + (|Character|)) + $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|reduce| + ((|Character|) + (|Mapping| (|Character|) (|Character|) + (|Character|)) + $ (|Character|))) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|remove| ($ (|Mapping| (|Boolean|) (|Character|)) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|select| ($ (|Mapping| (|Boolean|) (|Character|)) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|reduce| + ((|Character|) + (|Mapping| (|Character|) (|Character|) + (|Character|)) + $ (|Character|) (|Character|))) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| (|Character|) (|SetCategory|))) + (ELT $ NIL)) + ((|remove| ($ (|Character|) $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| (|Character|) (|SetCategory|))) + (ELT $ NIL)) + ((|removeDuplicates| ($ $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| (|Character|) (|SetCategory|))) + (ELT $ NIL)) + ((|convert| ((|InputForm|) $)) + (|has| (|Character|) (|ConvertibleTo| (|InputForm|))) + (ELT $ NIL)) + ((|swap!| ((|Void|) $ (|Integer|) (|Integer|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|fill!| ($ $ (|Character|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|first| ((|Character|) $)) + (|has| (|Integer|) (|OrderedSet|)) (ELT $ NIL)) + ((|minIndex| ((|Integer|) $)) + (|has| (|Integer|) (|OrderedSet|)) (ELT $ 28)) + ((|maxIndex| ((|Integer|) $)) + (|has| (|Integer|) (|OrderedSet|)) (ELT $ 42)) + ((|entry?| ((|Boolean|) (|Character|) $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| (|Character|) (|SetCategory|))) + (ELT $ NIL)) + ((|indices| ((|List| (|Integer|)) $)) T (ELT $ NIL)) + ((|index?| ((|Boolean|) (|Integer|) $)) T (ELT $ NIL)) + ((|entries| ((|List| (|Character|)) $)) T (ELT $ NIL)) + ((|elt| ((|Character|) $ (|Integer|))) T (ELT $ 52)) + ((|elt| ((|Character|) $ (|Integer|) (|Character|))) T + (ELT $ NIL)) + ((|qelt| ((|Character|) $ (|Integer|))) T (ELT $ NIL)) + ((|setelt| ((|Character|) $ (|Integer|) (|Character|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ 45)) + ((|qsetelt!| + ((|Character|) $ (|Integer|) (|Character|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|eval| ($ $ (|List| (|Character|)) + (|List| (|Character|)))) + (AND (|has| (|Character|) (|Evalable| (|Character|))) + (|has| (|Character|) (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ (|Character|) (|Character|))) + (AND (|has| (|Character|) (|Evalable| (|Character|))) + (|has| (|Character|) (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ (|Equation| (|Character|)))) + (AND (|has| (|Character|) (|Evalable| (|Character|))) + (|has| (|Character|) (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ (|List| (|Equation| (|Character|))))) + (AND (|has| (|Character|) (|Evalable| (|Character|))) + (|has| (|Character|) (|SetCategory|))) + (ELT $ NIL)) + ((|member?| ((|Boolean|) (|Character|) $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| (|Character|) (|SetCategory|))) + (ELT $ NIL)) + ((|count| ((|NonNegativeInteger|) (|Character|) $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| (|Character|) (|SetCategory|))) + (ELT $ NIL)) + ((|members| ((|List| (|Character|)) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|parts| ((|List| (|Character|)) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|count| ((|NonNegativeInteger|) + (|Mapping| (|Boolean|) (|Character|)) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|every?| + ((|Boolean|) (|Mapping| (|Boolean|) (|Character|)) + $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|any?| ((|Boolean|) + (|Mapping| (|Boolean|) (|Character|)) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|map!| ($ (|Mapping| (|Character|) (|Character|)) $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ 33)) + ((|map| ($ (|Mapping| (|Character|) (|Character|)) $)) T + (ELT $ NIL)) + ((|#| ((|NonNegativeInteger|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ 13)) + ((|sample| ($)) T (CONST $ NIL)) + ((|size?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|more?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|less?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|empty?| ((|Boolean|) $)) T (ELT $ 12)) + ((|empty| ($)) T (ELT $ 10)) + ((|copy| ($ $)) T (ELT $ 17)) + ((|eq?| ((|Boolean|) $ $)) T (ELT $ NIL))) + (|addModemap| '|IndexedString| '(|IndexedString| |#1|) + '((|Join| (|StringAggregate|) + (CATEGORY |domain| + (SIGNATURE |hash| ((|Integer|) $)))) + (|Integer|)) + T '|IndexedString| + (|put| '|IndexedString| '|mode| + '(|Mapping| + (|Join| (|StringAggregate|) + (CATEGORY |domain| + (SIGNATURE |hash| + ((|Integer|) $)))) + (|Integer|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp index 69ffd104..2cb74e75 100644 --- a/src/algebra/strap/LIST.lsp +++ b/src/algebra/strap/LIST.lsp @@ -18,15 +18,17 @@ (DEFUN |LIST;append;3$;4| (|l| |t| $) (APPEND |l| |t|)) (DEFUN |LIST;writeOMList| (|dev| |x| $) - (SEQ (SPADCALL |dev| (QREFELT $ 14)) - (SPADCALL |dev| "list1" "list" (QREFELT $ 16)) + (SEQ (SPADCALL |dev| (|getShellEntry| $ 14)) + (SPADCALL |dev| "list1" "list" (|getShellEntry| $ 16)) (SEQ G190 (COND - ((NULL (SPADCALL (NULL |x|) (QREFELT $ 17))) (GO G191))) - (SEQ (SPADCALL |dev| (|SPADfirst| |x|) 'NIL (QREFELT $ 18)) + ((NULL (SPADCALL (NULL |x|) (|getShellEntry| $ 17))) + (GO G191))) + (SEQ (SPADCALL |dev| (|SPADfirst| |x|) 'NIL + (|getShellEntry| $ 18)) (EXIT (LETT |x| (CDR |x|) |LIST;writeOMList|))) NIL (GO G190) G191 (EXIT NIL)) - (EXIT (SPADCALL |dev| (QREFELT $ 19))))) + (EXIT (SPADCALL |dev| (|getShellEntry| $ 19))))) (DEFUN |LIST;OMwrite;$S;6| (|x| $) (PROG (|sp| |dev| |s|) @@ -34,13 +36,13 @@ (SEQ (LETT |s| "" |LIST;OMwrite;$S;6|) (LETT |sp| (OM-STRINGTOSTRINGPTR |s|) |LIST;OMwrite;$S;6|) (LETT |dev| - (SPADCALL |sp| (SPADCALL (QREFELT $ 21)) - (QREFELT $ 22)) + (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 21)) + (|getShellEntry| $ 22)) |LIST;OMwrite;$S;6|) - (SPADCALL |dev| (QREFELT $ 23)) + (SPADCALL |dev| (|getShellEntry| $ 23)) (|LIST;writeOMList| |dev| |x| $) - (SPADCALL |dev| (QREFELT $ 24)) - (SPADCALL |dev| (QREFELT $ 25)) + (SPADCALL |dev| (|getShellEntry| $ 24)) + (SPADCALL |dev| (|getShellEntry| $ 25)) (LETT |s| (OM-STRINGPTRTOSTRING |sp|) |LIST;OMwrite;$S;6|) (EXIT |s|))))) @@ -50,41 +52,44 @@ (SEQ (LETT |s| "" |LIST;OMwrite;$BS;7|) (LETT |sp| (OM-STRINGTOSTRINGPTR |s|) |LIST;OMwrite;$BS;7|) (LETT |dev| - (SPADCALL |sp| (SPADCALL (QREFELT $ 21)) - (QREFELT $ 22)) + (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 21)) + (|getShellEntry| $ 22)) |LIST;OMwrite;$BS;7|) - (COND (|wholeObj| (SPADCALL |dev| (QREFELT $ 23)))) + (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23)))) (|LIST;writeOMList| |dev| |x| $) - (COND (|wholeObj| (SPADCALL |dev| (QREFELT $ 24)))) - (SPADCALL |dev| (QREFELT $ 25)) + (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 24)))) + (SPADCALL |dev| (|getShellEntry| $ 25)) (LETT |s| (OM-STRINGPTRTOSTRING |sp|) |LIST;OMwrite;$BS;7|) (EXIT |s|))))) (DEFUN |LIST;OMwrite;Omd$V;8| (|dev| |x| $) - (SEQ (SPADCALL |dev| (QREFELT $ 23)) (|LIST;writeOMList| |dev| |x| $) - (EXIT (SPADCALL |dev| (QREFELT $ 24))))) + (SEQ (SPADCALL |dev| (|getShellEntry| $ 23)) + (|LIST;writeOMList| |dev| |x| $) + (EXIT (SPADCALL |dev| (|getShellEntry| $ 24))))) (DEFUN |LIST;OMwrite;Omd$BV;9| (|dev| |x| |wholeObj| $) - (SEQ (COND (|wholeObj| (SPADCALL |dev| (QREFELT $ 23)))) + (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23)))) (|LIST;writeOMList| |dev| |x| $) - (EXIT (COND (|wholeObj| (SPADCALL |dev| (QREFELT $ 24))))))) + (EXIT (COND + (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 24))))))) (DEFUN |LIST;setUnion;3$;10| (|l1| |l2| $) - (SPADCALL (SPADCALL |l1| |l2| (QREFELT $ 30)) (QREFELT $ 31))) + (SPADCALL (SPADCALL |l1| |l2| (|getShellEntry| $ 30)) + (|getShellEntry| $ 31))) (DEFUN |LIST;setIntersection;3$;11| (|l1| |l2| $) (PROG (|u|) (RETURN (SEQ (LETT |u| NIL |LIST;setIntersection;3$;11|) - (LETT |l1| (SPADCALL |l1| (QREFELT $ 31)) + (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 31)) |LIST;setIntersection;3$;11|) (SEQ G190 (COND - ((NULL (SPADCALL (NULL |l1|) (QREFELT $ 17))) + ((NULL (SPADCALL (NULL |l1|) (|getShellEntry| $ 17))) (GO G191))) (SEQ (COND ((SPADCALL (|SPADfirst| |l1|) |l2| - (QREFELT $ 33)) + (|getShellEntry| $ 33)) (LETT |u| (CONS (|SPADfirst| |l1|) |u|) |LIST;setIntersection;3$;11|))) (EXIT (LETT |l1| (CDR |l1|) @@ -95,17 +100,19 @@ (DEFUN |LIST;setDifference;3$;12| (|l1| |l2| $) (PROG (|l11| |lu|) (RETURN - (SEQ (LETT |l1| (SPADCALL |l1| (QREFELT $ 31)) + (SEQ (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 31)) |LIST;setDifference;3$;12|) (LETT |lu| NIL |LIST;setDifference;3$;12|) (SEQ G190 (COND - ((NULL (SPADCALL (NULL |l1|) (QREFELT $ 17))) + ((NULL (SPADCALL (NULL |l1|) (|getShellEntry| $ 17))) (GO G191))) - (SEQ (LETT |l11| (SPADCALL |l1| 1 (QREFELT $ 36)) + (SEQ (LETT |l11| + (SPADCALL |l1| 1 (|getShellEntry| $ 36)) |LIST;setDifference;3$;12|) (COND - ((NULL (SPADCALL |l11| |l2| (QREFELT $ 33))) + ((NULL (SPADCALL |l11| |l2| + (|getShellEntry| $ 33))) (LETT |lu| (CONS |l11| |lu|) |LIST;setDifference;3$;12|))) (EXIT (LETT |l1| (CDR |l1|) @@ -114,11 +121,12 @@ (EXIT |lu|))))) (DEFUN |LIST;convert;$If;13| (|x| $) - (PROG (#0=#:G1440 |a| #1=#:G1441) + (PROG (#0=#:G1437 |a| #1=#:G1438) (RETURN (SEQ (SPADCALL - (CONS (SPADCALL (SPADCALL "construct" (QREFELT $ 39)) - (QREFELT $ 41)) + (CONS (SPADCALL + (SPADCALL "construct" (|getShellEntry| $ 39)) + (|getShellEntry| $ 41)) (PROGN (LETT #0# NIL |LIST;convert;$If;13|) (SEQ (LETT |a| NIL |LIST;convert;$If;13|) @@ -132,17 +140,18 @@ (GO G191))) (SEQ (EXIT (LETT #0# (CONS - (SPADCALL |a| (QREFELT $ 42)) + (SPADCALL |a| + (|getShellEntry| $ 42)) #0#) |LIST;convert;$If;13|))) (LETT #1# (CDR #1#) |LIST;convert;$If;13|) (GO G190) G191 (EXIT (NREVERSE0 #0#))))) - (QREFELT $ 44)))))) + (|getShellEntry| $ 44)))))) -(DEFUN |List| (#0=#:G1452) +(DEFUN |List| (#0=#:G1446) (PROG () (RETURN - (PROG (#1=#:G1453) + (PROG (#1=#:G1447) (RETURN (COND ((LETT #1# @@ -157,76 +166,77 @@ (COND ((NOT #1#) (HREM |$ConstructorCache| '|List|))))))))))) (DEFUN |List;| (|#1|) - (PROG (|dv$1| |dv$| $ #0=#:G1451 #1=#:G1449 |pv$|) + (PROG (|dv$1| |dv$| $ |pv$|) (RETURN (PROGN - (LETT |dv$1| (|devaluate| |#1|) . #2=(|List|)) - (LETT |dv$| (LIST '|List| |dv$1|) . #2#) - (LETT $ (GETREFV 63) . #2#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 + (LETT |dv$1| (|devaluate| |#1|) . #0=(|List|)) + (LETT |dv$| (LIST '|List| |dv$1|) . #0#) + (LETT $ (|newShell| 63) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 - (LIST (|HasCategory| |#1| - '(|ConvertibleTo| (|InputForm|))) - (|HasCategory| |#1| '(|OrderedSet|)) - (|HasCategory| |#1| '(|OpenMath|)) - (|HasCategory| (|Integer|) '(|OrderedSet|)) - (LETT #0# - (|HasCategory| |#1| '(|SetCategory|)) . #2#) - (OR (|HasCategory| |#1| '(|OrderedSet|)) - #0#) - (AND #0# - (|HasCategory| |#1| - (LIST '|Evalable| - (|devaluate| |#1|)))) - (OR (AND (|HasCategory| |#1| + (LIST (OR (AND (|HasCategory| |#1| '(|OrderedSet|)) (|HasCategory| |#1| (LIST '|Evalable| (|devaluate| |#1|)))) - (AND #0# + (AND (|HasCategory| |#1| + '(|SetCategory|)) (|HasCategory| |#1| (LIST '|Evalable| (|devaluate| |#1|))))) - (LETT #1# - (|HasCategory| |#1| - '(|CoercibleTo| (|OutputForm|))) . #2#) - (OR (AND #0# + (OR (AND (|HasCategory| |#1| + '(|SetCategory|)) (|HasCategory| |#1| (LIST '|Evalable| (|devaluate| |#1|)))) - #1#))) . #2#)) + (|HasCategory| |#1| + '(|CoercibleTo| (|OutputForm|)))) + (|HasCategory| |#1| + '(|ConvertibleTo| (|InputForm|))) + (OR (|HasCategory| |#1| '(|OrderedSet|)) + (|HasCategory| |#1| '(|SetCategory|))) + (|HasCategory| |#1| '(|OrderedSet|)) + (|HasCategory| |#1| '(|OpenMath|)) + (|HasCategory| (|Integer|) '(|OrderedSet|)) + (|HasCategory| |#1| '(|SetCategory|)) + (AND (|HasCategory| |#1| '(|SetCategory|)) + (|HasCategory| |#1| + (LIST '|Evalable| + (|devaluate| |#1|)))) + (|HasCategory| |#1| + '(|CoercibleTo| (|OutputForm|))))) . #0#)) (|haddProp| |$ConstructorCache| '|List| (LIST |dv$1|) (CONS 1 $)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) (COND - ((|testBitVector| |pv$| 3) + ((|testBitVector| |pv$| 6) (PROGN - (QSETREFV $ 26 + (|setShellEntry| $ 26 (CONS (|dispatchFunction| |LIST;OMwrite;$S;6|) $)) - (QSETREFV $ 27 + (|setShellEntry| $ 27 (CONS (|dispatchFunction| |LIST;OMwrite;$BS;7|) $)) - (QSETREFV $ 28 + (|setShellEntry| $ 28 (CONS (|dispatchFunction| |LIST;OMwrite;Omd$V;8|) $)) - (QSETREFV $ 29 + (|setShellEntry| $ 29 (CONS (|dispatchFunction| |LIST;OMwrite;Omd$BV;9|) $))))) (COND - ((|testBitVector| |pv$| 5) + ((|testBitVector| |pv$| 8) (PROGN - (QSETREFV $ 32 + (|setShellEntry| $ 32 (CONS (|dispatchFunction| |LIST;setUnion;3$;10|) $)) - (QSETREFV $ 34 + (|setShellEntry| $ 34 (CONS (|dispatchFunction| |LIST;setIntersection;3$;11|) $)) - (QSETREFV $ 37 + (|setShellEntry| $ 37 (CONS (|dispatchFunction| |LIST;setDifference;3$;12|) $))))) (COND - ((|testBitVector| |pv$| 1) - (QSETREFV $ 45 + ((|testBitVector| |pv$| 3) + (|setShellEntry| $ 45 (CONS (|dispatchFunction| |LIST;convert;$If;13|) $)))) $)))) @@ -247,7 +257,7 @@ (119 . |coerce|) (|InputForm|) (124 . |convert|) (129 . |convert|) (|List| $) (134 . |convert|) (139 . |convert|) (|Mapping| 6 6 6) (|NonNegativeInteger|) - (|List| 6) (|List| 50) (|Equation| 6) (|Mapping| 8 6) + (|List| 6) (|Equation| 6) (|List| 49) (|Mapping| 8 6) (|Mapping| 8 6 6) (|UniversalSegment| 35) '"last" '"rest" '"first" '"value" (|Mapping| 6 6) (|OutputForm|) (|SingleInteger|) (|List| 35) (|Union| 6 '"failed")) @@ -256,8 +266,8 @@ |elt| 182 |convert| 188 |cons| 193 |concat| 199 |append| 205 |OMwrite| 211) '((|shallowlyMutable| . 0) (|finiteAggregate| . 0)) - (CONS (|makeByteWordVec2| 10 - '(0 0 0 0 0 0 0 0 0 0 2 0 0 8 6 0 0 8 10 1 6 3)) + (CONS (|makeByteWordVec2| 6 + '(0 0 0 0 0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4 6)) (CONS '#(|ListAggregate&| |StreamAggregate&| |ExtensibleLinearAggregate&| |FiniteLinearAggregate&| @@ -293,10 +303,315 @@ 0 0 0 32 2 0 8 6 0 33 2 0 0 0 0 34 2 0 6 0 35 36 2 0 0 0 0 37 1 38 0 15 39 1 40 0 38 41 1 6 40 0 42 1 40 0 43 44 - 1 0 40 0 45 2 5 0 0 0 32 2 5 0 0 0 34 - 2 5 0 0 0 37 1 5 0 0 31 1 0 8 0 9 0 0 - 0 7 2 5 8 6 0 33 2 0 6 0 35 36 1 1 40 + 1 0 40 0 45 2 8 0 0 0 32 2 8 0 0 0 34 + 2 8 0 0 0 37 1 8 0 0 31 1 0 8 0 9 0 0 + 0 7 2 8 8 6 0 33 2 0 6 0 35 36 1 3 40 0 45 2 0 0 6 0 10 2 0 0 0 0 30 2 0 0 - 0 0 11 3 3 12 13 0 8 29 2 3 12 13 0 - 28 1 3 15 0 26 2 3 15 0 8 27))))) + 0 0 11 3 6 12 13 0 8 29 2 6 12 13 0 + 28 1 6 15 0 26 2 6 15 0 8 27))))) '|lookupIncomplete|)) + +(SETQ |$CategoryFrame| + (|put| '|List| '|isFunctor| + '(((~= ((|Boolean|) $ $)) (|has| |#1| (|SetCategory|)) + (ELT $ NIL)) + ((= ((|Boolean|) $ $)) (|has| |#1| (|SetCategory|)) + (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) + (|has| |#1| (|CoercibleTo| (|OutputForm|))) + (ELT $ NIL)) + ((|hash| ((|SingleInteger|) $)) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|latex| ((|String|) $)) (|has| |#1| (|SetCategory|)) + (ELT $ NIL)) + ((|OMwrite| ((|Void|) (|OpenMathDevice|) $ (|Boolean|))) + (|has| |#1| (|OpenMath|)) (ELT $ 29)) + ((|OMwrite| ((|Void|) (|OpenMathDevice|) $)) + (|has| |#1| (|OpenMath|)) (ELT $ 28)) + ((|OMwrite| ((|String|) $ (|Boolean|))) + (|has| |#1| (|OpenMath|)) (ELT $ 27)) + ((|OMwrite| ((|String|) $)) (|has| |#1| (|OpenMath|)) + (ELT $ 26)) + ((|setDifference| ($ $ $)) (|has| |#1| (|SetCategory|)) + (ELT $ 37)) + ((|setIntersection| ($ $ $)) + (|has| |#1| (|SetCategory|)) (ELT $ 34)) + ((|setUnion| ($ $ $)) (|has| |#1| (|SetCategory|)) + (ELT $ 32)) + ((|append| ($ $ $)) T (ELT $ 11)) + ((|cons| ($ |#1| $)) T (ELT $ 10)) + ((|null| ((|Boolean|) $)) T (ELT $ 9)) + ((|nil| ($)) T (ELT $ 7)) + ((|list| ($ |#1|)) T (ELT $ NIL)) + ((|concat!| ($ $ |#1|)) T (ELT $ NIL)) + ((|concat!| ($ $ $)) T (ELT $ NIL)) + ((|delete!| ($ $ (|Integer|))) T (ELT $ NIL)) + ((|delete!| ($ $ (|UniversalSegment| (|Integer|)))) T + (ELT $ NIL)) + ((|remove!| ($ (|Mapping| (|Boolean|) |#1|) $)) T + (ELT $ NIL)) + ((|insert!| ($ |#1| $ (|Integer|))) T (ELT $ NIL)) + ((|insert!| ($ $ $ (|Integer|))) T (ELT $ NIL)) + ((|merge!| ($ (|Mapping| (|Boolean|) |#1| |#1|) $ $)) T + (ELT $ NIL)) + ((|select!| ($ (|Mapping| (|Boolean|) |#1|) $)) T + (ELT $ NIL)) + ((|remove!| ($ |#1| $)) (|has| |#1| (|SetCategory|)) + (ELT $ NIL)) + ((|removeDuplicates!| ($ $)) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|merge!| ($ $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|merge| ($ (|Mapping| (|Boolean|) |#1| |#1|) $ $)) T + (ELT $ NIL)) + ((|reverse| ($ $)) T (ELT $ NIL)) + ((|sort| ($ (|Mapping| (|Boolean|) |#1| |#1|) $)) T + (ELT $ NIL)) + ((|sorted?| + ((|Boolean|) (|Mapping| (|Boolean|) |#1| |#1|) $)) + T (ELT $ NIL)) + ((|position| + ((|Integer|) (|Mapping| (|Boolean|) |#1|) $)) + T (ELT $ NIL)) + ((|position| ((|Integer|) |#1| $)) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|position| ((|Integer|) |#1| $ (|Integer|))) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|merge| ($ $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|sort| ($ $)) (|has| |#1| (|OrderedSet|)) (ELT $ NIL)) + ((|sorted?| ((|Boolean|) $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|copyInto!| ($ $ $ (|Integer|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|reverse!| ($ $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|sort!| ($ (|Mapping| (|Boolean|) |#1| |#1|) $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|sort!| ($ $)) + (AND (|has| $ (ATTRIBUTE |shallowlyMutable|)) + (|has| |#1| (|OrderedSet|))) + (ELT $ NIL)) + ((|min| ($ $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|max| ($ $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((<= ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((>= ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((> ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((< ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|possiblyInfinite?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|explicitlyFinite?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|qsetelt!| (|#1| $ (|Integer|) |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|setelt| (|#1| $ (|Integer|) |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|qelt| (|#1| $ (|Integer|))) T (ELT $ NIL)) + ((|elt| (|#1| $ (|Integer|) |#1|)) T (ELT $ NIL)) + ((|elt| (|#1| $ (|Integer|))) T (ELT $ 36)) + ((|entries| ((|List| |#1|) $)) T (ELT $ NIL)) + ((|index?| ((|Boolean|) (|Integer|) $)) T (ELT $ NIL)) + ((|indices| ((|List| (|Integer|)) $)) T (ELT $ NIL)) + ((|entry?| ((|Boolean|) |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|maxIndex| ((|Integer|) $)) + (|has| (|Integer|) (|OrderedSet|)) (ELT $ NIL)) + ((|minIndex| ((|Integer|) $)) + (|has| (|Integer|) (|OrderedSet|)) (ELT $ NIL)) + ((|fill!| ($ $ |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|swap!| ((|Void|) $ (|Integer|) (|Integer|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|convert| ((|InputForm|) $)) + (|has| |#1| (|ConvertibleTo| (|InputForm|))) + (ELT $ 45)) + ((|removeDuplicates| ($ $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ 31)) + ((|remove| ($ |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|reduce| + (|#1| (|Mapping| |#1| |#1| |#1|) $ |#1| |#1|)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|select| ($ (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|remove| ($ (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|reduce| (|#1| (|Mapping| |#1| |#1| |#1|) $ |#1|)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|reduce| (|#1| (|Mapping| |#1| |#1| |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|find| ((|Union| |#1| "failed") + (|Mapping| (|Boolean|) |#1|) $)) + T (ELT $ NIL)) + ((|construct| ($ (|List| |#1|))) T (ELT $ NIL)) + ((|new| ($ (|NonNegativeInteger|) |#1|)) T (ELT $ NIL)) + ((|concat| ($ $ |#1|)) T (ELT $ NIL)) + ((|concat| ($ (|List| $))) T (ELT $ NIL)) + ((|map| ($ (|Mapping| |#1| |#1| |#1|) $ $)) T + (ELT $ NIL)) + ((|elt| ($ $ (|UniversalSegment| (|Integer|)))) T + (ELT $ NIL)) + ((|delete| ($ $ (|Integer|))) T (ELT $ NIL)) + ((|delete| ($ $ (|UniversalSegment| (|Integer|)))) T + (ELT $ NIL)) + ((|insert| ($ |#1| $ (|Integer|))) T (ELT $ NIL)) + ((|insert| ($ $ $ (|Integer|))) T (ELT $ NIL)) + ((|setelt| + (|#1| $ (|UniversalSegment| (|Integer|)) |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|split!| ($ $ (|Integer|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|setelt| (|#1| $ "last" |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|setlast!| (|#1| $ |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|setelt| ($ $ "rest" $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|setrest!| ($ $ $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|setelt| (|#1| $ "first" |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|setfirst!| (|#1| $ |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|cycleSplit!| ($ $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|cycleTail| ($ $)) T (ELT $ NIL)) + ((|cycleLength| ((|NonNegativeInteger|) $)) T + (ELT $ NIL)) + ((|cycleEntry| ($ $)) T (ELT $ NIL)) + ((|third| (|#1| $)) T (ELT $ NIL)) + ((|second| (|#1| $)) T (ELT $ NIL)) + ((|tail| ($ $)) T (ELT $ NIL)) + ((|last| ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((|elt| (|#1| $ "last")) T (ELT $ NIL)) + ((|last| (|#1| $)) T (ELT $ NIL)) + ((|rest| ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((|elt| ($ $ "rest")) T (ELT $ NIL)) + ((|rest| ($ $)) T (ELT $ NIL)) + ((|first| ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((|elt| (|#1| $ "first")) T (ELT $ NIL)) + ((|first| (|#1| $)) T (ELT $ NIL)) + ((|concat| ($ |#1| $)) T (ELT $ NIL)) + ((|concat| ($ $ $)) T (ELT $ 30)) + ((|setvalue!| (|#1| $ |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|setelt| (|#1| $ "value" |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|setchildren!| ($ $ (|List| $))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|node?| ((|Boolean|) $ $)) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|child?| ((|Boolean|) $ $)) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|distance| ((|Integer|) $ $)) T (ELT $ NIL)) + ((|leaves| ((|List| |#1|) $)) T (ELT $ NIL)) + ((|cyclic?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|elt| (|#1| $ "value")) T (ELT $ NIL)) + ((|value| (|#1| $)) T (ELT $ NIL)) + ((|leaf?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|nodes| ((|List| $) $)) T (ELT $ NIL)) + ((|children| ((|List| $) $)) T (ELT $ NIL)) + ((|eval| ($ $ (|List| |#1|) (|List| |#1|))) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ |#1| |#1|)) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ (|Equation| |#1|))) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ (|List| (|Equation| |#1|)))) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|member?| ((|Boolean|) |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ 33)) + ((|count| ((|NonNegativeInteger|) |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|members| ((|List| |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|parts| ((|List| |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|count| ((|NonNegativeInteger|) + (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|every?| ((|Boolean|) (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|any?| ((|Boolean|) (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|map!| ($ (|Mapping| |#1| |#1|) $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|map| ($ (|Mapping| |#1| |#1|) $)) T (ELT $ NIL)) + ((|#| ((|NonNegativeInteger|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|sample| ($)) T (CONST $ NIL)) + ((|size?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|more?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|less?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|empty?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|empty| ($)) T (ELT $ NIL)) + ((|copy| ($ $)) T (ELT $ NIL)) + ((|eq?| ((|Boolean|) $ $)) T (ELT $ NIL))) + (|addModemap| '|List| '(|List| |#1|) + '((|Join| (|ListAggregate| |#1|) + (CATEGORY |domain| (SIGNATURE |nil| ($)) + (SIGNATURE |null| ((|Boolean|) $)) + (SIGNATURE |cons| ($ |#1| $)) + (SIGNATURE |append| ($ $ $)) + (IF (|has| |#1| (|SetCategory|)) + (PROGN + (SIGNATURE |setUnion| ($ $ $)) + (SIGNATURE |setIntersection| + ($ $ $)) + (SIGNATURE |setDifference| + ($ $ $))) + |%noBranch|) + (IF (|has| |#1| (|OpenMath|)) + (ATTRIBUTE (|OpenMath|)) + |%noBranch|))) + (|Type|)) + T '|List| + (|put| '|List| '|mode| + '(|Mapping| + (|Join| (|ListAggregate| |#1|) + (CATEGORY |domain| + (SIGNATURE |nil| ($)) + (SIGNATURE |null| + ((|Boolean|) $)) + (SIGNATURE |cons| ($ |#1| $)) + (SIGNATURE |append| ($ $ $)) + (IF (|has| |#1| (|SetCategory|)) + (PROGN + (SIGNATURE |setUnion| ($ $ $)) + (SIGNATURE |setIntersection| + ($ $ $)) + (SIGNATURE |setDifference| + ($ $ $))) + |%noBranch|) + (IF (|has| |#1| (|OpenMath|)) + (ATTRIBUTE (|OpenMath|)) + |%noBranch|))) + (|Type|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/LNAGG-.lsp b/src/algebra/strap/LNAGG-.lsp index 5ba1d59c..865a3523 100644 --- a/src/algebra/strap/LNAGG-.lsp +++ b/src/algebra/strap/LNAGG-.lsp @@ -2,13 +2,13 @@ (/VERSIONCHECK 2) (DEFUN |LNAGG-;indices;AL;1| (|a| $) - (PROG (#0=#:G1404 |i| #1=#:G1405) + (PROG (#0=#:G1401 |i| #1=#:G1402) (RETURN (SEQ (PROGN (LETT #0# NIL |LNAGG-;indices;AL;1|) - (SEQ (LETT |i| (SPADCALL |a| (QREFELT $ 9)) + (SEQ (LETT |i| (SPADCALL |a| (|getShellEntry| $ 9)) |LNAGG-;indices;AL;1|) - (LETT #1# (SPADCALL |a| (QREFELT $ 10)) + (LETT #1# (SPADCALL |a| (|getShellEntry| $ 10)) |LNAGG-;indices;AL;1|) G190 (COND ((> |i| #1#) (GO G191))) (SEQ (EXIT (LETT #0# (CONS |i| #0#) @@ -18,21 +18,26 @@ (DEFUN |LNAGG-;index?;IAB;2| (|i| |a| $) (COND - ((< |i| (SPADCALL |a| (QREFELT $ 9))) 'NIL) + ((< |i| (SPADCALL |a| (|getShellEntry| $ 9))) 'NIL) ('T - (SPADCALL (< (SPADCALL |a| (QREFELT $ 10)) |i|) (QREFELT $ 14))))) + (SPADCALL (< (SPADCALL |a| (|getShellEntry| $ 10)) |i|) + (|getShellEntry| $ 14))))) (DEFUN |LNAGG-;concat;ASA;3| (|a| |x| $) - (SPADCALL |a| (SPADCALL 1 |x| (QREFELT $ 17)) (QREFELT $ 18))) + (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 17)) + (|getShellEntry| $ 18))) (DEFUN |LNAGG-;concat;S2A;4| (|x| |y| $) - (SPADCALL (SPADCALL 1 |x| (QREFELT $ 17)) |y| (QREFELT $ 18))) + (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 17)) |y| + (|getShellEntry| $ 18))) (DEFUN |LNAGG-;insert;SAIA;5| (|x| |a| |i| $) - (SPADCALL (SPADCALL 1 |x| (QREFELT $ 17)) |a| |i| (QREFELT $ 21))) + (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 17)) |a| |i| + (|getShellEntry| $ 21))) (DEFUN |LNAGG-;maxIndex;AI;6| (|l| $) - (+ (- (SPADCALL |l| (QREFELT $ 23)) 1) (SPADCALL |l| (QREFELT $ 9)))) + (+ (- (SPADCALL |l| (|getShellEntry| $ 23)) 1) + (SPADCALL |l| (|getShellEntry| $ 9)))) (DEFUN |LinearAggregate&| (|#1| |#2|) (PROG (|dv$1| |dv$2| |dv$| $ |pv$|) @@ -41,18 +46,18 @@ (LETT |dv$1| (|devaluate| |#1|) . #0=(|LinearAggregate&|)) (LETT |dv$2| (|devaluate| |#2|) . #0#) (LETT |dv$| (LIST '|LinearAggregate&| |dv$1| |dv$2|) . #0#) - (LETT $ (GETREFV 26) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 + (LETT $ (|newShell| 26) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 (LIST (|HasAttribute| |#1| '|shallowlyMutable|))) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) - (QSETREFV $ 7 |#2|) + (|setShellEntry| $ 6 |#1|) + (|setShellEntry| $ 7 |#2|) (COND ((|HasAttribute| |#1| '|finiteAggregate|) - (QSETREFV $ 24 + (|setShellEntry| $ 24 (CONS (|dispatchFunction| |LNAGG-;maxIndex;AI;6|) $)))) $)))) @@ -78,3 +83,53 @@ 0 7 0 8 22 1 0 11 0 12 2 0 13 8 0 15 2 0 0 0 7 19 2 0 0 7 0 20))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|LinearAggregate&| '|isFunctor| + '(((|insert| ($ $ $ (|Integer|))) T (ELT $ NIL)) + ((|insert| ($ |#2| $ (|Integer|))) T (ELT $ 22)) + ((|concat| ($ (|List| $))) T (ELT $ NIL)) + ((|concat| ($ $ $)) T (ELT $ NIL)) + ((|concat| ($ |#2| $)) T (ELT $ 20)) + ((|concat| ($ $ |#2|)) T (ELT $ 19)) + ((|maxIndex| ((|Integer|) $)) T (ELT $ 24)) + ((|indices| ((|List| (|Integer|)) $)) T (ELT $ 12)) + ((|index?| ((|Boolean|) (|Integer|) $)) T (ELT $ 15))) + (|addModemap| '|LinearAggregate&| + '(|LinearAggregate&| |#1| |#2|) + '((CATEGORY |domain| + (SIGNATURE |insert| + (|#1| |#1| |#1| (|Integer|))) + (SIGNATURE |insert| + (|#1| |#2| |#1| (|Integer|))) + (SIGNATURE |concat| (|#1| (|List| |#1|))) + (SIGNATURE |concat| (|#1| |#1| |#1|)) + (SIGNATURE |concat| (|#1| |#2| |#1|)) + (SIGNATURE |concat| (|#1| |#1| |#2|)) + (SIGNATURE |maxIndex| ((|Integer|) |#1|)) + (SIGNATURE |indices| + ((|List| (|Integer|)) |#1|)) + (SIGNATURE |index?| + ((|Boolean|) (|Integer|) |#1|))) + (|LinearAggregate| |#2|) (|Type|)) + T '|LinearAggregate&| + (|put| '|LinearAggregate&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |insert| + (|#1| |#1| |#1| (|Integer|))) + (SIGNATURE |insert| + (|#1| |#2| |#1| (|Integer|))) + (SIGNATURE |concat| + (|#1| (|List| |#1|))) + (SIGNATURE |concat| (|#1| |#1| |#1|)) + (SIGNATURE |concat| (|#1| |#2| |#1|)) + (SIGNATURE |concat| (|#1| |#1| |#2|)) + (SIGNATURE |maxIndex| + ((|Integer|) |#1|)) + (SIGNATURE |indices| + ((|List| (|Integer|)) |#1|)) + (SIGNATURE |index?| + ((|Boolean|) (|Integer|) |#1|))) + (|LinearAggregate| |#2|) (|Type|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/LNAGG.lsp b/src/algebra/strap/LNAGG.lsp index a97133de..7eab4ad6 100644 --- a/src/algebra/strap/LNAGG.lsp +++ b/src/algebra/strap/LNAGG.lsp @@ -5,8 +5,8 @@ (DEFPARAMETER |LinearAggregate;AL| 'NIL) -(DEFUN |LinearAggregate| (#0=#:G1400) - (LET (#1=#:G1401) +(DEFUN |LinearAggregate| (#0=#:G1397) + (LET (#1=#:G1398) (COND ((SETQ #1# (|assoc| (|devaluate| #0#) |LinearAggregate;AL|)) (CDR #1#)) @@ -17,13 +17,13 @@ #1#)))) (DEFUN |LinearAggregate;| (|t#1|) - (PROG (#0=#:G1399) + (PROG (#0=#:G1396) (RETURN (PROG1 (LETT #0# (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (|sublisV| - (PAIR '(#1=#:G1398) (LIST '(|Integer|))) + (PAIR '(#1=#:G1395) (LIST '(|Integer|))) (COND (|LinearAggregate;CAT|) ('T @@ -79,3 +79,9 @@ NIL)) . #2=(|LinearAggregate|)))))) . #2#) (SETELT #0# 0 (LIST '|LinearAggregate| (|devaluate| |t#1|))))))) + +(SETQ |$CategoryFrame| + (|put| '|LinearAggregate| '|isCategory| T + (|addModemap| '|LinearAggregate| '(|LinearAggregate| |#1|) + '((|Category|) (|Type|)) T '|LinearAggregate| + |$CategoryFrame|))) diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp index 5a27a55c..98528759 100644 --- a/src/algebra/strap/LSAGG-.lsp +++ b/src/algebra/strap/LSAGG-.lsp @@ -2,22 +2,23 @@ (/VERSIONCHECK 2) (DEFUN |LSAGG-;sort!;M2A;1| (|f| |l| $) - (|LSAGG-;mergeSort| |f| |l| (SPADCALL |l| (QREFELT $ 9)) $)) + (|LSAGG-;mergeSort| |f| |l| (SPADCALL |l| (|getShellEntry| $ 9)) $)) (DEFUN |LSAGG-;list;SA;2| (|x| $) - (SPADCALL |x| (SPADCALL (QREFELT $ 12)) (QREFELT $ 13))) + (SPADCALL |x| (SPADCALL (|getShellEntry| $ 13)) + (|getShellEntry| $ 14))) (DEFUN |LSAGG-;reduce;MAS;3| (|f| |x| $) (COND - ((SPADCALL |x| (QREFELT $ 16)) + ((SPADCALL |x| (|getShellEntry| $ 16)) (|error| "reducing over an empty list needs the 3 argument form")) ('T - (SPADCALL |f| (SPADCALL |x| (QREFELT $ 17)) - (SPADCALL |x| (QREFELT $ 18)) (QREFELT $ 20))))) + (SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 17)) + (SPADCALL |x| (|getShellEntry| $ 18)) (|getShellEntry| $ 20))))) (DEFUN |LSAGG-;merge;M3A;4| (|f| |p| |q| $) - (SPADCALL |f| (SPADCALL |p| (QREFELT $ 22)) - (SPADCALL |q| (QREFELT $ 22)) (QREFELT $ 23))) + (SPADCALL |f| (SPADCALL |p| (|getShellEntry| $ 22)) + (SPADCALL |q| (|getShellEntry| $ 22)) (|getShellEntry| $ 23))) (DEFUN |LSAGG-;select!;M2A;5| (|f| |x| $) (PROG (|y| |z|) @@ -25,48 +26,56 @@ (SEQ (SEQ G190 (COND ((NULL (COND - ((SPADCALL |x| (QREFELT $ 16)) 'NIL) + ((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL) ('T (SPADCALL - (SPADCALL (SPADCALL |x| (QREFELT $ 18)) + (SPADCALL + (SPADCALL |x| + (|getShellEntry| $ 18)) |f|) - (QREFELT $ 25))))) + (|getShellEntry| $ 25))))) (GO G191))) - (SEQ (EXIT (LETT |x| (SPADCALL |x| (QREFELT $ 17)) + (SEQ (EXIT (LETT |x| + (SPADCALL |x| (|getShellEntry| $ 17)) |LSAGG-;select!;M2A;5|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT (COND - ((SPADCALL |x| (QREFELT $ 16)) |x|) + ((SPADCALL |x| (|getShellEntry| $ 16)) |x|) ('T (SEQ (LETT |y| |x| |LSAGG-;select!;M2A;5|) - (LETT |z| (SPADCALL |y| (QREFELT $ 17)) + (LETT |z| + (SPADCALL |y| (|getShellEntry| $ 17)) |LSAGG-;select!;M2A;5|) (SEQ G190 (COND ((NULL (SPADCALL - (SPADCALL |z| (QREFELT $ 16)) - (QREFELT $ 25))) + (SPADCALL |z| + (|getShellEntry| $ 16)) + (|getShellEntry| $ 25))) (GO G191))) (SEQ (EXIT (COND ((SPADCALL - (SPADCALL |z| (QREFELT $ 18)) + (SPADCALL |z| + (|getShellEntry| $ 18)) |f|) (SEQ (LETT |y| |z| |LSAGG-;select!;M2A;5|) (EXIT (LETT |z| - (SPADCALL |z| (QREFELT $ 17)) + (SPADCALL |z| + (|getShellEntry| $ 17)) |LSAGG-;select!;M2A;5|)))) ('T (SEQ (LETT |z| - (SPADCALL |z| (QREFELT $ 17)) + (SPADCALL |z| + (|getShellEntry| $ 17)) |LSAGG-;select!;M2A;5|) (EXIT (SPADCALL |y| |z| - (QREFELT $ 26)))))))) + (|getShellEntry| $ 26)))))))) NIL (GO G190) G191 (EXIT NIL)) (EXIT |x|))))))))) @@ -74,76 +83,86 @@ (PROG (|r| |t|) (RETURN (SEQ (COND - ((SPADCALL |p| (QREFELT $ 16)) |q|) - ((SPADCALL |q| (QREFELT $ 16)) |p|) - ((SPADCALL |p| |q| (QREFELT $ 29)) + ((SPADCALL |p| (|getShellEntry| $ 16)) |q|) + ((SPADCALL |q| (|getShellEntry| $ 16)) |p|) + ((SPADCALL |p| |q| (|getShellEntry| $ 29)) (|error| "cannot merge a list into itself")) ('T (SEQ (COND - ((SPADCALL (SPADCALL |p| (QREFELT $ 18)) - (SPADCALL |q| (QREFELT $ 18)) |f|) + ((SPADCALL (SPADCALL |p| (|getShellEntry| $ 18)) + (SPADCALL |q| (|getShellEntry| $ 18)) |f|) (SEQ (LETT |r| (LETT |t| |p| |LSAGG-;merge!;M3A;6|) |LSAGG-;merge!;M3A;6|) (EXIT (LETT |p| - (SPADCALL |p| (QREFELT $ 17)) + (SPADCALL |p| + (|getShellEntry| $ 17)) |LSAGG-;merge!;M3A;6|)))) ('T (SEQ (LETT |r| (LETT |t| |q| |LSAGG-;merge!;M3A;6|) |LSAGG-;merge!;M3A;6|) (EXIT (LETT |q| - (SPADCALL |q| (QREFELT $ 17)) + (SPADCALL |q| + (|getShellEntry| $ 17)) |LSAGG-;merge!;M3A;6|))))) (SEQ G190 (COND ((NULL (COND - ((SPADCALL |p| (QREFELT $ 16)) 'NIL) + ((SPADCALL |p| + (|getShellEntry| $ 16)) + 'NIL) ('T (SPADCALL - (SPADCALL |q| (QREFELT $ 16)) - (QREFELT $ 25))))) + (SPADCALL |q| + (|getShellEntry| $ 16)) + (|getShellEntry| $ 25))))) (GO G191))) (SEQ (EXIT (COND ((SPADCALL - (SPADCALL |p| (QREFELT $ 18)) - (SPADCALL |q| (QREFELT $ 18)) + (SPADCALL |p| + (|getShellEntry| $ 18)) + (SPADCALL |q| + (|getShellEntry| $ 18)) |f|) (SEQ (SPADCALL |t| |p| - (QREFELT $ 26)) + (|getShellEntry| $ 26)) (LETT |t| |p| |LSAGG-;merge!;M3A;6|) (EXIT (LETT |p| - (SPADCALL |p| (QREFELT $ 17)) + (SPADCALL |p| + (|getShellEntry| $ 17)) |LSAGG-;merge!;M3A;6|)))) ('T (SEQ (SPADCALL |t| |q| - (QREFELT $ 26)) + (|getShellEntry| $ 26)) (LETT |t| |q| |LSAGG-;merge!;M3A;6|) (EXIT (LETT |q| - (SPADCALL |q| (QREFELT $ 17)) + (SPADCALL |q| + (|getShellEntry| $ 17)) |LSAGG-;merge!;M3A;6|))))))) NIL (GO G190) G191 (EXIT NIL)) (SPADCALL |t| (COND - ((SPADCALL |p| (QREFELT $ 16)) |q|) + ((SPADCALL |p| (|getShellEntry| $ 16)) |q|) ('T |p|)) - (QREFELT $ 26)) + (|getShellEntry| $ 26)) (EXIT |r|)))))))) (DEFUN |LSAGG-;insert!;SAIA;7| (|s| |x| |i| $) - (PROG (|m| #0=#:G1464 |y| |z|) + (PROG (|m| #0=#:G1461 |y| |z|) (RETURN - (SEQ (LETT |m| (SPADCALL |x| (QREFELT $ 32)) + (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32)) |LSAGG-;insert!;SAIA;7|) (EXIT (COND ((< |i| |m|) (|error| "index out of range")) - ((EQL |i| |m|) (SPADCALL |s| |x| (QREFELT $ 13))) + ((EQL |i| |m|) + (SPADCALL |s| |x| (|getShellEntry| $ 14))) ('T (SEQ (LETT |y| (SPADCALL |x| @@ -152,23 +171,25 @@ |LSAGG-;insert!;SAIA;7|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (QREFELT $ 33)) + (|getShellEntry| $ 33)) |LSAGG-;insert!;SAIA;7|) - (LETT |z| (SPADCALL |y| (QREFELT $ 17)) + (LETT |z| + (SPADCALL |y| (|getShellEntry| $ 17)) |LSAGG-;insert!;SAIA;7|) (SPADCALL |y| - (SPADCALL |s| |z| (QREFELT $ 13)) - (QREFELT $ 26)) + (SPADCALL |s| |z| (|getShellEntry| $ 14)) + (|getShellEntry| $ 26)) (EXIT |x|))))))))) (DEFUN |LSAGG-;insert!;2AIA;8| (|w| |x| |i| $) - (PROG (|m| #0=#:G1468 |y| |z|) + (PROG (|m| #0=#:G1465 |y| |z|) (RETURN - (SEQ (LETT |m| (SPADCALL |x| (QREFELT $ 32)) + (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32)) |LSAGG-;insert!;2AIA;8|) (EXIT (COND ((< |i| |m|) (|error| "index out of range")) - ((EQL |i| |m|) (SPADCALL |w| |x| (QREFELT $ 35))) + ((EQL |i| |m|) + (SPADCALL |w| |x| (|getShellEntry| $ 35))) ('T (SEQ (LETT |y| (SPADCALL |x| @@ -177,12 +198,14 @@ |LSAGG-;insert!;2AIA;8|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (QREFELT $ 33)) + (|getShellEntry| $ 33)) |LSAGG-;insert!;2AIA;8|) - (LETT |z| (SPADCALL |y| (QREFELT $ 17)) + (LETT |z| + (SPADCALL |y| (|getShellEntry| $ 17)) |LSAGG-;insert!;2AIA;8|) - (SPADCALL |y| |w| (QREFELT $ 26)) - (SPADCALL |y| |z| (QREFELT $ 35)) (EXIT |x|))))))))) + (SPADCALL |y| |w| (|getShellEntry| $ 26)) + (SPADCALL |y| |z| (|getShellEntry| $ 35)) + (EXIT |x|))))))))) (DEFUN |LSAGG-;remove!;M2A;9| (|f| |x| $) (PROG (|p| |q|) @@ -190,35 +213,41 @@ (SEQ (SEQ G190 (COND ((NULL (COND - ((SPADCALL |x| (QREFELT $ 16)) 'NIL) + ((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL) ('T - (SPADCALL (SPADCALL |x| (QREFELT $ 18)) + (SPADCALL + (SPADCALL |x| (|getShellEntry| $ 18)) |f|)))) (GO G191))) - (SEQ (EXIT (LETT |x| (SPADCALL |x| (QREFELT $ 17)) + (SEQ (EXIT (LETT |x| + (SPADCALL |x| (|getShellEntry| $ 17)) |LSAGG-;remove!;M2A;9|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT (COND - ((SPADCALL |x| (QREFELT $ 16)) |x|) + ((SPADCALL |x| (|getShellEntry| $ 16)) |x|) ('T (SEQ (LETT |p| |x| |LSAGG-;remove!;M2A;9|) - (LETT |q| (SPADCALL |x| (QREFELT $ 17)) + (LETT |q| + (SPADCALL |x| (|getShellEntry| $ 17)) |LSAGG-;remove!;M2A;9|) (SEQ G190 (COND ((NULL (SPADCALL - (SPADCALL |q| (QREFELT $ 16)) - (QREFELT $ 25))) + (SPADCALL |q| + (|getShellEntry| $ 16)) + (|getShellEntry| $ 25))) (GO G191))) (SEQ (EXIT (COND ((SPADCALL - (SPADCALL |q| (QREFELT $ 18)) + (SPADCALL |q| + (|getShellEntry| $ 18)) |f|) (LETT |q| (SPADCALL |p| - (SPADCALL |q| (QREFELT $ 17)) - (QREFELT $ 26)) + (SPADCALL |q| + (|getShellEntry| $ 17)) + (|getShellEntry| $ 26)) |LSAGG-;remove!;M2A;9|)) ('T (SEQ @@ -226,19 +255,21 @@ |LSAGG-;remove!;M2A;9|) (EXIT (LETT |q| - (SPADCALL |q| (QREFELT $ 17)) + (SPADCALL |q| + (|getShellEntry| $ 17)) |LSAGG-;remove!;M2A;9|))))))) NIL (GO G190) G191 (EXIT NIL)) (EXIT |x|))))))))) (DEFUN |LSAGG-;delete!;AIA;10| (|x| |i| $) - (PROG (|m| #0=#:G1480 |y|) + (PROG (|m| #0=#:G1477 |y|) (RETURN - (SEQ (LETT |m| (SPADCALL |x| (QREFELT $ 32)) + (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32)) |LSAGG-;delete!;AIA;10|) (EXIT (COND ((< |i| |m|) (|error| "index out of range")) - ((EQL |i| |m|) (SPADCALL |x| (QREFELT $ 17))) + ((EQL |i| |m|) + (SPADCALL |x| (|getShellEntry| $ 17))) ('T (SEQ (LETT |y| (SPADCALL |x| @@ -247,27 +278,29 @@ |LSAGG-;delete!;AIA;10|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (QREFELT $ 33)) + (|getShellEntry| $ 33)) |LSAGG-;delete!;AIA;10|) - (SPADCALL |y| (SPADCALL |y| 2 (QREFELT $ 33)) - (QREFELT $ 26)) + (SPADCALL |y| + (SPADCALL |y| 2 (|getShellEntry| $ 33)) + (|getShellEntry| $ 26)) (EXIT |x|))))))))) (DEFUN |LSAGG-;delete!;AUsA;11| (|x| |i| $) - (PROG (|l| |m| |h| #0=#:G1485 #1=#:G1486 |t| #2=#:G1487) + (PROG (|l| |m| |h| #0=#:G1482 #1=#:G1483 |t| #2=#:G1484) (RETURN - (SEQ (LETT |l| (SPADCALL |i| (QREFELT $ 40)) + (SEQ (LETT |l| (SPADCALL |i| (|getShellEntry| $ 40)) |LSAGG-;delete!;AUsA;11|) - (LETT |m| (SPADCALL |x| (QREFELT $ 32)) + (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32)) |LSAGG-;delete!;AUsA;11|) (EXIT (COND ((< |l| |m|) (|error| "index out of range")) ('T (SEQ (LETT |h| (COND - ((SPADCALL |i| (QREFELT $ 41)) - (SPADCALL |i| (QREFELT $ 42))) - ('T (SPADCALL |x| (QREFELT $ 43)))) + ((SPADCALL |i| (|getShellEntry| $ 41)) + (SPADCALL |i| (|getShellEntry| $ 42))) + ('T + (SPADCALL |x| (|getShellEntry| $ 43)))) |LSAGG-;delete!;AUsA;11|) (EXIT (COND ((< |h| |l|) |x|) @@ -278,7 +311,7 @@ |LSAGG-;delete!;AUsA;11|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (QREFELT $ 33))) + (|getShellEntry| $ 33))) ('T (SEQ (LETT |t| (SPADCALL |x| @@ -288,7 +321,7 @@ (|check-subtype| (>= #1# 0) '(|NonNegativeInteger|) #1#)) - (QREFELT $ 33)) + (|getShellEntry| $ 33)) |LSAGG-;delete!;AUsA;11|) (SPADCALL |t| (SPADCALL |t| @@ -298,63 +331,68 @@ (|check-subtype| (>= #2# 0) '(|NonNegativeInteger|) #2#)) - (QREFELT $ 33)) - (QREFELT $ 26)) + (|getShellEntry| $ 33)) + (|getShellEntry| $ 26)) (EXIT |x|))))))))))))) (DEFUN |LSAGG-;find;MAU;12| (|f| |x| $) (SEQ (SEQ G190 (COND ((NULL (COND - ((SPADCALL |x| (QREFELT $ 16)) 'NIL) + ((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL) ('T (SPADCALL - (SPADCALL (SPADCALL |x| (QREFELT $ 18)) + (SPADCALL + (SPADCALL |x| (|getShellEntry| $ 18)) |f|) - (QREFELT $ 25))))) + (|getShellEntry| $ 25))))) (GO G191))) - (SEQ (EXIT (LETT |x| (SPADCALL |x| (QREFELT $ 17)) + (SEQ (EXIT (LETT |x| (SPADCALL |x| (|getShellEntry| $ 17)) |LSAGG-;find;MAU;12|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT (COND - ((SPADCALL |x| (QREFELT $ 16)) (CONS 1 "failed")) - ('T (CONS 0 (SPADCALL |x| (QREFELT $ 18)))))))) + ((SPADCALL |x| (|getShellEntry| $ 16)) + (CONS 1 "failed")) + ('T (CONS 0 (SPADCALL |x| (|getShellEntry| $ 18)))))))) (DEFUN |LSAGG-;position;MAI;13| (|f| |x| $) (PROG (|k|) (RETURN - (SEQ (SEQ (LETT |k| (SPADCALL |x| (QREFELT $ 32)) + (SEQ (SEQ (LETT |k| (SPADCALL |x| (|getShellEntry| $ 32)) |LSAGG-;position;MAI;13|) G190 (COND ((NULL (COND - ((SPADCALL |x| (QREFELT $ 16)) 'NIL) + ((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL) ('T (SPADCALL - (SPADCALL (SPADCALL |x| (QREFELT $ 18)) + (SPADCALL + (SPADCALL |x| + (|getShellEntry| $ 18)) |f|) - (QREFELT $ 25))))) + (|getShellEntry| $ 25))))) (GO G191))) - (SEQ (EXIT (LETT |x| (SPADCALL |x| (QREFELT $ 17)) + (SEQ (EXIT (LETT |x| + (SPADCALL |x| (|getShellEntry| $ 17)) |LSAGG-;position;MAI;13|))) (LETT |k| (+ |k| 1) |LSAGG-;position;MAI;13|) (GO G190) G191 (EXIT NIL)) (EXIT (COND - ((SPADCALL |x| (QREFELT $ 16)) - (- (SPADCALL |x| (QREFELT $ 32)) 1)) + ((SPADCALL |x| (|getShellEntry| $ 16)) + (- (SPADCALL |x| (|getShellEntry| $ 32)) 1)) ('T |k|))))))) (DEFUN |LSAGG-;mergeSort| (|f| |p| |n| $) - (PROG (#0=#:G1507 |l| |q|) + (PROG (#0=#:G1504 |l| |q|) (RETURN (SEQ (COND ((EQL |n| 2) (COND ((SPADCALL - (SPADCALL (SPADCALL |p| (QREFELT $ 17)) - (QREFELT $ 18)) - (SPADCALL |p| (QREFELT $ 18)) |f|) - (LETT |p| (SPADCALL |p| (QREFELT $ 48)) + (SPADCALL (SPADCALL |p| (|getShellEntry| $ 17)) + (|getShellEntry| $ 18)) + (SPADCALL |p| (|getShellEntry| $ 18)) |f|) + (LETT |p| (SPADCALL |p| (|getShellEntry| $ 48)) |LSAGG-;mergeSort|))))) (EXIT (COND ((< |n| 3) |p|) @@ -365,7 +403,9 @@ (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) |LSAGG-;mergeSort|) - (LETT |q| (SPADCALL |p| |l| (QREFELT $ 49)) + (LETT |q| + (SPADCALL |p| |l| + (|getShellEntry| $ 49)) |LSAGG-;mergeSort|) (LETT |p| (|LSAGG-;mergeSort| |f| |p| |l| $) |LSAGG-;mergeSort|) @@ -373,28 +413,33 @@ (|LSAGG-;mergeSort| |f| |q| (- |n| |l|) $) |LSAGG-;mergeSort|) - (EXIT (SPADCALL |f| |p| |q| (QREFELT $ 23))))))))))) + (EXIT (SPADCALL |f| |p| |q| + (|getShellEntry| $ 23))))))))))) (DEFUN |LSAGG-;sorted?;MAB;15| (|f| |l| $) - (PROG (#0=#:G1516 |p|) + (PROG (#0=#:G1513 |p|) (RETURN (SEQ (EXIT (COND - ((SPADCALL |l| (QREFELT $ 16)) 'T) + ((SPADCALL |l| (|getShellEntry| $ 16)) 'T) ('T - (SEQ (LETT |p| (SPADCALL |l| (QREFELT $ 17)) + (SEQ (LETT |p| + (SPADCALL |l| (|getShellEntry| $ 17)) |LSAGG-;sorted?;MAB;15|) (SEQ G190 (COND ((NULL (SPADCALL - (SPADCALL |p| (QREFELT $ 16)) - (QREFELT $ 25))) + (SPADCALL |p| + (|getShellEntry| $ 16)) + (|getShellEntry| $ 25))) (GO G191))) (SEQ (EXIT (COND ((NULL (SPADCALL - (SPADCALL |l| (QREFELT $ 18)) - (SPADCALL |p| (QREFELT $ 18)) + (SPADCALL |l| + (|getShellEntry| $ 18)) + (SPADCALL |p| + (|getShellEntry| $ 18)) |f|)) (PROGN (LETT #0# 'NIL @@ -405,7 +450,7 @@ (SPADCALL (LETT |l| |p| |LSAGG-;sorted?;MAB;15|) - (QREFELT $ 17)) + (|getShellEntry| $ 17)) |LSAGG-;sorted?;MAB;15|))))) NIL (GO G190) G191 (EXIT NIL)) (EXIT 'T))))) @@ -417,14 +462,17 @@ (SEQ (LETT |r| |i| |LSAGG-;reduce;MA2S;16|) (SEQ G190 (COND - ((NULL (SPADCALL (SPADCALL |x| (QREFELT $ 16)) - (QREFELT $ 25))) + ((NULL (SPADCALL + (SPADCALL |x| (|getShellEntry| $ 16)) + (|getShellEntry| $ 25))) (GO G191))) (SEQ (LETT |r| - (SPADCALL |r| (SPADCALL |x| (QREFELT $ 18)) + (SPADCALL |r| + (SPADCALL |x| (|getShellEntry| $ 18)) |f|) |LSAGG-;reduce;MA2S;16|) - (EXIT (LETT |x| (SPADCALL |x| (QREFELT $ 17)) + (EXIT (LETT |x| + (SPADCALL |x| (|getShellEntry| $ 17)) |LSAGG-;reduce;MA2S;16|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT |r|))))) @@ -436,16 +484,17 @@ (SEQ G190 (COND ((NULL (COND - ((SPADCALL |x| (QREFELT $ 16)) 'NIL) + ((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL) ('T - (SPADCALL (SPADCALL |r| |a| (QREFELT $ 52)) - (QREFELT $ 25))))) + (SPADCALL |r| |a| (|getShellEntry| $ 52))))) (GO G191))) (SEQ (LETT |r| - (SPADCALL |r| (SPADCALL |x| (QREFELT $ 18)) + (SPADCALL |r| + (SPADCALL |x| (|getShellEntry| $ 18)) |f|) |LSAGG-;reduce;MA3S;17|) - (EXIT (LETT |x| (SPADCALL |x| (QREFELT $ 17)) + (EXIT (LETT |x| + (SPADCALL |x| (|getShellEntry| $ 17)) |LSAGG-;reduce;MA3S;17|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT |r|))))) @@ -453,10 +502,13 @@ (DEFUN |LSAGG-;new;NniSA;18| (|n| |s| $) (PROG (|k| |l|) (RETURN - (SEQ (LETT |l| (SPADCALL (QREFELT $ 12)) |LSAGG-;new;NniSA;18|) + (SEQ (LETT |l| (SPADCALL (|getShellEntry| $ 13)) + |LSAGG-;new;NniSA;18|) (SEQ (LETT |k| 1 |LSAGG-;new;NniSA;18|) G190 (COND ((QSGREATERP |k| |n|) (GO G191))) - (SEQ (EXIT (LETT |l| (SPADCALL |s| |l| (QREFELT $ 13)) + (SEQ (EXIT (LETT |l| + (SPADCALL |s| |l| + (|getShellEntry| $ 14)) |LSAGG-;new;NniSA;18|))) (LETT |k| (QSADD1 |k|) |LSAGG-;new;NniSA;18|) (GO G190) G191 (EXIT NIL)) @@ -465,50 +517,60 @@ (DEFUN |LSAGG-;map;M3A;19| (|f| |x| |y| $) (PROG (|z|) (RETURN - (SEQ (LETT |z| (SPADCALL (QREFELT $ 12)) |LSAGG-;map;M3A;19|) + (SEQ (LETT |z| (SPADCALL (|getShellEntry| $ 13)) + |LSAGG-;map;M3A;19|) (SEQ G190 (COND ((NULL (COND - ((SPADCALL |x| (QREFELT $ 16)) 'NIL) + ((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL) ('T - (SPADCALL (SPADCALL |y| (QREFELT $ 16)) - (QREFELT $ 25))))) + (SPADCALL + (SPADCALL |y| (|getShellEntry| $ 16)) + (|getShellEntry| $ 25))))) (GO G191))) (SEQ (LETT |z| (SPADCALL - (SPADCALL (SPADCALL |x| (QREFELT $ 18)) - (SPADCALL |y| (QREFELT $ 18)) |f|) - |z| (QREFELT $ 13)) + (SPADCALL + (SPADCALL |x| + (|getShellEntry| $ 18)) + (SPADCALL |y| + (|getShellEntry| $ 18)) + |f|) + |z| (|getShellEntry| $ 14)) |LSAGG-;map;M3A;19|) - (LETT |x| (SPADCALL |x| (QREFELT $ 17)) + (LETT |x| (SPADCALL |x| (|getShellEntry| $ 17)) |LSAGG-;map;M3A;19|) - (EXIT (LETT |y| (SPADCALL |y| (QREFELT $ 17)) + (EXIT (LETT |y| + (SPADCALL |y| (|getShellEntry| $ 17)) |LSAGG-;map;M3A;19|))) NIL (GO G190) G191 (EXIT NIL)) - (EXIT (SPADCALL |z| (QREFELT $ 48))))))) + (EXIT (SPADCALL |z| (|getShellEntry| $ 48))))))) (DEFUN |LSAGG-;reverse!;2A;20| (|x| $) (PROG (|z| |y|) (RETURN (SEQ (COND - ((OR (SPADCALL |x| (QREFELT $ 16)) + ((OR (SPADCALL |x| (|getShellEntry| $ 16)) (SPADCALL - (LETT |y| (SPADCALL |x| (QREFELT $ 17)) + (LETT |y| (SPADCALL |x| (|getShellEntry| $ 17)) |LSAGG-;reverse!;2A;20|) - (QREFELT $ 16))) + (|getShellEntry| $ 16))) |x|) ('T - (SEQ (SPADCALL |x| (SPADCALL (QREFELT $ 12)) - (QREFELT $ 26)) + (SEQ (SPADCALL |x| (SPADCALL (|getShellEntry| $ 13)) + (|getShellEntry| $ 26)) (SEQ G190 (COND ((NULL (SPADCALL - (SPADCALL |y| (QREFELT $ 16)) - (QREFELT $ 25))) + (SPADCALL |y| + (|getShellEntry| $ 16)) + (|getShellEntry| $ 25))) (GO G191))) - (SEQ (LETT |z| (SPADCALL |y| (QREFELT $ 17)) + (SEQ (LETT |z| + (SPADCALL |y| + (|getShellEntry| $ 17)) |LSAGG-;reverse!;2A;20|) - (SPADCALL |y| |x| (QREFELT $ 26)) + (SPADCALL |y| |x| (|getShellEntry| $ 26)) (LETT |x| |y| |LSAGG-;reverse!;2A;20|) (EXIT (LETT |y| |z| |LSAGG-;reverse!;2A;20|))) @@ -518,31 +580,35 @@ (DEFUN |LSAGG-;copy;2A;21| (|x| $) (PROG (|k| |y|) (RETURN - (SEQ (LETT |y| (SPADCALL (QREFELT $ 12)) |LSAGG-;copy;2A;21|) + (SEQ (LETT |y| (SPADCALL (|getShellEntry| $ 13)) + |LSAGG-;copy;2A;21|) (SEQ (LETT |k| 0 |LSAGG-;copy;2A;21|) G190 (COND - ((NULL (SPADCALL (SPADCALL |x| (QREFELT $ 16)) - (QREFELT $ 25))) + ((NULL (SPADCALL + (SPADCALL |x| (|getShellEntry| $ 16)) + (|getShellEntry| $ 25))) (GO G191))) (SEQ (COND ((EQL |k| 1000) (COND - ((SPADCALL |x| (QREFELT $ 57)) + ((SPADCALL |x| (|getShellEntry| $ 57)) (EXIT (|error| "cyclic list")))))) (LETT |y| - (SPADCALL (SPADCALL |x| (QREFELT $ 18)) |y| - (QREFELT $ 13)) + (SPADCALL + (SPADCALL |x| (|getShellEntry| $ 18)) + |y| (|getShellEntry| $ 14)) |LSAGG-;copy;2A;21|) - (EXIT (LETT |x| (SPADCALL |x| (QREFELT $ 17)) + (EXIT (LETT |x| + (SPADCALL |x| (|getShellEntry| $ 17)) |LSAGG-;copy;2A;21|))) (LETT |k| (QSADD1 |k|) |LSAGG-;copy;2A;21|) (GO G190) G191 (EXIT NIL)) - (EXIT (SPADCALL |y| (QREFELT $ 48))))))) + (EXIT (SPADCALL |y| (|getShellEntry| $ 48))))))) (DEFUN |LSAGG-;copyInto!;2AIA;22| (|y| |x| |s| $) - (PROG (|m| #0=#:G1545 |z|) + (PROG (|m| #0=#:G1542 |z|) (RETURN - (SEQ (LETT |m| (SPADCALL |y| (QREFELT $ 32)) + (SEQ (LETT |m| (SPADCALL |y| (|getShellEntry| $ 32)) |LSAGG-;copyInto!;2AIA;22|) (EXIT (COND ((< |s| |m|) (|error| "index out of range")) @@ -554,36 +620,40 @@ |LSAGG-;copyInto!;2AIA;22|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (QREFELT $ 33)) + (|getShellEntry| $ 33)) |LSAGG-;copyInto!;2AIA;22|) (SEQ G190 (COND ((NULL (COND - ((SPADCALL |z| (QREFELT $ 16)) + ((SPADCALL |z| + (|getShellEntry| $ 16)) 'NIL) ('T (SPADCALL (SPADCALL |x| - (QREFELT $ 16)) - (QREFELT $ 25))))) + (|getShellEntry| $ 16)) + (|getShellEntry| $ 25))))) (GO G191))) (SEQ (SPADCALL |z| - (SPADCALL |x| (QREFELT $ 18)) - (QREFELT $ 59)) + (SPADCALL |x| + (|getShellEntry| $ 18)) + (|getShellEntry| $ 59)) (LETT |x| - (SPADCALL |x| (QREFELT $ 17)) + (SPADCALL |x| + (|getShellEntry| $ 17)) |LSAGG-;copyInto!;2AIA;22|) (EXIT (LETT |z| - (SPADCALL |z| (QREFELT $ 17)) + (SPADCALL |z| + (|getShellEntry| $ 17)) |LSAGG-;copyInto!;2AIA;22|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT |y|))))))))) (DEFUN |LSAGG-;position;SA2I;23| (|w| |x| |s| $) - (PROG (|m| #0=#:G1552 |k|) + (PROG (|m| #0=#:G1549 |k|) (RETURN - (SEQ (LETT |m| (SPADCALL |x| (QREFELT $ 32)) + (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32)) |LSAGG-;position;SA2I;23|) (EXIT (COND ((< |s| |m|) (|error| "index out of range")) @@ -595,32 +665,34 @@ |LSAGG-;position;SA2I;23|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (QREFELT $ 33)) + (|getShellEntry| $ 33)) |LSAGG-;position;SA2I;23|) (SEQ (LETT |k| |s| |LSAGG-;position;SA2I;23|) G190 (COND ((NULL (COND - ((SPADCALL |x| (QREFELT $ 16)) + ((SPADCALL |x| + (|getShellEntry| $ 16)) 'NIL) ('T - (SPADCALL - (SPADCALL |w| - (SPADCALL |x| - (QREFELT $ 18)) - (QREFELT $ 52)) - (QREFELT $ 25))))) + (SPADCALL |w| + (SPADCALL |x| + (|getShellEntry| $ 18)) + (|getShellEntry| $ 52))))) (GO G191))) (SEQ (EXIT (LETT |x| - (SPADCALL |x| (QREFELT $ 17)) + (SPADCALL |x| + (|getShellEntry| $ 17)) |LSAGG-;position;SA2I;23|))) (LETT |k| (+ |k| 1) |LSAGG-;position;SA2I;23|) (GO G190) G191 (EXIT NIL)) (EXIT (COND - ((SPADCALL |x| (QREFELT $ 16)) - (- (SPADCALL |x| (QREFELT $ 32)) 1)) + ((SPADCALL |x| (|getShellEntry| $ 16)) + (- (SPADCALL |x| + (|getShellEntry| $ 32)) + 1)) ('T |k|))))))))))) (DEFUN |LSAGG-;removeDuplicates!;2A;24| (|l| $) @@ -629,8 +701,9 @@ (SEQ (LETT |p| |l| |LSAGG-;removeDuplicates!;2A;24|) (SEQ G190 (COND - ((NULL (SPADCALL (SPADCALL |p| (QREFELT $ 16)) - (QREFELT $ 25))) + ((NULL (SPADCALL + (SPADCALL |p| (|getShellEntry| $ 16)) + (|getShellEntry| $ 25))) (GO G191))) (SEQ (EXIT (LETT |p| (SPADCALL |p| @@ -638,68 +711,73 @@ (CONS #'|LSAGG-;removeDuplicates!;2A;24!0| (VECTOR $ |p|)) - (SPADCALL |p| (QREFELT $ 17)) - (QREFELT $ 62)) - (QREFELT $ 26)) + (SPADCALL |p| + (|getShellEntry| $ 17)) + (|getShellEntry| $ 63)) + (|getShellEntry| $ 26)) |LSAGG-;removeDuplicates!;2A;24|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT |l|))))) (DEFUN |LSAGG-;removeDuplicates!;2A;24!0| (|#1| $$) (PROG ($) - (LETT $ (QREFELT $$ 0) |LSAGG-;removeDuplicates!;2A;24|) + (LETT $ (|getShellEntry| $$ 0) |LSAGG-;removeDuplicates!;2A;24|) (RETURN (PROGN - (SPADCALL |#1| (SPADCALL (QREFELT $$ 1) (QREFELT $ 18)) - (QREFELT $ 52)))))) + (SPADCALL |#1| + (SPADCALL (|getShellEntry| $$ 1) (|getShellEntry| $ 18)) + (|getShellEntry| $ 62)))))) (DEFUN |LSAGG-;<;2AB;25| (|x| |y| $) - (PROG (#0=#:G1566) + (PROG (#0=#:G1563) (RETURN (SEQ (EXIT (SEQ (SEQ G190 (COND ((NULL (COND - ((SPADCALL |x| (QREFELT $ 16)) + ((SPADCALL |x| + (|getShellEntry| $ 16)) 'NIL) ('T (SPADCALL - (SPADCALL |y| (QREFELT $ 16)) - (QREFELT $ 25))))) + (SPADCALL |y| + (|getShellEntry| $ 16)) + (|getShellEntry| $ 25))))) (GO G191))) (SEQ (EXIT (COND - ((NULL - (SPADCALL - (SPADCALL |x| - (QREFELT $ 18)) - (SPADCALL |y| - (QREFELT $ 18)) - (QREFELT $ 52))) + ((SPADCALL + (SPADCALL |x| + (|getShellEntry| $ 18)) + (SPADCALL |y| + (|getShellEntry| $ 18)) + (|getShellEntry| $ 52)) (PROGN (LETT #0# (SPADCALL (SPADCALL |x| - (QREFELT $ 18)) + (|getShellEntry| $ 18)) (SPADCALL |y| - (QREFELT $ 18)) - (QREFELT $ 64)) + (|getShellEntry| $ 18)) + (|getShellEntry| $ 65)) |LSAGG-;<;2AB;25|) (GO #0#))) ('T (SEQ (LETT |x| (SPADCALL |x| - (QREFELT $ 17)) + (|getShellEntry| $ 17)) |LSAGG-;<;2AB;25|) (EXIT (LETT |y| (SPADCALL |y| - (QREFELT $ 17)) + (|getShellEntry| $ 17)) |LSAGG-;<;2AB;25|))))))) NIL (GO G190) G191 (EXIT NIL)) (EXIT (COND - ((SPADCALL |x| (QREFELT $ 16)) - (SPADCALL (SPADCALL |y| (QREFELT $ 16)) - (QREFELT $ 25))) + ((SPADCALL |x| (|getShellEntry| $ 16)) + (SPADCALL + (SPADCALL |y| + (|getShellEntry| $ 16)) + (|getShellEntry| $ 25))) ('T 'NIL))))) #0# (EXIT #0#))))) @@ -710,41 +788,42 @@ (LETT |dv$1| (|devaluate| |#1|) . #0=(|ListAggregate&|)) (LETT |dv$2| (|devaluate| |#2|) . #0#) (LETT |dv$| (LIST '|ListAggregate&| |dv$1| |dv$2|) . #0#) - (LETT $ (GETREFV 67) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 68) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) - (QSETREFV $ 7 |#2|) + (|setShellEntry| $ 6 |#1|) + (|setShellEntry| $ 7 |#2|) (COND ((|HasCategory| |#2| '(|SetCategory|)) - (QSETREFV $ 53 + (|setShellEntry| $ 53 (CONS (|dispatchFunction| |LSAGG-;reduce;MA3S;17|) $)))) (COND ((|HasCategory| |#2| '(|SetCategory|)) (PROGN - (QSETREFV $ 61 + (|setShellEntry| $ 61 (CONS (|dispatchFunction| |LSAGG-;position;SA2I;23|) $)) - (QSETREFV $ 63 + (|setShellEntry| $ 64 (CONS (|dispatchFunction| |LSAGG-;removeDuplicates!;2A;24|) $))))) (COND ((|HasCategory| |#2| '(|OrderedSet|)) - (QSETREFV $ 65 + (|setShellEntry| $ 66 (CONS (|dispatchFunction| |LSAGG-;<;2AB;25|) $)))) $)))) (MAKEPROP '|ListAggregate&| '|infovec| (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) - (|NonNegativeInteger|) (0 . |#|) (|Mapping| 15 7 7) - |LSAGG-;sort!;M2A;1| (5 . |empty|) (9 . |concat|) - |LSAGG-;list;SA;2| (|Boolean|) (15 . |empty?|) + (|NonNegativeInteger|) (0 . |#|) (|Boolean|) + (|Mapping| 10 7 7) |LSAGG-;sort!;M2A;1| (5 . |empty|) + (9 . |concat|) |LSAGG-;list;SA;2| (15 . |empty?|) (20 . |rest|) (25 . |first|) (|Mapping| 7 7 7) (30 . |reduce|) |LSAGG-;reduce;MAS;3| (37 . |copy|) (42 . |merge!|) |LSAGG-;merge;M3A;4| (49 . |not|) - (54 . |setrest!|) (|Mapping| 15 7) |LSAGG-;select!;M2A;5| + (54 . |setrest!|) (|Mapping| 10 7) |LSAGG-;select!;M2A;5| (60 . |eq?|) |LSAGG-;merge!;M3A;6| (|Integer|) (66 . |minIndex|) (71 . |rest|) |LSAGG-;insert!;SAIA;7| (77 . |concat!|) |LSAGG-;insert!;2AIA;8| @@ -754,41 +833,234 @@ (|Union| 7 '"failed") |LSAGG-;find;MAU;12| |LSAGG-;position;MAI;13| (103 . |reverse!|) (108 . |split!|) |LSAGG-;sorted?;MAB;15| - |LSAGG-;reduce;MA2S;16| (114 . =) (120 . |reduce|) + |LSAGG-;reduce;MA2S;16| (114 . ~=) (120 . |reduce|) |LSAGG-;new;NniSA;18| |LSAGG-;map;M3A;19| |LSAGG-;reverse!;2A;20| (128 . |cyclic?|) |LSAGG-;copy;2A;21| (133 . |setfirst!|) - |LSAGG-;copyInto!;2AIA;22| (139 . |position|) - (146 . |remove!|) (152 . |removeDuplicates!|) (157 . <) - (163 . <) (|Mapping| 7 7)) - '#(|sorted?| 169 |sort!| 175 |select!| 181 |reverse!| 187 - |removeDuplicates!| 192 |remove!| 197 |reduce| 203 - |position| 224 |new| 237 |merge!| 243 |merge| 250 |map| - 257 |list| 264 |insert!| 269 |find| 283 |delete!| 289 - |copyInto!| 301 |copy| 308 < 313) + |LSAGG-;copyInto!;2AIA;22| (139 . |position|) (146 . =) + (152 . |remove!|) (158 . |removeDuplicates!|) (163 . <) + (169 . <) (|Mapping| 7 7)) + '#(|sorted?| 175 |sort!| 181 |select!| 187 |reverse!| 193 + |removeDuplicates!| 198 |remove!| 203 |reduce| 209 + |position| 230 |new| 243 |merge!| 249 |merge| 256 |map| + 263 |list| 270 |insert!| 275 |find| 289 |delete!| 295 + |copyInto!| 307 |copy| 314 < 319) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 65 - '(1 6 8 0 9 0 6 0 12 2 6 0 7 0 13 1 6 - 15 0 16 1 6 0 0 17 1 6 7 0 18 3 6 7 - 19 0 7 20 1 6 0 0 22 3 6 0 10 0 0 23 - 1 15 0 0 25 2 6 0 0 0 26 2 6 15 0 0 + (|makeByteWordVec2| 66 + '(1 6 8 0 9 0 6 0 13 2 6 0 7 0 14 1 6 + 10 0 16 1 6 0 0 17 1 6 7 0 18 3 6 7 + 19 0 7 20 1 6 0 0 22 3 6 0 11 0 0 23 + 1 10 0 0 25 2 6 0 0 0 26 2 6 10 0 0 29 1 6 31 0 32 2 6 0 0 8 33 2 6 0 0 0 - 35 1 39 31 0 40 1 39 15 0 41 1 39 31 + 35 1 39 31 0 40 1 39 10 0 41 1 39 31 0 42 1 6 31 0 43 1 6 0 0 48 2 6 0 0 - 31 49 2 7 15 0 0 52 4 0 7 19 0 7 7 53 - 1 6 15 0 57 2 6 7 0 7 59 3 0 31 7 0 - 31 61 2 6 0 27 0 62 1 0 0 0 63 2 7 15 - 0 0 64 2 0 15 0 0 65 2 0 15 10 0 50 2 - 0 0 10 0 11 2 0 0 27 0 28 1 0 0 0 56 - 1 0 0 0 63 2 0 0 27 0 37 3 0 7 19 0 7 - 51 4 0 7 19 0 7 7 53 2 0 7 19 0 21 2 - 0 31 27 0 47 3 0 31 7 0 31 61 2 0 0 8 - 7 54 3 0 0 10 0 0 30 3 0 0 10 0 0 24 - 3 0 0 19 0 0 55 1 0 0 7 14 3 0 0 7 0 - 31 34 3 0 0 0 0 31 36 2 0 45 27 0 46 - 2 0 0 0 39 44 2 0 0 0 31 38 3 0 0 0 0 - 31 60 1 0 0 0 58 2 0 15 0 0 65))))) + 31 49 2 7 10 0 0 52 4 0 7 19 0 7 7 53 + 1 6 10 0 57 2 6 7 0 7 59 3 0 31 7 0 + 31 61 2 7 10 0 0 62 2 6 0 27 0 63 1 0 + 0 0 64 2 7 10 0 0 65 2 0 10 0 0 66 2 + 0 10 11 0 50 2 0 0 11 0 12 2 0 0 27 0 + 28 1 0 0 0 56 1 0 0 0 64 2 0 0 27 0 + 37 3 0 7 19 0 7 51 4 0 7 19 0 7 7 53 + 2 0 7 19 0 21 2 0 31 27 0 47 3 0 31 7 + 0 31 61 2 0 0 8 7 54 3 0 0 11 0 0 30 + 3 0 0 11 0 0 24 3 0 0 19 0 0 55 1 0 0 + 7 15 3 0 0 7 0 31 34 3 0 0 0 0 31 36 + 2 0 45 27 0 46 2 0 0 0 39 44 2 0 0 0 + 31 38 3 0 0 0 0 31 60 1 0 0 0 58 2 0 + 10 0 0 66))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|ListAggregate&| '|isFunctor| + '(((|list| ($ |#2|)) T (ELT $ 15)) + ((|delete!| ($ $ (|Integer|))) T (ELT $ 38)) + ((|delete!| ($ $ (|UniversalSegment| (|Integer|)))) T + (ELT $ 44)) + ((|remove!| ($ (|Mapping| (|Boolean|) |#2|) $)) T + (ELT $ 37)) + ((|insert!| ($ |#2| $ (|Integer|))) T (ELT $ 34)) + ((|insert!| ($ $ $ (|Integer|))) T (ELT $ 36)) + ((|merge!| ($ (|Mapping| (|Boolean|) |#2| |#2|) $ $)) T + (ELT $ 30)) + ((|select!| ($ (|Mapping| (|Boolean|) |#2|) $)) T + (ELT $ 28)) + ((|remove!| ($ |#2| $)) T (ELT $ NIL)) + ((|removeDuplicates!| ($ $)) T (ELT $ 64)) + ((|merge!| ($ $ $)) T (ELT $ NIL)) + ((|merge| ($ (|Mapping| (|Boolean|) |#2| |#2|) $ $)) T + (ELT $ 24)) + ((|sorted?| + ((|Boolean|) (|Mapping| (|Boolean|) |#2| |#2|) $)) + T (ELT $ 50)) + ((|position| + ((|Integer|) (|Mapping| (|Boolean|) |#2|) $)) + T (ELT $ 47)) + ((|position| ((|Integer|) |#2| $)) T (ELT $ NIL)) + ((|position| ((|Integer|) |#2| $ (|Integer|))) T + (ELT $ 61)) + ((|merge| ($ $ $)) T (ELT $ NIL)) + ((|sorted?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|copyInto!| ($ $ $ (|Integer|))) T (ELT $ 60)) + ((|reverse!| ($ $)) T (ELT $ 56)) + ((|sort!| ($ (|Mapping| (|Boolean|) |#2| |#2|) $)) T + (ELT $ 12)) + ((|sort!| ($ $)) T (ELT $ NIL)) + ((< ((|Boolean|) $ $)) T (ELT $ 66)) + ((|reduce| + (|#2| (|Mapping| |#2| |#2| |#2|) $ |#2| |#2|)) + T (ELT $ 53)) + ((|reduce| (|#2| (|Mapping| |#2| |#2| |#2|) $ |#2|)) T + (ELT $ 51)) + ((|reduce| (|#2| (|Mapping| |#2| |#2| |#2|) $)) T + (ELT $ 21)) + ((|find| ((|Union| |#2| "failed") + (|Mapping| (|Boolean|) |#2|) $)) + T (ELT $ 46)) + ((|new| ($ (|NonNegativeInteger|) |#2|)) T (ELT $ 54)) + ((|map| ($ (|Mapping| |#2| |#2| |#2|) $ $)) T + (ELT $ 55)) + ((|map| ($ (|Mapping| |#2| |#2|) $)) T (ELT $ NIL)) + ((|copy| ($ $)) T (ELT $ 58))) + (|addModemap| '|ListAggregate&| + '(|ListAggregate&| |#1| |#2|) + '((CATEGORY |domain| (SIGNATURE |list| (|#1| |#2|)) + (SIGNATURE |delete!| (|#1| |#1| (|Integer|))) + (SIGNATURE |delete!| + (|#1| |#1| (|UniversalSegment| (|Integer|)))) + (SIGNATURE |remove!| + (|#1| (|Mapping| (|Boolean|) |#2|) |#1|)) + (SIGNATURE |insert!| + (|#1| |#2| |#1| (|Integer|))) + (SIGNATURE |insert!| + (|#1| |#1| |#1| (|Integer|))) + (SIGNATURE |merge!| + (|#1| (|Mapping| (|Boolean|) |#2| |#2|) |#1| + |#1|)) + (SIGNATURE |select!| + (|#1| (|Mapping| (|Boolean|) |#2|) |#1|)) + (SIGNATURE |remove!| (|#1| |#2| |#1|)) + (SIGNATURE |removeDuplicates!| (|#1| |#1|)) + (SIGNATURE |merge!| (|#1| |#1| |#1|)) + (SIGNATURE |merge| + (|#1| (|Mapping| (|Boolean|) |#2| |#2|) |#1| + |#1|)) + (SIGNATURE |sorted?| + ((|Boolean|) + (|Mapping| (|Boolean|) |#2| |#2|) |#1|)) + (SIGNATURE |position| + ((|Integer|) (|Mapping| (|Boolean|) |#2|) + |#1|)) + (SIGNATURE |position| ((|Integer|) |#2| |#1|)) + (SIGNATURE |position| + ((|Integer|) |#2| |#1| (|Integer|))) + (SIGNATURE |merge| (|#1| |#1| |#1|)) + (SIGNATURE |sorted?| ((|Boolean|) |#1|)) + (SIGNATURE |copyInto!| + (|#1| |#1| |#1| (|Integer|))) + (SIGNATURE |reverse!| (|#1| |#1|)) + (SIGNATURE |sort!| + (|#1| (|Mapping| (|Boolean|) |#2| |#2|) + |#1|)) + (SIGNATURE |sort!| (|#1| |#1|)) + (SIGNATURE < ((|Boolean|) |#1| |#1|)) + (SIGNATURE |reduce| + (|#2| (|Mapping| |#2| |#2| |#2|) |#1| |#2| + |#2|)) + (SIGNATURE |reduce| + (|#2| (|Mapping| |#2| |#2| |#2|) |#1| |#2|)) + (SIGNATURE |reduce| + (|#2| (|Mapping| |#2| |#2| |#2|) |#1|)) + (SIGNATURE |find| + ((|Union| |#2| "failed") + (|Mapping| (|Boolean|) |#2|) |#1|)) + (SIGNATURE |new| + (|#1| (|NonNegativeInteger|) |#2|)) + (SIGNATURE |map| + (|#1| (|Mapping| |#2| |#2| |#2|) |#1| |#1|)) + (SIGNATURE |map| + (|#1| (|Mapping| |#2| |#2|) |#1|)) + (SIGNATURE |copy| (|#1| |#1|))) + (|ListAggregate| |#2|) (|Type|)) + T '|ListAggregate&| + (|put| '|ListAggregate&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |list| (|#1| |#2|)) + (SIGNATURE |delete!| + (|#1| |#1| (|Integer|))) + (SIGNATURE |delete!| + (|#1| |#1| + (|UniversalSegment| (|Integer|)))) + (SIGNATURE |remove!| + (|#1| (|Mapping| (|Boolean|) |#2|) + |#1|)) + (SIGNATURE |insert!| + (|#1| |#2| |#1| (|Integer|))) + (SIGNATURE |insert!| + (|#1| |#1| |#1| (|Integer|))) + (SIGNATURE |merge!| + (|#1| + (|Mapping| (|Boolean|) |#2| |#2|) + |#1| |#1|)) + (SIGNATURE |select!| + (|#1| (|Mapping| (|Boolean|) |#2|) + |#1|)) + (SIGNATURE |remove!| (|#1| |#2| |#1|)) + (SIGNATURE |removeDuplicates!| + (|#1| |#1|)) + (SIGNATURE |merge!| (|#1| |#1| |#1|)) + (SIGNATURE |merge| + (|#1| + (|Mapping| (|Boolean|) |#2| |#2|) + |#1| |#1|)) + (SIGNATURE |sorted?| + ((|Boolean|) + (|Mapping| (|Boolean|) |#2| |#2|) + |#1|)) + (SIGNATURE |position| + ((|Integer|) + (|Mapping| (|Boolean|) |#2|) + |#1|)) + (SIGNATURE |position| + ((|Integer|) |#2| |#1|)) + (SIGNATURE |position| + ((|Integer|) |#2| |#1| + (|Integer|))) + (SIGNATURE |merge| (|#1| |#1| |#1|)) + (SIGNATURE |sorted?| + ((|Boolean|) |#1|)) + (SIGNATURE |copyInto!| + (|#1| |#1| |#1| (|Integer|))) + (SIGNATURE |reverse!| (|#1| |#1|)) + (SIGNATURE |sort!| + (|#1| + (|Mapping| (|Boolean|) |#2| |#2|) + |#1|)) + (SIGNATURE |sort!| (|#1| |#1|)) + (SIGNATURE < ((|Boolean|) |#1| |#1|)) + (SIGNATURE |reduce| + (|#2| (|Mapping| |#2| |#2| |#2|) + |#1| |#2| |#2|)) + (SIGNATURE |reduce| + (|#2| (|Mapping| |#2| |#2| |#2|) + |#1| |#2|)) + (SIGNATURE |reduce| + (|#2| (|Mapping| |#2| |#2| |#2|) + |#1|)) + (SIGNATURE |find| + ((|Union| |#2| "failed") + (|Mapping| (|Boolean|) |#2|) + |#1|)) + (SIGNATURE |new| + (|#1| (|NonNegativeInteger|) |#2|)) + (SIGNATURE |map| + (|#1| (|Mapping| |#2| |#2| |#2|) + |#1| |#1|)) + (SIGNATURE |map| + (|#1| (|Mapping| |#2| |#2|) |#1|)) + (SIGNATURE |copy| (|#1| |#1|))) + (|ListAggregate| |#2|) (|Type|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/LSAGG.lsp b/src/algebra/strap/LSAGG.lsp index c0470689..4729107b 100644 --- a/src/algebra/strap/LSAGG.lsp +++ b/src/algebra/strap/LSAGG.lsp @@ -5,8 +5,8 @@ (DEFPARAMETER |ListAggregate;AL| 'NIL) -(DEFUN |ListAggregate| (#0=#:G1431) - (LET (#1=#:G1432) +(DEFUN |ListAggregate| (#0=#:G1428) + (LET (#1=#:G1429) (COND ((SETQ #1# (|assoc| (|devaluate| #0#) |ListAggregate;AL|)) (CDR #1#)) @@ -17,7 +17,7 @@ #1#)))) (DEFUN |ListAggregate;| (|t#1|) - (PROG (#0=#:G1430) + (PROG (#0=#:G1427) (RETURN (PROG1 (LETT #0# (|sublisV| @@ -36,3 +36,9 @@ 'NIL NIL)) . #1=(|ListAggregate|))))) . #1#) (SETELT #0# 0 (LIST '|ListAggregate| (|devaluate| |t#1|))))))) + +(SETQ |$CategoryFrame| + (|put| '|ListAggregate| '|isCategory| T + (|addModemap| '|ListAggregate| '(|ListAggregate| |#1|) + '((|Category|) (|Type|)) T '|ListAggregate| + |$CategoryFrame|))) diff --git a/src/algebra/strap/MONOID-.lsp b/src/algebra/strap/MONOID-.lsp index c9bcbbe5..cd87b5fc 100644 --- a/src/algebra/strap/MONOID-.lsp +++ b/src/algebra/strap/MONOID-.lsp @@ -2,22 +2,23 @@ (/VERSIONCHECK 2) (DEFUN |MONOID-;^;SNniS;1| (|x| |n| $) - (SPADCALL |x| |n| (QREFELT $ 8))) + (SPADCALL |x| |n| (|getShellEntry| $ 8))) (DEFUN |MONOID-;one?;SB;2| (|x| $) - (SPADCALL |x| (|spadConstant| $ 10) (QREFELT $ 12))) + (SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 12))) (DEFUN |MONOID-;sample;S;3| ($) (|spadConstant| $ 10)) (DEFUN |MONOID-;recip;SU;4| (|x| $) (COND - ((SPADCALL |x| (|spadConstant| $ 10) (QREFELT $ 12)) (CONS 0 |x|)) + ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 12)) + (CONS 0 |x|)) ('T (CONS 1 "failed")))) (DEFUN |MONOID-;**;SNniS;5| (|x| |n| $) (COND ((ZEROP |n|) (|spadConstant| $ 10)) - ('T (SPADCALL |x| |n| (QREFELT $ 19))))) + ('T (SPADCALL |x| |n| (|getShellEntry| $ 19))))) (DEFUN |Monoid&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -25,11 +26,12 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|Monoid&|)) (LETT |dv$| (LIST '|Monoid&| |dv$1|) . #0#) - (LETT $ (GETREFV 21) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 21) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) $)))) (MAKEPROP '|Monoid&| '|infovec| @@ -48,3 +50,43 @@ 18 6 6 17 19 0 0 0 14 1 0 15 0 16 1 0 11 0 13 2 0 0 0 7 9 2 0 0 0 7 20))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|Monoid&| '|isFunctor| + '(((|recip| ((|Union| $ "failed") $)) T (ELT $ 16)) + ((^ ($ $ (|NonNegativeInteger|))) T (ELT $ 9)) + ((** ($ $ (|NonNegativeInteger|))) T (ELT $ 20)) + ((|one?| ((|Boolean|) $)) T (ELT $ 13)) + ((|sample| ($)) T (ELT $ 14)) + ((^ ($ $ (|PositiveInteger|))) T (ELT $ NIL)) + ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL))) + (|addModemap| '|Monoid&| '(|Monoid&| |#1|) + '((CATEGORY |domain| + (SIGNATURE |recip| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE ^ (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE ** + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |one?| ((|Boolean|) |#1|)) + (SIGNATURE |sample| (|#1|)) + (SIGNATURE ^ (|#1| |#1| (|PositiveInteger|))) + (SIGNATURE ** (|#1| |#1| (|PositiveInteger|)))) + (|Monoid|)) + T '|Monoid&| + (|put| '|Monoid&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |recip| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE ^ + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE ** + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |one?| ((|Boolean|) |#1|)) + (SIGNATURE |sample| (|#1|)) + (SIGNATURE ^ + (|#1| |#1| (|PositiveInteger|))) + (SIGNATURE ** + (|#1| |#1| (|PositiveInteger|)))) + (|Monoid|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/MONOID.lsp b/src/algebra/strap/MONOID.lsp index eecfccc9..b6c5ec92 100644 --- a/src/algebra/strap/MONOID.lsp +++ b/src/algebra/strap/MONOID.lsp @@ -4,11 +4,11 @@ (DEFPARAMETER |Monoid;AL| 'NIL) (DEFUN |Monoid| () - (LET (#:G1388) + (LET (#:G1397) (COND (|Monoid;AL|) (T (SETQ |Monoid;AL| (|Monoid;|)))))) (DEFUN |Monoid;| () - (PROG (#0=#:G1386) + (PROG (#0=#:G1395) (RETURN (PROG1 (LETT #0# (|Join| (|SemiGroup|) @@ -25,4 +25,9 @@ |Monoid|) (SETELT #0# 0 '(|Monoid|)))))) +(SETQ |$CategoryFrame| + (|put| '|Monoid| '|isCategory| T + (|addModemap| '|Monoid| '(|Monoid|) '((|Category|)) T + '|Monoid| |$CategoryFrame|))) + (MAKEPROP '|Monoid| 'NILADIC T) diff --git a/src/algebra/strap/MTSCAT.lsp b/src/algebra/strap/MTSCAT.lsp index dbd30965..39e41d1a 100644 --- a/src/algebra/strap/MTSCAT.lsp +++ b/src/algebra/strap/MTSCAT.lsp @@ -6,9 +6,9 @@ (DEFPARAMETER |MultivariateTaylorSeriesCategory;AL| 'NIL) (DEFUN |MultivariateTaylorSeriesCategory| - (&REST #0=#:G1390 &AUX #1=#:G1388) + (&REST #0=#:G1399 &AUX #1=#:G1397) (DSETQ #1# #0#) - (LET (#2=#:G1389) + (LET (#2=#:G1398) (COND ((SETQ #2# (|assoc| (|devaluateList| #1#) @@ -24,7 +24,7 @@ #2#)))) (DEFUN |MultivariateTaylorSeriesCategory;| (|t#1| |t#2|) - (PROG (#0=#:G1387) + (PROG (#0=#:G1396) (RETURN (PROG1 (LETT #0# (|sublisV| @@ -32,7 +32,7 @@ (LIST (|devaluate| |t#1|) (|devaluate| |t#2|))) (|sublisV| - (PAIR '(#1=#:G1386) + (PAIR '(#1=#:G1395) (LIST '(|IndexedExponents| |t#2|))) (COND (|MultivariateTaylorSeriesCategory;CAT|) @@ -105,3 +105,10 @@ (SETELT #0# 0 (LIST '|MultivariateTaylorSeriesCategory| (|devaluate| |t#1|) (|devaluate| |t#2|))))))) + +(SETQ |$CategoryFrame| + (|put| '|MultivariateTaylorSeriesCategory| '|isCategory| T + (|addModemap| '|MultivariateTaylorSeriesCategory| + '(|MultivariateTaylorSeriesCategory| |#1| |#2|) + '((|Category|) (|Ring|) (|OrderedSet|)) T + '|MultivariateTaylorSeriesCategory| |$CategoryFrame|))) diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp index 7952eb34..10211893 100644 --- a/src/algebra/strap/NNI.lsp +++ b/src/algebra/strap/NNI.lsp @@ -1,148 +1,182 @@ -(|/VERSIONCHECK| 2) +(/VERSIONCHECK 2) -(SETQ |$CategoryFrame| - (|put| - #1=(QUOTE |NonNegativeInteger|) - (QUOTE |SuperDomain|) - #2=(QUOTE (|Integer|)) - (|put| - #2# - #3=(QUOTE |SubDomain|) - (CONS - (QUOTE - (|NonNegativeInteger| - COND ((|<| |#1| 0) (QUOTE NIL)) ((QUOTE T) (QUOTE T)))) - (DELASC #1# (|get| #2# #3# |$CategoryFrame|))) - |$CategoryFrame|))) +(SETQ |$CategoryFrame| + (|put| #0='|NonNegativeInteger| '|SuperDomain| #1='(|Integer|) + (|put| #1# '|SubDomain| + (CONS '(|NonNegativeInteger| COND ((< |#1| 0) 'NIL) + ('T 'T)) + (DELASC #0# + (|get| #1# '|SubDomain| + |$CategoryFrame|))) + |$CategoryFrame|))) -(PUT - (QUOTE |NNI;sup;3$;1|) - (QUOTE |SPADreplace|) - (QUOTE MAX)) +(PUT '|NNI;sup;3$;1| '|SPADreplace| 'MAX) -(DEFUN |NNI;sup;3$;1| (|x| |y| |$|) (MAX |x| |y|)) +(DEFUN |NNI;sup;3$;1| (|x| |y| $) (MAX |x| |y|)) -(PUT - (QUOTE |NNI;shift;$I$;2|) - (QUOTE |SPADreplace|) - (QUOTE ASH)) +(PUT '|NNI;shift;$I$;2| '|SPADreplace| 'ASH) -(DEFUN |NNI;shift;$I$;2| (|x| |n| |$|) (ASH |x| |n|)) +(DEFUN |NNI;shift;$I$;2| (|x| |n| $) (ASH |x| |n|)) -(DEFUN |NNI;subtractIfCan;2$U;3| (|x| |y| |$|) - (PROG (|c|) - (RETURN - (SEQ - (LETT |c| (|-| |x| |y|) |NNI;subtractIfCan;2$U;3|) - (EXIT - (COND - ((|<| |c| 0) (CONS 1 "failed")) - ((QUOTE T) (CONS 0 |c|)))))))) +(DEFUN |NNI;subtractIfCan;2$U;3| (|x| |y| $) + (PROG (|c|) + (RETURN + (SEQ (LETT |c| (- |x| |y|) |NNI;subtractIfCan;2$U;3|) + (EXIT (COND + ((< |c| 0) (CONS 1 "failed")) + ('T (CONS 0 |c|)))))))) -(DEFUN |NonNegativeInteger| NIL - (PROG NIL - (RETURN - (PROG (#1=#:G96708) - (RETURN - (COND - ((LETT #1# - (HGET |$ConstructorCache| (QUOTE |NonNegativeInteger|)) - |NonNegativeInteger|) - (|CDRwithIncrement| (CDAR #1#))) - ((QUOTE T) - (|UNWIND-PROTECT| - (PROG1 - (CDDAR - (HPUT - |$ConstructorCache| - (QUOTE |NonNegativeInteger|) - (LIST (CONS NIL (CONS 1 (|NonNegativeInteger;|)))))) - (LETT #1# T |NonNegativeInteger|)) - (COND - ((NOT #1#) - (HREM - |$ConstructorCache| - (QUOTE |NonNegativeInteger|)))))))))))) +(DEFUN |NonNegativeInteger| () + (PROG () + (RETURN + (PROG (#0=#:G1406) + (RETURN + (COND + ((LETT #0# (HGET |$ConstructorCache| '|NonNegativeInteger|) + |NonNegativeInteger|) + (|CDRwithIncrement| (CDAR #0#))) + ('T + (UNWIND-PROTECT + (PROG1 (CDDAR (HPUT |$ConstructorCache| + '|NonNegativeInteger| + (LIST + (CONS NIL + (CONS 1 (|NonNegativeInteger;|)))))) + (LETT #0# T |NonNegativeInteger|)) + (COND + ((NOT #0#) + (HREM |$ConstructorCache| '|NonNegativeInteger|))))))))))) -(DEFUN |NonNegativeInteger;| NIL - (PROG (|dv$| |$| |pv$|) - (RETURN - (PROGN - (LETT |dv$| (QUOTE (|NonNegativeInteger|)) . #1=(|NonNegativeInteger|)) - (LETT |$| (GETREFV 17) . #1#) - (QSETREFV |$| 0 |dv$|) - (QSETREFV |$| 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #1#)) - (|haddProp| - |$ConstructorCache| - (QUOTE |NonNegativeInteger|) - NIL - (CONS 1 |$|)) - (|stuffDomainSlots| |$|) |$|)))) +(DEFUN |NonNegativeInteger;| () + (PROG (|dv$| $ |pv$|) + (RETURN + (PROGN + (LETT |dv$| '(|NonNegativeInteger|) + . #0=(|NonNegativeInteger|)) + (LETT $ (|newShell| 17) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (|haddProp| |$ConstructorCache| '|NonNegativeInteger| NIL + (CONS 1 $)) + (|stuffDomainSlots| $) + $)))) -(MAKEPROP - (QUOTE |NonNegativeInteger|) - (QUOTE |infovec|) - (LIST - (QUOTE - #(NIL NIL NIL NIL NIL - (|Integer|) - |NNI;sup;3$;1| - |NNI;shift;$I$;2| - (|Union| |$| (QUOTE "failed")) - |NNI;subtractIfCan;2$U;3| - (|Record| (|:| |quotient| |$|) (|:| |remainder| |$|)) - (|PositiveInteger|) - (|Boolean|) - (|NonNegativeInteger|) - (|SingleInteger|) - (|String|) - (|OutputForm|))) - (QUOTE - #(|~=| 0 |zero?| 6 |sup| 11 |subtractIfCan| 17 |shift| 23 |sample| 29 - |rem| 33 |recip| 39 |random| 44 |quo| 49 |one?| 55 |min| 60 |max| 66 - |latex| 72 |hash| 77 |gcd| 82 |exquo| 88 |divide| 94 |coerce| 100 - |^| 105 |Zero| 117 |One| 121 |>=| 125 |>| 131 |=| 137 |<=| 143 - |<| 149 |+| 155 |**| 161 |*| 173)) - (QUOTE (((|commutative| "*") . 0))) - (CONS - (|makeByteWordVec2| 1 (QUOTE (0 0 0 0 0 0 0 0 0 0 0 0 0))) - (CONS - (QUOTE - #(NIL NIL NIL NIL NIL - |Monoid&| - |AbelianMonoid&| - |OrderedSet&| - |SemiGroup&| - |AbelianSemiGroup&| - |SetCategory&| - |BasicType&| - NIL)) - (CONS - (QUOTE - #((|OrderedAbelianMonoidSup|) - (|OrderedCancellationAbelianMonoid|) - (|OrderedAbelianMonoid|) - (|OrderedAbelianSemiGroup|) - (|CancellationAbelianMonoid|) - (|Monoid|) - (|AbelianMonoid|) - (|OrderedSet|) - (|SemiGroup|) - (|AbelianSemiGroup|) - (|SetCategory|) - (|BasicType|) - (|CoercibleTo| 16))) - (|makeByteWordVec2| 16 - (QUOTE - (2 0 12 0 0 1 1 0 12 0 1 2 0 0 0 0 6 2 0 8 0 0 9 2 0 0 0 5 7 0 0 - 0 1 2 0 0 0 0 1 1 0 8 0 1 1 0 0 0 1 2 0 0 0 0 1 1 0 12 0 1 2 0 - 0 0 0 1 2 0 0 0 0 1 1 0 15 0 1 1 0 14 0 1 2 0 0 0 0 1 2 0 8 0 0 - 1 2 0 10 0 0 1 1 0 16 0 1 2 0 0 0 11 1 2 0 0 0 13 1 0 0 0 1 0 0 - 0 1 2 0 12 0 0 1 2 0 12 0 0 1 2 0 12 0 0 1 2 0 12 0 0 1 2 0 12 - 0 0 1 2 0 0 0 0 1 2 0 0 0 11 1 2 0 0 0 13 1 2 0 0 0 0 1 2 0 0 - 11 0 1 2 0 0 13 0 1)))))) - (QUOTE |lookupComplete|))) +(MAKEPROP '|NonNegativeInteger| '|infovec| + (LIST '#(NIL NIL NIL NIL NIL (|Integer|) |NNI;sup;3$;1| + |NNI;shift;$I$;2| (|Union| $ '"failed") + |NNI;subtractIfCan;2$U;3| + (|Record| (|:| |quotient| $) (|:| |remainder| $)) + (|PositiveInteger|) (|Boolean|) (|NonNegativeInteger|) + (|SingleInteger|) (|String|) (|OutputForm|)) + '#(~= 0 |zero?| 6 |sup| 11 |subtractIfCan| 17 |shift| 23 + |sample| 29 |rem| 33 |recip| 39 |random| 44 |quo| 49 + |one?| 55 |min| 60 |max| 66 |latex| 72 |hash| 77 |gcd| 82 + |exquo| 88 |divide| 94 |coerce| 100 ^ 105 |Zero| 117 |One| + 121 >= 125 > 131 = 137 <= 143 < 149 + 155 ** 161 * 173) + '(((|commutative| "*") . 0)) + (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0)) + (CONS '#(NIL NIL NIL NIL NIL |Monoid&| |AbelianMonoid&| + |OrderedSet&| |SemiGroup&| |AbelianSemiGroup&| + |SetCategory&| |BasicType&| NIL) + (CONS '#((|OrderedAbelianMonoidSup|) + (|OrderedCancellationAbelianMonoid|) + (|OrderedAbelianMonoid|) + (|CancellationAbelianMonoid|) + (|OrderedAbelianSemiGroup|) (|Monoid|) + (|AbelianMonoid|) (|OrderedSet|) + (|SemiGroup|) (|AbelianSemiGroup|) + (|SetCategory|) (|BasicType|) + (|CoercibleTo| 16)) + (|makeByteWordVec2| 16 + '(2 0 12 0 0 1 1 0 12 0 1 2 0 0 0 0 6 2 + 0 8 0 0 9 2 0 0 0 5 7 0 0 0 1 2 0 0 0 + 0 1 1 0 8 0 1 1 0 0 0 1 2 0 0 0 0 1 1 + 0 12 0 1 2 0 0 0 0 1 2 0 0 0 0 1 1 0 + 15 0 1 1 0 14 0 1 2 0 0 0 0 1 2 0 8 0 + 0 1 2 0 10 0 0 1 1 0 16 0 1 2 0 0 0 + 11 1 2 0 0 0 13 1 0 0 0 1 0 0 0 1 2 0 + 12 0 0 1 2 0 12 0 0 1 2 0 12 0 0 1 2 + 0 12 0 0 1 2 0 12 0 0 1 2 0 0 0 0 1 2 + 0 0 0 11 1 2 0 0 0 13 1 2 0 0 0 0 1 2 + 0 0 13 0 1 2 0 0 11 0 1))))) + '|lookupComplete|)) -(MAKEPROP (QUOTE |NonNegativeInteger|) (QUOTE NILADIC) T) +(SETQ |$CategoryFrame| + (|put| '|NonNegativeInteger| '|isFunctor| + '(((|random| ($ $)) T (ELT $ NIL)) + ((|shift| ($ $ (|Integer|))) T (ELT $ 7)) + ((|exquo| ((|Union| $ "failed") $ $)) T (ELT $ NIL)) + ((|divide| + ((|Record| (|:| |quotient| $) (|:| |remainder| $)) + $ $)) + T (ELT $ NIL)) + ((|gcd| ($ $ $)) T (ELT $ NIL)) + ((|rem| ($ $ $)) T (ELT $ NIL)) + ((|quo| ($ $ $)) T (ELT $ NIL)) + ((* ($ $ $)) T (ELT $ NIL)) + ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL)) + ((^ ($ $ (|PositiveInteger|))) T (ELT $ NIL)) + ((|One| ($)) T (CONST $ NIL)) + ((|one?| ((|Boolean|) $)) T (ELT $ NIL)) + ((** ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((^ ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((|recip| ((|Union| $ "failed") $)) T (ELT $ NIL)) + ((|sup| ($ $ $)) T (ELT $ 6)) + ((|subtractIfCan| ((|Union| $ "failed") $ $)) T + (ELT $ 9)) + ((|Zero| ($)) T (CONST $ NIL)) + ((|sample| ($)) T (CONST $ NIL)) + ((|zero?| ((|Boolean|) $)) T (ELT $ NIL)) + ((* ($ (|NonNegativeInteger|) $)) T (ELT $ NIL)) + ((+ ($ $ $)) T (ELT $ NIL)) + ((* ($ (|PositiveInteger|) $)) T (ELT $ NIL)) + ((|min| ($ $ $)) T (ELT $ NIL)) + ((|max| ($ $ $)) T (ELT $ NIL)) + ((<= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((>= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((> ((|Boolean|) $ $)) T (ELT $ NIL)) + ((< ((|Boolean|) $ $)) T (ELT $ NIL)) + ((|latex| ((|String|) $)) T (ELT $ NIL)) + ((|hash| ((|SingleInteger|) $)) T (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ NIL)) + ((= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((~= ((|Boolean|) $ $)) T (ELT $ NIL))) + (|addModemap| '|NonNegativeInteger| + '(|NonNegativeInteger|) + '((|Join| (|OrderedAbelianMonoidSup|) (|Monoid|) + (CATEGORY |domain| (SIGNATURE |quo| ($ $ $)) + (SIGNATURE |rem| ($ $ $)) + (SIGNATURE |gcd| ($ $ $)) + (SIGNATURE |divide| + ((|Record| (|:| |quotient| $) + (|:| |remainder| $)) + $ $)) + (SIGNATURE |exquo| + ((|Union| $ "failed") $ $)) + (SIGNATURE |shift| ($ $ (|Integer|))) + (SIGNATURE |random| ($ $)) + (ATTRIBUTE (|commutative| "*"))))) + T '|NonNegativeInteger| + (|put| '|NonNegativeInteger| '|mode| + '(|Mapping| + (|Join| (|OrderedAbelianMonoidSup|) + (|Monoid|) + (CATEGORY |domain| + (SIGNATURE |quo| ($ $ $)) + (SIGNATURE |rem| ($ $ $)) + (SIGNATURE |gcd| ($ $ $)) + (SIGNATURE |divide| + ((|Record| (|:| |quotient| $) + (|:| |remainder| $)) + $ $)) + (SIGNATURE |exquo| + ((|Union| $ "failed") $ $)) + (SIGNATURE |shift| + ($ $ (|Integer|))) + (SIGNATURE |random| ($ $)) + (ATTRIBUTE (|commutative| "*"))))) + |$CategoryFrame|)))) +(MAKEPROP '|NonNegativeInteger| 'NILADIC T) diff --git a/src/algebra/strap/OINTDOM.lsp b/src/algebra/strap/OINTDOM.lsp index 8729184b..d449414c 100644 --- a/src/algebra/strap/OINTDOM.lsp +++ b/src/algebra/strap/OINTDOM.lsp @@ -4,16 +4,22 @@ (DEFPARAMETER |OrderedIntegralDomain;AL| 'NIL) (DEFUN |OrderedIntegralDomain| () - (LET (#:G1387) + (LET (#:G1396) (COND (|OrderedIntegralDomain;AL|) (T (SETQ |OrderedIntegralDomain;AL| (|OrderedIntegralDomain;|)))))) (DEFUN |OrderedIntegralDomain;| () - (PROG (#0=#:G1385) + (PROG (#0=#:G1394) (RETURN (PROG1 (LETT #0# (|Join| (|IntegralDomain|) (|OrderedRing|)) |OrderedIntegralDomain|) (SETELT #0# 0 '(|OrderedIntegralDomain|)))))) +(SETQ |$CategoryFrame| + (|put| '|OrderedIntegralDomain| '|isCategory| T + (|addModemap| '|OrderedIntegralDomain| + '(|OrderedIntegralDomain|) '((|Category|)) T + '|OrderedIntegralDomain| |$CategoryFrame|))) + (MAKEPROP '|OrderedIntegralDomain| 'NILADIC T) diff --git a/src/algebra/strap/ORDRING-.lsp b/src/algebra/strap/ORDRING-.lsp index b556918a..63b2eb23 100644 --- a/src/algebra/strap/ORDRING-.lsp +++ b/src/algebra/strap/ORDRING-.lsp @@ -2,23 +2,24 @@ (/VERSIONCHECK 2) (DEFUN |ORDRING-;positive?;SB;1| (|x| $) - (SPADCALL (|spadConstant| $ 7) |x| (QREFELT $ 9))) + (SPADCALL (|spadConstant| $ 7) |x| (|getShellEntry| $ 9))) (DEFUN |ORDRING-;negative?;SB;2| (|x| $) - (SPADCALL |x| (|spadConstant| $ 7) (QREFELT $ 9))) + (SPADCALL |x| (|spadConstant| $ 7) (|getShellEntry| $ 9))) (DEFUN |ORDRING-;sign;SI;3| (|x| $) (COND - ((SPADCALL |x| (QREFELT $ 12)) 1) - ((SPADCALL |x| (QREFELT $ 13)) -1) - ((SPADCALL |x| (QREFELT $ 15)) 0) + ((SPADCALL |x| (|getShellEntry| $ 12)) 1) + ((SPADCALL |x| (|getShellEntry| $ 13)) -1) + ((SPADCALL |x| (|getShellEntry| $ 15)) 0) ('T (|error| "x satisfies neither positive?, negative? or zero?")))) (DEFUN |ORDRING-;abs;2S;4| (|x| $) (COND - ((SPADCALL |x| (QREFELT $ 12)) |x|) - ((SPADCALL |x| (QREFELT $ 13)) (SPADCALL |x| (QREFELT $ 18))) - ((SPADCALL |x| (QREFELT $ 15)) (|spadConstant| $ 7)) + ((SPADCALL |x| (|getShellEntry| $ 12)) |x|) + ((SPADCALL |x| (|getShellEntry| $ 13)) + (SPADCALL |x| (|getShellEntry| $ 18))) + ((SPADCALL |x| (|getShellEntry| $ 15)) (|spadConstant| $ 7)) ('T (|error| "x satisfies neither positive?, negative? or zero?")))) (DEFUN |OrderedRing&| (|#1|) @@ -27,11 +28,12 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|OrderedRing&|)) (LETT |dv$| (LIST '|OrderedRing&| |dv$1|) . #0#) - (LETT $ (GETREFV 20) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 20) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) $)))) (MAKEPROP '|OrderedRing&| '|infovec| @@ -50,3 +52,28 @@ 0 16 0 17 1 0 8 0 10 1 0 8 0 11 1 0 0 0 19))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|OrderedRing&| '|isFunctor| + '(((|abs| ($ $)) T (ELT $ 19)) + ((|sign| ((|Integer|) $)) T (ELT $ 17)) + ((|negative?| ((|Boolean|) $)) T (ELT $ 11)) + ((|positive?| ((|Boolean|) $)) T (ELT $ 10))) + (|addModemap| '|OrderedRing&| '(|OrderedRing&| |#1|) + '((CATEGORY |domain| (SIGNATURE |abs| (|#1| |#1|)) + (SIGNATURE |sign| ((|Integer|) |#1|)) + (SIGNATURE |negative?| ((|Boolean|) |#1|)) + (SIGNATURE |positive?| ((|Boolean|) |#1|))) + (|OrderedRing|)) + T '|OrderedRing&| + (|put| '|OrderedRing&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |abs| (|#1| |#1|)) + (SIGNATURE |sign| ((|Integer|) |#1|)) + (SIGNATURE |negative?| + ((|Boolean|) |#1|)) + (SIGNATURE |positive?| + ((|Boolean|) |#1|))) + (|OrderedRing|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/ORDRING.lsp b/src/algebra/strap/ORDRING.lsp index 9d3e60c9..341a4bc7 100644 --- a/src/algebra/strap/ORDRING.lsp +++ b/src/algebra/strap/ORDRING.lsp @@ -4,13 +4,13 @@ (DEFPARAMETER |OrderedRing;AL| 'NIL) (DEFUN |OrderedRing| () - (LET (#:G1393) + (LET (#:G1402) (COND (|OrderedRing;AL|) (T (SETQ |OrderedRing;AL| (|OrderedRing;|)))))) (DEFUN |OrderedRing;| () - (PROG (#0=#:G1391) + (PROG (#0=#:G1400) (RETURN (PROG1 (LETT #0# (|Join| (|OrderedAbelianGroup|) (|Ring|) (|Monoid|) @@ -23,4 +23,9 @@ |OrderedRing|) (SETELT #0# 0 '(|OrderedRing|)))))) +(SETQ |$CategoryFrame| + (|put| '|OrderedRing| '|isCategory| T + (|addModemap| '|OrderedRing| '(|OrderedRing|) + '((|Category|)) T '|OrderedRing| |$CategoryFrame|))) + (MAKEPROP '|OrderedRing| 'NILADIC T) diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp index 91e85005..03c859e5 100644 --- a/src/algebra/strap/OUTFORM.lsp +++ b/src/algebra/strap/OUTFORM.lsp @@ -7,11 +7,13 @@ (DEFUN |OUTFORM;message;S$;2| (|s| $) (COND - ((SPADCALL |s| (QREFELT $ 11)) (SPADCALL (QREFELT $ 12))) + ((SPADCALL |s| (|getShellEntry| $ 11)) + (SPADCALL (|getShellEntry| $ 12))) ('T |s|))) (DEFUN |OUTFORM;messagePrint;SV;3| (|s| $) - (SPADCALL (SPADCALL |s| (QREFELT $ 13)) (QREFELT $ 8))) + (SPADCALL (SPADCALL |s| (|getShellEntry| $ 13)) + (|getShellEntry| $ 8))) (PUT '|OUTFORM;=;2$B;4| '|SPADreplace| 'EQUAL) @@ -20,9 +22,9 @@ (DEFUN |OUTFORM;=;3$;5| (|a| |b| $) (LIST (|OUTFORM;sform| "=" $) |a| |b|)) -(PUT '|OUTFORM;coerce;$Of;6| '|SPADreplace| '(XLAM (|a|) |a|)) +(PUT '|OUTFORM;coerce;2$;6| '|SPADreplace| '(XLAM (|a|) |a|)) -(DEFUN |OUTFORM;coerce;$Of;6| (|a| $) |a|) +(DEFUN |OUTFORM;coerce;2$;6| (|a| $) |a|) (PUT '|OUTFORM;outputForm;I$;7| '|SPADreplace| '(XLAM (|n|) |n|)) @@ -50,9 +52,10 @@ (DEFUN |OUTFORM;outputForm;S$;13| (|s| $) (|OUTFORM;sform| - (SPADCALL (SPADCALL (QREFELT $ 26)) - (SPADCALL |s| (SPADCALL (QREFELT $ 26)) (QREFELT $ 27)) - (QREFELT $ 28)) + (SPADCALL (SPADCALL (|getShellEntry| $ 26)) + (SPADCALL |s| (SPADCALL (|getShellEntry| $ 26)) + (|getShellEntry| $ 27)) + (|getShellEntry| $ 28)) $)) (PUT '|OUTFORM;width;$I;14| '|SPADreplace| '|outformWidth|) @@ -81,50 +84,58 @@ (DEFUN |OUTFORM;center;$I$;20| (|a| |w| $) (SPADCALL - (SPADCALL (QUOTIENT2 (- |w| (SPADCALL |a| (QREFELT $ 30))) 2) - (QREFELT $ 36)) - |a| (QREFELT $ 37))) + (SPADCALL + (QUOTIENT2 (- |w| (SPADCALL |a| (|getShellEntry| $ 30))) 2) + (|getShellEntry| $ 36)) + |a| (|getShellEntry| $ 37))) (DEFUN |OUTFORM;left;$I$;21| (|a| |w| $) (SPADCALL |a| - (SPADCALL (- |w| (SPADCALL |a| (QREFELT $ 30))) (QREFELT $ 36)) - (QREFELT $ 37))) + (SPADCALL (- |w| (SPADCALL |a| (|getShellEntry| $ 30))) + (|getShellEntry| $ 36)) + (|getShellEntry| $ 37))) (DEFUN |OUTFORM;right;$I$;22| (|a| |w| $) (SPADCALL - (SPADCALL (- |w| (SPADCALL |a| (QREFELT $ 30))) (QREFELT $ 36)) - |a| (QREFELT $ 37))) + (SPADCALL (- |w| (SPADCALL |a| (|getShellEntry| $ 30))) + (|getShellEntry| $ 36)) + |a| (|getShellEntry| $ 37))) (DEFUN |OUTFORM;center;2$;23| (|a| $) - (SPADCALL |a| (SPADCALL (QREFELT $ 35)) (QREFELT $ 38))) + (SPADCALL |a| (SPADCALL (|getShellEntry| $ 35)) + (|getShellEntry| $ 38))) (DEFUN |OUTFORM;left;2$;24| (|a| $) - (SPADCALL |a| (SPADCALL (QREFELT $ 35)) (QREFELT $ 39))) + (SPADCALL |a| (SPADCALL (|getShellEntry| $ 35)) + (|getShellEntry| $ 39))) (DEFUN |OUTFORM;right;2$;25| (|a| $) - (SPADCALL |a| (SPADCALL (QREFELT $ 35)) (QREFELT $ 40))) + (SPADCALL |a| (SPADCALL (|getShellEntry| $ 35)) + (|getShellEntry| $ 40))) (DEFUN |OUTFORM;vspace;I$;26| (|n| $) (COND - ((EQL |n| 0) (SPADCALL (QREFELT $ 12))) + ((EQL |n| 0) (SPADCALL (|getShellEntry| $ 12))) ('T (SPADCALL (|OUTFORM;sform| " " $) - (SPADCALL (- |n| 1) (QREFELT $ 44)) (QREFELT $ 45))))) + (SPADCALL (- |n| 1) (|getShellEntry| $ 44)) + (|getShellEntry| $ 45))))) (DEFUN |OUTFORM;hspace;I$;27| (|n| $) (COND - ((EQL |n| 0) (SPADCALL (QREFELT $ 12))) + ((EQL |n| 0) (SPADCALL (|getShellEntry| $ 12))) ('T (|OUTFORM;sform| (|fillerSpaces| |n|) $)))) (DEFUN |OUTFORM;rspace;2I$;28| (|n| |m| $) (COND - ((OR (EQL |n| 0) (EQL |m| 0)) (SPADCALL (QREFELT $ 12))) + ((OR (EQL |n| 0) (EQL |m| 0)) (SPADCALL (|getShellEntry| $ 12))) ('T - (SPADCALL (SPADCALL |n| (QREFELT $ 36)) - (SPADCALL |n| (- |m| 1) (QREFELT $ 46)) (QREFELT $ 45))))) + (SPADCALL (SPADCALL |n| (|getShellEntry| $ 36)) + (SPADCALL |n| (- |m| 1) (|getShellEntry| $ 46)) + (|getShellEntry| $ 45))))) (DEFUN |OUTFORM;matrix;L$;29| (|ll| $) - (PROG (#0=#:G1437 |l| #1=#:G1438 |lv|) + (PROG (#0=#:G1439 |l| #1=#:G1440 |lv|) (RETURN (SEQ (LETT |lv| (PROGN @@ -155,13 +166,13 @@ (CONS (|OUTFORM;eform| 'AGGSET $) |l|)) (DEFUN |OUTFORM;blankSeparate;L$;33| (|l| $) - (PROG (|c| |u| #0=#:G1446 |l1|) + (PROG (|c| |u| #0=#:G1448 |l1|) (RETURN (SEQ (LETT |c| (|OUTFORM;eform| 'CONCATB $) |OUTFORM;blankSeparate;L$;33|) (LETT |l1| NIL |OUTFORM;blankSeparate;L$;33|) (SEQ (LETT |u| NIL |OUTFORM;blankSeparate;L$;33|) - (LETT #0# (SPADCALL |l| (QREFELT $ 53)) + (LETT #0# (SPADCALL |l| (|getShellEntry| $ 53)) |OUTFORM;blankSeparate;L$;33|) G190 (COND @@ -175,7 +186,7 @@ ((EQCAR |u| |c|) (LETT |l1| (SPADCALL (CDR |u|) |l1| - (QREFELT $ 54)) + (|getShellEntry| $ 54)) |OUTFORM;blankSeparate;L$;33|)) ('T (LETT |l1| (CONS |u| |l1|) @@ -188,19 +199,22 @@ (LIST (|OUTFORM;eform| 'BRACE $) |a|)) (DEFUN |OUTFORM;brace;L$;35| (|l| $) - (SPADCALL (SPADCALL |l| (QREFELT $ 51)) (QREFELT $ 56))) + (SPADCALL (SPADCALL |l| (|getShellEntry| $ 51)) + (|getShellEntry| $ 56))) (DEFUN |OUTFORM;bracket;2$;36| (|a| $) (LIST (|OUTFORM;eform| 'BRACKET $) |a|)) (DEFUN |OUTFORM;bracket;L$;37| (|l| $) - (SPADCALL (SPADCALL |l| (QREFELT $ 51)) (QREFELT $ 58))) + (SPADCALL (SPADCALL |l| (|getShellEntry| $ 51)) + (|getShellEntry| $ 58))) (DEFUN |OUTFORM;paren;2$;38| (|a| $) (LIST (|OUTFORM;eform| 'PAREN $) |a|)) (DEFUN |OUTFORM;paren;L$;39| (|l| $) - (SPADCALL (SPADCALL |l| (QREFELT $ 51)) (QREFELT $ 60))) + (SPADCALL (SPADCALL |l| (|getShellEntry| $ 51)) + (|getShellEntry| $ 60))) (DEFUN |OUTFORM;sub;3$;40| (|a| |b| $) (LIST (|OUTFORM;eform| 'SUB $) |a| |b|)) @@ -218,17 +232,19 @@ (DEFUN |OUTFORM;scripts;$L$;44| (|a| |l| $) (COND - ((SPADCALL |l| (QREFELT $ 66)) |a|) - ((SPADCALL (SPADCALL |l| (QREFELT $ 67)) (QREFELT $ 66)) - (SPADCALL |a| (SPADCALL |l| (QREFELT $ 68)) (QREFELT $ 62))) + ((SPADCALL |l| (|getShellEntry| $ 66)) |a|) + ((SPADCALL (SPADCALL |l| (|getShellEntry| $ 67)) + (|getShellEntry| $ 66)) + (SPADCALL |a| (SPADCALL |l| (|getShellEntry| $ 68)) + (|getShellEntry| $ 62))) ('T (CONS (|OUTFORM;eform| 'SUPERSUB $) (CONS |a| |l|))))) (DEFUN |OUTFORM;supersub;$L$;45| (|a| |l| $) (SEQ (COND - ((ODDP (SPADCALL |l| (QREFELT $ 71))) + ((ODDP (SPADCALL |l| (|getShellEntry| $ 71))) (LETT |l| - (SPADCALL |l| (LIST (SPADCALL (QREFELT $ 12))) - (QREFELT $ 73)) + (SPADCALL |l| (LIST (SPADCALL (|getShellEntry| $ 12))) + (|getShellEntry| $ 73)) |OUTFORM;supersub;$L$;45|))) (EXIT (CONS (|OUTFORM;eform| 'ALTSUPERSUB $) (CONS |a| |l|))))) @@ -309,7 +325,7 @@ (DEFUN |OUTFORM;empty;$;71| ($) (LIST (|OUTFORM;eform| 'NOTHING $))) (DEFUN |OUTFORM;infix?;$B;72| (|a| $) - (PROG (#0=#:G1491 |e|) + (PROG (#0=#:G1493 |e|) (RETURN (SEQ (EXIT (SEQ (LETT |e| (COND @@ -329,32 +345,35 @@ (DEFUN |OUTFORM;prefix;$L$;74| (|a| |l| $) (COND - ((NULL (SPADCALL |a| (QREFELT $ 98))) (CONS |a| |l|)) + ((NULL (SPADCALL |a| (|getShellEntry| $ 98))) (CONS |a| |l|)) ('T (SPADCALL |a| - (SPADCALL (SPADCALL |l| (QREFELT $ 51)) (QREFELT $ 60)) - (QREFELT $ 37))))) + (SPADCALL (SPADCALL |l| (|getShellEntry| $ 51)) + (|getShellEntry| $ 60)) + (|getShellEntry| $ 37))))) (DEFUN |OUTFORM;infix;$L$;75| (|a| |l| $) (COND - ((SPADCALL |l| (QREFELT $ 66)) (SPADCALL (QREFELT $ 12))) - ((SPADCALL (SPADCALL |l| (QREFELT $ 67)) (QREFELT $ 66)) - (SPADCALL |l| (QREFELT $ 68))) - ((SPADCALL |a| (QREFELT $ 98)) (CONS |a| |l|)) + ((SPADCALL |l| (|getShellEntry| $ 66)) + (SPADCALL (|getShellEntry| $ 12))) + ((SPADCALL (SPADCALL |l| (|getShellEntry| $ 67)) + (|getShellEntry| $ 66)) + (SPADCALL |l| (|getShellEntry| $ 68))) + ((SPADCALL |a| (|getShellEntry| $ 98)) (CONS |a| |l|)) ('T (SPADCALL - (LIST (SPADCALL |l| (QREFELT $ 68)) |a| - (SPADCALL |a| (SPADCALL |l| (QREFELT $ 101)) - (QREFELT $ 102))) - (QREFELT $ 75))))) + (LIST (SPADCALL |l| (|getShellEntry| $ 68)) |a| + (SPADCALL |a| (SPADCALL |l| (|getShellEntry| $ 101)) + (|getShellEntry| $ 102))) + (|getShellEntry| $ 75))))) (DEFUN |OUTFORM;infix;4$;76| (|a| |b| |c| $) (COND - ((SPADCALL |a| (QREFELT $ 98)) (LIST |a| |b| |c|)) - ('T (SPADCALL (LIST |b| |a| |c|) (QREFELT $ 75))))) + ((SPADCALL |a| (|getShellEntry| $ 98)) (LIST |a| |b| |c|)) + ('T (SPADCALL (LIST |b| |a| |c|) (|getShellEntry| $ 75))))) (DEFUN |OUTFORM;postfix;3$;77| (|a| |b| $) - (SPADCALL |b| |a| (QREFELT $ 37))) + (SPADCALL |b| |a| (|getShellEntry| $ 37))) (DEFUN |OUTFORM;string;2$;78| (|a| $) (LIST (|OUTFORM;eform| 'STRING $) |a|)) @@ -366,26 +385,30 @@ (LIST (|OUTFORM;eform| 'OVERBAR $) |a|)) (DEFUN |OUTFORM;dot;2$;81| (|a| $) - (SPADCALL |a| (|OUTFORM;sform| "." $) (QREFELT $ 63))) + (SPADCALL |a| (|OUTFORM;sform| "." $) (|getShellEntry| $ 63))) (DEFUN |OUTFORM;prime;2$;82| (|a| $) - (SPADCALL |a| (|OUTFORM;sform| "," $) (QREFELT $ 63))) + (SPADCALL |a| (|OUTFORM;sform| "," $) (|getShellEntry| $ 63))) (DEFUN |OUTFORM;dot;$Nni$;83| (|a| |nn| $) (PROG (|s|) (RETURN (SEQ (LETT |s| - (MAKE-FULL-CVEC |nn| (SPADCALL "." (QREFELT $ 110))) + (MAKE-FULL-CVEC |nn| + (SPADCALL "." (|getShellEntry| $ 110))) |OUTFORM;dot;$Nni$;83|) - (EXIT (SPADCALL |a| (|OUTFORM;sform| |s| $) (QREFELT $ 63))))))) + (EXIT (SPADCALL |a| (|OUTFORM;sform| |s| $) + (|getShellEntry| $ 63))))))) (DEFUN |OUTFORM;prime;$Nni$;84| (|a| |nn| $) (PROG (|s|) (RETURN (SEQ (LETT |s| - (MAKE-FULL-CVEC |nn| (SPADCALL "," (QREFELT $ 110))) + (MAKE-FULL-CVEC |nn| + (SPADCALL "," (|getShellEntry| $ 110))) |OUTFORM;prime;$Nni$;84|) - (EXIT (SPADCALL |a| (|OUTFORM;sform| |s| $) (QREFELT $ 63))))))) + (EXIT (SPADCALL |a| (|OUTFORM;sform| |s| $) + (|getShellEntry| $ 63))))))) (DEFUN |OUTFORM;overlabel;3$;85| (|a| |b| $) (LIST (|OUTFORM;eform| 'OVERLABEL $) |a| |b|)) @@ -418,11 +441,11 @@ (LIST (|OUTFORM;eform| 'TAG $) |a| |b|)) (DEFUN |OUTFORM;differentiate;$Nni$;95| (|a| |nn| $) - (PROG (#0=#:G1521 |r| |s|) + (PROG (#0=#:G1523 |r| |s|) (RETURN (SEQ (COND ((ZEROP |nn|) |a|) - ((< |nn| 4) (SPADCALL |a| |nn| (QREFELT $ 112))) + ((< |nn| 4) (SPADCALL |a| |nn| (|getShellEntry| $ 112))) ('T (SEQ (LETT |r| (SPADCALL @@ -430,17 +453,18 @@ |OUTFORM;differentiate;$Nni$;95|) (|check-subtype| (> #0# 0) '(|PositiveInteger|) #0#)) - (QREFELT $ 125)) + (|getShellEntry| $ 125)) |OUTFORM;differentiate;$Nni$;95|) - (LETT |s| (SPADCALL |r| (QREFELT $ 126)) + (LETT |s| (SPADCALL |r| (|getShellEntry| $ 126)) |OUTFORM;differentiate;$Nni$;95|) (EXIT (SPADCALL |a| (SPADCALL (|OUTFORM;sform| |s| $) - (QREFELT $ 60)) - (QREFELT $ 63)))))))))) + (|getShellEntry| $ 60)) + (|getShellEntry| $ 63)))))))))) (DEFUN |OUTFORM;sum;2$;96| (|a| $) - (LIST (|OUTFORM;eform| 'SIGMA $) (SPADCALL (QREFELT $ 12)) |a|)) + (LIST (|OUTFORM;eform| 'SIGMA $) (SPADCALL (|getShellEntry| $ 12)) + |a|)) (DEFUN |OUTFORM;sum;3$;97| (|a| |b| $) (LIST (|OUTFORM;eform| 'SIGMA $) |b| |a|)) @@ -449,7 +473,7 @@ (LIST (|OUTFORM;eform| 'SIGMA2 $) |b| |c| |a|)) (DEFUN |OUTFORM;prod;2$;99| (|a| $) - (LIST (|OUTFORM;eform| 'PI $) (SPADCALL (QREFELT $ 12)) |a|)) + (LIST (|OUTFORM;eform| 'PI $) (SPADCALL (|getShellEntry| $ 12)) |a|)) (DEFUN |OUTFORM;prod;3$;100| (|a| |b| $) (LIST (|OUTFORM;eform| 'PI $) |b| |a|)) @@ -458,11 +482,12 @@ (LIST (|OUTFORM;eform| 'PI2 $) |b| |c| |a|)) (DEFUN |OUTFORM;int;2$;102| (|a| $) - (LIST (|OUTFORM;eform| 'INTSIGN $) (SPADCALL (QREFELT $ 12)) - (SPADCALL (QREFELT $ 12)) |a|)) + (LIST (|OUTFORM;eform| 'INTSIGN $) (SPADCALL (|getShellEntry| $ 12)) + (SPADCALL (|getShellEntry| $ 12)) |a|)) (DEFUN |OUTFORM;int;3$;103| (|a| |b| $) - (LIST (|OUTFORM;eform| 'INTSIGN $) |b| (SPADCALL (QREFELT $ 12)) |a|)) + (LIST (|OUTFORM;eform| 'INTSIGN $) |b| + (SPADCALL (|getShellEntry| $ 12)) |a|)) (DEFUN |OUTFORM;int;4$;104| (|a| |b| |c| $) (LIST (|OUTFORM;eform| 'INTSIGN $) |b| |c| |a|)) @@ -470,7 +495,7 @@ (DEFUN |OutputForm| () (PROG () (RETURN - (PROG (#0=#:G1535) + (PROG (#0=#:G1537) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|OutputForm|) @@ -491,11 +516,12 @@ (PROGN (LETT |dv$| '(|OutputForm|) . #0=(|OutputForm|)) (LETT $ (|newShell| 138) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|haddProp| |$ConstructorCache| '|OutputForm| NIL (CONS 1 $)) (|stuffDomainSlots| $) - (QSETREFV $ 6 (|List| $)) + (|setShellEntry| $ 6 (|List| $)) $)))) (MAKEPROP '|OutputForm| '|infovec| @@ -503,7 +529,7 @@ |OUTFORM;print;$V;1| (|Boolean|) (|String|) (0 . |empty?|) |OUTFORM;empty;$;71| |OUTFORM;message;S$;2| |OUTFORM;messagePrint;SV;3| |OUTFORM;=;2$B;4| - |OUTFORM;=;3$;5| (|OutputForm|) |OUTFORM;coerce;$Of;6| + |OUTFORM;=;3$;5| (|OutputForm|) |OUTFORM;coerce;2$;6| (|Integer|) |OUTFORM;outputForm;I$;7| (|Symbol|) |OUTFORM;outputForm;S$;8| (|DoubleFloat|) |OUTFORM;outputForm;Df$;9| (|Character|) (5 . |quote|) @@ -516,8 +542,8 @@ |OUTFORM;right;$I$;22| |OUTFORM;center;2$;23| |OUTFORM;left;2$;24| |OUTFORM;right;2$;25| |OUTFORM;vspace;I$;26| |OUTFORM;vconcat;3$;48| - |OUTFORM;rspace;2I$;28| (|List| 49) |OUTFORM;matrix;L$;29| - (|List| $) |OUTFORM;pile;L$;30| + |OUTFORM;rspace;2I$;28| (|List| $) (|List| 47) + |OUTFORM;matrix;L$;29| |OUTFORM;pile;L$;30| |OUTFORM;commaSeparate;L$;31| |OUTFORM;semicolonSeparate;L$;32| (21 . |reverse|) (26 . |append|) |OUTFORM;blankSeparate;L$;33| @@ -587,34 +613,34 @@ 1 25 0 10 110 1 124 10 123 125 1 10 0 0 126 2 0 0 0 0 77 2 0 9 0 0 1 2 0 0 0 0 115 0 0 19 35 1 0 19 0 30 1 0 0 - 19 44 1 0 0 49 76 2 0 0 0 0 45 2 0 0 - 0 49 74 1 0 19 0 33 2 0 0 0 0 63 2 0 + 19 44 1 0 0 47 76 2 0 0 0 0 45 2 0 0 + 0 47 74 1 0 19 0 33 2 0 0 0 0 63 2 0 0 0 0 129 3 0 0 0 0 0 130 1 0 0 0 128 1 0 19 0 32 2 0 0 0 0 62 1 0 0 0 105 - 2 0 0 0 0 119 1 0 0 49 52 2 0 0 0 49 + 2 0 0 0 0 119 1 0 0 47 52 2 0 0 0 47 69 2 0 0 19 19 46 1 0 0 0 116 2 0 0 0 0 117 1 0 0 0 43 2 0 0 0 19 40 2 0 0 0 0 89 2 0 0 0 0 122 1 0 0 0 106 2 0 0 0 0 90 3 0 0 0 0 0 133 1 0 0 0 131 2 0 0 0 0 132 1 0 7 0 8 2 0 0 0 70 112 1 0 0 0 109 2 0 0 0 0 65 2 0 0 0 - 0 64 2 0 0 0 49 100 2 0 0 0 0 104 1 0 - 0 49 50 1 0 0 49 61 1 0 0 0 60 2 0 0 + 0 64 2 0 0 0 47 100 2 0 0 0 0 104 1 0 + 0 47 50 1 0 0 47 61 1 0 0 0 60 2 0 0 0 0 113 1 0 0 0 107 2 0 0 0 0 118 1 0 0 10 29 1 0 0 23 24 1 0 0 21 22 1 0 0 19 20 2 0 0 0 0 93 1 0 0 0 94 1 0 7 - 10 14 1 0 0 10 13 1 0 0 47 48 1 0 0 0 + 10 14 1 0 0 10 13 1 0 0 48 49 1 0 0 0 42 2 0 0 0 19 39 1 0 10 0 1 2 0 0 0 0 121 3 0 0 0 0 0 136 2 0 0 0 0 135 1 0 - 0 0 134 1 0 9 0 98 2 0 0 0 49 102 3 0 + 0 0 134 1 0 9 0 98 2 0 0 0 47 102 3 0 0 0 0 0 103 1 0 0 19 36 0 0 19 34 1 0 - 19 0 31 1 0 0 49 75 2 0 0 0 0 37 1 0 + 19 0 31 1 0 0 47 75 2 0 0 0 0 37 1 0 137 0 1 2 0 0 0 0 91 0 0 0 12 2 0 0 0 - 49 99 2 0 0 0 70 111 1 0 0 0 108 2 0 - 0 0 0 88 2 0 0 0 70 127 1 0 0 49 51 1 + 47 99 2 0 0 0 70 111 1 0 0 0 108 2 0 + 0 0 0 88 2 0 0 0 70 127 1 0 0 47 51 1 0 17 0 18 1 0 0 0 41 2 0 0 0 19 38 1 - 0 0 0 58 1 0 0 49 59 1 0 0 49 57 1 0 - 0 0 56 1 0 0 0 114 1 0 0 49 55 2 0 0 + 0 0 0 58 1 0 0 47 59 1 0 0 47 57 1 0 + 0 0 56 1 0 0 0 114 1 0 0 47 55 2 0 0 0 0 97 2 0 0 0 0 120 2 0 0 0 0 92 1 0 0 0 96 2 0 0 0 0 95 2 0 0 0 0 81 2 0 0 0 0 79 2 0 0 0 0 16 2 0 9 0 0 15 2 @@ -623,4 +649,359 @@ 2 0 0 0 0 87 2 0 0 0 0 85))))) '|lookupComplete|)) +(SETQ |$CategoryFrame| + (|put| '|OutputForm| '|isFunctor| + '(((SEGMENT ($ $)) T (ELT $ 96)) + ((SEGMENT ($ $ $)) T (ELT $ 95)) + ((|not| ($ $)) T (ELT $ 94)) + ((|or| ($ $ $)) T (ELT $ 93)) + ((|and| ($ $ $)) T (ELT $ 92)) + ((|exquo| ($ $ $)) T (ELT $ 91)) + ((|quo| ($ $ $)) T (ELT $ 90)) + ((|rem| ($ $ $)) T (ELT $ 89)) + ((|div| ($ $ $)) T (ELT $ 88)) + ((** ($ $ $)) T (ELT $ 87)) ((/ ($ $ $)) T (ELT $ 86)) + ((* ($ $ $)) T (ELT $ 85)) ((- ($ $)) T (ELT $ 84)) + ((- ($ $ $)) T (ELT $ 83)) ((+ ($ $ $)) T (ELT $ 82)) + ((>= ($ $ $)) T (ELT $ 81)) ((<= ($ $ $)) T (ELT $ 80)) + ((> ($ $ $)) T (ELT $ 79)) ((< ($ $ $)) T (ELT $ 78)) + ((~= ($ $ $)) T (ELT $ 77)) ((= ($ $ $)) T (ELT $ 16)) + ((|blankSeparate| ($ (|List| $))) T (ELT $ 55)) + ((|semicolonSeparate| ($ (|List| $))) T (ELT $ 52)) + ((|commaSeparate| ($ (|List| $))) T (ELT $ 51)) + ((|pile| ($ (|List| $))) T (ELT $ 50)) + ((|paren| ($ (|List| $))) T (ELT $ 61)) + ((|paren| ($ $)) T (ELT $ 60)) + ((|bracket| ($ (|List| $))) T (ELT $ 59)) + ((|bracket| ($ $)) T (ELT $ 58)) + ((|brace| ($ (|List| $))) T (ELT $ 57)) + ((|brace| ($ $)) T (ELT $ 56)) + ((|int| ($ $ $ $)) T (ELT $ 136)) + ((|int| ($ $ $)) T (ELT $ 135)) + ((|int| ($ $)) T (ELT $ 134)) + ((|prod| ($ $ $ $)) T (ELT $ 133)) + ((|prod| ($ $ $)) T (ELT $ 132)) + ((|prod| ($ $)) T (ELT $ 131)) + ((|sum| ($ $ $ $)) T (ELT $ 130)) + ((|sum| ($ $ $)) T (ELT $ 129)) + ((|sum| ($ $)) T (ELT $ 128)) + ((|overlabel| ($ $ $)) T (ELT $ 113)) + ((|overbar| ($ $)) T (ELT $ 107)) + ((|prime| ($ $ (|NonNegativeInteger|))) T (ELT $ 112)) + ((|prime| ($ $)) T (ELT $ 109)) + ((|dot| ($ $ (|NonNegativeInteger|))) T (ELT $ 111)) + ((|dot| ($ $)) T (ELT $ 108)) + ((|quote| ($ $)) T (ELT $ 106)) + ((|supersub| ($ $ (|List| $))) T (ELT $ 74)) + ((|scripts| ($ $ (|List| $))) T (ELT $ 69)) + ((|presuper| ($ $ $)) T (ELT $ 65)) + ((|presub| ($ $ $)) T (ELT $ 64)) + ((|super| ($ $ $)) T (ELT $ 63)) + ((|sub| ($ $ $)) T (ELT $ 62)) + ((|binomial| ($ $ $)) T (ELT $ 97)) + ((|differentiate| ($ $ (|NonNegativeInteger|))) T + (ELT $ 127)) + ((|rarrow| ($ $ $)) T (ELT $ 122)) + ((|assign| ($ $ $)) T (ELT $ 120)) + ((|slash| ($ $ $)) T (ELT $ 119)) + ((|over| ($ $ $)) T (ELT $ 118)) + ((|root| ($ $ $)) T (ELT $ 117)) + ((|root| ($ $)) T (ELT $ 116)) + ((|zag| ($ $ $)) T (ELT $ 115)) + ((|matrix| ($ (|List| (|List| $)))) T (ELT $ 49)) + ((|box| ($ $)) T (ELT $ 114)) + ((|label| ($ $ $)) T (ELT $ 121)) + ((|string| ($ $)) T (ELT $ 105)) + ((|elt| ($ $ (|List| $))) T (ELT $ 99)) + ((|infix?| ((|Boolean|) $)) T (ELT $ 98)) + ((|postfix| ($ $ $)) T (ELT $ 104)) + ((|infix| ($ $ $ $)) T (ELT $ 103)) + ((|infix| ($ $ (|List| $))) T (ELT $ 102)) + ((|prefix| ($ $ (|List| $))) T (ELT $ 100)) + ((|vconcat| ($ (|List| $))) T (ELT $ 76)) + ((|hconcat| ($ (|List| $))) T (ELT $ 75)) + ((|vconcat| ($ $ $)) T (ELT $ 45)) + ((|hconcat| ($ $ $)) T (ELT $ 37)) + ((|center| ($ $)) T (ELT $ 41)) + ((|right| ($ $)) T (ELT $ 43)) + ((|left| ($ $)) T (ELT $ 42)) + ((|center| ($ $ (|Integer|))) T (ELT $ 38)) + ((|right| ($ $ (|Integer|))) T (ELT $ 40)) + ((|left| ($ $ (|Integer|))) T (ELT $ 39)) + ((|rspace| ($ (|Integer|) (|Integer|))) T (ELT $ 46)) + ((|vspace| ($ (|Integer|))) T (ELT $ 44)) + ((|hspace| ($ (|Integer|))) T (ELT $ 36)) + ((|superHeight| ((|Integer|) $)) T (ELT $ 33)) + ((|subHeight| ((|Integer|) $)) T (ELT $ 32)) + ((|height| ((|Integer|))) T (ELT $ 34)) + ((|width| ((|Integer|))) T (ELT $ 35)) + ((|height| ((|Integer|) $)) T (ELT $ 31)) + ((|width| ((|Integer|) $)) T (ELT $ 30)) + ((|empty| ($)) T (ELT $ 12)) + ((|outputForm| ($ (|DoubleFloat|))) T (ELT $ 24)) + ((|outputForm| ($ (|String|))) T (ELT $ 29)) + ((|outputForm| ($ (|Symbol|))) T (ELT $ 22)) + ((|outputForm| ($ (|Integer|))) T (ELT $ 20)) + ((|messagePrint| ((|Void|) (|String|))) T (ELT $ 14)) + ((|message| ($ (|String|))) T (ELT $ 13)) + ((|print| ((|Void|) $)) T (ELT $ 8)) + ((|latex| ((|String|) $)) T (ELT $ NIL)) + ((|hash| ((|SingleInteger|) $)) T (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ 18)) + ((= ((|Boolean|) $ $)) T (ELT $ 15)) + ((~= ((|Boolean|) $ $)) T (ELT $ NIL))) + (|addModemap| '|OutputForm| '(|OutputForm|) + '((|Join| (|SetCategory|) + (CATEGORY |domain| + (SIGNATURE |print| ((|Void|) $)) + (SIGNATURE |message| ($ (|String|))) + (SIGNATURE |messagePrint| + ((|Void|) (|String|))) + (SIGNATURE |outputForm| ($ (|Integer|))) + (SIGNATURE |outputForm| ($ (|Symbol|))) + (SIGNATURE |outputForm| ($ (|String|))) + (SIGNATURE |outputForm| + ($ (|DoubleFloat|))) + (SIGNATURE |empty| ($)) + (SIGNATURE |width| ((|Integer|) $)) + (SIGNATURE |height| ((|Integer|) $)) + (SIGNATURE |width| ((|Integer|))) + (SIGNATURE |height| ((|Integer|))) + (SIGNATURE |subHeight| ((|Integer|) $)) + (SIGNATURE |superHeight| + ((|Integer|) $)) + (SIGNATURE |hspace| ($ (|Integer|))) + (SIGNATURE |vspace| ($ (|Integer|))) + (SIGNATURE |rspace| + ($ (|Integer|) (|Integer|))) + (SIGNATURE |left| ($ $ (|Integer|))) + (SIGNATURE |right| ($ $ (|Integer|))) + (SIGNATURE |center| ($ $ (|Integer|))) + (SIGNATURE |left| ($ $)) + (SIGNATURE |right| ($ $)) + (SIGNATURE |center| ($ $)) + (SIGNATURE |hconcat| ($ $ $)) + (SIGNATURE |vconcat| ($ $ $)) + (SIGNATURE |hconcat| ($ (|List| $))) + (SIGNATURE |vconcat| ($ (|List| $))) + (SIGNATURE |prefix| ($ $ (|List| $))) + (SIGNATURE |infix| ($ $ (|List| $))) + (SIGNATURE |infix| ($ $ $ $)) + (SIGNATURE |postfix| ($ $ $)) + (SIGNATURE |infix?| ((|Boolean|) $)) + (SIGNATURE |elt| ($ $ (|List| $))) + (SIGNATURE |string| ($ $)) + (SIGNATURE |label| ($ $ $)) + (SIGNATURE |box| ($ $)) + (SIGNATURE |matrix| + ($ (|List| (|List| $)))) + (SIGNATURE |zag| ($ $ $)) + (SIGNATURE |root| ($ $)) + (SIGNATURE |root| ($ $ $)) + (SIGNATURE |over| ($ $ $)) + (SIGNATURE |slash| ($ $ $)) + (SIGNATURE |assign| ($ $ $)) + (SIGNATURE |rarrow| ($ $ $)) + (SIGNATURE |differentiate| + ($ $ (|NonNegativeInteger|))) + (SIGNATURE |binomial| ($ $ $)) + (SIGNATURE |sub| ($ $ $)) + (SIGNATURE |super| ($ $ $)) + (SIGNATURE |presub| ($ $ $)) + (SIGNATURE |presuper| ($ $ $)) + (SIGNATURE |scripts| ($ $ (|List| $))) + (SIGNATURE |supersub| ($ $ (|List| $))) + (SIGNATURE |quote| ($ $)) + (SIGNATURE |dot| ($ $)) + (SIGNATURE |dot| + ($ $ (|NonNegativeInteger|))) + (SIGNATURE |prime| ($ $)) + (SIGNATURE |prime| + ($ $ (|NonNegativeInteger|))) + (SIGNATURE |overbar| ($ $)) + (SIGNATURE |overlabel| ($ $ $)) + (SIGNATURE |sum| ($ $)) + (SIGNATURE |sum| ($ $ $)) + (SIGNATURE |sum| ($ $ $ $)) + (SIGNATURE |prod| ($ $)) + (SIGNATURE |prod| ($ $ $)) + (SIGNATURE |prod| ($ $ $ $)) + (SIGNATURE |int| ($ $)) + (SIGNATURE |int| ($ $ $)) + (SIGNATURE |int| ($ $ $ $)) + (SIGNATURE |brace| ($ $)) + (SIGNATURE |brace| ($ (|List| $))) + (SIGNATURE |bracket| ($ $)) + (SIGNATURE |bracket| ($ (|List| $))) + (SIGNATURE |paren| ($ $)) + (SIGNATURE |paren| ($ (|List| $))) + (SIGNATURE |pile| ($ (|List| $))) + (SIGNATURE |commaSeparate| + ($ (|List| $))) + (SIGNATURE |semicolonSeparate| + ($ (|List| $))) + (SIGNATURE |blankSeparate| + ($ (|List| $))) + (SIGNATURE = ($ $ $)) + (SIGNATURE ~= ($ $ $)) + (SIGNATURE < ($ $ $)) + (SIGNATURE > ($ $ $)) + (SIGNATURE <= ($ $ $)) + (SIGNATURE >= ($ $ $)) + (SIGNATURE + ($ $ $)) + (SIGNATURE - ($ $ $)) + (SIGNATURE - ($ $)) + (SIGNATURE * ($ $ $)) + (SIGNATURE / ($ $ $)) + (SIGNATURE ** ($ $ $)) + (SIGNATURE |div| ($ $ $)) + (SIGNATURE |rem| ($ $ $)) + (SIGNATURE |quo| ($ $ $)) + (SIGNATURE |exquo| ($ $ $)) + (SIGNATURE |and| ($ $ $)) + (SIGNATURE |or| ($ $ $)) + (SIGNATURE |not| ($ $)) + (SIGNATURE SEGMENT ($ $ $)) + (SIGNATURE SEGMENT ($ $))))) + T '|OutputForm| + (|put| '|OutputForm| '|mode| + '(|Mapping| + (|Join| (|SetCategory|) + (CATEGORY |domain| + (SIGNATURE |print| ((|Void|) $)) + (SIGNATURE |message| + ($ (|String|))) + (SIGNATURE |messagePrint| + ((|Void|) (|String|))) + (SIGNATURE |outputForm| + ($ (|Integer|))) + (SIGNATURE |outputForm| + ($ (|Symbol|))) + (SIGNATURE |outputForm| + ($ (|String|))) + (SIGNATURE |outputForm| + ($ (|DoubleFloat|))) + (SIGNATURE |empty| ($)) + (SIGNATURE |width| + ((|Integer|) $)) + (SIGNATURE |height| + ((|Integer|) $)) + (SIGNATURE |width| ((|Integer|))) + (SIGNATURE |height| + ((|Integer|))) + (SIGNATURE |subHeight| + ((|Integer|) $)) + (SIGNATURE |superHeight| + ((|Integer|) $)) + (SIGNATURE |hspace| + ($ (|Integer|))) + (SIGNATURE |vspace| + ($ (|Integer|))) + (SIGNATURE |rspace| + ($ (|Integer|) (|Integer|))) + (SIGNATURE |left| + ($ $ (|Integer|))) + (SIGNATURE |right| + ($ $ (|Integer|))) + (SIGNATURE |center| + ($ $ (|Integer|))) + (SIGNATURE |left| ($ $)) + (SIGNATURE |right| ($ $)) + (SIGNATURE |center| ($ $)) + (SIGNATURE |hconcat| ($ $ $)) + (SIGNATURE |vconcat| ($ $ $)) + (SIGNATURE |hconcat| + ($ (|List| $))) + (SIGNATURE |vconcat| + ($ (|List| $))) + (SIGNATURE |prefix| + ($ $ (|List| $))) + (SIGNATURE |infix| + ($ $ (|List| $))) + (SIGNATURE |infix| ($ $ $ $)) + (SIGNATURE |postfix| ($ $ $)) + (SIGNATURE |infix?| + ((|Boolean|) $)) + (SIGNATURE |elt| + ($ $ (|List| $))) + (SIGNATURE |string| ($ $)) + (SIGNATURE |label| ($ $ $)) + (SIGNATURE |box| ($ $)) + (SIGNATURE |matrix| + ($ (|List| (|List| $)))) + (SIGNATURE |zag| ($ $ $)) + (SIGNATURE |root| ($ $)) + (SIGNATURE |root| ($ $ $)) + (SIGNATURE |over| ($ $ $)) + (SIGNATURE |slash| ($ $ $)) + (SIGNATURE |assign| ($ $ $)) + (SIGNATURE |rarrow| ($ $ $)) + (SIGNATURE |differentiate| + ($ $ (|NonNegativeInteger|))) + (SIGNATURE |binomial| ($ $ $)) + (SIGNATURE |sub| ($ $ $)) + (SIGNATURE |super| ($ $ $)) + (SIGNATURE |presub| ($ $ $)) + (SIGNATURE |presuper| ($ $ $)) + (SIGNATURE |scripts| + ($ $ (|List| $))) + (SIGNATURE |supersub| + ($ $ (|List| $))) + (SIGNATURE |quote| ($ $)) + (SIGNATURE |dot| ($ $)) + (SIGNATURE |dot| + ($ $ (|NonNegativeInteger|))) + (SIGNATURE |prime| ($ $)) + (SIGNATURE |prime| + ($ $ (|NonNegativeInteger|))) + (SIGNATURE |overbar| ($ $)) + (SIGNATURE |overlabel| ($ $ $)) + (SIGNATURE |sum| ($ $)) + (SIGNATURE |sum| ($ $ $)) + (SIGNATURE |sum| ($ $ $ $)) + (SIGNATURE |prod| ($ $)) + (SIGNATURE |prod| ($ $ $)) + (SIGNATURE |prod| ($ $ $ $)) + (SIGNATURE |int| ($ $)) + (SIGNATURE |int| ($ $ $)) + (SIGNATURE |int| ($ $ $ $)) + (SIGNATURE |brace| ($ $)) + (SIGNATURE |brace| + ($ (|List| $))) + (SIGNATURE |bracket| ($ $)) + (SIGNATURE |bracket| + ($ (|List| $))) + (SIGNATURE |paren| ($ $)) + (SIGNATURE |paren| + ($ (|List| $))) + (SIGNATURE |pile| ($ (|List| $))) + (SIGNATURE |commaSeparate| + ($ (|List| $))) + (SIGNATURE |semicolonSeparate| + ($ (|List| $))) + (SIGNATURE |blankSeparate| + ($ (|List| $))) + (SIGNATURE = ($ $ $)) + (SIGNATURE ~= ($ $ $)) + (SIGNATURE < ($ $ $)) + (SIGNATURE > ($ $ $)) + (SIGNATURE <= ($ $ $)) + (SIGNATURE >= ($ $ $)) + (SIGNATURE + ($ $ $)) + (SIGNATURE - ($ $ $)) + (SIGNATURE - ($ $)) + (SIGNATURE * ($ $ $)) + (SIGNATURE / ($ $ $)) + (SIGNATURE ** ($ $ $)) + (SIGNATURE |div| ($ $ $)) + (SIGNATURE |rem| ($ $ $)) + (SIGNATURE |quo| ($ $ $)) + (SIGNATURE |exquo| ($ $ $)) + (SIGNATURE |and| ($ $ $)) + (SIGNATURE |or| ($ $ $)) + (SIGNATURE |not| ($ $)) + (SIGNATURE SEGMENT ($ $ $)) + (SIGNATURE SEGMENT ($ $))))) + |$CategoryFrame|)))) + (MAKEPROP '|OutputForm| 'NILADIC T) diff --git a/src/algebra/strap/PI.lsp b/src/algebra/strap/PI.lsp index bf877607..063678d6 100644 --- a/src/algebra/strap/PI.lsp +++ b/src/algebra/strap/PI.lsp @@ -14,7 +14,7 @@ (DEFUN |PositiveInteger| () (PROG () (RETURN - (PROG (#0=#:G1396) + (PROG (#0=#:G1398) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|PositiveInteger|) @@ -72,4 +72,43 @@ 0 0 0 5 1 2 0 0 0 0 1 2 0 0 6 0 1))))) '|lookupComplete|)) +(SETQ |$CategoryFrame| + (|put| '|PositiveInteger| '|isFunctor| + '(((|gcd| ($ $ $)) T (ELT $ NIL)) + ((* ($ $ $)) T (ELT $ NIL)) + ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL)) + ((^ ($ $ (|PositiveInteger|))) T (ELT $ NIL)) + ((|One| ($)) T (CONST $ NIL)) + ((|sample| ($)) T (CONST $ NIL)) + ((|one?| ((|Boolean|) $)) T (ELT $ NIL)) + ((** ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((^ ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((|recip| ((|Union| $ "failed") $)) T (ELT $ NIL)) + ((+ ($ $ $)) T (ELT $ NIL)) + ((* ($ (|PositiveInteger|) $)) T (ELT $ NIL)) + ((|min| ($ $ $)) T (ELT $ NIL)) + ((|max| ($ $ $)) T (ELT $ NIL)) + ((<= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((>= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((> ((|Boolean|) $ $)) T (ELT $ NIL)) + ((< ((|Boolean|) $ $)) T (ELT $ NIL)) + ((|latex| ((|String|) $)) T (ELT $ NIL)) + ((|hash| ((|SingleInteger|) $)) T (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ NIL)) + ((= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((~= ((|Boolean|) $ $)) T (ELT $ NIL))) + (|addModemap| '|PositiveInteger| '(|PositiveInteger|) + '((|Join| (|OrderedAbelianSemiGroup|) (|Monoid|) + (CATEGORY |domain| (SIGNATURE |gcd| ($ $ $)) + (ATTRIBUTE (|commutative| "*"))))) + T '|PositiveInteger| + (|put| '|PositiveInteger| '|mode| + '(|Mapping| + (|Join| (|OrderedAbelianSemiGroup|) + (|Monoid|) + (CATEGORY |domain| + (SIGNATURE |gcd| ($ $ $)) + (ATTRIBUTE (|commutative| "*"))))) + |$CategoryFrame|)))) + (MAKEPROP '|PositiveInteger| 'NILADIC T) diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp index 557b4f8e..f9b376c2 100644 --- a/src/algebra/strap/POLYCAT-.lsp +++ b/src/algebra/strap/POLYCAT-.lsp @@ -2,8 +2,8 @@ (/VERSIONCHECK 2) (DEFUN |POLYCAT-;eval;SLS;1| (|p| |l| $) - (PROG (#0=#:G1427 #1=#:G1421 #2=#:G1428 #3=#:G1429 |lvar| #4=#:G1430 - |e| #5=#:G1431) + (PROG (#0=#:G1429 #1=#:G1423 #2=#:G1430 #3=#:G1431 |lvar| #4=#:G1432 + |e| #5=#:G1433) (RETURN (SEQ (COND ((NULL |l|) |p|) @@ -121,7 +121,7 @@ ('T (CONS 0 |l|)))))) (DEFUN |POLYCAT-;isTimes;SU;4| (|p| $) - (PROG (|lv| #0=#:G1453 |v| #1=#:G1454 |l| |r|) + (PROG (|lv| #0=#:G1455 |v| #1=#:G1456 |l| |r|) (RETURN (SEQ (COND ((OR (NULL (LETT |lv| @@ -222,7 +222,7 @@ (CDR |lv|) (CDR |ln|) (|getShellEntry| $ 56))))) (DEFUN |POLYCAT-;retract;SVarSet;9| (|p| $) - (PROG (#0=#:G1479 |q|) + (PROG (#0=#:G1481 |q|) (RETURN (SEQ (LETT |q| (PROG2 (LETT #0# (SPADCALL |p| (|getShellEntry| $ 43)) @@ -238,7 +238,7 @@ ('T (|error| "Polynomial is not a single variable")))))))) (DEFUN |POLYCAT-;retractIfCan;SU;10| (|p| $) - (PROG (|q| #0=#:G1487) + (PROG (|q| #0=#:G1489) (RETURN (SEQ (EXIT (SEQ (SEQ (LETT |q| (SPADCALL |p| (|getShellEntry| $ 43)) @@ -262,7 +262,7 @@ (|getShellEntry| $ 62))) (DEFUN |POLYCAT-;primitiveMonomials;SL;12| (|p| $) - (PROG (#0=#:G1492 |q| #1=#:G1493) + (PROG (#0=#:G1494 |q| #1=#:G1495) (RETURN (SEQ (PROGN (LETT #0# NIL |POLYCAT-;primitiveMonomials;SL;12|) @@ -285,7 +285,7 @@ (GO G190) G191 (EXIT (NREVERSE0 #0#)))))))) (DEFUN |POLYCAT-;totalDegree;SNni;13| (|p| $) - (PROG (#0=#:G1495 |d| |u|) + (PROG (#0=#:G1497 |d| |u|) (RETURN (SEQ (COND ((SPADCALL |p| (|getShellEntry| $ 64)) 0) @@ -325,7 +325,7 @@ (EXIT |d|)))))))) (DEFUN |POLYCAT-;totalDegree;SLNni;14| (|p| |lv| $) - (PROG (#0=#:G1503 |v| |w| |d| |u|) + (PROG (#0=#:G1505 |v| |w| |d| |u|) (RETURN (SEQ (COND ((SPADCALL |p| (|getShellEntry| $ 64)) 0) @@ -382,7 +382,7 @@ (|getShellEntry| $ 77))) (DEFUN |POLYCAT-;allMonoms| (|l| $) - (PROG (#0=#:G1515 |p| #1=#:G1516) + (PROG (#0=#:G1517 |p| #1=#:G1518) (RETURN (SEQ (SPADCALL (SPADCALL @@ -409,7 +409,7 @@ (|getShellEntry| $ 82)))))) (DEFUN |POLYCAT-;P2R| (|p| |b| |n| $) - (PROG (|w| |bj| #0=#:G1521 |i| #1=#:G1520) + (PROG (|w| |bj| #0=#:G1523 |i| #1=#:G1522) (RETURN (SEQ (LETT |w| (SPADCALL |n| (|spadConstant| $ 23) @@ -438,7 +438,7 @@ (EXIT |w|))))) (DEFUN |POLYCAT-;eq2R| (|l| |b| $) - (PROG (#0=#:G1525 |bj| #1=#:G1526 #2=#:G1527 |p| #3=#:G1528) + (PROG (#0=#:G1527 |bj| #1=#:G1528 #2=#:G1529 |p| #3=#:G1530) (RETURN (SEQ (SPADCALL (PROGN @@ -488,7 +488,7 @@ (|getShellEntry| $ 92)))))) (DEFUN |POLYCAT-;reducedSystem;MM;20| (|m| $) - (PROG (#0=#:G1537 |r| #1=#:G1538 |b| #2=#:G1539 |bj| #3=#:G1540 |d| + (PROG (#0=#:G1539 |r| #1=#:G1540 |b| #2=#:G1541 |bj| #3=#:G1542 |d| |mm| |l|) (RETURN (SEQ (LETT |l| (SPADCALL |m| (|getShellEntry| $ 95)) @@ -1755,3 +1755,425 @@ 149 98 154 3 0 0 0 16 53 55 3 0 0 0 9 36 52 1 0 145 0 156 2 0 24 0 0 186))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|PolynomialCategory&| '|isFunctor| + '(((|gcdPolynomial| + ((|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| $))) + T (ELT $ 109)) + ((|squareFree| ((|Factored| $) $)) T (ELT $ 165)) + ((|squareFreePart| ($ $)) T (ELT $ 173)) + ((|charthRoot| ((|Union| $ "failed") $)) T (ELT $ 156)) + ((< ((|Boolean|) $ $)) T (ELT $ 186)) + ((|convert| ((|InputForm|) $)) T (ELT $ 221)) + ((|convert| ((|Pattern| (|Integer|)) $)) T (ELT $ 206)) + ((|convert| ((|Pattern| (|Float|)) $)) T (ELT $ 213)) + ((|patternMatch| + ((|PatternMatchResult| (|Integer|) $) $ + (|Pattern| (|Integer|)) + (|PatternMatchResult| (|Integer|) $))) + T (ELT $ 192)) + ((|patternMatch| + ((|PatternMatchResult| (|Float|) $) $ + (|Pattern| (|Float|)) + (|PatternMatchResult| (|Float|) $))) + T (ELT $ 199)) + ((|factor| ((|Factored| $) $)) T (ELT $ 140)) + ((|factorPolynomial| + ((|Factored| (|SparseUnivariatePolynomial| $)) + (|SparseUnivariatePolynomial| $))) + T (ELT $ 120)) + ((|factorSquareFreePolynomial| + ((|Factored| (|SparseUnivariatePolynomial| $)) + (|SparseUnivariatePolynomial| $))) + T (ELT $ 122)) + ((|solveLinearPolynomialEquation| + ((|Union| (|List| (|SparseUnivariatePolynomial| $)) + "failed") + (|List| (|SparseUnivariatePolynomial| $)) + (|SparseUnivariatePolynomial| $))) + T (ELT $ 116)) + ((|conditionP| + ((|Union| (|Vector| $) "failed") (|Matrix| $))) + T (ELT $ 154)) + ((|primitivePart| ($ $ |#4|)) T (ELT $ 183)) + ((|content| ($ $ |#4|)) T (ELT $ 175)) + ((|discriminant| ($ $ |#4|)) T (ELT $ 78)) + ((|resultant| ($ $ $ |#4|)) T (ELT $ 76)) + ((|primitiveMonomials| ((|List| $) $)) T (ELT $ 63)) + ((|totalDegree| + ((|NonNegativeInteger|) $ (|List| |#4|))) + T (ELT $ 74)) + ((|totalDegree| ((|NonNegativeInteger|) $)) T + (ELT $ 71)) + ((|isExpt| + ((|Union| (|Record| (|:| |var| |#4|) + (|:| |exponent| + (|NonNegativeInteger|))) + "failed") + $)) + T (ELT $ 47)) + ((|isTimes| ((|Union| (|List| $) "failed") $)) T + (ELT $ 42)) + ((|isPlus| ((|Union| (|List| $) "failed") $)) T + (ELT $ 31)) + ((|monomial| + ($ $ (|List| |#4|) (|List| (|NonNegativeInteger|)))) + T (ELT $ 57)) + ((|monomial| ($ $ |#4| (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|monicDivide| + ((|Record| (|:| |quotient| $) (|:| |remainder| $)) + $ $ |#4|)) + T (ELT $ 162)) + ((|monomials| ((|List| $) $)) T (ELT $ 28)) + ((|coefficient| + ($ $ (|List| |#4|) (|List| (|NonNegativeInteger|)))) + T (ELT $ 55)) + ((|coefficient| ($ $ |#4| (|NonNegativeInteger|))) T + (ELT $ 52)) + ((|reducedSystem| ((|Matrix| |#2|) (|Matrix| $))) T + (ELT $ 99)) + ((|reducedSystem| + ((|Record| (|:| |mat| (|Matrix| |#2|)) + (|:| |vec| (|Vector| |#2|))) + (|Matrix| $) (|Vector| $))) + T (ELT $ 106)) + ((|reducedSystem| + ((|Record| (|:| |mat| (|Matrix| (|Integer|))) + (|:| |vec| (|Vector| (|Integer|)))) + (|Matrix| $) (|Vector| $))) + T (ELT $ NIL)) + ((|reducedSystem| ((|Matrix| (|Integer|)) (|Matrix| $))) + T (ELT $ NIL)) + ((|retract| (|#4| $)) T (ELT $ 59)) + ((|retractIfCan| ((|Union| |#4| "failed") $)) T + (ELT $ 60)) + ((|eval| ($ $ (|List| |#4|) (|List| $))) T (ELT $ NIL)) + ((|eval| ($ $ |#4| $)) T (ELT $ NIL)) + ((|eval| ($ $ (|List| |#4|) (|List| |#2|))) T + (ELT $ NIL)) + ((|eval| ($ $ |#4| |#2|)) T (ELT $ NIL)) + ((|eval| ($ $ (|List| $) (|List| $))) T (ELT $ NIL)) + ((|eval| ($ $ $ $)) T (ELT $ NIL)) + ((|eval| ($ $ (|Equation| $))) T (ELT $ NIL)) + ((|eval| ($ $ (|List| (|Equation| $)))) T (ELT $ 21)) + ((|monomial| ($ |#2| |#3|)) T (ELT $ NIL)) + ((|coefficient| (|#2| $ |#3|)) T (ELT $ NIL)) + ((|retract| ((|Integer|) $)) T (ELT $ NIL)) + ((|retractIfCan| ((|Union| (|Integer|) "failed") $)) T + (ELT $ NIL)) + ((|retract| ((|Fraction| (|Integer|)) $)) T (ELT $ NIL)) + ((|retractIfCan| + ((|Union| (|Fraction| (|Integer|)) "failed") $)) + T (ELT $ NIL)) + ((|retractIfCan| ((|Union| |#2| "failed") $)) T + (ELT $ NIL)) + ((|retract| (|#2| $)) T (ELT $ NIL)) + ((|content| (|#2| $)) T (ELT $ NIL)) + ((|primitivePart| ($ $)) T (ELT $ 180))) + (|addModemap| '|PolynomialCategory&| + '(|PolynomialCategory&| |#1| |#2| |#3| |#4|) + '((CATEGORY |domain| + (SIGNATURE |gcdPolynomial| + ((|SparseUnivariatePolynomial| |#1|) + (|SparseUnivariatePolynomial| |#1|) + (|SparseUnivariatePolynomial| |#1|))) + (SIGNATURE |squareFree| + ((|Factored| |#1|) |#1|)) + (SIGNATURE |squareFreePart| (|#1| |#1|)) + (SIGNATURE |charthRoot| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE < ((|Boolean|) |#1| |#1|)) + (SIGNATURE |convert| ((|InputForm|) |#1|)) + (SIGNATURE |convert| + ((|Pattern| (|Integer|)) |#1|)) + (SIGNATURE |convert| + ((|Pattern| (|Float|)) |#1|)) + (SIGNATURE |patternMatch| + ((|PatternMatchResult| (|Integer|) |#1|) + |#1| (|Pattern| (|Integer|)) + (|PatternMatchResult| (|Integer|) |#1|))) + (SIGNATURE |patternMatch| + ((|PatternMatchResult| (|Float|) |#1|) |#1| + (|Pattern| (|Float|)) + (|PatternMatchResult| (|Float|) |#1|))) + (SIGNATURE |factor| ((|Factored| |#1|) |#1|)) + (SIGNATURE |factorPolynomial| + ((|Factored| + (|SparseUnivariatePolynomial| |#1|)) + (|SparseUnivariatePolynomial| |#1|))) + (SIGNATURE |factorSquareFreePolynomial| + ((|Factored| + (|SparseUnivariatePolynomial| |#1|)) + (|SparseUnivariatePolynomial| |#1|))) + (SIGNATURE |solveLinearPolynomialEquation| + ((|Union| (|List| + (|SparseUnivariatePolynomial| + |#1|)) + "failed") + (|List| (|SparseUnivariatePolynomial| |#1|)) + (|SparseUnivariatePolynomial| |#1|))) + (SIGNATURE |conditionP| + ((|Union| (|Vector| |#1|) "failed") + (|Matrix| |#1|))) + (SIGNATURE |primitivePart| (|#1| |#1| |#4|)) + (SIGNATURE |content| (|#1| |#1| |#4|)) + (SIGNATURE |discriminant| (|#1| |#1| |#4|)) + (SIGNATURE |resultant| (|#1| |#1| |#1| |#4|)) + (SIGNATURE |primitiveMonomials| + ((|List| |#1|) |#1|)) + (SIGNATURE |totalDegree| + ((|NonNegativeInteger|) |#1| (|List| |#4|))) + (SIGNATURE |totalDegree| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |isExpt| + ((|Union| (|Record| (|:| |var| |#4|) + (|:| |exponent| + (|NonNegativeInteger|))) + "failed") + |#1|)) + (SIGNATURE |isTimes| + ((|Union| (|List| |#1|) "failed") |#1|)) + (SIGNATURE |isPlus| + ((|Union| (|List| |#1|) "failed") |#1|)) + (SIGNATURE |monomial| + (|#1| |#1| (|List| |#4|) + (|List| (|NonNegativeInteger|)))) + (SIGNATURE |monomial| + (|#1| |#1| |#4| (|NonNegativeInteger|))) + (SIGNATURE |monicDivide| + ((|Record| (|:| |quotient| |#1|) + (|:| |remainder| |#1|)) + |#1| |#1| |#4|)) + (SIGNATURE |monomials| ((|List| |#1|) |#1|)) + (SIGNATURE |coefficient| + (|#1| |#1| (|List| |#4|) + (|List| (|NonNegativeInteger|)))) + (SIGNATURE |coefficient| + (|#1| |#1| |#4| (|NonNegativeInteger|))) + (SIGNATURE |reducedSystem| + ((|Matrix| |#2|) (|Matrix| |#1|))) + (SIGNATURE |reducedSystem| + ((|Record| (|:| |mat| (|Matrix| |#2|)) + (|:| |vec| (|Vector| |#2|))) + (|Matrix| |#1|) (|Vector| |#1|))) + (SIGNATURE |reducedSystem| + ((|Record| (|:| |mat| + (|Matrix| (|Integer|))) + (|:| |vec| + (|Vector| (|Integer|)))) + (|Matrix| |#1|) (|Vector| |#1|))) + (SIGNATURE |reducedSystem| + ((|Matrix| (|Integer|)) (|Matrix| |#1|))) + (SIGNATURE |retract| (|#4| |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| |#4| "failed") |#1|)) + (SIGNATURE |eval| + (|#1| |#1| (|List| |#4|) (|List| |#1|))) + (SIGNATURE |eval| (|#1| |#1| |#4| |#1|)) + (SIGNATURE |eval| + (|#1| |#1| (|List| |#4|) (|List| |#2|))) + (SIGNATURE |eval| (|#1| |#1| |#4| |#2|)) + (SIGNATURE |eval| + (|#1| |#1| (|List| |#1|) (|List| |#1|))) + (SIGNATURE |eval| (|#1| |#1| |#1| |#1|)) + (SIGNATURE |eval| (|#1| |#1| (|Equation| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| (|List| (|Equation| |#1|)))) + (SIGNATURE |monomial| (|#1| |#2| |#3|)) + (SIGNATURE |coefficient| (|#2| |#1| |#3|)) + (SIGNATURE |retract| ((|Integer|) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Integer|) "failed") |#1|)) + (SIGNATURE |retract| + ((|Fraction| (|Integer|)) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Fraction| (|Integer|)) "failed") + |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| |#2| "failed") |#1|)) + (SIGNATURE |retract| (|#2| |#1|)) + (SIGNATURE |content| (|#2| |#1|)) + (SIGNATURE |primitivePart| (|#1| |#1|))) + (|PolynomialCategory| |#2| |#3| |#4|) (|Ring|) + (|OrderedAbelianMonoidSup|) (|OrderedSet|)) + T '|PolynomialCategory&| + (|put| '|PolynomialCategory&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |gcdPolynomial| + ((|SparseUnivariatePolynomial| + |#1|) + (|SparseUnivariatePolynomial| + |#1|) + (|SparseUnivariatePolynomial| + |#1|))) + (SIGNATURE |squareFree| + ((|Factored| |#1|) |#1|)) + (SIGNATURE |squareFreePart| + (|#1| |#1|)) + (SIGNATURE |charthRoot| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE < ((|Boolean|) |#1| |#1|)) + (SIGNATURE |convert| + ((|InputForm|) |#1|)) + (SIGNATURE |convert| + ((|Pattern| (|Integer|)) |#1|)) + (SIGNATURE |convert| + ((|Pattern| (|Float|)) |#1|)) + (SIGNATURE |patternMatch| + ((|PatternMatchResult| (|Integer|) + |#1|) + |#1| (|Pattern| (|Integer|)) + (|PatternMatchResult| (|Integer|) + |#1|))) + (SIGNATURE |patternMatch| + ((|PatternMatchResult| (|Float|) + |#1|) + |#1| (|Pattern| (|Float|)) + (|PatternMatchResult| (|Float|) + |#1|))) + (SIGNATURE |factor| + ((|Factored| |#1|) |#1|)) + (SIGNATURE |factorPolynomial| + ((|Factored| + (|SparseUnivariatePolynomial| + |#1|)) + (|SparseUnivariatePolynomial| + |#1|))) + (SIGNATURE + |factorSquareFreePolynomial| + ((|Factored| + (|SparseUnivariatePolynomial| + |#1|)) + (|SparseUnivariatePolynomial| + |#1|))) + (SIGNATURE + |solveLinearPolynomialEquation| + ((|Union| + (|List| + (|SparseUnivariatePolynomial| + |#1|)) + "failed") + (|List| + (|SparseUnivariatePolynomial| + |#1|)) + (|SparseUnivariatePolynomial| + |#1|))) + (SIGNATURE |conditionP| + ((|Union| (|Vector| |#1|) + "failed") + (|Matrix| |#1|))) + (SIGNATURE |primitivePart| + (|#1| |#1| |#4|)) + (SIGNATURE |content| (|#1| |#1| |#4|)) + (SIGNATURE |discriminant| + (|#1| |#1| |#4|)) + (SIGNATURE |resultant| + (|#1| |#1| |#1| |#4|)) + (SIGNATURE |primitiveMonomials| + ((|List| |#1|) |#1|)) + (SIGNATURE |totalDegree| + ((|NonNegativeInteger|) |#1| + (|List| |#4|))) + (SIGNATURE |totalDegree| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |isExpt| + ((|Union| + (|Record| (|:| |var| |#4|) + (|:| |exponent| + (|NonNegativeInteger|))) + "failed") + |#1|)) + (SIGNATURE |isTimes| + ((|Union| (|List| |#1|) "failed") + |#1|)) + (SIGNATURE |isPlus| + ((|Union| (|List| |#1|) "failed") + |#1|)) + (SIGNATURE |monomial| + (|#1| |#1| (|List| |#4|) + (|List| (|NonNegativeInteger|)))) + (SIGNATURE |monomial| + (|#1| |#1| |#4| + (|NonNegativeInteger|))) + (SIGNATURE |monicDivide| + ((|Record| (|:| |quotient| |#1|) + (|:| |remainder| |#1|)) + |#1| |#1| |#4|)) + (SIGNATURE |monomials| + ((|List| |#1|) |#1|)) + (SIGNATURE |coefficient| + (|#1| |#1| (|List| |#4|) + (|List| (|NonNegativeInteger|)))) + (SIGNATURE |coefficient| + (|#1| |#1| |#4| + (|NonNegativeInteger|))) + (SIGNATURE |reducedSystem| + ((|Matrix| |#2|) (|Matrix| |#1|))) + (SIGNATURE |reducedSystem| + ((|Record| + (|:| |mat| (|Matrix| |#2|)) + (|:| |vec| (|Vector| |#2|))) + (|Matrix| |#1|) (|Vector| |#1|))) + (SIGNATURE |reducedSystem| + ((|Record| + (|:| |mat| + (|Matrix| (|Integer|))) + (|:| |vec| + (|Vector| (|Integer|)))) + (|Matrix| |#1|) (|Vector| |#1|))) + (SIGNATURE |reducedSystem| + ((|Matrix| (|Integer|)) + (|Matrix| |#1|))) + (SIGNATURE |retract| (|#4| |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| |#4| "failed") |#1|)) + (SIGNATURE |eval| + (|#1| |#1| (|List| |#4|) + (|List| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| |#4| |#1|)) + (SIGNATURE |eval| + (|#1| |#1| (|List| |#4|) + (|List| |#2|))) + (SIGNATURE |eval| + (|#1| |#1| |#4| |#2|)) + (SIGNATURE |eval| + (|#1| |#1| (|List| |#1|) + (|List| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| |#1| |#1|)) + (SIGNATURE |eval| + (|#1| |#1| (|Equation| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| + (|List| (|Equation| |#1|)))) + (SIGNATURE |monomial| + (|#1| |#2| |#3|)) + (SIGNATURE |coefficient| + (|#2| |#1| |#3|)) + (SIGNATURE |retract| + ((|Integer|) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Integer|) "failed") + |#1|)) + (SIGNATURE |retract| + ((|Fraction| (|Integer|)) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Fraction| (|Integer|)) + "failed") + |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| |#2| "failed") |#1|)) + (SIGNATURE |retract| (|#2| |#1|)) + (SIGNATURE |content| (|#2| |#1|)) + (SIGNATURE |primitivePart| + (|#1| |#1|))) + (|PolynomialCategory| |#2| |#3| |#4|) + (|Ring|) (|OrderedAbelianMonoidSup|) + (|OrderedSet|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/POLYCAT.lsp b/src/algebra/strap/POLYCAT.lsp index e328aa4d..1f53dc2e 100644 --- a/src/algebra/strap/POLYCAT.lsp +++ b/src/algebra/strap/POLYCAT.lsp @@ -5,9 +5,9 @@ (DEFPARAMETER |PolynomialCategory;AL| 'NIL) -(DEFUN |PolynomialCategory| (&REST #0=#:G1406 &AUX #1=#:G1404) +(DEFUN |PolynomialCategory| (&REST #0=#:G1415 &AUX #1=#:G1413) (DSETQ #1# #0#) - (LET (#2=#:G1405) + (LET (#2=#:G1414) (COND ((SETQ #2# (|assoc| (|devaluateList| #1#) |PolynomialCategory;AL|)) @@ -20,7 +20,7 @@ #2#)))) (DEFUN |PolynomialCategory;| (|t#1| |t#2| |t#3|) - (PROG (#0=#:G1403) + (PROG (#0=#:G1412) (RETURN (PROG1 (LETT #0# (|sublisV| @@ -236,3 +236,11 @@ (SETELT #0# 0 (LIST '|PolynomialCategory| (|devaluate| |t#1|) (|devaluate| |t#2|) (|devaluate| |t#3|))))))) + +(SETQ |$CategoryFrame| + (|put| '|PolynomialCategory| '|isCategory| T + (|addModemap| '|PolynomialCategory| + '(|PolynomialCategory| |#1| |#2| |#3|) + '((|Category|) (|Ring|) (|OrderedAbelianMonoidSup|) + (|OrderedSet|)) + T '|PolynomialCategory| |$CategoryFrame|))) diff --git a/src/algebra/strap/PRIMARR.lsp b/src/algebra/strap/PRIMARR.lsp index a8f4f9a7..03f749e2 100644 --- a/src/algebra/strap/PRIMARR.lsp +++ b/src/algebra/strap/PRIMARR.lsp @@ -36,7 +36,7 @@ (|setSimpleArrayEntry| |x| |i| |s|)) (DEFUN |PRIMARR;fill!;$S$;9| (|x| |s| $) - (PROG (|i| #0=#:G1403) + (PROG (|i| #0=#:G1405) (RETURN (SEQ (SEQ (LETT |i| 0 |PRIMARR;fill!;$S$;9|) (LETT #0# (|maxIndexOfSimpleArray| |x|) @@ -47,10 +47,10 @@ G191 (EXIT NIL)) (EXIT |x|))))) -(DEFUN |PrimitiveArray| (#0=#:G1411) +(DEFUN |PrimitiveArray| (#0=#:G1413) (PROG () (RETURN - (PROG (#1=#:G1412) + (PROG (#1=#:G1414) (RETURN (COND ((LETT #1# @@ -191,3 +191,187 @@ 1 2 5 19 0 0 1 2 5 19 0 0 1 1 0 7 0 8))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|PrimitiveArray| '|isFunctor| + '(((~= ((|Boolean|) $ $)) (|has| |#1| (|SetCategory|)) + (ELT $ NIL)) + ((= ((|Boolean|) $ $)) (|has| |#1| (|SetCategory|)) + (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) + (|has| |#1| (|CoercibleTo| (|OutputForm|))) + (ELT $ NIL)) + ((|hash| ((|SingleInteger|) $)) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|latex| ((|String|) $)) (|has| |#1| (|SetCategory|)) + (ELT $ NIL)) + ((< ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((> ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((>= ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((<= ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|max| ($ $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|min| ($ $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|sort!| ($ $)) + (AND (|has| $ (ATTRIBUTE |shallowlyMutable|)) + (|has| |#1| (|OrderedSet|))) + (ELT $ NIL)) + ((|sort!| ($ (|Mapping| (|Boolean|) |#1| |#1|) $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|reverse!| ($ $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|copyInto!| ($ $ $ (|Integer|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|sorted?| ((|Boolean|) $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|sort| ($ $)) (|has| |#1| (|OrderedSet|)) (ELT $ NIL)) + ((|merge| ($ $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|position| ((|Integer|) |#1| $ (|Integer|))) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|position| ((|Integer|) |#1| $)) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|position| + ((|Integer|) (|Mapping| (|Boolean|) |#1|) $)) + T (ELT $ NIL)) + ((|sorted?| + ((|Boolean|) (|Mapping| (|Boolean|) |#1| |#1|) $)) + T (ELT $ NIL)) + ((|sort| ($ (|Mapping| (|Boolean|) |#1| |#1|) $)) T + (ELT $ NIL)) + ((|reverse| ($ $)) T (ELT $ NIL)) + ((|merge| ($ (|Mapping| (|Boolean|) |#1| |#1|) $ $)) T + (ELT $ NIL)) + ((|setelt| + (|#1| $ (|UniversalSegment| (|Integer|)) |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|insert| ($ $ $ (|Integer|))) T (ELT $ NIL)) + ((|insert| ($ |#1| $ (|Integer|))) T (ELT $ NIL)) + ((|delete| ($ $ (|UniversalSegment| (|Integer|)))) T + (ELT $ NIL)) + ((|delete| ($ $ (|Integer|))) T (ELT $ NIL)) + ((|elt| ($ $ (|UniversalSegment| (|Integer|)))) T + (ELT $ NIL)) + ((|map| ($ (|Mapping| |#1| |#1| |#1|) $ $)) T + (ELT $ NIL)) + ((|concat| ($ (|List| $))) T (ELT $ NIL)) + ((|concat| ($ $ $)) T (ELT $ NIL)) + ((|concat| ($ |#1| $)) T (ELT $ NIL)) + ((|concat| ($ $ |#1|)) T (ELT $ NIL)) + ((|new| ($ (|NonNegativeInteger|) |#1|)) T (ELT $ 12)) + ((|construct| ($ (|List| |#1|))) T (ELT $ NIL)) + ((|find| ((|Union| |#1| "failed") + (|Mapping| (|Boolean|) |#1|) $)) + T (ELT $ NIL)) + ((|reduce| (|#1| (|Mapping| |#1| |#1| |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|reduce| (|#1| (|Mapping| |#1| |#1| |#1|) $ |#1|)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|remove| ($ (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|select| ($ (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|reduce| + (|#1| (|Mapping| |#1| |#1| |#1|) $ |#1| |#1|)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|remove| ($ |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|removeDuplicates| ($ $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|convert| ((|InputForm|) $)) + (|has| |#1| (|ConvertibleTo| (|InputForm|))) + (ELT $ NIL)) + ((|swap!| ((|Void|) $ (|Integer|) (|Integer|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|fill!| ($ $ |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ 17)) + ((|first| (|#1| $)) (|has| (|Integer|) (|OrderedSet|)) + (ELT $ NIL)) + ((|minIndex| ((|Integer|) $)) + (|has| (|Integer|) (|OrderedSet|)) (ELT $ 10)) + ((|maxIndex| ((|Integer|) $)) + (|has| (|Integer|) (|OrderedSet|)) (ELT $ NIL)) + ((|entry?| ((|Boolean|) |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|indices| ((|List| (|Integer|)) $)) T (ELT $ NIL)) + ((|index?| ((|Boolean|) (|Integer|) $)) T (ELT $ NIL)) + ((|entries| ((|List| |#1|) $)) T (ELT $ NIL)) + ((|elt| (|#1| $ (|Integer|))) T (ELT $ 14)) + ((|elt| (|#1| $ (|Integer|) |#1|)) T (ELT $ NIL)) + ((|qelt| (|#1| $ (|Integer|))) T (ELT $ 13)) + ((|setelt| (|#1| $ (|Integer|) |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ 16)) + ((|qsetelt!| (|#1| $ (|Integer|) |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ 15)) + ((|eval| ($ $ (|List| |#1|) (|List| |#1|))) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ |#1| |#1|)) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ (|Equation| |#1|))) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ (|List| (|Equation| |#1|)))) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|member?| ((|Boolean|) |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|count| ((|NonNegativeInteger|) |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|members| ((|List| |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|parts| ((|List| |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|count| ((|NonNegativeInteger|) + (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|every?| ((|Boolean|) (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|any?| ((|Boolean|) (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|map!| ($ (|Mapping| |#1| |#1|) $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|map| ($ (|Mapping| |#1| |#1|) $)) T (ELT $ NIL)) + ((|#| ((|NonNegativeInteger|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ 8)) + ((|sample| ($)) T (CONST $ NIL)) + ((|size?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|more?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|less?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|empty?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|empty| ($)) T (ELT $ 11)) + ((|copy| ($ $)) T (ELT $ NIL)) + ((|eq?| ((|Boolean|) $ $)) T (ELT $ NIL))) + (|addModemap| '|PrimitiveArray| '(|PrimitiveArray| |#1|) + '((|OneDimensionalArrayAggregate| |#1|) (|Type|)) T + '|PrimitiveArray| + (|put| '|PrimitiveArray| '|mode| + '(|Mapping| + (|OneDimensionalArrayAggregate| |#1|) + (|Type|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/PSETCAT-.lsp b/src/algebra/strap/PSETCAT-.lsp index 3e22b5d1..ea50f238 100644 --- a/src/algebra/strap/PSETCAT-.lsp +++ b/src/algebra/strap/PSETCAT-.lsp @@ -8,7 +8,7 @@ |PSETCAT-;elements|)))) (DEFUN |PSETCAT-;variables1| (|lp| $) - (PROG (#0=#:G1435 |p| #1=#:G1436 |lvars|) + (PROG (#0=#:G1437 |p| #1=#:G1438 |lvars|) (RETURN (SEQ (LETT |lvars| (PROGN @@ -41,7 +41,7 @@ (SPADCALL |#2| |#1| (|getShellEntry| $ 16))) (DEFUN |PSETCAT-;variables2| (|lp| $) - (PROG (#0=#:G1440 |p| #1=#:G1441 |lvars|) + (PROG (#0=#:G1442 |p| #1=#:G1443 |lvars|) (RETURN (SEQ (LETT |lvars| (PROGN @@ -220,7 +220,7 @@ (SPADCALL |ws| (|getShellEntry| $ 31)))))))) (DEFUN |PSETCAT-;=;2SB;11| (|ps1| |ps2| $) - (PROG (#0=#:G1475 #1=#:G1476 #2=#:G1477 |p| #3=#:G1478) + (PROG (#0=#:G1477 #1=#:G1478 #2=#:G1479 |p| #3=#:G1480) (RETURN (SEQ (SPADCALL (SPADCALL @@ -399,7 +399,7 @@ ('T 'NIL))) (DEFUN |PSETCAT-;exactQuo| (|r| |s| $) - (PROG (#0=#:G1510) + (PROG (#0=#:G1512) (RETURN (COND ((|HasCategory| (|getShellEntry| $ 7) '(|EuclideanDomain|)) @@ -883,3 +883,130 @@ 0 0 0 9 32 2 0 0 0 9 34 2 0 15 0 0 40))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|PolynomialSetCategory&| '|isFunctor| + '(((|triangular?| ((|Boolean|) $)) T (ELT $ 47)) + ((|rewriteIdealWithRemainder| + ((|List| |#5|) (|List| |#5|) $)) + T (ELT $ 90)) + ((|rewriteIdealWithHeadRemainder| + ((|List| |#5|) (|List| |#5|) $)) + T (ELT $ 87)) + ((|remainder| + ((|Record| (|:| |rnum| |#2|) (|:| |polnum| |#5|) + (|:| |den| |#2|)) + |#5| $)) + T (ELT $ 81)) + ((|headRemainder| + ((|Record| (|:| |num| |#5|) (|:| |den| |#2|)) |#5| + $)) + T (ELT $ 73)) + ((|roughUnitIdeal?| ((|Boolean|) $)) T (ELT $ 49)) + ((|roughEqualIdeals?| ((|Boolean|) $ $)) T (ELT $ 58)) + ((|roughSubIdeal?| ((|Boolean|) $ $)) T (ELT $ 55)) + ((|roughBase?| ((|Boolean|) $)) T (ELT $ 53)) + ((|trivialIdeal?| ((|Boolean|) $)) T (ELT $ 48)) + ((|sort| ((|Record| (|:| |under| $) (|:| |floor| $) + (|:| |upper| $)) + $ |#4|)) + T (ELT $ 36)) + ((|collectUpper| ($ $ |#4|)) T (ELT $ 33)) + ((|collect| ($ $ |#4|)) T (ELT $ 34)) + ((|collectUnder| ($ $ |#4|)) T (ELT $ 32)) + ((|mainVariable?| ((|Boolean|) |#4| $)) T (ELT $ 30)) + ((|mainVariables| ((|List| |#4|) $)) T (ELT $ 27)) + ((|variables| ((|List| |#4|) $)) T (ELT $ 23)) + ((= ((|Boolean|) $ $)) T (ELT $ 40))) + (|addModemap| '|PolynomialSetCategory&| + '(|PolynomialSetCategory&| |#1| |#2| |#3| |#4| |#5|) + '((CATEGORY |domain| + (SIGNATURE |triangular?| ((|Boolean|) |#1|)) + (SIGNATURE |rewriteIdealWithRemainder| + ((|List| |#5|) (|List| |#5|) |#1|)) + (SIGNATURE |rewriteIdealWithHeadRemainder| + ((|List| |#5|) (|List| |#5|) |#1|)) + (SIGNATURE |remainder| + ((|Record| (|:| |rnum| |#2|) + (|:| |polnum| |#5|) (|:| |den| |#2|)) + |#5| |#1|)) + (SIGNATURE |headRemainder| + ((|Record| (|:| |num| |#5|) + (|:| |den| |#2|)) + |#5| |#1|)) + (SIGNATURE |roughUnitIdeal?| ((|Boolean|) |#1|)) + (SIGNATURE |roughEqualIdeals?| + ((|Boolean|) |#1| |#1|)) + (SIGNATURE |roughSubIdeal?| + ((|Boolean|) |#1| |#1|)) + (SIGNATURE |roughBase?| ((|Boolean|) |#1|)) + (SIGNATURE |trivialIdeal?| ((|Boolean|) |#1|)) + (SIGNATURE |sort| + ((|Record| (|:| |under| |#1|) + (|:| |floor| |#1|) (|:| |upper| |#1|)) + |#1| |#4|)) + (SIGNATURE |collectUpper| (|#1| |#1| |#4|)) + (SIGNATURE |collect| (|#1| |#1| |#4|)) + (SIGNATURE |collectUnder| (|#1| |#1| |#4|)) + (SIGNATURE |mainVariable?| + ((|Boolean|) |#4| |#1|)) + (SIGNATURE |mainVariables| ((|List| |#4|) |#1|)) + (SIGNATURE |variables| ((|List| |#4|) |#1|)) + (SIGNATURE = ((|Boolean|) |#1| |#1|))) + (|PolynomialSetCategory| |#2| |#3| |#4| |#5|) + (|Ring|) (|OrderedAbelianMonoidSup|) (|OrderedSet|) + (|RecursivePolynomialCategory| |#2| |#3| |#4|)) + T '|PolynomialSetCategory&| + (|put| '|PolynomialSetCategory&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |triangular?| + ((|Boolean|) |#1|)) + (SIGNATURE |rewriteIdealWithRemainder| + ((|List| |#5|) (|List| |#5|) |#1|)) + (SIGNATURE + |rewriteIdealWithHeadRemainder| + ((|List| |#5|) (|List| |#5|) |#1|)) + (SIGNATURE |remainder| + ((|Record| (|:| |rnum| |#2|) + (|:| |polnum| |#5|) + (|:| |den| |#2|)) + |#5| |#1|)) + (SIGNATURE |headRemainder| + ((|Record| (|:| |num| |#5|) + (|:| |den| |#2|)) + |#5| |#1|)) + (SIGNATURE |roughUnitIdeal?| + ((|Boolean|) |#1|)) + (SIGNATURE |roughEqualIdeals?| + ((|Boolean|) |#1| |#1|)) + (SIGNATURE |roughSubIdeal?| + ((|Boolean|) |#1| |#1|)) + (SIGNATURE |roughBase?| + ((|Boolean|) |#1|)) + (SIGNATURE |trivialIdeal?| + ((|Boolean|) |#1|)) + (SIGNATURE |sort| + ((|Record| (|:| |under| |#1|) + (|:| |floor| |#1|) + (|:| |upper| |#1|)) + |#1| |#4|)) + (SIGNATURE |collectUpper| + (|#1| |#1| |#4|)) + (SIGNATURE |collect| (|#1| |#1| |#4|)) + (SIGNATURE |collectUnder| + (|#1| |#1| |#4|)) + (SIGNATURE |mainVariable?| + ((|Boolean|) |#4| |#1|)) + (SIGNATURE |mainVariables| + ((|List| |#4|) |#1|)) + (SIGNATURE |variables| + ((|List| |#4|) |#1|)) + (SIGNATURE = ((|Boolean|) |#1| |#1|))) + (|PolynomialSetCategory| |#2| |#3| |#4| + |#5|) + (|Ring|) (|OrderedAbelianMonoidSup|) + (|OrderedSet|) + (|RecursivePolynomialCategory| |#2| |#3| + |#4|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/PSETCAT.lsp b/src/algebra/strap/PSETCAT.lsp index e4a1f465..ee7ff2fe 100644 --- a/src/algebra/strap/PSETCAT.lsp +++ b/src/algebra/strap/PSETCAT.lsp @@ -5,9 +5,9 @@ (DEFPARAMETER |PolynomialSetCategory;AL| 'NIL) -(DEFUN |PolynomialSetCategory| (&REST #0=#:G1422 &AUX #1=#:G1420) +(DEFUN |PolynomialSetCategory| (&REST #0=#:G1431 &AUX #1=#:G1429) (DSETQ #1# #0#) - (LET (#2=#:G1421) + (LET (#2=#:G1430) (COND ((SETQ #2# (|assoc| (|devaluateList| #1#) |PolynomialSetCategory;AL|)) @@ -21,7 +21,7 @@ #2#)))) (DEFUN |PolynomialSetCategory;| (|t#1| |t#2| |t#3| |t#4|) - (PROG (#0=#:G1419) + (PROG (#0=#:G1428) (RETURN (PROG1 (LETT #0# (|sublisV| @@ -31,7 +31,7 @@ (|devaluate| |t#3|) (|devaluate| |t#4|))) (|sublisV| - (PAIR '(#1=#:G1418) (LIST '(|List| |t#4|))) + (PAIR '(#1=#:G1427) (LIST '(|List| |t#4|))) (COND (|PolynomialSetCategory;CAT|) ('T @@ -121,3 +121,12 @@ (LIST '|PolynomialSetCategory| (|devaluate| |t#1|) (|devaluate| |t#2|) (|devaluate| |t#3|) (|devaluate| |t#4|))))))) + +(SETQ |$CategoryFrame| + (|put| '|PolynomialSetCategory| '|isCategory| T + (|addModemap| '|PolynomialSetCategory| + '(|PolynomialSetCategory| |#1| |#2| |#3| |#4|) + '((|Category|) (|Ring|) (|OrderedAbelianMonoidSup|) + (|OrderedSet|) + (|RecursivePolynomialCategory| |t#1| |t#2| |t#3|)) + T '|PolynomialSetCategory| |$CategoryFrame|))) diff --git a/src/algebra/strap/QFCAT-.lsp b/src/algebra/strap/QFCAT-.lsp index 2197438a..3ef776d0 100644 --- a/src/algebra/strap/QFCAT-.lsp +++ b/src/algebra/strap/QFCAT-.lsp @@ -438,3 +438,269 @@ 67 0 70 1 0 76 0 79 1 0 0 55 57 1 0 0 85 90 0 0 29 31 2 0 48 0 0 50))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|QuotientFieldCategory&| '|isFunctor| + '(((< ((|Boolean|) $ $)) T (ELT $ 50)) + ((|init| ($)) T (ELT $ 16)) + ((|nextItem| ((|Union| $ "failed") $)) T (ELT $ 20)) + ((|retract| ((|Integer|) $)) T (ELT $ 92)) + ((|retractIfCan| ((|Union| (|Integer|) "failed") $)) T + (ELT $ 95)) + ((|retract| ((|Fraction| (|Integer|)) $)) T (ELT $ NIL)) + ((|retractIfCan| + ((|Union| (|Fraction| (|Integer|)) "failed") $)) + T (ELT $ NIL)) + ((|convert| ((|DoubleFloat|) $)) T (ELT $ 47)) + ((|convert| ((|Float|) $)) T (ELT $ 44)) + ((|convert| ((|InputForm|) $)) T (ELT $ 40)) + ((|retract| ((|Symbol|) $)) T (ELT $ 60)) + ((|retractIfCan| ((|Union| (|Symbol|) "failed") $)) T + (ELT $ 65)) + ((|coerce| ($ (|Symbol|))) T (ELT $ 57)) + ((|random| ($)) T (ELT $ 98)) + ((|fractionPart| ($ $)) T (ELT $ 54)) + ((|denominator| ($ $)) T (ELT $ 12)) + ((|numerator| ($ $)) T (ELT $ 10)) + ((|patternMatch| + ((|PatternMatchResult| (|Float|) $) $ + (|Pattern| (|Float|)) + (|PatternMatchResult| (|Float|) $))) + T (ELT $ 84)) + ((|patternMatch| + ((|PatternMatchResult| (|Integer|) $) $ + (|Pattern| (|Integer|)) + (|PatternMatchResult| (|Integer|) $))) + T (ELT $ 75)) + ((|convert| ((|Pattern| (|Float|)) $)) T (ELT $ 79)) + ((|convert| ((|Pattern| (|Integer|)) $)) T (ELT $ 70)) + ((|reducedSystem| ((|Matrix| |#2|) (|Matrix| $))) T + (ELT $ 28)) + ((|reducedSystem| + ((|Record| (|:| |mat| (|Matrix| |#2|)) + (|:| |vec| (|Vector| |#2|))) + (|Matrix| $) (|Vector| $))) + T (ELT $ 112)) + ((|reducedSystem| + ((|Record| (|:| |mat| (|Matrix| (|Integer|))) + (|:| |vec| (|Vector| (|Integer|)))) + (|Matrix| $) (|Vector| $))) + T (ELT $ NIL)) + ((|reducedSystem| ((|Matrix| (|Integer|)) (|Matrix| $))) + T (ELT $ NIL)) + ((|differentiate| ($ $ (|Mapping| |#2| |#2|))) T + (ELT $ 36)) + ((|differentiate| + ($ $ (|Mapping| |#2| |#2|) (|NonNegativeInteger|))) + T (ELT $ NIL)) + ((|differentiate| + ($ $ (|List| (|Symbol|)) + (|List| (|NonNegativeInteger|)))) + T (ELT $ NIL)) + ((|differentiate| + ($ $ (|Symbol|) (|NonNegativeInteger|))) + T (ELT $ NIL)) + ((|differentiate| ($ $ (|List| (|Symbol|)))) T + (ELT $ NIL)) + ((|differentiate| ($ $ (|Symbol|))) T (ELT $ NIL)) + ((|differentiate| ($ $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|differentiate| ($ $)) T (ELT $ NIL)) + ((|map| ($ (|Mapping| |#2| |#2|) $)) T (ELT $ 22)) + ((|retract| (|#2| $)) T (ELT $ NIL)) + ((|retractIfCan| ((|Union| |#2| "failed") $)) T + (ELT $ NIL)) + ((|coerce| ($ |#2|)) T (ELT $ NIL)) + ((|coerce| ($ (|Fraction| (|Integer|)))) T (ELT $ 90)) + ((|coerce| ($ $)) T (ELT $ NIL)) + ((|coerce| ($ (|Integer|))) T (ELT $ NIL)) + ((|characteristic| ((|NonNegativeInteger|))) T + (ELT $ 31)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ NIL))) + (|addModemap| '|QuotientFieldCategory&| + '(|QuotientFieldCategory&| |#1| |#2|) + '((CATEGORY |domain| + (SIGNATURE < ((|Boolean|) |#1| |#1|)) + (SIGNATURE |init| (|#1|)) + (SIGNATURE |nextItem| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE |retract| ((|Integer|) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Integer|) "failed") |#1|)) + (SIGNATURE |retract| + ((|Fraction| (|Integer|)) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Fraction| (|Integer|)) "failed") + |#1|)) + (SIGNATURE |convert| ((|DoubleFloat|) |#1|)) + (SIGNATURE |convert| ((|Float|) |#1|)) + (SIGNATURE |convert| ((|InputForm|) |#1|)) + (SIGNATURE |retract| ((|Symbol|) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Symbol|) "failed") |#1|)) + (SIGNATURE |coerce| (|#1| (|Symbol|))) + (SIGNATURE |random| (|#1|)) + (SIGNATURE |fractionPart| (|#1| |#1|)) + (SIGNATURE |denominator| (|#1| |#1|)) + (SIGNATURE |numerator| (|#1| |#1|)) + (SIGNATURE |patternMatch| + ((|PatternMatchResult| (|Float|) |#1|) |#1| + (|Pattern| (|Float|)) + (|PatternMatchResult| (|Float|) |#1|))) + (SIGNATURE |patternMatch| + ((|PatternMatchResult| (|Integer|) |#1|) + |#1| (|Pattern| (|Integer|)) + (|PatternMatchResult| (|Integer|) |#1|))) + (SIGNATURE |convert| + ((|Pattern| (|Float|)) |#1|)) + (SIGNATURE |convert| + ((|Pattern| (|Integer|)) |#1|)) + (SIGNATURE |reducedSystem| + ((|Matrix| |#2|) (|Matrix| |#1|))) + (SIGNATURE |reducedSystem| + ((|Record| (|:| |mat| (|Matrix| |#2|)) + (|:| |vec| (|Vector| |#2|))) + (|Matrix| |#1|) (|Vector| |#1|))) + (SIGNATURE |reducedSystem| + ((|Record| + (|:| |mat| (|Matrix| (|Integer|))) + (|:| |vec| (|Vector| (|Integer|)))) + (|Matrix| |#1|) (|Vector| |#1|))) + (SIGNATURE |reducedSystem| + ((|Matrix| (|Integer|)) (|Matrix| |#1|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Mapping| |#2| |#2|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Mapping| |#2| |#2|) + (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|List| (|Symbol|)) + (|List| (|NonNegativeInteger|)))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Symbol|) + (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|List| (|Symbol|)))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Symbol|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |differentiate| (|#1| |#1|)) + (SIGNATURE |map| + (|#1| (|Mapping| |#2| |#2|) |#1|)) + (SIGNATURE |retract| (|#2| |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| |#2| "failed") |#1|)) + (SIGNATURE |coerce| (|#1| |#2|)) + (SIGNATURE |coerce| + (|#1| (|Fraction| (|Integer|)))) + (SIGNATURE |coerce| (|#1| |#1|)) + (SIGNATURE |coerce| (|#1| (|Integer|))) + (SIGNATURE |characteristic| + ((|NonNegativeInteger|))) + (SIGNATURE |coerce| ((|OutputForm|) |#1|))) + (|QuotientFieldCategory| |#2|) (|IntegralDomain|)) + T '|QuotientFieldCategory&| + (|put| '|QuotientFieldCategory&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE < ((|Boolean|) |#1| |#1|)) + (SIGNATURE |init| (|#1|)) + (SIGNATURE |nextItem| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE |retract| + ((|Integer|) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Integer|) "failed") + |#1|)) + (SIGNATURE |retract| + ((|Fraction| (|Integer|)) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Fraction| (|Integer|)) + "failed") + |#1|)) + (SIGNATURE |convert| + ((|DoubleFloat|) |#1|)) + (SIGNATURE |convert| ((|Float|) |#1|)) + (SIGNATURE |convert| + ((|InputForm|) |#1|)) + (SIGNATURE |retract| + ((|Symbol|) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Symbol|) "failed") + |#1|)) + (SIGNATURE |coerce| (|#1| (|Symbol|))) + (SIGNATURE |random| (|#1|)) + (SIGNATURE |fractionPart| (|#1| |#1|)) + (SIGNATURE |denominator| (|#1| |#1|)) + (SIGNATURE |numerator| (|#1| |#1|)) + (SIGNATURE |patternMatch| + ((|PatternMatchResult| (|Float|) + |#1|) + |#1| (|Pattern| (|Float|)) + (|PatternMatchResult| (|Float|) + |#1|))) + (SIGNATURE |patternMatch| + ((|PatternMatchResult| (|Integer|) + |#1|) + |#1| (|Pattern| (|Integer|)) + (|PatternMatchResult| (|Integer|) + |#1|))) + (SIGNATURE |convert| + ((|Pattern| (|Float|)) |#1|)) + (SIGNATURE |convert| + ((|Pattern| (|Integer|)) |#1|)) + (SIGNATURE |reducedSystem| + ((|Matrix| |#2|) (|Matrix| |#1|))) + (SIGNATURE |reducedSystem| + ((|Record| + (|:| |mat| (|Matrix| |#2|)) + (|:| |vec| (|Vector| |#2|))) + (|Matrix| |#1|) (|Vector| |#1|))) + (SIGNATURE |reducedSystem| + ((|Record| + (|:| |mat| + (|Matrix| (|Integer|))) + (|:| |vec| + (|Vector| (|Integer|)))) + (|Matrix| |#1|) (|Vector| |#1|))) + (SIGNATURE |reducedSystem| + ((|Matrix| (|Integer|)) + (|Matrix| |#1|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Mapping| |#2| |#2|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Mapping| |#2| |#2|) + (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|List| (|Symbol|)) + (|List| (|NonNegativeInteger|)))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Symbol|) + (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|List| (|Symbol|)))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Symbol|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1|)) + (SIGNATURE |map| + (|#1| (|Mapping| |#2| |#2|) |#1|)) + (SIGNATURE |retract| (|#2| |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| |#2| "failed") |#1|)) + (SIGNATURE |coerce| (|#1| |#2|)) + (SIGNATURE |coerce| + (|#1| (|Fraction| (|Integer|)))) + (SIGNATURE |coerce| (|#1| |#1|)) + (SIGNATURE |coerce| + (|#1| (|Integer|))) + (SIGNATURE |characteristic| + ((|NonNegativeInteger|))) + (SIGNATURE |coerce| + ((|OutputForm|) |#1|))) + (|QuotientFieldCategory| |#2|) + (|IntegralDomain|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/QFCAT.lsp b/src/algebra/strap/QFCAT.lsp index babf745e..2ba4a22d 100644 --- a/src/algebra/strap/QFCAT.lsp +++ b/src/algebra/strap/QFCAT.lsp @@ -5,8 +5,8 @@ (DEFPARAMETER |QuotientFieldCategory;AL| 'NIL) -(DEFUN |QuotientFieldCategory| (#0=#:G1388) - (LET (#1=#:G1389) +(DEFUN |QuotientFieldCategory| (#0=#:G1397) + (LET (#1=#:G1398) (COND ((SETQ #1# (|assoc| (|devaluate| #0#) |QuotientFieldCategory;AL|)) @@ -18,7 +18,7 @@ #1#)))) (DEFUN |QuotientFieldCategory;| (|t#1|) - (PROG (#0=#:G1387) + (PROG (#0=#:G1396) (RETURN (PROG1 (LETT #0# (|sublisV| @@ -103,3 +103,10 @@ . #1=(|QuotientFieldCategory|))))) . #1#) (SETELT #0# 0 (LIST '|QuotientFieldCategory| (|devaluate| |t#1|))))))) + +(SETQ |$CategoryFrame| + (|put| '|QuotientFieldCategory| '|isCategory| T + (|addModemap| '|QuotientFieldCategory| + '(|QuotientFieldCategory| |#1|) + '((|Category|) (|IntegralDomain|)) T + '|QuotientFieldCategory| |$CategoryFrame|))) diff --git a/src/algebra/strap/RCAGG-.lsp b/src/algebra/strap/RCAGG-.lsp index 24470798..0546ebc4 100644 --- a/src/algebra/strap/RCAGG-.lsp +++ b/src/algebra/strap/RCAGG-.lsp @@ -1,13 +1,15 @@ (/VERSIONCHECK 2) -(DEFUN |RCAGG-;elt;AvalueS;1| (|x| T0 $) (SPADCALL |x| (QREFELT $ 8))) +(DEFUN |RCAGG-;elt;AvalueS;1| (|x| T0 $) + (SPADCALL |x| (|getShellEntry| $ 8))) (DEFUN |RCAGG-;setelt;Avalue2S;2| (|x| T1 |y| $) - (SPADCALL |x| |y| (QREFELT $ 11))) + (SPADCALL |x| |y| (|getShellEntry| $ 11))) (DEFUN |RCAGG-;child?;2AB;3| (|x| |l| $) - (SPADCALL |x| (SPADCALL |l| (QREFELT $ 14)) (QREFELT $ 17))) + (SPADCALL |x| (SPADCALL |l| (|getShellEntry| $ 14)) + (|getShellEntry| $ 17))) (DEFUN |RecursiveAggregate&| (|#1| |#2|) (PROG (|dv$1| |dv$2| |dv$| $ |pv$|) @@ -16,23 +18,23 @@ (LETT |dv$1| (|devaluate| |#1|) . #0=(|RecursiveAggregate&|)) (LETT |dv$2| (|devaluate| |#2|) . #0#) (LETT |dv$| (LIST '|RecursiveAggregate&| |dv$1| |dv$2|) . #0#) - (LETT $ (GETREFV 19) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 + (LETT $ (|newShell| 19) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 (LIST (|HasAttribute| |#1| '|shallowlyMutable|) (|HasCategory| |#2| '(|SetCategory|)))) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) - (QSETREFV $ 7 |#2|) + (|setShellEntry| $ 6 |#1|) + (|setShellEntry| $ 7 |#2|) (COND ((|testBitVector| |pv$| 1) - (QSETREFV $ 12 + (|setShellEntry| $ 12 (CONS (|dispatchFunction| |RCAGG-;setelt;Avalue2S;2|) $)))) (COND ((|testBitVector| |pv$| 2) - (QSETREFV $ 18 + (|setShellEntry| $ 18 (CONS (|dispatchFunction| |RCAGG-;child?;2AB;3|) $)))) $)))) @@ -52,3 +54,27 @@ 18 3 0 7 0 9 7 12 2 0 7 0 9 10 2 0 15 0 0 18))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|RecursiveAggregate&| '|isFunctor| + '(((|setelt| (|#2| $ "value" |#2|)) T (ELT $ 12)) + ((|child?| ((|Boolean|) $ $)) T (ELT $ 18)) + ((|elt| (|#2| $ "value")) T (ELT $ 10))) + (|addModemap| '|RecursiveAggregate&| + '(|RecursiveAggregate&| |#1| |#2|) + '((CATEGORY |domain| + (SIGNATURE |setelt| (|#2| |#1| "value" |#2|)) + (SIGNATURE |child?| ((|Boolean|) |#1| |#1|)) + (SIGNATURE |elt| (|#2| |#1| "value"))) + (|RecursiveAggregate| |#2|) (|Type|)) + T '|RecursiveAggregate&| + (|put| '|RecursiveAggregate&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |setelt| + (|#2| |#1| "value" |#2|)) + (SIGNATURE |child?| + ((|Boolean|) |#1| |#1|)) + (SIGNATURE |elt| (|#2| |#1| "value"))) + (|RecursiveAggregate| |#2|) (|Type|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/RCAGG.lsp b/src/algebra/strap/RCAGG.lsp index 9981da27..e60f3c4e 100644 --- a/src/algebra/strap/RCAGG.lsp +++ b/src/algebra/strap/RCAGG.lsp @@ -5,8 +5,8 @@ (DEFPARAMETER |RecursiveAggregate;AL| 'NIL) -(DEFUN |RecursiveAggregate| (#0=#:G1398) - (LET (#1=#:G1399) +(DEFUN |RecursiveAggregate| (#0=#:G1395) + (LET (#1=#:G1396) (COND ((SETQ #1# (|assoc| (|devaluate| #0#) |RecursiveAggregate;AL|)) (CDR #1#)) @@ -17,7 +17,7 @@ #1#)))) (DEFUN |RecursiveAggregate;| (|t#1|) - (PROG (#0=#:G1397) + (PROG (#0=#:G1394) (RETURN (PROG1 (LETT #0# (|sublisV| @@ -72,3 +72,9 @@ NIL)) . #1=(|RecursiveAggregate|))))) . #1#) (SETELT #0# 0 (LIST '|RecursiveAggregate| (|devaluate| |t#1|))))))) + +(SETQ |$CategoryFrame| + (|put| '|RecursiveAggregate| '|isCategory| T + (|addModemap| '|RecursiveAggregate| + '(|RecursiveAggregate| |#1|) '((|Category|) (|Type|)) + T '|RecursiveAggregate| |$CategoryFrame|))) diff --git a/src/algebra/strap/REF.lsp b/src/algebra/strap/REF.lsp index ad9f6dd0..ae5ee5c3 100644 --- a/src/algebra/strap/REF.lsp +++ b/src/algebra/strap/REF.lsp @@ -28,10 +28,10 @@ (LIST (SPADCALL (QCAR |p|) (|getShellEntry| $ 18))) (|getShellEntry| $ 20))) -(DEFUN |Reference| (#0=#:G1401) +(DEFUN |Reference| (#0=#:G1403) (PROG () (RETURN - (PROG (#1=#:G1402) + (PROG (#1=#:G1404) (RETURN (COND ((LETT #1# @@ -90,3 +90,51 @@ 1 1 22 0 1 1 0 6 0 11 1 0 6 0 13 1 1 16 0 21 2 0 8 0 0 9))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|Reference| '|isFunctor| + '(((~= ((|Boolean|) $ $)) (|has| |#1| (|SetCategory|)) + (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) + (|has| |#1| (|SetCategory|)) (ELT $ 21)) + ((|hash| ((|SingleInteger|) $)) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|latex| ((|String|) $)) (|has| |#1| (|SetCategory|)) + (ELT $ NIL)) + ((= ((|Boolean|) $ $)) T (ELT $ 9)) + ((|setref| (|#1| $ |#1|)) T (ELT $ 14)) + ((|deref| (|#1| $)) T (ELT $ 13)) + ((|setelt| (|#1| $ |#1|)) T (ELT $ 12)) + ((|elt| (|#1| $)) T (ELT $ 11)) + ((|ref| ($ |#1|)) T (ELT $ 10))) + (|addModemap| '|Reference| '(|Reference| |#1|) + '((|Join| (|Type|) + (CATEGORY |domain| + (SIGNATURE |ref| ($ |#1|)) + (SIGNATURE |elt| (|#1| $)) + (SIGNATURE |setelt| (|#1| $ |#1|)) + (SIGNATURE |deref| (|#1| $)) + (SIGNATURE |setref| (|#1| $ |#1|)) + (SIGNATURE = ((|Boolean|) $ $)) + (IF (|has| |#1| (|SetCategory|)) + (ATTRIBUTE (|SetCategory|)) + |%noBranch|))) + (|Type|)) + T '|Reference| + (|put| '|Reference| '|mode| + '(|Mapping| + (|Join| (|Type|) + (CATEGORY |domain| + (SIGNATURE |ref| ($ |#1|)) + (SIGNATURE |elt| (|#1| $)) + (SIGNATURE |setelt| + (|#1| $ |#1|)) + (SIGNATURE |deref| (|#1| $)) + (SIGNATURE |setref| + (|#1| $ |#1|)) + (SIGNATURE = ((|Boolean|) $ $)) + (IF (|has| |#1| (|SetCategory|)) + (ATTRIBUTE (|SetCategory|)) + |%noBranch|))) + (|Type|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/RING-.lsp b/src/algebra/strap/RING-.lsp index 31e6daf4..dee3b20e 100644 --- a/src/algebra/strap/RING-.lsp +++ b/src/algebra/strap/RING-.lsp @@ -2,7 +2,7 @@ (/VERSIONCHECK 2) (DEFUN |RING-;coerce;IS;1| (|n| $) - (SPADCALL |n| (|spadConstant| $ 7) (QREFELT $ 9))) + (SPADCALL |n| (|spadConstant| $ 7) (|getShellEntry| $ 9))) (DEFUN |Ring&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -10,11 +10,12 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|Ring&|)) (LETT |dv$| (LIST '|Ring&| |dv$1|) . #0#) - (LETT $ (GETREFV 12) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 12) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) $)))) (MAKEPROP '|Ring&| '|infovec| @@ -27,3 +28,23 @@ (|makeByteWordVec2| 10 '(0 6 0 7 2 6 0 8 0 9 1 0 0 8 10))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|Ring&| '|isFunctor| + '(((|coerce| ($ (|Integer|))) T (ELT $ 10)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ NIL))) + (|addModemap| '|Ring&| '(|Ring&| |#1|) + '((CATEGORY |domain| + (SIGNATURE |coerce| (|#1| (|Integer|))) + (SIGNATURE |coerce| ((|OutputForm|) |#1|))) + (|Ring|)) + T '|Ring&| + (|put| '|Ring&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |coerce| + (|#1| (|Integer|))) + (SIGNATURE |coerce| + ((|OutputForm|) |#1|))) + (|Ring|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/RING.lsp b/src/algebra/strap/RING.lsp index 47fce84a..de80c4c5 100644 --- a/src/algebra/strap/RING.lsp +++ b/src/algebra/strap/RING.lsp @@ -4,10 +4,10 @@ (DEFPARAMETER |Ring;AL| 'NIL) (DEFUN |Ring| () - (LET (#:G1387) (COND (|Ring;AL|) (T (SETQ |Ring;AL| (|Ring;|)))))) + (LET (#:G1396) (COND (|Ring;AL|) (T (SETQ |Ring;AL| (|Ring;|)))))) (DEFUN |Ring;| () - (PROG (#0=#:G1385) + (PROG (#0=#:G1394) (RETURN (PROG1 (LETT #0# (|Join| (|Rng|) (|Monoid|) (|LeftModule| '$) @@ -22,4 +22,9 @@ |Ring|) (SETELT #0# 0 '(|Ring|)))))) +(SETQ |$CategoryFrame| + (|put| '|Ring| '|isCategory| T + (|addModemap| '|Ring| '(|Ring|) '((|Category|)) T '|Ring| + |$CategoryFrame|))) + (MAKEPROP '|Ring| 'NILADIC T) diff --git a/src/algebra/strap/RNG.lsp b/src/algebra/strap/RNG.lsp index 5ba05b81..b5b61715 100644 --- a/src/algebra/strap/RNG.lsp +++ b/src/algebra/strap/RNG.lsp @@ -4,12 +4,17 @@ (DEFPARAMETER |Rng;AL| 'NIL) (DEFUN |Rng| () - (LET (#:G1387) (COND (|Rng;AL|) (T (SETQ |Rng;AL| (|Rng;|)))))) + (LET (#:G1396) (COND (|Rng;AL|) (T (SETQ |Rng;AL| (|Rng;|)))))) (DEFUN |Rng;| () - (PROG (#0=#:G1385) + (PROG (#0=#:G1394) (RETURN (PROG1 (LETT #0# (|Join| (|AbelianGroup|) (|SemiGroup|)) |Rng|) (SETELT #0# 0 '(|Rng|)))))) +(SETQ |$CategoryFrame| + (|put| '|Rng| '|isCategory| T + (|addModemap| '|Rng| '(|Rng|) '((|Category|)) T '|Rng| + |$CategoryFrame|))) + (MAKEPROP '|Rng| 'NILADIC T) diff --git a/src/algebra/strap/RNS-.lsp b/src/algebra/strap/RNS-.lsp index 911b8420..693f7a64 100644 --- a/src/algebra/strap/RNS-.lsp +++ b/src/algebra/strap/RNS-.lsp @@ -6,89 +6,102 @@ (DEFUN |RNS-;characteristic;Nni;1| ($) 0) (DEFUN |RNS-;fractionPart;2S;2| (|x| $) - (SPADCALL |x| (SPADCALL |x| (QREFELT $ 9)) (QREFELT $ 10))) + (SPADCALL |x| (SPADCALL |x| (|getShellEntry| $ 9)) + (|getShellEntry| $ 10))) (DEFUN |RNS-;truncate;2S;3| (|x| $) (COND - ((SPADCALL |x| (QREFELT $ 13)) - (SPADCALL (SPADCALL (SPADCALL |x| (QREFELT $ 14)) (QREFELT $ 15)) - (QREFELT $ 14))) - ('T (SPADCALL |x| (QREFELT $ 15))))) + ((SPADCALL |x| (|getShellEntry| $ 13)) + (SPADCALL + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 14)) + (|getShellEntry| $ 15)) + (|getShellEntry| $ 14))) + ('T (SPADCALL |x| (|getShellEntry| $ 15))))) (DEFUN |RNS-;round;2S;4| (|x| $) (COND - ((SPADCALL |x| (QREFELT $ 13)) + ((SPADCALL |x| (|getShellEntry| $ 13)) (SPADCALL (SPADCALL |x| (SPADCALL (|spadConstant| $ 17) - (SPADCALL 2 (QREFELT $ 19)) (QREFELT $ 20)) - (QREFELT $ 10)) - (QREFELT $ 9))) + (SPADCALL 2 (|getShellEntry| $ 19)) + (|getShellEntry| $ 20)) + (|getShellEntry| $ 10)) + (|getShellEntry| $ 9))) ('T (SPADCALL (SPADCALL |x| (SPADCALL (|spadConstant| $ 17) - (SPADCALL 2 (QREFELT $ 19)) (QREFELT $ 20)) - (QREFELT $ 21)) - (QREFELT $ 9))))) + (SPADCALL 2 (|getShellEntry| $ 19)) + (|getShellEntry| $ 20)) + (|getShellEntry| $ 21)) + (|getShellEntry| $ 9))))) -(DEFUN |RNS-;norm;2S;5| (|x| $) (SPADCALL |x| (QREFELT $ 23))) +(DEFUN |RNS-;norm;2S;5| (|x| $) (SPADCALL |x| (|getShellEntry| $ 23))) (DEFUN |RNS-;coerce;FS;6| (|x| $) - (SPADCALL (SPADCALL (SPADCALL |x| (QREFELT $ 26)) (QREFELT $ 19)) - (SPADCALL (SPADCALL |x| (QREFELT $ 27)) (QREFELT $ 19)) - (QREFELT $ 20))) + (SPADCALL + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 26)) + (|getShellEntry| $ 19)) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 27)) + (|getShellEntry| $ 19)) + (|getShellEntry| $ 20))) (DEFUN |RNS-;convert;SP;7| (|x| $) - (SPADCALL (SPADCALL |x| (QREFELT $ 30)) (QREFELT $ 32))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30)) + (|getShellEntry| $ 32))) (DEFUN |RNS-;floor;2S;8| (|x| $) (PROG (|x1|) (RETURN (SEQ (LETT |x1| - (SPADCALL (SPADCALL |x| (QREFELT $ 34)) - (QREFELT $ 19)) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 34)) + (|getShellEntry| $ 19)) |RNS-;floor;2S;8|) (EXIT (COND - ((SPADCALL |x| |x1| (QREFELT $ 35)) |x|) - ((SPADCALL |x| (|spadConstant| $ 36) (QREFELT $ 37)) + ((SPADCALL |x| |x1| (|getShellEntry| $ 35)) |x|) + ((SPADCALL |x| (|spadConstant| $ 36) + (|getShellEntry| $ 37)) (SPADCALL |x1| (|spadConstant| $ 17) - (QREFELT $ 10))) + (|getShellEntry| $ 10))) ('T |x1|))))))) (DEFUN |RNS-;ceiling;2S;9| (|x| $) (PROG (|x1|) (RETURN (SEQ (LETT |x1| - (SPADCALL (SPADCALL |x| (QREFELT $ 34)) - (QREFELT $ 19)) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 34)) + (|getShellEntry| $ 19)) |RNS-;ceiling;2S;9|) (EXIT (COND - ((SPADCALL |x| |x1| (QREFELT $ 35)) |x|) - ((SPADCALL |x| (|spadConstant| $ 36) (QREFELT $ 37)) + ((SPADCALL |x| |x1| (|getShellEntry| $ 35)) |x|) + ((SPADCALL |x| (|spadConstant| $ 36) + (|getShellEntry| $ 37)) |x1|) ('T (SPADCALL |x1| (|spadConstant| $ 17) - (QREFELT $ 21))))))))) + (|getShellEntry| $ 21))))))))) (DEFUN |RNS-;patternMatch;SP2Pmr;10| (|x| |p| |l| $) (PROG (|r|) (RETURN (SEQ (COND - ((SPADCALL |p| (QREFELT $ 40)) - (SPADCALL |p| |x| |l| (QREFELT $ 42))) - ((SPADCALL |p| (QREFELT $ 43)) - (SEQ (LETT |r| (SPADCALL |p| (QREFELT $ 45)) + ((SPADCALL |p| (|getShellEntry| $ 40)) + (SPADCALL |p| |x| |l| (|getShellEntry| $ 42))) + ((SPADCALL |p| (|getShellEntry| $ 43)) + (SEQ (LETT |r| (SPADCALL |p| (|getShellEntry| $ 45)) |RNS-;patternMatch;SP2Pmr;10|) (EXIT (COND ((QEQCAR |r| 0) (COND - ((SPADCALL (SPADCALL |x| (QREFELT $ 30)) - (QCDR |r|) (QREFELT $ 46)) + ((SPADCALL + (SPADCALL |x| + (|getShellEntry| $ 30)) + (QCDR |r|) (|getShellEntry| $ 46)) |l|) - ('T (SPADCALL (QREFELT $ 47))))) - ('T (SPADCALL (QREFELT $ 47))))))) - ('T (SPADCALL (QREFELT $ 47)))))))) + ('T (SPADCALL (|getShellEntry| $ 47))))) + ('T (SPADCALL (|getShellEntry| $ 47))))))) + ('T (SPADCALL (|getShellEntry| $ 47)))))))) (DEFUN |RealNumberSystem&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -96,11 +109,12 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|RealNumberSystem&|)) (LETT |dv$| (LIST '|RealNumberSystem&| |dv$1|) . #0#) - (LETT $ (GETREFV 52) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 52) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) $)))) (MAKEPROP '|RealNumberSystem&| '|infovec| @@ -142,3 +156,91 @@ 0 33 1 0 0 25 28 1 0 0 25 28 0 0 7 8 1 0 0 0 39))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|RealNumberSystem&| '|isFunctor| + '(((|round| ($ $)) T (ELT $ 22)) + ((|truncate| ($ $)) T (ELT $ 16)) + ((|fractionPart| ($ $)) T (ELT $ 11)) + ((|floor| ($ $)) T (ELT $ 38)) + ((|ceiling| ($ $)) T (ELT $ 39)) + ((|norm| ($ $)) T (ELT $ 24)) + ((|patternMatch| + ((|PatternMatchResult| (|Float|) $) $ + (|Pattern| (|Float|)) + (|PatternMatchResult| (|Float|) $))) + T (ELT $ 49)) + ((|convert| ((|Pattern| (|Float|)) $)) T (ELT $ 33)) + ((|coerce| ($ (|Fraction| (|Integer|)))) T (ELT $ 28)) + ((|coerce| ($ (|Integer|))) T (ELT $ NIL)) + ((|convert| ((|DoubleFloat|) $)) T (ELT $ NIL)) + ((|convert| ((|Float|) $)) T (ELT $ NIL)) + ((|coerce| ($ (|Fraction| (|Integer|)))) T (ELT $ 28)) + ((|coerce| ($ $)) T (ELT $ NIL)) + ((|coerce| ($ (|Integer|))) T (ELT $ NIL)) + ((|characteristic| ((|NonNegativeInteger|))) T + (ELT $ 8)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ NIL))) + (|addModemap| '|RealNumberSystem&| + '(|RealNumberSystem&| |#1|) + '((CATEGORY |domain| (SIGNATURE |round| (|#1| |#1|)) + (SIGNATURE |truncate| (|#1| |#1|)) + (SIGNATURE |fractionPart| (|#1| |#1|)) + (SIGNATURE |floor| (|#1| |#1|)) + (SIGNATURE |ceiling| (|#1| |#1|)) + (SIGNATURE |norm| (|#1| |#1|)) + (SIGNATURE |patternMatch| + ((|PatternMatchResult| (|Float|) |#1|) |#1| + (|Pattern| (|Float|)) + (|PatternMatchResult| (|Float|) |#1|))) + (SIGNATURE |convert| + ((|Pattern| (|Float|)) |#1|)) + (SIGNATURE |coerce| + (|#1| (|Fraction| (|Integer|)))) + (SIGNATURE |coerce| (|#1| (|Integer|))) + (SIGNATURE |convert| ((|DoubleFloat|) |#1|)) + (SIGNATURE |convert| ((|Float|) |#1|)) + (SIGNATURE |coerce| + (|#1| (|Fraction| (|Integer|)))) + (SIGNATURE |coerce| (|#1| |#1|)) + (SIGNATURE |coerce| (|#1| (|Integer|))) + (SIGNATURE |characteristic| + ((|NonNegativeInteger|))) + (SIGNATURE |coerce| ((|OutputForm|) |#1|))) + (|RealNumberSystem|)) + T '|RealNumberSystem&| + (|put| '|RealNumberSystem&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |round| (|#1| |#1|)) + (SIGNATURE |truncate| (|#1| |#1|)) + (SIGNATURE |fractionPart| (|#1| |#1|)) + (SIGNATURE |floor| (|#1| |#1|)) + (SIGNATURE |ceiling| (|#1| |#1|)) + (SIGNATURE |norm| (|#1| |#1|)) + (SIGNATURE |patternMatch| + ((|PatternMatchResult| (|Float|) + |#1|) + |#1| (|Pattern| (|Float|)) + (|PatternMatchResult| (|Float|) + |#1|))) + (SIGNATURE |convert| + ((|Pattern| (|Float|)) |#1|)) + (SIGNATURE |coerce| + (|#1| (|Fraction| (|Integer|)))) + (SIGNATURE |coerce| + (|#1| (|Integer|))) + (SIGNATURE |convert| + ((|DoubleFloat|) |#1|)) + (SIGNATURE |convert| ((|Float|) |#1|)) + (SIGNATURE |coerce| + (|#1| (|Fraction| (|Integer|)))) + (SIGNATURE |coerce| (|#1| |#1|)) + (SIGNATURE |coerce| + (|#1| (|Integer|))) + (SIGNATURE |characteristic| + ((|NonNegativeInteger|))) + (SIGNATURE |coerce| + ((|OutputForm|) |#1|))) + (|RealNumberSystem|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/RNS.lsp b/src/algebra/strap/RNS.lsp index 7955ad3e..6132cdab 100644 --- a/src/algebra/strap/RNS.lsp +++ b/src/algebra/strap/RNS.lsp @@ -4,18 +4,18 @@ (DEFPARAMETER |RealNumberSystem;AL| 'NIL) (DEFUN |RealNumberSystem| () - (LET (#:G1396) + (LET (#:G1405) (COND (|RealNumberSystem;AL|) (T (SETQ |RealNumberSystem;AL| (|RealNumberSystem;|)))))) (DEFUN |RealNumberSystem;| () - (PROG (#0=#:G1394) + (PROG (#0=#:G1403) (RETURN (PROG1 (LETT #0# (|sublisV| - (PAIR '(#1=#:G1390 #2=#:G1391 #3=#:G1392 - #4=#:G1393) + (PAIR '(#1=#:G1399 #2=#:G1400 #3=#:G1401 + #4=#:G1402) (LIST '(|Integer|) '(|Fraction| (|Integer|)) '(|Pattern| (|Float|)) '(|Float|))) @@ -39,4 +39,10 @@ |RealNumberSystem|) (SETELT #0# 0 '(|RealNumberSystem|)))))) +(SETQ |$CategoryFrame| + (|put| '|RealNumberSystem| '|isCategory| T + (|addModemap| '|RealNumberSystem| '(|RealNumberSystem|) + '((|Category|)) T '|RealNumberSystem| + |$CategoryFrame|))) + (MAKEPROP '|RealNumberSystem| 'NILADIC T) diff --git a/src/algebra/strap/SETAGG-.lsp b/src/algebra/strap/SETAGG-.lsp index de45a200..99884fa8 100644 --- a/src/algebra/strap/SETAGG-.lsp +++ b/src/algebra/strap/SETAGG-.lsp @@ -48,3 +48,38 @@ 0 0 7 0 14 2 0 0 0 7 13 2 0 0 0 0 10 2 0 0 0 7 15))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|SetAggregate&| '|isFunctor| + '(((|union| ($ |#2| $)) T (ELT $ 14)) + ((|union| ($ $ |#2|)) T (ELT $ 13)) + ((|union| ($ $ $)) T (ELT $ NIL)) + ((|symmetricDifference| ($ $ $)) T (ELT $ 10)) + ((|difference| ($ $ |#2|)) T (ELT $ 15)) + ((|difference| ($ $ $)) T (ELT $ NIL))) + (|addModemap| '|SetAggregate&| + '(|SetAggregate&| |#1| |#2|) + '((CATEGORY |domain| + (SIGNATURE |union| (|#1| |#2| |#1|)) + (SIGNATURE |union| (|#1| |#1| |#2|)) + (SIGNATURE |union| (|#1| |#1| |#1|)) + (SIGNATURE |symmetricDifference| + (|#1| |#1| |#1|)) + (SIGNATURE |difference| (|#1| |#1| |#2|)) + (SIGNATURE |difference| (|#1| |#1| |#1|))) + (|SetAggregate| |#2|) (|SetCategory|)) + T '|SetAggregate&| + (|put| '|SetAggregate&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |union| (|#1| |#2| |#1|)) + (SIGNATURE |union| (|#1| |#1| |#2|)) + (SIGNATURE |union| (|#1| |#1| |#1|)) + (SIGNATURE |symmetricDifference| + (|#1| |#1| |#1|)) + (SIGNATURE |difference| + (|#1| |#1| |#2|)) + (SIGNATURE |difference| + (|#1| |#1| |#1|))) + (|SetAggregate| |#2|) (|SetCategory|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/SETAGG.lsp b/src/algebra/strap/SETAGG.lsp index e28d5608..f3f7586e 100644 --- a/src/algebra/strap/SETAGG.lsp +++ b/src/algebra/strap/SETAGG.lsp @@ -5,8 +5,8 @@ (DEFPARAMETER |SetAggregate;AL| 'NIL) -(DEFUN |SetAggregate| (#0=#:G1394) - (LET (#1=#:G1395) +(DEFUN |SetAggregate| (#0=#:G1395) + (LET (#1=#:G1396) (COND ((SETQ #1# (|assoc| (|devaluate| #0#) |SetAggregate;AL|)) (CDR #1#)) @@ -17,7 +17,7 @@ #1#)))) (DEFUN |SetAggregate;| (|t#1|) - (PROG (#0=#:G1393) + (PROG (#0=#:G1394) (RETURN (PROG1 (LETT #0# (|sublisV| @@ -56,3 +56,9 @@ NIL)) . #1=(|SetAggregate|))))) . #1#) (SETELT #0# 0 (LIST '|SetAggregate| (|devaluate| |t#1|))))))) + +(SETQ |$CategoryFrame| + (|put| '|SetAggregate| '|isCategory| T + (|addModemap| '|SetAggregate| '(|SetAggregate| |#1|) + '((|Category|) (|SetCategory|)) T '|SetAggregate| + |$CategoryFrame|))) diff --git a/src/algebra/strap/SETCAT-.lsp b/src/algebra/strap/SETCAT-.lsp index d4c1987b..57bf43e1 100644 --- a/src/algebra/strap/SETCAT-.lsp +++ b/src/algebra/strap/SETCAT-.lsp @@ -16,11 +16,12 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|SetCategory&|)) (LETT |dv$| (LIST '|SetCategory&| |dv$1|) . #0#) - (LETT $ (GETREFV 11) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 11) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) + (|setShellEntry| $ 6 |#1|) $)))) (MAKEPROP '|SetCategory&| '|infovec| @@ -33,3 +34,22 @@ (|makeByteWordVec2| 10 '(1 0 9 0 10 1 0 7 0 8))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|SetCategory&| '|isFunctor| + '(((|latex| ((|String|) $)) T (ELT $ 10)) + ((|hash| ((|SingleInteger|) $)) T (ELT $ 8))) + (|addModemap| '|SetCategory&| '(|SetCategory&| |#1|) + '((CATEGORY |domain| + (SIGNATURE |latex| ((|String|) |#1|)) + (SIGNATURE |hash| ((|SingleInteger|) |#1|))) + (|SetCategory|)) + T '|SetCategory&| + (|put| '|SetCategory&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |latex| ((|String|) |#1|)) + (SIGNATURE |hash| + ((|SingleInteger|) |#1|))) + (|SetCategory|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/SETCAT.lsp b/src/algebra/strap/SETCAT.lsp index 075d8993..3f239b87 100644 --- a/src/algebra/strap/SETCAT.lsp +++ b/src/algebra/strap/SETCAT.lsp @@ -4,17 +4,17 @@ (DEFPARAMETER |SetCategory;AL| 'NIL) (DEFUN |SetCategory| () - (LET (#:G1388) + (LET (#:G1397) (COND (|SetCategory;AL|) (T (SETQ |SetCategory;AL| (|SetCategory;|)))))) (DEFUN |SetCategory;| () - (PROG (#0=#:G1386) + (PROG (#0=#:G1395) (RETURN (PROG1 (LETT #0# (|sublisV| - (PAIR '(#1=#:G1385) (LIST '(|OutputForm|))) + (PAIR '(#1=#:G1394) (LIST '(|OutputForm|))) (|Join| (|BasicType|) (|CoercibleTo| '#1#) (|mkCategory| '|domain| '(((|hash| ((|SingleInteger|) $)) T) @@ -24,4 +24,9 @@ |SetCategory|) (SETELT #0# 0 '(|SetCategory|)))))) +(SETQ |$CategoryFrame| + (|put| '|SetCategory| '|isCategory| T + (|addModemap| '|SetCategory| '(|SetCategory|) + '((|Category|)) T '|SetCategory| |$CategoryFrame|))) + (MAKEPROP '|SetCategory| 'NILADIC T) diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index 2ad4d6de..f1b5503b 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -262,7 +262,7 @@ (DEFUN |SingleInteger| () (PROG () (RETURN - (PROG (#0=#:G1486) + (PROG (#0=#:G1488) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|SingleInteger|) @@ -377,8 +377,8 @@ |UniqueFactorizationDomain&| NIL NIL |GcdDomain&| |IntegralDomain&| |Algebra&| NIL NIL |DifferentialRing&| |OrderedRing&| NIL NIL - |Module&| NIL NIL |Ring&| NIL NIL NIL NIL NIL - |AbelianGroup&| NIL NIL |AbelianMonoid&| + |Module&| NIL |Ring&| NIL NIL NIL NIL NIL + |AbelianGroup&| NIL NIL NIL |AbelianMonoid&| |Monoid&| NIL NIL |OrderedSet&| |AbelianSemiGroup&| |SemiGroup&| |Logic&| NIL |SetCategory&| NIL NIL NIL NIL NIL NIL @@ -393,15 +393,15 @@ (|LinearlyExplicitRingOver| 12) (|DifferentialRing|) (|OrderedRing|) (|CommutativeRing|) (|EntireRing|) - (|Module| $$) (|OrderedAbelianGroup|) - (|BiModule| $$ $$) (|Ring|) - (|OrderedCancellationAbelianMonoid|) + (|Module| $$) (|BiModule| $$ $$) + (|Ring|) (|OrderedAbelianGroup|) (|LeftModule| $$) (|Rng|) (|RightModule| $$) - (|OrderedAbelianMonoid|) + (|OrderedCancellationAbelianMonoid|) (|AbelianGroup|) - (|OrderedAbelianSemiGroup|) + (|OrderedAbelianMonoid|) (|CancellationAbelianMonoid|) + (|OrderedAbelianSemiGroup|) (|AbelianMonoid|) (|Monoid|) (|StepThrough|) (|PatternMatchable| 12) (|OrderedSet|) (|AbelianSemiGroup|) @@ -460,4 +460,204 @@ 1 2 0 0 103 0 1))))) '|lookupComplete|)) +(SETQ |$CategoryFrame| + (|put| '|SingleInteger| '|isFunctor| + '(((|Or| ($ $ $)) T (ELT $ 47)) + ((|And| ($ $ $)) T (ELT $ 46)) + ((|Not| ($ $)) T (ELT $ 45)) + ((|xor| ($ $ $)) T (ELT $ 48)) + ((|not| ($ $)) T (ELT $ 42)) ((|min| ($)) T (ELT $ 39)) + ((|max| ($)) T (ELT $ 38)) + ((|OMwrite| ((|Void|) (|OpenMathDevice|) $ (|Boolean|))) + T (ELT $ 25)) + ((|OMwrite| ((|Void|) (|OpenMathDevice|) $)) T + (ELT $ 24)) + ((|OMwrite| ((|String|) $ (|Boolean|))) T (ELT $ 23)) + ((|OMwrite| ((|String|) $)) T (ELT $ 21)) + ((~ ($ $)) T (ELT $ 41)) ((|/\\| ($ $ $)) T (ELT $ 43)) + ((|\\/| ($ $ $)) T (ELT $ 44)) + ((|invmod| ($ $ $)) T (ELT $ NIL)) + ((|powmod| ($ $ $ $)) T (ELT $ NIL)) + ((|mulmod| ($ $ $ $)) T (ELT $ 72)) + ((|submod| ($ $ $ $)) T (ELT $ 74)) + ((|addmod| ($ $ $ $)) T (ELT $ 73)) + ((|mask| ($ $)) T (ELT $ NIL)) + ((|dec| ($ $)) T (ELT $ 51)) + ((|inc| ($ $)) T (ELT $ 50)) + ((|copy| ($ $)) T (ELT $ NIL)) + ((|hash| ($ $)) T (ELT $ 69)) + ((|random| ($ $)) T (ELT $ 83)) + ((|random| ($)) T (ELT $ 82)) + ((|rationalIfCan| + ((|Union| (|Fraction| (|Integer|)) "failed") $)) + T (ELT $ NIL)) + ((|rational| ((|Fraction| (|Integer|)) $)) T + (ELT $ NIL)) + ((|rational?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|symmetricRemainder| ($ $ $)) T (ELT $ NIL)) + ((|positiveRemainder| ($ $ $)) T (ELT $ 80)) + ((|bit?| ((|Boolean|) $ $)) T (ELT $ NIL)) + ((|shift| ($ $ $)) T (ELT $ 71)) + ((|length| ($ $)) T (ELT $ 70)) + ((|base| ($)) T (ELT $ 37)) + ((|even?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|odd?| ((|Boolean|) $)) T (ELT $ 64)) + ((|init| ($)) T (CONST $ NIL)) + ((|nextItem| ((|Union| $ "failed") $)) T (ELT $ NIL)) + ((|convert| ((|DoubleFloat|) $)) T (ELT $ NIL)) + ((|convert| ((|Float|) $)) T (ELT $ NIL)) + ((|permutation| ($ $ $)) T (ELT $ NIL)) + ((|factorial| ($ $)) T (ELT $ NIL)) + ((|binomial| ($ $ $)) T (ELT $ NIL)) + ((|patternMatch| + ((|PatternMatchResult| (|Integer|) $) $ + (|Pattern| (|Integer|)) + (|PatternMatchResult| (|Integer|) $))) + T (ELT $ NIL)) + ((|convert| ((|Pattern| (|Integer|)) $)) T (ELT $ NIL)) + ((|convert| ((|InputForm|) $)) T (ELT $ NIL)) + ((|reducedSystem| ((|Matrix| (|Integer|)) (|Matrix| $))) + T (ELT $ 28)) + ((|reducedSystem| + ((|Record| (|:| |mat| (|Matrix| (|Integer|))) + (|:| |vec| (|Vector| (|Integer|)))) + (|Matrix| $) (|Vector| $))) + T (ELT $ 79)) + ((|retract| ((|Integer|) $)) T (ELT $ NIL)) + ((|retractIfCan| ((|Union| (|Integer|) "failed") $)) T + (ELT $ NIL)) + ((|coerce| ($ (|Integer|))) T (ELT $ 81)) + ((|convert| ((|Integer|) $)) T (ELT $ 32)) + ((|differentiate| ($ $)) T (ELT $ NIL)) + ((D ($ $)) T (ELT $ NIL)) + ((|differentiate| ($ $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((D ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((|abs| ($ $)) T (ELT $ 63)) + ((|sign| ((|Integer|) $)) T (ELT $ NIL)) + ((|negative?| ((|Boolean|) $)) T (ELT $ 75)) + ((|positive?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|min| ($ $ $)) T (ELT $ 68)) + ((|max| ($ $ $)) T (ELT $ 67)) + ((<= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((>= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((> ((|Boolean|) $ $)) T (ELT $ NIL)) + ((< ((|Boolean|) $ $)) T (ELT $ 49)) + ((|principalIdeal| + ((|Record| (|:| |coef| (|List| $)) + (|:| |generator| $)) + (|List| $))) + T (ELT $ NIL)) + ((|expressIdealMember| + ((|Union| (|List| $) "failed") (|List| $) $)) + T (ELT $ NIL)) + ((|sizeLess?| ((|Boolean|) $ $)) T (ELT $ NIL)) + ((|euclideanSize| ((|NonNegativeInteger|) $)) T + (ELT $ NIL)) + ((|divide| + ((|Record| (|:| |quotient| $) (|:| |remainder| $)) + $ $)) + T (ELT $ 61)) + ((|quo| ($ $ $)) T (ELT $ 58)) + ((|rem| ($ $ $)) T (ELT $ 59)) + ((|extendedEuclidean| + ((|Record| (|:| |coef1| $) (|:| |coef2| $) + (|:| |generator| $)) + $ $)) + T (ELT $ NIL)) + ((|extendedEuclidean| + ((|Union| (|Record| (|:| |coef1| $) + (|:| |coef2| $)) + "failed") + $ $ $)) + T (ELT $ NIL)) + ((|multiEuclidean| + ((|Union| (|List| $) "failed") (|List| $) $)) + T (ELT $ NIL)) + ((|factor| ((|Factored| $) $)) T (ELT $ NIL)) + ((|squareFreePart| ($ $)) T (ELT $ NIL)) + ((|squareFree| ((|Factored| $) $)) T (ELT $ NIL)) + ((|prime?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|gcdPolynomial| + ((|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| $))) + T (ELT $ NIL)) + ((|lcm| ($ (|List| $))) T (ELT $ NIL)) + ((|lcm| ($ $ $)) T (ELT $ NIL)) + ((|gcd| ($ (|List| $))) T (ELT $ NIL)) + ((|gcd| ($ $ $)) T (ELT $ 62)) + ((|unit?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|associates?| ((|Boolean|) $ $)) T (ELT $ NIL)) + ((|unitCanonical| ($ $)) T (ELT $ NIL)) + ((|unitNormal| + ((|Record| (|:| |unit| $) (|:| |canonical| $) + (|:| |associate| $)) + $)) + T (ELT $ 85)) + ((|exquo| ((|Union| $ "failed") $ $)) T (ELT $ NIL)) + ((|coerce| ($ $)) T (ELT $ NIL)) + ((|coerce| ($ (|Integer|))) T (ELT $ 81)) + ((|characteristic| ((|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|One| ($)) T (CONST $ 36)) + ((|one?| ((|Boolean|) $)) T (ELT $ 66)) + ((** ($ $ (|NonNegativeInteger|))) T (ELT $ 57)) + ((^ ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) + ((|recip| ((|Union| $ "failed") $)) T (ELT $ NIL)) + ((* ($ $ $)) T (ELT $ 55)) + ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL)) + ((^ ($ $ (|PositiveInteger|))) T (ELT $ NIL)) + ((* ($ (|Integer|) $)) T (ELT $ 34)) + ((- ($ $ $)) T (ELT $ 54)) ((- ($ $)) T (ELT $ 52)) + ((|subtractIfCan| ((|Union| $ "failed") $ $)) T + (ELT $ NIL)) + ((* ($ (|NonNegativeInteger|) $)) T (ELT $ NIL)) + ((|zero?| ((|Boolean|) $)) T (ELT $ 65)) + ((|sample| ($)) T (CONST $ NIL)) + ((|Zero| ($)) T (CONST $ 35)) + ((* ($ (|PositiveInteger|) $)) T (ELT $ NIL)) + ((+ ($ $ $)) T (ELT $ 53)) + ((|latex| ((|String|) $)) T (ELT $ NIL)) + ((|hash| ((|SingleInteger|) $)) T (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ 31)) + ((= ((|Boolean|) $ $)) T (ELT $ 40)) + ((~= ((|Boolean|) $ $)) T (ELT $ NIL))) + (|addModemap| '|SingleInteger| '(|SingleInteger|) + '((|Join| (|IntegerNumberSystem|) (|Logic|) + (|OpenMath|) + (CATEGORY |domain| (ATTRIBUTE |canonical|) + (ATTRIBUTE |canonicalsClosed|) + (ATTRIBUTE |noetherian|) + (SIGNATURE |max| ($)) + (SIGNATURE |min| ($)) + (SIGNATURE |not| ($ $)) + (SIGNATURE ~ ($ $)) + (SIGNATURE |/\\| ($ $ $)) + (SIGNATURE |\\/| ($ $ $)) + (SIGNATURE |xor| ($ $ $)) + (SIGNATURE |Not| ($ $)) + (SIGNATURE |And| ($ $ $)) + (SIGNATURE |Or| ($ $ $))))) + T '|SingleInteger| + (|put| '|SingleInteger| '|mode| + '(|Mapping| + (|Join| (|IntegerNumberSystem|) (|Logic|) + (|OpenMath|) + (CATEGORY |domain| + (ATTRIBUTE |canonical|) + (ATTRIBUTE |canonicalsClosed|) + (ATTRIBUTE |noetherian|) + (SIGNATURE |max| ($)) + (SIGNATURE |min| ($)) + (SIGNATURE |not| ($ $)) + (SIGNATURE ~ ($ $)) + (SIGNATURE |/\\| ($ $ $)) + (SIGNATURE |\\/| ($ $ $)) + (SIGNATURE |xor| ($ $ $)) + (SIGNATURE |Not| ($ $)) + (SIGNATURE |And| ($ $ $)) + (SIGNATURE |Or| ($ $ $))))) + |$CategoryFrame|)))) + (MAKEPROP '|SingleInteger| 'NILADIC T) diff --git a/src/algebra/strap/STAGG-.lsp b/src/algebra/strap/STAGG-.lsp index 4b967563..b157d076 100644 --- a/src/algebra/strap/STAGG-.lsp +++ b/src/algebra/strap/STAGG-.lsp @@ -2,13 +2,14 @@ (/VERSIONCHECK 2) (DEFUN |STAGG-;explicitlyFinite?;AB;1| (|x| $) - (SPADCALL (SPADCALL |x| (QREFELT $ 9)) (QREFELT $ 10))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 9)) + (|getShellEntry| $ 10))) (DEFUN |STAGG-;possiblyInfinite?;AB;2| (|x| $) - (SPADCALL |x| (QREFELT $ 9))) + (SPADCALL |x| (|getShellEntry| $ 9))) (DEFUN |STAGG-;first;ANniA;3| (|x| |n| $) - (PROG (#0=#:G1411 |i|) + (PROG (#0=#:G1408 |i|) (RETURN (SEQ (SPADCALL (PROGN @@ -19,24 +20,26 @@ (CONS (|STAGG-;c2| |x| (LETT |x| - (SPADCALL |x| (QREFELT $ 13)) + (SPADCALL |x| + (|getShellEntry| $ 13)) |STAGG-;first;ANniA;3|) $) #0#) |STAGG-;first;ANniA;3|))) (LETT |i| (QSADD1 |i|) |STAGG-;first;ANniA;3|) (GO G190) G191 (EXIT (NREVERSE0 #0#)))) - (QREFELT $ 15)))))) + (|getShellEntry| $ 15)))))) (DEFUN |STAGG-;c2| (|x| |r| $) (COND - ((SPADCALL |x| (QREFELT $ 18)) (|error| "Index out of range")) - ('T (SPADCALL |x| (QREFELT $ 19))))) + ((SPADCALL |x| (|getShellEntry| $ 18)) + (|error| "Index out of range")) + ('T (SPADCALL |x| (|getShellEntry| $ 19))))) (DEFUN |STAGG-;elt;AIS;5| (|x| |i| $) - (PROG (#0=#:G1414) + (PROG (#0=#:G1411) (RETURN - (SEQ (LETT |i| (- |i| (SPADCALL |x| (QREFELT $ 21))) + (SEQ (LETT |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 21))) |STAGG-;elt;AIS;5|) (COND ((OR (< |i| 0) @@ -47,37 +50,37 @@ |STAGG-;elt;AIS;5|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (QREFELT $ 22)) + (|getShellEntry| $ 22)) |STAGG-;elt;AIS;5|) - (QREFELT $ 18))) + (|getShellEntry| $ 18))) (EXIT (|error| "index out of range")))) - (EXIT (SPADCALL |x| (QREFELT $ 19))))))) + (EXIT (SPADCALL |x| (|getShellEntry| $ 19))))))) (DEFUN |STAGG-;elt;AUsA;6| (|x| |i| $) - (PROG (|l| #0=#:G1418 |h| #1=#:G1420 #2=#:G1421) + (PROG (|l| #0=#:G1415 |h| #1=#:G1417 #2=#:G1418) (RETURN (SEQ (LETT |l| - (- (SPADCALL |i| (QREFELT $ 25)) - (SPADCALL |x| (QREFELT $ 21))) + (- (SPADCALL |i| (|getShellEntry| $ 25)) + (SPADCALL |x| (|getShellEntry| $ 21))) |STAGG-;elt;AUsA;6|) (EXIT (COND ((< |l| 0) (|error| "index out of range")) - ((NULL (SPADCALL |i| (QREFELT $ 26))) + ((NULL (SPADCALL |i| (|getShellEntry| $ 26))) (SPADCALL (SPADCALL |x| (PROG1 (LETT #0# |l| |STAGG-;elt;AUsA;6|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (QREFELT $ 22)) - (QREFELT $ 27))) + (|getShellEntry| $ 22)) + (|getShellEntry| $ 27))) ('T (SEQ (LETT |h| - (- (SPADCALL |i| (QREFELT $ 28)) - (SPADCALL |x| (QREFELT $ 21))) + (- (SPADCALL |i| (|getShellEntry| $ 28)) + (SPADCALL |x| (|getShellEntry| $ 21))) |STAGG-;elt;AUsA;6|) (EXIT (COND ((< |h| |l|) - (SPADCALL (QREFELT $ 29))) + (SPADCALL (|getShellEntry| $ 29))) ('T (SPADCALL (SPADCALL |x| @@ -86,23 +89,25 @@ |STAGG-;elt;AUsA;6|) (|check-subtype| (>= #1# 0) '(|NonNegativeInteger|) #1#)) - (QREFELT $ 22)) + (|getShellEntry| $ 22)) (PROG1 (LETT #2# (+ (- |h| |l|) 1) |STAGG-;elt;AUsA;6|) (|check-subtype| (>= #2# 0) '(|NonNegativeInteger|) #2#)) - (QREFELT $ 30))))))))))))) + (|getShellEntry| $ 30))))))))))))) (DEFUN |STAGG-;concat;3A;7| (|x| |y| $) - (SPADCALL (SPADCALL |x| (QREFELT $ 27)) |y| (QREFELT $ 32))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 27)) |y| + (|getShellEntry| $ 32))) (DEFUN |STAGG-;concat;LA;8| (|l| $) (COND - ((NULL |l|) (SPADCALL (QREFELT $ 29))) + ((NULL |l|) (SPADCALL (|getShellEntry| $ 29))) ('T - (SPADCALL (SPADCALL (|SPADfirst| |l|) (QREFELT $ 27)) - (SPADCALL (CDR |l|) (QREFELT $ 35)) (QREFELT $ 32))))) + (SPADCALL (SPADCALL (|SPADfirst| |l|) (|getShellEntry| $ 27)) + (SPADCALL (CDR |l|) (|getShellEntry| $ 35)) + (|getShellEntry| $ 32))))) (DEFUN |STAGG-;map!;M2A;9| (|f| |l| $) (PROG (|y|) @@ -110,13 +115,16 @@ (SEQ (LETT |y| |l| |STAGG-;map!;M2A;9|) (SEQ G190 (COND - ((NULL (SPADCALL (SPADCALL |l| (QREFELT $ 18)) - (QREFELT $ 10))) + ((NULL (SPADCALL + (SPADCALL |l| (|getShellEntry| $ 18)) + (|getShellEntry| $ 10))) (GO G191))) (SEQ (SPADCALL |l| - (SPADCALL (SPADCALL |l| (QREFELT $ 19)) |f|) - (QREFELT $ 37)) - (EXIT (LETT |l| (SPADCALL |l| (QREFELT $ 13)) + (SPADCALL + (SPADCALL |l| (|getShellEntry| $ 19)) |f|) + (|getShellEntry| $ 37)) + (EXIT (LETT |l| + (SPADCALL |l| (|getShellEntry| $ 13)) |STAGG-;map!;M2A;9|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT |y|))))) @@ -127,19 +135,21 @@ (SEQ (LETT |y| |x| |STAGG-;fill!;ASA;10|) (SEQ G190 (COND - ((NULL (SPADCALL (SPADCALL |y| (QREFELT $ 18)) - (QREFELT $ 10))) + ((NULL (SPADCALL + (SPADCALL |y| (|getShellEntry| $ 18)) + (|getShellEntry| $ 10))) (GO G191))) - (SEQ (SPADCALL |y| |s| (QREFELT $ 37)) - (EXIT (LETT |y| (SPADCALL |y| (QREFELT $ 13)) + (SEQ (SPADCALL |y| |s| (|getShellEntry| $ 37)) + (EXIT (LETT |y| + (SPADCALL |y| (|getShellEntry| $ 13)) |STAGG-;fill!;ASA;10|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT |x|))))) (DEFUN |STAGG-;setelt;AI2S;11| (|x| |i| |s| $) - (PROG (#0=#:G1437) + (PROG (#0=#:G1434) (RETURN - (SEQ (LETT |i| (- |i| (SPADCALL |x| (QREFELT $ 21))) + (SEQ (LETT |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 21))) |STAGG-;setelt;AI2S;11|) (COND ((OR (< |i| 0) @@ -150,28 +160,31 @@ |STAGG-;setelt;AI2S;11|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (QREFELT $ 22)) + (|getShellEntry| $ 22)) |STAGG-;setelt;AI2S;11|) - (QREFELT $ 18))) + (|getShellEntry| $ 18))) (EXIT (|error| "index out of range")))) - (EXIT (SPADCALL |x| |s| (QREFELT $ 37))))))) + (EXIT (SPADCALL |x| |s| (|getShellEntry| $ 37))))))) (DEFUN |STAGG-;setelt;AUs2S;12| (|x| |i| |s| $) - (PROG (|l| |h| #0=#:G1442 #1=#:G1443 |z| |y|) + (PROG (|l| |h| #0=#:G1439 #1=#:G1440 |z| |y|) (RETURN (SEQ (LETT |l| - (- (SPADCALL |i| (QREFELT $ 25)) - (SPADCALL |x| (QREFELT $ 21))) + (- (SPADCALL |i| (|getShellEntry| $ 25)) + (SPADCALL |x| (|getShellEntry| $ 21))) |STAGG-;setelt;AUs2S;12|) (EXIT (COND ((< |l| 0) (|error| "index out of range")) ('T (SEQ (LETT |h| (COND - ((SPADCALL |i| (QREFELT $ 26)) - (- (SPADCALL |i| (QREFELT $ 28)) - (SPADCALL |x| (QREFELT $ 21)))) - ('T (SPADCALL |x| (QREFELT $ 42)))) + ((SPADCALL |i| (|getShellEntry| $ 26)) + (- (SPADCALL |i| + (|getShellEntry| $ 28)) + (SPADCALL |x| + (|getShellEntry| $ 21)))) + ('T + (SPADCALL |x| (|getShellEntry| $ 42)))) |STAGG-;setelt;AUs2S;12|) (EXIT (COND ((< |h| |l|) |s|) @@ -184,7 +197,7 @@ (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (QREFELT $ 22)) + (|getShellEntry| $ 22)) |STAGG-;setelt;AUs2S;12|) (LETT |z| (SPADCALL |y| @@ -194,33 +207,33 @@ (|check-subtype| (>= #1# 0) '(|NonNegativeInteger|) #1#)) - (QREFELT $ 22)) + (|getShellEntry| $ 22)) |STAGG-;setelt;AUs2S;12|) (SEQ G190 (COND ((NULL (SPADCALL (SPADCALL |y| |z| - (QREFELT $ 43)) - (QREFELT $ 10))) + (|getShellEntry| $ 43)) + (|getShellEntry| $ 10))) (GO G191))) (SEQ (SPADCALL |y| |s| - (QREFELT $ 37)) + (|getShellEntry| $ 37)) (EXIT (LETT |y| (SPADCALL |y| - (QREFELT $ 13)) + (|getShellEntry| $ 13)) |STAGG-;setelt;AUs2S;12|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT |s|))))))))))))) (DEFUN |STAGG-;concat!;3A;13| (|x| |y| $) (SEQ (COND - ((SPADCALL |x| (QREFELT $ 18)) |y|) + ((SPADCALL |x| (|getShellEntry| $ 18)) |y|) ('T - (SEQ (SPADCALL (SPADCALL |x| (QREFELT $ 45)) |y| - (QREFELT $ 46)) + (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 45)) |y| + (|getShellEntry| $ 46)) (EXIT |x|)))))) (DEFUN |StreamAggregate&| (|#1| |#2|) @@ -230,28 +243,29 @@ (LETT |dv$1| (|devaluate| |#1|) . #0=(|StreamAggregate&|)) (LETT |dv$2| (|devaluate| |#2|) . #0#) (LETT |dv$| (LIST '|StreamAggregate&| |dv$1| |dv$2|) . #0#) - (LETT $ (GETREFV 52) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) + (LETT $ (|newShell| 52) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 + (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) - (QSETREFV $ 7 |#2|) + (|setShellEntry| $ 6 |#1|) + (|setShellEntry| $ 7 |#2|) (COND ((|HasAttribute| |#1| '|shallowlyMutable|) (PROGN - (QSETREFV $ 33 + (|setShellEntry| $ 33 (CONS (|dispatchFunction| |STAGG-;concat;3A;7|) $)) - (QSETREFV $ 36 + (|setShellEntry| $ 36 (CONS (|dispatchFunction| |STAGG-;concat;LA;8|) $)) - (QSETREFV $ 39 + (|setShellEntry| $ 39 (CONS (|dispatchFunction| |STAGG-;map!;M2A;9|) $)) - (QSETREFV $ 40 + (|setShellEntry| $ 40 (CONS (|dispatchFunction| |STAGG-;fill!;ASA;10|) $)) - (QSETREFV $ 41 + (|setShellEntry| $ 41 (CONS (|dispatchFunction| |STAGG-;setelt;AI2S;11|) $)) - (QSETREFV $ 44 + (|setShellEntry| $ 44 (CONS (|dispatchFunction| |STAGG-;setelt;AUs2S;12|) $)) - (QSETREFV $ 47 + (|setShellEntry| $ 47 (CONS (|dispatchFunction| |STAGG-;concat!;3A;13|) $))))) $)))) @@ -295,3 +309,119 @@ 20 23 2 0 0 0 24 31 2 0 0 0 0 47 1 0 0 34 36 2 0 0 0 0 33))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|StreamAggregate&| '|isFunctor| + '(((|possiblyInfinite?| ((|Boolean|) $)) T (ELT $ 12)) + ((|explicitlyFinite?| ((|Boolean|) $)) T (ELT $ 11)) + ((|setelt| (|#2| $ (|Integer|) |#2|)) T (ELT $ 41)) + ((|elt| (|#2| $ (|Integer|) |#2|)) T (ELT $ NIL)) + ((|elt| (|#2| $ (|Integer|))) T (ELT $ 23)) + ((|fill!| ($ $ |#2|)) T (ELT $ 40)) + ((|concat| ($ $ |#2|)) T (ELT $ NIL)) + ((|concat| ($ (|List| $))) T (ELT $ 36)) + ((|elt| ($ $ (|UniversalSegment| (|Integer|)))) T + (ELT $ 31)) + ((|setelt| + (|#2| $ (|UniversalSegment| (|Integer|)) |#2|)) + T (ELT $ 44)) + ((|setelt| (|#2| $ "last" |#2|)) T (ELT $ NIL)) + ((|setelt| ($ $ "rest" $)) T (ELT $ NIL)) + ((|setelt| (|#2| $ "first" |#2|)) T (ELT $ NIL)) + ((|concat!| ($ $ |#2|)) T (ELT $ NIL)) + ((|concat!| ($ $ $)) T (ELT $ 47)) + ((|elt| (|#2| $ "last")) T (ELT $ NIL)) + ((|elt| ($ $ "rest")) T (ELT $ NIL)) + ((|first| ($ $ (|NonNegativeInteger|))) T (ELT $ 17)) + ((|elt| (|#2| $ "first")) T (ELT $ NIL)) + ((|first| (|#2| $)) T (ELT $ NIL)) + ((|concat| ($ |#2| $)) T (ELT $ NIL)) + ((|concat| ($ $ $)) T (ELT $ 33)) + ((|setelt| (|#2| $ "value" |#2|)) T (ELT $ NIL)) + ((|elt| (|#2| $ "value")) T (ELT $ NIL)) + ((|map!| ($ (|Mapping| |#2| |#2|) $)) T (ELT $ 39))) + (|addModemap| '|StreamAggregate&| + '(|StreamAggregate&| |#1| |#2|) + '((CATEGORY |domain| + (SIGNATURE |possiblyInfinite?| + ((|Boolean|) |#1|)) + (SIGNATURE |explicitlyFinite?| + ((|Boolean|) |#1|)) + (SIGNATURE |setelt| + (|#2| |#1| (|Integer|) |#2|)) + (SIGNATURE |elt| (|#2| |#1| (|Integer|) |#2|)) + (SIGNATURE |elt| (|#2| |#1| (|Integer|))) + (SIGNATURE |fill!| (|#1| |#1| |#2|)) + (SIGNATURE |concat| (|#1| |#1| |#2|)) + (SIGNATURE |concat| (|#1| (|List| |#1|))) + (SIGNATURE |elt| + (|#1| |#1| (|UniversalSegment| (|Integer|)))) + (SIGNATURE |setelt| + (|#2| |#1| (|UniversalSegment| (|Integer|)) + |#2|)) + (SIGNATURE |setelt| (|#2| |#1| "last" |#2|)) + (SIGNATURE |setelt| (|#1| |#1| "rest" |#1|)) + (SIGNATURE |setelt| (|#2| |#1| "first" |#2|)) + (SIGNATURE |concat!| (|#1| |#1| |#2|)) + (SIGNATURE |concat!| (|#1| |#1| |#1|)) + (SIGNATURE |elt| (|#2| |#1| "last")) + (SIGNATURE |elt| (|#1| |#1| "rest")) + (SIGNATURE |first| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |elt| (|#2| |#1| "first")) + (SIGNATURE |first| (|#2| |#1|)) + (SIGNATURE |concat| (|#1| |#2| |#1|)) + (SIGNATURE |concat| (|#1| |#1| |#1|)) + (SIGNATURE |setelt| (|#2| |#1| "value" |#2|)) + (SIGNATURE |elt| (|#2| |#1| "value")) + (SIGNATURE |map!| + (|#1| (|Mapping| |#2| |#2|) |#1|))) + (|StreamAggregate| |#2|) (|Type|)) + T '|StreamAggregate&| + (|put| '|StreamAggregate&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |possiblyInfinite?| + ((|Boolean|) |#1|)) + (SIGNATURE |explicitlyFinite?| + ((|Boolean|) |#1|)) + (SIGNATURE |setelt| + (|#2| |#1| (|Integer|) |#2|)) + (SIGNATURE |elt| + (|#2| |#1| (|Integer|) |#2|)) + (SIGNATURE |elt| + (|#2| |#1| (|Integer|))) + (SIGNATURE |fill!| (|#1| |#1| |#2|)) + (SIGNATURE |concat| (|#1| |#1| |#2|)) + (SIGNATURE |concat| + (|#1| (|List| |#1|))) + (SIGNATURE |elt| + (|#1| |#1| + (|UniversalSegment| (|Integer|)))) + (SIGNATURE |setelt| + (|#2| |#1| + (|UniversalSegment| (|Integer|)) + |#2|)) + (SIGNATURE |setelt| + (|#2| |#1| "last" |#2|)) + (SIGNATURE |setelt| + (|#1| |#1| "rest" |#1|)) + (SIGNATURE |setelt| + (|#2| |#1| "first" |#2|)) + (SIGNATURE |concat!| (|#1| |#1| |#2|)) + (SIGNATURE |concat!| (|#1| |#1| |#1|)) + (SIGNATURE |elt| (|#2| |#1| "last")) + (SIGNATURE |elt| (|#1| |#1| "rest")) + (SIGNATURE |first| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |elt| (|#2| |#1| "first")) + (SIGNATURE |first| (|#2| |#1|)) + (SIGNATURE |concat| (|#1| |#2| |#1|)) + (SIGNATURE |concat| (|#1| |#1| |#1|)) + (SIGNATURE |setelt| + (|#2| |#1| "value" |#2|)) + (SIGNATURE |elt| (|#2| |#1| "value")) + (SIGNATURE |map!| + (|#1| (|Mapping| |#2| |#2|) |#1|))) + (|StreamAggregate| |#2|) (|Type|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/STAGG.lsp b/src/algebra/strap/STAGG.lsp index 95a087cb..9da57f50 100644 --- a/src/algebra/strap/STAGG.lsp +++ b/src/algebra/strap/STAGG.lsp @@ -5,8 +5,8 @@ (DEFPARAMETER |StreamAggregate;AL| 'NIL) -(DEFUN |StreamAggregate| (#0=#:G1405) - (LET (#1=#:G1406) +(DEFUN |StreamAggregate| (#0=#:G1402) + (LET (#1=#:G1403) (COND ((SETQ #1# (|assoc| (|devaluate| #0#) |StreamAggregate;AL|)) (CDR #1#)) @@ -17,7 +17,7 @@ #1#)))) (DEFUN |StreamAggregate;| (|t#1|) - (PROG (#0=#:G1404) + (PROG (#0=#:G1401) (RETURN (PROG1 (LETT #0# (|sublisV| @@ -39,3 +39,9 @@ NIL '((|Boolean|)) NIL)) . #1=(|StreamAggregate|))))) . #1#) (SETELT #0# 0 (LIST '|StreamAggregate| (|devaluate| |t#1|))))))) + +(SETQ |$CategoryFrame| + (|put| '|StreamAggregate| '|isCategory| T + (|addModemap| '|StreamAggregate| '(|StreamAggregate| |#1|) + '((|Category|) (|Type|)) T '|StreamAggregate| + |$CategoryFrame|))) diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp index 82291964..e2da054c 100644 --- a/src/algebra/strap/SYMBOL.lsp +++ b/src/algebra/strap/SYMBOL.lsp @@ -55,9 +55,9 @@ (DEFUN |SYMBOL;convert;$If;6| (|s| $) (SPADCALL |s| (|getShellEntry| $ 45))) -(PUT '|SYMBOL;convert;$S;7| '|SPADreplace| '(XLAM (|s|) |s|)) +(PUT '|SYMBOL;convert;2$;7| '|SPADreplace| '(XLAM (|s|) |s|)) -(DEFUN |SYMBOL;convert;$S;7| (|s| $) |s|) +(DEFUN |SYMBOL;convert;2$;7| (|s| $) |s|) (DEFUN |SYMBOL;coerce;S$;8| (|s| $) (VALUES (INTERN |s|))) @@ -98,7 +98,7 @@ (SPADCALL |x| (|getShellEntry| $ 76))) (DEFUN |SYMBOL;syprefix| (|sc| $) - (PROG (|ns| #0=#:G1449 |n| #1=#:G1450) + (PROG (|ns| #0=#:G1451 |n| #1=#:G1452) (RETURN (SEQ (LETT |ns| (LIST (LENGTH (QVELT |sc| 3)) (LENGTH (QVELT |sc| 2)) @@ -343,7 +343,7 @@ (EXIT |s|))))) (DEFUN |SYMBOL;anyRadix| (|n| |s| $) - (PROG (|qr| |ns| #0=#:G1500) + (PROG (|qr| |ns| #0=#:G1502) (RETURN (SEQ (EXIT (SEQ (LETT |ns| "" |SYMBOL;anyRadix|) (EXIT (SEQ G190 NIL @@ -437,7 +437,7 @@ (|getShellEntry| $ 82))))))) (DEFUN |SYMBOL;resetNew;V;29| ($) - (PROG (|k| #0=#:G1523) + (PROG (|k| #0=#:G1525) (RETURN (SEQ (SPADCALL (|getShellEntry| $ 9) 0 (|getShellEntry| $ 94)) (SEQ (LETT |k| NIL |SYMBOL;resetNew;V;29|) @@ -462,7 +462,7 @@ (SPADCALL (ATOM |sy|) (|getShellEntry| $ 88))) (DEFUN |SYMBOL;name;2$;31| (|sy| $) - (PROG (|str| |i| #0=#:G1530 #1=#:G1529 #2=#:G1527) + (PROG (|str| |i| #0=#:G1532 #1=#:G1531 #2=#:G1529) (RETURN (SEQ (EXIT (COND ((NULL (SPADCALL |sy| (|getShellEntry| $ 22))) |sy|) @@ -516,8 +516,8 @@ #1# (EXIT #1#))))) (DEFUN |SYMBOL;scripts;$R;32| (|sy| $) - (PROG (|lscripts| |str| |nstr| |j| #0=#:G1533 |nscripts| |m| |n| - #1=#:G1542 |i| #2=#:G1543 |a| #3=#:G1544 |allscripts|) + (PROG (|lscripts| |str| |nstr| |j| #0=#:G1535 |nscripts| |m| |n| + #1=#:G1544 |i| #2=#:G1545 |a| #3=#:G1546 |allscripts|) (RETURN (SEQ (COND ((NULL (SPADCALL |sy| (|getShellEntry| $ 22))) @@ -657,7 +657,7 @@ (DEFUN |SYMBOL;istring| (|n| $) (COND ((< 9 |n|) (|error| "Can have at most 9 scripts of each kind")) - ('T (ELT (|getShellEntry| $ 17) (+ |n| 0))))) + ('T (|getSimpleArrayEntry| (|getShellEntry| $ 17) (+ |n| 0))))) (DEFUN |SYMBOL;list;$L;34| (|sy| $) (COND @@ -671,7 +671,7 @@ (DEFUN |Symbol| () (PROG () (RETURN - (PROG (#0=#:G1551) + (PROG (#0=#:G1553) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|Symbol|) |Symbol|) @@ -725,7 +725,7 @@ |SYMBOL;OMwrite;Omd$V;4| |SYMBOL;OMwrite;Omd$BV;5| '|hd| '|lhd| (|Character|) (45 . |char|) (|NonNegativeInteger|) (50 . |ord|) '|ord0| (|InputForm|) (55 . |convert|) - |SYMBOL;convert;$If;6| |SYMBOL;convert;$S;7| + |SYMBOL;convert;$If;6| |SYMBOL;convert;2$;7| |SYMBOL;coerce;S$;8| |SYMBOL;=;2$B;9| |SYMBOL;<;2$B;10| (|OutputForm|) (60 . |outputForm|) |SYMBOL;coerce;$Of;11| (|List| 51) (|List| 54) |SYMBOL;script;$L$;22| @@ -813,4 +813,191 @@ 1 2 0 21 0 0 50))))) '|lookupComplete|)) +(SETQ |$CategoryFrame| + (|put| '|Symbol| '|isFunctor| + '(((|sample| ($)) T (CONST $ 124)) + ((|list| ((|List| $) $)) T (ELT $ 107)) + ((|string| ((|String|) $)) T (ELT $ 84)) + ((|elt| ($ $ (|List| (|OutputForm|)))) T (ELT $ 58)) + ((|argscript| ($ $ (|List| (|OutputForm|)))) T + (ELT $ 60)) + ((|superscript| ($ $ (|List| (|OutputForm|)))) T + (ELT $ 59)) + ((|subscript| ($ $ (|List| (|OutputForm|)))) T + (ELT $ 57)) + ((|script| + ($ $ + (|Record| (|:| |sub| (|List| (|OutputForm|))) + (|:| |sup| (|List| (|OutputForm|))) + (|:| |presup| (|List| (|OutputForm|))) + (|:| |presub| (|List| (|OutputForm|))) + (|:| |args| (|List| (|OutputForm|)))))) + T (ELT $ 82)) + ((|script| ($ $ (|List| (|List| (|OutputForm|))))) T + (ELT $ 56)) + ((|scripts| + ((|Record| (|:| |sub| (|List| (|OutputForm|))) + (|:| |sup| (|List| (|OutputForm|))) + (|:| |presup| (|List| (|OutputForm|))) + (|:| |presub| (|List| (|OutputForm|))) + (|:| |args| (|List| (|OutputForm|)))) + $)) + T (ELT $ 87)) + ((|scripted?| ((|Boolean|) $)) T (ELT $ 22)) + ((|name| ($ $)) T (ELT $ 83)) + ((|coerce| ($ (|String|))) T (ELT $ 48)) + ((|resetNew| ((|Void|))) T (ELT $ 106)) + ((|new| ($ $)) T (ELT $ 101)) ((|new| ($)) T (ELT $ 95)) + ((|patternMatch| + ((|PatternMatchResult| (|Float|) $) $ + (|Pattern| (|Float|)) + (|PatternMatchResult| (|Float|) $))) + T (ELT $ 73)) + ((|patternMatch| + ((|PatternMatchResult| (|Integer|) $) $ + (|Pattern| (|Integer|)) + (|PatternMatchResult| (|Integer|) $))) + T (ELT $ 66)) + ((|convert| ((|Pattern| (|Float|)) $)) T (ELT $ 75)) + ((|convert| ((|Pattern| (|Integer|)) $)) T (ELT $ 77)) + ((|convert| ((|Symbol|) $)) T (ELT $ 47)) + ((|OMwrite| ((|Void|) (|OpenMathDevice|) $ (|Boolean|))) + T (ELT $ 36)) + ((|OMwrite| ((|Void|) (|OpenMathDevice|) $)) T + (ELT $ 35)) + ((|OMwrite| ((|String|) $ (|Boolean|))) T (ELT $ 34)) + ((|OMwrite| ((|String|) $)) T (ELT $ 33)) + ((|convert| ((|InputForm|) $)) T (ELT $ 46)) + ((|min| ($ $ $)) T (ELT $ NIL)) + ((|max| ($ $ $)) T (ELT $ NIL)) + ((<= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((>= ((|Boolean|) $ $)) T (ELT $ NIL)) + ((> ((|Boolean|) $ $)) T (ELT $ NIL)) + ((< ((|Boolean|) $ $)) T (ELT $ 50)) + ((|latex| ((|String|) $)) T (ELT $ 90)) + ((|hash| ((|SingleInteger|) $)) T (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ 53)) + ((= ((|Boolean|) $ $)) T (ELT $ 49)) + ((~= ((|Boolean|) $ $)) T (ELT $ NIL))) + (|addModemap| '|Symbol| '(|Symbol|) + '((|Join| (|OrderedSet|) + (|ConvertibleTo| (|InputForm|)) (|OpenMath|) + (|ConvertibleTo| (|Symbol|)) + (|ConvertibleTo| (|Pattern| (|Integer|))) + (|ConvertibleTo| (|Pattern| (|Float|))) + (|PatternMatchable| (|Integer|)) + (|PatternMatchable| (|Float|)) + (CATEGORY |domain| (SIGNATURE |new| ($)) + (SIGNATURE |new| ($ $)) + (SIGNATURE |resetNew| ((|Void|))) + (SIGNATURE |coerce| ($ (|String|))) + (SIGNATURE |name| ($ $)) + (SIGNATURE |scripted?| ((|Boolean|) $)) + (SIGNATURE |scripts| + ((|Record| + (|:| |sub| + (|List| (|OutputForm|))) + (|:| |sup| + (|List| (|OutputForm|))) + (|:| |presup| + (|List| (|OutputForm|))) + (|:| |presub| + (|List| (|OutputForm|))) + (|:| |args| + (|List| (|OutputForm|)))) + $)) + (SIGNATURE |script| + ($ $ + (|List| (|List| (|OutputForm|))))) + (SIGNATURE |script| + ($ $ + (|Record| + (|:| |sub| + (|List| (|OutputForm|))) + (|:| |sup| + (|List| (|OutputForm|))) + (|:| |presup| + (|List| (|OutputForm|))) + (|:| |presub| + (|List| (|OutputForm|))) + (|:| |args| + (|List| (|OutputForm|)))))) + (SIGNATURE |subscript| + ($ $ (|List| (|OutputForm|)))) + (SIGNATURE |superscript| + ($ $ (|List| (|OutputForm|)))) + (SIGNATURE |argscript| + ($ $ (|List| (|OutputForm|)))) + (SIGNATURE |elt| + ($ $ (|List| (|OutputForm|)))) + (SIGNATURE |string| ((|String|) $)) + (SIGNATURE |list| ((|List| $) $)) + (SIGNATURE |sample| ($) |constant|)))) + T '|Symbol| + (|put| '|Symbol| '|mode| + '(|Mapping| + (|Join| (|OrderedSet|) + (|ConvertibleTo| (|InputForm|)) + (|OpenMath|) + (|ConvertibleTo| (|Symbol|)) + (|ConvertibleTo| + (|Pattern| (|Integer|))) + (|ConvertibleTo| + (|Pattern| (|Float|))) + (|PatternMatchable| (|Integer|)) + (|PatternMatchable| (|Float|)) + (CATEGORY |domain| + (SIGNATURE |new| ($)) + (SIGNATURE |new| ($ $)) + (SIGNATURE |resetNew| ((|Void|))) + (SIGNATURE |coerce| + ($ (|String|))) + (SIGNATURE |name| ($ $)) + (SIGNATURE |scripted?| + ((|Boolean|) $)) + (SIGNATURE |scripts| + ((|Record| + (|:| |sub| + (|List| (|OutputForm|))) + (|:| |sup| + (|List| (|OutputForm|))) + (|:| |presup| + (|List| (|OutputForm|))) + (|:| |presub| + (|List| (|OutputForm|))) + (|:| |args| + (|List| (|OutputForm|)))) + $)) + (SIGNATURE |script| + ($ $ + (|List| + (|List| (|OutputForm|))))) + (SIGNATURE |script| + ($ $ + (|Record| + (|:| |sub| + (|List| (|OutputForm|))) + (|:| |sup| + (|List| (|OutputForm|))) + (|:| |presup| + (|List| (|OutputForm|))) + (|:| |presub| + (|List| (|OutputForm|))) + (|:| |args| + (|List| (|OutputForm|)))))) + (SIGNATURE |subscript| + ($ $ (|List| (|OutputForm|)))) + (SIGNATURE |superscript| + ($ $ (|List| (|OutputForm|)))) + (SIGNATURE |argscript| + ($ $ (|List| (|OutputForm|)))) + (SIGNATURE |elt| + ($ $ (|List| (|OutputForm|)))) + (SIGNATURE |string| + ((|String|) $)) + (SIGNATURE |list| ((|List| $) $)) + (SIGNATURE |sample| ($) + |constant|)))) + |$CategoryFrame|)))) + (MAKEPROP '|Symbol| 'NILADIC T) diff --git a/src/algebra/strap/TSETCAT-.lsp b/src/algebra/strap/TSETCAT-.lsp index 2b979ff7..dcd1eca4 100644 --- a/src/algebra/strap/TSETCAT-.lsp +++ b/src/algebra/strap/TSETCAT-.lsp @@ -2,7 +2,7 @@ (/VERSIONCHECK 2) (DEFUN |TSETCAT-;=;2SB;1| (|ts| |us| $) - (PROG (#0=#:G1451 #1=#:G1457) + (PROG (#0=#:G1453 #1=#:G1459) (RETURN (COND ((SPADCALL |ts| (|getShellEntry| $ 12)) @@ -38,7 +38,7 @@ (|getShellEntry| $ 18))))))) (DEFUN |TSETCAT-;infRittWu?;2SB;2| (|ts| |us| $) - (PROG (|p| #0=#:G1464 |q| |v|) + (PROG (|p| #0=#:G1466 |q| |v|) (RETURN (SEQ (COND ((SPADCALL |us| (|getShellEntry| $ 12)) @@ -376,7 +376,7 @@ (EXIT |red|))))) (DEFUN |TSETCAT-;reduce;PSMMP;13| (|p| |ts| |redOp| |redOp?| $) - (PROG (|ts0| #0=#:G1539 |reductor| #1=#:G1542) + (PROG (|ts0| #0=#:G1541 |reductor| #1=#:G1544) (RETURN (SEQ (COND ((OR (SPADCALL |ts| (|getShellEntry| $ 12)) @@ -502,7 +502,7 @@ (SPADCALL |p| |ts| (ELT $ 79) (ELT $ 80) (|getShellEntry| $ 72))) (DEFUN |TSETCAT-;removeZero;PSP;18| (|p| |ts| $) - (PROG (|v| |tsv-| #0=#:G1565 #1=#:G1574 |q|) + (PROG (|v| |tsv-| #0=#:G1567 #1=#:G1576 |q|) (RETURN (SEQ (EXIT (COND ((OR (SPADCALL |p| (|getShellEntry| $ 35)) @@ -636,7 +636,7 @@ (SPADCALL |ts| (ELT $ 106) (|getShellEntry| $ 101))) (DEFUN |TSETCAT-;mvar;SV;25| (|ts| $) - (PROG (#0=#:G1593) + (PROG (#0=#:G1595) (RETURN (COND ((SPADCALL |ts| (|getShellEntry| $ 12)) @@ -696,7 +696,7 @@ (|getShellEntry| $ 37))) (DEFUN |TSETCAT-;algebraicVariables;SL;30| (|ts| $) - (PROG (#0=#:G1618 |p| #1=#:G1619) + (PROG (#0=#:G1620 |p| #1=#:G1621) (RETURN (SEQ (PROGN (LETT #0# NIL |TSETCAT-;algebraicVariables;SL;30|) @@ -866,7 +866,7 @@ (|error| "in extend : ($,P) -> $ from TSETCAT : bad ars")))))))) (DEFUN |TSETCAT-;coHeight;SNni;39| (|ts| $) - (PROG (|n| |m| #0=#:G1659) + (PROG (|n| |m| #0=#:G1661) (RETURN (SEQ (LETT |n| (SPADCALL (|getShellEntry| $ 128)) |TSETCAT-;coHeight;SNni;39|) @@ -1029,3 +1029,302 @@ 43 2 0 11 0 99 100 1 0 114 0 115 2 0 11 9 0 118 2 0 11 0 0 19))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|TriangularSetCategory&| '|isFunctor| + '(((|coHeight| ((|NonNegativeInteger|) $)) T (ELT $ 130)) + ((|extend| ($ $ |#5|)) T (ELT $ 127)) + ((|select| ((|Union| |#5| "failed") $ |#4|)) T + (ELT $ 119)) + ((|algebraic?| ((|Boolean|) |#4| $)) T (ELT $ 118)) + ((|algebraicVariables| ((|List| |#4|) $)) T (ELT $ 115)) + ((|rest| ((|Union| $ "failed") $)) T (ELT $ 112)) + ((|last| ((|Union| |#5| "failed") $)) T (ELT $ 110)) + ((|first| ((|Union| |#5| "failed") $)) T (ELT $ 109)) + ((|reduceByQuasiMonic| (|#5| |#5| $)) T (ELT $ 98)) + ((|collectQuasiMonic| ($ $)) T (ELT $ 120)) + ((|removeZero| (|#5| |#5| $)) T (ELT $ 94)) + ((|initiallyReduce| (|#5| |#5| $)) T (ELT $ 81)) + ((|headReduce| (|#5| |#5| $)) T (ELT $ 78)) + ((|stronglyReduce| (|#5| |#5| $)) T (ELT $ 75)) + ((|rewriteSetWithReduction| + ((|List| |#5|) (|List| |#5|) $ + (|Mapping| |#5| |#5| |#5|) + (|Mapping| (|Boolean|) |#5| |#5|))) + T (ELT $ 73)) + ((|reduce| + (|#5| |#5| $ (|Mapping| |#5| |#5| |#5|) + (|Mapping| (|Boolean|) |#5| |#5|))) + T (ELT $ 69)) + ((|initiallyReduced?| ((|Boolean|) $)) T (ELT $ 107)) + ((|headReduced?| ((|Boolean|) $)) T (ELT $ 105)) + ((|stronglyReduced?| ((|Boolean|) $)) T (ELT $ 102)) + ((|autoReduced?| + ((|Boolean|) $ + (|Mapping| (|Boolean|) |#5| (|List| |#5|)))) + T (ELT $ 100)) + ((|initiallyReduced?| ((|Boolean|) |#5| $)) T + (ELT $ 67)) + ((|headReduced?| ((|Boolean|) |#5| $)) T (ELT $ 63)) + ((|stronglyReduced?| ((|Boolean|) |#5| $)) T (ELT $ 60)) + ((|reduced?| + ((|Boolean|) |#5| $ + (|Mapping| (|Boolean|) |#5| |#5|))) + T (ELT $ 31)) + ((|normalized?| ((|Boolean|) $)) T (ELT $ 103)) + ((|normalized?| ((|Boolean|) |#5| $)) T (ELT $ 58)) + ((|quasiComponent| + ((|Record| (|:| |close| (|List| |#5|)) + (|:| |open| (|List| |#5|))) + $)) + T (ELT $ 55)) + ((|degree| ((|NonNegativeInteger|) $)) T (ELT $ 52)) + ((|initials| ((|List| |#5|) $)) T (ELT $ 49)) + ((|basicSet| + ((|Union| (|Record| (|:| |bas| $) + (|:| |top| (|List| |#5|))) + "failed") + (|List| |#5|) (|Mapping| (|Boolean|) |#5|) + (|Mapping| (|Boolean|) |#5| |#5|))) + T (ELT $ 45)) + ((|basicSet| + ((|Union| (|Record| (|:| |bas| $) + (|:| |top| (|List| |#5|))) + "failed") + (|List| |#5|) (|Mapping| (|Boolean|) |#5| |#5|))) + T (ELT $ 43)) + ((|infRittWu?| ((|Boolean|) $ $)) T (ELT $ 27)) + ((|collectUpper| ($ $ |#4|)) T (ELT $ 122)) + ((|collectUnder| ($ $ |#4|)) T (ELT $ 121)) + ((|mvar| (|#4| $)) T (ELT $ 108)) + ((|retractIfCan| ((|Union| $ "failed") (|List| |#5|))) T + (ELT $ 126)) + ((|coerce| ((|List| |#5|) $)) T (ELT $ 113)) + ((|construct| ($ (|List| |#5|))) T (ELT $ 124)) + ((|reduce| (|#5| (|Mapping| |#5| |#5| |#5|) $)) T + (ELT $ NIL)) + ((|reduce| (|#5| (|Mapping| |#5| |#5| |#5|) $ |#5|)) T + (ELT $ NIL)) + ((|select| ($ (|Mapping| (|Boolean|) |#5|) $)) T + (ELT $ NIL)) + ((|reduce| + (|#5| (|Mapping| |#5| |#5| |#5|) $ |#5| |#5|)) + T (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ NIL)) + ((= ((|Boolean|) $ $)) T (ELT $ 19))) + (|addModemap| '|TriangularSetCategory&| + '(|TriangularSetCategory&| |#1| |#2| |#3| |#4| |#5|) + '((CATEGORY |domain| + (SIGNATURE |coHeight| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |extend| (|#1| |#1| |#5|)) + (SIGNATURE |select| + ((|Union| |#5| "failed") |#1| |#4|)) + (SIGNATURE |algebraic?| ((|Boolean|) |#4| |#1|)) + (SIGNATURE |algebraicVariables| + ((|List| |#4|) |#1|)) + (SIGNATURE |rest| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE |last| + ((|Union| |#5| "failed") |#1|)) + (SIGNATURE |first| + ((|Union| |#5| "failed") |#1|)) + (SIGNATURE |reduceByQuasiMonic| + (|#5| |#5| |#1|)) + (SIGNATURE |collectQuasiMonic| (|#1| |#1|)) + (SIGNATURE |removeZero| (|#5| |#5| |#1|)) + (SIGNATURE |initiallyReduce| (|#5| |#5| |#1|)) + (SIGNATURE |headReduce| (|#5| |#5| |#1|)) + (SIGNATURE |stronglyReduce| (|#5| |#5| |#1|)) + (SIGNATURE |rewriteSetWithReduction| + ((|List| |#5|) (|List| |#5|) |#1| + (|Mapping| |#5| |#5| |#5|) + (|Mapping| (|Boolean|) |#5| |#5|))) + (SIGNATURE |reduce| + (|#5| |#5| |#1| (|Mapping| |#5| |#5| |#5|) + (|Mapping| (|Boolean|) |#5| |#5|))) + (SIGNATURE |initiallyReduced?| + ((|Boolean|) |#1|)) + (SIGNATURE |headReduced?| ((|Boolean|) |#1|)) + (SIGNATURE |stronglyReduced?| + ((|Boolean|) |#1|)) + (SIGNATURE |autoReduced?| + ((|Boolean|) |#1| + (|Mapping| (|Boolean|) |#5| (|List| |#5|)))) + (SIGNATURE |initiallyReduced?| + ((|Boolean|) |#5| |#1|)) + (SIGNATURE |headReduced?| + ((|Boolean|) |#5| |#1|)) + (SIGNATURE |stronglyReduced?| + ((|Boolean|) |#5| |#1|)) + (SIGNATURE |reduced?| + ((|Boolean|) |#5| |#1| + (|Mapping| (|Boolean|) |#5| |#5|))) + (SIGNATURE |normalized?| ((|Boolean|) |#1|)) + (SIGNATURE |normalized?| + ((|Boolean|) |#5| |#1|)) + (SIGNATURE |quasiComponent| + ((|Record| (|:| |close| (|List| |#5|)) + (|:| |open| (|List| |#5|))) + |#1|)) + (SIGNATURE |degree| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |initials| ((|List| |#5|) |#1|)) + (SIGNATURE |basicSet| + ((|Union| (|Record| (|:| |bas| |#1|) + (|:| |top| (|List| |#5|))) + "failed") + (|List| |#5|) (|Mapping| (|Boolean|) |#5|) + (|Mapping| (|Boolean|) |#5| |#5|))) + (SIGNATURE |basicSet| + ((|Union| (|Record| (|:| |bas| |#1|) + (|:| |top| (|List| |#5|))) + "failed") + (|List| |#5|) + (|Mapping| (|Boolean|) |#5| |#5|))) + (SIGNATURE |infRittWu?| ((|Boolean|) |#1| |#1|)) + (SIGNATURE |collectUpper| (|#1| |#1| |#4|)) + (SIGNATURE |collectUnder| (|#1| |#1| |#4|)) + (SIGNATURE |mvar| (|#4| |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| |#1| "failed") (|List| |#5|))) + (SIGNATURE |coerce| ((|List| |#5|) |#1|)) + (SIGNATURE |construct| (|#1| (|List| |#5|))) + (SIGNATURE |reduce| + (|#5| (|Mapping| |#5| |#5| |#5|) |#1|)) + (SIGNATURE |reduce| + (|#5| (|Mapping| |#5| |#5| |#5|) |#1| |#5|)) + (SIGNATURE |select| + (|#1| (|Mapping| (|Boolean|) |#5|) |#1|)) + (SIGNATURE |reduce| + (|#5| (|Mapping| |#5| |#5| |#5|) |#1| |#5| + |#5|)) + (SIGNATURE |coerce| ((|OutputForm|) |#1|)) + (SIGNATURE = ((|Boolean|) |#1| |#1|))) + (|TriangularSetCategory| |#2| |#3| |#4| |#5|) + (|IntegralDomain|) (|OrderedAbelianMonoidSup|) + (|OrderedSet|) + (|RecursivePolynomialCategory| |#2| |#3| |#4|)) + T '|TriangularSetCategory&| + (|put| '|TriangularSetCategory&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |coHeight| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |extend| (|#1| |#1| |#5|)) + (SIGNATURE |select| + ((|Union| |#5| "failed") |#1| + |#4|)) + (SIGNATURE |algebraic?| + ((|Boolean|) |#4| |#1|)) + (SIGNATURE |algebraicVariables| + ((|List| |#4|) |#1|)) + (SIGNATURE |rest| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE |last| + ((|Union| |#5| "failed") |#1|)) + (SIGNATURE |first| + ((|Union| |#5| "failed") |#1|)) + (SIGNATURE |reduceByQuasiMonic| + (|#5| |#5| |#1|)) + (SIGNATURE |collectQuasiMonic| + (|#1| |#1|)) + (SIGNATURE |removeZero| + (|#5| |#5| |#1|)) + (SIGNATURE |initiallyReduce| + (|#5| |#5| |#1|)) + (SIGNATURE |headReduce| + (|#5| |#5| |#1|)) + (SIGNATURE |stronglyReduce| + (|#5| |#5| |#1|)) + (SIGNATURE |rewriteSetWithReduction| + ((|List| |#5|) (|List| |#5|) |#1| + (|Mapping| |#5| |#5| |#5|) + (|Mapping| (|Boolean|) |#5| |#5|))) + (SIGNATURE |reduce| + (|#5| |#5| |#1| + (|Mapping| |#5| |#5| |#5|) + (|Mapping| (|Boolean|) |#5| |#5|))) + (SIGNATURE |initiallyReduced?| + ((|Boolean|) |#1|)) + (SIGNATURE |headReduced?| + ((|Boolean|) |#1|)) + (SIGNATURE |stronglyReduced?| + ((|Boolean|) |#1|)) + (SIGNATURE |autoReduced?| + ((|Boolean|) |#1| + (|Mapping| (|Boolean|) |#5| + (|List| |#5|)))) + (SIGNATURE |initiallyReduced?| + ((|Boolean|) |#5| |#1|)) + (SIGNATURE |headReduced?| + ((|Boolean|) |#5| |#1|)) + (SIGNATURE |stronglyReduced?| + ((|Boolean|) |#5| |#1|)) + (SIGNATURE |reduced?| + ((|Boolean|) |#5| |#1| + (|Mapping| (|Boolean|) |#5| |#5|))) + (SIGNATURE |normalized?| + ((|Boolean|) |#1|)) + (SIGNATURE |normalized?| + ((|Boolean|) |#5| |#1|)) + (SIGNATURE |quasiComponent| + ((|Record| + (|:| |close| (|List| |#5|)) + (|:| |open| (|List| |#5|))) + |#1|)) + (SIGNATURE |degree| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |initials| + ((|List| |#5|) |#1|)) + (SIGNATURE |basicSet| + ((|Union| + (|Record| (|:| |bas| |#1|) + (|:| |top| (|List| |#5|))) + "failed") + (|List| |#5|) + (|Mapping| (|Boolean|) |#5|) + (|Mapping| (|Boolean|) |#5| |#5|))) + (SIGNATURE |basicSet| + ((|Union| + (|Record| (|:| |bas| |#1|) + (|:| |top| (|List| |#5|))) + "failed") + (|List| |#5|) + (|Mapping| (|Boolean|) |#5| |#5|))) + (SIGNATURE |infRittWu?| + ((|Boolean|) |#1| |#1|)) + (SIGNATURE |collectUpper| + (|#1| |#1| |#4|)) + (SIGNATURE |collectUnder| + (|#1| |#1| |#4|)) + (SIGNATURE |mvar| (|#4| |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| |#1| "failed") + (|List| |#5|))) + (SIGNATURE |coerce| + ((|List| |#5|) |#1|)) + (SIGNATURE |construct| + (|#1| (|List| |#5|))) + (SIGNATURE |reduce| + (|#5| (|Mapping| |#5| |#5| |#5|) + |#1|)) + (SIGNATURE |reduce| + (|#5| (|Mapping| |#5| |#5| |#5|) + |#1| |#5|)) + (SIGNATURE |select| + (|#1| (|Mapping| (|Boolean|) |#5|) + |#1|)) + (SIGNATURE |reduce| + (|#5| (|Mapping| |#5| |#5| |#5|) + |#1| |#5| |#5|)) + (SIGNATURE |coerce| + ((|OutputForm|) |#1|)) + (SIGNATURE = ((|Boolean|) |#1| |#1|))) + (|TriangularSetCategory| |#2| |#3| |#4| + |#5|) + (|IntegralDomain|) + (|OrderedAbelianMonoidSup|) (|OrderedSet|) + (|RecursivePolynomialCategory| |#2| |#3| + |#4|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/TSETCAT.lsp b/src/algebra/strap/TSETCAT.lsp index 8304c820..a99c4402 100644 --- a/src/algebra/strap/TSETCAT.lsp +++ b/src/algebra/strap/TSETCAT.lsp @@ -5,9 +5,9 @@ (DEFPARAMETER |TriangularSetCategory;AL| 'NIL) -(DEFUN |TriangularSetCategory| (&REST #0=#:G1439 &AUX #1=#:G1437) +(DEFUN |TriangularSetCategory| (&REST #0=#:G1448 &AUX #1=#:G1446) (DSETQ #1# #0#) - (LET (#2=#:G1438) + (LET (#2=#:G1447) (COND ((SETQ #2# (|assoc| (|devaluateList| #1#) |TriangularSetCategory;AL|)) @@ -21,7 +21,7 @@ #2#)))) (DEFUN |TriangularSetCategory;| (|t#1| |t#2| |t#3| |t#4|) - (PROG (#0=#:G1436) + (PROG (#0=#:G1445) (RETURN (PROG1 (LETT #0# (|sublisV| @@ -198,3 +198,12 @@ (LIST '|TriangularSetCategory| (|devaluate| |t#1|) (|devaluate| |t#2|) (|devaluate| |t#3|) (|devaluate| |t#4|))))))) + +(SETQ |$CategoryFrame| + (|put| '|TriangularSetCategory| '|isCategory| T + (|addModemap| '|TriangularSetCategory| + '(|TriangularSetCategory| |#1| |#2| |#3| |#4|) + '((|Category|) (|IntegralDomain|) + (|OrderedAbelianMonoidSup|) (|OrderedSet|) + (|RecursivePolynomialCategory| |t#1| |t#2| |t#3|)) + T '|TriangularSetCategory| |$CategoryFrame|))) diff --git a/src/algebra/strap/UFD-.lsp b/src/algebra/strap/UFD-.lsp index eb1afd12..26e633da 100644 --- a/src/algebra/strap/UFD-.lsp +++ b/src/algebra/strap/UFD-.lsp @@ -2,7 +2,7 @@ (/VERSIONCHECK 2) (DEFUN |UFD-;squareFreePart;2S;1| (|x| $) - (PROG (|s| |f| #0=#:G1403 #1=#:G1401 #2=#:G1399 #3=#:G1400) + (PROG (|s| |f| #0=#:G1405 #1=#:G1403 #2=#:G1401 #3=#:G1402) (RETURN (SEQ (SPADCALL (SPADCALL @@ -81,3 +81,24 @@ 0 0 0 15 0 6 0 16 1 6 7 0 18 1 9 21 0 22 1 0 0 0 17 1 0 23 0 24))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|UniqueFactorizationDomain&| '|isFunctor| + '(((|squareFreePart| ($ $)) T (ELT $ 17)) + ((|prime?| ((|Boolean|) $)) T (ELT $ 24))) + (|addModemap| '|UniqueFactorizationDomain&| + '(|UniqueFactorizationDomain&| |#1|) + '((CATEGORY |domain| + (SIGNATURE |squareFreePart| (|#1| |#1|)) + (SIGNATURE |prime?| ((|Boolean|) |#1|))) + (|UniqueFactorizationDomain|)) + T '|UniqueFactorizationDomain&| + (|put| '|UniqueFactorizationDomain&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |squareFreePart| + (|#1| |#1|)) + (SIGNATURE |prime?| + ((|Boolean|) |#1|))) + (|UniqueFactorizationDomain|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/UFD.lsp b/src/algebra/strap/UFD.lsp index ee4b7a18..ca8cedeb 100644 --- a/src/algebra/strap/UFD.lsp +++ b/src/algebra/strap/UFD.lsp @@ -4,14 +4,14 @@ (DEFPARAMETER |UniqueFactorizationDomain;AL| 'NIL) (DEFUN |UniqueFactorizationDomain| () - (LET (#:G1387) + (LET (#:G1396) (COND (|UniqueFactorizationDomain;AL|) (T (SETQ |UniqueFactorizationDomain;AL| (|UniqueFactorizationDomain;|)))))) (DEFUN |UniqueFactorizationDomain;| () - (PROG (#0=#:G1385) + (PROG (#0=#:G1394) (RETURN (PROG1 (LETT #0# (|Join| (|GcdDomain|) @@ -24,4 +24,10 @@ |UniqueFactorizationDomain|) (SETELT #0# 0 '(|UniqueFactorizationDomain|)))))) +(SETQ |$CategoryFrame| + (|put| '|UniqueFactorizationDomain| '|isCategory| T + (|addModemap| '|UniqueFactorizationDomain| + '(|UniqueFactorizationDomain|) '((|Category|)) T + '|UniqueFactorizationDomain| |$CategoryFrame|))) + (MAKEPROP '|UniqueFactorizationDomain| 'NILADIC T) diff --git a/src/algebra/strap/ULSCAT.lsp b/src/algebra/strap/ULSCAT.lsp index 94ef7e99..5992b652 100644 --- a/src/algebra/strap/ULSCAT.lsp +++ b/src/algebra/strap/ULSCAT.lsp @@ -5,8 +5,8 @@ (DEFPARAMETER |UnivariateLaurentSeriesCategory;AL| 'NIL) -(DEFUN |UnivariateLaurentSeriesCategory| (#0=#:G1388) - (LET (#1=#:G1389) +(DEFUN |UnivariateLaurentSeriesCategory| (#0=#:G1397) + (LET (#1=#:G1398) (COND ((SETQ #1# (|assoc| (|devaluate| #0#) @@ -21,13 +21,13 @@ #1#)))) (DEFUN |UnivariateLaurentSeriesCategory;| (|t#1|) - (PROG (#0=#:G1387) + (PROG (#0=#:G1396) (RETURN (PROG1 (LETT #0# (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (|sublisV| - (PAIR '(#1=#:G1386) (LIST '(|Integer|))) + (PAIR '(#1=#:G1395) (LIST '(|Integer|))) (COND (|UnivariateLaurentSeriesCategory;CAT|) ('T @@ -111,3 +111,10 @@ (SETELT #0# 0 (LIST '|UnivariateLaurentSeriesCategory| (|devaluate| |t#1|))))))) + +(SETQ |$CategoryFrame| + (|put| '|UnivariateLaurentSeriesCategory| '|isCategory| T + (|addModemap| '|UnivariateLaurentSeriesCategory| + '(|UnivariateLaurentSeriesCategory| |#1|) + '((|Category|) (|Ring|)) T + '|UnivariateLaurentSeriesCategory| |$CategoryFrame|))) diff --git a/src/algebra/strap/UPOLYC-.lsp b/src/algebra/strap/UPOLYC-.lsp index ff1ac0da..c6c77d4b 100644 --- a/src/algebra/strap/UPOLYC-.lsp +++ b/src/algebra/strap/UPOLYC-.lsp @@ -135,7 +135,7 @@ (SPADCALL |pp| (|getShellEntry| $ 87))) (DEFUN |UPOLYC-;factor;SF;23| (|p| $) - (PROG (|ansR| #0=#:G1516 |w| #1=#:G1517) + (PROG (|ansR| #0=#:G1518 |w| #1=#:G1519) (RETURN (SEQ (COND ((ZEROP (SPADCALL |p| (|getShellEntry| $ 11))) @@ -187,7 +187,7 @@ (|getShellEntry| $ 106)))))))) (DEFUN |UPOLYC-;vectorise;SNniV;24| (|p| |n| $) - (PROG (|v| |m| |i| #0=#:G1522 #1=#:G1518) + (PROG (|v| |m| |i| #0=#:G1524 #1=#:G1520) (RETURN (SEQ (LETT |m| (SPADCALL @@ -234,7 +234,7 @@ (SPADCALL (|spadConstant| $ 118) (|getShellEntry| $ 30))) (DEFUN |UPOLYC-;nextItemInner| (|n| $) - (PROG (|nn| |n1| |n2| #0=#:G1543 |n3|) + (PROG (|nn| |n1| |n2| #0=#:G1545 |n3|) (RETURN (SEQ (COND ((SPADCALL |n| (|getShellEntry| $ 9)) @@ -322,7 +322,7 @@ (|getShellEntry| $ 50))))))))))))))))) (DEFUN |UPOLYC-;nextItem;SU;29| (|n| $) - (PROG (|n1| #0=#:G1556) + (PROG (|n1| #0=#:G1558) (RETURN (SEQ (LETT |n1| (|UPOLYC-;nextItemInner| |n| $) |UPOLYC-;nextItem;SU;29|) @@ -347,7 +347,7 @@ (|getShellEntry| $ 30))) (DEFUN |UPOLYC-;primeFactor| (|p| |q| $) - (PROG (#0=#:G1562 |p1|) + (PROG (#0=#:G1564 |p1|) (RETURN (SEQ (LETT |p1| (PROG2 (LETT #0# @@ -365,7 +365,7 @@ ('T (|UPOLYC-;primeFactor| |p1| |q| $)))))))) (DEFUN |UPOLYC-;separate;2SR;32| (|p| |q| $) - (PROG (|a| #0=#:G1568) + (PROG (|a| #0=#:G1570) (RETURN (SEQ (LETT |a| (|UPOLYC-;primeFactor| |p| |q| $) |UPOLYC-;separate;2SR;32|) @@ -379,7 +379,7 @@ (|getShellEntry| $ 6) #0#)))))))) (DEFUN |UPOLYC-;differentiate;SM2S;33| (|x| |deriv| |x'| $) - (PROG (|dg| |lc| #0=#:G1573 |d|) + (PROG (|dg| |lc| #0=#:G1575 |d|) (RETURN (SEQ (LETT |d| (|spadConstant| $ 61) |UPOLYC-;differentiate;SM2S;33|) @@ -424,7 +424,7 @@ (|getShellEntry| $ 66))))))) (DEFUN |UPOLYC-;ncdiff| (|n| |x'| $) - (PROG (#0=#:G1591 |n1|) + (PROG (#0=#:G1593 |n1|) (RETURN (COND ((ZEROP |n|) (|spadConstant| $ 61)) @@ -487,7 +487,7 @@ (SPADCALL |x| |deriv| (|spadConstant| $ 48) (|getShellEntry| $ 136))) (DEFUN |UPOLYC-;differentiate;2S;37| (|x| $) - (PROG (|dg| #0=#:G1600 |d|) + (PROG (|dg| #0=#:G1602 |d|) (RETURN (SEQ (LETT |d| (|spadConstant| $ 61) |UPOLYC-;differentiate;2S;37|) @@ -531,7 +531,7 @@ (|getShellEntry| $ 146))) (DEFUN |UPOLYC-;pseudoQuotient;3S;40| (|p| |q| $) - (PROG (|n| #0=#:G1646 #1=#:G1648) + (PROG (|n| #0=#:G1648 #1=#:G1650) (RETURN (SEQ (LETT |n| (+ (- (SPADCALL |p| (|getShellEntry| $ 11)) @@ -565,7 +565,7 @@ (|getShellEntry| $ 6) #1#))))))))) (DEFUN |UPOLYC-;pseudoDivide;2SR;41| (|p| |q| $) - (PROG (|n| |prem| #0=#:G1654 |lc| #1=#:G1656) + (PROG (|n| |prem| #0=#:G1656 |lc| #1=#:G1658) (RETURN (SEQ (LETT |n| (+ (- (SPADCALL |p| (|getShellEntry| $ 11)) @@ -632,7 +632,7 @@ (|getShellEntry| $ 155)))))))))))))) (DEFUN |UPOLYC-;composite;2SU;43| (|p| |q| $) - (PROG (|cqr| |v| |u| |w| #0=#:G1682) + (PROG (|cqr| |v| |u| |w| #0=#:G1684) (RETURN (SEQ (COND ((SPADCALL |p| (|getShellEntry| $ 158)) (CONS 0 |p|)) @@ -694,7 +694,7 @@ #0# (EXIT #0#)))))))) (DEFUN |UPOLYC-;elt;S2F;44| (|p| |f| $) - (PROG (|n| #0=#:G1688 |ans|) + (PROG (|n| #0=#:G1690 |ans|) (RETURN (SEQ (COND ((SPADCALL |p| (|getShellEntry| $ 9)) @@ -754,7 +754,7 @@ (|getShellEntry| $ 166)))))))))))) (DEFUN |UPOLYC-;order;2SNni;45| (|p| |q| $) - (PROG (|u| #0=#:G1702 |ans|) + (PROG (|u| #0=#:G1704 |ans|) (RETURN (SEQ (EXIT (COND ((SPADCALL |p| (|getShellEntry| $ 9)) @@ -830,7 +830,7 @@ ('T (SPADCALL |x| (|getShellEntry| $ 11))))) (DEFUN |UPOLYC-;divide;2SR;52| (|x| |y| $) - (PROG (|lc| |f| #0=#:G1714 |n| |quot|) + (PROG (|lc| |f| #0=#:G1716 |n| |quot|) (RETURN (SEQ (COND ((SPADCALL |y| (|getShellEntry| $ 9)) @@ -1229,3 +1229,642 @@ 19 0 14 20 2 0 0 0 12 125 2 0 120 0 0 161 2 0 156 143 0 157 1 0 0 12 51))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|UnivariatePolynomialCategory&| '|isFunctor| + '(((|coerce| ($ $)) T (ELT $ NIL)) + ((|gcdPolynomial| + ((|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| $))) + T (ELT $ 182)) + ((|squareFree| ((|Factored| $) $)) T (ELT $ 173)) + ((|squareFreePart| ($ $)) T (ELT $ 175)) + ((|coerce| ($ (|Fraction| (|Integer|)))) T (ELT $ NIL)) + ((|init| ($)) T (ELT $ 119)) + ((|nextItem| ((|Union| $ "failed") $)) T (ELT $ 123)) + ((|elt| ((|Fraction| $) $ (|Fraction| $))) T + (ELT $ 169)) + ((|euclideanSize| ((|NonNegativeInteger|) $)) T + (ELT $ 188)) + ((|divide| + ((|Record| (|:| |quotient| $) (|:| |remainder| $)) + $ $)) + T (ELT $ 191)) + ((|integrate| ($ $)) T (ELT $ 197)) + ((|elt| (|#2| (|Fraction| $) |#2|)) T (ELT $ 187)) + ((|separate| + ((|Record| (|:| |primePart| $) + (|:| |commonPart| $)) + $ $)) + T (ELT $ 130)) + ((|pseudoDivide| + ((|Record| (|:| |coef| |#2|) (|:| |quotient| $) + (|:| |remainder| $)) + $ $)) + T (ELT $ 153)) + ((|pseudoQuotient| ($ $ $)) T (ELT $ 151)) + ((|composite| + ((|Union| (|Fraction| $) "failed") (|Fraction| $) + $)) + T (ELT $ 157)) + ((|composite| ((|Union| $ "failed") $ $)) T (ELT $ 161)) + ((|order| ((|NonNegativeInteger|) $ $)) T (ELT $ 170)) + ((|elt| ((|Fraction| $) (|Fraction| $) (|Fraction| $))) + T (ELT $ 147)) + ((|differentiate| ($ $ (|Mapping| |#2| |#2|) $)) T + (ELT $ 134)) + ((|shiftLeft| ($ $ (|NonNegativeInteger|))) T + (ELT $ 73)) + ((|shiftRight| ($ $ (|NonNegativeInteger|))) T + (ELT $ 71)) + ((|karatsubaDivide| + ((|Record| (|:| |quotient| $) (|:| |remainder| $)) + $ (|NonNegativeInteger|))) + T (ELT $ 70)) + ((|unmakeSUP| ($ (|SparseUnivariatePolynomial| |#2|))) T + (ELT $ 67)) + ((|makeSUP| ((|SparseUnivariatePolynomial| |#2|) $)) T + (ELT $ 59)) + ((|vectorise| + ((|Vector| |#2|) $ (|NonNegativeInteger|))) + T (ELT $ 114)) + ((|differentiate| ($ $ (|Mapping| |#2| |#2|))) T + (ELT $ 137)) + ((|differentiate| + ($ $ (|Mapping| |#2| |#2|) (|NonNegativeInteger|))) + T (ELT $ NIL)) + ((|differentiate| + ($ $ (|List| (|Symbol|)) + (|List| (|NonNegativeInteger|)))) + T (ELT $ NIL)) + ((|differentiate| + ($ $ (|Symbol|) (|NonNegativeInteger|))) + T (ELT $ NIL)) + ((|differentiate| ($ $ (|List| (|Symbol|)))) T + (ELT $ NIL)) + ((|differentiate| ($ $ (|Symbol|))) T (ELT $ NIL)) + ((|differentiate| ($ $)) T (ELT $ 138)) + ((|differentiate| ($ $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|elt| ($ $ $)) T (ELT $ NIL)) + ((|elt| (|#2| $ |#2|)) T (ELT $ NIL)) + ((|factor| ((|Factored| $) $)) T (ELT $ 107)) + ((|squareFreePolynomial| + ((|Factored| (|SparseUnivariatePolynomial| $)) + (|SparseUnivariatePolynomial| $))) + T (ELT $ 185)) + ((|factorPolynomial| + ((|Factored| (|SparseUnivariatePolynomial| $)) + (|SparseUnivariatePolynomial| $))) + T (ELT $ 86)) + ((|factorSquareFreePolynomial| + ((|Factored| (|SparseUnivariatePolynomial| $)) + (|SparseUnivariatePolynomial| $))) + T (ELT $ 88)) + ((|solveLinearPolynomialEquation| + ((|Union| (|List| (|SparseUnivariatePolynomial| $)) + "failed") + (|List| (|SparseUnivariatePolynomial| $)) + (|SparseUnivariatePolynomial| $))) + T (ELT $ 82)) + ((|content| ($ $ (|SingletonAsOrderedSet|))) T + (ELT $ 125)) + ((|variables| ((|List| (|SingletonAsOrderedSet|)) $)) T + (ELT $ 15)) + ((|totalDegree| + ((|NonNegativeInteger|) $ + (|List| (|SingletonAsOrderedSet|)))) + T (ELT $ 18)) + ((|totalDegree| ((|NonNegativeInteger|) $)) T + (ELT $ NIL)) + ((|monomial| + ($ $ (|List| (|SingletonAsOrderedSet|)) + (|List| (|NonNegativeInteger|)))) + T (ELT $ NIL)) + ((|monomial| + ($ $ (|SingletonAsOrderedSet|) + (|NonNegativeInteger|))) + T (ELT $ 47)) + ((|minimumDegree| + ((|List| (|NonNegativeInteger|)) $ + (|List| (|SingletonAsOrderedSet|)))) + T (ELT $ 43)) + ((|minimumDegree| + ((|NonNegativeInteger|) $ + (|SingletonAsOrderedSet|))) + T (ELT $ 42)) + ((|mainVariable| + ((|Union| (|SingletonAsOrderedSet|) "failed") $)) + T (ELT $ 40)) + ((|degree| + ((|List| (|NonNegativeInteger|)) $ + (|List| (|SingletonAsOrderedSet|)))) + T (ELT $ 20)) + ((|degree| + ((|NonNegativeInteger|) $ + (|SingletonAsOrderedSet|))) + T (ELT $ 16)) + ((|retract| ((|SingletonAsOrderedSet|) $)) T + (ELT $ NIL)) + ((|retractIfCan| + ((|Union| (|SingletonAsOrderedSet|) "failed") $)) + T (ELT $ NIL)) + ((|coerce| ($ (|SingletonAsOrderedSet|))) T (ELT $ 51)) + ((|eval| ($ $ (|List| (|SingletonAsOrderedSet|)) + (|List| $))) + T (ELT $ 23)) + ((|eval| ($ $ (|SingletonAsOrderedSet|) $)) T + (ELT $ 25)) + ((|eval| ($ $ (|List| (|SingletonAsOrderedSet|)) + (|List| |#2|))) + T (ELT $ 28)) + ((|eval| ($ $ (|SingletonAsOrderedSet|) |#2|)) T + (ELT $ 31)) + ((|eval| ($ $ (|List| $) (|List| $))) T (ELT $ NIL)) + ((|eval| ($ $ $ $)) T (ELT $ NIL)) + ((|eval| ($ $ (|Equation| $))) T (ELT $ NIL)) + ((|eval| ($ $ (|List| (|Equation| $)))) T (ELT $ 39)) + ((|degree| ((|NonNegativeInteger|) $)) T (ELT $ NIL)) + ((|monomial| ($ |#2| (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|retract| ((|Integer|) $)) T (ELT $ NIL)) + ((|retractIfCan| ((|Union| (|Integer|) "failed") $)) T + (ELT $ NIL)) + ((|retract| ((|Fraction| (|Integer|)) $)) T (ELT $ NIL)) + ((|retractIfCan| + ((|Union| (|Fraction| (|Integer|)) "failed") $)) + T (ELT $ NIL)) + ((|coerce| ($ |#2|)) T (ELT $ NIL)) + ((|retractIfCan| ((|Union| |#2| "failed") $)) T + (ELT $ 117)) + ((|retract| (|#2| $)) T (ELT $ 115)) + ((|minimumDegree| ((|NonNegativeInteger|) $)) T + (ELT $ NIL)) + ((|content| (|#2| $)) T (ELT $ NIL)) + ((|differentiate| + ($ $ (|List| (|SingletonAsOrderedSet|)) + (|List| (|NonNegativeInteger|)))) + T (ELT $ NIL)) + ((|differentiate| + ($ $ (|SingletonAsOrderedSet|) + (|NonNegativeInteger|))) + T (ELT $ NIL)) + ((|differentiate| + ($ $ (|List| (|SingletonAsOrderedSet|)))) + T (ELT $ NIL)) + ((|differentiate| ($ $ (|SingletonAsOrderedSet|))) T + (ELT $ 140)) + ((|coerce| ($ (|Integer|))) T (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ NIL))) + (|addModemap| '|UnivariatePolynomialCategory&| + '(|UnivariatePolynomialCategory&| |#1| |#2|) + '((CATEGORY |domain| (SIGNATURE |coerce| (|#1| |#1|)) + (SIGNATURE |gcdPolynomial| + ((|SparseUnivariatePolynomial| |#1|) + (|SparseUnivariatePolynomial| |#1|) + (|SparseUnivariatePolynomial| |#1|))) + (SIGNATURE |squareFree| + ((|Factored| |#1|) |#1|)) + (SIGNATURE |squareFreePart| (|#1| |#1|)) + (SIGNATURE |coerce| + (|#1| (|Fraction| (|Integer|)))) + (SIGNATURE |init| (|#1|)) + (SIGNATURE |nextItem| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE |elt| + ((|Fraction| |#1|) |#1| (|Fraction| |#1|))) + (SIGNATURE |euclideanSize| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |divide| + ((|Record| (|:| |quotient| |#1|) + (|:| |remainder| |#1|)) + |#1| |#1|)) + (SIGNATURE |integrate| (|#1| |#1|)) + (SIGNATURE |elt| (|#2| (|Fraction| |#1|) |#2|)) + (SIGNATURE |separate| + ((|Record| (|:| |primePart| |#1|) + (|:| |commonPart| |#1|)) + |#1| |#1|)) + (SIGNATURE |pseudoDivide| + ((|Record| (|:| |coef| |#2|) + (|:| |quotient| |#1|) + (|:| |remainder| |#1|)) + |#1| |#1|)) + (SIGNATURE |pseudoQuotient| (|#1| |#1| |#1|)) + (SIGNATURE |composite| + ((|Union| (|Fraction| |#1|) "failed") + (|Fraction| |#1|) |#1|)) + (SIGNATURE |composite| + ((|Union| |#1| "failed") |#1| |#1|)) + (SIGNATURE |order| + ((|NonNegativeInteger|) |#1| |#1|)) + (SIGNATURE |elt| + ((|Fraction| |#1|) (|Fraction| |#1|) + (|Fraction| |#1|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Mapping| |#2| |#2|) |#1|)) + (SIGNATURE |shiftLeft| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |shiftRight| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |karatsubaDivide| + ((|Record| (|:| |quotient| |#1|) + (|:| |remainder| |#1|)) + |#1| (|NonNegativeInteger|))) + (SIGNATURE |unmakeSUP| + (|#1| (|SparseUnivariatePolynomial| |#2|))) + (SIGNATURE |makeSUP| + ((|SparseUnivariatePolynomial| |#2|) |#1|)) + (SIGNATURE |vectorise| + ((|Vector| |#2|) |#1| + (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Mapping| |#2| |#2|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Mapping| |#2| |#2|) + (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|List| (|Symbol|)) + (|List| (|NonNegativeInteger|)))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Symbol|) + (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|List| (|Symbol|)))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Symbol|))) + (SIGNATURE |differentiate| (|#1| |#1|)) + (SIGNATURE |differentiate| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |elt| (|#1| |#1| |#1|)) + (SIGNATURE |elt| (|#2| |#1| |#2|)) + (SIGNATURE |factor| ((|Factored| |#1|) |#1|)) + (SIGNATURE |squareFreePolynomial| + ((|Factored| + (|SparseUnivariatePolynomial| |#1|)) + (|SparseUnivariatePolynomial| |#1|))) + (SIGNATURE |factorPolynomial| + ((|Factored| + (|SparseUnivariatePolynomial| |#1|)) + (|SparseUnivariatePolynomial| |#1|))) + (SIGNATURE |factorSquareFreePolynomial| + ((|Factored| + (|SparseUnivariatePolynomial| |#1|)) + (|SparseUnivariatePolynomial| |#1|))) + (SIGNATURE |solveLinearPolynomialEquation| + ((|Union| (|List| + (|SparseUnivariatePolynomial| + |#1|)) + "failed") + (|List| (|SparseUnivariatePolynomial| |#1|)) + (|SparseUnivariatePolynomial| |#1|))) + (SIGNATURE |content| + (|#1| |#1| (|SingletonAsOrderedSet|))) + (SIGNATURE |variables| + ((|List| (|SingletonAsOrderedSet|)) |#1|)) + (SIGNATURE |totalDegree| + ((|NonNegativeInteger|) |#1| + (|List| (|SingletonAsOrderedSet|)))) + (SIGNATURE |totalDegree| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |monomial| + (|#1| |#1| + (|List| (|SingletonAsOrderedSet|)) + (|List| (|NonNegativeInteger|)))) + (SIGNATURE |monomial| + (|#1| |#1| (|SingletonAsOrderedSet|) + (|NonNegativeInteger|))) + (SIGNATURE |minimumDegree| + ((|List| (|NonNegativeInteger|)) |#1| + (|List| (|SingletonAsOrderedSet|)))) + (SIGNATURE |minimumDegree| + ((|NonNegativeInteger|) |#1| + (|SingletonAsOrderedSet|))) + (SIGNATURE |mainVariable| + ((|Union| (|SingletonAsOrderedSet|) + "failed") + |#1|)) + (SIGNATURE |degree| + ((|List| (|NonNegativeInteger|)) |#1| + (|List| (|SingletonAsOrderedSet|)))) + (SIGNATURE |degree| + ((|NonNegativeInteger|) |#1| + (|SingletonAsOrderedSet|))) + (SIGNATURE |retract| + ((|SingletonAsOrderedSet|) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|SingletonAsOrderedSet|) + "failed") + |#1|)) + (SIGNATURE |coerce| + (|#1| (|SingletonAsOrderedSet|))) + (SIGNATURE |eval| + (|#1| |#1| + (|List| (|SingletonAsOrderedSet|)) + (|List| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| (|SingletonAsOrderedSet|) |#1|)) + (SIGNATURE |eval| + (|#1| |#1| + (|List| + (|SingletonAsOrderedSet|)) + (|List| |#2|))) + (SIGNATURE |eval| + (|#1| |#1| (|SingletonAsOrderedSet|) |#2|)) + (SIGNATURE |eval| + (|#1| |#1| (|List| |#1|) (|List| |#1|))) + (SIGNATURE |eval| (|#1| |#1| |#1| |#1|)) + (SIGNATURE |eval| (|#1| |#1| (|Equation| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| (|List| (|Equation| |#1|)))) + (SIGNATURE |degree| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |monomial| + (|#1| |#2| (|NonNegativeInteger|))) + (SIGNATURE |retract| ((|Integer|) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Integer|) "failed") |#1|)) + (SIGNATURE |retract| + ((|Fraction| (|Integer|)) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Fraction| (|Integer|)) "failed") + |#1|)) + (SIGNATURE |coerce| (|#1| |#2|)) + (SIGNATURE |retractIfCan| + ((|Union| |#2| "failed") |#1|)) + (SIGNATURE |retract| (|#2| |#1|)) + (SIGNATURE |minimumDegree| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |content| (|#2| |#1|)) + (SIGNATURE |differentiate| + (|#1| |#1| + (|List| (|SingletonAsOrderedSet|)) + (|List| (|NonNegativeInteger|)))) + (SIGNATURE |differentiate| + (|#1| |#1| (|SingletonAsOrderedSet|) + (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1| + (|List| (|SingletonAsOrderedSet|)))) + (SIGNATURE |differentiate| + (|#1| |#1| (|SingletonAsOrderedSet|))) + (SIGNATURE |coerce| (|#1| (|Integer|))) + (SIGNATURE |coerce| ((|OutputForm|) |#1|))) + (|UnivariatePolynomialCategory| |#2|) (|Ring|)) + T '|UnivariatePolynomialCategory&| + (|put| '|UnivariatePolynomialCategory&| '|mode| + '(|Mapping| + (CATEGORY |domain| + (SIGNATURE |coerce| (|#1| |#1|)) + (SIGNATURE |gcdPolynomial| + ((|SparseUnivariatePolynomial| + |#1|) + (|SparseUnivariatePolynomial| + |#1|) + (|SparseUnivariatePolynomial| + |#1|))) + (SIGNATURE |squareFree| + ((|Factored| |#1|) |#1|)) + (SIGNATURE |squareFreePart| + (|#1| |#1|)) + (SIGNATURE |coerce| + (|#1| (|Fraction| (|Integer|)))) + (SIGNATURE |init| (|#1|)) + (SIGNATURE |nextItem| + ((|Union| |#1| "failed") |#1|)) + (SIGNATURE |elt| + ((|Fraction| |#1|) |#1| + (|Fraction| |#1|))) + (SIGNATURE |euclideanSize| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |divide| + ((|Record| (|:| |quotient| |#1|) + (|:| |remainder| |#1|)) + |#1| |#1|)) + (SIGNATURE |integrate| (|#1| |#1|)) + (SIGNATURE |elt| + (|#2| (|Fraction| |#1|) |#2|)) + (SIGNATURE |separate| + ((|Record| (|:| |primePart| |#1|) + (|:| |commonPart| |#1|)) + |#1| |#1|)) + (SIGNATURE |pseudoDivide| + ((|Record| (|:| |coef| |#2|) + (|:| |quotient| |#1|) + (|:| |remainder| |#1|)) + |#1| |#1|)) + (SIGNATURE |pseudoQuotient| + (|#1| |#1| |#1|)) + (SIGNATURE |composite| + ((|Union| (|Fraction| |#1|) + "failed") + (|Fraction| |#1|) |#1|)) + (SIGNATURE |composite| + ((|Union| |#1| "failed") |#1| + |#1|)) + (SIGNATURE |order| + ((|NonNegativeInteger|) |#1| |#1|)) + (SIGNATURE |elt| + ((|Fraction| |#1|) + (|Fraction| |#1|) + (|Fraction| |#1|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Mapping| |#2| |#2|) + |#1|)) + (SIGNATURE |shiftLeft| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |shiftRight| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |karatsubaDivide| + ((|Record| (|:| |quotient| |#1|) + (|:| |remainder| |#1|)) + |#1| (|NonNegativeInteger|))) + (SIGNATURE |unmakeSUP| + (|#1| + (|SparseUnivariatePolynomial| + |#2|))) + (SIGNATURE |makeSUP| + ((|SparseUnivariatePolynomial| + |#2|) + |#1|)) + (SIGNATURE |vectorise| + ((|Vector| |#2|) |#1| + (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Mapping| |#2| |#2|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Mapping| |#2| |#2|) + (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|List| (|Symbol|)) + (|List| (|NonNegativeInteger|)))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Symbol|) + (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1| (|List| (|Symbol|)))) + (SIGNATURE |differentiate| + (|#1| |#1| (|Symbol|))) + (SIGNATURE |differentiate| + (|#1| |#1|)) + (SIGNATURE |differentiate| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |elt| (|#1| |#1| |#1|)) + (SIGNATURE |elt| (|#2| |#1| |#2|)) + (SIGNATURE |factor| + ((|Factored| |#1|) |#1|)) + (SIGNATURE |squareFreePolynomial| + ((|Factored| + (|SparseUnivariatePolynomial| + |#1|)) + (|SparseUnivariatePolynomial| + |#1|))) + (SIGNATURE |factorPolynomial| + ((|Factored| + (|SparseUnivariatePolynomial| + |#1|)) + (|SparseUnivariatePolynomial| + |#1|))) + (SIGNATURE + |factorSquareFreePolynomial| + ((|Factored| + (|SparseUnivariatePolynomial| + |#1|)) + (|SparseUnivariatePolynomial| + |#1|))) + (SIGNATURE + |solveLinearPolynomialEquation| + ((|Union| + (|List| + (|SparseUnivariatePolynomial| + |#1|)) + "failed") + (|List| + (|SparseUnivariatePolynomial| + |#1|)) + (|SparseUnivariatePolynomial| + |#1|))) + (SIGNATURE |content| + (|#1| |#1| + (|SingletonAsOrderedSet|))) + (SIGNATURE |variables| + ((|List| + (|SingletonAsOrderedSet|)) + |#1|)) + (SIGNATURE |totalDegree| + ((|NonNegativeInteger|) |#1| + (|List| + (|SingletonAsOrderedSet|)))) + (SIGNATURE |totalDegree| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |monomial| + (|#1| |#1| + (|List| + (|SingletonAsOrderedSet|)) + (|List| (|NonNegativeInteger|)))) + (SIGNATURE |monomial| + (|#1| |#1| + (|SingletonAsOrderedSet|) + (|NonNegativeInteger|))) + (SIGNATURE |minimumDegree| + ((|List| (|NonNegativeInteger|)) + |#1| + (|List| + (|SingletonAsOrderedSet|)))) + (SIGNATURE |minimumDegree| + ((|NonNegativeInteger|) |#1| + (|SingletonAsOrderedSet|))) + (SIGNATURE |mainVariable| + ((|Union| + (|SingletonAsOrderedSet|) + "failed") + |#1|)) + (SIGNATURE |degree| + ((|List| (|NonNegativeInteger|)) + |#1| + (|List| + (|SingletonAsOrderedSet|)))) + (SIGNATURE |degree| + ((|NonNegativeInteger|) |#1| + (|SingletonAsOrderedSet|))) + (SIGNATURE |retract| + ((|SingletonAsOrderedSet|) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| + (|SingletonAsOrderedSet|) + "failed") + |#1|)) + (SIGNATURE |coerce| + (|#1| (|SingletonAsOrderedSet|))) + (SIGNATURE |eval| + (|#1| |#1| + (|List| + (|SingletonAsOrderedSet|)) + (|List| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| + (|SingletonAsOrderedSet|) |#1|)) + (SIGNATURE |eval| + (|#1| |#1| + (|List| + (|SingletonAsOrderedSet|)) + (|List| |#2|))) + (SIGNATURE |eval| + (|#1| |#1| + (|SingletonAsOrderedSet|) |#2|)) + (SIGNATURE |eval| + (|#1| |#1| (|List| |#1|) + (|List| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| |#1| |#1|)) + (SIGNATURE |eval| + (|#1| |#1| (|Equation| |#1|))) + (SIGNATURE |eval| + (|#1| |#1| + (|List| (|Equation| |#1|)))) + (SIGNATURE |degree| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |monomial| + (|#1| |#2| (|NonNegativeInteger|))) + (SIGNATURE |retract| + ((|Integer|) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Integer|) "failed") + |#1|)) + (SIGNATURE |retract| + ((|Fraction| (|Integer|)) |#1|)) + (SIGNATURE |retractIfCan| + ((|Union| (|Fraction| (|Integer|)) + "failed") + |#1|)) + (SIGNATURE |coerce| (|#1| |#2|)) + (SIGNATURE |retractIfCan| + ((|Union| |#2| "failed") |#1|)) + (SIGNATURE |retract| (|#2| |#1|)) + (SIGNATURE |minimumDegree| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |content| (|#2| |#1|)) + (SIGNATURE |differentiate| + (|#1| |#1| + (|List| + (|SingletonAsOrderedSet|)) + (|List| (|NonNegativeInteger|)))) + (SIGNATURE |differentiate| + (|#1| |#1| + (|SingletonAsOrderedSet|) + (|NonNegativeInteger|))) + (SIGNATURE |differentiate| + (|#1| |#1| + (|List| + (|SingletonAsOrderedSet|)))) + (SIGNATURE |differentiate| + (|#1| |#1| + (|SingletonAsOrderedSet|))) + (SIGNATURE |coerce| + (|#1| (|Integer|))) + (SIGNATURE |coerce| + ((|OutputForm|) |#1|))) + (|UnivariatePolynomialCategory| |#2|) + (|Ring|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/UPOLYC.lsp b/src/algebra/strap/UPOLYC.lsp index 895e13e4..358e514f 100644 --- a/src/algebra/strap/UPOLYC.lsp +++ b/src/algebra/strap/UPOLYC.lsp @@ -5,8 +5,8 @@ (DEFPARAMETER |UnivariatePolynomialCategory;AL| 'NIL) -(DEFUN |UnivariatePolynomialCategory| (#0=#:G1424) - (LET (#1=#:G1425) +(DEFUN |UnivariatePolynomialCategory| (#0=#:G1433) + (LET (#1=#:G1434) (COND ((SETQ #1# (|assoc| (|devaluate| #0#) @@ -21,13 +21,13 @@ #1#)))) (DEFUN |UnivariatePolynomialCategory;| (|t#1|) - (PROG (#0=#:G1423) + (PROG (#0=#:G1432) (RETURN (PROG1 (LETT #0# (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (|sublisV| - (PAIR '(#1=#:G1421 #2=#:G1422) + (PAIR '(#1=#:G1430 #2=#:G1431) (LIST '(|NonNegativeInteger|) '(|SingletonAsOrderedSet|))) (COND @@ -156,3 +156,10 @@ (SETELT #0# 0 (LIST '|UnivariatePolynomialCategory| (|devaluate| |t#1|))))))) + +(SETQ |$CategoryFrame| + (|put| '|UnivariatePolynomialCategory| '|isCategory| T + (|addModemap| '|UnivariatePolynomialCategory| + '(|UnivariatePolynomialCategory| |#1|) + '((|Category|) (|Ring|)) T + '|UnivariatePolynomialCategory| |$CategoryFrame|))) diff --git a/src/algebra/strap/URAGG-.lsp b/src/algebra/strap/URAGG-.lsp index 06ae51f1..66fba802 100644 --- a/src/algebra/strap/URAGG-.lsp +++ b/src/algebra/strap/URAGG-.lsp @@ -1,28 +1,36 @@ (/VERSIONCHECK 2) -(DEFUN |URAGG-;elt;AfirstS;1| (|x| T0 $) (SPADCALL |x| (QREFELT $ 8))) +(DEFUN |URAGG-;elt;AfirstS;1| (|x| T0 $) + (SPADCALL |x| (|getShellEntry| $ 8))) -(DEFUN |URAGG-;elt;AlastS;2| (|x| T1 $) (SPADCALL |x| (QREFELT $ 11))) +(DEFUN |URAGG-;elt;AlastS;2| (|x| T1 $) + (SPADCALL |x| (|getShellEntry| $ 11))) -(DEFUN |URAGG-;elt;ArestA;3| (|x| T2 $) (SPADCALL |x| (QREFELT $ 14))) +(DEFUN |URAGG-;elt;ArestA;3| (|x| T2 $) + (SPADCALL |x| (|getShellEntry| $ 14))) (DEFUN |URAGG-;second;AS;4| (|x| $) - (SPADCALL (SPADCALL |x| (QREFELT $ 14)) (QREFELT $ 8))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 14)) + (|getShellEntry| $ 8))) (DEFUN |URAGG-;third;AS;5| (|x| $) - (SPADCALL (SPADCALL (SPADCALL |x| (QREFELT $ 14)) (QREFELT $ 14)) - (QREFELT $ 8))) + (SPADCALL + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 14)) + (|getShellEntry| $ 14)) + (|getShellEntry| $ 8))) (DEFUN |URAGG-;cyclic?;AB;6| (|x| $) (COND - ((SPADCALL |x| (QREFELT $ 20)) 'NIL) + ((SPADCALL |x| (|getShellEntry| $ 20)) 'NIL) ('T - (SPADCALL (SPADCALL (|URAGG-;findCycle| |x| $) (QREFELT $ 20)) - (QREFELT $ 21))))) + (SPADCALL + (SPADCALL (|URAGG-;findCycle| |x| $) (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))))) (DEFUN |URAGG-;last;AS;7| (|x| $) - (SPADCALL (SPADCALL |x| (QREFELT $ 23)) (QREFELT $ 8))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 23)) + (|getShellEntry| $ 8))) (DEFUN |URAGG-;nodes;AL;8| (|x| $) (PROG (|l|) @@ -30,11 +38,13 @@ (SEQ (LETT |l| NIL |URAGG-;nodes;AL;8|) (SEQ G190 (COND - ((NULL (SPADCALL (SPADCALL |x| (QREFELT $ 20)) - (QREFELT $ 21))) + ((NULL (SPADCALL + (SPADCALL |x| (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))) (GO G191))) (SEQ (LETT |l| (CONS |x| |l|) |URAGG-;nodes;AL;8|) - (EXIT (LETT |x| (SPADCALL |x| (QREFELT $ 14)) + (EXIT (LETT |x| + (SPADCALL |x| (|getShellEntry| $ 14)) |URAGG-;nodes;AL;8|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT (NREVERSE |l|)))))) @@ -44,15 +54,18 @@ (RETURN (SEQ (LETT |l| NIL |URAGG-;children;AL;9|) (EXIT (COND - ((SPADCALL |x| (QREFELT $ 20)) |l|) - ('T (CONS (SPADCALL |x| (QREFELT $ 14)) |l|)))))))) + ((SPADCALL |x| (|getShellEntry| $ 20)) |l|) + ('T + (CONS (SPADCALL |x| (|getShellEntry| $ 14)) |l|)))))))) -(DEFUN |URAGG-;leaf?;AB;10| (|x| $) (SPADCALL |x| (QREFELT $ 20))) +(DEFUN |URAGG-;leaf?;AB;10| (|x| $) + (SPADCALL |x| (|getShellEntry| $ 20))) (DEFUN |URAGG-;value;AS;11| (|x| $) (COND - ((SPADCALL |x| (QREFELT $ 20)) (|error| "value of empty object")) - ('T (SPADCALL |x| (QREFELT $ 8))))) + ((SPADCALL |x| (|getShellEntry| $ 20)) + (|error| "value of empty object")) + ('T (SPADCALL |x| (|getShellEntry| $ 8))))) (DEFUN |URAGG-;less?;ANniB;12| (|l| |n| $) (PROG (|i|) @@ -62,11 +75,12 @@ (COND ((NULL (COND ((< 0 |i|) - (SPADCALL (SPADCALL |l| (QREFELT $ 20)) - (QREFELT $ 21))) + (SPADCALL + (SPADCALL |l| (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))) ('T 'NIL))) (GO G191))) - (SEQ (LETT |l| (SPADCALL |l| (QREFELT $ 14)) + (SEQ (LETT |l| (SPADCALL |l| (|getShellEntry| $ 14)) |URAGG-;less?;ANniB;12|) (EXIT (LETT |i| (- |i| 1) |URAGG-;less?;ANniB;12|))) NIL (GO G190) G191 (EXIT NIL)) @@ -80,18 +94,19 @@ (COND ((NULL (COND ((< 0 |i|) - (SPADCALL (SPADCALL |l| (QREFELT $ 20)) - (QREFELT $ 21))) + (SPADCALL + (SPADCALL |l| (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))) ('T 'NIL))) (GO G191))) - (SEQ (LETT |l| (SPADCALL |l| (QREFELT $ 14)) + (SEQ (LETT |l| (SPADCALL |l| (|getShellEntry| $ 14)) |URAGG-;more?;ANniB;13|) (EXIT (LETT |i| (- |i| 1) |URAGG-;more?;ANniB;13|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT (COND ((ZEROP |i|) - (SPADCALL (SPADCALL |l| (QREFELT $ 20)) - (QREFELT $ 21))) + (SPADCALL (SPADCALL |l| (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))) ('T 'NIL))))))) (DEFUN |URAGG-;size?;ANniB;14| (|l| |n| $) @@ -101,15 +116,15 @@ (SEQ G190 (COND ((NULL (COND - ((SPADCALL |l| (QREFELT $ 20)) 'NIL) + ((SPADCALL |l| (|getShellEntry| $ 20)) 'NIL) ('T (< 0 |i|)))) (GO G191))) - (SEQ (LETT |l| (SPADCALL |l| (QREFELT $ 14)) + (SEQ (LETT |l| (SPADCALL |l| (|getShellEntry| $ 14)) |URAGG-;size?;ANniB;14|) (EXIT (LETT |i| (- |i| 1) |URAGG-;size?;ANniB;14|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT (COND - ((SPADCALL |l| (QREFELT $ 20)) (ZEROP |i|)) + ((SPADCALL |l| (|getShellEntry| $ 20)) (ZEROP |i|)) ('T 'NIL))))))) (DEFUN |URAGG-;#;ANni;15| (|x| $) @@ -117,15 +132,17 @@ (RETURN (SEQ (SEQ (LETT |k| 0 |URAGG-;#;ANni;15|) G190 (COND - ((NULL (SPADCALL (SPADCALL |x| (QREFELT $ 20)) - (QREFELT $ 21))) + ((NULL (SPADCALL + (SPADCALL |x| (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))) (GO G191))) (SEQ (COND ((EQL |k| 1000) (COND - ((SPADCALL |x| (QREFELT $ 34)) + ((SPADCALL |x| (|getShellEntry| $ 34)) (EXIT (|error| "cyclic list")))))) - (EXIT (LETT |x| (SPADCALL |x| (QREFELT $ 14)) + (EXIT (LETT |x| + (SPADCALL |x| (|getShellEntry| $ 14)) |URAGG-;#;ANni;15|))) (LETT |k| (QSADD1 |k|) |URAGG-;#;ANni;15|) (GO G190) G191 (EXIT NIL)) @@ -135,62 +152,74 @@ (PROG (|k| |y|) (RETURN (SEQ (COND - ((SPADCALL |x| (QREFELT $ 20)) (|error| "empty list")) + ((SPADCALL |x| (|getShellEntry| $ 20)) + (|error| "empty list")) ('T - (SEQ (LETT |y| (SPADCALL |x| (QREFELT $ 14)) + (SEQ (LETT |y| (SPADCALL |x| (|getShellEntry| $ 14)) |URAGG-;tail;2A;16|) (SEQ (LETT |k| 0 |URAGG-;tail;2A;16|) G190 (COND ((NULL (SPADCALL - (SPADCALL |y| (QREFELT $ 20)) - (QREFELT $ 21))) + (SPADCALL |y| + (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))) (GO G191))) (SEQ (COND ((EQL |k| 1000) (COND - ((SPADCALL |x| (QREFELT $ 34)) + ((SPADCALL |x| + (|getShellEntry| $ 34)) (EXIT (|error| "cyclic list")))))) (EXIT (LETT |y| (SPADCALL (LETT |x| |y| |URAGG-;tail;2A;16|) - (QREFELT $ 14)) + (|getShellEntry| $ 14)) |URAGG-;tail;2A;16|))) (LETT |k| (QSADD1 |k|) |URAGG-;tail;2A;16|) (GO G190) G191 (EXIT NIL)) (EXIT |x|)))))))) (DEFUN |URAGG-;findCycle| (|x| $) - (PROG (#0=#:G1475 |y|) + (PROG (#0=#:G1472 |y|) (RETURN - (SEQ (EXIT (SEQ (LETT |y| (SPADCALL |x| (QREFELT $ 14)) + (SEQ (EXIT (SEQ (LETT |y| (SPADCALL |x| (|getShellEntry| $ 14)) |URAGG-;findCycle|) (SEQ G190 (COND ((NULL (SPADCALL - (SPADCALL |y| (QREFELT $ 20)) - (QREFELT $ 21))) + (SPADCALL |y| + (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))) (GO G191))) (SEQ (COND - ((SPADCALL |x| |y| (QREFELT $ 37)) + ((SPADCALL |x| |y| + (|getShellEntry| $ 37)) (PROGN (LETT #0# |x| |URAGG-;findCycle|) (GO #0#)))) - (LETT |x| (SPADCALL |x| (QREFELT $ 14)) + (LETT |x| + (SPADCALL |x| + (|getShellEntry| $ 14)) |URAGG-;findCycle|) - (LETT |y| (SPADCALL |y| (QREFELT $ 14)) + (LETT |y| + (SPADCALL |y| + (|getShellEntry| $ 14)) |URAGG-;findCycle|) (COND - ((SPADCALL |y| (QREFELT $ 20)) + ((SPADCALL |y| + (|getShellEntry| $ 20)) (PROGN (LETT #0# |y| |URAGG-;findCycle|) (GO #0#)))) (COND - ((SPADCALL |x| |y| (QREFELT $ 37)) + ((SPADCALL |x| |y| + (|getShellEntry| $ 37)) (PROGN (LETT #0# |y| |URAGG-;findCycle|) (GO #0#)))) (EXIT (LETT |y| - (SPADCALL |y| (QREFELT $ 14)) + (SPADCALL |y| + (|getShellEntry| $ 14)) |URAGG-;findCycle|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT |y|))) @@ -202,23 +231,25 @@ (SEQ (COND ((SPADCALL (LETT |y| - (LETT |x| (SPADCALL |x| (QREFELT $ 38)) + (LETT |x| (SPADCALL |x| (|getShellEntry| $ 38)) |URAGG-;cycleTail;2A;18|) |URAGG-;cycleTail;2A;18|) - (QREFELT $ 20)) + (|getShellEntry| $ 20)) |x|) ('T - (SEQ (LETT |z| (SPADCALL |x| (QREFELT $ 14)) + (SEQ (LETT |z| (SPADCALL |x| (|getShellEntry| $ 14)) |URAGG-;cycleTail;2A;18|) (SEQ G190 (COND ((NULL (SPADCALL - (SPADCALL |x| |z| (QREFELT $ 37)) - (QREFELT $ 21))) + (SPADCALL |x| |z| + (|getShellEntry| $ 37)) + (|getShellEntry| $ 21))) (GO G191))) (SEQ (LETT |y| |z| |URAGG-;cycleTail;2A;18|) (EXIT (LETT |z| - (SPADCALL |z| (QREFELT $ 14)) + (SPADCALL |z| + (|getShellEntry| $ 14)) |URAGG-;cycleTail;2A;18|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT |y|)))))))) @@ -227,23 +258,25 @@ (PROG (|l| |z| |k| |y|) (RETURN (SEQ (COND - ((SPADCALL |x| (QREFELT $ 20)) |x|) + ((SPADCALL |x| (|getShellEntry| $ 20)) |x|) ((SPADCALL (LETT |y| (|URAGG-;findCycle| |x| $) |URAGG-;cycleEntry;2A;19|) - (QREFELT $ 20)) + (|getShellEntry| $ 20)) |y|) ('T - (SEQ (LETT |z| (SPADCALL |y| (QREFELT $ 14)) + (SEQ (LETT |z| (SPADCALL |y| (|getShellEntry| $ 14)) |URAGG-;cycleEntry;2A;19|) (SEQ (LETT |l| 1 |URAGG-;cycleEntry;2A;19|) G190 (COND ((NULL (SPADCALL - (SPADCALL |y| |z| (QREFELT $ 37)) - (QREFELT $ 21))) + (SPADCALL |y| |z| + (|getShellEntry| $ 37)) + (|getShellEntry| $ 21))) (GO G191))) (SEQ (EXIT (LETT |z| - (SPADCALL |z| (QREFELT $ 14)) + (SPADCALL |z| + (|getShellEntry| $ 14)) |URAGG-;cycleEntry;2A;19|))) (LETT |l| (QSADD1 |l|) |URAGG-;cycleEntry;2A;19|) @@ -252,7 +285,8 @@ (SEQ (LETT |k| 1 |URAGG-;cycleEntry;2A;19|) G190 (COND ((QSGREATERP |k| |l|) (GO G191))) (SEQ (EXIT (LETT |y| - (SPADCALL |y| (QREFELT $ 14)) + (SPADCALL |y| + (|getShellEntry| $ 14)) |URAGG-;cycleEntry;2A;19|))) (LETT |k| (QSADD1 |k|) |URAGG-;cycleEntry;2A;19|) @@ -260,13 +294,17 @@ (SEQ G190 (COND ((NULL (SPADCALL - (SPADCALL |x| |y| (QREFELT $ 37)) - (QREFELT $ 21))) + (SPADCALL |x| |y| + (|getShellEntry| $ 37)) + (|getShellEntry| $ 21))) (GO G191))) - (SEQ (LETT |x| (SPADCALL |x| (QREFELT $ 14)) + (SEQ (LETT |x| + (SPADCALL |x| + (|getShellEntry| $ 14)) |URAGG-;cycleEntry;2A;19|) (EXIT (LETT |y| - (SPADCALL |y| (QREFELT $ 14)) + (SPADCALL |y| + (|getShellEntry| $ 14)) |URAGG-;cycleEntry;2A;19|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT |x|)))))))) @@ -275,23 +313,25 @@ (PROG (|k| |y|) (RETURN (SEQ (COND - ((OR (SPADCALL |x| (QREFELT $ 20)) + ((OR (SPADCALL |x| (|getShellEntry| $ 20)) (SPADCALL (LETT |x| (|URAGG-;findCycle| |x| $) |URAGG-;cycleLength;ANni;20|) - (QREFELT $ 20))) + (|getShellEntry| $ 20))) 0) ('T - (SEQ (LETT |y| (SPADCALL |x| (QREFELT $ 14)) + (SEQ (LETT |y| (SPADCALL |x| (|getShellEntry| $ 14)) |URAGG-;cycleLength;ANni;20|) (SEQ (LETT |k| 1 |URAGG-;cycleLength;ANni;20|) G190 (COND ((NULL (SPADCALL - (SPADCALL |x| |y| (QREFELT $ 37)) - (QREFELT $ 21))) + (SPADCALL |x| |y| + (|getShellEntry| $ 37)) + (|getShellEntry| $ 21))) (GO G191))) (SEQ (EXIT (LETT |y| - (SPADCALL |y| (QREFELT $ 14)) + (SPADCALL |y| + (|getShellEntry| $ 14)) |URAGG-;cycleLength;ANni;20|))) (LETT |k| (QSADD1 |k|) |URAGG-;cycleLength;ANni;20|) @@ -304,19 +344,21 @@ (SEQ (SEQ (LETT |i| 1 |URAGG-;rest;ANniA;21|) G190 (COND ((QSGREATERP |i| |n|) (GO G191))) (SEQ (EXIT (COND - ((SPADCALL |x| (QREFELT $ 20)) + ((SPADCALL |x| (|getShellEntry| $ 20)) (|error| "Index out of range")) ('T - (LETT |x| (SPADCALL |x| (QREFELT $ 14)) + (LETT |x| + (SPADCALL |x| + (|getShellEntry| $ 14)) |URAGG-;rest;ANniA;21|))))) (LETT |i| (QSADD1 |i|) |URAGG-;rest;ANniA;21|) (GO G190) G191 (EXIT NIL)) (EXIT |x|))))) (DEFUN |URAGG-;last;ANniA;22| (|x| |n| $) - (PROG (|m| #0=#:G1498) + (PROG (|m| #0=#:G1495) (RETURN - (SEQ (LETT |m| (SPADCALL |x| (QREFELT $ 43)) + (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 43)) |URAGG-;last;ANniA;22|) (EXIT (COND ((< |m| |n|) (|error| "index out of range")) @@ -327,69 +369,77 @@ |URAGG-;last;ANniA;22|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (QREFELT $ 44)) - (QREFELT $ 45))))))))) + (|getShellEntry| $ 44)) + (|getShellEntry| $ 45))))))))) (DEFUN |URAGG-;=;2AB;23| (|x| |y| $) - (PROG (|k| #0=#:G1508) + (PROG (|k| #0=#:G1505) (RETURN (SEQ (EXIT (COND - ((SPADCALL |x| |y| (QREFELT $ 37)) 'T) + ((SPADCALL |x| |y| (|getShellEntry| $ 37)) 'T) ('T (SEQ (SEQ (LETT |k| 0 |URAGG-;=;2AB;23|) G190 (COND ((NULL (COND - ((SPADCALL |x| (QREFELT $ 20)) + ((SPADCALL |x| + (|getShellEntry| $ 20)) 'NIL) ('T (SPADCALL (SPADCALL |y| - (QREFELT $ 20)) - (QREFELT $ 21))))) + (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))))) (GO G191))) (SEQ (COND ((EQL |k| 1000) (COND - ((SPADCALL |x| (QREFELT $ 34)) + ((SPADCALL |x| + (|getShellEntry| $ 34)) (EXIT (|error| "cyclic list")))))) - (COND - ((NULL - (SPADCALL - (SPADCALL |x| (QREFELT $ 8)) - (SPADCALL |y| (QREFELT $ 8)) - (QREFELT $ 47))) - (EXIT + (EXIT + (COND + ((SPADCALL + (SPADCALL |x| + (|getShellEntry| $ 8)) + (SPADCALL |y| + (|getShellEntry| $ 8)) + (|getShellEntry| $ 47)) (PROGN (LETT #0# 'NIL |URAGG-;=;2AB;23|) - (GO #0#))))) - (LETT |x| - (SPADCALL |x| (QREFELT $ 14)) - |URAGG-;=;2AB;23|) - (EXIT - (LETT |y| - (SPADCALL |y| (QREFELT $ 14)) - |URAGG-;=;2AB;23|))) + (GO #0#))) + ('T + (SEQ + (LETT |x| + (SPADCALL |x| + (|getShellEntry| $ 14)) + |URAGG-;=;2AB;23|) + (EXIT + (LETT |y| + (SPADCALL |y| + (|getShellEntry| $ 14)) + |URAGG-;=;2AB;23|))))))) (LETT |k| (QSADD1 |k|) |URAGG-;=;2AB;23|) (GO G190) G191 (EXIT NIL)) (EXIT (COND - ((SPADCALL |x| (QREFELT $ 20)) - (SPADCALL |y| (QREFELT $ 20))) + ((SPADCALL |x| (|getShellEntry| $ 20)) + (SPADCALL |y| (|getShellEntry| $ 20))) ('T 'NIL))))))) #0# (EXIT #0#))))) (DEFUN |URAGG-;node?;2AB;24| (|u| |v| $) - (PROG (|k| #0=#:G1513) + (PROG (|k| #0=#:G1510) (RETURN (SEQ (EXIT (SEQ (SEQ (LETT |k| 0 |URAGG-;node?;2AB;24|) G190 (COND ((NULL (SPADCALL - (SPADCALL |v| (QREFELT $ 20)) - (QREFELT $ 21))) + (SPADCALL |v| + (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))) (GO G191))) (SEQ (EXIT (COND ((SPADCALL |u| |v| - (QREFELT $ 49)) + (|getShellEntry| $ 49)) (PROGN (LETT #0# 'T |URAGG-;node?;2AB;24|) @@ -400,53 +450,54 @@ ((EQL |k| 1000) (COND ((SPADCALL |v| - (QREFELT $ 34)) + (|getShellEntry| $ 34)) (EXIT (|error| "cyclic list")))))) (EXIT (LETT |v| (SPADCALL |v| - (QREFELT $ 14)) + (|getShellEntry| $ 14)) |URAGG-;node?;2AB;24|))))))) (LETT |k| (QSADD1 |k|) |URAGG-;node?;2AB;24|) (GO G190) G191 (EXIT NIL)) - (EXIT (SPADCALL |u| |v| (QREFELT $ 49))))) + (EXIT (SPADCALL |u| |v| (|getShellEntry| $ 49))))) #0# (EXIT #0#))))) (DEFUN |URAGG-;setelt;Afirst2S;25| (|x| T3 |a| $) - (SPADCALL |x| |a| (QREFELT $ 51))) + (SPADCALL |x| |a| (|getShellEntry| $ 51))) (DEFUN |URAGG-;setelt;Alast2S;26| (|x| T4 |a| $) - (SPADCALL |x| |a| (QREFELT $ 53))) + (SPADCALL |x| |a| (|getShellEntry| $ 53))) (DEFUN |URAGG-;setelt;Arest2A;27| (|x| T5 |a| $) - (SPADCALL |x| |a| (QREFELT $ 55))) + (SPADCALL |x| |a| (|getShellEntry| $ 55))) (DEFUN |URAGG-;concat;3A;28| (|x| |y| $) - (SPADCALL (SPADCALL |x| (QREFELT $ 45)) |y| (QREFELT $ 57))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 45)) |y| + (|getShellEntry| $ 57))) (DEFUN |URAGG-;setlast!;A2S;29| (|x| |s| $) (SEQ (COND - ((SPADCALL |x| (QREFELT $ 20)) + ((SPADCALL |x| (|getShellEntry| $ 20)) (|error| "setlast: empty list")) ('T - (SEQ (SPADCALL (SPADCALL |x| (QREFELT $ 23)) |s| - (QREFELT $ 51)) + (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 23)) |s| + (|getShellEntry| $ 51)) (EXIT |s|)))))) (DEFUN |URAGG-;setchildren!;ALA;30| (|u| |lv| $) (COND ((EQL (LENGTH |lv|) 1) - (SPADCALL |u| (|SPADfirst| |lv|) (QREFELT $ 55))) + (SPADCALL |u| (|SPADfirst| |lv|) (|getShellEntry| $ 55))) ('T (|error| "wrong number of children specified")))) (DEFUN |URAGG-;setvalue!;A2S;31| (|u| |s| $) - (SPADCALL |u| |s| (QREFELT $ 51))) + (SPADCALL |u| |s| (|getShellEntry| $ 51))) (DEFUN |URAGG-;split!;AIA;32| (|p| |n| $) - (PROG (#0=#:G1524 |q|) + (PROG (#0=#:G1521 |q|) (RETURN (SEQ (COND ((< |n| 1) (|error| "index out of range")) @@ -457,12 +508,12 @@ |URAGG-;split!;AIA;32|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (QREFELT $ 44)) + (|getShellEntry| $ 44)) |URAGG-;split!;AIA;32|) - (LETT |q| (SPADCALL |p| (QREFELT $ 14)) + (LETT |q| (SPADCALL |p| (|getShellEntry| $ 14)) |URAGG-;split!;AIA;32|) - (SPADCALL |p| (SPADCALL (QREFELT $ 62)) - (QREFELT $ 55)) + (SPADCALL |p| (SPADCALL (|getShellEntry| $ 62)) + (|getShellEntry| $ 55)) (EXIT |q|)))))))) (DEFUN |URAGG-;cycleSplit!;2A;33| (|x| $) @@ -470,27 +521,29 @@ (RETURN (SEQ (COND ((OR (SPADCALL - (LETT |y| (SPADCALL |x| (QREFELT $ 38)) + (LETT |y| (SPADCALL |x| (|getShellEntry| $ 38)) |URAGG-;cycleSplit!;2A;33|) - (QREFELT $ 20)) - (SPADCALL |x| |y| (QREFELT $ 37))) + (|getShellEntry| $ 20)) + (SPADCALL |x| |y| (|getShellEntry| $ 37))) |y|) ('T - (SEQ (LETT |z| (SPADCALL |x| (QREFELT $ 14)) + (SEQ (LETT |z| (SPADCALL |x| (|getShellEntry| $ 14)) |URAGG-;cycleSplit!;2A;33|) (SEQ G190 (COND ((NULL (SPADCALL - (SPADCALL |z| |y| (QREFELT $ 37)) - (QREFELT $ 21))) + (SPADCALL |z| |y| + (|getShellEntry| $ 37)) + (|getShellEntry| $ 21))) (GO G191))) (SEQ (LETT |x| |z| |URAGG-;cycleSplit!;2A;33|) (EXIT (LETT |z| - (SPADCALL |z| (QREFELT $ 14)) + (SPADCALL |z| + (|getShellEntry| $ 14)) |URAGG-;cycleSplit!;2A;33|))) NIL (GO G190) G191 (EXIT NIL)) - (SPADCALL |x| (SPADCALL (QREFELT $ 62)) - (QREFELT $ 55)) + (SPADCALL |x| (SPADCALL (|getShellEntry| $ 62)) + (|getShellEntry| $ 55)) (EXIT |y|)))))))) (DEFUN |UnaryRecursiveAggregate&| (|#1| |#2|) @@ -502,52 +555,52 @@ (LETT |dv$2| (|devaluate| |#2|) . #0#) (LETT |dv$| (LIST '|UnaryRecursiveAggregate&| |dv$1| |dv$2|) . #0#) - (LETT $ (GETREFV 67) . #0#) - (QSETREFV $ 0 |dv$|) - (QSETREFV $ 3 + (LETT $ (|newShell| 67) . #0#) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 (LIST (|HasAttribute| |#1| '|shallowlyMutable|))) . #0#)) (|stuffDomainSlots| $) - (QSETREFV $ 6 |#1|) - (QSETREFV $ 7 |#2|) + (|setShellEntry| $ 6 |#1|) + (|setShellEntry| $ 7 |#2|) (COND ((|HasAttribute| |#1| '|finiteAggregate|) - (QSETREFV $ 46 + (|setShellEntry| $ 46 (CONS (|dispatchFunction| |URAGG-;last;ANniA;22|) $)))) (COND ((|HasCategory| |#2| '(|SetCategory|)) (PROGN - (QSETREFV $ 48 + (|setShellEntry| $ 48 (CONS (|dispatchFunction| |URAGG-;=;2AB;23|) $)) - (QSETREFV $ 50 + (|setShellEntry| $ 50 (CONS (|dispatchFunction| |URAGG-;node?;2AB;24|) $))))) (COND ((|testBitVector| |pv$| 1) (PROGN - (QSETREFV $ 52 + (|setShellEntry| $ 52 (CONS (|dispatchFunction| |URAGG-;setelt;Afirst2S;25|) $)) - (QSETREFV $ 54 + (|setShellEntry| $ 54 (CONS (|dispatchFunction| |URAGG-;setelt;Alast2S;26|) $)) - (QSETREFV $ 56 + (|setShellEntry| $ 56 (CONS (|dispatchFunction| |URAGG-;setelt;Arest2A;27|) $)) - (QSETREFV $ 58 + (|setShellEntry| $ 58 (CONS (|dispatchFunction| |URAGG-;concat;3A;28|) $)) - (QSETREFV $ 59 + (|setShellEntry| $ 59 (CONS (|dispatchFunction| |URAGG-;setlast!;A2S;29|) $)) - (QSETREFV $ 60 + (|setShellEntry| $ 60 (CONS (|dispatchFunction| |URAGG-;setchildren!;ALA;30|) $)) - (QSETREFV $ 61 + (|setShellEntry| $ 61 (CONS (|dispatchFunction| |URAGG-;setvalue!;A2S;31|) $)) - (QSETREFV $ 64 + (|setShellEntry| $ 64 (CONS (|dispatchFunction| |URAGG-;split!;AIA;32|) $)) - (QSETREFV $ 65 + (|setShellEntry| $ 65 (CONS (|dispatchFunction| |URAGG-;cycleSplit!;2A;33|) $))))) $)))) @@ -568,7 +621,7 @@ (41 . |cycleEntry|) |URAGG-;cycleTail;2A;18| |URAGG-;cycleEntry;2A;19| |URAGG-;cycleLength;ANni;20| |URAGG-;rest;ANniA;21| (46 . |#|) (51 . |rest|) - (57 . |copy|) (62 . |last|) (68 . =) (74 . =) (80 . =) + (57 . |copy|) (62 . |last|) (68 . ~=) (74 . =) (80 . =) (86 . |node?|) (92 . |setfirst!|) (98 . |setelt|) (105 . |setlast!|) (111 . |setelt|) (118 . |setrest!|) (124 . |setelt|) (131 . |concat!|) (137 . |concat|) @@ -610,3 +663,170 @@ 1 0 30 0 41 1 0 0 0 40 2 0 0 0 0 58 1 0 25 0 27 2 0 19 0 0 48 1 0 30 0 35))))) '|lookupComplete|)) + +(SETQ |$CategoryFrame| + (|put| '|UnaryRecursiveAggregate&| '|isFunctor| + '(((|split!| ($ $ (|Integer|))) T (ELT $ 64)) + ((|setelt| (|#2| $ "last" |#2|)) T (ELT $ 54)) + ((|setlast!| (|#2| $ |#2|)) T (ELT $ 59)) + ((|setelt| ($ $ "rest" $)) T (ELT $ 56)) + ((|setelt| (|#2| $ "first" |#2|)) T (ELT $ 52)) + ((|cycleSplit!| ($ $)) T (ELT $ 65)) + ((|cycleTail| ($ $)) T (ELT $ 39)) + ((|cycleLength| ((|NonNegativeInteger|) $)) T + (ELT $ 41)) + ((|cycleEntry| ($ $)) T (ELT $ 40)) + ((|third| (|#2| $)) T (ELT $ 18)) + ((|second| (|#2| $)) T (ELT $ 17)) + ((|tail| ($ $)) T (ELT $ 36)) + ((|last| ($ $ (|NonNegativeInteger|))) T (ELT $ 46)) + ((|elt| (|#2| $ "last")) T (ELT $ 13)) + ((|last| (|#2| $)) T (ELT $ 24)) + ((|rest| ($ $ (|NonNegativeInteger|))) T (ELT $ 42)) + ((|elt| ($ $ "rest")) T (ELT $ 16)) + ((|rest| ($ $)) T (ELT $ NIL)) + ((|elt| (|#2| $ "first")) T (ELT $ 10)) + ((|concat| ($ |#2| $)) T (ELT $ NIL)) + ((|concat| ($ $ $)) T (ELT $ 58)) + ((|setvalue!| (|#2| $ |#2|)) T (ELT $ 61)) + ((|setelt| (|#2| $ "value" |#2|)) T (ELT $ NIL)) + ((|setchildren!| ($ $ (|List| $))) T (ELT $ 60)) + ((|node?| ((|Boolean|) $ $)) T (ELT $ 50)) + ((|cyclic?| ((|Boolean|) $)) T (ELT $ 22)) + ((|elt| (|#2| $ "value")) T (ELT $ NIL)) + ((|value| (|#2| $)) T (ELT $ 29)) + ((|leaf?| ((|Boolean|) $)) T (ELT $ 28)) + ((|nodes| ((|List| $) $)) T (ELT $ 26)) + ((|children| ((|List| $) $)) T (ELT $ 27)) + ((= ((|Boolean|) $ $)) T (ELT $ 48)) + ((|#| ((|NonNegativeInteger|) $)) T (ELT $ 35)) + ((|size?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ 33)) + ((|more?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ 32)) + ((|less?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ 31))) + (|addModemap| '|UnaryRecursiveAggregate&| + '(|UnaryRecursiveAggregate&| |#1| |#2|) + '((CATEGORY |domain| + (SIGNATURE |split!| (|#1| |#1| (|Integer|))) + (SIGNATURE |setelt| (|#2| |#1| "last" |#2|)) + (SIGNATURE |setlast!| (|#2| |#1| |#2|)) + (SIGNATURE |setelt| (|#1| |#1| "rest" |#1|)) + (SIGNATURE |setelt| (|#2| |#1| "first" |#2|)) + (SIGNATURE |cycleSplit!| (|#1| |#1|)) + (SIGNATURE |cycleTail| (|#1| |#1|)) + (SIGNATURE |cycleLength| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |cycleEntry| (|#1| |#1|)) + (SIGNATURE |third| (|#2| |#1|)) + (SIGNATURE |second| (|#2| |#1|)) + (SIGNATURE |tail| (|#1| |#1|)) + (SIGNATURE |last| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |elt| (|#2| |#1| "last")) + (SIGNATURE |last| (|#2| |#1|)) + (SIGNATURE |rest| + (|#1| |#1| (|NonNegativeInteger|))) + (SIGNATURE |elt| (|#1| |#1| "rest")) + (SIGNATURE |rest| (|#1| |#1|)) + (SIGNATURE |elt| (|#2| |#1| "first")) + (SIGNATURE |concat| (|#1| |#2| |#1|)) + (SIGNATURE |concat| (|#1| |#1| |#1|)) + (SIGNATURE |setvalue!| (|#2| |#1| |#2|)) + (SIGNATURE |setelt| (|#2| |#1| "value" |#2|)) + (SIGNATURE |setchildren!| + (|#1| |#1| (|List| |#1|))) + (SIGNATURE |node?| ((|Boolean|) |#1| |#1|)) + (SIGNATURE |cyclic?| ((|Boolean|) |#1|)) + (SIGNATURE |elt| (|#2| |#1| "value")) + (SIGNATURE |value| (|#2| |#1|)) + (SIGNATURE |leaf?| ((|Boolean|) |#1|)) + (SIGNATURE |nodes| ((|List| |#1|) |#1|)) + (SIGNATURE |children| ((|List| |#1|) |#1|)) + (SIGNATURE = ((|Boolean|) |#1| |#1|)) + (SIGNATURE |#| ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |size?| + ((|Boolean|) |#1| (|NonNegativeInteger|))) + (SIGNATURE |more?| + ((|Boolean|) |#1| (|NonNegativeInteger|))) + (SIGNATURE |less?| + ((|Boolean|) |#1| (|NonNegativeInteger|)))) + (|UnaryRecursiveAggregate| |#2|) (|Type|)) + T '|UnaryRecursiveAggregate&| + (|put| '|UnaryRecursiveAggregate&| '|mode| + '(|Mapping| (CATEGORY |domain| + (SIGNATURE |split!| + (|#1| |#1| (|Integer|))) + (SIGNATURE |setelt| + (|#2| |#1| "last" |#2|)) + (SIGNATURE |setlast!| + (|#2| |#1| |#2|)) + (SIGNATURE |setelt| + (|#1| |#1| "rest" |#1|)) + (SIGNATURE |setelt| + (|#2| |#1| "first" |#2|)) + (SIGNATURE |cycleSplit!| + (|#1| |#1|)) + (SIGNATURE |cycleTail| + (|#1| |#1|)) + (SIGNATURE |cycleLength| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |cycleEntry| + (|#1| |#1|)) + (SIGNATURE |third| (|#2| |#1|)) + (SIGNATURE |second| (|#2| |#1|)) + (SIGNATURE |tail| (|#1| |#1|)) + (SIGNATURE |last| + (|#1| |#1| + (|NonNegativeInteger|))) + (SIGNATURE |elt| + (|#2| |#1| "last")) + (SIGNATURE |last| (|#2| |#1|)) + (SIGNATURE |rest| + (|#1| |#1| + (|NonNegativeInteger|))) + (SIGNATURE |elt| + (|#1| |#1| "rest")) + (SIGNATURE |rest| (|#1| |#1|)) + (SIGNATURE |elt| + (|#2| |#1| "first")) + (SIGNATURE |concat| + (|#1| |#2| |#1|)) + (SIGNATURE |concat| + (|#1| |#1| |#1|)) + (SIGNATURE |setvalue!| + (|#2| |#1| |#2|)) + (SIGNATURE |setelt| + (|#2| |#1| "value" |#2|)) + (SIGNATURE |setchildren!| + (|#1| |#1| (|List| |#1|))) + (SIGNATURE |node?| + ((|Boolean|) |#1| |#1|)) + (SIGNATURE |cyclic?| + ((|Boolean|) |#1|)) + (SIGNATURE |elt| + (|#2| |#1| "value")) + (SIGNATURE |value| (|#2| |#1|)) + (SIGNATURE |leaf?| + ((|Boolean|) |#1|)) + (SIGNATURE |nodes| + ((|List| |#1|) |#1|)) + (SIGNATURE |children| + ((|List| |#1|) |#1|)) + (SIGNATURE = + ((|Boolean|) |#1| |#1|)) + (SIGNATURE |#| + ((|NonNegativeInteger|) |#1|)) + (SIGNATURE |size?| + ((|Boolean|) |#1| + (|NonNegativeInteger|))) + (SIGNATURE |more?| + ((|Boolean|) |#1| + (|NonNegativeInteger|))) + (SIGNATURE |less?| + ((|Boolean|) |#1| + (|NonNegativeInteger|)))) + (|UnaryRecursiveAggregate| |#2|) + (|Type|)) + |$CategoryFrame|)))) diff --git a/src/algebra/strap/URAGG.lsp b/src/algebra/strap/URAGG.lsp index e6d16cf0..6ead382f 100644 --- a/src/algebra/strap/URAGG.lsp +++ b/src/algebra/strap/URAGG.lsp @@ -5,8 +5,8 @@ (DEFPARAMETER |UnaryRecursiveAggregate;AL| 'NIL) -(DEFUN |UnaryRecursiveAggregate| (#0=#:G1426) - (LET (#1=#:G1427) +(DEFUN |UnaryRecursiveAggregate| (#0=#:G1423) + (LET (#1=#:G1424) (COND ((SETQ #1# (|assoc| (|devaluate| #0#) |UnaryRecursiveAggregate;AL|)) @@ -19,7 +19,7 @@ #1#)))) (DEFUN |UnaryRecursiveAggregate;| (|t#1|) - (PROG (#0=#:G1425) + (PROG (#0=#:G1422) (RETURN (PROG1 (LETT #0# (|sublisV| @@ -111,3 +111,10 @@ . #1=(|UnaryRecursiveAggregate|))))) . #1#) (SETELT #0# 0 (LIST '|UnaryRecursiveAggregate| (|devaluate| |t#1|))))))) + +(SETQ |$CategoryFrame| + (|put| '|UnaryRecursiveAggregate| '|isCategory| T + (|addModemap| '|UnaryRecursiveAggregate| + '(|UnaryRecursiveAggregate| |#1|) + '((|Category|) (|Type|)) T '|UnaryRecursiveAggregate| + |$CategoryFrame|))) diff --git a/src/algebra/strap/VECTOR.lsp b/src/algebra/strap/VECTOR.lsp index 7de3d0c1..ecbc5ece 100644 --- a/src/algebra/strap/VECTOR.lsp +++ b/src/algebra/strap/VECTOR.lsp @@ -12,10 +12,10 @@ (|getShellEntry| $ 16))) (|getShellEntry| $ 18))) -(DEFUN |Vector| (#0=#:G1402) +(DEFUN |Vector| (#0=#:G1404) (PROG () (RETURN - (PROG (#1=#:G1403) + (PROG (#1=#:G1405) (RETURN (COND ((LETT #1# @@ -131,3 +131,216 @@ 13 0 19 1 0 0 7 9 1 0 7 0 15 1 3 13 0 19 1 0 0 7 8))))) '|lookupIncomplete|)) + +(SETQ |$CategoryFrame| + (|put| '|Vector| '|isFunctor| + '(((~= ((|Boolean|) $ $)) (|has| |#1| (|SetCategory|)) + (ELT $ NIL)) + ((= ((|Boolean|) $ $)) (|has| |#1| (|SetCategory|)) + (ELT $ NIL)) + ((|coerce| ((|OutputForm|) $)) + (|has| |#1| (|CoercibleTo| (|OutputForm|))) + (ELT $ NIL)) + ((|hash| ((|SingleInteger|) $)) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|latex| ((|String|) $)) (|has| |#1| (|SetCategory|)) + (ELT $ NIL)) + ((|vector| ($ (|List| |#1|))) T (ELT $ 9)) + ((|magnitude| (|#1| $)) + (AND (|has| |#1| (|RadicalCategory|)) + (|has| |#1| (|Ring|))) + (ELT $ NIL)) + ((|length| (|#1| $)) + (AND (|has| |#1| (|RadicalCategory|)) + (|has| |#1| (|Ring|))) + (ELT $ NIL)) + ((|cross| ($ $ $)) (|has| |#1| (|Ring|)) (ELT $ NIL)) + ((|outerProduct| ((|Matrix| |#1|) $ $)) + (|has| |#1| (|Ring|)) (ELT $ NIL)) + ((|dot| (|#1| $ $)) (|has| |#1| (|Ring|)) (ELT $ NIL)) + ((* ($ $ |#1|)) (|has| |#1| (|Monoid|)) (ELT $ NIL)) + ((* ($ |#1| $)) (|has| |#1| (|Monoid|)) (ELT $ NIL)) + ((* ($ (|Integer|) $)) (|has| |#1| (|AbelianGroup|)) + (ELT $ NIL)) + ((- ($ $ $)) (|has| |#1| (|AbelianGroup|)) (ELT $ NIL)) + ((- ($ $)) (|has| |#1| (|AbelianGroup|)) (ELT $ NIL)) + ((|zero| ($ (|NonNegativeInteger|))) + (|has| |#1| (|AbelianMonoid|)) (ELT $ NIL)) + ((+ ($ $ $)) (|has| |#1| (|AbelianSemiGroup|)) + (ELT $ NIL)) + ((< ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((> ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((>= ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((<= ((|Boolean|) $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|max| ($ $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|min| ($ $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|sort!| ($ $)) + (AND (|has| $ (ATTRIBUTE |shallowlyMutable|)) + (|has| |#1| (|OrderedSet|))) + (ELT $ NIL)) + ((|sort!| ($ (|Mapping| (|Boolean|) |#1| |#1|) $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|reverse!| ($ $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|copyInto!| ($ $ $ (|Integer|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|sorted?| ((|Boolean|) $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|sort| ($ $)) (|has| |#1| (|OrderedSet|)) (ELT $ NIL)) + ((|merge| ($ $ $)) (|has| |#1| (|OrderedSet|)) + (ELT $ NIL)) + ((|position| ((|Integer|) |#1| $ (|Integer|))) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|position| ((|Integer|) |#1| $)) + (|has| |#1| (|SetCategory|)) (ELT $ NIL)) + ((|position| + ((|Integer|) (|Mapping| (|Boolean|) |#1|) $)) + T (ELT $ NIL)) + ((|sorted?| + ((|Boolean|) (|Mapping| (|Boolean|) |#1| |#1|) $)) + T (ELT $ NIL)) + ((|sort| ($ (|Mapping| (|Boolean|) |#1| |#1|) $)) T + (ELT $ NIL)) + ((|reverse| ($ $)) T (ELT $ NIL)) + ((|merge| ($ (|Mapping| (|Boolean|) |#1| |#1|) $ $)) T + (ELT $ NIL)) + ((|setelt| + (|#1| $ (|UniversalSegment| (|Integer|)) |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|insert| ($ $ $ (|Integer|))) T (ELT $ NIL)) + ((|insert| ($ |#1| $ (|Integer|))) T (ELT $ NIL)) + ((|delete| ($ $ (|UniversalSegment| (|Integer|)))) T + (ELT $ NIL)) + ((|delete| ($ $ (|Integer|))) T (ELT $ NIL)) + ((|elt| ($ $ (|UniversalSegment| (|Integer|)))) T + (ELT $ NIL)) + ((|map| ($ (|Mapping| |#1| |#1| |#1|) $ $)) T + (ELT $ NIL)) + ((|concat| ($ (|List| $))) T (ELT $ NIL)) + ((|concat| ($ $ $)) T (ELT $ NIL)) + ((|concat| ($ |#1| $)) T (ELT $ NIL)) + ((|concat| ($ $ |#1|)) T (ELT $ NIL)) + ((|new| ($ (|NonNegativeInteger|) |#1|)) T (ELT $ NIL)) + ((|construct| ($ (|List| |#1|))) T (ELT $ 8)) + ((|find| ((|Union| |#1| "failed") + (|Mapping| (|Boolean|) |#1|) $)) + T (ELT $ NIL)) + ((|reduce| (|#1| (|Mapping| |#1| |#1| |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|reduce| (|#1| (|Mapping| |#1| |#1| |#1|) $ |#1|)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|remove| ($ (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|select| ($ (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|reduce| + (|#1| (|Mapping| |#1| |#1| |#1|) $ |#1| |#1|)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|remove| ($ |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|removeDuplicates| ($ $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|convert| ((|InputForm|) $)) + (|has| |#1| (|ConvertibleTo| (|InputForm|))) + (ELT $ 19)) + ((|swap!| ((|Void|) $ (|Integer|) (|Integer|))) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|fill!| ($ $ |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|first| (|#1| $)) (|has| (|Integer|) (|OrderedSet|)) + (ELT $ NIL)) + ((|minIndex| ((|Integer|) $)) + (|has| (|Integer|) (|OrderedSet|)) (ELT $ NIL)) + ((|maxIndex| ((|Integer|) $)) + (|has| (|Integer|) (|OrderedSet|)) (ELT $ NIL)) + ((|entry?| ((|Boolean|) |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|indices| ((|List| (|Integer|)) $)) T (ELT $ NIL)) + ((|index?| ((|Boolean|) (|Integer|) $)) T (ELT $ NIL)) + ((|entries| ((|List| |#1|) $)) T (ELT $ NIL)) + ((|elt| (|#1| $ (|Integer|))) T (ELT $ NIL)) + ((|elt| (|#1| $ (|Integer|) |#1|)) T (ELT $ NIL)) + ((|qelt| (|#1| $ (|Integer|))) T (ELT $ NIL)) + ((|setelt| (|#1| $ (|Integer|) |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|qsetelt!| (|#1| $ (|Integer|) |#1|)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|eval| ($ $ (|List| |#1|) (|List| |#1|))) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ |#1| |#1|)) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ (|Equation| |#1|))) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|eval| ($ $ (|List| (|Equation| |#1|)))) + (AND (|has| |#1| (|Evalable| |#1|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|member?| ((|Boolean|) |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|count| ((|NonNegativeInteger|) |#1| $)) + (AND (|has| $ (ATTRIBUTE |finiteAggregate|)) + (|has| |#1| (|SetCategory|))) + (ELT $ NIL)) + ((|members| ((|List| |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|parts| ((|List| |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ 15)) + ((|count| ((|NonNegativeInteger|) + (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|every?| ((|Boolean|) (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|any?| ((|Boolean|) (|Mapping| (|Boolean|) |#1|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|map!| ($ (|Mapping| |#1| |#1|) $)) + (|has| $ (ATTRIBUTE |shallowlyMutable|)) (ELT $ NIL)) + ((|map| ($ (|Mapping| |#1| |#1|) $)) T (ELT $ NIL)) + ((|#| ((|NonNegativeInteger|) $)) + (|has| $ (ATTRIBUTE |finiteAggregate|)) (ELT $ NIL)) + ((|sample| ($)) T (CONST $ NIL)) + ((|size?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|more?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|less?| ((|Boolean|) $ (|NonNegativeInteger|))) T + (ELT $ NIL)) + ((|empty?| ((|Boolean|) $)) T (ELT $ NIL)) + ((|empty| ($)) T (ELT $ NIL)) + ((|copy| ($ $)) T (ELT $ NIL)) + ((|eq?| ((|Boolean|) $ $)) T (ELT $ NIL))) + (|addModemap| '|Vector| '(|Vector| |#1|) + '((|Join| (|VectorCategory| |#1|) + (CATEGORY |domain| + (SIGNATURE |vector| ($ (|List| |#1|))))) + (|Type|)) + T '|Vector| + (|put| '|Vector| '|mode| + '(|Mapping| + (|Join| (|VectorCategory| |#1|) + (CATEGORY |domain| + (SIGNATURE |vector| + ($ (|List| |#1|))))) + (|Type|)) + |$CategoryFrame|)))) |