aboutsummaryrefslogtreecommitdiff
path: root/src/algebra
diff options
context:
space:
mode:
Diffstat (limited to 'src/algebra')
-rw-r--r--src/algebra/boolean.spad.pamphlet6
-rw-r--r--src/algebra/mappkg.spad.pamphlet2
-rw-r--r--src/algebra/strap/BOOLEAN.lsp16
-rw-r--r--src/algebra/strap/ES-.lsp321
-rw-r--r--src/algebra/strap/EUCDOM-.lsp167
-rw-r--r--src/algebra/strap/FFIELDC-.lsp187
-rw-r--r--src/algebra/strap/ILIST.lsp248
-rw-r--r--src/algebra/strap/INS-.lsp260
-rw-r--r--src/algebra/strap/ISTRING.lsp181
-rw-r--r--src/algebra/strap/LIST.lsp163
-rw-r--r--src/algebra/strap/LNAGG-.lsp49
-rw-r--r--src/algebra/strap/LSAGG-.lsp274
-rw-r--r--src/algebra/strap/POLYCAT-.lsp420
-rw-r--r--src/algebra/strap/PSETCAT-.lsp370
-rw-r--r--src/algebra/strap/STAGG-.lsp186
-rw-r--r--src/algebra/strap/SYMBOL.lsp198
-rw-r--r--src/algebra/strap/TSETCAT-.lsp540
-rw-r--r--src/algebra/strap/UPOLYC-.lsp214
-rw-r--r--src/algebra/strap/URAGG-.lsp251
19 files changed, 1939 insertions, 2114 deletions
diff --git a/src/algebra/boolean.spad.pamphlet b/src/algebra/boolean.spad.pamphlet
index 07e5df47..75b5b325 100644
--- a/src/algebra/boolean.spad.pamphlet
+++ b/src/algebra/boolean.spad.pamphlet
@@ -383,11 +383,11 @@ Boolean(): Join(OrderedFinite, Logic, PropositionalLogic, ConvertibleTo InputFor
true == 'T pretend %
false == NIL$Lisp
sample() == true
- not b == (b => false; true)
+ not b == NOT(b)$Lisp
_~ b == (b => false; true)
- _and(a, b) == (a => b; false)
+ _and(a, b) == AND(a,b)$Lisp
_/_\(a, b) == (a => b; false)
- _or(a, b) == (a => true; b)
+ _or(a, b) == OR(a,b)$Lisp
_\_/(a, b) == (a => true; b)
xor(a, b) == (a => nt b; b)
nor(a, b) == (a => false; nt b)
diff --git a/src/algebra/mappkg.spad.pamphlet b/src/algebra/mappkg.spad.pamphlet
index 6600874e..133f28fe 100644
--- a/src/algebra/mappkg.spad.pamphlet
+++ b/src/algebra/mappkg.spad.pamphlet
@@ -140,7 +140,7 @@ MappingPackage1(A:SetCategory): MPcat == MPdef where
fixedPoint(fll, n) ==
g0 := [(GENSYM()$Lisp):A for i in 1..n]
g1 := fll g0
- or/[EQ(e0,e1)$Lisp for e0 in g0 for e1 in g1] =>
+ or/[EQ(e0,e1)$Lisp@Boolean for e0 in g0 for e1 in g1] =>
error "All points are fixed points"
GEQNSUBSTLIST(g0, g1, g1)$Lisp
diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp
index 1e367244..d654d918 100644
--- a/src/algebra/strap/BOOLEAN.lsp
+++ b/src/algebra/strap/BOOLEAN.lsp
@@ -20,18 +20,24 @@
(DECLAIM (FTYPE (FUNCTION (|%Boolean| |%Shell|) |%Boolean|)
|BOOLEAN;not;2$;5|))
+(PUT '|BOOLEAN;not;2$;5| '|SPADreplace| 'NOT)
+
(DECLAIM (FTYPE (FUNCTION (|%Boolean| |%Shell|) |%Boolean|)
|BOOLEAN;~;2$;6|))
(DECLAIM (FTYPE (FUNCTION (|%Boolean| |%Boolean| |%Shell|) |%Boolean|)
|BOOLEAN;and;3$;7|))
+(PUT '|BOOLEAN;and;3$;7| '|SPADreplace| 'AND)
+
(DECLAIM (FTYPE (FUNCTION (|%Boolean| |%Boolean| |%Shell|) |%Boolean|)
|BOOLEAN;/\\;3$;8|))
(DECLAIM (FTYPE (FUNCTION (|%Boolean| |%Boolean| |%Shell|) |%Boolean|)
|BOOLEAN;or;3$;9|))
+(PUT '|BOOLEAN;or;3$;9| '|SPADreplace| 'OR)
+
(DECLAIM (FTYPE (FUNCTION (|%Boolean| |%Boolean| |%Shell|) |%Boolean|)
|BOOLEAN;\\/;3$;10|))
@@ -87,15 +93,19 @@
(DEFUN |BOOLEAN;false;$;4| ($) (DECLARE (IGNORE $)) NIL)
-(DEFUN |BOOLEAN;not;2$;5| (|b| $) (COND (|b| 'NIL) ('T 'T)))
+(DEFUN |BOOLEAN;not;2$;5| (|b| $) (DECLARE (IGNORE $)) (NOT |b|))
(DEFUN |BOOLEAN;~;2$;6| (|b| $) (COND (|b| 'NIL) ('T 'T)))
-(DEFUN |BOOLEAN;and;3$;7| (|a| |b| $) (COND (|a| |b|) ('T 'NIL)))
+(DEFUN |BOOLEAN;and;3$;7| (|a| |b| $)
+ (DECLARE (IGNORE $))
+ (AND |a| |b|))
(DEFUN |BOOLEAN;/\\;3$;8| (|a| |b| $) (COND (|a| |b|) ('T 'NIL)))
-(DEFUN |BOOLEAN;or;3$;9| (|a| |b| $) (COND (|a| 'T) ('T |b|)))
+(DEFUN |BOOLEAN;or;3$;9| (|a| |b| $)
+ (DECLARE (IGNORE $))
+ (OR |a| |b|))
(DEFUN |BOOLEAN;\\/;3$;10| (|a| |b| $) (COND (|a| 'T) ('T |b|)))
diff --git a/src/algebra/strap/ES-.lsp b/src/algebra/strap/ES-.lsp
index d17b7e1b..fd867a6d 100644
--- a/src/algebra/strap/ES-.lsp
+++ b/src/algebra/strap/ES-.lsp
@@ -233,31 +233,29 @@
(DEFUN |ES-;freeOf?;SSB;9| (|x| |s| $)
(PROG (#0=#:G1584 |k| #1=#:G1585)
(RETURN
- (SEQ (SPADCALL
- (SPADCALL |s|
- (PROGN
- (LETT #0# NIL |ES-;freeOf?;SSB;9|)
- (SEQ (LETT |k| NIL |ES-;freeOf?;SSB;9|)
- (LETT #1# (|ES-;listk| |x| $)
- |ES-;freeOf?;SSB;9|)
- G190
- (COND
- ((OR (ATOM #1#)
- (PROGN
- (LETT |k| (CAR #1#)
- |ES-;freeOf?;SSB;9|)
- NIL))
- (GO G191)))
- (SEQ (EXIT (LETT #0#
- (CONS
- (SPADCALL |k|
- (|getShellEntry| $ 47))
- #0#)
- |ES-;freeOf?;SSB;9|)))
- (LETT #1# (CDR #1#) |ES-;freeOf?;SSB;9|)
- (GO G190) G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 49))
- (|getShellEntry| $ 50))))))
+ (SEQ (NOT (SPADCALL |s|
+ (PROGN
+ (LETT #0# NIL |ES-;freeOf?;SSB;9|)
+ (SEQ (LETT |k| NIL |ES-;freeOf?;SSB;9|)
+ (LETT #1# (|ES-;listk| |x| $)
+ |ES-;freeOf?;SSB;9|)
+ G190
+ (COND
+ ((OR (ATOM #1#)
+ (PROGN
+ (LETT |k| (CAR #1#)
+ |ES-;freeOf?;SSB;9|)
+ NIL))
+ (GO G191)))
+ (SEQ (EXIT (LETT #0#
+ (CONS
+ (SPADCALL |k|
+ (|getShellEntry| $ 47))
+ #0#)
+ |ES-;freeOf?;SSB;9|)))
+ (LETT #1# (CDR #1#) |ES-;freeOf?;SSB;9|)
+ (GO G190) G191 (EXIT (NREVERSE0 #0#))))
+ (|getShellEntry| $ 49)))))))
(DEFUN |ES-;distribute;2S;10| (|x| $)
(PROG (#0=#:G1586 |k| #1=#:G1587)
@@ -279,7 +277,7 @@
(SEQ (EXIT (COND
((SPADCALL |k|
(|getShellEntry| $ 13)
- (|getShellEntry| $ 52))
+ (|getShellEntry| $ 51))
(LETT #0# (CONS |k| #0#)
|ES-;distribute;2S;10|)))))
(LETT #1# (CDR #1#) |ES-;distribute;2S;10|)
@@ -287,59 +285,57 @@
|x| $)))))
(DEFUN |ES-;box;LS;11| (|l| $)
- (SPADCALL (|getShellEntry| $ 14) |l| (|getShellEntry| $ 54)))
+ (SPADCALL (|getShellEntry| $ 14) |l| (|getShellEntry| $ 53)))
(DEFUN |ES-;paren;LS;12| (|l| $)
- (SPADCALL (|getShellEntry| $ 13) |l| (|getShellEntry| $ 54)))
+ (SPADCALL (|getShellEntry| $ 13) |l| (|getShellEntry| $ 53)))
(DEFUN |ES-;freeOf?;2SB;13| (|x| |k| $)
- (SPADCALL
- (SPADCALL (SPADCALL |k| (|getShellEntry| $ 57))
- (|ES-;listk| |x| $) (|getShellEntry| $ 58))
- (|getShellEntry| $ 50)))
+ (NOT (SPADCALL (SPADCALL |k| (|getShellEntry| $ 56))
+ (|ES-;listk| |x| $) (|getShellEntry| $ 57))))
(DEFUN |ES-;kernel;Bo2S;14| (|op| |arg| $)
- (SPADCALL |op| (LIST |arg|) (|getShellEntry| $ 60)))
+ (SPADCALL |op| (LIST |arg|) (|getShellEntry| $ 59)))
(DEFUN |ES-;elt;Bo2S;15| (|op| |x| $)
- (SPADCALL |op| (LIST |x|) (|getShellEntry| $ 54)))
+ (SPADCALL |op| (LIST |x|) (|getShellEntry| $ 53)))
(DEFUN |ES-;elt;Bo3S;16| (|op| |x| |y| $)
- (SPADCALL |op| (LIST |x| |y|) (|getShellEntry| $ 54)))
+ (SPADCALL |op| (LIST |x| |y|) (|getShellEntry| $ 53)))
(DEFUN |ES-;elt;Bo4S;17| (|op| |x| |y| |z| $)
- (SPADCALL |op| (LIST |x| |y| |z|) (|getShellEntry| $ 54)))
+ (SPADCALL |op| (LIST |x| |y| |z|) (|getShellEntry| $ 53)))
(DEFUN |ES-;elt;Bo5S;18| (|op| |x| |y| |z| |t| $)
- (SPADCALL |op| (LIST |x| |y| |z| |t|) (|getShellEntry| $ 54)))
+ (SPADCALL |op| (LIST |x| |y| |z| |t|) (|getShellEntry| $ 53)))
(DEFUN |ES-;eval;SSMS;19| (|x| |s| |f| $)
- (SPADCALL |x| (LIST |s|) (LIST |f|) (|getShellEntry| $ 68)))
+ (SPADCALL |x| (LIST |s|) (LIST |f|) (|getShellEntry| $ 67)))
(DEFUN |ES-;eval;SBoMS;20| (|x| |s| |f| $)
- (SPADCALL |x| (LIST (SPADCALL |s| (|getShellEntry| $ 70))) (LIST |f|)
- (|getShellEntry| $ 68)))
+ (SPADCALL |x| (LIST (SPADCALL |s| (|getShellEntry| $ 69))) (LIST |f|)
+ (|getShellEntry| $ 67)))
(DEFUN |ES-;eval;SSMS;21| (|x| |s| |f| $)
(SPADCALL |x| (LIST |s|)
(LIST (CONS #'|ES-;eval;SSMS;21!0| (VECTOR |f| $)))
- (|getShellEntry| $ 68)))
+ (|getShellEntry| $ 67)))
(DEFUN |ES-;eval;SSMS;21!0| (|#1| $$)
- (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 73))
+ (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 72))
(|getShellEntry| $$ 0)))
(DEFUN |ES-;eval;SBoMS;22| (|x| |s| |f| $)
(SPADCALL |x| (LIST |s|)
(LIST (CONS #'|ES-;eval;SBoMS;22!0| (VECTOR |f| $)))
- (|getShellEntry| $ 76)))
+ (|getShellEntry| $ 75)))
(DEFUN |ES-;eval;SBoMS;22!0| (|#1| $$)
- (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 73))
+ (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 72))
(|getShellEntry| $$ 0)))
(DEFUN |ES-;subst;SES;23| (|x| |e| $)
- (SPADCALL |x| (LIST |e|) (|getShellEntry| $ 80)))
+ (SPADCALL |x| (LIST |e|) (|getShellEntry| $ 79)))
(DEFUN |ES-;eval;SLLS;24| (|x| |ls| |lf| $)
(PROG (#0=#:G1588 |f| #1=#:G1589)
@@ -363,10 +359,10 @@
|ES-;eval;SLLS;24|)))
(LETT #1# (CDR #1#) |ES-;eval;SLLS;24|) (GO G190)
G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 76))))))
+ (|getShellEntry| $ 75))))))
(DEFUN |ES-;eval;SLLS;24!0| (|#1| $$)
- (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 73))
+ (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 72))
(|getShellEntry| $$ 0)))
(DEFUN |ES-;eval;SLLS;25| (|x| |ls| |lf| $)
@@ -391,10 +387,10 @@
|ES-;eval;SLLS;25|)))
(LETT #1# (CDR #1#) |ES-;eval;SLLS;25|) (GO G190)
G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 68))))))
+ (|getShellEntry| $ 67))))))
(DEFUN |ES-;eval;SLLS;25!0| (|#1| $$)
- (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 73))
+ (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 72))
(|getShellEntry| $$ 0)))
(DEFUN |ES-;eval;SLLS;26| (|x| |ls| |lf| $)
@@ -414,12 +410,12 @@
(SEQ (EXIT (LETT #0#
(CONS
(SPADCALL |s|
- (|getShellEntry| $ 70))
+ (|getShellEntry| $ 69))
#0#)
|ES-;eval;SLLS;26|)))
(LETT #1# (CDR #1#) |ES-;eval;SLLS;26|) (GO G190)
G191 (EXIT (NREVERSE0 #0#))))
- |lf| (|getShellEntry| $ 68))))))
+ |lf| (|getShellEntry| $ 67))))))
(DEFUN |ES-;map;MKS;27| (|fn| |k| $)
(PROG (#0=#:G1594 |x| #1=#:G1595 |l|)
@@ -432,7 +428,7 @@
(SEQ (LETT |x| NIL |ES-;map;MKS;27|)
(LETT #1#
(SPADCALL |k|
- (|getShellEntry| $ 86))
+ (|getShellEntry| $ 85))
|ES-;map;MKS;27|)
G190
(COND
@@ -449,20 +445,20 @@
(LETT #1# (CDR #1#) |ES-;map;MKS;27|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
|ES-;map;MKS;27|)
- (SPADCALL |k| (|getShellEntry| $ 86))
- (|getShellEntry| $ 87))
- (SPADCALL |k| (|getShellEntry| $ 88)))
+ (SPADCALL |k| (|getShellEntry| $ 85))
+ (|getShellEntry| $ 86))
+ (SPADCALL |k| (|getShellEntry| $ 87)))
('T
(SPADCALL (SPADCALL |k| (|getShellEntry| $ 36)) |l|
- (|getShellEntry| $ 54))))))))
+ (|getShellEntry| $ 53))))))))
(DEFUN |ES-;operator;2Bo;28| (|op| $)
(COND
((SPADCALL |op| (SPADCALL "%paren" (|getShellEntry| $ 9))
- (|getShellEntry| $ 90))
+ (|getShellEntry| $ 89))
(|getShellEntry| $ 13))
((SPADCALL |op| (SPADCALL "%box" (|getShellEntry| $ 9))
- (|getShellEntry| $ 90))
+ (|getShellEntry| $ 89))
(|getShellEntry| $ 14))
('T (|error| "Unknown operator"))))
@@ -529,24 +525,24 @@
(SPADCALL |k|
(|getShellEntry| $ 36))
"%dummyVar"
- (|getShellEntry| $ 96))
+ (|getShellEntry| $ 95))
|ES-;allKernels|)
(EXIT (COND
((QEQCAR |u| 0)
(SEQ
(LETT |arg|
(SPADCALL |k|
- (|getShellEntry| $ 86))
+ (|getShellEntry| $ 85))
|ES-;allKernels|)
(LETT |s0|
(SPADCALL
(SPADCALL
(SPADCALL |arg|
- (|getShellEntry| $ 97))
- (|getShellEntry| $ 57))
+ (|getShellEntry| $ 96))
+ (|getShellEntry| $ 56))
(|ES-;allKernels|
(|SPADfirst| |arg|) $)
- (|getShellEntry| $ 98))
+ (|getShellEntry| $ 97))
|ES-;allKernels|)
(LETT |arg| (CDR (CDR |arg|))
|ES-;allKernels|)
@@ -563,7 +559,7 @@
('T
(|ES-;allk|
(SPADCALL |k|
- (|getShellEntry| $ 86))
+ (|getShellEntry| $ 85))
$)))))
|ES-;allKernels|)
(EXIT (LETT |s|
@@ -576,7 +572,7 @@
(DEFUN |ES-;kernel;BoLS;31| (|op| |args| $)
(COND
- ((NULL (SPADCALL |op| (|getShellEntry| $ 99)))
+ ((NULL (SPADCALL |op| (|getShellEntry| $ 98)))
(|error| "Unknown operator"))
('T (|ES-;okkernel| |op| |args| $))))
@@ -602,32 +598,32 @@
(LETT #0#
(CONS
(SPADCALL |f|
- (|getShellEntry| $ 101))
+ (|getShellEntry| $ 100))
#0#)
|ES-;okkernel|)))
(LETT #1# (CDR #1#) |ES-;okkernel|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
0 (|getShellEntry| $ 45)))
- (|getShellEntry| $ 102))
- (|getShellEntry| $ 88))))))
+ (|getShellEntry| $ 101))
+ (|getShellEntry| $ 87))))))
(DEFUN |ES-;elt;BoLS;33| (|op| |args| $)
(PROG (|u| #0=#:G1521 |v|)
(RETURN
(SEQ (EXIT (COND
- ((NULL (SPADCALL |op| (|getShellEntry| $ 99)))
+ ((NULL (SPADCALL |op| (|getShellEntry| $ 98)))
(|error| "Unknown operator"))
('T
(SEQ (SEQ (LETT |u|
(SPADCALL |op|
- (|getShellEntry| $ 104))
+ (|getShellEntry| $ 103))
|ES-;elt;BoLS;33|)
(EXIT (COND
((QEQCAR |u| 0)
(COND
((SPADCALL (LENGTH |args|)
(QCDR |u|)
- (|getShellEntry| $ 105))
+ (|getShellEntry| $ 104))
(PROGN
(LETT #0#
(|error|
@@ -636,7 +632,7 @@
(GO #0#))))))))
(LETT |v|
(SPADCALL |op| |args|
- (|getShellEntry| $ 108))
+ (|getShellEntry| $ 107))
|ES-;elt;BoLS;33|)
(EXIT (COND
((QEQCAR |v| 0) (QCDR |v|))
@@ -646,50 +642,50 @@
(DEFUN |ES-;retract;SK;34| (|f| $)
(PROG (|k|)
(RETURN
- (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 110))
+ (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 109))
|ES-;retract;SK;34|)
(EXIT (COND
((OR (QEQCAR |k| 1)
(SPADCALL
(SPADCALL (QCDR |k|)
- (|getShellEntry| $ 88))
- |f| (|getShellEntry| $ 111)))
+ (|getShellEntry| $ 87))
+ |f| (|getShellEntry| $ 110)))
(|error| "not a kernel"))
('T (QCDR |k|))))))))
(DEFUN |ES-;retractIfCan;SU;35| (|f| $)
(PROG (|k|)
(RETURN
- (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 110))
+ (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 109))
|ES-;retractIfCan;SU;35|)
(EXIT (COND
((OR (QEQCAR |k| 1)
(SPADCALL
(SPADCALL (QCDR |k|)
- (|getShellEntry| $ 88))
- |f| (|getShellEntry| $ 111)))
+ (|getShellEntry| $ 87))
+ |f| (|getShellEntry| $ 110)))
(CONS 1 "failed"))
('T |k|)))))))
(DEFUN |ES-;is?;SSB;36| (|f| |s| $)
(PROG (|k|)
(RETURN
- (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 114))
+ (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 113))
|ES-;is?;SSB;36|)
(EXIT (COND
((QEQCAR |k| 1) 'NIL)
('T
- (SPADCALL (QCDR |k|) |s| (|getShellEntry| $ 115)))))))))
+ (SPADCALL (QCDR |k|) |s| (|getShellEntry| $ 114)))))))))
(DEFUN |ES-;is?;SBoB;37| (|f| |op| $)
(PROG (|k|)
(RETURN
- (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 114))
+ (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 113))
|ES-;is?;SBoB;37|)
(EXIT (COND
((QEQCAR |k| 1) 'NIL)
('T
- (SPADCALL (QCDR |k|) |op| (|getShellEntry| $ 52)))))))))
+ (SPADCALL (QCDR |k|) |op| (|getShellEntry| $ 51)))))))))
(DEFUN |ES-;unwrap| (|l| |x| $)
(PROG (|k| #0=#:G1600)
@@ -704,8 +700,8 @@
(SPADCALL |x| |k|
(|SPADfirst|
(SPADCALL |k|
- (|getShellEntry| $ 86)))
- (|getShellEntry| $ 118))
+ (|getShellEntry| $ 85)))
+ (|getShellEntry| $ 117))
|ES-;unwrap|)))
(LETT #0# (CDR #0#) |ES-;unwrap|) (GO G190) G191
(EXIT NIL))
@@ -714,7 +710,7 @@
(DEFUN |ES-;distribute;3S;39| (|x| |y| $)
(PROG (|ky| #0=#:G1601 |k| #1=#:G1602)
(RETURN
- (SEQ (LETT |ky| (SPADCALL |y| (|getShellEntry| $ 57))
+ (SEQ (LETT |ky| (SPADCALL |y| (|getShellEntry| $ 56))
|ES-;distribute;3S;39|)
(EXIT (|ES-;unwrap|
(PROGN
@@ -735,13 +731,13 @@
((SPADCALL |k|
(SPADCALL "%paren"
(|getShellEntry| $ 9))
- (|getShellEntry| $ 115))
+ (|getShellEntry| $ 114))
(SPADCALL |ky|
(|ES-;listk|
(SPADCALL |k|
- (|getShellEntry| $ 88))
+ (|getShellEntry| $ 87))
$)
- (|getShellEntry| $ 58)))
+ (|getShellEntry| $ 57)))
('T 'NIL))
(LETT #0# (CONS |k| #0#)
|ES-;distribute;3S;39|)))))
@@ -754,14 +750,14 @@
(RETURN
(SEQ (LETT |rec| (|ES-;mkKerLists| |leq| $) |ES-;eval;SLS;40|)
(EXIT (SPADCALL |f| (QCAR |rec|) (QCDR |rec|)
- (|getShellEntry| $ 120)))))))
+ (|getShellEntry| $ 119)))))))
(DEFUN |ES-;subst;SLS;41| (|f| |leq| $)
(PROG (|rec|)
(RETURN
(SEQ (LETT |rec| (|ES-;mkKerLists| |leq| $) |ES-;subst;SLS;41|)
(EXIT (SPADCALL |f| (QCAR |rec|) (QCDR |rec|)
- (|getShellEntry| $ 122)))))))
+ (|getShellEntry| $ 121)))))))
(DEFUN |ES-;mkKerLists| (|leq| $)
(PROG (|eq| #0=#:G1603 |k| |lk| |lv|)
@@ -778,35 +774,35 @@
(GO G191)))
(SEQ (LETT |k|
(SPADCALL
- (SPADCALL |eq| (|getShellEntry| $ 125))
- (|getShellEntry| $ 114))
+ (SPADCALL |eq| (|getShellEntry| $ 124))
+ (|getShellEntry| $ 113))
|ES-;mkKerLists|)
(EXIT (COND
((QEQCAR |k| 1)
(|error| "left hand side must be a single kernel"))
((NULL (SPADCALL (QCDR |k|) |lk|
- (|getShellEntry| $ 58)))
+ (|getShellEntry| $ 57)))
(SEQ (LETT |lk| (CONS (QCDR |k|) |lk|)
|ES-;mkKerLists|)
(EXIT
(LETT |lv|
(CONS
(SPADCALL |eq|
- (|getShellEntry| $ 126))
+ (|getShellEntry| $ 125))
|lv|)
|ES-;mkKerLists|)))))))
(LETT #0# (CDR #0#) |ES-;mkKerLists|) (GO G190) G191
(EXIT NIL))
(EXIT (CONS |lk| |lv|))))))
-(DEFUN |ES-;even?;SB;43| (|x| $) (|ES-;intpred?| |x| (ELT $ 128) $))
+(DEFUN |ES-;even?;SB;43| (|x| $) (|ES-;intpred?| |x| (ELT $ 127) $))
-(DEFUN |ES-;odd?;SB;44| (|x| $) (|ES-;intpred?| |x| (ELT $ 130) $))
+(DEFUN |ES-;odd?;SB;44| (|x| $) (|ES-;intpred?| |x| (ELT $ 129) $))
(DEFUN |ES-;intpred?| (|x| |pred?| $)
(PROG (|u|)
(RETURN
- (SEQ (LETT |u| (SPADCALL |x| (|getShellEntry| $ 133))
+ (SEQ (LETT |u| (SPADCALL |x| (|getShellEntry| $ 132))
|ES-;intpred?|)
(EXIT (COND
((QEQCAR |u| 0) (SPADCALL (QCDR |u|) |pred?|))
@@ -818,7 +814,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|ExpressionSpace&|))
(LETT |dv$| (LIST '|ExpressionSpace&| |dv$1|) . #0#)
- (LETT $ (|newShell| 134) . #0#)
+ (LETT $ (|newShell| 133) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -837,9 +833,9 @@
(COND
((|testBitVector| |pv$| 1)
(PROGN
- (|setShellEntry| $ 129
+ (|setShellEntry| $ 128
(CONS (|dispatchFunction| |ES-;even?;SB;43|) $))
- (|setShellEntry| $ 131
+ (|setShellEntry| $ 130
(CONS (|dispatchFunction| |ES-;odd?;SB;44|) $)))))
$))))
@@ -857,80 +853,79 @@
(|NonNegativeInteger|) (64 . |height|) (69 . |max|)
(|Mapping| 40 40 40) (|List| 40) (75 . |reduce|)
|ES-;height;SNni;8| (82 . |name|) (|List| 8)
- (87 . |member?|) (93 . |not|) |ES-;freeOf?;SSB;9|
- (98 . |is?|) |ES-;distribute;2S;10| (104 . |elt|)
- |ES-;box;LS;11| |ES-;paren;LS;12| (110 . |retract|)
- (115 . |member?|) |ES-;freeOf?;2SB;13| (121 . |kernel|)
- |ES-;kernel;Bo2S;14| |ES-;elt;Bo2S;15| |ES-;elt;Bo3S;16|
- |ES-;elt;Bo4S;17| |ES-;elt;Bo5S;18| (|Mapping| $ 15)
- (|List| 66) (127 . |eval|) |ES-;eval;SSMS;19|
- (134 . |name|) |ES-;eval;SBoMS;20| (|List| 6)
- (139 . |first|) (|Mapping| $ $) |ES-;eval;SSMS;21|
- (144 . |eval|) |ES-;eval;SBoMS;22| (|Equation| $)
- (|List| 78) (151 . |subst|) |ES-;subst;SES;23| (|List| 74)
+ (87 . |member?|) |ES-;freeOf?;SSB;9| (93 . |is?|)
+ |ES-;distribute;2S;10| (99 . |elt|) |ES-;box;LS;11|
+ |ES-;paren;LS;12| (105 . |retract|) (110 . |member?|)
+ |ES-;freeOf?;2SB;13| (116 . |kernel|) |ES-;kernel;Bo2S;14|
+ |ES-;elt;Bo2S;15| |ES-;elt;Bo3S;16| |ES-;elt;Bo4S;17|
+ |ES-;elt;Bo5S;18| (|Mapping| $ 15) (|List| 65)
+ (122 . |eval|) |ES-;eval;SSMS;19| (129 . |name|)
+ |ES-;eval;SBoMS;20| (|List| 6) (134 . |first|)
+ (|Mapping| $ $) |ES-;eval;SSMS;21| (139 . |eval|)
+ |ES-;eval;SBoMS;22| (|Equation| $) (|List| 77)
+ (146 . |subst|) |ES-;subst;SES;23| (|List| 73)
|ES-;eval;SLLS;24| |ES-;eval;SLLS;25| |ES-;eval;SLLS;26|
- (157 . |argument|) (162 . =) (168 . |coerce|)
- |ES-;map;MKS;27| (173 . |is?|) |ES-;operator;2Bo;28|
+ (152 . |argument|) (157 . =) (163 . |coerce|)
+ |ES-;map;MKS;27| (168 . |is?|) |ES-;operator;2Bo;28|
(|Union| 28 '"failed") |ES-;mainKernel;SU;29| (|None|)
- (|Union| 94 '"failed") (179 . |property|) (185 . |second|)
- (190 . |remove!|) (196 . |belong?|) |ES-;kernel;BoLS;31|
- (201 . |height|) (206 . |kernel|) (|Union| 40 '"failed")
- (213 . |arity|) (218 . ~=) (|Union| 6 '"failed")
- (|BasicOperatorFunctions1| 6) (224 . |evaluate|)
- |ES-;elt;BoLS;33| (230 . |mainKernel|) (235 . ~=)
+ (|Union| 93 '"failed") (174 . |property|) (180 . |second|)
+ (185 . |remove!|) (191 . |belong?|) |ES-;kernel;BoLS;31|
+ (196 . |height|) (201 . |kernel|) (|Union| 40 '"failed")
+ (208 . |arity|) (213 . ~=) (|Union| 6 '"failed")
+ (|BasicOperatorFunctions1| 6) (219 . |evaluate|)
+ |ES-;elt;BoLS;33| (225 . |mainKernel|) (230 . ~=)
|ES-;retract;SK;34| |ES-;retractIfCan;SU;35|
- (241 . |retractIfCan|) (246 . |is?|) |ES-;is?;SSB;36|
- |ES-;is?;SBoB;37| (252 . |eval|) |ES-;distribute;3S;39|
- (259 . |eval|) |ES-;eval;SLS;40| (266 . |subst|)
- |ES-;subst;SLS;41| (|Equation| 6) (273 . |lhs|)
- (278 . |rhs|) (|Integer|) (283 . |even?|) (288 . |even?|)
- (293 . |odd?|) (298 . |odd?|) (|Union| 127 '"failed")
- (303 . |retractIfCan|))
- '#(|tower| 308 |subst| 313 |retractIfCan| 325 |retract| 330
- |paren| 335 |operators| 345 |operator| 350 |odd?| 355
- |map| 360 |mainKernel| 366 |kernel| 371 |is?| 383 |height|
- 395 |freeOf?| 400 |even?| 412 |eval| 417 |elt| 472
- |distribute| 508 |box| 519 |belong?| 529)
+ (236 . |retractIfCan|) (241 . |is?|) |ES-;is?;SSB;36|
+ |ES-;is?;SBoB;37| (247 . |eval|) |ES-;distribute;3S;39|
+ (254 . |eval|) |ES-;eval;SLS;40| (261 . |subst|)
+ |ES-;subst;SLS;41| (|Equation| 6) (268 . |lhs|)
+ (273 . |rhs|) (|Integer|) (278 . |even?|) (283 . |even?|)
+ (288 . |odd?|) (293 . |odd?|) (|Union| 126 '"failed")
+ (298 . |retractIfCan|))
+ '#(|tower| 303 |subst| 308 |retractIfCan| 320 |retract| 325
+ |paren| 330 |operators| 340 |operator| 345 |odd?| 350
+ |map| 355 |mainKernel| 361 |kernel| 366 |is?| 378 |height|
+ 390 |freeOf?| 395 |even?| 407 |eval| 412 |elt| 467
+ |distribute| 503 |box| 514 |belong?| 524)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 133
+ (|makeByteWordVec2| 132
'(1 8 0 7 9 1 11 10 8 12 1 6 0 15 16 1
6 0 15 18 2 10 20 0 0 21 1 25 24 0 26
1 24 0 0 27 1 25 0 24 31 2 25 0 0 0
32 3 34 25 33 0 25 35 1 23 10 0 36 1
6 29 0 39 1 23 40 0 41 2 40 0 0 0 42
3 44 40 43 0 40 45 1 23 8 0 47 2 48
- 20 8 0 49 1 20 0 0 50 2 23 20 0 10 52
- 2 6 0 10 15 54 1 6 28 0 57 2 24 20 23
- 0 58 2 6 0 10 15 60 3 6 0 0 48 67 68
- 1 10 8 0 70 1 72 6 0 73 3 6 0 0 37 67
- 76 2 6 0 0 79 80 1 23 72 0 86 2 72 20
- 0 0 87 1 6 0 28 88 2 10 20 0 8 90 2
- 10 95 0 7 96 1 72 6 0 97 2 25 0 23 0
- 98 1 6 20 10 99 1 6 40 0 101 3 23 0
- 10 72 40 102 1 10 103 0 104 2 40 20 0
- 0 105 2 107 106 10 72 108 1 6 92 0
- 110 2 6 20 0 0 111 1 6 92 0 114 2 23
- 20 0 8 115 3 6 0 0 28 0 118 3 6 0 0
- 29 15 120 3 6 0 0 29 15 122 1 124 6 0
- 125 1 124 6 0 126 1 127 20 0 128 1 0
- 20 0 129 1 127 20 0 130 1 0 20 0 131
- 1 6 132 0 133 1 0 29 0 30 2 0 0 0 79
- 123 2 0 0 0 78 81 1 0 92 0 113 1 0 28
- 0 112 1 0 0 0 19 1 0 0 15 56 1 0 37 0
- 38 1 0 10 10 91 1 0 20 0 131 2 0 0 74
- 28 89 1 0 92 0 93 2 0 0 10 15 100 2 0
- 0 10 0 61 2 0 20 0 8 116 2 0 20 0 10
- 117 1 0 40 0 46 2 0 20 0 8 51 2 0 20
- 0 0 59 1 0 20 0 129 3 0 0 0 10 74 77
- 3 0 0 0 37 67 85 3 0 0 0 10 66 71 3 0
- 0 0 37 82 83 3 0 0 0 8 66 69 3 0 0 0
- 8 74 75 3 0 0 0 48 82 84 2 0 0 0 79
- 121 2 0 0 10 15 109 5 0 0 10 0 0 0 0
- 65 3 0 0 10 0 0 63 4 0 0 10 0 0 0 64
- 2 0 0 10 0 62 2 0 0 0 0 119 1 0 0 0
- 53 1 0 0 15 55 1 0 0 0 17 1 0 20 10
- 22)))))
+ 20 8 0 49 2 23 20 0 10 51 2 6 0 10 15
+ 53 1 6 28 0 56 2 24 20 23 0 57 2 6 0
+ 10 15 59 3 6 0 0 48 66 67 1 10 8 0 69
+ 1 71 6 0 72 3 6 0 0 37 66 75 2 6 0 0
+ 78 79 1 23 71 0 85 2 71 20 0 0 86 1 6
+ 0 28 87 2 10 20 0 8 89 2 10 94 0 7 95
+ 1 71 6 0 96 2 25 0 23 0 97 1 6 20 10
+ 98 1 6 40 0 100 3 23 0 10 71 40 101 1
+ 10 102 0 103 2 40 20 0 0 104 2 106
+ 105 10 71 107 1 6 91 0 109 2 6 20 0 0
+ 110 1 6 91 0 113 2 23 20 0 8 114 3 6
+ 0 0 28 0 117 3 6 0 0 29 15 119 3 6 0
+ 0 29 15 121 1 123 6 0 124 1 123 6 0
+ 125 1 126 20 0 127 1 0 20 0 128 1 126
+ 20 0 129 1 0 20 0 130 1 6 131 0 132 1
+ 0 29 0 30 2 0 0 0 78 122 2 0 0 0 77
+ 80 1 0 91 0 112 1 0 28 0 111 1 0 0 0
+ 19 1 0 0 15 55 1 0 37 0 38 1 0 10 10
+ 90 1 0 20 0 130 2 0 0 73 28 88 1 0 91
+ 0 92 2 0 0 10 15 99 2 0 0 10 0 60 2 0
+ 20 0 8 115 2 0 20 0 10 116 1 0 40 0
+ 46 2 0 20 0 8 50 2 0 20 0 0 58 1 0 20
+ 0 128 3 0 0 0 10 73 76 3 0 0 0 37 66
+ 84 3 0 0 0 10 65 70 3 0 0 0 37 81 82
+ 3 0 0 0 8 65 68 3 0 0 0 8 73 74 3 0 0
+ 0 48 81 83 2 0 0 0 78 120 2 0 0 10 15
+ 108 5 0 0 10 0 0 0 0 64 3 0 0 10 0 0
+ 62 4 0 0 10 0 0 0 63 2 0 0 10 0 61 2
+ 0 0 0 0 118 1 0 0 0 52 1 0 0 15 54 1
+ 0 0 0 17 1 0 20 10 22)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/EUCDOM-.lsp b/src/algebra/strap/EUCDOM-.lsp
index 405da119..7c83b999 100644
--- a/src/algebra/strap/EUCDOM-.lsp
+++ b/src/algebra/strap/EUCDOM-.lsp
@@ -72,13 +72,12 @@
|EUCDOM-;gcd;3S;5|)
(SEQ G190
(COND
- ((NULL (SPADCALL (SPADCALL |y| (|getShellEntry| $ 8))
- (|getShellEntry| $ 19)))
+ ((NULL (NOT (SPADCALL |y| (|getShellEntry| $ 8))))
(GO G191)))
(SEQ (PROGN
(LETT |#G13| |y| |EUCDOM-;gcd;3S;5|)
(LETT |#G14|
- (SPADCALL |x| |y| (|getShellEntry| $ 20))
+ (SPADCALL |x| |y| (|getShellEntry| $ 19))
|EUCDOM-;gcd;3S;5|)
(LETT |x| |#G13| |EUCDOM-;gcd;3S;5|)
(LETT |y| |#G14| |EUCDOM-;gcd;3S;5|))
@@ -93,7 +92,7 @@
(RETURN
(SEQ (PROGN
(LETT |#G16|
- (SPADCALL (QVELT |s| 2) (|getShellEntry| $ 23))
+ (SPADCALL (QVELT |s| 2) (|getShellEntry| $ 22))
|EUCDOM-;unitNormalizeIdealElt|)
(LETT |u| (QVELT |#G16| 0)
|EUCDOM-;unitNormalizeIdealElt|)
@@ -103,14 +102,14 @@
|EUCDOM-;unitNormalizeIdealElt|)
|#G16|)
(EXIT (COND
- ((SPADCALL |a| (|spadConstant| $ 24)
- (|getShellEntry| $ 25))
+ ((SPADCALL |a| (|spadConstant| $ 23)
+ (|getShellEntry| $ 24))
|s|)
('T
(VECTOR (SPADCALL |a| (QVELT |s| 0)
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
(SPADCALL |a| (QVELT |s| 1)
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
|c|))))))))
(DEFUN |EUCDOM-;extendedEuclidean;2SR;7| (|x| |y| $)
@@ -118,14 +117,14 @@
(RETURN
(SEQ (LETT |s1|
(|EUCDOM-;unitNormalizeIdealElt|
- (VECTOR (|spadConstant| $ 24)
- (|spadConstant| $ 27) |x|)
+ (VECTOR (|spadConstant| $ 23)
+ (|spadConstant| $ 26) |x|)
$)
|EUCDOM-;extendedEuclidean;2SR;7|)
(LETT |s2|
(|EUCDOM-;unitNormalizeIdealElt|
- (VECTOR (|spadConstant| $ 27)
- (|spadConstant| $ 24) |y|)
+ (VECTOR (|spadConstant| $ 26)
+ (|spadConstant| $ 23) |y|)
$)
|EUCDOM-;extendedEuclidean;2SR;7|)
(EXIT (COND
@@ -134,10 +133,9 @@
('T
(SEQ (SEQ G190
(COND
- ((NULL (SPADCALL
+ ((NULL (NOT
(SPADCALL (QVELT |s2| 2)
- (|getShellEntry| $ 8))
- (|getShellEntry| $ 19)))
+ (|getShellEntry| $ 8))))
(GO G191)))
(SEQ (LETT |qr|
(SPADCALL (QVELT |s1| 2)
@@ -149,13 +147,13 @@
(SPADCALL (QVELT |s1| 0)
(SPADCALL (QCAR |qr|)
(QVELT |s2| 0)
- (|getShellEntry| $ 26))
- (|getShellEntry| $ 28))
+ (|getShellEntry| $ 25))
+ (|getShellEntry| $ 27))
(SPADCALL (QVELT |s1| 1)
(SPADCALL (QCAR |qr|)
(QVELT |s2| 1)
- (|getShellEntry| $ 26))
- (|getShellEntry| $ 28))
+ (|getShellEntry| $ 25))
+ (|getShellEntry| $ 27))
(QCDR |qr|))
|EUCDOM-;extendedEuclidean;2SR;7|)
(LETT |s1| |s2|
@@ -171,7 +169,7 @@
(|getShellEntry| $ 8)))
(COND
((NULL (SPADCALL (QVELT |s1| 0) |y|
- (|getShellEntry| $ 29)))
+ (|getShellEntry| $ 28)))
(SEQ (LETT |qr|
(SPADCALL (QVELT |s1| 0) |y|
(|getShellEntry| $ 13))
@@ -180,8 +178,8 @@
(QSETVELT |s1| 1
(SPADCALL (QVELT |s1| 1)
(SPADCALL (QCAR |qr|) |x|
- (|getShellEntry| $ 26))
- (|getShellEntry| $ 30)))
+ (|getShellEntry| $ 25))
+ (|getShellEntry| $ 29)))
(EXIT
(LETT |s1|
(|EUCDOM-;unitNormalizeIdealElt|
@@ -195,13 +193,13 @@
(SEQ (COND
((SPADCALL |z| (|getShellEntry| $ 8))
(CONS 0
- (CONS (|spadConstant| $ 27) (|spadConstant| $ 27))))
+ (CONS (|spadConstant| $ 26) (|spadConstant| $ 26))))
('T
- (SEQ (LETT |s| (SPADCALL |x| |y| (|getShellEntry| $ 33))
+ (SEQ (LETT |s| (SPADCALL |x| |y| (|getShellEntry| $ 32))
|EUCDOM-;extendedEuclidean;3SU;8|)
(LETT |w|
(SPADCALL |z| (QVELT |s| 2)
- (|getShellEntry| $ 34))
+ (|getShellEntry| $ 33))
|EUCDOM-;extendedEuclidean;3SU;8|)
(EXIT (COND
((QEQCAR |w| 1) (CONS 1 "failed"))
@@ -209,16 +207,16 @@
(CONS 0
(CONS (SPADCALL (QVELT |s| 0)
(QCDR |w|)
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
(SPADCALL (QVELT |s| 1)
(QCDR |w|)
- (|getShellEntry| $ 26)))))
+ (|getShellEntry| $ 25)))))
('T
(SEQ (LETT |qr|
(SPADCALL
(SPADCALL (QVELT |s| 0)
(QCDR |w|)
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
|y| (|getShellEntry| $ 13))
|EUCDOM-;extendedEuclidean;3SU;8|)
(EXIT (CONS 0
@@ -226,38 +224,38 @@
(SPADCALL
(SPADCALL (QVELT |s| 1)
(QCDR |w|)
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
(SPADCALL (QCAR |qr|) |x|
- (|getShellEntry| $ 26))
- (|getShellEntry| $ 30))))))))))))))))
+ (|getShellEntry| $ 25))
+ (|getShellEntry| $ 29))))))))))))))))
(DEFUN |EUCDOM-;principalIdeal;LR;9| (|l| $)
(PROG (|uca| |v| |u| #0=#:G1515 |vv| #1=#:G1516)
(RETURN
(SEQ (COND
- ((SPADCALL |l| NIL (|getShellEntry| $ 39))
+ ((SPADCALL |l| NIL (|getShellEntry| $ 38))
(|error| "empty list passed to principalIdeal"))
- ((SPADCALL (CDR |l|) NIL (|getShellEntry| $ 39))
+ ((SPADCALL (CDR |l|) NIL (|getShellEntry| $ 38))
(SEQ (LETT |uca|
(SPADCALL (|SPADfirst| |l|)
- (|getShellEntry| $ 23))
+ (|getShellEntry| $ 22))
|EUCDOM-;principalIdeal;LR;9|)
(EXIT (CONS (LIST (QVELT |uca| 0)) (QVELT |uca| 1)))))
- ((SPADCALL (CDR (CDR |l|)) NIL (|getShellEntry| $ 39))
+ ((SPADCALL (CDR (CDR |l|)) NIL (|getShellEntry| $ 38))
(SEQ (LETT |u|
(SPADCALL (|SPADfirst| |l|)
- (SPADCALL |l| (|getShellEntry| $ 40))
- (|getShellEntry| $ 33))
+ (SPADCALL |l| (|getShellEntry| $ 39))
+ (|getShellEntry| $ 32))
|EUCDOM-;principalIdeal;LR;9|)
(EXIT (CONS (LIST (QVELT |u| 0) (QVELT |u| 1))
(QVELT |u| 2)))))
('T
(SEQ (LETT |v|
- (SPADCALL (CDR |l|) (|getShellEntry| $ 43))
+ (SPADCALL (CDR |l|) (|getShellEntry| $ 42))
|EUCDOM-;principalIdeal;LR;9|)
(LETT |u|
(SPADCALL (|SPADfirst| |l|) (QCDR |v|)
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 32))
|EUCDOM-;principalIdeal;LR;9|)
(EXIT (CONS (CONS (QVELT |u| 0)
(PROGN
@@ -282,7 +280,7 @@
(CONS
(SPADCALL (QVELT |u| 1)
|vv|
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
#0#)
|EUCDOM-;principalIdeal;LR;9|)))
(LETT #1# (CDR #1#)
@@ -295,8 +293,8 @@
(PROG (#0=#:G1517 #1=#:G1518 |pid| |q| #2=#:G1519 |v| #3=#:G1520)
(RETURN
(SEQ (COND
- ((SPADCALL |z| (|spadConstant| $ 27)
- (|getShellEntry| $ 25))
+ ((SPADCALL |z| (|spadConstant| $ 26)
+ (|getShellEntry| $ 24))
(CONS 0
(PROGN
(LETT #0# NIL
@@ -314,17 +312,17 @@
NIL))
(GO G191)))
(SEQ (EXIT (LETT #0#
- (CONS (|spadConstant| $ 27) #0#)
+ (CONS (|spadConstant| $ 26) #0#)
|EUCDOM-;expressIdealMember;LSU;10|)))
(LETT #1# (CDR #1#)
|EUCDOM-;expressIdealMember;LSU;10|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))))
('T
- (SEQ (LETT |pid| (SPADCALL |l| (|getShellEntry| $ 43))
+ (SEQ (LETT |pid| (SPADCALL |l| (|getShellEntry| $ 42))
|EUCDOM-;expressIdealMember;LSU;10|)
(LETT |q|
(SPADCALL |z| (QCDR |pid|)
- (|getShellEntry| $ 34))
+ (|getShellEntry| $ 33))
|EUCDOM-;expressIdealMember;LSU;10|)
(EXIT (COND
((QEQCAR |q| 1) (CONS 1 "failed"))
@@ -351,7 +349,7 @@
(LETT #2#
(CONS
(SPADCALL (QCDR |q|) |v|
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
#2#)
|EUCDOM-;expressIdealMember;LSU;10|)))
(LETT #3# (CDR #3#)
@@ -371,11 +369,11 @@
((EQL |n| 1) (CONS 0 (LIST |z|)))
('T
(SEQ (LETT |l1|
- (SPADCALL |l| (|getShellEntry| $ 47))
+ (SPADCALL |l| (|getShellEntry| $ 46))
|EUCDOM-;multiEuclidean;LSU;11|)
(LETT |l2|
(SPADCALL |l1| (QUOTIENT2 |n| 2)
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 48))
|EUCDOM-;multiEuclidean;LSU;11|)
(LETT |u|
(SPADCALL
@@ -404,7 +402,7 @@
(#4#
(LETT #3#
(SPADCALL #3# #2#
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
|EUCDOM-;multiEuclidean;LSU;11|))
('T
(PROGN
@@ -417,7 +415,7 @@
(GO G190) G191 (EXIT NIL))
(COND
(#4# #3#)
- ('T (|spadConstant| $ 24))))
+ ('T (|spadConstant| $ 23))))
(PROGN
(LETT #9# NIL
|EUCDOM-;multiEuclidean;LSU;11|)
@@ -443,7 +441,7 @@
(#9#
(LETT #8#
(SPADCALL #8# #7#
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
|EUCDOM-;multiEuclidean;LSU;11|))
('T
(PROGN
@@ -456,8 +454,8 @@
(GO G190) G191 (EXIT NIL))
(COND
(#9# #8#)
- ('T (|spadConstant| $ 24))))
- |z| (|getShellEntry| $ 50))
+ ('T (|spadConstant| $ 23))))
+ |z| (|getShellEntry| $ 49))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT (COND
((QEQCAR |u| 1) (CONS 1 "failed"))
@@ -465,7 +463,7 @@
(SEQ (LETT |v1|
(SPADCALL |l1|
(QCDR (QCDR |u|))
- (|getShellEntry| $ 51))
+ (|getShellEntry| $ 50))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT
(COND
@@ -476,7 +474,7 @@
(LETT |v2|
(SPADCALL |l2|
(QCAR (QCDR |u|))
- (|getShellEntry| $ 51))
+ (|getShellEntry| $ 50))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT
(COND
@@ -487,7 +485,7 @@
(SPADCALL (QCDR |v1|)
(QCDR |v2|)
(|getShellEntry| $
- 52))))))))))))))))))))))
+ 51))))))))))))))))))))))
(DEFUN |EuclideanDomain&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -495,7 +493,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|EuclideanDomain&|))
(LETT |dv$| (LIST '|EuclideanDomain&| |dv$1|) . #0#)
- (LETT $ (|newShell| 54) . #0#)
+ (LETT $ (|newShell| 53) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -510,43 +508,42 @@
(|Record| (|:| |quotient| $) (|:| |remainder| $))
(10 . |divide|) |EUCDOM-;quo;3S;2| |EUCDOM-;rem;3S;3|
(|Union| $ '"failed") |EUCDOM-;exquo;2SU;4|
- (16 . |unitCanonical|) (21 . |not|) (26 . |rem|)
- |EUCDOM-;gcd;3S;5|
+ (16 . |unitCanonical|) (21 . |rem|) |EUCDOM-;gcd;3S;5|
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $))
- (32 . |unitNormal|) (37 . |One|) (41 . =) (47 . *)
- (53 . |Zero|) (57 . -) (63 . |sizeLess?|) (69 . +)
+ (27 . |unitNormal|) (32 . |One|) (36 . =) (42 . *)
+ (48 . |Zero|) (52 . -) (58 . |sizeLess?|) (64 . +)
(|Record| (|:| |coef1| $) (|:| |coef2| $)
(|:| |generator| $))
|EUCDOM-;extendedEuclidean;2SR;7|
- (75 . |extendedEuclidean|) (81 . |exquo|)
+ (70 . |extendedEuclidean|) (76 . |exquo|)
(|Record| (|:| |coef1| $) (|:| |coef2| $))
- (|Union| 35 '"failed") |EUCDOM-;extendedEuclidean;3SU;8|
- (|List| 6) (87 . =) (93 . |second|) (|List| $)
- (|Record| (|:| |coef| 41) (|:| |generator| $))
- (98 . |principalIdeal|) |EUCDOM-;principalIdeal;LR;9|
- (|Union| 41 '"failed") |EUCDOM-;expressIdealMember;LSU;10|
- (103 . |copy|) (|Integer|) (108 . |split!|)
- (114 . |extendedEuclidean|) (121 . |multiEuclidean|)
- (127 . |concat|) |EUCDOM-;multiEuclidean;LSU;11|)
- '#(|sizeLess?| 133 |rem| 139 |quo| 145 |principalIdeal| 151
- |multiEuclidean| 156 |gcd| 162 |extendedEuclidean| 168
- |exquo| 181 |expressIdealMember| 187)
+ (|Union| 34 '"failed") |EUCDOM-;extendedEuclidean;3SU;8|
+ (|List| 6) (82 . =) (88 . |second|) (|List| $)
+ (|Record| (|:| |coef| 40) (|:| |generator| $))
+ (93 . |principalIdeal|) |EUCDOM-;principalIdeal;LR;9|
+ (|Union| 40 '"failed") |EUCDOM-;expressIdealMember;LSU;10|
+ (98 . |copy|) (|Integer|) (103 . |split!|)
+ (109 . |extendedEuclidean|) (116 . |multiEuclidean|)
+ (122 . |concat|) |EUCDOM-;multiEuclidean;LSU;11|)
+ '#(|sizeLess?| 128 |rem| 134 |quo| 140 |principalIdeal| 146
+ |multiEuclidean| 151 |gcd| 157 |extendedEuclidean| 163
+ |exquo| 176 |expressIdealMember| 182)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 53
+ (|makeByteWordVec2| 52
'(1 6 7 0 8 1 6 9 0 10 2 6 12 0 0 13 1
- 6 0 0 18 1 7 0 0 19 2 6 0 0 0 20 1 6
- 22 0 23 0 6 0 24 2 6 7 0 0 25 2 6 0 0
- 0 26 0 6 0 27 2 6 0 0 0 28 2 6 7 0 0
- 29 2 6 0 0 0 30 2 6 31 0 0 33 2 6 16
- 0 0 34 2 38 7 0 0 39 1 38 6 0 40 1 6
- 42 41 43 1 38 0 0 47 2 38 0 0 48 49 3
- 6 36 0 0 0 50 2 6 45 41 0 51 2 38 0 0
- 0 52 2 0 7 0 0 11 2 0 0 0 0 15 2 0 0
- 0 0 14 1 0 42 41 44 2 0 45 41 0 53 2
- 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)))))
+ 6 0 0 18 2 6 0 0 0 19 1 6 21 0 22 0 6
+ 0 23 2 6 7 0 0 24 2 6 0 0 0 25 0 6 0
+ 26 2 6 0 0 0 27 2 6 7 0 0 28 2 6 0 0
+ 0 29 2 6 30 0 0 32 2 6 16 0 0 33 2 37
+ 7 0 0 38 1 37 6 0 39 1 6 41 40 42 1
+ 37 0 0 46 2 37 0 0 47 48 3 6 35 0 0 0
+ 49 2 6 44 40 0 50 2 37 0 0 0 51 2 0 7
+ 0 0 11 2 0 0 0 0 15 2 0 0 0 0 14 1 0
+ 41 40 43 2 0 44 40 0 52 2 0 0 0 0 20
+ 3 0 35 0 0 0 36 2 0 30 0 0 31 2 0 16
+ 0 0 17 2 0 44 40 0 45)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp
index 0f649439..8baa9d6f 100644
--- a/src/algebra/strap/FFIELDC-.lsp
+++ b/src/algebra/strap/FFIELDC-.lsp
@@ -102,10 +102,7 @@
(LETT |found| 'NIL |FFIELDC-;createPrimitiveElement;S;8|)
(SEQ (LETT |i| |start|
|FFIELDC-;createPrimitiveElement;S;8|)
- G190
- (COND
- ((NULL (SPADCALL |found| (|getShellEntry| $ 43)))
- (GO G191)))
+ G190 (COND ((NULL (NOT |found|)) (GO G191)))
(SEQ (LETT |e|
(SPADCALL
(PROG1 (LETT #0# |i|
@@ -130,7 +127,7 @@
(SEQ (COND
((SPADCALL |a| (|getShellEntry| $ 14)) 'NIL)
('T
- (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 47))
+ (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 46))
|FFIELDC-;primitive?;SB;9|)
(LETT |q| (- 2 1) |FFIELDC-;primitive?;SB;9|)
(LETT |equalone| 'NIL |FFIELDC-;primitive?;SB;9|)
@@ -143,20 +140,19 @@
(LETT |exp| (CAR #0#)
|FFIELDC-;primitive?;SB;9|)
NIL)
- (NULL (SPADCALL |equalone|
- (|getShellEntry| $ 43))))
+ (NULL (NOT |equalone|)))
(GO G191)))
(SEQ (EXIT (LETT |equalone|
(SPADCALL
(SPADCALL |a|
(QUOTIENT2 |q| (QCAR |exp|))
- (|getShellEntry| $ 48))
- (|spadConstant| $ 49)
- (|getShellEntry| $ 50))
+ (|getShellEntry| $ 47))
+ (|spadConstant| $ 48)
+ (|getShellEntry| $ 49))
|FFIELDC-;primitive?;SB;9|)))
(LETT #0# (CDR #0#) |FFIELDC-;primitive?;SB;9|)
(GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |equalone| (|getShellEntry| $ 43))))))))))
+ (EXIT (NOT |equalone|)))))))))
(DEFUN |FFIELDC-;order;SPi;10| (|e| $)
(PROG (|lof| |rec| #0=#:G1515 |primeDivisor| |j| #1=#:G1516 |a|
@@ -164,12 +160,12 @@
(RETURN
(SEQ (COND
((SPADCALL |e| (|spadConstant| $ 7)
- (|getShellEntry| $ 50))
+ (|getShellEntry| $ 49))
(|error| "order(0) is not defined "))
('T
(SEQ (LETT |ord| (- 2 1) |FFIELDC-;order;SPi;10|)
(LETT |a| 0 |FFIELDC-;order;SPi;10|)
- (LETT |lof| (SPADCALL (|getShellEntry| $ 47))
+ (LETT |lof| (SPADCALL (|getShellEntry| $ 46))
|FFIELDC-;order;SPi;10|)
(SEQ (LETT |rec| NIL |FFIELDC-;order;SPi;10|)
(LETT #0# |lof| |FFIELDC-;order;SPi;10|) G190
@@ -188,9 +184,9 @@
(LETT |goon|
(SPADCALL
(SPADCALL |e| |a|
- (|getShellEntry| $ 48))
- (|spadConstant| $ 49)
- (|getShellEntry| $ 50))
+ (|getShellEntry| $ 47))
+ (|spadConstant| $ 48)
+ (|getShellEntry| $ 49))
|FFIELDC-;order;SPi;10|)
(SEQ (LETT |j| 0 |FFIELDC-;order;SPi;10|)
(LETT #1# (- (QCDR |rec|) 2)
@@ -210,9 +206,9 @@
(LETT |goon|
(SPADCALL
(SPADCALL |e| |a|
- (|getShellEntry| $ 48))
- (|spadConstant| $ 49)
- (|getShellEntry| $ 50))
+ (|getShellEntry| $ 47))
+ (|spadConstant| $ 48)
+ (|getShellEntry| $ 49))
|FFIELDC-;order;SPi;10|)))
(LETT |j| (QSADD1 |j|)
|FFIELDC-;order;SPi;10|)
@@ -234,13 +230,13 @@
((SPADCALL |b| (|getShellEntry| $ 14))
(|error| "discreteLog: logarithm of zero"))
('T
- (SEQ (LETT |faclist| (SPADCALL (|getShellEntry| $ 47))
+ (SEQ (LETT |faclist| (SPADCALL (|getShellEntry| $ 46))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |a| |b| |FFIELDC-;discreteLog;SNni;11|)
- (LETT |gen| (SPADCALL (|getShellEntry| $ 53))
+ (LETT |gen| (SPADCALL (|getShellEntry| $ 52))
|FFIELDC-;discreteLog;SNni;11|)
(EXIT (COND
- ((SPADCALL |b| |gen| (|getShellEntry| $ 50))
+ ((SPADCALL |b| |gen| (|getShellEntry| $ 49))
1)
('T
(SEQ (LETT |disclog| 0
@@ -282,15 +278,15 @@
|FFIELDC-;discreteLog;SNni;11|)
(LETT |exptable|
(SPADCALL |fac|
- (|getShellEntry| $ 55))
+ (|getShellEntry| $ 54))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |n|
(SPADCALL |exptable|
- (|getShellEntry| $ 56))
+ (|getShellEntry| $ 55))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |c|
(SPADCALL |a| |exp|
- (|getShellEntry| $ 48))
+ (|getShellEntry| $ 47))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |end|
(QUOTIENT2 (- |fac| 1) |n|)
@@ -306,9 +302,7 @@
(COND
((OR
(QSGREATERP |i| |end|)
- (NULL
- (SPADCALL |found|
- (|getShellEntry| $ 43))))
+ (NULL (NOT |found|)))
(GO G191)))
(SEQ
(LETT |rho|
@@ -316,7 +310,7 @@
(SPADCALL |c|
(|getShellEntry| $ 11))
|exptable|
- (|getShellEntry| $ 58))
+ (|getShellEntry| $ 57))
|FFIELDC-;discreteLog;SNni;11|)
(EXIT
(COND
@@ -340,9 +334,9 @@
|groupord| |fac|)
(- |n|))
(|getShellEntry| $
- 48))
+ 47))
(|getShellEntry| $
- 59))
+ 58))
|FFIELDC-;discreteLog;SNni;11|)))))
(LETT |i| (QSADD1 |i|)
|FFIELDC-;discreteLog;SNni;11|)
@@ -363,9 +357,9 @@
(SPADCALL |gen|
(- |disc1|)
(|getShellEntry| $
- 48))
+ 47))
(|getShellEntry| $
- 59))
+ 58))
|FFIELDC-;discreteLog;SNni;11|))))
('T
(|error|
@@ -386,14 +380,14 @@
(SEQ (EXIT (COND
((SPADCALL |b| (|getShellEntry| $ 14))
(SEQ (SPADCALL "discreteLog: logarithm of zero"
- (|getShellEntry| $ 64))
+ (|getShellEntry| $ 63))
(EXIT (CONS 1 "failed"))))
((SPADCALL |logbase| (|getShellEntry| $ 14))
(SEQ (SPADCALL
"discreteLog: logarithm to base zero"
- (|getShellEntry| $ 64))
+ (|getShellEntry| $ 63))
(EXIT (CONS 1 "failed"))))
- ((SPADCALL |b| |logbase| (|getShellEntry| $ 50))
+ ((SPADCALL |b| |logbase| (|getShellEntry| $ 49))
(CONS 0 1))
('T
(COND
@@ -406,14 +400,14 @@
(|getShellEntry| $ 17)))))
(SEQ (SPADCALL
"discreteLog: second argument not in cyclic group generated by first argument"
- (|getShellEntry| $ 64))
+ (|getShellEntry| $ 63))
(EXIT (CONS 1 "failed"))))
('T
(SEQ (LETT |faclist|
(SPADCALL
(SPADCALL |groupord|
- (|getShellEntry| $ 66))
- (|getShellEntry| $ 68))
+ (|getShellEntry| $ 65))
+ (|getShellEntry| $ 67))
|FFIELDC-;discreteLog;2SU;12|)
(LETT |a| |b|
|FFIELDC-;discreteLog;2SU;12|)
@@ -440,7 +434,7 @@
(LETT |primroot|
(SPADCALL |logbase|
(QUOTIENT2 |groupord| |fac|)
- (|getShellEntry| $ 48))
+ (|getShellEntry| $ 47))
|FFIELDC-;discreteLog;2SU;12|)
(EXIT
(SEQ
@@ -459,9 +453,9 @@
(LETT |rhoHelp|
(SPADCALL |primroot|
(SPADCALL |a| |exp|
- (|getShellEntry| $ 48))
+ (|getShellEntry| $ 47))
|fac|
- (|getShellEntry| $ 70))
+ (|getShellEntry| $ 69))
|FFIELDC-;discreteLog;2SU;12|)
(EXIT
(COND
@@ -489,8 +483,8 @@
(SPADCALL |logbase|
(- |rho|)
(|getShellEntry| $
- 48))
- (|getShellEntry| $ 59))
+ 47))
+ (|getShellEntry| $ 58))
|FFIELDC-;discreteLog;2SU;12|)))))))
(LETT |t| (QSADD1 |t|)
|FFIELDC-;discreteLog;2SU;12|)
@@ -502,25 +496,25 @@
#2# (EXIT #2#)))))
(DEFUN |FFIELDC-;squareFreePolynomial| (|f| $)
- (SPADCALL |f| (|getShellEntry| $ 75)))
+ (SPADCALL |f| (|getShellEntry| $ 74)))
(DEFUN |FFIELDC-;factorPolynomial| (|f| $)
- (SPADCALL |f| (|getShellEntry| $ 77)))
+ (SPADCALL |f| (|getShellEntry| $ 76)))
(DEFUN |FFIELDC-;factorSquareFreePolynomial| (|f| $)
(PROG (|flist| |u| #0=#:G1521 #1=#:G1510 #2=#:G1508 #3=#:G1509)
(RETURN
(SEQ (COND
- ((SPADCALL |f| (|spadConstant| $ 78)
- (|getShellEntry| $ 79))
- (|spadConstant| $ 80))
+ ((SPADCALL |f| (|spadConstant| $ 77)
+ (|getShellEntry| $ 78))
+ (|spadConstant| $ 79))
('T
(SEQ (LETT |flist|
- (SPADCALL |f| 'T (|getShellEntry| $ 84))
+ (SPADCALL |f| 'T (|getShellEntry| $ 83))
|FFIELDC-;factorSquareFreePolynomial|)
(EXIT (SPADCALL
(SPADCALL (QCAR |flist|)
- (|getShellEntry| $ 85))
+ (|getShellEntry| $ 84))
(PROGN
(LETT #3# NIL
|FFIELDC-;factorSquareFreePolynomial|)
@@ -542,13 +536,13 @@
(LETT #1#
(SPADCALL (QCAR |u|)
(QCDR |u|)
- (|getShellEntry| $ 86))
+ (|getShellEntry| $ 85))
|FFIELDC-;factorSquareFreePolynomial|)
(COND
(#3#
(LETT #2#
(SPADCALL #2# #1#
- (|getShellEntry| $ 87))
+ (|getShellEntry| $ 86))
|FFIELDC-;factorSquareFreePolynomial|))
('T
(PROGN
@@ -561,11 +555,11 @@
(GO G190) G191 (EXIT NIL))
(COND
(#3# #2#)
- ('T (|spadConstant| $ 88))))
- (|getShellEntry| $ 89))))))))))
+ ('T (|spadConstant| $ 87))))
+ (|getShellEntry| $ 88))))))))))
(DEFUN |FFIELDC-;gcdPolynomial;3Sup;16| (|f| |g| $)
- (SPADCALL |f| |g| (|getShellEntry| $ 91)))
+ (SPADCALL |f| |g| (|getShellEntry| $ 90)))
(DEFUN |FiniteFieldCategory&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -573,7 +567,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|FiniteFieldCategory&|))
(LETT |dv$| (LIST '|FiniteFieldCategory&| |dv$1|) . #0#)
- (LETT $ (|newShell| 94) . #0#)
+ (LETT $ (|newShell| 93) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -597,56 +591,55 @@
|FFIELDC-;charthRoot;2S;6| |FFIELDC-;charthRoot;SU;7|
(57 . |size|)
(|Union| '"prime" '"polynomial" '"normal" '"cyclic")
- (61 . |representationType|) (65 . =) (71 . |not|)
+ (61 . |representationType|) (65 . =)
|FFIELDC-;createPrimitiveElement;S;8|
(|Record| (|:| |factor| 18) (|:| |exponent| 18))
- (|List| 45) (76 . |factorsOfCyclicGroupSize|) (80 . **)
- (86 . |One|) (90 . =) |FFIELDC-;primitive?;SB;9|
- |FFIELDC-;order;SPi;10| (96 . |primitiveElement|)
- (|Table| 10 35) (100 . |tableForDiscreteLogarithm|)
- (105 . |#|) (|Union| 35 '"failed") (110 . |search|)
- (116 . *) |FFIELDC-;discreteLog;SNni;11| (|Void|)
- (|String|) (|OutputForm|) (122 . |messagePrint|)
- (|Factored| $) (127 . |factor|) (|Factored| 18)
- (132 . |factors|) (|DiscreteLogarithmPackage| 6)
- (137 . |shanksDiscLogAlgorithm|)
+ (|List| 44) (71 . |factorsOfCyclicGroupSize|) (75 . **)
+ (81 . |One|) (85 . =) |FFIELDC-;primitive?;SB;9|
+ |FFIELDC-;order;SPi;10| (91 . |primitiveElement|)
+ (|Table| 10 35) (95 . |tableForDiscreteLogarithm|)
+ (100 . |#|) (|Union| 35 '"failed") (105 . |search|)
+ (111 . *) |FFIELDC-;discreteLog;SNni;11| (|Void|)
+ (|String|) (|OutputForm|) (117 . |messagePrint|)
+ (|Factored| $) (122 . |factor|) (|Factored| 18)
+ (127 . |factors|) (|DiscreteLogarithmPackage| 6)
+ (132 . |shanksDiscLogAlgorithm|)
|FFIELDC-;discreteLog;2SU;12|
- (|SparseUnivariatePolynomial| 6) (|Factored| 72)
- (|UnivariatePolynomialSquareFree| 6 72)
- (144 . |squareFree|) (|DistinctDegreeFactorize| 6 72)
- (149 . |factor|) (154 . |Zero|) (158 . =) (164 . |Zero|)
- (|Record| (|:| |irr| 72) (|:| |pow| 18)) (|List| 81)
- (|Record| (|:| |cont| 6) (|:| |factors| 82))
- (168 . |distdfact|) (174 . |coerce|) (179 . |primeFactor|)
- (185 . *) (191 . |One|) (195 . *) (|EuclideanDomain&| 72)
- (201 . |gcd|) (|SparseUnivariatePolynomial| $)
+ (|SparseUnivariatePolynomial| 6) (|Factored| 71)
+ (|UnivariatePolynomialSquareFree| 6 71)
+ (139 . |squareFree|) (|DistinctDegreeFactorize| 6 71)
+ (144 . |factor|) (149 . |Zero|) (153 . =) (159 . |Zero|)
+ (|Record| (|:| |irr| 71) (|:| |pow| 18)) (|List| 80)
+ (|Record| (|:| |cont| 6) (|:| |factors| 81))
+ (163 . |distdfact|) (169 . |coerce|) (174 . |primeFactor|)
+ (180 . *) (186 . |One|) (190 . *) (|EuclideanDomain&| 71)
+ (196 . |gcd|) (|SparseUnivariatePolynomial| $)
|FFIELDC-;gcdPolynomial;3Sup;16|)
- '#(|primitive?| 207 |order| 212 |nextItem| 222 |init| 227
- |gcdPolynomial| 231 |discreteLog| 237 |differentiate| 248
- |createPrimitiveElement| 253 |conditionP| 257 |charthRoot|
- 262)
+ '#(|primitive?| 202 |order| 207 |nextItem| 217 |init| 222
+ |gcdPolynomial| 226 |discreteLog| 232 |differentiate| 243
+ |createPrimitiveElement| 248 |conditionP| 252 |charthRoot|
+ 257)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 93
+ (|makeByteWordVec2| 92
'(0 6 0 7 1 6 10 0 11 1 6 0 10 12 1 6
13 0 14 1 6 10 0 17 1 19 0 18 20 1 24
23 0 25 2 22 13 26 0 27 1 6 0 0 28 2
22 0 29 0 30 2 6 0 0 35 36 0 6 35 39
- 0 6 40 41 2 40 13 0 0 42 1 13 0 0 43
- 0 6 46 47 2 6 0 0 18 48 0 6 0 49 2 6
- 13 0 0 50 0 6 0 53 1 6 54 18 55 1 54
- 35 0 56 2 54 57 10 0 58 2 6 0 0 0 59
- 1 63 61 62 64 1 18 65 0 66 1 67 46 0
- 68 3 69 57 6 6 35 70 1 74 73 72 75 1
- 76 73 72 77 0 72 0 78 2 72 13 0 0 79
- 0 73 0 80 2 76 83 72 13 84 1 72 0 6
- 85 2 73 0 72 18 86 2 73 0 0 0 87 0 73
- 0 88 2 73 0 72 0 89 2 90 0 0 0 91 1 0
- 13 0 51 1 0 10 0 52 1 0 19 0 21 1 0
- 15 0 16 0 0 0 9 2 0 92 92 92 93 1 0
- 35 0 60 2 0 57 0 0 71 1 0 0 0 8 0 0 0
- 44 1 0 32 33 34 1 0 0 0 37 1 0 15 0
- 38)))))
+ 0 6 40 41 2 40 13 0 0 42 0 6 45 46 2
+ 6 0 0 18 47 0 6 0 48 2 6 13 0 0 49 0
+ 6 0 52 1 6 53 18 54 1 53 35 0 55 2 53
+ 56 10 0 57 2 6 0 0 0 58 1 62 60 61 63
+ 1 18 64 0 65 1 66 45 0 67 3 68 56 6 6
+ 35 69 1 73 72 71 74 1 75 72 71 76 0
+ 71 0 77 2 71 13 0 0 78 0 72 0 79 2 75
+ 82 71 13 83 1 71 0 6 84 2 72 0 71 18
+ 85 2 72 0 0 0 86 0 72 0 87 2 72 0 71
+ 0 88 2 89 0 0 0 90 1 0 13 0 50 1 0 10
+ 0 51 1 0 19 0 21 1 0 15 0 16 0 0 0 9
+ 2 0 91 91 91 92 1 0 35 0 59 2 0 56 0
+ 0 70 1 0 0 0 8 0 0 0 43 1 0 32 33 34
+ 1 0 0 0 37 1 0 15 0 38)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp
index addea91c..0af4f011 100644
--- a/src/algebra/strap/ILIST.lsp
+++ b/src/algebra/strap/ILIST.lsp
@@ -200,13 +200,11 @@
(RETURN
(SEQ (LETT |y| NIL |ILIST;copy;2$;20|)
(SEQ (LETT |i| 0 |ILIST;copy;2$;20|) G190
- (COND
- ((NULL (SPADCALL (NULL |x|) (|getShellEntry| $ 33)))
- (GO G191)))
+ (COND ((NULL (NOT (NULL |x|))) (GO G191)))
(SEQ (COND
((EQ |i| 1000)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 34))
+ ((SPADCALL |x| (|getShellEntry| $ 33))
(|error| "cyclic list")))))
(LETT |y| (CONS (QCAR |x|) |y|)
|ILIST;copy;2$;20|)
@@ -219,25 +217,25 @@
(PROG (|s| |y| |z|)
(RETURN
(SEQ (LETT |y| NIL |ILIST;coerce;$Of;21|)
- (LETT |s| (SPADCALL |x| (|getShellEntry| $ 36))
+ (LETT |s| (SPADCALL |x| (|getShellEntry| $ 35))
|ILIST;coerce;$Of;21|)
(SEQ G190 (COND ((NULL (NEQ |x| |s|)) (GO G191)))
(SEQ (LETT |y|
(CONS (SPADCALL (|SPADfirst| |x|)
- (|getShellEntry| $ 38))
+ (|getShellEntry| $ 37))
|y|)
|ILIST;coerce;$Of;21|)
(EXIT (LETT |x| (CDR |x|) |ILIST;coerce;$Of;21|)))
NIL (GO G190) G191 (EXIT NIL))
(LETT |y| (NREVERSE |y|) |ILIST;coerce;$Of;21|)
(EXIT (COND
- ((NULL |s|) (SPADCALL |y| (|getShellEntry| $ 40)))
+ ((NULL |s|) (SPADCALL |y| (|getShellEntry| $ 39)))
('T
(SEQ (LETT |z|
(SPADCALL
(SPADCALL (|SPADfirst| |x|)
- (|getShellEntry| $ 38))
- (|getShellEntry| $ 42))
+ (|getShellEntry| $ 37))
+ (|getShellEntry| $ 41))
|ILIST;coerce;$Of;21|)
(SEQ G190
(COND
@@ -248,7 +246,7 @@
(LETT |z|
(CONS
(SPADCALL (|SPADfirst| |x|)
- (|getShellEntry| $ 38))
+ (|getShellEntry| $ 37))
|z|)
|ILIST;coerce;$Of;21|)))
NIL (GO G190) G191 (EXIT NIL))
@@ -256,10 +254,10 @@
(SPADCALL |y|
(SPADCALL
(SPADCALL (NREVERSE |z|)
- (|getShellEntry| $ 43))
- (|getShellEntry| $ 44))
- (|getShellEntry| $ 45))
- (|getShellEntry| $ 40)))))))))))
+ (|getShellEntry| $ 42))
+ (|getShellEntry| $ 43))
+ (|getShellEntry| $ 44))
+ (|getShellEntry| $ 39)))))))))))
(DEFUN |ILIST;=;2$B;22| (|x| |y| $)
(PROG (#0=#:G1469)
@@ -271,14 +269,12 @@
(COND
((NULL (COND
((NULL |x|) 'NIL)
- ('T
- (SPADCALL (NULL |y|)
- (|getShellEntry| $ 33)))))
+ ('T (NOT (NULL |y|)))))
(GO G191)))
(SEQ (EXIT
(COND
((SPADCALL (QCAR |x|) (QCAR |y|)
- (|getShellEntry| $ 47))
+ (|getShellEntry| $ 46))
(PROGN
(LETT #0# 'NIL
|ILIST;=;2$B;22|)
@@ -300,14 +296,11 @@
(PROG (|s|)
(RETURN
(SEQ (LETT |s| "\\left[" |ILIST;latex;$S;23|)
- (SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |x|) (|getShellEntry| $ 33)))
- (GO G191)))
+ (SEQ G190 (COND ((NULL (NOT (NULL |x|))) (GO G191)))
(SEQ (LETT |s|
(STRCONC |s|
(SPADCALL (QCAR |x|)
- (|getShellEntry| $ 50)))
+ (|getShellEntry| $ 49)))
|ILIST;latex;$S;23|)
(LETT |x| (QCDR |x|) |ILIST;latex;$S;23|)
(EXIT (COND
@@ -321,13 +314,10 @@
(PROG (#0=#:G1477)
(RETURN
(SEQ (EXIT (SEQ (SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |x|)
- (|getShellEntry| $ 33)))
- (GO G191)))
+ (COND ((NULL (NOT (NULL |x|))) (GO G191)))
(SEQ (EXIT (COND
((SPADCALL |s| (QCAR |x|)
- (|getShellEntry| $ 52))
+ (|getShellEntry| $ 51))
(PROGN
(LETT #0# 'T
|ILIST;member?;S$B;24|)
@@ -353,9 +343,7 @@
(SEQ (LETT |z| |x| |ILIST;concat!;3$;25|)
(SEQ G190
(COND
- ((NULL (SPADCALL (NULL (QCDR |z|))
- (|getShellEntry| $ 33)))
- (GO G191)))
+ ((NULL (NOT (NULL (QCDR |z|)))) (GO G191)))
(SEQ (EXIT (LETT |z| (QCDR |z|)
|ILIST;concat!;3$;25|)))
NIL (GO G190) G191 (EXIT NIL))
@@ -365,10 +353,7 @@
(PROG (|f| |p| |pr| |pp|)
(RETURN
(SEQ (LETT |p| |l| |ILIST;removeDuplicates!;2$;26|)
- (SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |p|) (|getShellEntry| $ 33)))
- (GO G191)))
+ (SEQ G190 (COND ((NULL (NOT (NULL |p|))) (GO G191)))
(SEQ (LETT |pp| |p| |ILIST;removeDuplicates!;2$;26|)
(LETT |f| (QCAR |p|)
|ILIST;removeDuplicates!;2$;26|)
@@ -377,16 +362,15 @@
(EXIT (SEQ G190
(COND
((NULL
- (SPADCALL
+ (NOT
(NULL
(LETT |pr| (QCDR |pp|)
- |ILIST;removeDuplicates!;2$;26|))
- (|getShellEntry| $ 33)))
+ |ILIST;removeDuplicates!;2$;26|))))
(GO G191)))
(SEQ (EXIT
(COND
((SPADCALL (QCAR |pr|) |f|
- (|getShellEntry| $ 52))
+ (|getShellEntry| $ 51))
(QRPLACD |pp| (QCDR |pr|)))
('T
(LETT |pp| |pr|
@@ -423,9 +407,7 @@
(COND
((NULL (COND
((NULL |p|) 'NIL)
- ('T
- (SPADCALL (NULL |q|)
- (|getShellEntry| $ 33)))))
+ ('T (NOT (NULL |q|)))))
(GO G191)))
(SEQ (EXIT (COND
((SPADCALL (QCAR |p|) (QCAR |q|)
@@ -519,7 +501,7 @@
(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#)
+ (LETT $ (|newShell| 72) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -561,20 +543,20 @@
(|setShellEntry| $ 7 |#2|)
(COND
((|testBitVector| |pv$| 8)
- (|setShellEntry| $ 46
+ (|setShellEntry| $ 45
(CONS (|dispatchFunction| |ILIST;coerce;$Of;21|) $))))
(COND
((|testBitVector| |pv$| 7)
(PROGN
- (|setShellEntry| $ 48
+ (|setShellEntry| $ 47
(CONS (|dispatchFunction| |ILIST;=;2$B;22|) $))
- (|setShellEntry| $ 51
+ (|setShellEntry| $ 50
(CONS (|dispatchFunction| |ILIST;latex;$S;23|) $))
- (|setShellEntry| $ 53
+ (|setShellEntry| $ 52
(CONS (|dispatchFunction| |ILIST;member?;S$B;24|) $)))))
(COND
((|testBitVector| |pv$| 7)
- (|setShellEntry| $ 55
+ (|setShellEntry| $ 54
(CONS (|dispatchFunction|
|ILIST;removeDuplicates!;2$;26|)
$))))
@@ -591,43 +573,43 @@
|ILIST;setelt;$rest2$;13| (|List| 6)
|ILIST;construct;L$;14| |ILIST;parts;$L;15|
|ILIST;reverse!;2$;16| |ILIST;reverse;2$;17| (|Integer|)
- |ILIST;minIndex;$I;18| |ILIST;rest;$Nni$;19| (0 . |not|)
- (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 . =) (79 . |member?|)
- |ILIST;concat!;3$;25| (85 . |removeDuplicates!|)
+ |ILIST;minIndex;$I;18| |ILIST;rest;$Nni$;19|
+ (0 . |cyclic?|) |ILIST;copy;2$;20| (5 . |cycleEntry|)
+ (|OutputForm|) (10 . |coerce|) (|List| $) (15 . |bracket|)
+ (|List| 36) (20 . |list|) (25 . |commaSeparate|)
+ (30 . |overbar|) (35 . |concat!|) (41 . |coerce|)
+ (46 . ~=) (52 . =) (|String|) (58 . |latex|)
+ (63 . |latex|) (68 . =) (74 . |member?|)
+ |ILIST;concat!;3$;25| (80 . |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| 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"))
- '#(~= 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)
+ '#(~= 85 |value| 91 |third| 96 |tail| 101 |swap!| 106
+ |split!| 113 |sorted?| 119 |sort!| 130 |sort| 141 |size?|
+ 152 |setvalue!| 158 |setrest!| 164 |setlast!| 170
+ |setfirst!| 176 |setelt| 182 |setchildren!| 224 |select!|
+ 230 |select| 236 |second| 242 |sample| 247 |reverse!| 251
+ |reverse| 256 |rest| 261 |removeDuplicates!| 272
+ |removeDuplicates| 277 |remove!| 282 |remove| 294 |reduce|
+ 306 |qsetelt!| 327 |qelt| 334 |possiblyInfinite?| 340
+ |position| 345 |parts| 364 |nodes| 369 |node?| 374 |new|
+ 380 |more?| 386 |minIndex| 392 |min| 397 |merge!| 403
+ |merge| 416 |members| 429 |member?| 434 |maxIndex| 440
+ |max| 445 |map!| 451 |map| 457 |list| 470 |less?| 475
+ |leaves| 481 |leaf?| 486 |latex| 491 |last| 496 |insert!|
+ 507 |insert| 521 |indices| 535 |index?| 540 |hash| 546
+ |first| 551 |find| 562 |fill!| 568 |explicitlyFinite?| 574
+ |every?| 579 |eval| 585 |eq?| 611 |entry?| 617 |entries|
+ 623 |empty?| 628 |empty| 633 |elt| 637 |distance| 680
+ |delete!| 686 |delete| 698 |cyclic?| 710 |cycleTail| 715
+ |cycleSplit!| 720 |cycleLength| 725 |cycleEntry| 730
+ |count| 735 |copyInto!| 747 |copy| 754 |convert| 759
+ |construct| 764 |concat!| 769 |concat| 781 |coerce| 804
+ |children| 809 |child?| 814 |any?| 820 >= 826 > 832 = 838
+ <= 844 < 850 |#| 856)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
(CONS (|makeByteWordVec2| 5
'(0 0 0 0 0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4))
@@ -654,58 +636,58 @@
(|EltableAggregate| 30 6) (|Evalable| 6)
(|SetCategory|) (|Type|)
(|Eltable| 30 6) (|InnerEvalable| 6 6)
- (|CoercibleTo| 37) (|ConvertibleTo| 69)
+ (|CoercibleTo| 36) (|ConvertibleTo| 68)
(|BasicType|))
- (|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 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 9 0 0 6 6
- 1 3 9 0 0 25 25 1 2 9 0 0 61 1 2 9 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 8 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)))))
+ (|makeByteWordVec2| 71
+ '(1 0 11 0 33 1 0 0 0 35 1 6 36 0 37 1
+ 36 0 38 39 1 40 0 36 41 1 36 0 38 42
+ 1 36 0 0 43 2 40 0 0 36 44 1 0 36 0
+ 45 2 6 11 0 0 46 2 0 11 0 0 47 1 6 48
+ 0 49 1 0 48 0 50 2 6 11 0 0 51 2 0 11
+ 6 0 52 1 0 0 0 54 2 7 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 5 11 0 1 2 0 11
+ 55 0 1 1 5 0 0 1 2 0 0 55 0 56 1 5 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 38 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 7 0 0 54 1 7 0 0 1 2
+ 7 0 6 0 1 2 0 0 62 0 1 2 7 0 6 0 1 2
+ 0 0 62 0 1 4 7 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 7 30 6 0 1 3 7
+ 30 6 0 30 1 2 0 30 62 0 1 1 0 25 0 27
+ 1 0 38 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 55 0 0 57 2 5 0 0 0 1
+ 3 0 0 55 0 0 1 1 0 25 0 1 2 7 11 6 0
+ 52 1 6 30 0 1 2 5 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 7 48 0 50 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 7 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 9 0 0 6 6 1 3 9 0 0
+ 25 25 1 2 9 0 0 60 1 2 9 0 0 61 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 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
+ 33 1 0 0 0 1 1 0 0 0 1 1 0 8 0 1 1 0
+ 0 0 35 2 7 8 6 0 1 2 0 8 62 0 1 3 0 0
+ 0 0 30 1 1 0 0 0 34 1 3 68 0 1 1 0 0
+ 25 26 2 0 0 0 0 53 2 0 0 0 6 1 1 0 0
+ 38 1 2 0 0 0 6 1 2 0 0 6 0 10 2 0 0 0
+ 0 1 1 8 36 0 45 1 0 38 0 1 2 7 11 0 0
+ 1 2 0 11 62 0 1 2 5 11 0 0 1 2 5 11 0
+ 0 1 2 7 11 0 0 47 2 5 11 0 0 1 2 5 11
+ 0 0 1 1 0 8 0 9)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/INS-.lsp b/src/algebra/strap/INS-.lsp
index 229a04fa..f2f8f5a4 100644
--- a/src/algebra/strap/INS-.lsp
+++ b/src/algebra/strap/INS-.lsp
@@ -100,23 +100,22 @@
(DEFUN |INS-;differentiate;2S;2| (|x| $) (|spadConstant| $ 9))
(DEFUN |INS-;even?;SB;3| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 12))
- (|getShellEntry| $ 13)))
+ (NOT (SPADCALL |x| (|getShellEntry| $ 12))))
(DEFUN |INS-;positive?;SB;4| (|x| $)
- (SPADCALL (|spadConstant| $ 9) |x| (|getShellEntry| $ 15)))
+ (SPADCALL (|spadConstant| $ 9) |x| (|getShellEntry| $ 14)))
(DEFUN |INS-;copy;2S;5| (|x| $) (DECLARE (IGNORE $)) |x|)
(DEFUN |INS-;bit?;2SB;6| (|x| |i| $)
(SPADCALL
- (SPADCALL |x| (SPADCALL |i| (|getShellEntry| $ 18))
- (|getShellEntry| $ 19))
+ (SPADCALL |x| (SPADCALL |i| (|getShellEntry| $ 17))
+ (|getShellEntry| $ 18))
(|getShellEntry| $ 12)))
(DEFUN |INS-;mask;2S;7| (|n| $)
- (SPADCALL (SPADCALL (|spadConstant| $ 21) |n| (|getShellEntry| $ 19))
- (|getShellEntry| $ 22)))
+ (SPADCALL (SPADCALL (|spadConstant| $ 20) |n| (|getShellEntry| $ 18))
+ (|getShellEntry| $ 21)))
(DEFUN |INS-;rational?;SB;8| (|x| $) (DECLARE (IGNORE $)) 'T)
@@ -124,148 +123,146 @@
(PROG (#0=#:G1424 #1=#:G1425)
(RETURN
(COND
- ((SPADCALL |x| (|spadConstant| $ 9) (|getShellEntry| $ 25))
+ ((SPADCALL |x| (|spadConstant| $ 9) (|getShellEntry| $ 24))
(|error| "euclideanSize called on zero"))
- ((SPADCALL |x| (|spadConstant| $ 9) (|getShellEntry| $ 15))
- (PROG1 (LETT #0# (- (SPADCALL |x| (|getShellEntry| $ 27)))
+ ((SPADCALL |x| (|spadConstant| $ 9) (|getShellEntry| $ 14))
+ (PROG1 (LETT #0# (- (SPADCALL |x| (|getShellEntry| $ 26)))
|INS-;euclideanSize;SNni;9|)
(|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)))
('T
- (PROG1 (LETT #1# (SPADCALL |x| (|getShellEntry| $ 27))
+ (PROG1 (LETT #1# (SPADCALL |x| (|getShellEntry| $ 26))
|INS-;euclideanSize;SNni;9|)
(|check-subtype| (>= #1# 0) '(|NonNegativeInteger|) #1#)))))))
(DEFUN |INS-;convert;SF;10| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 27))
- (|getShellEntry| $ 30)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 26))
+ (|getShellEntry| $ 29)))
(DEFUN |INS-;convert;SDf;11| (|x| $)
- (FLOAT (SPADCALL |x| (|getShellEntry| $ 27)) |$DoubleFloatMaximum|))
+ (FLOAT (SPADCALL |x| (|getShellEntry| $ 26)) |$DoubleFloatMaximum|))
(DEFUN |INS-;convert;SIf;12| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 27))
- (|getShellEntry| $ 35)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 26))
+ (|getShellEntry| $ 34)))
(DEFUN |INS-;retract;SI;13| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 27)))
+ (SPADCALL |x| (|getShellEntry| $ 26)))
(DEFUN |INS-;convert;SP;14| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 27))
- (|getShellEntry| $ 39)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 26))
+ (|getShellEntry| $ 38)))
(DEFUN |INS-;factor;SF;15| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 43)))
+ (SPADCALL |x| (|getShellEntry| $ 42)))
(DEFUN |INS-;squareFree;SF;16| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 46)))
+ (SPADCALL |x| (|getShellEntry| $ 45)))
(DEFUN |INS-;prime?;SB;17| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 49)))
+ (SPADCALL |x| (|getShellEntry| $ 48)))
(DEFUN |INS-;factorial;2S;18| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 52)))
+ (SPADCALL |x| (|getShellEntry| $ 51)))
(DEFUN |INS-;binomial;3S;19| (|n| |m| $)
- (SPADCALL |n| |m| (|getShellEntry| $ 54)))
+ (SPADCALL |n| |m| (|getShellEntry| $ 53)))
(DEFUN |INS-;permutation;3S;20| (|n| |m| $)
- (SPADCALL |n| |m| (|getShellEntry| $ 56)))
+ (SPADCALL |n| |m| (|getShellEntry| $ 55)))
(DEFUN |INS-;retractIfCan;SU;21| (|x| $)
- (CONS 0 (SPADCALL |x| (|getShellEntry| $ 27))))
+ (CONS 0 (SPADCALL |x| (|getShellEntry| $ 26))))
(DEFUN |INS-;init;S;22| ($) (|spadConstant| $ 9))
(DEFUN |INS-;nextItem;SU;23| (|n| $)
(COND
- ((SPADCALL |n| (|getShellEntry| $ 61))
- (CONS 0 (|spadConstant| $ 21)))
- ((SPADCALL (|spadConstant| $ 9) |n| (|getShellEntry| $ 15))
- (CONS 0 (SPADCALL |n| (|getShellEntry| $ 18))))
+ ((SPADCALL |n| (|getShellEntry| $ 60))
+ (CONS 0 (|spadConstant| $ 20)))
+ ((SPADCALL (|spadConstant| $ 9) |n| (|getShellEntry| $ 14))
+ (CONS 0 (SPADCALL |n| (|getShellEntry| $ 17))))
('T
(CONS 0
- (SPADCALL (|spadConstant| $ 21) |n| (|getShellEntry| $ 62))))))
+ (SPADCALL (|spadConstant| $ 20) |n| (|getShellEntry| $ 61))))))
(DEFUN |INS-;patternMatch;SP2Pmr;24| (|x| |p| |l| $)
- (SPADCALL |x| |p| |l| (|getShellEntry| $ 67)))
+ (SPADCALL |x| |p| |l| (|getShellEntry| $ 66)))
(DEFUN |INS-;rational;SF;25| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 27))
- (|getShellEntry| $ 71)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 26))
+ (|getShellEntry| $ 70)))
(DEFUN |INS-;rationalIfCan;SU;26| (|x| $)
(CONS 0
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 27))
- (|getShellEntry| $ 71))))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 26))
+ (|getShellEntry| $ 70))))
(DEFUN |INS-;symmetricRemainder;3S;27| (|x| |n| $)
(PROG (|r|)
(RETURN
- (SEQ (LETT |r| (SPADCALL |x| |n| (|getShellEntry| $ 75))
+ (SEQ (LETT |r| (SPADCALL |x| |n| (|getShellEntry| $ 74))
|INS-;symmetricRemainder;3S;27|)
(EXIT (COND
((SPADCALL |r| (|spadConstant| $ 9)
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
|r|)
('T
(SEQ (COND
((SPADCALL |n| (|spadConstant| $ 9)
- (|getShellEntry| $ 15))
+ (|getShellEntry| $ 14))
(LETT |n|
- (SPADCALL |n| (|getShellEntry| $ 18))
+ (SPADCALL |n| (|getShellEntry| $ 17))
|INS-;symmetricRemainder;3S;27|)))
(EXIT (COND
((SPADCALL (|spadConstant| $ 9) |r|
- (|getShellEntry| $ 15))
+ (|getShellEntry| $ 14))
(COND
((SPADCALL |n|
(SPADCALL 2 |r|
- (|getShellEntry| $ 77))
- (|getShellEntry| $ 15))
+ (|getShellEntry| $ 76))
+ (|getShellEntry| $ 14))
(SPADCALL |r| |n|
- (|getShellEntry| $ 62)))
+ (|getShellEntry| $ 61)))
('T |r|)))
((NULL (SPADCALL (|spadConstant| $ 9)
(SPADCALL
(SPADCALL 2 |r|
- (|getShellEntry| $ 77))
- |n| (|getShellEntry| $ 78))
- (|getShellEntry| $ 15)))
+ (|getShellEntry| $ 76))
+ |n| (|getShellEntry| $ 77))
+ (|getShellEntry| $ 14)))
(SPADCALL |r| |n|
- (|getShellEntry| $ 78)))
+ (|getShellEntry| $ 77)))
('T |r|)))))))))))
(DEFUN |INS-;invmod;3S;28| (|a| |b| $)
(PROG (|q| |r| |r1| |c| |c1| |d| |d1|)
(RETURN
(SEQ (COND
- ((SPADCALL |a| (|getShellEntry| $ 80))
- (LETT |a| (SPADCALL |a| |b| (|getShellEntry| $ 81))
+ ((SPADCALL |a| (|getShellEntry| $ 79))
+ (LETT |a| (SPADCALL |a| |b| (|getShellEntry| $ 80))
|INS-;invmod;3S;28|)))
(LETT |c| |a| |INS-;invmod;3S;28|)
- (LETT |c1| (|spadConstant| $ 21) |INS-;invmod;3S;28|)
+ (LETT |c1| (|spadConstant| $ 20) |INS-;invmod;3S;28|)
(LETT |d| |b| |INS-;invmod;3S;28|)
(LETT |d1| (|spadConstant| $ 9) |INS-;invmod;3S;28|)
(SEQ G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |d| (|getShellEntry| $ 61))
- (|getShellEntry| $ 13)))
+ ((NULL (NOT (SPADCALL |d| (|getShellEntry| $ 60))))
(GO G191)))
(SEQ (LETT |q|
- (SPADCALL |c| |d| (|getShellEntry| $ 82))
+ (SPADCALL |c| |d| (|getShellEntry| $ 81))
|INS-;invmod;3S;28|)
(LETT |r|
(SPADCALL |c|
(SPADCALL |q| |d|
- (|getShellEntry| $ 83))
- (|getShellEntry| $ 62))
+ (|getShellEntry| $ 82))
+ (|getShellEntry| $ 61))
|INS-;invmod;3S;28|)
(LETT |r1|
(SPADCALL |c1|
(SPADCALL |q| |d1|
- (|getShellEntry| $ 83))
- (|getShellEntry| $ 62))
+ (|getShellEntry| $ 82))
+ (|getShellEntry| $ 61))
|INS-;invmod;3S;28|)
(LETT |c| |d| |INS-;invmod;3S;28|)
(LETT |c1| |d1| |INS-;invmod;3S;28|)
@@ -273,11 +270,11 @@
(EXIT (LETT |d1| |r1| |INS-;invmod;3S;28|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT (COND
- ((SPADCALL |c| (|spadConstant| $ 21)
- (|getShellEntry| $ 25))
+ ((SPADCALL |c| (|spadConstant| $ 20)
+ (|getShellEntry| $ 24))
(COND
- ((SPADCALL |c1| (|getShellEntry| $ 80))
- (SPADCALL |c1| |b| (|getShellEntry| $ 78)))
+ ((SPADCALL |c1| (|getShellEntry| $ 79))
+ (SPADCALL |c1| |b| (|getShellEntry| $ 77)))
('T |c1|)))
('T (|error| "inverse does not exist"))))))))
@@ -285,18 +282,18 @@
(PROG (|y| #0=#:G1482 |z|)
(RETURN
(SEQ (EXIT (SEQ (COND
- ((SPADCALL |x| (|getShellEntry| $ 80))
+ ((SPADCALL |x| (|getShellEntry| $ 79))
(LETT |x|
(SPADCALL |x| |p|
- (|getShellEntry| $ 81))
+ (|getShellEntry| $ 80))
|INS-;powmod;4S;29|)))
(EXIT (COND
- ((SPADCALL |x| (|getShellEntry| $ 61))
+ ((SPADCALL |x| (|getShellEntry| $ 60))
(|spadConstant| $ 9))
- ((SPADCALL |n| (|getShellEntry| $ 61))
- (|spadConstant| $ 21))
+ ((SPADCALL |n| (|getShellEntry| $ 60))
+ (|spadConstant| $ 20))
('T
- (SEQ (LETT |y| (|spadConstant| $ 21)
+ (SEQ (LETT |y| (|spadConstant| $ 20)
|INS-;powmod;4S;29|)
(LETT |z| |x| |INS-;powmod;4S;29|)
(EXIT
@@ -307,7 +304,7 @@
(|getShellEntry| $ 12))
(LETT |y|
(SPADCALL |y| |z| |p|
- (|getShellEntry| $ 85))
+ (|getShellEntry| $ 84))
|INS-;powmod;4S;29|)))
(EXIT
(COND
@@ -315,11 +312,11 @@
(LETT |n|
(SPADCALL |n|
(SPADCALL
- (|spadConstant| $ 21)
- (|getShellEntry| $ 18))
- (|getShellEntry| $ 19))
+ (|spadConstant| $ 20)
+ (|getShellEntry| $ 17))
+ (|getShellEntry| $ 18))
|INS-;powmod;4S;29|)
- (|getShellEntry| $ 61))
+ (|getShellEntry| $ 60))
(PROGN
(LETT #0# |y|
|INS-;powmod;4S;29|)
@@ -327,7 +324,7 @@
('T
(LETT |z|
(SPADCALL |z| |z| |p|
- (|getShellEntry| $ 85))
+ (|getShellEntry| $ 84))
|INS-;powmod;4S;29|)))))
NIL (GO G190) G191 (EXIT NIL)))))))))
#0# (EXIT #0#)))))
@@ -338,7 +335,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|IntegerNumberSystem&|))
(LETT |dv$| (LIST '|IntegerNumberSystem&| |dv$1|) . #0#)
- (LETT $ (|newShell| 87) . #0#)
+ (LETT $ (|newShell| 86) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -350,68 +347,67 @@
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|)
(|NonNegativeInteger|) |INS-;characteristic;Nni;1|
(0 . |Zero|) |INS-;differentiate;2S;2| (|Boolean|)
- (4 . |odd?|) (9 . |not|) |INS-;even?;SB;3| (14 . <)
- |INS-;positive?;SB;4| |INS-;copy;2S;5| (20 . -)
- (25 . |shift|) |INS-;bit?;2SB;6| (31 . |One|) (35 . |dec|)
- |INS-;mask;2S;7| |INS-;rational?;SB;8| (40 . =)
- (|Integer|) (46 . |convert|) |INS-;euclideanSize;SNni;9|
- (|Float|) (51 . |coerce|) |INS-;convert;SF;10|
+ (4 . |odd?|) |INS-;even?;SB;3| (9 . <)
+ |INS-;positive?;SB;4| |INS-;copy;2S;5| (15 . -)
+ (20 . |shift|) |INS-;bit?;2SB;6| (26 . |One|) (30 . |dec|)
+ |INS-;mask;2S;7| |INS-;rational?;SB;8| (35 . =)
+ (|Integer|) (41 . |convert|) |INS-;euclideanSize;SNni;9|
+ (|Float|) (46 . |coerce|) |INS-;convert;SF;10|
(|DoubleFloat|) |INS-;convert;SDf;11| (|InputForm|)
- (56 . |convert|) |INS-;convert;SIf;12|
- |INS-;retract;SI;13| (|Pattern| 26) (61 . |coerce|)
+ (51 . |convert|) |INS-;convert;SIf;12|
+ |INS-;retract;SI;13| (|Pattern| 25) (56 . |coerce|)
|INS-;convert;SP;14| (|Factored| 6)
- (|IntegerFactorizationPackage| 6) (66 . |factor|)
- (|Factored| $) |INS-;factor;SF;15| (71 . |squareFree|)
+ (|IntegerFactorizationPackage| 6) (61 . |factor|)
+ (|Factored| $) |INS-;factor;SF;15| (66 . |squareFree|)
|INS-;squareFree;SF;16| (|IntegerPrimesPackage| 6)
- (76 . |prime?|) |INS-;prime?;SB;17|
- (|IntegerCombinatoricFunctions| 6) (81 . |factorial|)
- |INS-;factorial;2S;18| (86 . |binomial|)
- |INS-;binomial;3S;19| (92 . |permutation|)
- |INS-;permutation;3S;20| (|Union| 26 '"failed")
- |INS-;retractIfCan;SU;21| |INS-;init;S;22| (98 . |zero?|)
- (103 . -) (|Union| $ '"failed") |INS-;nextItem;SU;23|
- (|PatternMatchResult| 26 6)
+ (71 . |prime?|) |INS-;prime?;SB;17|
+ (|IntegerCombinatoricFunctions| 6) (76 . |factorial|)
+ |INS-;factorial;2S;18| (81 . |binomial|)
+ |INS-;binomial;3S;19| (87 . |permutation|)
+ |INS-;permutation;3S;20| (|Union| 25 '"failed")
+ |INS-;retractIfCan;SU;21| |INS-;init;S;22| (93 . |zero?|)
+ (98 . -) (|Union| $ '"failed") |INS-;nextItem;SU;23|
+ (|PatternMatchResult| 25 6)
(|PatternMatchIntegerNumberSystem| 6)
- (109 . |patternMatch|) (|PatternMatchResult| 26 $)
- |INS-;patternMatch;SP2Pmr;24| (|Fraction| 26)
- (116 . |coerce|) |INS-;rational;SF;25|
- (|Union| 70 '"failed") |INS-;rationalIfCan;SU;26|
- (121 . |rem|) (|PositiveInteger|) (127 . *) (133 . +)
- |INS-;symmetricRemainder;3S;27| (139 . |negative?|)
- (144 . |positiveRemainder|) (150 . |quo|) (156 . *)
- |INS-;invmod;3S;28| (162 . |mulmod|) |INS-;powmod;4S;29|)
- '#(|symmetricRemainder| 169 |squareFree| 175 |retractIfCan|
- 180 |retract| 185 |rationalIfCan| 190 |rational?| 195
- |rational| 200 |prime?| 205 |powmod| 210 |positive?| 217
- |permutation| 222 |patternMatch| 228 |nextItem| 235 |mask|
- 240 |invmod| 245 |init| 251 |factorial| 255 |factor| 260
- |even?| 265 |euclideanSize| 270 |differentiate| 275 |copy|
- 280 |convert| 285 |characteristic| 305 |bit?| 309
- |binomial| 315)
+ (104 . |patternMatch|) (|PatternMatchResult| 25 $)
+ |INS-;patternMatch;SP2Pmr;24| (|Fraction| 25)
+ (111 . |coerce|) |INS-;rational;SF;25|
+ (|Union| 69 '"failed") |INS-;rationalIfCan;SU;26|
+ (116 . |rem|) (|PositiveInteger|) (122 . *) (128 . +)
+ |INS-;symmetricRemainder;3S;27| (134 . |negative?|)
+ (139 . |positiveRemainder|) (145 . |quo|) (151 . *)
+ |INS-;invmod;3S;28| (157 . |mulmod|) |INS-;powmod;4S;29|)
+ '#(|symmetricRemainder| 164 |squareFree| 170 |retractIfCan|
+ 175 |retract| 180 |rationalIfCan| 185 |rational?| 190
+ |rational| 195 |prime?| 200 |powmod| 205 |positive?| 212
+ |permutation| 217 |patternMatch| 223 |nextItem| 230 |mask|
+ 235 |invmod| 240 |init| 246 |factorial| 250 |factor| 255
+ |even?| 260 |euclideanSize| 265 |differentiate| 270 |copy|
+ 275 |convert| 280 |characteristic| 300 |bit?| 304
+ |binomial| 310)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 86
- '(0 6 0 9 1 6 11 0 12 1 11 0 0 13 2 6
- 11 0 0 15 1 6 0 0 18 2 6 0 0 0 19 0 6
- 0 21 1 6 0 0 22 2 6 11 0 0 25 1 6 26
- 0 27 1 29 0 26 30 1 34 0 26 35 1 38 0
- 26 39 1 42 41 6 43 1 42 41 6 46 1 48
- 11 6 49 1 51 6 6 52 2 51 6 6 6 54 2
- 51 6 6 6 56 1 6 11 0 61 2 6 0 0 0 62
- 3 66 65 6 38 65 67 1 70 0 26 71 2 6 0
- 0 0 75 2 6 0 76 0 77 2 6 0 0 0 78 1 6
- 11 0 80 2 6 0 0 0 81 2 6 0 0 0 82 2 6
- 0 0 0 83 3 6 0 0 0 0 85 2 0 0 0 0 79
- 1 0 44 0 47 1 0 58 0 59 1 0 26 0 37 1
- 0 73 0 74 1 0 11 0 24 1 0 70 0 72 1 0
- 11 0 50 3 0 0 0 0 0 86 1 0 11 0 16 2
- 0 0 0 0 57 3 0 68 0 38 68 69 1 0 63 0
- 64 1 0 0 0 23 2 0 0 0 0 84 0 0 0 60 1
- 0 0 0 53 1 0 44 0 45 1 0 11 0 14 1 0
- 7 0 28 1 0 0 0 10 1 0 0 0 17 1 0 32 0
- 33 1 0 29 0 31 1 0 38 0 40 1 0 34 0
- 36 0 0 7 8 2 0 11 0 0 20 2 0 0 0 0
- 55)))))
+ (|makeByteWordVec2| 85
+ '(0 6 0 9 1 6 11 0 12 2 6 11 0 0 14 1 6
+ 0 0 17 2 6 0 0 0 18 0 6 0 20 1 6 0 0
+ 21 2 6 11 0 0 24 1 6 25 0 26 1 28 0
+ 25 29 1 33 0 25 34 1 37 0 25 38 1 41
+ 40 6 42 1 41 40 6 45 1 47 11 6 48 1
+ 50 6 6 51 2 50 6 6 6 53 2 50 6 6 6 55
+ 1 6 11 0 60 2 6 0 0 0 61 3 65 64 6 37
+ 64 66 1 69 0 25 70 2 6 0 0 0 74 2 6 0
+ 75 0 76 2 6 0 0 0 77 1 6 11 0 79 2 6
+ 0 0 0 80 2 6 0 0 0 81 2 6 0 0 0 82 3
+ 6 0 0 0 0 84 2 0 0 0 0 78 1 0 43 0 46
+ 1 0 57 0 58 1 0 25 0 36 1 0 72 0 73 1
+ 0 11 0 23 1 0 69 0 71 1 0 11 0 49 3 0
+ 0 0 0 0 85 1 0 11 0 15 2 0 0 0 0 56 3
+ 0 67 0 37 67 68 1 0 62 0 63 1 0 0 0
+ 22 2 0 0 0 0 83 0 0 0 59 1 0 0 0 52 1
+ 0 43 0 44 1 0 11 0 13 1 0 7 0 27 1 0
+ 0 0 10 1 0 0 0 16 1 0 31 0 32 1 0 28
+ 0 30 1 0 37 0 39 1 0 33 0 35 0 0 7 8
+ 2 0 11 0 0 19 2 0 0 0 0 54)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index d9dea6b1..a2c66301 100644
--- a/src/algebra/strap/ISTRING.lsp
+++ b/src/algebra/strap/ISTRING.lsp
@@ -430,13 +430,11 @@
((NULL (COND
((< |n| |i|) 'NIL)
('T
- (SPADCALL
- (< (LETT |j|
- (|ISTRING;position;C$2I;19| |c| |s|
- |i| $)
- |ISTRING;split;$CL;22|)
- (|getShellEntry| $ 6))
- (|getShellEntry| $ 56)))))
+ (NOT (< (LETT |j|
+ (|ISTRING;position;C$2I;19| |c|
+ |s| |i| $)
+ |ISTRING;split;$CL;22|)
+ (|getShellEntry| $ 6))))))
(GO G191)))
(SEQ (LETT |l|
(SPADCALL
@@ -444,7 +442,7 @@
(SPADCALL |i| (- |j| 1)
(|getShellEntry| $ 20))
$)
- |l| (|getShellEntry| $ 57))
+ |l| (|getShellEntry| $ 56))
|ISTRING;split;$CL;22|)
(EXIT (SEQ (LETT |i| |j| |ISTRING;split;$CL;22|)
G190
@@ -467,9 +465,9 @@
(|ISTRING;elt;$Us$;31| |s|
(SPADCALL |i| |n| (|getShellEntry| $ 20))
$)
- |l| (|getShellEntry| $ 57))
+ |l| (|getShellEntry| $ 56))
|ISTRING;split;$CL;22|)))
- (EXIT (SPADCALL |l| (|getShellEntry| $ 58)))))))
+ (EXIT (SPADCALL |l| (|getShellEntry| $ 57)))))))
(DEFUN |ISTRING;split;$CcL;23| (|s| |cc| $)
(PROG (|n| |j| |i| |l|)
@@ -494,13 +492,11 @@
((NULL (COND
((< |n| |i|) 'NIL)
('T
- (SPADCALL
- (< (LETT |j|
- (|ISTRING;position;Cc$2I;20| |cc|
- |s| |i| $)
- |ISTRING;split;$CcL;23|)
- (|getShellEntry| $ 6))
- (|getShellEntry| $ 56)))))
+ (NOT (< (LETT |j|
+ (|ISTRING;position;Cc$2I;20| |cc|
+ |s| |i| $)
+ |ISTRING;split;$CcL;23|)
+ (|getShellEntry| $ 6))))))
(GO G191)))
(SEQ (LETT |l|
(SPADCALL
@@ -508,7 +504,7 @@
(SPADCALL |i| (- |j| 1)
(|getShellEntry| $ 20))
$)
- |l| (|getShellEntry| $ 57))
+ |l| (|getShellEntry| $ 56))
|ISTRING;split;$CcL;23|)
(EXIT (SEQ (LETT |i| |j| |ISTRING;split;$CcL;23|)
G190
@@ -531,9 +527,9 @@
(|ISTRING;elt;$Us$;31| |s|
(SPADCALL |i| |n| (|getShellEntry| $ 20))
$)
- |l| (|getShellEntry| $ 57))
+ |l| (|getShellEntry| $ 56))
|ISTRING;split;$CcL;23|)))
- (EXIT (SPADCALL |l| (|getShellEntry| $ 58)))))))
+ (EXIT (SPADCALL |l| (|getShellEntry| $ 57)))))))
(DEFUN |ISTRING;leftTrim;$C$;24| (|s| |c| $)
(PROG (|n| |i|)
@@ -716,23 +712,23 @@
(SPADCALL
(|ISTRING;elt;$IC;30| |s| (|getShellEntry| $ 6)
$)
- (|getShellEntry| $ 68)))
+ (|getShellEntry| $ 67)))
('T
(* (* (SPADCALL
(|ISTRING;elt;$IC;30| |s|
(|getShellEntry| $ 6) $)
- (|getShellEntry| $ 68))
+ (|getShellEntry| $ 67))
(SPADCALL
(|ISTRING;elt;$IC;30| |s|
(- (+ (|getShellEntry| $ 6) |n|) 1)
$)
- (|getShellEntry| $ 68)))
+ (|getShellEntry| $ 67)))
(SPADCALL
(|ISTRING;elt;$IC;30| |s|
(+ (|getShellEntry| $ 6)
(QUOTIENT2 |n| 2))
$)
- (|getShellEntry| $ 68))))))))))
+ (|getShellEntry| $ 67))))))))))
(DEFUN |ISTRING;match;2$CNni;33| (|pattern| |target| |wildcard| $)
(|stringMatch| |pattern| |target| (CHARACTER |wildcard|)))
@@ -763,7 +759,7 @@
('T
(SEQ (COND
((SPADCALL |p| |m|
- (|getShellEntry| $ 71))
+ (|getShellEntry| $ 70))
(COND
((NULL
(SPADCALL
@@ -773,7 +769,7 @@
(|getShellEntry| $ 20))
$)
|target|
- (|getShellEntry| $ 72)))
+ (|getShellEntry| $ 71)))
(EXIT 'NIL)))))
(LETT |i| |p|
|ISTRING;match?;2$CB;34|)
@@ -791,7 +787,7 @@
(COND
((NULL
(SPADCALL |q| (- |m| 1)
- (|getShellEntry| $ 71)))
+ (|getShellEntry| $ 70)))
(GO G191)))
(SEQ
(LETT |s|
@@ -839,7 +835,7 @@
NIL (GO G190) G191 (EXIT NIL))
(COND
((SPADCALL |p| |n|
- (|getShellEntry| $ 71))
+ (|getShellEntry| $ 70))
(COND
((NULL
(|ISTRING;suffix?;2$B;21|
@@ -879,7 +875,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|IndexedString|))
(LETT |dv$| (LIST '|IndexedString| |dv$1|) . #0#)
- (LETT $ (|newShell| 85) . #0#)
+ (LETT $ (|newShell| 84) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -942,34 +938,34 @@
|ISTRING;position;2$2I;18| |ISTRING;position;C$2I;19|
(64 . |member?|) |ISTRING;position;Cc$2I;20|
|ISTRING;suffix?;2$B;21| |ISTRING;elt;$IC;30| (70 . =)
- (|List| $$) (76 . |empty|) (80 . |not|) (85 . |concat|)
- (91 . |reverse!|) (|List| $) |ISTRING;split;$CL;22|
+ (|List| $$) (76 . |empty|) (80 . |concat|)
+ (86 . |reverse!|) (|List| $) |ISTRING;split;$CL;22|
|ISTRING;split;$CcL;23| |ISTRING;leftTrim;$C$;24|
|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 . ~=) (107 . |prefix?|)
+ |ISTRING;concat;L$;28| (91 . |ord|) |ISTRING;hash;$I;32|
+ |ISTRING;match;2$CNni;33| (96 . ~=) (102 . |prefix?|)
|ISTRING;match?;2$CB;34| (|List| 8) (|Equation| 8)
- (|List| 75) (|Mapping| 8 8 8) (|InputForm|)
+ (|List| 74) (|Mapping| 8 8 8) (|InputForm|)
(|SingleInteger|) (|Mapping| 11 8) (|Mapping| 11 8 8)
(|Void|) (|Union| 8 '"failed") (|List| 18))
- '#(~= 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)
+ '#(~= 108 |upperCase!| 114 |upperCase| 119 |trim| 124 |swap!|
+ 136 |suffix?| 143 |substring?| 149 |split| 156 |sorted?|
+ 168 |sort!| 179 |sort| 190 |size?| 201 |setelt| 207
+ |select| 221 |sample| 227 |rightTrim| 231 |reverse!| 243
+ |reverse| 248 |replace| 253 |removeDuplicates| 260
+ |remove| 265 |reduce| 277 |qsetelt!| 298 |qelt| 305
+ |prefix?| 311 |position| 317 |parts| 350 |new| 355 |more?|
+ 361 |minIndex| 367 |min| 372 |merge| 378 |members| 391
+ |member?| 396 |maxIndex| 402 |max| 407 |match?| 413
+ |match| 420 |map!| 427 |map| 433 |lowerCase!| 446
+ |lowerCase| 451 |less?| 456 |leftTrim| 462 |latex| 474
+ |insert| 479 |indices| 493 |index?| 498 |hash| 504 |first|
+ 514 |find| 519 |fill!| 525 |every?| 531 |eval| 537 |eq?|
+ 563 |entry?| 569 |entries| 575 |empty?| 580 |empty| 585
+ |elt| 589 |delete| 614 |count| 626 |copyInto!| 638 |copy|
+ 645 |convert| 650 |construct| 655 |concat| 660 |coerce|
+ 683 |any?| 693 >= 699 > 705 = 711 <= 717 < 723 |#| 729)
'((|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))
@@ -992,52 +988,51 @@
(|EltableAggregate| 18 8) (|Evalable| 8)
(|SetCategory|) (|Type|)
(|Eltable| 18 8) (|InnerEvalable| 8 8)
- (|CoercibleTo| 25) (|ConvertibleTo| 78)
+ (|CoercibleTo| 25) (|ConvertibleTo| 77)
(|BasicType|))
- (|makeByteWordVec2| 84
+ (|makeByteWordVec2| 83
'(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 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 9 0 0 74 74 1 3
- 9 0 0 8 8 1 2 9 0 0 76 1 2 9 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 8 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)))))
+ 0 54 0 55 2 54 0 2 0 56 1 54 0 0 57 1
+ 8 7 0 67 2 18 11 0 0 70 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 58
+ 0 29 60 2 0 58 0 8 59 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 63 2 0 0 0 29 64 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 69 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 61 2 0 0 0 29 62 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 68 1
+ 6 8 0 1 2 0 82 79 0 1 2 0 0 0 8 1 2 0
+ 11 79 0 1 3 9 0 0 73 73 1 3 9 0 0 8 8
+ 1 2 9 0 0 75 1 2 9 0 0 74 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 65 1 0 0 0 17 1 3
+ 77 0 1 1 0 0 73 1 1 0 0 58 66 2 0 0 0
+ 0 16 2 0 0 0 8 1 2 0 0 8 0 1 1 8 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)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp
index 43656399..8e1a47d8 100644
--- a/src/algebra/strap/LIST.lsp
+++ b/src/algebra/strap/LIST.lsp
@@ -63,15 +63,12 @@
(DEFUN |LIST;writeOMList| (|dev| |x| $)
(SEQ (SPADCALL |dev| (|getShellEntry| $ 14))
(SPADCALL |dev| "list1" "list" (|getShellEntry| $ 16))
- (SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |x|) (|getShellEntry| $ 17)))
- (GO G191)))
+ (SEQ G190 (COND ((NULL (NOT (NULL |x|))) (GO G191)))
(SEQ (SPADCALL |dev| (|SPADfirst| |x|) 'NIL
- (|getShellEntry| $ 18))
+ (|getShellEntry| $ 17))
(EXIT (LETT |x| (CDR |x|) |LIST;writeOMList|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 19)))))
+ (EXIT (SPADCALL |dev| (|getShellEntry| $ 18)))))
(DEFUN |LIST;OMwrite;$S;6| (|x| $)
(PROG (|sp| |dev| |s|)
@@ -79,13 +76,13 @@
(SEQ (LETT |s| "" |LIST;OMwrite;$S;6|)
(LETT |sp| (OM-STRINGTOSTRINGPTR |s|) |LIST;OMwrite;$S;6|)
(LETT |dev|
- (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 21))
- (|getShellEntry| $ 22))
+ (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 20))
+ (|getShellEntry| $ 21))
|LIST;OMwrite;$S;6|)
- (SPADCALL |dev| (|getShellEntry| $ 23))
+ (SPADCALL |dev| (|getShellEntry| $ 22))
(|LIST;writeOMList| |dev| |x| $)
+ (SPADCALL |dev| (|getShellEntry| $ 23))
(SPADCALL |dev| (|getShellEntry| $ 24))
- (SPADCALL |dev| (|getShellEntry| $ 25))
(LETT |s| (OM-STRINGPTRTOSTRING |sp|) |LIST;OMwrite;$S;6|)
(EXIT |s|)))))
@@ -95,44 +92,41 @@
(SEQ (LETT |s| "" |LIST;OMwrite;$BS;7|)
(LETT |sp| (OM-STRINGTOSTRINGPTR |s|) |LIST;OMwrite;$BS;7|)
(LETT |dev|
- (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 21))
- (|getShellEntry| $ 22))
+ (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 20))
+ (|getShellEntry| $ 21))
|LIST;OMwrite;$BS;7|)
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23))))
+ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 22))))
(|LIST;writeOMList| |dev| |x| $)
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 24))))
- (SPADCALL |dev| (|getShellEntry| $ 25))
+ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23))))
+ (SPADCALL |dev| (|getShellEntry| $ 24))
(LETT |s| (OM-STRINGPTRTOSTRING |sp|) |LIST;OMwrite;$BS;7|)
(EXIT |s|)))))
(DEFUN |LIST;OMwrite;Omd$V;8| (|dev| |x| $)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 23))
+ (SEQ (SPADCALL |dev| (|getShellEntry| $ 22))
(|LIST;writeOMList| |dev| |x| $)
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 24)))))
+ (EXIT (SPADCALL |dev| (|getShellEntry| $ 23)))))
(DEFUN |LIST;OMwrite;Omd$BV;9| (|dev| |x| |wholeObj| $)
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 22))))
(|LIST;writeOMList| |dev| |x| $)
(EXIT (COND
- (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 24)))))))
+ (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23)))))))
(DEFUN |LIST;setUnion;3$;10| (|l1| |l2| $)
- (SPADCALL (SPADCALL |l1| |l2| (|getShellEntry| $ 30))
- (|getShellEntry| $ 31)))
+ (SPADCALL (SPADCALL |l1| |l2| (|getShellEntry| $ 29))
+ (|getShellEntry| $ 30)))
(DEFUN |LIST;setIntersection;3$;11| (|l1| |l2| $)
(PROG (|u|)
(RETURN
(SEQ (LETT |u| NIL |LIST;setIntersection;3$;11|)
- (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 31))
+ (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 30))
|LIST;setIntersection;3$;11|)
- (SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |l1|) (|getShellEntry| $ 17)))
- (GO G191)))
+ (SEQ G190 (COND ((NULL (NOT (NULL |l1|))) (GO G191)))
(SEQ (COND
((SPADCALL (|SPADfirst| |l1|) |l2|
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 32))
(LETT |u| (CONS (|SPADfirst| |l1|) |u|)
|LIST;setIntersection;3$;11|)))
(EXIT (LETT |l1| (CDR |l1|)
@@ -143,19 +137,16 @@
(DEFUN |LIST;setDifference;3$;12| (|l1| |l2| $)
(PROG (|l11| |lu|)
(RETURN
- (SEQ (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 31))
+ (SEQ (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 30))
|LIST;setDifference;3$;12|)
(LETT |lu| NIL |LIST;setDifference;3$;12|)
- (SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |l1|) (|getShellEntry| $ 17)))
- (GO G191)))
+ (SEQ G190 (COND ((NULL (NOT (NULL |l1|))) (GO G191)))
(SEQ (LETT |l11|
- (SPADCALL |l1| 1 (|getShellEntry| $ 36))
+ (SPADCALL |l1| 1 (|getShellEntry| $ 35))
|LIST;setDifference;3$;12|)
(COND
((NULL (SPADCALL |l11| |l2|
- (|getShellEntry| $ 33)))
+ (|getShellEntry| $ 32)))
(LETT |lu| (CONS |l11| |lu|)
|LIST;setDifference;3$;12|)))
(EXIT (LETT |l1| (CDR |l1|)
@@ -168,8 +159,8 @@
(RETURN
(SEQ (SPADCALL
(CONS (SPADCALL
- (SPADCALL "construct" (|getShellEntry| $ 39))
- (|getShellEntry| $ 41))
+ (SPADCALL "construct" (|getShellEntry| $ 38))
+ (|getShellEntry| $ 40))
(PROGN
(LETT #0# NIL |LIST;convert;$If;13|)
(SEQ (LETT |a| NIL |LIST;convert;$If;13|)
@@ -184,12 +175,12 @@
(SEQ (EXIT (LETT #0#
(CONS
(SPADCALL |a|
- (|getShellEntry| $ 42))
+ (|getShellEntry| $ 41))
#0#)
|LIST;convert;$If;13|)))
(LETT #1# (CDR #1#) |LIST;convert;$If;13|)
(GO G190) G191 (EXIT (NREVERSE0 #0#)))))
- (|getShellEntry| $ 44))))))
+ (|getShellEntry| $ 43))))))
(DEFUN |List| (#0=#:G1444)
(PROG ()
@@ -214,7 +205,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|List|))
(LETT |dv$| (LIST '|List| |dv$1|) . #0#)
- (LETT $ (|newShell| 63) . #0#)
+ (LETT $ (|newShell| 62) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -257,29 +248,29 @@
(COND
((|testBitVector| |pv$| 6)
(PROGN
- (|setShellEntry| $ 26
+ (|setShellEntry| $ 25
(CONS (|dispatchFunction| |LIST;OMwrite;$S;6|) $))
- (|setShellEntry| $ 27
+ (|setShellEntry| $ 26
(CONS (|dispatchFunction| |LIST;OMwrite;$BS;7|) $))
- (|setShellEntry| $ 28
+ (|setShellEntry| $ 27
(CONS (|dispatchFunction| |LIST;OMwrite;Omd$V;8|) $))
- (|setShellEntry| $ 29
+ (|setShellEntry| $ 28
(CONS (|dispatchFunction| |LIST;OMwrite;Omd$BV;9|) $)))))
(COND
((|testBitVector| |pv$| 8)
(PROGN
- (|setShellEntry| $ 32
+ (|setShellEntry| $ 31
(CONS (|dispatchFunction| |LIST;setUnion;3$;10|) $))
- (|setShellEntry| $ 34
+ (|setShellEntry| $ 33
(CONS (|dispatchFunction|
|LIST;setIntersection;3$;11|)
$))
- (|setShellEntry| $ 37
+ (|setShellEntry| $ 36
(CONS (|dispatchFunction| |LIST;setDifference;3$;12|)
$)))))
(COND
((|testBitVector| |pv$| 3)
- (|setShellEntry| $ 45
+ (|setShellEntry| $ 44
(CONS (|dispatchFunction| |LIST;convert;$If;13|) $))))
$))))
@@ -288,26 +279,26 @@
(|local| |#1|) |LIST;nil;$;1| (|Boolean|) |LIST;null;$B;2|
|LIST;cons;S2$;3| |LIST;append;3$;4| (|Void|)
(|OpenMathDevice|) (0 . |OMputApp|) (|String|)
- (5 . |OMputSymbol|) (12 . |not|) (17 . |OMwrite|)
- (24 . |OMputEndApp|) (|OpenMathEncoding|)
- (29 . |OMencodingXML|) (33 . |OMopenString|)
- (39 . |OMputObject|) (44 . |OMputEndObject|)
- (49 . |OMclose|) (54 . |OMwrite|) (59 . |OMwrite|)
- (65 . |OMwrite|) (71 . |OMwrite|) (78 . |concat|)
- (84 . |removeDuplicates|) (89 . |setUnion|)
- (95 . |member?|) (101 . |setIntersection|) (|Integer|)
- (107 . |elt|) (113 . |setDifference|) (|Symbol|)
- (119 . |coerce|) (|InputForm|) (124 . |convert|)
- (129 . |convert|) (|List| $) (134 . |convert|)
- (139 . |convert|) (|Mapping| 6 6 6) (|NonNegativeInteger|)
- (|List| 6) (|Equation| 6) (|List| 49) (|Mapping| 8 6)
- (|Mapping| 8 6 6) (|UniversalSegment| 35) '"last" '"rest"
+ (5 . |OMputSymbol|) (12 . |OMwrite|) (19 . |OMputEndApp|)
+ (|OpenMathEncoding|) (24 . |OMencodingXML|)
+ (28 . |OMopenString|) (34 . |OMputObject|)
+ (39 . |OMputEndObject|) (44 . |OMclose|) (49 . |OMwrite|)
+ (54 . |OMwrite|) (60 . |OMwrite|) (66 . |OMwrite|)
+ (73 . |concat|) (79 . |removeDuplicates|)
+ (84 . |setUnion|) (90 . |member?|)
+ (96 . |setIntersection|) (|Integer|) (102 . |elt|)
+ (108 . |setDifference|) (|Symbol|) (114 . |coerce|)
+ (|InputForm|) (119 . |convert|) (124 . |convert|)
+ (|List| $) (129 . |convert|) (134 . |convert|)
+ (|Mapping| 6 6 6) (|NonNegativeInteger|) (|List| 6)
+ (|Equation| 6) (|List| 48) (|Mapping| 8 6)
+ (|Mapping| 8 6 6) (|UniversalSegment| 34) '"last" '"rest"
'"first" '"value" (|Mapping| 6 6) (|OutputForm|)
- (|SingleInteger|) (|List| 35) (|Union| 6 '"failed"))
- '#(|setUnion| 144 |setIntersection| 150 |setDifference| 156
- |removeDuplicates| 162 |null| 167 |nil| 172 |member?| 176
- |elt| 182 |convert| 188 |cons| 193 |concat| 199 |append|
- 205 |OMwrite| 211)
+ (|SingleInteger|) (|List| 34) (|Union| 6 '"failed"))
+ '#(|setUnion| 139 |setIntersection| 145 |setDifference| 151
+ |removeDuplicates| 157 |null| 162 |nil| 167 |member?| 171
+ |elt| 177 |convert| 183 |cons| 188 |concat| 194 |append|
+ 200 |OMwrite| 206)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
(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))
@@ -327,29 +318,29 @@
(|UnaryRecursiveAggregate| 6)
(|LinearAggregate| 6)
(|RecursiveAggregate| 6)
- (|IndexedAggregate| 35 6)
+ (|IndexedAggregate| 34 6)
(|Collection| 6)
(|HomogeneousAggregate| 6)
(|OrderedSet|) (|Aggregate|)
- (|EltableAggregate| 35 6) (|Evalable| 6)
+ (|EltableAggregate| 34 6) (|Evalable| 6)
(|SetCategory|) (|Type|)
- (|Eltable| 35 6) (|InnerEvalable| 6 6)
- (|CoercibleTo| 59) (|ConvertibleTo| 40)
+ (|Eltable| 34 6) (|InnerEvalable| 6 6)
+ (|CoercibleTo| 58) (|ConvertibleTo| 39)
(|BasicType|) (|OpenMath|))
- (|makeByteWordVec2| 45
- '(1 13 12 0 14 3 13 12 0 15 15 16 1 8 0
- 0 17 3 6 12 13 0 8 18 1 13 12 0 19 0
- 20 0 21 2 13 0 15 20 22 1 13 12 0 23
- 1 13 12 0 24 1 13 12 0 25 1 0 15 0 26
- 2 0 15 0 8 27 2 0 12 13 0 28 3 0 12
- 13 0 8 29 2 0 0 0 0 30 1 0 0 0 31 2 0
- 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 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 6 12 13 0 8 29 2 6 12 13 0
- 28 1 6 15 0 26 2 6 15 0 8 27)))))
+ (|makeByteWordVec2| 44
+ '(1 13 12 0 14 3 13 12 0 15 15 16 3 6
+ 12 13 0 8 17 1 13 12 0 18 0 19 0 20 2
+ 13 0 15 19 21 1 13 12 0 22 1 13 12 0
+ 23 1 13 12 0 24 1 0 15 0 25 2 0 15 0
+ 8 26 2 0 12 13 0 27 3 0 12 13 0 8 28
+ 2 0 0 0 0 29 1 0 0 0 30 2 0 0 0 0 31
+ 2 0 8 6 0 32 2 0 0 0 0 33 2 0 6 0 34
+ 35 2 0 0 0 0 36 1 37 0 15 38 1 39 0
+ 37 40 1 6 39 0 41 1 39 0 42 43 1 0 39
+ 0 44 2 8 0 0 0 31 2 8 0 0 0 33 2 8 0
+ 0 0 36 1 8 0 0 30 1 0 8 0 9 0 0 0 7 2
+ 8 8 6 0 32 2 0 6 0 34 35 1 3 39 0 44
+ 2 0 0 6 0 10 2 0 0 0 0 29 2 0 0 0 0
+ 11 3 6 12 13 0 8 28 2 6 12 13 0 27 1
+ 6 15 0 25 2 6 15 0 8 26)))))
'|lookupIncomplete|))
diff --git a/src/algebra/strap/LNAGG-.lsp b/src/algebra/strap/LNAGG-.lsp
index b997b6b1..258f83de 100644
--- a/src/algebra/strap/LNAGG-.lsp
+++ b/src/algebra/strap/LNAGG-.lsp
@@ -38,24 +38,22 @@
(DEFUN |LNAGG-;index?;IAB;2| (|i| |a| $)
(COND
((< |i| (SPADCALL |a| (|getShellEntry| $ 9))) 'NIL)
- ('T
- (SPADCALL (< (SPADCALL |a| (|getShellEntry| $ 10)) |i|)
- (|getShellEntry| $ 14)))))
+ ('T (NOT (< (SPADCALL |a| (|getShellEntry| $ 10)) |i|)))))
(DEFUN |LNAGG-;concat;ASA;3| (|a| |x| $)
- (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 17))
- (|getShellEntry| $ 18)))
+ (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 16))
+ (|getShellEntry| $ 17)))
(DEFUN |LNAGG-;concat;S2A;4| (|x| |y| $)
- (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 17)) |y|
- (|getShellEntry| $ 18)))
+ (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 16)) |y|
+ (|getShellEntry| $ 17)))
(DEFUN |LNAGG-;insert;SAIA;5| (|x| |a| |i| $)
- (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 17)) |a| |i|
- (|getShellEntry| $ 21)))
+ (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 16)) |a| |i|
+ (|getShellEntry| $ 20)))
(DEFUN |LNAGG-;maxIndex;AI;6| (|l| $)
- (+ (- (SPADCALL |l| (|getShellEntry| $ 23)) 1)
+ (+ (- (SPADCALL |l| (|getShellEntry| $ 22)) 1)
(SPADCALL |l| (|getShellEntry| $ 9))))
(DEFUN |LinearAggregate&| (|#1| |#2|)
@@ -65,7 +63,7 @@
(LETT |dv$1| (|devaluate| |#1|) . #0=(|LinearAggregate&|))
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$| (LIST '|LinearAggregate&| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 26) . #0#)
+ (LETT $ (|newShell| 25) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -76,29 +74,28 @@
(|setShellEntry| $ 7 |#2|)
(COND
((|HasAttribute| |#1| '|finiteAggregate|)
- (|setShellEntry| $ 24
+ (|setShellEntry| $ 23
(CONS (|dispatchFunction| |LNAGG-;maxIndex;AI;6|) $))))
$))))
(MAKEPROP '|LinearAggregate&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|)
(|Integer|) (0 . |minIndex|) (5 . |maxIndex|) (|List| 8)
- |LNAGG-;indices;AL;1| (|Boolean|) (10 . |not|)
- |LNAGG-;index?;IAB;2| (|NonNegativeInteger|) (15 . |new|)
- (21 . |concat|) |LNAGG-;concat;ASA;3|
- |LNAGG-;concat;S2A;4| (27 . |insert|)
- |LNAGG-;insert;SAIA;5| (34 . |#|) (39 . |maxIndex|)
- (|List| $))
- '#(|maxIndex| 44 |insert| 49 |indices| 56 |index?| 61
- |concat| 67)
+ |LNAGG-;indices;AL;1| (|Boolean|) |LNAGG-;index?;IAB;2|
+ (|NonNegativeInteger|) (10 . |new|) (16 . |concat|)
+ |LNAGG-;concat;ASA;3| |LNAGG-;concat;S2A;4|
+ (22 . |insert|) |LNAGG-;insert;SAIA;5| (29 . |#|)
+ (34 . |maxIndex|) (|List| $))
+ '#(|maxIndex| 39 |insert| 44 |indices| 51 |index?| 56
+ |concat| 62)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 24
- '(1 6 8 0 9 1 6 8 0 10 1 13 0 0 14 2 6
- 0 16 7 17 2 6 0 0 0 18 3 6 0 0 0 8 21
- 1 6 16 0 23 1 0 8 0 24 1 0 8 0 24 3 0
- 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)))))
+ (|makeByteWordVec2| 23
+ '(1 6 8 0 9 1 6 8 0 10 2 6 0 15 7 16 2
+ 6 0 0 0 17 3 6 0 0 0 8 20 1 6 15 0 22
+ 1 0 8 0 23 1 0 8 0 23 3 0 0 7 0 8 21
+ 1 0 11 0 12 2 0 13 8 0 14 2 0 0 0 7
+ 18 2 0 0 7 0 19)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp
index 504a9575..c33ce4f3 100644
--- a/src/algebra/strap/LSAGG-.lsp
+++ b/src/algebra/strap/LSAGG-.lsp
@@ -115,12 +115,10 @@
((NULL (COND
((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL)
('T
- (SPADCALL
- (SPADCALL
- (SPADCALL |x|
- (|getShellEntry| $ 18))
- |f|)
- (|getShellEntry| $ 25)))))
+ (NOT (SPADCALL
+ (SPADCALL |x|
+ (|getShellEntry| $ 18))
+ |f|)))))
(GO G191)))
(SEQ (EXIT (LETT |x|
(SPADCALL |x| (|getShellEntry| $ 17))
@@ -135,10 +133,9 @@
|LSAGG-;select!;M2A;5|)
(SEQ G190
(COND
- ((NULL (SPADCALL
+ ((NULL (NOT
(SPADCALL |z|
- (|getShellEntry| $ 16))
- (|getShellEntry| $ 25)))
+ (|getShellEntry| $ 16))))
(GO G191)))
(SEQ (EXIT
(COND
@@ -162,7 +159,7 @@
|LSAGG-;select!;M2A;5|)
(EXIT
(SPADCALL |y| |z|
- (|getShellEntry| $ 26))))))))
+ (|getShellEntry| $ 25))))))))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |x|)))))))))
@@ -172,7 +169,7 @@
(SEQ (COND
((SPADCALL |p| (|getShellEntry| $ 16)) |q|)
((SPADCALL |q| (|getShellEntry| $ 16)) |p|)
- ((SPADCALL |p| |q| (|getShellEntry| $ 29))
+ ((SPADCALL |p| |q| (|getShellEntry| $ 28))
(|error| "cannot merge a list into itself"))
('T
(SEQ (COND
@@ -200,10 +197,9 @@
(|getShellEntry| $ 16))
'NIL)
('T
- (SPADCALL
+ (NOT
(SPADCALL |q|
- (|getShellEntry| $ 16))
- (|getShellEntry| $ 25)))))
+ (|getShellEntry| $ 16))))))
(GO G191)))
(SEQ (EXIT (COND
((SPADCALL
@@ -214,7 +210,7 @@
|f|)
(SEQ
(SPADCALL |t| |p|
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
(LETT |t| |p|
|LSAGG-;merge!;M3A;6|)
(EXIT
@@ -225,7 +221,7 @@
('T
(SEQ
(SPADCALL |t| |q|
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
(LETT |t| |q|
|LSAGG-;merge!;M3A;6|)
(EXIT
@@ -238,13 +234,13 @@
(COND
((SPADCALL |p| (|getShellEntry| $ 16)) |q|)
('T |p|))
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
(EXIT |r|))))))))
(DEFUN |LSAGG-;insert!;SAIA;7| (|s| |x| |i| $)
(PROG (|m| #0=#:G1464 |y| |z|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 31))
|LSAGG-;insert!;SAIA;7|)
(EXIT (COND
((< |i| |m|) (|error| "index out of range"))
@@ -258,25 +254,25 @@
|LSAGG-;insert!;SAIA;7|)
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 32))
|LSAGG-;insert!;SAIA;7|)
(LETT |z|
(SPADCALL |y| (|getShellEntry| $ 17))
|LSAGG-;insert!;SAIA;7|)
(SPADCALL |y|
(SPADCALL |s| |z| (|getShellEntry| $ 14))
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
(EXIT |x|)))))))))
(DEFUN |LSAGG-;insert!;2AIA;8| (|w| |x| |i| $)
(PROG (|m| #0=#:G1468 |y| |z|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 31))
|LSAGG-;insert!;2AIA;8|)
(EXIT (COND
((< |i| |m|) (|error| "index out of range"))
((EQL |i| |m|)
- (SPADCALL |w| |x| (|getShellEntry| $ 35)))
+ (SPADCALL |w| |x| (|getShellEntry| $ 34)))
('T
(SEQ (LETT |y|
(SPADCALL |x|
@@ -285,13 +281,13 @@
|LSAGG-;insert!;2AIA;8|)
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 32))
|LSAGG-;insert!;2AIA;8|)
(LETT |z|
(SPADCALL |y| (|getShellEntry| $ 17))
|LSAGG-;insert!;2AIA;8|)
- (SPADCALL |y| |w| (|getShellEntry| $ 26))
- (SPADCALL |y| |z| (|getShellEntry| $ 35))
+ (SPADCALL |y| |w| (|getShellEntry| $ 25))
+ (SPADCALL |y| |z| (|getShellEntry| $ 34))
(EXIT |x|)))))))))
(DEFUN |LSAGG-;remove!;M2A;9| (|f| |x| $)
@@ -319,10 +315,9 @@
|LSAGG-;remove!;M2A;9|)
(SEQ G190
(COND
- ((NULL (SPADCALL
+ ((NULL (NOT
(SPADCALL |q|
- (|getShellEntry| $ 16))
- (|getShellEntry| $ 25)))
+ (|getShellEntry| $ 16))))
(GO G191)))
(SEQ (EXIT
(COND
@@ -334,7 +329,7 @@
(SPADCALL |p|
(SPADCALL |q|
(|getShellEntry| $ 17))
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
|LSAGG-;remove!;M2A;9|))
('T
(SEQ
@@ -351,7 +346,7 @@
(DEFUN |LSAGG-;delete!;AIA;10| (|x| |i| $)
(PROG (|m| #0=#:G1480 |y|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 31))
|LSAGG-;delete!;AIA;10|)
(EXIT (COND
((< |i| |m|) (|error| "index out of range"))
@@ -365,29 +360,29 @@
|LSAGG-;delete!;AIA;10|)
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 32))
|LSAGG-;delete!;AIA;10|)
(SPADCALL |y|
- (SPADCALL |y| 2 (|getShellEntry| $ 33))
- (|getShellEntry| $ 26))
+ (SPADCALL |y| 2 (|getShellEntry| $ 32))
+ (|getShellEntry| $ 25))
(EXIT |x|)))))))))
(DEFUN |LSAGG-;delete!;AUsA;11| (|x| |i| $)
(PROG (|l| |m| |h| #0=#:G1485 #1=#:G1486 |t| #2=#:G1487)
(RETURN
- (SEQ (LETT |l| (SPADCALL |i| (|getShellEntry| $ 40))
+ (SEQ (LETT |l| (SPADCALL |i| (|getShellEntry| $ 39))
|LSAGG-;delete!;AUsA;11|)
- (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 31))
|LSAGG-;delete!;AUsA;11|)
(EXIT (COND
((< |l| |m|) (|error| "index out of range"))
('T
(SEQ (LETT |h|
(COND
- ((SPADCALL |i| (|getShellEntry| $ 41))
- (SPADCALL |i| (|getShellEntry| $ 42)))
+ ((SPADCALL |i| (|getShellEntry| $ 40))
+ (SPADCALL |i| (|getShellEntry| $ 41)))
('T
- (SPADCALL |x| (|getShellEntry| $ 43))))
+ (SPADCALL |x| (|getShellEntry| $ 42))))
|LSAGG-;delete!;AUsA;11|)
(EXIT (COND
((< |h| |l|) |x|)
@@ -398,7 +393,7 @@
|LSAGG-;delete!;AUsA;11|)
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 33)))
+ (|getShellEntry| $ 32)))
('T
(SEQ (LETT |t|
(SPADCALL |x|
@@ -408,7 +403,7 @@
(|check-subtype| (>= #1# 0)
'(|NonNegativeInteger|)
#1#))
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 32))
|LSAGG-;delete!;AUsA;11|)
(SPADCALL |t|
(SPADCALL |t|
@@ -418,8 +413,8 @@
(|check-subtype| (>= #2# 0)
'(|NonNegativeInteger|)
#2#))
- (|getShellEntry| $ 33))
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 32))
+ (|getShellEntry| $ 25))
(EXIT |x|)))))))))))))
(DEFUN |LSAGG-;find;MAU;12| (|f| |x| $)
@@ -428,11 +423,9 @@
((NULL (COND
((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL)
('T
- (SPADCALL
- (SPADCALL
- (SPADCALL |x| (|getShellEntry| $ 18))
- |f|)
- (|getShellEntry| $ 25)))))
+ (NOT (SPADCALL
+ (SPADCALL |x| (|getShellEntry| $ 18))
+ |f|)))))
(GO G191)))
(SEQ (EXIT (LETT |x| (SPADCALL |x| (|getShellEntry| $ 17))
|LSAGG-;find;MAU;12|)))
@@ -445,19 +438,17 @@
(DEFUN |LSAGG-;position;MAI;13| (|f| |x| $)
(PROG (|k|)
(RETURN
- (SEQ (SEQ (LETT |k| (SPADCALL |x| (|getShellEntry| $ 32))
+ (SEQ (SEQ (LETT |k| (SPADCALL |x| (|getShellEntry| $ 31))
|LSAGG-;position;MAI;13|)
G190
(COND
((NULL (COND
((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL)
('T
- (SPADCALL
- (SPADCALL
- (SPADCALL |x|
- (|getShellEntry| $ 18))
- |f|)
- (|getShellEntry| $ 25)))))
+ (NOT (SPADCALL
+ (SPADCALL |x|
+ (|getShellEntry| $ 18))
+ |f|)))))
(GO G191)))
(SEQ (EXIT (LETT |x|
(SPADCALL |x| (|getShellEntry| $ 17))
@@ -466,7 +457,7 @@
G191 (EXIT NIL))
(EXIT (COND
((SPADCALL |x| (|getShellEntry| $ 16))
- (- (SPADCALL |x| (|getShellEntry| $ 32)) 1))
+ (- (SPADCALL |x| (|getShellEntry| $ 31)) 1))
('T |k|)))))))
(DEFUN |LSAGG-;mergeSort| (|f| |p| |n| $)
@@ -479,7 +470,7 @@
(SPADCALL (SPADCALL |p| (|getShellEntry| $ 17))
(|getShellEntry| $ 18))
(SPADCALL |p| (|getShellEntry| $ 18)) |f|)
- (LETT |p| (SPADCALL |p| (|getShellEntry| $ 48))
+ (LETT |p| (SPADCALL |p| (|getShellEntry| $ 47))
|LSAGG-;mergeSort|)))))
(EXIT (COND
((< |n| 3) |p|)
@@ -492,7 +483,7 @@
|LSAGG-;mergeSort|)
(LETT |q|
(SPADCALL |p| |l|
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 48))
|LSAGG-;mergeSort|)
(LETT |p| (|LSAGG-;mergeSort| |f| |p| |l| $)
|LSAGG-;mergeSort|)
@@ -514,10 +505,9 @@
|LSAGG-;sorted?;MAB;15|)
(SEQ G190
(COND
- ((NULL (SPADCALL
+ ((NULL (NOT
(SPADCALL |p|
- (|getShellEntry| $ 16))
- (|getShellEntry| $ 25)))
+ (|getShellEntry| $ 16))))
(GO G191)))
(SEQ (EXIT
(COND
@@ -549,9 +539,7 @@
(SEQ (LETT |r| |i| |LSAGG-;reduce;MA2S;16|)
(SEQ G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |x| (|getShellEntry| $ 16))
- (|getShellEntry| $ 25)))
+ ((NULL (NOT (SPADCALL |x| (|getShellEntry| $ 16))))
(GO G191)))
(SEQ (LETT |r|
(SPADCALL |r|
@@ -573,7 +561,7 @@
((NULL (COND
((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL)
('T
- (SPADCALL |r| |a| (|getShellEntry| $ 52)))))
+ (SPADCALL |r| |a| (|getShellEntry| $ 51)))))
(GO G191)))
(SEQ (LETT |r|
(SPADCALL |r|
@@ -611,9 +599,7 @@
((NULL (COND
((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL)
('T
- (SPADCALL
- (SPADCALL |y| (|getShellEntry| $ 16))
- (|getShellEntry| $ 25)))))
+ (NOT (SPADCALL |y| (|getShellEntry| $ 16))))))
(GO G191)))
(SEQ (LETT |z|
(SPADCALL
@@ -631,7 +617,7 @@
(SPADCALL |y| (|getShellEntry| $ 17))
|LSAGG-;map;M3A;19|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |z| (|getShellEntry| $ 48)))))))
+ (EXIT (SPADCALL |z| (|getShellEntry| $ 47)))))))
(DEFUN |LSAGG-;reverse!;2A;20| (|x| $)
(PROG (|z| |y|)
@@ -645,19 +631,17 @@
|x|)
('T
(SEQ (SPADCALL |x| (SPADCALL (|getShellEntry| $ 13))
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 25))
(SEQ G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |y|
- (|getShellEntry| $ 16))
- (|getShellEntry| $ 25)))
+ ((NULL (NOT (SPADCALL |y|
+ (|getShellEntry| $ 16))))
(GO G191)))
(SEQ (LETT |z|
(SPADCALL |y|
(|getShellEntry| $ 17))
|LSAGG-;reverse!;2A;20|)
- (SPADCALL |y| |x| (|getShellEntry| $ 26))
+ (SPADCALL |y| |x| (|getShellEntry| $ 25))
(LETT |x| |y| |LSAGG-;reverse!;2A;20|)
(EXIT (LETT |y| |z|
|LSAGG-;reverse!;2A;20|)))
@@ -671,14 +655,12 @@
|LSAGG-;copy;2A;21|)
(SEQ (LETT |k| 0 |LSAGG-;copy;2A;21|) G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |x| (|getShellEntry| $ 16))
- (|getShellEntry| $ 25)))
+ ((NULL (NOT (SPADCALL |x| (|getShellEntry| $ 16))))
(GO G191)))
(SEQ (COND
((EQL |k| 1000)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 57))
+ ((SPADCALL |x| (|getShellEntry| $ 56))
(EXIT (|error| "cyclic list"))))))
(LETT |y|
(SPADCALL
@@ -690,12 +672,12 @@
|LSAGG-;copy;2A;21|)))
(LETT |k| (QSADD1 |k|) |LSAGG-;copy;2A;21|) (GO G190)
G191 (EXIT NIL))
- (EXIT (SPADCALL |y| (|getShellEntry| $ 48)))))))
+ (EXIT (SPADCALL |y| (|getShellEntry| $ 47)))))))
(DEFUN |LSAGG-;copyInto!;2AIA;22| (|y| |x| |s| $)
(PROG (|m| #0=#:G1545 |z|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |y| (|getShellEntry| $ 32))
+ (SEQ (LETT |m| (SPADCALL |y| (|getShellEntry| $ 31))
|LSAGG-;copyInto!;2AIA;22|)
(EXIT (COND
((< |s| |m|) (|error| "index out of range"))
@@ -707,7 +689,7 @@
|LSAGG-;copyInto!;2AIA;22|)
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 32))
|LSAGG-;copyInto!;2AIA;22|)
(SEQ G190
(COND
@@ -716,15 +698,14 @@
(|getShellEntry| $ 16))
'NIL)
('T
- (SPADCALL
+ (NOT
(SPADCALL |x|
- (|getShellEntry| $ 16))
- (|getShellEntry| $ 25)))))
+ (|getShellEntry| $ 16))))))
(GO G191)))
(SEQ (SPADCALL |z|
(SPADCALL |x|
(|getShellEntry| $ 18))
- (|getShellEntry| $ 59))
+ (|getShellEntry| $ 58))
(LETT |x|
(SPADCALL |x|
(|getShellEntry| $ 17))
@@ -740,7 +721,7 @@
(DEFUN |LSAGG-;position;SA2I;23| (|w| |x| |s| $)
(PROG (|m| #0=#:G1552 |k|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 31))
|LSAGG-;position;SA2I;23|)
(EXIT (COND
((< |s| |m|) (|error| "index out of range"))
@@ -752,7 +733,7 @@
|LSAGG-;position;SA2I;23|)
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 32))
|LSAGG-;position;SA2I;23|)
(SEQ (LETT |k| |s| |LSAGG-;position;SA2I;23|)
G190
@@ -765,7 +746,7 @@
(SPADCALL |w|
(SPADCALL |x|
(|getShellEntry| $ 18))
- (|getShellEntry| $ 52)))))
+ (|getShellEntry| $ 51)))))
(GO G191)))
(SEQ (EXIT
(LETT |x|
@@ -778,7 +759,7 @@
(EXIT (COND
((SPADCALL |x| (|getShellEntry| $ 16))
(- (SPADCALL |x|
- (|getShellEntry| $ 32))
+ (|getShellEntry| $ 31))
1))
('T |k|)))))))))))
@@ -788,9 +769,7 @@
(SEQ (LETT |p| |l| |LSAGG-;removeDuplicates!;2A;24|)
(SEQ G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |p| (|getShellEntry| $ 16))
- (|getShellEntry| $ 25)))
+ ((NULL (NOT (SPADCALL |p| (|getShellEntry| $ 16))))
(GO G191)))
(SEQ (EXIT (LETT |p|
(SPADCALL |p|
@@ -800,8 +779,8 @@
(VECTOR $ |p|))
(SPADCALL |p|
(|getShellEntry| $ 17))
- (|getShellEntry| $ 63))
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 62))
+ (|getShellEntry| $ 25))
|LSAGG-;removeDuplicates!;2A;24|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |l|)))))
@@ -813,7 +792,7 @@
(PROGN
(SPADCALL |#1|
(SPADCALL (|getShellEntry| $$ 1) (|getShellEntry| $ 18))
- (|getShellEntry| $ 62))))))
+ (|getShellEntry| $ 61))))))
(DEFUN |LSAGG-;<;2AB;25| (|x| |y| $)
(PROG (#0=#:G1566)
@@ -825,10 +804,9 @@
(|getShellEntry| $ 16))
'NIL)
('T
- (SPADCALL
+ (NOT
(SPADCALL |y|
- (|getShellEntry| $ 16))
- (|getShellEntry| $ 25)))))
+ (|getShellEntry| $ 16))))))
(GO G191)))
(SEQ (EXIT (COND
((SPADCALL
@@ -836,7 +814,7 @@
(|getShellEntry| $ 18))
(SPADCALL |y|
(|getShellEntry| $ 18))
- (|getShellEntry| $ 52))
+ (|getShellEntry| $ 51))
(PROGN
(LETT #0#
(SPADCALL
@@ -844,7 +822,7 @@
(|getShellEntry| $ 18))
(SPADCALL |y|
(|getShellEntry| $ 18))
- (|getShellEntry| $ 65))
+ (|getShellEntry| $ 64))
|LSAGG-;<;2AB;25|)
(GO #0#)))
('T
@@ -861,10 +839,8 @@
NIL (GO G190) G191 (EXIT NIL))
(EXIT (COND
((SPADCALL |x| (|getShellEntry| $ 16))
- (SPADCALL
- (SPADCALL |y|
- (|getShellEntry| $ 16))
- (|getShellEntry| $ 25)))
+ (NOT (SPADCALL |y|
+ (|getShellEntry| $ 16))))
('T 'NIL)))))
#0# (EXIT #0#)))))
@@ -875,7 +851,7 @@
(LETT |dv$1| (|devaluate| |#1|) . #0=(|ListAggregate&|))
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$| (LIST '|ListAggregate&| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 68) . #0#)
+ (LETT $ (|newShell| 67) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -884,21 +860,21 @@
(|setShellEntry| $ 7 |#2|)
(COND
((|HasCategory| |#2| '(|SetCategory|))
- (|setShellEntry| $ 53
+ (|setShellEntry| $ 52
(CONS (|dispatchFunction| |LSAGG-;reduce;MA3S;17|) $))))
(COND
((|HasCategory| |#2| '(|SetCategory|))
(PROGN
- (|setShellEntry| $ 61
+ (|setShellEntry| $ 60
(CONS (|dispatchFunction| |LSAGG-;position;SA2I;23|)
$))
- (|setShellEntry| $ 64
+ (|setShellEntry| $ 63
(CONS (|dispatchFunction|
|LSAGG-;removeDuplicates!;2A;24|)
$)))))
(COND
((|HasCategory| |#2| '(|OrderedSet|))
- (|setShellEntry| $ 66
+ (|setShellEntry| $ 65
(CONS (|dispatchFunction| |LSAGG-;<;2AB;25|) $))))
$))))
@@ -909,53 +885,51 @@
(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| 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|
- |LSAGG-;remove!;M2A;9| |LSAGG-;delete!;AIA;10|
- (|UniversalSegment| 31) (83 . |lo|) (88 . |hasHi|)
- (93 . |hi|) (98 . |maxIndex|) |LSAGG-;delete!;AUsA;11|
- (|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|)
+ (42 . |merge!|) |LSAGG-;merge;M3A;4| (49 . |setrest!|)
+ (|Mapping| 10 7) |LSAGG-;select!;M2A;5| (55 . |eq?|)
+ |LSAGG-;merge!;M3A;6| (|Integer|) (61 . |minIndex|)
+ (66 . |rest|) |LSAGG-;insert!;SAIA;7| (72 . |concat!|)
+ |LSAGG-;insert!;2AIA;8| |LSAGG-;remove!;M2A;9|
+ |LSAGG-;delete!;AIA;10| (|UniversalSegment| 30)
+ (78 . |lo|) (83 . |hasHi|) (88 . |hi|) (93 . |maxIndex|)
+ |LSAGG-;delete!;AUsA;11| (|Union| 7 '"failed")
+ |LSAGG-;find;MAU;12| |LSAGG-;position;MAI;13|
+ (98 . |reverse!|) (103 . |split!|) |LSAGG-;sorted?;MAB;15|
+ |LSAGG-;reduce;MA2S;16| (109 . ~=) (115 . |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 . =)
- (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)
+ |LSAGG-;reverse!;2A;20| (123 . |cyclic?|)
+ |LSAGG-;copy;2A;21| (128 . |setfirst!|)
+ |LSAGG-;copyInto!;2AIA;22| (134 . |position|) (141 . =)
+ (147 . |remove!|) (153 . |removeDuplicates!|) (158 . <)
+ (164 . <) (|Mapping| 7 7))
+ '#(|sorted?| 170 |sort!| 176 |select!| 182 |reverse!| 188
+ |removeDuplicates!| 193 |remove!| 198 |reduce| 204
+ |position| 225 |new| 238 |merge!| 244 |merge| 251 |map|
+ 258 |list| 265 |insert!| 270 |find| 284 |delete!| 290
+ |copyInto!| 302 |copy| 309 < 314)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 66
+ (|makeByteWordVec2| 65
'(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 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 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)))))
+ 2 6 0 0 0 25 2 6 10 0 0 28 1 6 30 0
+ 31 2 6 0 0 8 32 2 6 0 0 0 34 1 38 30
+ 0 39 1 38 10 0 40 1 38 30 0 41 1 6 30
+ 0 42 1 6 0 0 47 2 6 0 0 30 48 2 7 10
+ 0 0 51 4 0 7 19 0 7 7 52 1 6 10 0 56
+ 2 6 7 0 7 58 3 0 30 7 0 30 60 2 7 10
+ 0 0 61 2 6 0 26 0 62 1 0 0 0 63 2 7
+ 10 0 0 64 2 0 10 0 0 65 2 0 10 11 0
+ 49 2 0 0 11 0 12 2 0 0 26 0 27 1 0 0
+ 0 55 1 0 0 0 63 2 0 0 26 0 36 3 0 7
+ 19 0 7 50 4 0 7 19 0 7 7 52 2 0 7 19
+ 0 21 2 0 30 26 0 46 3 0 30 7 0 30 60
+ 2 0 0 8 7 53 3 0 0 11 0 0 29 3 0 0 11
+ 0 0 24 3 0 0 19 0 0 54 1 0 0 7 15 3 0
+ 0 7 0 30 33 3 0 0 0 0 30 35 2 0 44 26
+ 0 45 2 0 0 0 38 43 2 0 0 0 30 37 3 0
+ 0 0 0 30 59 1 0 0 0 57 2 0 10 0 0 65)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp
index f081f580..b14697e2 100644
--- a/src/algebra/strap/POLYCAT-.lsp
+++ b/src/algebra/strap/POLYCAT-.lsp
@@ -689,15 +689,12 @@
(LETT |mm| (|POLYCAT-;eq2R| (|SPADfirst| |l|) |d| $)
|POLYCAT-;reducedSystem;MM;20|)
(LETT |l| (CDR |l|) |POLYCAT-;reducedSystem;MM;20|)
- (SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |l|) (|getShellEntry| $ 96)))
- (GO G191)))
+ (SEQ G190 (COND ((NULL (NOT (NULL |l|))) (GO G191)))
(SEQ (LETT |mm|
(SPADCALL |mm|
(|POLYCAT-;eq2R| (|SPADfirst| |l|) |d|
$)
- (|getShellEntry| $ 97))
+ (|getShellEntry| $ 96))
|POLYCAT-;reducedSystem;MM;20|)
(EXIT (LETT |l| (CDR |l|)
|POLYCAT-;reducedSystem;MM;20|)))
@@ -710,7 +707,7 @@
(RETURN
(SEQ (LETT |l| (SPADCALL |m| (|getShellEntry| $ 95))
|POLYCAT-;reducedSystem;MVR;21|)
- (LETT |r| (SPADCALL |v| (|getShellEntry| $ 101))
+ (LETT |r| (SPADCALL |v| (|getShellEntry| $ 100))
|POLYCAT-;reducedSystem;MVR;21|)
(LETT |b|
(SPADCALL
@@ -743,7 +740,7 @@
(GO G190) G191
(EXIT (NREVERSE0 #0#))))
(|getShellEntry| $ 81))
- (|getShellEntry| $ 102))
+ (|getShellEntry| $ 101))
(|getShellEntry| $ 82))
|POLYCAT-;reducedSystem;MVR;21|)
(LETT |d|
@@ -776,21 +773,18 @@
|POLYCAT-;reducedSystem;MVR;21|)
(LETT |l| (CDR |l|) |POLYCAT-;reducedSystem;MVR;21|)
(LETT |r| (CDR |r|) |POLYCAT-;reducedSystem;MVR;21|)
- (SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |l|) (|getShellEntry| $ 96)))
- (GO G191)))
+ (SEQ G190 (COND ((NULL (NOT (NULL |l|))) (GO G191)))
(SEQ (LETT |mm|
(SPADCALL |mm|
(|POLYCAT-;eq2R| (|SPADfirst| |l|) |d|
$)
- (|getShellEntry| $ 97))
+ (|getShellEntry| $ 96))
|POLYCAT-;reducedSystem;MVR;21|)
(LETT |w|
(SPADCALL |w|
(|POLYCAT-;P2R| (|SPADfirst| |r|) |d|
|n| $)
- (|getShellEntry| $ 103))
+ (|getShellEntry| $ 102))
|POLYCAT-;reducedSystem;MVR;21|)
(LETT |l| (CDR |l|)
|POLYCAT-;reducedSystem;MVR;21|)
@@ -800,16 +794,16 @@
(EXIT (CONS |mm| |w|))))))
(DEFUN |POLYCAT-;gcdPolynomial;3Sup;22| (|pp| |qq| $)
- (SPADCALL |pp| |qq| (|getShellEntry| $ 108)))
+ (SPADCALL |pp| |qq| (|getShellEntry| $ 107)))
(DEFUN |POLYCAT-;solveLinearPolynomialEquation;LSupU;23| (|lpp| |pp| $)
- (SPADCALL |lpp| |pp| (|getShellEntry| $ 113)))
+ (SPADCALL |lpp| |pp| (|getShellEntry| $ 112)))
(DEFUN |POLYCAT-;factorPolynomial;SupF;24| (|pp| $)
- (SPADCALL |pp| (|getShellEntry| $ 118)))
+ (SPADCALL |pp| (|getShellEntry| $ 117)))
(DEFUN |POLYCAT-;factorSquareFreePolynomial;SupF;25| (|pp| $)
- (SPADCALL |pp| (|getShellEntry| $ 121)))
+ (SPADCALL |pp| (|getShellEntry| $ 120)))
(DEFUN |POLYCAT-;factor;SF;26| (|p| $)
(PROG (|v| |ansR| #0=#:G1713 |w| #1=#:G1714 |up| |ansSUP| #2=#:G1715
@@ -823,12 +817,12 @@
(SPADCALL
(SPADCALL |p|
(|getShellEntry| $ 39))
- (|getShellEntry| $ 124))
+ (|getShellEntry| $ 123))
|POLYCAT-;factor;SF;26|)
(EXIT (SPADCALL
(SPADCALL
(SPADCALL |ansR|
- (|getShellEntry| $ 126))
+ (|getShellEntry| $ 125))
(|getShellEntry| $ 41))
(PROGN
(LETT #0# NIL
@@ -838,7 +832,7 @@
|POLYCAT-;factor;SF;26|)
(LETT #1#
(SPADCALL |ansR|
- (|getShellEntry| $ 130))
+ (|getShellEntry| $ 129))
|POLYCAT-;factor;SF;26|)
G190
(COND
@@ -862,20 +856,20 @@
|POLYCAT-;factor;SF;26|)
(GO G190) G191
(EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 134)))))
+ (|getShellEntry| $ 133)))))
('T
(SEQ (LETT |up|
(SPADCALL |p| (QCDR |v|)
(|getShellEntry| $ 49))
|POLYCAT-;factor;SF;26|)
(LETT |ansSUP|
- (SPADCALL |up| (|getShellEntry| $ 118))
+ (SPADCALL |up| (|getShellEntry| $ 117))
|POLYCAT-;factor;SF;26|)
(EXIT (SPADCALL
(SPADCALL
(SPADCALL |ansSUP|
- (|getShellEntry| $ 135))
- (QCDR |v|) (|getShellEntry| $ 136))
+ (|getShellEntry| $ 134))
+ (QCDR |v|) (|getShellEntry| $ 135))
(PROGN
(LETT #2# NIL
|POLYCAT-;factor;SF;26|)
@@ -884,7 +878,7 @@
|POLYCAT-;factor;SF;26|)
(LETT #3#
(SPADCALL |ansSUP|
- (|getShellEntry| $ 139))
+ (|getShellEntry| $ 138))
|POLYCAT-;factor;SF;26|)
G190
(COND
@@ -901,7 +895,7 @@
(VECTOR (QVELT |ww| 0)
(SPADCALL (QVELT |ww| 1)
(QCDR |v|)
- (|getShellEntry| $ 136))
+ (|getShellEntry| $ 135))
(QVELT |ww| 2))
#2#)
|POLYCAT-;factor;SF;26|)))
@@ -909,7 +903,7 @@
|POLYCAT-;factor;SF;26|)
(GO G190) G191
(EXIT (NREVERSE0 #2#))))
- (|getShellEntry| $ 134)))))))))))
+ (|getShellEntry| $ 133)))))))))))
(DEFUN |POLYCAT-;conditionP;MU;27| (|mat| $)
(PROG (|ll| #0=#:G1717 |z| #1=#:G1718 |ch| |l| #2=#:G1719 #3=#:G1720
@@ -923,7 +917,7 @@
(SEQ (EXIT (SEQ (LETT |ll|
(SPADCALL
(SPADCALL |mat|
- (|getShellEntry| $ 141))
+ (|getShellEntry| $ 140))
(|getShellEntry| $ 95))
|POLYCAT-;conditionP;MU;27|)
(LETT |llR|
@@ -952,7 +946,7 @@
(EXIT (NREVERSE0 #0#))))
|POLYCAT-;conditionP;MU;27|)
(LETT |monslist| NIL |POLYCAT-;conditionP;MU;27|)
- (LETT |ch| (SPADCALL (|getShellEntry| $ 142))
+ (LETT |ch| (SPADCALL (|getShellEntry| $ 141))
|POLYCAT-;conditionP;MU;27|)
(SEQ (LETT |l| NIL |POLYCAT-;conditionP;MU;27|)
(LETT #2# |ll| |POLYCAT-;conditionP;MU;27|)
@@ -993,7 +987,7 @@
(LETT #5#
(SPADCALL #5# #4#
(|getShellEntry| $
- 143))
+ 142))
|POLYCAT-;conditionP;MU;27|))
('T
(PROGN
@@ -1031,7 +1025,7 @@
|POLYCAT-;conditionP;MU;27|)
(LETT |degs|
(SPADCALL |m| |vars|
- (|getShellEntry| $ 144))
+ (|getShellEntry| $ 143))
|POLYCAT-;conditionP;MU;27|)
(LETT |deg1|
(PROGN
@@ -1058,7 +1052,7 @@
(LETT |nd|
(SPADCALL |d| |ch|
(|getShellEntry| $
- 146))
+ 145))
|POLYCAT-;conditionP;MU;27|)
(EXIT
(COND
@@ -1129,7 +1123,7 @@
(|getShellEntry| $
54))
(|getShellEntry| $
- 147))
+ 146))
|v|)
#12#)
|POLYCAT-;conditionP;MU;27|)))
@@ -1155,8 +1149,8 @@
(SPADCALL
(SPADCALL |llR|
(|getShellEntry| $ 92))
- (|getShellEntry| $ 148))
- (|getShellEntry| $ 150))
+ (|getShellEntry| $ 147))
+ (|getShellEntry| $ 149))
|POLYCAT-;conditionP;MU;27|)
(EXIT (COND
((QEQCAR |ans| 1) (CONS 1 "failed"))
@@ -1217,11 +1211,11 @@
(+ |i| 1)
|POLYCAT-;conditionP;MU;27|)
(|getShellEntry|
- $ 151))
+ $ 150))
(|getShellEntry|
$ 41))
(|getShellEntry|
- $ 152))
+ $ 151))
|POLYCAT-;conditionP;MU;27|)
(COND
(#21#
@@ -1229,7 +1223,7 @@
(SPADCALL #20#
#19#
(|getShellEntry|
- $ 153))
+ $ 152))
|POLYCAT-;conditionP;MU;27|))
('T
(PROGN
@@ -1265,8 +1259,8 @@
(SEQ (LETT |ans|
(SPADCALL
(SPADCALL |p|
- (|getShellEntry| $ 147))
- (|getShellEntry| $ 155))
+ (|getShellEntry| $ 146))
+ (|getShellEntry| $ 154))
|POLYCAT-;charthRoot;SU;28|)
(EXIT (COND
((QEQCAR |ans| 1) (CONS 1 "failed"))
@@ -1275,7 +1269,7 @@
(SPADCALL (QCDR |ans|)
(|getShellEntry| $ 41))))))))
('T
- (SEQ (LETT |ch| (SPADCALL (|getShellEntry| $ 142))
+ (SEQ (LETT |ch| (SPADCALL (|getShellEntry| $ 141))
|POLYCAT-;charthRoot;SU;28|)
(EXIT (|POLYCAT-;charthRootlv| |p| |vars| |ch|
$))))))))))
@@ -1288,8 +1282,8 @@
(SEQ (LETT |ans|
(SPADCALL
(SPADCALL |p|
- (|getShellEntry| $ 147))
- (|getShellEntry| $ 155))
+ (|getShellEntry| $ 146))
+ (|getShellEntry| $ 154))
|POLYCAT-;charthRootlv|)
(EXIT (COND
((QEQCAR |ans| 1) (CONS 1 "failed"))
@@ -1311,7 +1305,7 @@
(SEQ G190 (COND ((NULL (< 0 |d|)) (GO G191)))
(SEQ (LETT |dd|
(SPADCALL |d| |ch|
- (|getShellEntry| $ 146))
+ (|getShellEntry| $ 145))
|POLYCAT-;charthRootlv|)
(EXIT
(COND
@@ -1324,13 +1318,13 @@
(SEQ
(LETT |cp|
(SPADCALL |p| |v| |d|
- (|getShellEntry| $ 158))
+ (|getShellEntry| $ 157))
|POLYCAT-;charthRootlv|)
(LETT |p|
(SPADCALL |p|
(SPADCALL |cp| |v| |d|
(|getShellEntry| $ 38))
- (|getShellEntry| $ 159))
+ (|getShellEntry| $ 158))
|POLYCAT-;charthRootlv|)
(LETT |ansx|
(|POLYCAT-;charthRootlv| |cp|
@@ -1363,7 +1357,7 @@
'(|NonNegativeInteger|)
#0#))
(|getShellEntry| $ 38))
- (|getShellEntry| $ 153))
+ (|getShellEntry| $ 152))
|POLYCAT-;charthRootlv|)))))))))))
NIL (GO G190) G191 (EXIT NIL))
(LETT |ansx|
@@ -1381,7 +1375,7 @@
(LETT #1#
(CONS 0
(SPADCALL |ans| (QCDR |ansx|)
- (|getShellEntry| $ 153)))
+ (|getShellEntry| $ 152)))
|POLYCAT-;charthRootlv|)
(GO #1#)))))))))
#1# (EXIT #1#)))))
@@ -1393,34 +1387,34 @@
(SPADCALL
(SPADCALL |p1| |mvar| (|getShellEntry| $ 49))
(SPADCALL |p2| |mvar| (|getShellEntry| $ 49))
- (|getShellEntry| $ 161))
+ (|getShellEntry| $ 160))
|POLYCAT-;monicDivide;2SVarSetR;30|)
(EXIT (CONS (SPADCALL (QCAR |result|) |mvar|
- (|getShellEntry| $ 136))
+ (|getShellEntry| $ 135))
(SPADCALL (QCDR |result|) |mvar|
- (|getShellEntry| $ 136))))))))
+ (|getShellEntry| $ 135))))))))
(DEFUN |POLYCAT-;squareFree;SF;31| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 164)))
+ (SPADCALL |p| (|getShellEntry| $ 163)))
(DEFUN |POLYCAT-;squareFree;SF;32| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 167)))
+ (SPADCALL |p| (|getShellEntry| $ 166)))
(DEFUN |POLYCAT-;squareFree;SF;33| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 167)))
+ (SPADCALL |p| (|getShellEntry| $ 166)))
(DEFUN |POLYCAT-;squareFreePart;2S;34| (|p| $)
(PROG (|s| |f| #0=#:G1731 #1=#:G1651 #2=#:G1649 #3=#:G1650)
(RETURN
(SEQ (SPADCALL
(SPADCALL
- (LETT |s| (SPADCALL |p| (|getShellEntry| $ 168))
+ (LETT |s| (SPADCALL |p| (|getShellEntry| $ 167))
|POLYCAT-;squareFreePart;2S;34|)
- (|getShellEntry| $ 169))
+ (|getShellEntry| $ 168))
(PROGN
(LETT #3# NIL |POLYCAT-;squareFreePart;2S;34|)
(SEQ (LETT |f| NIL |POLYCAT-;squareFreePart;2S;34|)
- (LETT #0# (SPADCALL |s| (|getShellEntry| $ 172))
+ (LETT #0# (SPADCALL |s| (|getShellEntry| $ 171))
|POLYCAT-;squareFreePart;2S;34|)
G190
(COND
@@ -1437,7 +1431,7 @@
(#3#
(LETT #2#
(SPADCALL #2# #1#
- (|getShellEntry| $ 152))
+ (|getShellEntry| $ 151))
|POLYCAT-;squareFreePart;2S;34|))
('T
(PROGN
@@ -1449,11 +1443,11 @@
|POLYCAT-;squareFreePart;2S;34|)
(GO G190) G191 (EXIT NIL))
(COND (#3# #2#) ('T (|spadConstant| $ 34))))
- (|getShellEntry| $ 152))))))
+ (|getShellEntry| $ 151))))))
(DEFUN |POLYCAT-;content;SVarSetS;35| (|p| |v| $)
(SPADCALL (SPADCALL |p| |v| (|getShellEntry| $ 49))
- (|getShellEntry| $ 174)))
+ (|getShellEntry| $ 173)))
(DEFUN |POLYCAT-;primitivePart;2S;36| (|p| $)
(PROG (#0=#:G1655)
@@ -1462,13 +1456,13 @@
(PROG2 (LETT #0#
(SPADCALL |p|
(SPADCALL |p|
- (|getShellEntry| $ 176))
- (|getShellEntry| $ 177))
+ (|getShellEntry| $ 175))
+ (|getShellEntry| $ 176))
|POLYCAT-;primitivePart;2S;36|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) (|getShellEntry| $ 6)
#0#))
- (|getShellEntry| $ 179))
+ (|getShellEntry| $ 178))
1))))
(DEFUN |POLYCAT-;primitivePart;SVarSetS;37| (|p| |v| $)
@@ -1478,13 +1472,13 @@
(PROG2 (LETT #0#
(SPADCALL |p|
(SPADCALL |p| |v|
- (|getShellEntry| $ 181))
- (|getShellEntry| $ 182))
+ (|getShellEntry| $ 180))
+ (|getShellEntry| $ 181))
|POLYCAT-;primitivePart;SVarSetS;37|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) (|getShellEntry| $ 6)
#0#))
- (|getShellEntry| $ 179))
+ (|getShellEntry| $ 178))
1))))
(DEFUN |POLYCAT-;<;2SB;38| (|p| |q| $)
@@ -1495,34 +1489,34 @@
(LETT |dq| (SPADCALL |q| (|getShellEntry| $ 61))
|POLYCAT-;<;2SB;38|)
(EXIT (COND
- ((SPADCALL |dp| |dq| (|getShellEntry| $ 184))
+ ((SPADCALL |dp| |dq| (|getShellEntry| $ 183))
(SPADCALL (|spadConstant| $ 23)
(SPADCALL |q| (|getShellEntry| $ 39))
- (|getShellEntry| $ 185)))
- ((SPADCALL |dq| |dp| (|getShellEntry| $ 184))
+ (|getShellEntry| $ 184)))
+ ((SPADCALL |dq| |dp| (|getShellEntry| $ 183))
(SPADCALL (SPADCALL |p| (|getShellEntry| $ 39))
- (|spadConstant| $ 23) (|getShellEntry| $ 185)))
+ (|spadConstant| $ 23) (|getShellEntry| $ 184)))
('T
(SPADCALL
(SPADCALL (SPADCALL |p| |q|
- (|getShellEntry| $ 159))
+ (|getShellEntry| $ 158))
(|getShellEntry| $ 39))
- (|spadConstant| $ 23) (|getShellEntry| $ 185)))))))))
+ (|spadConstant| $ 23) (|getShellEntry| $ 184)))))))))
(DEFUN |POLYCAT-;patternMatch;SP2Pmr;39| (|p| |pat| |l| $)
- (SPADCALL |p| |pat| |l| (|getShellEntry| $ 190)))
+ (SPADCALL |p| |pat| |l| (|getShellEntry| $ 189)))
(DEFUN |POLYCAT-;patternMatch;SP2Pmr;40| (|p| |pat| |l| $)
- (SPADCALL |p| |pat| |l| (|getShellEntry| $ 197)))
+ (SPADCALL |p| |pat| |l| (|getShellEntry| $ 196)))
(DEFUN |POLYCAT-;convert;SP;41| (|x| $)
- (SPADCALL (ELT $ 200) (ELT $ 201) |x| (|getShellEntry| $ 205)))
+ (SPADCALL (ELT $ 199) (ELT $ 200) |x| (|getShellEntry| $ 204)))
(DEFUN |POLYCAT-;convert;SP;42| (|x| $)
- (SPADCALL (ELT $ 207) (ELT $ 208) |x| (|getShellEntry| $ 212)))
+ (SPADCALL (ELT $ 206) (ELT $ 207) |x| (|getShellEntry| $ 211)))
(DEFUN |POLYCAT-;convert;SIf;43| (|p| $)
- (SPADCALL (ELT $ 215) (ELT $ 216) |p| (|getShellEntry| $ 220)))
+ (SPADCALL (ELT $ 214) (ELT $ 215) |p| (|getShellEntry| $ 219)))
(DEFUN |PolynomialCategory&| (|#1| |#2| |#3| |#4|)
(PROG (|dv$1| |dv$2| |dv$3| |dv$4| |dv$| $ |pv$|)
@@ -1534,7 +1528,7 @@
(LETT |dv$4| (|devaluate| |#4|) . #0#)
(LETT |dv$|
(LIST '|PolynomialCategory&| |dv$1| |dv$2| |dv$3| |dv$4|) . #0#)
- (LETT $ (|newShell| 229) . #0#)
+ (LETT $ (|newShell| 228) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -1589,46 +1583,46 @@
(COND
((|HasCategory| |#2| '(|IntegralDomain|))
(PROGN
- (|setShellEntry| $ 99
+ (|setShellEntry| $ 98
(CONS (|dispatchFunction|
|POLYCAT-;reducedSystem;MM;20|)
$))
- (|setShellEntry| $ 106
+ (|setShellEntry| $ 105
(CONS (|dispatchFunction|
|POLYCAT-;reducedSystem;MVR;21|)
$)))))
(COND
((|testBitVector| |pv$| 1)
(PROGN
- (|setShellEntry| $ 109
+ (|setShellEntry| $ 108
(CONS (|dispatchFunction|
|POLYCAT-;gcdPolynomial;3Sup;22|)
$))
- (|setShellEntry| $ 116
+ (|setShellEntry| $ 115
(CONS (|dispatchFunction|
|POLYCAT-;solveLinearPolynomialEquation;LSupU;23|)
$))
- (|setShellEntry| $ 120
+ (|setShellEntry| $ 119
(CONS (|dispatchFunction|
|POLYCAT-;factorPolynomial;SupF;24|)
$))
- (|setShellEntry| $ 122
+ (|setShellEntry| $ 121
(CONS (|dispatchFunction|
|POLYCAT-;factorSquareFreePolynomial;SupF;25|)
$))
- (|setShellEntry| $ 140
+ (|setShellEntry| $ 139
(CONS (|dispatchFunction| |POLYCAT-;factor;SF;26|) $))
(COND
((|HasCategory| |#2| '(|CharacteristicNonZero|))
(PROGN
- (|setShellEntry| $ 154
+ (|setShellEntry| $ 153
(CONS (|dispatchFunction|
|POLYCAT-;conditionP;MU;27|)
$))))))))
(COND
((|HasCategory| |#2| '(|CharacteristicNonZero|))
(PROGN
- (|setShellEntry| $ 156
+ (|setShellEntry| $ 155
(CONS (|dispatchFunction| |POLYCAT-;charthRoot;SU;28|)
$)))))
(COND
@@ -1638,46 +1632,46 @@
((|HasCategory| |#2| '(|EuclideanDomain|))
(COND
((|HasCategory| |#2| '(|CharacteristicZero|))
- (|setShellEntry| $ 165
+ (|setShellEntry| $ 164
(CONS (|dispatchFunction|
|POLYCAT-;squareFree;SF;31|)
$)))
('T
- (|setShellEntry| $ 165
+ (|setShellEntry| $ 164
(CONS (|dispatchFunction|
|POLYCAT-;squareFree;SF;32|)
$)))))
('T
- (|setShellEntry| $ 165
+ (|setShellEntry| $ 164
(CONS (|dispatchFunction|
|POLYCAT-;squareFree;SF;33|)
$))))
- (|setShellEntry| $ 173
+ (|setShellEntry| $ 172
(CONS (|dispatchFunction|
|POLYCAT-;squareFreePart;2S;34|)
$))
- (|setShellEntry| $ 175
+ (|setShellEntry| $ 174
(CONS (|dispatchFunction|
|POLYCAT-;content;SVarSetS;35|)
$))
- (|setShellEntry| $ 180
+ (|setShellEntry| $ 179
(CONS (|dispatchFunction|
|POLYCAT-;primitivePart;2S;36|)
$))
- (|setShellEntry| $ 183
+ (|setShellEntry| $ 182
(CONS (|dispatchFunction|
|POLYCAT-;primitivePart;SVarSetS;37|)
$)))))
(COND
((|testBitVector| |pv$| 15)
(PROGN
- (|setShellEntry| $ 186
+ (|setShellEntry| $ 185
(CONS (|dispatchFunction| |POLYCAT-;<;2SB;38|) $))
(COND
((|testBitVector| |pv$| 8)
(COND
((|testBitVector| |pv$| 7)
- (|setShellEntry| $ 192
+ (|setShellEntry| $ 191
(CONS (|dispatchFunction|
|POLYCAT-;patternMatch;SP2Pmr;39|)
$))))))
@@ -1685,7 +1679,7 @@
((|testBitVector| |pv$| 6)
(COND
((|testBitVector| |pv$| 5)
- (|setShellEntry| $ 199
+ (|setShellEntry| $ 198
(CONS (|dispatchFunction|
|POLYCAT-;patternMatch;SP2Pmr;40|)
$)))))))))
@@ -1693,21 +1687,21 @@
((|testBitVector| |pv$| 12)
(COND
((|testBitVector| |pv$| 11)
- (|setShellEntry| $ 206
+ (|setShellEntry| $ 205
(CONS (|dispatchFunction| |POLYCAT-;convert;SP;41|)
$))))))
(COND
((|testBitVector| |pv$| 10)
(COND
((|testBitVector| |pv$| 9)
- (|setShellEntry| $ 213
+ (|setShellEntry| $ 212
(CONS (|dispatchFunction| |POLYCAT-;convert;SP;42|)
$))))))
(COND
((|testBitVector| |pv$| 14)
(COND
((|testBitVector| |pv$| 13)
- (|setShellEntry| $ 221
+ (|setShellEntry| $ 220
(CONS (|dispatchFunction| |POLYCAT-;convert;SIf;43|)
$))))))
$))))
@@ -1749,87 +1743,87 @@
(|Integer|) (248 . |minIndex|) (253 . |coefficient|)
(259 . |qsetelt!|) (|List| 7) (|List| 89) (|Matrix| 7)
(266 . |matrix|) (|List| 80) (|Matrix| 6)
- (271 . |listOfLists|) (276 . |not|) (281 . |vertConcat|)
- (|Matrix| $) (287 . |reducedSystem|) (|Vector| 6)
- (292 . |entries|) (297 . |concat|) (303 . |concat|)
+ (271 . |listOfLists|) (276 . |vertConcat|) (|Matrix| $)
+ (282 . |reducedSystem|) (|Vector| 6) (287 . |entries|)
+ (292 . |concat|) (298 . |concat|)
(|Record| (|:| |mat| 91) (|:| |vec| 83)) (|Vector| $)
- (309 . |reducedSystem|)
+ (304 . |reducedSystem|)
(|GeneralPolynomialGcdPackage| 8 9 7 6)
- (315 . |gcdPolynomial|) (321 . |gcdPolynomial|)
- (|List| 50) (|Union| 110 '"failed")
+ (310 . |gcdPolynomial|) (316 . |gcdPolynomial|)
+ (|List| 50) (|Union| 109 '"failed")
(|PolynomialFactorizationByRecursion| 7 8 9 6)
- (327 . |solveLinearPolynomialEquationByRecursion|)
- (|List| 48) (|Union| 114 '"failed")
- (333 . |solveLinearPolynomialEquation|) (|Factored| 50)
- (339 . |factorByRecursion|) (|Factored| 48)
- (344 . |factorPolynomial|)
- (349 . |factorSquareFreeByRecursion|)
- (354 . |factorSquareFreePolynomial|) (|Factored| $)
- (359 . |factor|) (|Factored| 7) (364 . |unit|)
+ (322 . |solveLinearPolynomialEquationByRecursion|)
+ (|List| 48) (|Union| 113 '"failed")
+ (328 . |solveLinearPolynomialEquation|) (|Factored| 50)
+ (334 . |factorByRecursion|) (|Factored| 48)
+ (339 . |factorPolynomial|)
+ (344 . |factorSquareFreeByRecursion|)
+ (349 . |factorSquareFreePolynomial|) (|Factored| $)
+ (354 . |factor|) (|Factored| 7) (359 . |unit|)
(|Union| '"nil" '"sqfr" '"irred" '"prime")
- (|Record| (|:| |flg| 127) (|:| |fctr| 7) (|:| |xpnt| 85))
- (|List| 128) (369 . |factorList|)
- (|Record| (|:| |flg| 127) (|:| |fctr| 6) (|:| |xpnt| 85))
- (|List| 131) (|Factored| 6) (374 . |makeFR|)
- (380 . |unit|) (385 . |multivariate|)
- (|Record| (|:| |flg| 127) (|:| |fctr| 50) (|:| |xpnt| 85))
- (|List| 137) (391 . |factorList|) (396 . |factor|)
- (401 . |transpose|) (406 . |characteristic|)
- (410 . |setUnion|) (416 . |degree|) (|Union| $ '"failed")
- (422 . |exquo|) (428 . |ground|) (433 . |transpose|)
- (|Union| 105 '"failed") (438 . |conditionP|) (443 . |elt|)
- (449 . *) (455 . +) (461 . |conditionP|)
- (466 . |charthRoot|) (471 . |charthRoot|) (476 . |Zero|)
- (480 . |coefficient|) (487 . -)
+ (|Record| (|:| |flg| 126) (|:| |fctr| 7) (|:| |xpnt| 85))
+ (|List| 127) (364 . |factorList|)
+ (|Record| (|:| |flg| 126) (|:| |fctr| 6) (|:| |xpnt| 85))
+ (|List| 130) (|Factored| 6) (369 . |makeFR|)
+ (375 . |unit|) (380 . |multivariate|)
+ (|Record| (|:| |flg| 126) (|:| |fctr| 50) (|:| |xpnt| 85))
+ (|List| 136) (386 . |factorList|) (391 . |factor|)
+ (396 . |transpose|) (401 . |characteristic|)
+ (405 . |setUnion|) (411 . |degree|) (|Union| $ '"failed")
+ (417 . |exquo|) (423 . |ground|) (428 . |transpose|)
+ (|Union| 104 '"failed") (433 . |conditionP|) (438 . |elt|)
+ (444 . *) (450 . +) (456 . |conditionP|)
+ (461 . |charthRoot|) (466 . |charthRoot|) (471 . |Zero|)
+ (475 . |coefficient|) (482 . -)
(|Record| (|:| |quotient| $) (|:| |remainder| $))
- (493 . |monicDivide|) |POLYCAT-;monicDivide;2SVarSetR;30|
- (|MultivariateSquareFree| 8 9 7 6) (499 . |squareFree|)
- (504 . |squareFree|) (|PolynomialSquareFree| 9 8 7 6)
- (509 . |squareFree|) (514 . |squareFree|) (519 . |unit|)
+ (488 . |monicDivide|) |POLYCAT-;monicDivide;2SVarSetR;30|
+ (|MultivariateSquareFree| 8 9 7 6) (494 . |squareFree|)
+ (499 . |squareFree|) (|PolynomialSquareFree| 9 8 7 6)
+ (504 . |squareFree|) (509 . |squareFree|) (514 . |unit|)
(|Record| (|:| |factor| 6) (|:| |exponent| 85))
- (|List| 170) (524 . |factors|) (529 . |squareFreePart|)
- (534 . |content|) (539 . |content|) (545 . |content|)
- (550 . |exquo|)
+ (|List| 169) (519 . |factors|) (524 . |squareFreePart|)
+ (529 . |content|) (534 . |content|) (540 . |content|)
+ (545 . |exquo|)
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $))
- (556 . |unitNormal|) (561 . |primitivePart|)
- (566 . |content|) (572 . |exquo|) (578 . |primitivePart|)
- (584 . <) (590 . <) (596 . <) (|PatternMatchResult| 85 6)
+ (551 . |unitNormal|) (556 . |primitivePart|)
+ (561 . |content|) (567 . |exquo|) (573 . |primitivePart|)
+ (579 . <) (585 . <) (591 . <) (|PatternMatchResult| 85 6)
(|Pattern| 85)
(|PatternMatchPolynomialCategory| 85 8 9 7 6)
- (602 . |patternMatch|) (|PatternMatchResult| 85 $)
- (609 . |patternMatch|) (|Float|)
- (|PatternMatchResult| 193 6) (|Pattern| 193)
- (|PatternMatchPolynomialCategory| 193 8 9 7 6)
- (616 . |patternMatch|) (|PatternMatchResult| 193 $)
- (623 . |patternMatch|) (630 . |convert|) (635 . |convert|)
- (|Mapping| 188 9) (|Mapping| 188 7)
- (|PolynomialCategoryLifting| 8 9 7 6 188) (640 . |map|)
- (647 . |convert|) (652 . |convert|) (657 . |convert|)
- (|Mapping| 195 9) (|Mapping| 195 7)
- (|PolynomialCategoryLifting| 8 9 7 6 195) (662 . |map|)
- (669 . |convert|) (|InputForm|) (674 . |convert|)
- (679 . |convert|) (|Mapping| 214 9) (|Mapping| 214 7)
- (|PolynomialCategoryLifting| 8 9 7 6 214) (684 . |map|)
- (691 . |convert|) (|Matrix| 85) (|Vector| 85)
- (|Record| (|:| |mat| 222) (|:| |vec| 223))
+ (597 . |patternMatch|) (|PatternMatchResult| 85 $)
+ (604 . |patternMatch|) (|Float|)
+ (|PatternMatchResult| 192 6) (|Pattern| 192)
+ (|PatternMatchPolynomialCategory| 192 8 9 7 6)
+ (611 . |patternMatch|) (|PatternMatchResult| 192 $)
+ (618 . |patternMatch|) (625 . |convert|) (630 . |convert|)
+ (|Mapping| 187 9) (|Mapping| 187 7)
+ (|PolynomialCategoryLifting| 8 9 7 6 187) (635 . |map|)
+ (642 . |convert|) (647 . |convert|) (652 . |convert|)
+ (|Mapping| 194 9) (|Mapping| 194 7)
+ (|PolynomialCategoryLifting| 8 9 7 6 194) (657 . |map|)
+ (664 . |convert|) (|InputForm|) (669 . |convert|)
+ (674 . |convert|) (|Mapping| 213 9) (|Mapping| 213 7)
+ (|PolynomialCategoryLifting| 8 9 7 6 213) (679 . |map|)
+ (686 . |convert|) (|Matrix| 85) (|Vector| 85)
+ (|Record| (|:| |mat| 221) (|:| |vec| 222))
(|Union| 85 '"failed") (|Fraction| 85)
- (|Union| 226 '"failed") (|Union| 7 '"failed"))
- '#(|totalDegree| 696 |squareFreePart| 707 |squareFree| 712
- |solveLinearPolynomialEquation| 717 |retractIfCan| 723
- |retract| 728 |resultant| 733 |reducedSystem| 740
- |primitivePart| 751 |primitiveMonomials| 762
- |patternMatch| 767 |monomials| 781 |monomial| 786
- |monicDivide| 793 |isTimes| 800 |isPlus| 805 |isExpt| 810
- |gcdPolynomial| 815 |factorSquareFreePolynomial| 821
- |factorPolynomial| 826 |factor| 831 |eval| 836
- |discriminant| 842 |convert| 848 |content| 863
- |conditionP| 869 |coefficient| 874 |charthRoot| 888 < 893)
+ (|Union| 225 '"failed") (|Union| 7 '"failed"))
+ '#(|totalDegree| 691 |squareFreePart| 702 |squareFree| 707
+ |solveLinearPolynomialEquation| 712 |retractIfCan| 718
+ |retract| 723 |resultant| 728 |reducedSystem| 735
+ |primitivePart| 746 |primitiveMonomials| 757
+ |patternMatch| 762 |monomials| 776 |monomial| 781
+ |monicDivide| 788 |isTimes| 795 |isPlus| 800 |isExpt| 805
+ |gcdPolynomial| 810 |factorSquareFreePolynomial| 816
+ |factorPolynomial| 821 |factor| 826 |eval| 831
+ |discriminant| 837 |convert| 843 |content| 858
+ |conditionP| 864 |coefficient| 869 |charthRoot| 883 < 888)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 221
+ (|makeByteWordVec2| 220
'(1 10 6 0 11 1 6 12 0 13 1 6 9 0 14 1
10 6 0 15 3 6 0 0 16 17 18 0 6 0 22 0
7 0 23 2 6 24 0 0 25 1 6 0 0 26 1 6 0
@@ -1847,51 +1841,51 @@
0 0 0 9 78 1 6 17 0 79 1 80 0 17 81 1
80 0 0 82 2 83 0 36 7 84 1 83 85 0 86
2 6 7 0 8 87 3 83 7 0 85 7 88 1 91 0
- 90 92 1 94 93 0 95 1 24 0 0 96 2 91 0
- 0 0 97 1 0 91 98 99 1 100 80 0 101 2
- 80 0 0 0 102 2 83 0 0 0 103 2 0 104
- 98 105 106 2 107 50 50 50 108 2 0 48
- 48 48 109 2 112 111 110 50 113 2 0
- 115 114 48 116 1 112 117 50 118 1 0
- 119 48 120 1 112 117 50 121 1 0 119
- 48 122 1 7 123 0 124 1 125 7 0 126 1
- 125 129 0 130 2 133 0 6 132 134 1 117
- 50 0 135 2 6 0 48 9 136 1 117 138 0
- 139 1 0 123 0 140 1 94 0 0 141 0 6 36
- 142 2 80 0 0 0 143 2 6 53 0 16 144 2
- 85 145 0 0 146 1 6 7 0 147 1 91 0 0
- 148 1 7 149 98 150 2 83 7 0 85 151 2
- 6 0 0 0 152 2 6 0 0 0 153 1 0 149 98
- 154 1 7 145 0 155 1 0 145 0 156 0 8 0
- 157 3 6 0 0 9 36 158 2 6 0 0 0 159 2
- 50 160 0 0 161 1 163 133 6 164 1 0
- 123 0 165 1 166 133 6 167 1 6 123 0
- 168 1 133 6 0 169 1 133 171 0 172 1 0
- 0 0 173 1 50 6 0 174 2 0 0 0 9 175 1
- 6 7 0 176 2 6 145 0 7 177 1 6 178 0
- 179 1 0 0 0 180 2 6 0 0 9 181 2 6 145
- 0 0 182 2 0 0 0 9 183 2 8 24 0 0 184
- 2 7 24 0 0 185 2 0 24 0 0 186 3 189
- 187 6 188 187 190 3 0 191 0 188 191
- 192 3 196 194 6 195 194 197 3 0 198 0
- 195 198 199 1 9 188 0 200 1 7 188 0
- 201 3 204 188 202 203 6 205 1 0 188 0
- 206 1 9 195 0 207 1 7 195 0 208 3 211
- 195 209 210 6 212 1 0 195 0 213 1 9
- 214 0 215 1 7 214 0 216 3 219 214 217
- 218 6 220 1 0 214 0 221 2 0 36 0 16
- 74 1 0 36 0 71 1 0 0 0 173 1 0 123 0
- 165 2 0 115 114 48 116 1 0 12 0 60 1
- 0 9 0 59 3 0 0 0 0 9 76 1 0 91 98 99
- 2 0 104 98 105 106 2 0 0 0 9 183 1 0
- 0 0 180 1 0 17 0 63 3 0 191 0 188 191
- 192 3 0 198 0 195 198 199 1 0 17 0 28
- 3 0 0 0 16 53 57 3 0 160 0 0 9 162 1
- 0 30 0 42 1 0 30 0 31 1 0 46 0 47 2 0
- 48 48 48 109 1 0 119 48 122 1 0 119
- 48 120 1 0 123 0 140 2 0 0 0 20 21 2
- 0 0 0 9 78 1 0 214 0 221 1 0 188 0
- 206 1 0 195 0 213 2 0 0 0 9 175 1 0
- 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)))))
+ 90 92 1 94 93 0 95 2 91 0 0 0 96 1 0
+ 91 97 98 1 99 80 0 100 2 80 0 0 0 101
+ 2 83 0 0 0 102 2 0 103 97 104 105 2
+ 106 50 50 50 107 2 0 48 48 48 108 2
+ 111 110 109 50 112 2 0 114 113 48 115
+ 1 111 116 50 117 1 0 118 48 119 1 111
+ 116 50 120 1 0 118 48 121 1 7 122 0
+ 123 1 124 7 0 125 1 124 128 0 129 2
+ 132 0 6 131 133 1 116 50 0 134 2 6 0
+ 48 9 135 1 116 137 0 138 1 0 122 0
+ 139 1 94 0 0 140 0 6 36 141 2 80 0 0
+ 0 142 2 6 53 0 16 143 2 85 144 0 0
+ 145 1 6 7 0 146 1 91 0 0 147 1 7 148
+ 97 149 2 83 7 0 85 150 2 6 0 0 0 151
+ 2 6 0 0 0 152 1 0 148 97 153 1 7 144
+ 0 154 1 0 144 0 155 0 8 0 156 3 6 0 0
+ 9 36 157 2 6 0 0 0 158 2 50 159 0 0
+ 160 1 162 132 6 163 1 0 122 0 164 1
+ 165 132 6 166 1 6 122 0 167 1 132 6 0
+ 168 1 132 170 0 171 1 0 0 0 172 1 50
+ 6 0 173 2 0 0 0 9 174 1 6 7 0 175 2 6
+ 144 0 7 176 1 6 177 0 178 1 0 0 0 179
+ 2 6 0 0 9 180 2 6 144 0 0 181 2 0 0 0
+ 9 182 2 8 24 0 0 183 2 7 24 0 0 184 2
+ 0 24 0 0 185 3 188 186 6 187 186 189
+ 3 0 190 0 187 190 191 3 195 193 6 194
+ 193 196 3 0 197 0 194 197 198 1 9 187
+ 0 199 1 7 187 0 200 3 203 187 201 202
+ 6 204 1 0 187 0 205 1 9 194 0 206 1 7
+ 194 0 207 3 210 194 208 209 6 211 1 0
+ 194 0 212 1 9 213 0 214 1 7 213 0 215
+ 3 218 213 216 217 6 219 1 0 213 0 220
+ 2 0 36 0 16 74 1 0 36 0 71 1 0 0 0
+ 172 1 0 122 0 164 2 0 114 113 48 115
+ 1 0 12 0 60 1 0 9 0 59 3 0 0 0 0 9 76
+ 1 0 91 97 98 2 0 103 97 104 105 2 0 0
+ 0 9 182 1 0 0 0 179 1 0 17 0 63 3 0
+ 190 0 187 190 191 3 0 197 0 194 197
+ 198 1 0 17 0 28 3 0 0 0 16 53 57 3 0
+ 159 0 0 9 161 1 0 30 0 42 1 0 30 0 31
+ 1 0 46 0 47 2 0 48 48 48 108 1 0 118
+ 48 121 1 0 118 48 119 1 0 122 0 139 2
+ 0 0 0 20 21 2 0 0 0 9 78 1 0 213 0
+ 220 1 0 187 0 205 1 0 194 0 212 2 0 0
+ 0 9 174 1 0 148 97 153 3 0 0 0 16 53
+ 55 3 0 0 0 9 36 52 1 0 144 0 155 2 0
+ 24 0 0 185)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/PSETCAT-.lsp b/src/algebra/strap/PSETCAT-.lsp
index a216f16e..56d45bc4 100644
--- a/src/algebra/strap/PSETCAT-.lsp
+++ b/src/algebra/strap/PSETCAT-.lsp
@@ -170,17 +170,15 @@
((NULL (COND
((NULL |lp|) 'NIL)
('T
- (SPADCALL
- (SPADCALL
- (SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 22))
- |v| (|getShellEntry| $ 28))
- (|getShellEntry| $ 29)))))
+ (NOT (SPADCALL
+ (SPADCALL (|SPADfirst| |lp|)
+ (|getShellEntry| $ 22))
+ |v| (|getShellEntry| $ 28))))))
(GO G191)))
(SEQ (EXIT (LETT |lp| (CDR |lp|)
|PSETCAT-;mainVariable?;VarSetSB;6|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL (NULL |lp|) (|getShellEntry| $ 29)))))))
+ (EXIT (NOT (NULL |lp|)))))))
(DEFUN |PSETCAT-;collectUnder;SVarSetS;7| (|ps| |v| $)
(PROG (|p| |lp| |lq|)
@@ -188,10 +186,7 @@
(SEQ (LETT |lp| (|PSETCAT-;elements| |ps| $)
|PSETCAT-;collectUnder;SVarSetS;7|)
(LETT |lq| NIL |PSETCAT-;collectUnder;SVarSetS;7|)
- (SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |lp|) (|getShellEntry| $ 29)))
- (GO G191)))
+ (SEQ G190 (COND ((NULL (NOT (NULL |lp|))) (GO G191)))
(SEQ (LETT |p| (|SPADfirst| |lp|)
|PSETCAT-;collectUnder;SVarSetS;7|)
(LETT |lp| (CDR |lp|)
@@ -205,7 +200,7 @@
(LETT |lq| (CONS |p| |lq|)
|PSETCAT-;collectUnder;SVarSetS;7|)))))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |lq| (|getShellEntry| $ 31)))))))
+ (EXIT (SPADCALL |lq| (|getShellEntry| $ 30)))))))
(DEFUN |PSETCAT-;collectUpper;SVarSetS;8| (|ps| |v| $)
(PROG (|p| |lp| |lq|)
@@ -213,10 +208,7 @@
(SEQ (LETT |lp| (|PSETCAT-;elements| |ps| $)
|PSETCAT-;collectUpper;SVarSetS;8|)
(LETT |lq| NIL |PSETCAT-;collectUpper;SVarSetS;8|)
- (SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |lp|) (|getShellEntry| $ 29)))
- (GO G191)))
+ (SEQ G190 (COND ((NULL (NOT (NULL |lp|))) (GO G191)))
(SEQ (LETT |p| (|SPADfirst| |lp|)
|PSETCAT-;collectUpper;SVarSetS;8|)
(LETT |lp| (CDR |lp|)
@@ -232,7 +224,7 @@
(LETT |lq| (CONS |p| |lq|)
|PSETCAT-;collectUpper;SVarSetS;8|)))))))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |lq| (|getShellEntry| $ 31)))))))
+ (EXIT (SPADCALL |lq| (|getShellEntry| $ 30)))))))
(DEFUN |PSETCAT-;collect;SVarSetS;9| (|ps| |v| $)
(PROG (|p| |lp| |lq|)
@@ -240,10 +232,7 @@
(SEQ (LETT |lp| (|PSETCAT-;elements| |ps| $)
|PSETCAT-;collect;SVarSetS;9|)
(LETT |lq| NIL |PSETCAT-;collect;SVarSetS;9|)
- (SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |lp|) (|getShellEntry| $ 29)))
- (GO G191)))
+ (SEQ G190 (COND ((NULL (NOT (NULL |lp|))) (GO G191)))
(SEQ (LETT |p| (|SPADfirst| |lp|)
|PSETCAT-;collect;SVarSetS;9|)
(LETT |lp| (CDR |lp|)
@@ -259,7 +248,7 @@
(LETT |lq| (CONS |p| |lq|)
|PSETCAT-;collect;SVarSetS;9|)))))))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |lq| (|getShellEntry| $ 31)))))))
+ (EXIT (SPADCALL |lq| (|getShellEntry| $ 30)))))))
(DEFUN |PSETCAT-;sort;SVarSetR;10| (|ps| |v| $)
(PROG (|p| |lp| |us| |vs| |ws|)
@@ -269,10 +258,7 @@
(LETT |us| NIL |PSETCAT-;sort;SVarSetR;10|)
(LETT |vs| NIL |PSETCAT-;sort;SVarSetR;10|)
(LETT |ws| NIL |PSETCAT-;sort;SVarSetR;10|)
- (SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |lp|) (|getShellEntry| $ 29)))
- (GO G191)))
+ (SEQ G190 (COND ((NULL (NOT (NULL |lp|))) (GO G191)))
(SEQ (LETT |p| (|SPADfirst| |lp|)
|PSETCAT-;sort;SVarSetR;10|)
(LETT |lp| (CDR |lp|) |PSETCAT-;sort;SVarSetR;10|)
@@ -293,9 +279,9 @@
(LETT |ws| (CONS |p| |ws|)
|PSETCAT-;sort;SVarSetR;10|)))))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (VECTOR (SPADCALL |us| (|getShellEntry| $ 31))
- (SPADCALL |vs| (|getShellEntry| $ 31))
- (SPADCALL |ws| (|getShellEntry| $ 31))))))))
+ (EXIT (VECTOR (SPADCALL |us| (|getShellEntry| $ 30))
+ (SPADCALL |vs| (|getShellEntry| $ 30))
+ (SPADCALL |ws| (|getShellEntry| $ 30))))))))
(DEFUN |PSETCAT-;=;2SB;11| (|ps1| |ps2| $)
(PROG (#0=#:G1562 #1=#:G1563 #2=#:G1564 |p| #3=#:G1565)
@@ -319,7 +305,7 @@
|PSETCAT-;=;2SB;11|)))
(LETT #1# (CDR #1#) |PSETCAT-;=;2SB;11|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 38))
+ (|getShellEntry| $ 37))
(SPADCALL
(PROGN
(LETT #2# NIL |PSETCAT-;=;2SB;11|)
@@ -338,28 +324,28 @@
|PSETCAT-;=;2SB;11|)))
(LETT #3# (CDR #3#) |PSETCAT-;=;2SB;11|)
(GO G190) G191 (EXIT (NREVERSE0 #2#))))
- (|getShellEntry| $ 38))
- (|getShellEntry| $ 39))))))
+ (|getShellEntry| $ 37))
+ (|getShellEntry| $ 38))))))
(DEFUN |PSETCAT-;localInf?| (|p| |q| $)
- (SPADCALL (SPADCALL |p| (|getShellEntry| $ 41))
- (SPADCALL |q| (|getShellEntry| $ 41)) (|getShellEntry| $ 42)))
+ (SPADCALL (SPADCALL |p| (|getShellEntry| $ 40))
+ (SPADCALL |q| (|getShellEntry| $ 40)) (|getShellEntry| $ 41)))
(DEFUN |PSETCAT-;localTriangular?| (|lp| $)
(PROG (|q| |p|)
(RETURN
- (SEQ (LETT |lp| (SPADCALL (ELT $ 43) |lp| (|getShellEntry| $ 26))
+ (SEQ (LETT |lp| (SPADCALL (ELT $ 42) |lp| (|getShellEntry| $ 26))
|PSETCAT-;localTriangular?|)
(EXIT (COND
((NULL |lp|) 'T)
- ((SPADCALL (ELT $ 24) |lp| (|getShellEntry| $ 44))
+ ((SPADCALL (ELT $ 24) |lp| (|getShellEntry| $ 43))
'NIL)
('T
(SEQ (LETT |lp|
(SPADCALL
(CONS
#'|PSETCAT-;localTriangular?!0| $)
- |lp| (|getShellEntry| $ 46))
+ |lp| (|getShellEntry| $ 45))
|PSETCAT-;localTriangular?|)
(LETT |p| (|SPADfirst| |lp|)
|PSETCAT-;localTriangular?|)
@@ -396,31 +382,31 @@
(|PSETCAT-;localTriangular?| (|PSETCAT-;elements| |ps| $) $))
(DEFUN |PSETCAT-;trivialIdeal?;SB;15| (|ps| $)
- (NULL (SPADCALL (ELT $ 43) (|PSETCAT-;elements| |ps| $)
+ (NULL (SPADCALL (ELT $ 42) (|PSETCAT-;elements| |ps| $)
(|getShellEntry| $ 26))))
(DEFUN |PSETCAT-;roughUnitIdeal?;SB;16| (|ps| $)
(SPADCALL (ELT $ 24)
- (SPADCALL (ELT $ 43) (|PSETCAT-;elements| |ps| $)
+ (SPADCALL (ELT $ 42) (|PSETCAT-;elements| |ps| $)
(|getShellEntry| $ 26))
- (|getShellEntry| $ 44)))
+ (|getShellEntry| $ 43)))
(DEFUN |PSETCAT-;relativelyPrimeLeadingMonomials?| (|p| |q| $)
(PROG (|dp| |dq|)
(RETURN
- (SEQ (LETT |dp| (SPADCALL |p| (|getShellEntry| $ 41))
+ (SEQ (LETT |dp| (SPADCALL |p| (|getShellEntry| $ 40))
|PSETCAT-;relativelyPrimeLeadingMonomials?|)
- (LETT |dq| (SPADCALL |q| (|getShellEntry| $ 41))
+ (LETT |dq| (SPADCALL |q| (|getShellEntry| $ 40))
|PSETCAT-;relativelyPrimeLeadingMonomials?|)
- (EXIT (SPADCALL (SPADCALL |dp| |dq| (|getShellEntry| $ 50))
- (SPADCALL |dp| |dq| (|getShellEntry| $ 51))
- (|getShellEntry| $ 52)))))))
+ (EXIT (SPADCALL (SPADCALL |dp| |dq| (|getShellEntry| $ 49))
+ (SPADCALL |dp| |dq| (|getShellEntry| $ 50))
+ (|getShellEntry| $ 51)))))))
(DEFUN |PSETCAT-;roughBase?;SB;18| (|ps| $)
(PROG (|p| |lp| |rB?| |copylp|)
(RETURN
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 43) (|PSETCAT-;elements| |ps| $)
+ (SPADCALL (ELT $ 42) (|PSETCAT-;elements| |ps| $)
(|getShellEntry| $ 26))
|PSETCAT-;roughBase?;SB;18|)
(EXIT (COND
@@ -464,16 +450,16 @@
(RETURN
(SEQ (LETT |lp|
(SPADCALL (|PSETCAT-;elements| |ps1| $) |ps2|
- (|getShellEntry| $ 54))
+ (|getShellEntry| $ 53))
|PSETCAT-;roughSubIdeal?;2SB;19|)
- (EXIT (NULL (SPADCALL (ELT $ 43) |lp|
+ (EXIT (NULL (SPADCALL (ELT $ 42) |lp|
(|getShellEntry| $ 26))))))))
(DEFUN |PSETCAT-;roughEqualIdeals?;2SB;20| (|ps1| |ps2| $)
(COND
- ((SPADCALL |ps1| |ps2| (|getShellEntry| $ 56)) 'T)
- ((SPADCALL |ps1| |ps2| (|getShellEntry| $ 57))
- (SPADCALL |ps2| |ps1| (|getShellEntry| $ 57)))
+ ((SPADCALL |ps1| |ps2| (|getShellEntry| $ 55)) 'T)
+ ((SPADCALL |ps1| |ps2| (|getShellEntry| $ 56))
+ (SPADCALL |ps2| |ps1| (|getShellEntry| $ 56)))
('T 'NIL)))
(DEFUN |PSETCAT-;exactQuo| (|r| |s| $)
@@ -481,9 +467,9 @@
(RETURN
(COND
((|HasCategory| (|getShellEntry| $ 7) '(|EuclideanDomain|))
- (SPADCALL |r| |s| (|getShellEntry| $ 59)))
+ (SPADCALL |r| |s| (|getShellEntry| $ 58)))
('T
- (PROG2 (LETT #0# (SPADCALL |r| |s| (|getShellEntry| $ 61))
+ (PROG2 (LETT #0# (SPADCALL |r| |s| (|getShellEntry| $ 60))
|PSETCAT-;exactQuo|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) (|getShellEntry| $ 7) #0#)))))))
@@ -492,16 +478,16 @@
(PROG (|lp1| |p| |e| |g| |#G45| |#G46| |lca| |lcp| |r| |lp2|)
(RETURN
(SEQ (LETT |lp1|
- (SPADCALL (ELT $ 43) (|PSETCAT-;elements| |ps| $)
+ (SPADCALL (ELT $ 42) (|PSETCAT-;elements| |ps| $)
(|getShellEntry| $ 26))
|PSETCAT-;headRemainder;PSR;22|)
(EXIT (COND
- ((NULL |lp1|) (CONS |a| (|spadConstant| $ 62)))
- ((SPADCALL (ELT $ 24) |lp1| (|getShellEntry| $ 44))
- (CONS (SPADCALL |a| (|getShellEntry| $ 63))
- (|spadConstant| $ 62)))
+ ((NULL |lp1|) (CONS |a| (|spadConstant| $ 61)))
+ ((SPADCALL (ELT $ 24) |lp1| (|getShellEntry| $ 43))
+ (CONS (SPADCALL |a| (|getShellEntry| $ 62))
+ (|spadConstant| $ 61)))
('T
- (SEQ (LETT |r| (|spadConstant| $ 62)
+ (SEQ (LETT |r| (|spadConstant| $ 61)
|PSETCAT-;headRemainder;PSR;22|)
(LETT |lp1|
(SPADCALL
@@ -510,7 +496,7 @@
$)
(REVERSE
(|PSETCAT-;elements| |ps| $))
- (|getShellEntry| $ 46))
+ (|getShellEntry| $ 45))
|PSETCAT-;headRemainder;PSR;22|)
(LETT |lp2| |lp1|
|PSETCAT-;headRemainder;PSR;22|)
@@ -518,21 +504,19 @@
(COND
((NULL (COND
((SPADCALL |a|
- (|getShellEntry| $ 43))
+ (|getShellEntry| $ 42))
'NIL)
- ('T
- (SPADCALL (NULL |lp2|)
- (|getShellEntry| $ 29)))))
+ ('T (NOT (NULL |lp2|)))))
(GO G191)))
(SEQ (LETT |p| (|SPADfirst| |lp2|)
|PSETCAT-;headRemainder;PSR;22|)
(LETT |e|
(SPADCALL
(SPADCALL |a|
- (|getShellEntry| $ 41))
+ (|getShellEntry| $ 40))
(SPADCALL |p|
- (|getShellEntry| $ 41))
- (|getShellEntry| $ 64))
+ (|getShellEntry| $ 40))
+ (|getShellEntry| $ 63))
|PSETCAT-;headRemainder;PSR;22|)
(EXIT
(COND
@@ -542,13 +526,13 @@
(SPADCALL
(LETT |lca|
(SPADCALL |a|
- (|getShellEntry| $ 65))
+ (|getShellEntry| $ 64))
|PSETCAT-;headRemainder;PSR;22|)
(LETT |lcp|
(SPADCALL |p|
- (|getShellEntry| $ 65))
+ (|getShellEntry| $ 64))
|PSETCAT-;headRemainder;PSR;22|)
- (|getShellEntry| $ 66))
+ (|getShellEntry| $ 65))
|PSETCAT-;headRemainder;PSR;22|)
(PROGN
(LETT |#G45|
@@ -567,19 +551,19 @@
(SPADCALL
(SPADCALL |lcp|
(SPADCALL |a|
- (|getShellEntry| $ 63))
- (|getShellEntry| $ 67))
+ (|getShellEntry| $ 62))
+ (|getShellEntry| $ 66))
(SPADCALL
(SPADCALL |lca| (QCDR |e|)
- (|getShellEntry| $ 68))
+ (|getShellEntry| $ 67))
(SPADCALL |p|
- (|getShellEntry| $ 63))
- (|getShellEntry| $ 69))
- (|getShellEntry| $ 70))
+ (|getShellEntry| $ 62))
+ (|getShellEntry| $ 68))
+ (|getShellEntry| $ 69))
|PSETCAT-;headRemainder;PSR;22|)
(LETT |r|
(SPADCALL |r| |lcp|
- (|getShellEntry| $ 71))
+ (|getShellEntry| $ 70))
|PSETCAT-;headRemainder;PSR;22|)
(EXIT
(LETT |lp2| |lp1|
@@ -595,17 +579,17 @@
(RETURN
(SEQ (LETT |g|
(SPADCALL (QCDR |frac|) (QCAR |frac|)
- (|getShellEntry| $ 74))
+ (|getShellEntry| $ 73))
|PSETCAT-;makeIrreducible!|)
(EXIT (COND
- ((SPADCALL |g| (|spadConstant| $ 62)
- (|getShellEntry| $ 76))
+ ((SPADCALL |g| (|spadConstant| $ 61)
+ (|getShellEntry| $ 75))
|frac|)
('T
(SEQ (PROGN
(RPLACA |frac|
(SPADCALL (QCAR |frac|) |g|
- (|getShellEntry| $ 77)))
+ (|getShellEntry| $ 76)))
(QCAR |frac|))
(PROGN
(RPLACD |frac|
@@ -619,67 +603,66 @@
(RETURN
(SEQ (LETT |hRa|
(|PSETCAT-;makeIrreducible!|
- (SPADCALL |a| |ps| (|getShellEntry| $ 78)) $)
+ (SPADCALL |a| |ps| (|getShellEntry| $ 77)) $)
|PSETCAT-;remainder;PSR;24|)
(LETT |a| (QCAR |hRa|) |PSETCAT-;remainder;PSR;24|)
(LETT |r| (QCDR |hRa|) |PSETCAT-;remainder;PSR;24|)
(EXIT (COND
- ((SPADCALL |a| (|getShellEntry| $ 43))
- (VECTOR (|spadConstant| $ 62) |a| |r|))
+ ((SPADCALL |a| (|getShellEntry| $ 42))
+ (VECTOR (|spadConstant| $ 61) |a| |r|))
('T
(SEQ (LETT |b|
- (SPADCALL (|spadConstant| $ 62)
+ (SPADCALL (|spadConstant| $ 61)
(SPADCALL |a|
- (|getShellEntry| $ 41))
- (|getShellEntry| $ 68))
+ (|getShellEntry| $ 40))
+ (|getShellEntry| $ 67))
|PSETCAT-;remainder;PSR;24|)
(LETT |c|
- (SPADCALL |a| (|getShellEntry| $ 65))
+ (SPADCALL |a| (|getShellEntry| $ 64))
|PSETCAT-;remainder;PSR;24|)
(SEQ G190
(COND
- ((NULL (SPADCALL
+ ((NULL (NOT
(SPADCALL
(LETT |a|
(SPADCALL |a|
- (|getShellEntry| $ 63))
+ (|getShellEntry| $ 62))
|PSETCAT-;remainder;PSR;24|)
- (|getShellEntry| $ 43))
- (|getShellEntry| $ 29)))
+ (|getShellEntry| $ 42))))
(GO G191)))
(SEQ (LETT |hRa|
(|PSETCAT-;makeIrreducible!|
(SPADCALL |a| |ps|
- (|getShellEntry| $ 78))
+ (|getShellEntry| $ 77))
$)
|PSETCAT-;remainder;PSR;24|)
(LETT |a| (QCAR |hRa|)
|PSETCAT-;remainder;PSR;24|)
(LETT |r|
(SPADCALL |r| (QCDR |hRa|)
- (|getShellEntry| $ 71))
+ (|getShellEntry| $ 70))
|PSETCAT-;remainder;PSR;24|)
(LETT |g|
(SPADCALL |c|
(LETT |lca|
(SPADCALL |a|
- (|getShellEntry| $ 65))
+ (|getShellEntry| $ 64))
|PSETCAT-;remainder;PSR;24|)
- (|getShellEntry| $ 66))
+ (|getShellEntry| $ 65))
|PSETCAT-;remainder;PSR;24|)
(LETT |b|
(SPADCALL
(SPADCALL
(SPADCALL (QCDR |hRa|)
(|PSETCAT-;exactQuo| |c| |g| $)
- (|getShellEntry| $ 71))
- |b| (|getShellEntry| $ 67))
+ (|getShellEntry| $ 70))
+ |b| (|getShellEntry| $ 66))
(SPADCALL
(|PSETCAT-;exactQuo| |lca| |g| $)
(SPADCALL |a|
- (|getShellEntry| $ 41))
- (|getShellEntry| $ 68))
- (|getShellEntry| $ 79))
+ (|getShellEntry| $ 40))
+ (|getShellEntry| $ 67))
+ (|getShellEntry| $ 78))
|PSETCAT-;remainder;PSR;24|)
(EXIT
(LETT |c| |g|
@@ -691,27 +674,25 @@
(PROG (|p| |rs|)
(RETURN
(SEQ (COND
- ((SPADCALL |cs| (|getShellEntry| $ 82)) |ps|)
- ((SPADCALL |cs| (|getShellEntry| $ 83))
- (LIST (|spadConstant| $ 84)))
+ ((SPADCALL |cs| (|getShellEntry| $ 81)) |ps|)
+ ((SPADCALL |cs| (|getShellEntry| $ 82))
+ (LIST (|spadConstant| $ 83)))
('T
(SEQ (LETT |ps|
- (SPADCALL (ELT $ 43) |ps|
+ (SPADCALL (ELT $ 42) |ps|
(|getShellEntry| $ 26))
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|)
(EXIT (COND
((NULL |ps|) |ps|)
((SPADCALL (ELT $ 24) |ps|
- (|getShellEntry| $ 44))
- (LIST (|spadConstant| $ 75)))
+ (|getShellEntry| $ 43))
+ (LIST (|spadConstant| $ 74)))
('T
(SEQ (LETT |rs| NIL
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|)
(SEQ G190
(COND
- ((NULL
- (SPADCALL (NULL |ps|)
- (|getShellEntry| $ 29)))
+ ((NULL (NOT (NULL |ps|)))
(GO G191)))
(SEQ
(LETT |p| (|SPADfirst| |ps|)
@@ -721,13 +702,13 @@
(LETT |p|
(QCAR
(SPADCALL |p| |cs|
- (|getShellEntry| $ 78)))
+ (|getShellEntry| $ 77)))
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|)
(EXIT
(COND
((NULL
(SPADCALL |p|
- (|getShellEntry| $ 43)))
+ (|getShellEntry| $ 42)))
(COND
((SPADCALL |p|
(|getShellEntry| $ 24))
@@ -737,45 +718,43 @@
(EXIT
(LETT |rs|
(LIST
- (|spadConstant| $ 75))
+ (|spadConstant| $ 74))
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|))))
('T
(SEQ
(SPADCALL |p|
- (|getShellEntry| $ 85))
+ (|getShellEntry| $ 84))
(EXIT
(LETT |rs|
(CONS |p| |rs|)
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|)))))))))
NIL (GO G190) G191 (EXIT NIL))
(EXIT (SPADCALL |rs|
- (|getShellEntry| $ 86))))))))))))))
+ (|getShellEntry| $ 85))))))))))))))
(DEFUN |PSETCAT-;rewriteIdealWithRemainder;LSL;26| (|ps| |cs| $)
(PROG (|p| |rs|)
(RETURN
(SEQ (COND
- ((SPADCALL |cs| (|getShellEntry| $ 82)) |ps|)
- ((SPADCALL |cs| (|getShellEntry| $ 83))
- (LIST (|spadConstant| $ 84)))
+ ((SPADCALL |cs| (|getShellEntry| $ 81)) |ps|)
+ ((SPADCALL |cs| (|getShellEntry| $ 82))
+ (LIST (|spadConstant| $ 83)))
('T
(SEQ (LETT |ps|
- (SPADCALL (ELT $ 43) |ps|
+ (SPADCALL (ELT $ 42) |ps|
(|getShellEntry| $ 26))
|PSETCAT-;rewriteIdealWithRemainder;LSL;26|)
(EXIT (COND
((NULL |ps|) |ps|)
((SPADCALL (ELT $ 24) |ps|
- (|getShellEntry| $ 44))
- (LIST (|spadConstant| $ 75)))
+ (|getShellEntry| $ 43))
+ (LIST (|spadConstant| $ 74)))
('T
(SEQ (LETT |rs| NIL
|PSETCAT-;rewriteIdealWithRemainder;LSL;26|)
(SEQ G190
(COND
- ((NULL
- (SPADCALL (NULL |ps|)
- (|getShellEntry| $ 29)))
+ ((NULL (NOT (NULL |ps|)))
(GO G191)))
(SEQ
(LETT |p| (|SPADfirst| |ps|)
@@ -785,14 +764,14 @@
(LETT |p|
(QVELT
(SPADCALL |p| |cs|
- (|getShellEntry| $ 88))
+ (|getShellEntry| $ 87))
1)
|PSETCAT-;rewriteIdealWithRemainder;LSL;26|)
(EXIT
(COND
((NULL
(SPADCALL |p|
- (|getShellEntry| $ 43)))
+ (|getShellEntry| $ 42)))
(COND
((SPADCALL |p|
(|getShellEntry| $ 24))
@@ -802,18 +781,18 @@
(EXIT
(LETT |rs|
(LIST
- (|spadConstant| $ 75))
+ (|spadConstant| $ 74))
|PSETCAT-;rewriteIdealWithRemainder;LSL;26|))))
('T
(LETT |rs|
(CONS
(SPADCALL |p|
- (|getShellEntry| $ 89))
+ (|getShellEntry| $ 88))
|rs|)
|PSETCAT-;rewriteIdealWithRemainder;LSL;26|)))))))
NIL (GO G190) G191 (EXIT NIL))
(EXIT (SPADCALL |rs|
- (|getShellEntry| $ 86))))))))))))))
+ (|getShellEntry| $ 85))))))))))))))
(DEFUN |PolynomialSetCategory&| (|#1| |#2| |#3| |#4| |#5|)
(PROG (|dv$1| |dv$2| |dv$3| |dv$4| |dv$5| |dv$| $ |pv$|)
@@ -828,7 +807,7 @@
(LETT |dv$|
(LIST '|PolynomialSetCategory&| |dv$1| |dv$2| |dv$3|
|dv$4| |dv$5|) . #0#)
- (LETT $ (|newShell| 91) . #0#)
+ (LETT $ (|newShell| 90) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -843,18 +822,18 @@
(COND
((|testBitVector| |pv$| 1)
(PROGN
- (|setShellEntry| $ 49
+ (|setShellEntry| $ 48
(CONS (|dispatchFunction|
|PSETCAT-;roughUnitIdeal?;SB;16|)
$))
- (|setShellEntry| $ 53
+ (|setShellEntry| $ 52
(CONS (|dispatchFunction| |PSETCAT-;roughBase?;SB;18|)
$))
- (|setShellEntry| $ 55
+ (|setShellEntry| $ 54
(CONS (|dispatchFunction|
|PSETCAT-;roughSubIdeal?;2SB;19|)
$))
- (|setShellEntry| $ 58
+ (|setShellEntry| $ 57
(CONS (|dispatchFunction|
|PSETCAT-;roughEqualIdeals?;2SB;20|)
$)))))
@@ -863,19 +842,19 @@
(COND
((|HasCategory| |#4| '(|ConvertibleTo| (|Symbol|)))
(PROGN
- (|setShellEntry| $ 73
+ (|setShellEntry| $ 72
(CONS (|dispatchFunction|
|PSETCAT-;headRemainder;PSR;22|)
$))
- (|setShellEntry| $ 81
+ (|setShellEntry| $ 80
(CONS (|dispatchFunction|
|PSETCAT-;remainder;PSR;24|)
$))
- (|setShellEntry| $ 87
+ (|setShellEntry| $ 86
(CONS (|dispatchFunction|
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|)
$))
- (|setShellEntry| $ 90
+ (|setShellEntry| $ 89
(CONS (|dispatchFunction|
|PSETCAT-;rewriteIdealWithRemainder;LSL;26|)
$)))))))
@@ -889,75 +868,74 @@
(21 . |removeDuplicates|) (|Mapping| 15 9 9) (26 . |sort|)
(32 . |mvar|) |PSETCAT-;variables;SL;4| (37 . |ground?|)
(|Mapping| 15 10) (42 . |remove|)
- |PSETCAT-;mainVariables;SL;5| (48 . =) (54 . |not|)
- |PSETCAT-;mainVariable?;VarSetSB;6| (59 . |construct|)
+ |PSETCAT-;mainVariables;SL;5| (48 . =)
+ |PSETCAT-;mainVariable?;VarSetSB;6| (54 . |construct|)
|PSETCAT-;collectUnder;SVarSetS;7|
|PSETCAT-;collectUpper;SVarSetS;8|
|PSETCAT-;collect;SVarSetS;9|
(|Record| (|:| |under| $) (|:| |floor| $) (|:| |upper| $))
- |PSETCAT-;sort;SVarSetR;10| (|Set| 10) (64 . |brace|)
- (69 . =) |PSETCAT-;=;2SB;11| (75 . |degree|) (80 . <)
- (86 . |zero?|) (91 . |any?|) (|Mapping| 15 10 10)
- (97 . |sort|) |PSETCAT-;triangular?;SB;14|
- |PSETCAT-;trivialIdeal?;SB;15| (103 . |roughUnitIdeal?|)
- (108 . |sup|) (114 . +) (120 . =) (126 . |roughBase?|)
- (131 . |rewriteIdealWithRemainder|)
- (137 . |roughSubIdeal?|) (143 . =)
- (149 . |roughSubIdeal?|) (155 . |roughEqualIdeals?|)
- (161 . |quo|) (|Union| $ '"failed") (167 . |exquo|)
- (173 . |One|) (177 . |reductum|) (182 . |subtractIfCan|)
- (188 . |leadingCoefficient|) (193 . |gcd|) (199 . *)
- (205 . |monomial|) (211 . *) (217 . -) (223 . *)
+ |PSETCAT-;sort;SVarSetR;10| (|Set| 10) (59 . |brace|)
+ (64 . =) |PSETCAT-;=;2SB;11| (70 . |degree|) (75 . <)
+ (81 . |zero?|) (86 . |any?|) (|Mapping| 15 10 10)
+ (92 . |sort|) |PSETCAT-;triangular?;SB;14|
+ |PSETCAT-;trivialIdeal?;SB;15| (98 . |roughUnitIdeal?|)
+ (103 . |sup|) (109 . +) (115 . =) (121 . |roughBase?|)
+ (126 . |rewriteIdealWithRemainder|)
+ (132 . |roughSubIdeal?|) (138 . =)
+ (144 . |roughSubIdeal?|) (150 . |roughEqualIdeals?|)
+ (156 . |quo|) (|Union| $ '"failed") (162 . |exquo|)
+ (168 . |One|) (172 . |reductum|) (177 . |subtractIfCan|)
+ (183 . |leadingCoefficient|) (188 . |gcd|) (194 . *)
+ (200 . |monomial|) (206 . *) (212 . -) (218 . *)
(|Record| (|:| |num| 10) (|:| |den| 7))
- (229 . |headRemainder|) (235 . |gcd|) (241 . |One|)
- (245 . =) (251 . |exactQuotient!|) (257 . |headRemainder|)
- (263 . +)
+ (224 . |headRemainder|) (230 . |gcd|) (236 . |One|)
+ (240 . =) (246 . |exactQuotient!|) (252 . |headRemainder|)
+ (258 . +)
(|Record| (|:| |rnum| 7) (|:| |polnum| 10) (|:| |den| 7))
- (269 . |remainder|) (275 . |trivialIdeal?|)
- (280 . |roughUnitIdeal?|) (285 . |Zero|)
- (289 . |primitivePart!|) (294 . |removeDuplicates|)
- (299 . |rewriteIdealWithHeadRemainder|)
- (305 . |remainder|) (311 . |unitCanonical|)
- (316 . |rewriteIdealWithRemainder|))
- '#(|variables| 322 |trivialIdeal?| 327 |triangular?| 332
- |sort| 337 |roughUnitIdeal?| 343 |roughSubIdeal?| 348
- |roughEqualIdeals?| 354 |roughBase?| 360
- |rewriteIdealWithRemainder| 365
- |rewriteIdealWithHeadRemainder| 371 |remainder| 377
- |mainVariables| 383 |mainVariable?| 388 |headRemainder|
- 394 |collectUpper| 400 |collectUnder| 406 |collect| 412 =
- 418)
+ (264 . |remainder|) (270 . |trivialIdeal?|)
+ (275 . |roughUnitIdeal?|) (280 . |Zero|)
+ (284 . |primitivePart!|) (289 . |removeDuplicates|)
+ (294 . |rewriteIdealWithHeadRemainder|)
+ (300 . |remainder|) (306 . |unitCanonical|)
+ (311 . |rewriteIdealWithRemainder|))
+ '#(|variables| 317 |trivialIdeal?| 322 |triangular?| 327
+ |sort| 332 |roughUnitIdeal?| 338 |roughSubIdeal?| 343
+ |roughEqualIdeals?| 349 |roughBase?| 355
+ |rewriteIdealWithRemainder| 360
+ |rewriteIdealWithHeadRemainder| 366 |remainder| 372
+ |mainVariables| 378 |mainVariable?| 383 |headRemainder|
+ 389 |collectUpper| 395 |collectUnder| 401 |collect| 407 =
+ 413)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 90
+ (|makeByteWordVec2| 89
'(1 6 11 0 12 1 10 13 0 14 2 9 15 0 0
16 1 13 0 17 18 1 13 0 0 19 2 13 0 20
0 21 1 10 9 0 22 1 10 15 0 24 2 11 0
- 25 0 26 2 9 15 0 0 28 1 15 0 0 29 1 6
- 0 11 31 1 37 0 11 38 2 37 15 0 0 39 1
- 10 8 0 41 2 8 15 0 0 42 1 10 15 0 43
- 2 11 15 25 0 44 2 11 0 45 0 46 1 0 15
- 0 49 2 8 0 0 0 50 2 8 0 0 0 51 2 8 15
- 0 0 52 1 0 15 0 53 2 6 11 11 0 54 2 0
- 15 0 0 55 2 6 15 0 0 56 2 6 15 0 0 57
- 2 0 15 0 0 58 2 7 0 0 0 59 2 7 60 0 0
- 61 0 7 0 62 1 10 0 0 63 2 8 60 0 0 64
- 1 10 7 0 65 2 7 0 0 0 66 2 10 0 7 0
- 67 2 10 0 7 8 68 2 10 0 0 0 69 2 10 0
- 0 0 70 2 7 0 0 0 71 2 0 72 10 0 73 2
- 10 7 7 0 74 0 10 0 75 2 7 15 0 0 76 2
- 10 0 0 7 77 2 6 72 10 0 78 2 10 0 0 0
- 79 2 0 80 10 0 81 1 6 15 0 82 1 6 15
- 0 83 0 10 0 84 1 10 0 0 85 1 11 0 0
- 86 2 0 11 11 0 87 2 6 80 10 0 88 1 10
- 0 0 89 2 0 11 11 0 90 1 0 13 0 23 1 0
- 15 0 48 1 0 15 0 47 2 0 35 0 9 36 1 0
- 15 0 49 2 0 15 0 0 55 2 0 15 0 0 58 1
- 0 15 0 53 2 0 11 11 0 90 2 0 11 11 0
- 87 2 0 80 10 0 81 1 0 13 0 27 2 0 15
- 9 0 30 2 0 72 10 0 73 2 0 0 0 9 33 2
- 0 0 0 9 32 2 0 0 0 9 34 2 0 15 0 0
- 40)))))
+ 25 0 26 2 9 15 0 0 28 1 6 0 11 30 1
+ 36 0 11 37 2 36 15 0 0 38 1 10 8 0 40
+ 2 8 15 0 0 41 1 10 15 0 42 2 11 15 25
+ 0 43 2 11 0 44 0 45 1 0 15 0 48 2 8 0
+ 0 0 49 2 8 0 0 0 50 2 8 15 0 0 51 1 0
+ 15 0 52 2 6 11 11 0 53 2 0 15 0 0 54
+ 2 6 15 0 0 55 2 6 15 0 0 56 2 0 15 0
+ 0 57 2 7 0 0 0 58 2 7 59 0 0 60 0 7 0
+ 61 1 10 0 0 62 2 8 59 0 0 63 1 10 7 0
+ 64 2 7 0 0 0 65 2 10 0 7 0 66 2 10 0
+ 7 8 67 2 10 0 0 0 68 2 10 0 0 0 69 2
+ 7 0 0 0 70 2 0 71 10 0 72 2 10 7 7 0
+ 73 0 10 0 74 2 7 15 0 0 75 2 10 0 0 7
+ 76 2 6 71 10 0 77 2 10 0 0 0 78 2 0
+ 79 10 0 80 1 6 15 0 81 1 6 15 0 82 0
+ 10 0 83 1 10 0 0 84 1 11 0 0 85 2 0
+ 11 11 0 86 2 6 79 10 0 87 1 10 0 0 88
+ 2 0 11 11 0 89 1 0 13 0 23 1 0 15 0
+ 47 1 0 15 0 46 2 0 34 0 9 35 1 0 15 0
+ 48 2 0 15 0 0 54 2 0 15 0 0 57 1 0 15
+ 0 52 2 0 11 11 0 89 2 0 11 11 0 86 2
+ 0 79 10 0 80 1 0 13 0 27 2 0 15 9 0
+ 29 2 0 71 10 0 72 2 0 0 0 9 32 2 0 0
+ 0 9 31 2 0 0 0 9 33 2 0 15 0 0 39)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/STAGG-.lsp b/src/algebra/strap/STAGG-.lsp
index 830a8636..1c815d62 100644
--- a/src/algebra/strap/STAGG-.lsp
+++ b/src/algebra/strap/STAGG-.lsp
@@ -44,8 +44,7 @@
|STAGG-;concat!;3A;13|))
(DEFUN |STAGG-;explicitlyFinite?;AB;1| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 9))
- (|getShellEntry| $ 10)))
+ (NOT (SPADCALL |x| (|getShellEntry| $ 9))))
(DEFUN |STAGG-;possiblyInfinite?;AB;2| (|x| $)
(SPADCALL |x| (|getShellEntry| $ 9)))
@@ -63,25 +62,25 @@
(|STAGG-;c2| |x|
(LETT |x|
(SPADCALL |x|
- (|getShellEntry| $ 13))
+ (|getShellEntry| $ 12))
|STAGG-;first;ANniA;3|)
$)
#0#)
|STAGG-;first;ANniA;3|)))
(LETT |i| (QSADD1 |i|) |STAGG-;first;ANniA;3|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 15))))))
+ (|getShellEntry| $ 14))))))
(DEFUN |STAGG-;c2| (|x| |r| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 18))
+ ((SPADCALL |x| (|getShellEntry| $ 17))
(|error| "Index out of range"))
- ('T (SPADCALL |x| (|getShellEntry| $ 19)))))
+ ('T (SPADCALL |x| (|getShellEntry| $ 18)))))
(DEFUN |STAGG-;elt;AIS;5| (|x| |i| $)
(PROG (#0=#:G1413)
(RETURN
- (SEQ (LETT |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 21)))
+ (SEQ (LETT |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 20)))
|STAGG-;elt;AIS;5|)
(COND
((OR (< |i| 0)
@@ -92,37 +91,37 @@
|STAGG-;elt;AIS;5|)
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 22))
+ (|getShellEntry| $ 21))
|STAGG-;elt;AIS;5|)
- (|getShellEntry| $ 18)))
+ (|getShellEntry| $ 17)))
(EXIT (|error| "index out of range"))))
- (EXIT (SPADCALL |x| (|getShellEntry| $ 19)))))))
+ (EXIT (SPADCALL |x| (|getShellEntry| $ 18)))))))
(DEFUN |STAGG-;elt;AUsA;6| (|x| |i| $)
(PROG (|l| #0=#:G1417 |h| #1=#:G1419 #2=#:G1420)
(RETURN
(SEQ (LETT |l|
- (- (SPADCALL |i| (|getShellEntry| $ 25))
- (SPADCALL |x| (|getShellEntry| $ 21)))
+ (- (SPADCALL |i| (|getShellEntry| $ 24))
+ (SPADCALL |x| (|getShellEntry| $ 20)))
|STAGG-;elt;AUsA;6|)
(EXIT (COND
((< |l| 0) (|error| "index out of range"))
- ((NULL (SPADCALL |i| (|getShellEntry| $ 26)))
+ ((NULL (SPADCALL |i| (|getShellEntry| $ 25)))
(SPADCALL
(SPADCALL |x|
(PROG1 (LETT #0# |l| |STAGG-;elt;AUsA;6|)
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 22))
- (|getShellEntry| $ 27)))
+ (|getShellEntry| $ 21))
+ (|getShellEntry| $ 26)))
('T
(SEQ (LETT |h|
- (- (SPADCALL |i| (|getShellEntry| $ 28))
- (SPADCALL |x| (|getShellEntry| $ 21)))
+ (- (SPADCALL |i| (|getShellEntry| $ 27))
+ (SPADCALL |x| (|getShellEntry| $ 20)))
|STAGG-;elt;AUsA;6|)
(EXIT (COND
((< |h| |l|)
- (SPADCALL (|getShellEntry| $ 29)))
+ (SPADCALL (|getShellEntry| $ 28)))
('T
(SPADCALL
(SPADCALL |x|
@@ -131,25 +130,25 @@
|STAGG-;elt;AUsA;6|)
(|check-subtype| (>= #1# 0)
'(|NonNegativeInteger|) #1#))
- (|getShellEntry| $ 22))
+ (|getShellEntry| $ 21))
(PROG1
(LETT #2# (+ (- |h| |l|) 1)
|STAGG-;elt;AUsA;6|)
(|check-subtype| (>= #2# 0)
'(|NonNegativeInteger|) #2#))
- (|getShellEntry| $ 30)))))))))))))
+ (|getShellEntry| $ 29)))))))))))))
(DEFUN |STAGG-;concat;3A;7| (|x| |y| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 27)) |y|
- (|getShellEntry| $ 32)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 26)) |y|
+ (|getShellEntry| $ 31)))
(DEFUN |STAGG-;concat;LA;8| (|l| $)
(COND
- ((NULL |l|) (SPADCALL (|getShellEntry| $ 29)))
+ ((NULL |l|) (SPADCALL (|getShellEntry| $ 28)))
('T
- (SPADCALL (SPADCALL (|SPADfirst| |l|) (|getShellEntry| $ 27))
- (SPADCALL (CDR |l|) (|getShellEntry| $ 35))
- (|getShellEntry| $ 32)))))
+ (SPADCALL (SPADCALL (|SPADfirst| |l|) (|getShellEntry| $ 26))
+ (SPADCALL (CDR |l|) (|getShellEntry| $ 34))
+ (|getShellEntry| $ 31)))))
(DEFUN |STAGG-;map!;M2A;9| (|f| |l| $)
(PROG (|y|)
@@ -157,16 +156,14 @@
(SEQ (LETT |y| |l| |STAGG-;map!;M2A;9|)
(SEQ G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |l| (|getShellEntry| $ 18))
- (|getShellEntry| $ 10)))
+ ((NULL (NOT (SPADCALL |l| (|getShellEntry| $ 17))))
(GO G191)))
(SEQ (SPADCALL |l|
(SPADCALL
- (SPADCALL |l| (|getShellEntry| $ 19)) |f|)
- (|getShellEntry| $ 37))
+ (SPADCALL |l| (|getShellEntry| $ 18)) |f|)
+ (|getShellEntry| $ 36))
(EXIT (LETT |l|
- (SPADCALL |l| (|getShellEntry| $ 13))
+ (SPADCALL |l| (|getShellEntry| $ 12))
|STAGG-;map!;M2A;9|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |y|)))))
@@ -177,13 +174,11 @@
(SEQ (LETT |y| |x| |STAGG-;fill!;ASA;10|)
(SEQ G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |y| (|getShellEntry| $ 18))
- (|getShellEntry| $ 10)))
+ ((NULL (NOT (SPADCALL |y| (|getShellEntry| $ 17))))
(GO G191)))
- (SEQ (SPADCALL |y| |s| (|getShellEntry| $ 37))
+ (SEQ (SPADCALL |y| |s| (|getShellEntry| $ 36))
(EXIT (LETT |y|
- (SPADCALL |y| (|getShellEntry| $ 13))
+ (SPADCALL |y| (|getShellEntry| $ 12))
|STAGG-;fill!;ASA;10|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |x|)))))
@@ -191,7 +186,7 @@
(DEFUN |STAGG-;setelt;AI2S;11| (|x| |i| |s| $)
(PROG (#0=#:G1436)
(RETURN
- (SEQ (LETT |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 21)))
+ (SEQ (LETT |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 20)))
|STAGG-;setelt;AI2S;11|)
(COND
((OR (< |i| 0)
@@ -202,31 +197,31 @@
|STAGG-;setelt;AI2S;11|)
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 22))
+ (|getShellEntry| $ 21))
|STAGG-;setelt;AI2S;11|)
- (|getShellEntry| $ 18)))
+ (|getShellEntry| $ 17)))
(EXIT (|error| "index out of range"))))
- (EXIT (SPADCALL |x| |s| (|getShellEntry| $ 37)))))))
+ (EXIT (SPADCALL |x| |s| (|getShellEntry| $ 36)))))))
(DEFUN |STAGG-;setelt;AUs2S;12| (|x| |i| |s| $)
(PROG (|l| |h| #0=#:G1441 #1=#:G1442 |z| |y|)
(RETURN
(SEQ (LETT |l|
- (- (SPADCALL |i| (|getShellEntry| $ 25))
- (SPADCALL |x| (|getShellEntry| $ 21)))
+ (- (SPADCALL |i| (|getShellEntry| $ 24))
+ (SPADCALL |x| (|getShellEntry| $ 20)))
|STAGG-;setelt;AUs2S;12|)
(EXIT (COND
((< |l| 0) (|error| "index out of range"))
('T
(SEQ (LETT |h|
(COND
- ((SPADCALL |i| (|getShellEntry| $ 26))
+ ((SPADCALL |i| (|getShellEntry| $ 25))
(- (SPADCALL |i|
- (|getShellEntry| $ 28))
+ (|getShellEntry| $ 27))
(SPADCALL |x|
- (|getShellEntry| $ 21))))
+ (|getShellEntry| $ 20))))
('T
- (SPADCALL |x| (|getShellEntry| $ 42))))
+ (SPADCALL |x| (|getShellEntry| $ 41))))
|STAGG-;setelt;AUs2S;12|)
(EXIT (COND
((< |h| |l|) |s|)
@@ -239,7 +234,7 @@
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|)
#0#))
- (|getShellEntry| $ 22))
+ (|getShellEntry| $ 21))
|STAGG-;setelt;AUs2S;12|)
(LETT |z|
(SPADCALL |y|
@@ -249,33 +244,32 @@
(|check-subtype| (>= #1# 0)
'(|NonNegativeInteger|)
#1#))
- (|getShellEntry| $ 22))
+ (|getShellEntry| $ 21))
|STAGG-;setelt;AUs2S;12|)
(SEQ G190
(COND
((NULL
- (SPADCALL
+ (NOT
(SPADCALL |y| |z|
- (|getShellEntry| $ 43))
- (|getShellEntry| $ 10)))
+ (|getShellEntry| $ 42))))
(GO G191)))
(SEQ
(SPADCALL |y| |s|
- (|getShellEntry| $ 37))
+ (|getShellEntry| $ 36))
(EXIT
(LETT |y|
(SPADCALL |y|
- (|getShellEntry| $ 13))
+ (|getShellEntry| $ 12))
|STAGG-;setelt;AUs2S;12|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |s|)))))))))))))
(DEFUN |STAGG-;concat!;3A;13| (|x| |y| $)
(SEQ (COND
- ((SPADCALL |x| (|getShellEntry| $ 18)) |y|)
+ ((SPADCALL |x| (|getShellEntry| $ 17)) |y|)
('T
- (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 45)) |y|
- (|getShellEntry| $ 46))
+ (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 44)) |y|
+ (|getShellEntry| $ 45))
(EXIT |x|))))))
(DEFUN |StreamAggregate&| (|#1| |#2|)
@@ -285,7 +279,7 @@
(LETT |dv$1| (|devaluate| |#1|) . #0=(|StreamAggregate&|))
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$| (LIST '|StreamAggregate&| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 52) . #0#)
+ (LETT $ (|newShell| 51) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -295,59 +289,59 @@
(COND
((|HasAttribute| |#1| '|shallowlyMutable|)
(PROGN
- (|setShellEntry| $ 33
+ (|setShellEntry| $ 32
(CONS (|dispatchFunction| |STAGG-;concat;3A;7|) $))
- (|setShellEntry| $ 36
+ (|setShellEntry| $ 35
(CONS (|dispatchFunction| |STAGG-;concat;LA;8|) $))
- (|setShellEntry| $ 39
+ (|setShellEntry| $ 38
(CONS (|dispatchFunction| |STAGG-;map!;M2A;9|) $))
- (|setShellEntry| $ 40
+ (|setShellEntry| $ 39
(CONS (|dispatchFunction| |STAGG-;fill!;ASA;10|) $))
- (|setShellEntry| $ 41
+ (|setShellEntry| $ 40
(CONS (|dispatchFunction| |STAGG-;setelt;AI2S;11|) $))
- (|setShellEntry| $ 44
+ (|setShellEntry| $ 43
(CONS (|dispatchFunction| |STAGG-;setelt;AUs2S;12|) $))
- (|setShellEntry| $ 47
+ (|setShellEntry| $ 46
(CONS (|dispatchFunction| |STAGG-;concat!;3A;13|) $)))))
$))))
(MAKEPROP '|StreamAggregate&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|)
- (|Boolean|) (0 . |cyclic?|) (5 . |not|)
+ (|Boolean|) (0 . |cyclic?|)
|STAGG-;explicitlyFinite?;AB;1|
- |STAGG-;possiblyInfinite?;AB;2| (10 . |rest|) (|List| 7)
- (15 . |construct|) (|NonNegativeInteger|)
- |STAGG-;first;ANniA;3| (20 . |empty?|) (25 . |first|)
- (|Integer|) (30 . |minIndex|) (35 . |rest|)
- |STAGG-;elt;AIS;5| (|UniversalSegment| 20) (41 . |lo|)
- (46 . |hasHi|) (51 . |copy|) (56 . |hi|) (61 . |empty|)
- (65 . |first|) |STAGG-;elt;AUsA;6| (71 . |concat!|)
- (77 . |concat|) (|List| $) (83 . |concat|) (88 . |concat|)
- (93 . |setfirst!|) (|Mapping| 7 7) (99 . |map!|)
- (105 . |fill!|) (111 . |setelt|) (118 . |maxIndex|)
- (123 . |eq?|) (129 . |setelt|) (136 . |tail|)
- (141 . |setrest!|) (147 . |concat!|) '"rest" '"last"
+ |STAGG-;possiblyInfinite?;AB;2| (5 . |rest|) (|List| 7)
+ (10 . |construct|) (|NonNegativeInteger|)
+ |STAGG-;first;ANniA;3| (15 . |empty?|) (20 . |first|)
+ (|Integer|) (25 . |minIndex|) (30 . |rest|)
+ |STAGG-;elt;AIS;5| (|UniversalSegment| 19) (36 . |lo|)
+ (41 . |hasHi|) (46 . |copy|) (51 . |hi|) (56 . |empty|)
+ (60 . |first|) |STAGG-;elt;AUsA;6| (66 . |concat!|)
+ (72 . |concat|) (|List| $) (78 . |concat|) (83 . |concat|)
+ (88 . |setfirst!|) (|Mapping| 7 7) (94 . |map!|)
+ (100 . |fill!|) (106 . |setelt|) (113 . |maxIndex|)
+ (118 . |eq?|) (124 . |setelt|) (131 . |tail|)
+ (136 . |setrest!|) (142 . |concat!|) '"rest" '"last"
'"first" '"value")
- '#(|setelt| 153 |possiblyInfinite?| 167 |map!| 172 |first|
- 178 |fill!| 184 |explicitlyFinite?| 190 |elt| 195
- |concat!| 207 |concat| 213)
+ '#(|setelt| 148 |possiblyInfinite?| 162 |map!| 167 |first|
+ 173 |fill!| 179 |explicitlyFinite?| 185 |elt| 190
+ |concat!| 202 |concat| 208)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 47
- '(1 6 8 0 9 1 8 0 0 10 1 6 0 0 13 1 6 0
- 14 15 1 6 8 0 18 1 6 7 0 19 1 6 20 0
- 21 2 6 0 0 16 22 1 24 20 0 25 1 24 8
- 0 26 1 6 0 0 27 1 24 20 0 28 0 6 0 29
- 2 6 0 0 16 30 2 6 0 0 0 32 2 0 0 0 0
- 33 1 6 0 34 35 1 0 0 34 36 2 6 7 0 7
- 37 2 0 0 38 0 39 2 0 0 0 7 40 3 0 7 0
- 20 7 41 1 6 20 0 42 2 6 8 0 0 43 3 0
- 7 0 24 7 44 1 6 0 0 45 2 6 0 0 0 46 2
- 0 0 0 0 47 3 0 7 0 20 7 41 3 0 7 0 24
- 7 44 1 0 8 0 12 2 0 0 38 0 39 2 0 0 0
- 16 17 2 0 0 0 7 40 1 0 8 0 11 2 0 7 0
- 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)))))
+ (|makeByteWordVec2| 46
+ '(1 6 8 0 9 1 6 0 0 12 1 6 0 13 14 1 6
+ 8 0 17 1 6 7 0 18 1 6 19 0 20 2 6 0 0
+ 15 21 1 23 19 0 24 1 23 8 0 25 1 6 0
+ 0 26 1 23 19 0 27 0 6 0 28 2 6 0 0 15
+ 29 2 6 0 0 0 31 2 0 0 0 0 32 1 6 0 33
+ 34 1 0 0 33 35 2 6 7 0 7 36 2 0 0 37
+ 0 38 2 0 0 0 7 39 3 0 7 0 19 7 40 1 6
+ 19 0 41 2 6 8 0 0 42 3 0 7 0 23 7 43
+ 1 6 0 0 44 2 6 0 0 0 45 2 0 0 0 0 46
+ 3 0 7 0 19 7 40 3 0 7 0 23 7 43 1 0 8
+ 0 11 2 0 0 37 0 38 2 0 0 0 15 16 2 0
+ 0 0 7 39 1 0 8 0 10 2 0 7 0 19 22 2 0
+ 0 0 23 30 2 0 0 0 0 46 1 0 0 33 35 2
+ 0 0 0 0 32)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp
index 8c1044f6..abcff0c2 100644
--- a/src/algebra/strap/SYMBOL.lsp
+++ b/src/algebra/strap/SYMBOL.lsp
@@ -331,14 +331,11 @@
((NULL (NULL |lo|))
(SEQ (LETT |sc| "_{" |SYMBOL;latex;$S;25|)
(SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |lo|)
- (|getShellEntry| $ 88)))
- (GO G191)))
+ (COND ((NULL (NOT (NULL |lo|))) (GO G191)))
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 89)))
+ (|getShellEntry| $ 88)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -355,14 +352,11 @@
((NULL (NULL |lo|))
(SEQ (LETT |sc| "^{" |SYMBOL;latex;$S;25|)
(SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |lo|)
- (|getShellEntry| $ 88)))
- (GO G191)))
+ (COND ((NULL (NOT (NULL |lo|))) (GO G191)))
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 89)))
+ (|getShellEntry| $ 88)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -379,14 +373,11 @@
((NULL (NULL |lo|))
(SEQ (LETT |sc| "{}^{" |SYMBOL;latex;$S;25|)
(SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |lo|)
- (|getShellEntry| $ 88)))
- (GO G191)))
+ (COND ((NULL (NOT (NULL |lo|))) (GO G191)))
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 89)))
+ (|getShellEntry| $ 88)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -403,14 +394,11 @@
((NULL (NULL |lo|))
(SEQ (LETT |sc| "{}_{" |SYMBOL;latex;$S;25|)
(SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |lo|)
- (|getShellEntry| $ 88)))
- (GO G191)))
+ (COND ((NULL (NOT (NULL |lo|))) (GO G191)))
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 89)))
+ (|getShellEntry| $ 88)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -427,14 +415,11 @@
((NULL (NULL |lo|))
(SEQ (LETT |sc| "\\left( {" |SYMBOL;latex;$S;25|)
(SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |lo|)
- (|getShellEntry| $ 88)))
- (GO G191)))
+ (COND ((NULL (NOT (NULL |lo|))) (GO G191)))
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 89)))
+ (|getShellEntry| $ 88)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -464,9 +449,9 @@
(SPADCALL |s|
(+ (QCDR |qr|)
(SPADCALL |s|
- (|getShellEntry| $ 91)))
+ (|getShellEntry| $ 90)))
(|getShellEntry| $ 85))
- |ns| (|getShellEntry| $ 92))
+ |ns| (|getShellEntry| $ 91))
|SYMBOL;anyRadix|)
(EXIT
(COND
@@ -484,14 +469,14 @@
(SEQ (LETT |sym|
(|SYMBOL;anyRadix|
(SPADCALL (|getShellEntry| $ 9)
- (|getShellEntry| $ 93))
+ (|getShellEntry| $ 92))
(|getShellEntry| $ 19) $)
|SYMBOL;new;$;27|)
(SPADCALL (|getShellEntry| $ 9)
(+ (SPADCALL (|getShellEntry| $ 9)
- (|getShellEntry| $ 93))
+ (|getShellEntry| $ 92))
1)
- (|getShellEntry| $ 94))
+ (|getShellEntry| $ 93))
(EXIT (|SYMBOL;coerce;S$;8| (STRCONC "%" |sym|) $))))))
(DEFUN |SYMBOL;new;2$;28| (|x| $)
@@ -500,14 +485,14 @@
(SEQ (LETT |n|
(SEQ (LETT |u|
(SPADCALL |x| (|getShellEntry| $ 12)
- (|getShellEntry| $ 97))
+ (|getShellEntry| $ 96))
|SYMBOL;new;2$;28|)
(EXIT (COND
((QEQCAR |u| 1) 0)
('T (+ (QCDR |u|) 1)))))
|SYMBOL;new;2$;28|)
(SPADCALL (|getShellEntry| $ 12) |x| |n|
- (|getShellEntry| $ 98))
+ (|getShellEntry| $ 97))
(LETT |xx|
(COND
((NULL (|SYMBOL;scripted?;$B;30| |x| $))
@@ -522,12 +507,12 @@
((NULL (< (SPADCALL
(SPADCALL |xx|
(SPADCALL |xx|
- (|getShellEntry| $ 99))
+ (|getShellEntry| $ 98))
(|getShellEntry| $ 85))
(|getShellEntry| $ 18)
- (|getShellEntry| $ 100))
+ (|getShellEntry| $ 99))
(SPADCALL (|getShellEntry| $ 18)
- (|getShellEntry| $ 91))))
+ (|getShellEntry| $ 90))))
(STRCONC |xx|
(|SYMBOL;anyRadix| |n|
(|getShellEntry| $ 20) $)))
@@ -545,11 +530,11 @@
(DEFUN |SYMBOL;resetNew;V;29| ($)
(PROG (|k| #0=#:G1550)
(RETURN
- (SEQ (SPADCALL (|getShellEntry| $ 9) 0 (|getShellEntry| $ 94))
+ (SEQ (SPADCALL (|getShellEntry| $ 9) 0 (|getShellEntry| $ 93))
(SEQ (LETT |k| NIL |SYMBOL;resetNew;V;29|)
(LETT #0#
(SPADCALL (|getShellEntry| $ 12)
- (|getShellEntry| $ 103))
+ (|getShellEntry| $ 102))
|SYMBOL;resetNew;V;29|)
G190
(COND
@@ -559,13 +544,12 @@
NIL))
(GO G191)))
(SEQ (EXIT (SPADCALL |k| (|getShellEntry| $ 12)
- (|getShellEntry| $ 104))))
+ (|getShellEntry| $ 103))))
(LETT #0# (CDR #0#) |SYMBOL;resetNew;V;29|) (GO G190)
G191 (EXIT NIL))
- (EXIT (SPADCALL (|getShellEntry| $ 105)))))))
+ (EXIT (SPADCALL (|getShellEntry| $ 104)))))))
-(DEFUN |SYMBOL;scripted?;$B;30| (|sy| $)
- (SPADCALL (ATOM |sy|) (|getShellEntry| $ 88)))
+(DEFUN |SYMBOL;scripted?;$B;30| (|sy| $) (NOT (ATOM |sy|)))
(DEFUN |SYMBOL;name;2$;31| (|sy| $)
(PROG (|str| |i| #0=#:G1551 #1=#:G1531 #2=#:G1529)
@@ -577,7 +561,7 @@
(|SYMBOL;string;$S;24|
(SPADCALL
(|SYMBOL;list;$L;34| |sy| $)
- (|getShellEntry| $ 108))
+ (|getShellEntry| $ 107))
$)
|SYMBOL;name;2$;31|)
(SEQ (EXIT (SEQ
@@ -595,7 +579,7 @@
(SPADCALL
(SPADCALL |str| |i|
(|getShellEntry| $ 85))
- (|getShellEntry| $ 109)))
+ (|getShellEntry| $ 108)))
(PROGN
(LETT #2#
(PROGN
@@ -605,9 +589,9 @@
(SPADCALL |i|
(QCSIZE |str|)
(|getShellEntry| $
- 111))
+ 110))
(|getShellEntry| $
- 112))
+ 111))
$)
|SYMBOL;name;2$;31|)
(GO #1#))
@@ -635,12 +619,12 @@
(LETT |str|
(|SYMBOL;string;$S;24|
(SPADCALL (|SYMBOL;list;$L;34| |sy| $)
- (|getShellEntry| $ 108))
+ (|getShellEntry| $ 107))
$)
|SYMBOL;scripts;$R;32|)
(LETT |nstr| (QCSIZE |str|) |SYMBOL;scripts;$R;32|)
(LETT |m|
- (SPADCALL |nscripts| (|getShellEntry| $ 114))
+ (SPADCALL |nscripts| (|getShellEntry| $ 113))
|SYMBOL;scripts;$R;32|)
(SEQ (LETT |j| (+ (|getShellEntry| $ 38) 1)
|SYMBOL;scripts;$R;32|)
@@ -650,7 +634,7 @@
(NULL (SPADCALL
(SPADCALL |str| |j|
(|getShellEntry| $ 85))
- (|getShellEntry| $ 109))))
+ (|getShellEntry| $ 108))))
(GO G191)))
(SEQ (EXIT (SPADCALL |nscripts| |i|
(PROG1
@@ -664,7 +648,7 @@
|SYMBOL;scripts;$R;32|)
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 115))))
+ (|getShellEntry| $ 114))))
(LETT |i|
(PROG1 (+ |i| 1)
(LETT |j| (+ |j| 1)
@@ -674,14 +658,14 @@
(LETT |nscripts|
(SPADCALL (CDR |nscripts|)
(|SPADfirst| |nscripts|)
- (|getShellEntry| $ 116))
+ (|getShellEntry| $ 115))
|SYMBOL;scripts;$R;32|)
(LETT |allscripts|
(SPADCALL (|SYMBOL;list;$L;34| |sy| $)
- (|getShellEntry| $ 117))
+ (|getShellEntry| $ 116))
|SYMBOL;scripts;$R;32|)
(LETT |m|
- (SPADCALL |lscripts| (|getShellEntry| $ 118))
+ (SPADCALL |lscripts| (|getShellEntry| $ 117))
|SYMBOL;scripts;$R;32|)
(SEQ (LETT |n| NIL |SYMBOL;scripts;$R;32|)
(LETT #1# |nscripts| |SYMBOL;scripts;$R;32|)
@@ -696,7 +680,7 @@
(SEQ (EXIT (COND
((<
(SPADCALL |allscripts|
- (|getShellEntry| $ 119))
+ (|getShellEntry| $ 118))
|n|)
(|error|
"Improper script count in symbol"))
@@ -711,7 +695,7 @@
|SYMBOL;scripts;$R;32|)
(LETT #3#
(SPADCALL |allscripts| |n|
- (|getShellEntry| $ 120))
+ (|getShellEntry| $ 119))
|SYMBOL;scripts;$R;32|)
G190
(COND
@@ -733,11 +717,11 @@
|SYMBOL;scripts;$R;32|)
(GO G190) G191
(EXIT (NREVERSE0 #2#))))
- (|getShellEntry| $ 121))
+ (|getShellEntry| $ 120))
(EXIT
(LETT |allscripts|
(SPADCALL |allscripts| |n|
- (|getShellEntry| $ 122))
+ (|getShellEntry| $ 121))
|SYMBOL;scripts;$R;32|)))))))
(LETT |i|
(PROG1 (+ |i| 1)
@@ -746,15 +730,15 @@
|SYMBOL;scripts;$R;32|)
(GO G190) G191 (EXIT NIL))
(EXIT (VECTOR (SPADCALL |lscripts| |m|
- (|getShellEntry| $ 123))
+ (|getShellEntry| $ 122))
(SPADCALL |lscripts| (+ |m| 1)
- (|getShellEntry| $ 123))
+ (|getShellEntry| $ 122))
(SPADCALL |lscripts| (+ |m| 2)
- (|getShellEntry| $ 123))
+ (|getShellEntry| $ 122))
(SPADCALL |lscripts| (+ |m| 3)
- (|getShellEntry| $ 123))
+ (|getShellEntry| $ 122))
(SPADCALL |lscripts| (+ |m| 4)
- (|getShellEntry| $ 123)))))))))))
+ (|getShellEntry| $ 122)))))))))))
(DEFUN |SYMBOL;istring| (|n| $)
(COND
@@ -790,7 +774,7 @@
(RETURN
(PROGN
(LETT |dv$| '(|Symbol|) . #0=(|Symbol|))
- (LETT $ (|newShell| 126) . #0#)
+ (LETT $ (|newShell| 125) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -846,29 +830,29 @@
(|:| |presub| 54) (|:| |args| 54))
|SYMBOL;script;$R$;23| |SYMBOL;name;2$;31|
|SYMBOL;string;$S;24| (100 . |elt|) (106 . ~=)
- |SYMBOL;scripts;$R;32| (112 . |not|) (117 . |latex|)
- |SYMBOL;latex;$S;25| (122 . |minIndex|) (127 . |concat|)
- (133 . |elt|) (138 . |setelt|) |SYMBOL;new;$;27|
- (|Union| 6 '"failed") (144 . |search|) (150 . |setelt|)
- (157 . |maxIndex|) (162 . |position|) |SYMBOL;new;2$;28|
- (|List| $$) (168 . |keys|) (173 . |remove!|)
- (179 . |void|) |SYMBOL;resetNew;V;29| |SYMBOL;list;$L;34|
- (183 . |first|) (188 . |digit?|) (|UniversalSegment| 6)
- (193 . SEGMENT) (199 . |elt|) (|List| 41)
- (205 . |minIndex|) (210 . |setelt|) (217 . |concat|)
- (223 . |rest|) (228 . |minIndex|) (233 . |#|)
- (238 . |first|) (244 . |setelt|) (251 . |rest|)
- (257 . |elt|)
+ |SYMBOL;scripts;$R;32| (112 . |latex|)
+ |SYMBOL;latex;$S;25| (117 . |minIndex|) (122 . |concat|)
+ (128 . |elt|) (133 . |setelt|) |SYMBOL;new;$;27|
+ (|Union| 6 '"failed") (139 . |search|) (145 . |setelt|)
+ (152 . |maxIndex|) (157 . |position|) |SYMBOL;new;2$;28|
+ (|List| $$) (163 . |keys|) (168 . |remove!|)
+ (174 . |void|) |SYMBOL;resetNew;V;29| |SYMBOL;list;$L;34|
+ (178 . |first|) (183 . |digit?|) (|UniversalSegment| 6)
+ (188 . SEGMENT) (194 . |elt|) (|List| 41)
+ (200 . |minIndex|) (205 . |setelt|) (212 . |concat|)
+ (218 . |rest|) (223 . |minIndex|) (228 . |#|)
+ (233 . |first|) (239 . |setelt|) (246 . |rest|)
+ (252 . |elt|)
(CONS IDENTITY
(FUNCALL (|dispatchFunction| |SYMBOL;sample;$;35|)
$))
(|SingleInteger|))
- '#(~= 263 |superscript| 269 |subscript| 275 |string| 281
- |scripts| 286 |scripted?| 291 |script| 296 |sample| 308
- |resetNew| 312 |patternMatch| 316 |new| 330 |name| 339
- |min| 344 |max| 350 |list| 356 |latex| 361 |hash| 366
- |elt| 371 |convert| 377 |coerce| 397 |argscript| 407
- |OMwrite| 413 >= 437 > 443 = 449 <= 455 < 461)
+ '#(~= 258 |superscript| 264 |subscript| 270 |string| 276
+ |scripts| 281 |scripted?| 286 |script| 291 |sample| 303
+ |resetNew| 307 |patternMatch| 311 |new| 325 |name| 334
+ |min| 339 |max| 345 |list| 351 |latex| 356 |hash| 361
+ |elt| 366 |convert| 372 |coerce| 392 |argscript| 402
+ |OMwrite| 408 >= 432 > 438 = 444 <= 450 < 456)
'NIL
(CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0))
(CONS '#(|OrderedSet&| NIL NIL |SetCategory&|
@@ -880,7 +864,7 @@
(|CoercibleFrom| 13)
(|ConvertibleTo| 24) (|OpenMath|)
(|ConvertibleTo| 44) (|CoercibleTo| 51))
- (|makeByteWordVec2| 125
+ (|makeByteWordVec2| 124
'(1 7 0 6 8 0 10 0 11 1 15 0 14 16 2 25
23 0 24 26 0 27 0 28 2 25 0 13 27 29
1 25 23 0 30 1 25 23 0 31 1 25 23 0
@@ -888,31 +872,31 @@
24 45 1 51 0 24 52 3 63 61 24 62 61
64 3 70 68 24 69 68 71 1 69 0 24 74 1
62 0 24 76 1 13 0 78 79 2 54 0 0 0 80
- 2 13 39 0 6 85 2 39 21 0 0 86 1 21 0
- 0 88 1 51 13 0 89 1 13 6 0 91 2 13 0
- 39 0 92 1 7 6 0 93 2 7 6 0 6 94 2 10
- 96 2 0 97 3 10 6 0 2 6 98 1 13 6 0 99
- 2 13 6 39 0 100 1 10 102 0 103 2 10
- 96 2 0 104 0 23 0 105 1 102 2 0 108 1
- 39 21 0 109 2 110 0 6 6 111 2 13 0 0
- 110 112 1 113 6 0 114 3 113 41 0 6 41
- 115 2 113 0 0 41 116 1 102 0 0 117 1
- 55 6 0 118 1 102 41 0 119 2 102 0 0
- 41 120 3 55 54 0 6 54 121 2 102 0 0
- 41 122 2 55 54 0 6 123 2 0 21 0 0 1 2
- 0 0 0 54 59 2 0 0 0 54 57 1 0 13 0 84
- 1 0 81 0 87 1 0 21 0 22 2 0 0 0 55 56
- 2 0 0 0 81 82 0 0 0 124 0 0 23 106 3
- 0 72 0 69 72 73 3 0 65 0 62 65 66 0 0
- 0 95 1 0 0 0 101 1 0 0 0 83 2 0 0 0 0
- 1 2 0 0 0 0 1 1 0 78 0 107 1 0 13 0
- 90 1 0 125 0 1 2 0 0 0 54 58 1 0 69 0
- 75 1 0 62 0 77 1 0 24 0 47 1 0 44 0
- 46 1 0 0 13 48 1 0 51 0 53 2 0 0 0 54
- 60 3 0 23 25 0 21 36 2 0 13 0 21 34 2
- 0 23 25 0 35 1 0 13 0 33 2 0 21 0 0 1
- 2 0 21 0 0 1 2 0 21 0 0 49 2 0 21 0 0
- 1 2 0 21 0 0 50)))))
+ 2 13 39 0 6 85 2 39 21 0 0 86 1 51 13
+ 0 88 1 13 6 0 90 2 13 0 39 0 91 1 7 6
+ 0 92 2 7 6 0 6 93 2 10 95 2 0 96 3 10
+ 6 0 2 6 97 1 13 6 0 98 2 13 6 39 0 99
+ 1 10 101 0 102 2 10 95 2 0 103 0 23 0
+ 104 1 101 2 0 107 1 39 21 0 108 2 109
+ 0 6 6 110 2 13 0 0 109 111 1 112 6 0
+ 113 3 112 41 0 6 41 114 2 112 0 0 41
+ 115 1 101 0 0 116 1 55 6 0 117 1 101
+ 41 0 118 2 101 0 0 41 119 3 55 54 0 6
+ 54 120 2 101 0 0 41 121 2 55 54 0 6
+ 122 2 0 21 0 0 1 2 0 0 0 54 59 2 0 0
+ 0 54 57 1 0 13 0 84 1 0 81 0 87 1 0
+ 21 0 22 2 0 0 0 55 56 2 0 0 0 81 82 0
+ 0 0 123 0 0 23 105 3 0 72 0 69 72 73
+ 3 0 65 0 62 65 66 0 0 0 94 1 0 0 0
+ 100 1 0 0 0 83 2 0 0 0 0 1 2 0 0 0 0
+ 1 1 0 78 0 106 1 0 13 0 89 1 0 124 0
+ 1 2 0 0 0 54 58 1 0 69 0 75 1 0 62 0
+ 77 1 0 24 0 47 1 0 44 0 46 1 0 0 13
+ 48 1 0 51 0 53 2 0 0 0 54 60 3 0 23
+ 25 0 21 36 2 0 13 0 21 34 2 0 23 25 0
+ 35 1 0 13 0 33 2 0 21 0 0 1 2 0 21 0
+ 0 1 2 0 21 0 0 49 2 0 21 0 0 1 2 0 21
+ 0 0 50)))))
'|lookupComplete|))
(MAKEPROP '|Symbol| 'NILADIC T)
diff --git a/src/algebra/strap/TSETCAT-.lsp b/src/algebra/strap/TSETCAT-.lsp
index 10ae2d9c..fe3f5d55 100644
--- a/src/algebra/strap/TSETCAT-.lsp
+++ b/src/algebra/strap/TSETCAT-.lsp
@@ -163,14 +163,13 @@
(RETURN
(SEQ (COND
((SPADCALL |us| (|getShellEntry| $ 12))
- (SPADCALL (SPADCALL |ts| (|getShellEntry| $ 12))
- (|getShellEntry| $ 20)))
+ (NOT (SPADCALL |ts| (|getShellEntry| $ 12))))
((SPADCALL |ts| (|getShellEntry| $ 12)) 'NIL)
('T
(SEQ (LETT |p|
(PROG2 (LETT #0#
(SPADCALL |ts|
- (|getShellEntry| $ 21))
+ (|getShellEntry| $ 20))
|TSETCAT-;infRittWu?;2SB;2|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
@@ -179,33 +178,33 @@
(LETT |q|
(PROG2 (LETT #0#
(SPADCALL |us|
- (|getShellEntry| $ 21))
+ (|getShellEntry| $ 20))
|TSETCAT-;infRittWu?;2SB;2|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
(|getShellEntry| $ 10) #0#))
|TSETCAT-;infRittWu?;2SB;2|)
(EXIT (COND
- ((SPADCALL |p| |q| (|getShellEntry| $ 22))
+ ((SPADCALL |p| |q| (|getShellEntry| $ 21))
'T)
- ((SPADCALL |p| |q| (|getShellEntry| $ 23))
+ ((SPADCALL |p| |q| (|getShellEntry| $ 22))
'NIL)
('T
(SEQ (LETT |v|
(SPADCALL |p|
- (|getShellEntry| $ 24))
+ (|getShellEntry| $ 23))
|TSETCAT-;infRittWu?;2SB;2|)
(EXIT (SPADCALL
(SPADCALL |ts| |v|
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
(SPADCALL |us| |v|
- (|getShellEntry| $ 25))
- (|getShellEntry| $ 26))))))))))))))
+ (|getShellEntry| $ 24))
+ (|getShellEntry| $ 25))))))))))))))
(DEFUN |TSETCAT-;reduced?;PSMB;3| (|p| |ts| |redOp?| $)
(PROG (|lp|)
(RETURN
- (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 29))
+ (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 28))
|TSETCAT-;reduced?;PSMB;3|)
(SEQ G190
(COND
@@ -222,29 +221,27 @@
(DEFUN |TSETCAT-;basicSet;LMU;4| (|ps| |redOp?| $)
(PROG (|b| |bs| |p| |ts|)
(RETURN
- (SEQ (LETT |ps| (SPADCALL (ELT $ 32) |ps| (|getShellEntry| $ 34))
+ (SEQ (LETT |ps| (SPADCALL (ELT $ 31) |ps| (|getShellEntry| $ 33))
|TSETCAT-;basicSet;LMU;4|)
(EXIT (COND
- ((SPADCALL (ELT $ 35) |ps| (|getShellEntry| $ 36))
+ ((SPADCALL (ELT $ 34) |ps| (|getShellEntry| $ 35))
(CONS 1 "failed"))
('T
(SEQ (LETT |ps|
- (SPADCALL (ELT $ 22) |ps|
- (|getShellEntry| $ 37))
+ (SPADCALL (ELT $ 21) |ps|
+ (|getShellEntry| $ 36))
|TSETCAT-;basicSet;LMU;4|)
- (LETT |bs| (SPADCALL (|getShellEntry| $ 38))
+ (LETT |bs| (SPADCALL (|getShellEntry| $ 37))
|TSETCAT-;basicSet;LMU;4|)
(LETT |ts| NIL |TSETCAT-;basicSet;LMU;4|)
(SEQ G190
(COND
- ((NULL (SPADCALL (NULL |ps|)
- (|getShellEntry| $ 20)))
- (GO G191)))
+ ((NULL (NOT (NULL |ps|))) (GO G191)))
(SEQ (LETT |b| (|SPADfirst| |ps|)
|TSETCAT-;basicSet;LMU;4|)
(LETT |bs|
(SPADCALL |bs| |b|
- (|getShellEntry| $ 39))
+ (|getShellEntry| $ 38))
|TSETCAT-;basicSet;LMU;4|)
(LETT |ps| (CDR |ps|)
|TSETCAT-;basicSet;LMU;4|)
@@ -255,14 +252,13 @@
(COND
((NULL |ps|) 'NIL)
('T
- (SPADCALL
+ (NOT
(SPADCALL
(LETT |p|
(|SPADfirst| |ps|)
|TSETCAT-;basicSet;LMU;4|)
|bs| |redOp?|
- (|getShellEntry| $ 40))
- (|getShellEntry| $ 20)))))
+ (|getShellEntry| $ 39))))))
(GO G191)))
(SEQ
(LETT |ts| (CONS |p| |ts|)
@@ -277,19 +273,17 @@
(DEFUN |TSETCAT-;basicSet;LMMU;5| (|ps| |pred?| |redOp?| $)
(PROG (|bps| |b| |bs| |p| |gps| |ts|)
(RETURN
- (SEQ (LETT |ps| (SPADCALL (ELT $ 32) |ps| (|getShellEntry| $ 34))
+ (SEQ (LETT |ps| (SPADCALL (ELT $ 31) |ps| (|getShellEntry| $ 33))
|TSETCAT-;basicSet;LMMU;5|)
(EXIT (COND
- ((SPADCALL (ELT $ 35) |ps| (|getShellEntry| $ 36))
+ ((SPADCALL (ELT $ 34) |ps| (|getShellEntry| $ 35))
(CONS 1 "failed"))
('T
(SEQ (LETT |gps| NIL |TSETCAT-;basicSet;LMMU;5|)
(LETT |bps| NIL |TSETCAT-;basicSet;LMMU;5|)
(SEQ G190
(COND
- ((NULL (SPADCALL (NULL |ps|)
- (|getShellEntry| $ 20)))
- (GO G191)))
+ ((NULL (NOT (NULL |ps|))) (GO G191)))
(SEQ (LETT |p| (|SPADfirst| |ps|)
|TSETCAT-;basicSet;LMMU;5|)
(LETT |ps| (CDR |ps|)
@@ -304,22 +298,20 @@
|TSETCAT-;basicSet;LMMU;5|)))))
NIL (GO G190) G191 (EXIT NIL))
(LETT |gps|
- (SPADCALL (ELT $ 22) |gps|
- (|getShellEntry| $ 37))
+ (SPADCALL (ELT $ 21) |gps|
+ (|getShellEntry| $ 36))
|TSETCAT-;basicSet;LMMU;5|)
- (LETT |bs| (SPADCALL (|getShellEntry| $ 38))
+ (LETT |bs| (SPADCALL (|getShellEntry| $ 37))
|TSETCAT-;basicSet;LMMU;5|)
(LETT |ts| NIL |TSETCAT-;basicSet;LMMU;5|)
(SEQ G190
(COND
- ((NULL (SPADCALL (NULL |gps|)
- (|getShellEntry| $ 20)))
- (GO G191)))
+ ((NULL (NOT (NULL |gps|))) (GO G191)))
(SEQ (LETT |b| (|SPADfirst| |gps|)
|TSETCAT-;basicSet;LMMU;5|)
(LETT |bs|
(SPADCALL |bs| |b|
- (|getShellEntry| $ 39))
+ (|getShellEntry| $ 38))
|TSETCAT-;basicSet;LMMU;5|)
(LETT |gps| (CDR |gps|)
|TSETCAT-;basicSet;LMMU;5|)
@@ -330,14 +322,13 @@
(COND
((NULL |gps|) 'NIL)
('T
- (SPADCALL
+ (NOT
(SPADCALL
(LETT |p|
(|SPADfirst| |gps|)
|TSETCAT-;basicSet;LMMU;5|)
|bs| |redOp?|
- (|getShellEntry| $ 40))
- (|getShellEntry| $ 20)))))
+ (|getShellEntry| $ 39))))))
(GO G191)))
(SEQ
(LETT |ts| (CONS |p| |ts|)
@@ -348,10 +339,10 @@
NIL (GO G190) G191 (EXIT NIL))))
NIL (GO G190) G191 (EXIT NIL))
(LETT |ts|
- (SPADCALL (ELT $ 22)
+ (SPADCALL (ELT $ 21)
(SPADCALL |ts| |bps|
- (|getShellEntry| $ 44))
- (|getShellEntry| $ 37))
+ (|getShellEntry| $ 43))
+ (|getShellEntry| $ 36))
|TSETCAT-;basicSet;LMMU;5|)
(EXIT (CONS 0 (CONS |bs| |ts|)))))))))))
@@ -363,13 +354,11 @@
((SPADCALL |ts| (|getShellEntry| $ 12)) |lip|)
('T
(SEQ (LETT |lp|
- (SPADCALL |ts| (|getShellEntry| $ 29))
+ (SPADCALL |ts| (|getShellEntry| $ 28))
|TSETCAT-;initials;SL;6|)
(SEQ G190
(COND
- ((NULL (SPADCALL (NULL |lp|)
- (|getShellEntry| $ 20)))
- (GO G191)))
+ ((NULL (NOT (NULL |lp|))) (GO G191)))
(SEQ (LETT |p| (|SPADfirst| |lp|)
|TSETCAT-;initials;SL;6|)
(COND
@@ -377,20 +366,20 @@
(SPADCALL
(LETT |ip|
(SPADCALL |p|
- (|getShellEntry| $ 46))
+ (|getShellEntry| $ 45))
|TSETCAT-;initials;SL;6|)
- (|getShellEntry| $ 35)))
+ (|getShellEntry| $ 34)))
(LETT |lip|
(CONS
(SPADCALL |ip|
- (|getShellEntry| $ 47))
+ (|getShellEntry| $ 46))
|lip|)
|TSETCAT-;initials;SL;6|)))
(EXIT
(LETT |lp| (CDR |lp|)
|TSETCAT-;initials;SL;6|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |lip| (|getShellEntry| $ 48)))))))))))
+ (EXIT (SPADCALL |lip| (|getShellEntry| $ 47)))))))))))
(DEFUN |TSETCAT-;degree;SNni;7| (|ts| $)
(PROG (|lp| |d|)
@@ -398,55 +387,53 @@
(SEQ (COND
((SPADCALL |ts| (|getShellEntry| $ 12)) 0)
('T
- (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 29))
+ (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 28))
|TSETCAT-;degree;SNni;7|)
(LETT |d|
(SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 51))
+ (|getShellEntry| $ 50))
|TSETCAT-;degree;SNni;7|)
(SEQ G190
(COND
- ((NULL (SPADCALL
- (NULL
- (LETT |lp| (CDR |lp|)
- |TSETCAT-;degree;SNni;7|))
- (|getShellEntry| $ 20)))
+ ((NULL (NOT (NULL
+ (LETT |lp| (CDR |lp|)
+ |TSETCAT-;degree;SNni;7|))))
(GO G191)))
(SEQ (EXIT (LETT |d|
(* |d|
(SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 51)))
+ (|getShellEntry| $ 50)))
|TSETCAT-;degree;SNni;7|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |d|))))))))
(DEFUN |TSETCAT-;quasiComponent;SR;8| (|ts| $)
- (CONS (SPADCALL |ts| (|getShellEntry| $ 29))
- (SPADCALL |ts| (|getShellEntry| $ 53))))
+ (CONS (SPADCALL |ts| (|getShellEntry| $ 28))
+ (SPADCALL |ts| (|getShellEntry| $ 52))))
(DEFUN |TSETCAT-;normalized?;PSB;9| (|p| |ts| $)
- (SPADCALL |p| (SPADCALL |ts| (|getShellEntry| $ 29))
- (|getShellEntry| $ 57)))
+ (SPADCALL |p| (SPADCALL |ts| (|getShellEntry| $ 28))
+ (|getShellEntry| $ 56)))
(DEFUN |TSETCAT-;stronglyReduced?;PSB;10| (|p| |ts| $)
- (SPADCALL |p| (SPADCALL |ts| (|getShellEntry| $ 29))
- (|getShellEntry| $ 59)))
+ (SPADCALL |p| (SPADCALL |ts| (|getShellEntry| $ 28))
+ (|getShellEntry| $ 58)))
(DEFUN |TSETCAT-;headReduced?;PSB;11| (|p| |ts| $)
- (SPADCALL (SPADCALL |p| (|getShellEntry| $ 61)) |ts|
- (|getShellEntry| $ 62)))
+ (SPADCALL (SPADCALL |p| (|getShellEntry| $ 60)) |ts|
+ (|getShellEntry| $ 61)))
(DEFUN |TSETCAT-;initiallyReduced?;PSB;12| (|p| |ts| $)
(PROG (|lp| |red|)
(RETURN
- (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 29))
+ (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 28))
|TSETCAT-;initiallyReduced?;PSB;12|)
(LETT |red| 'T |TSETCAT-;initiallyReduced?;PSB;12|)
(SEQ G190
(COND
((NULL (COND
((OR (NULL |lp|)
- (SPADCALL |p| (|getShellEntry| $ 35)))
+ (SPADCALL |p| (|getShellEntry| $ 34)))
'NIL)
('T |red|)))
(GO G191)))
@@ -457,10 +444,10 @@
('T
(SPADCALL
(SPADCALL |p|
- (|getShellEntry| $ 24))
+ (|getShellEntry| $ 23))
(SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 24))
- (|getShellEntry| $ 64)))))
+ (|getShellEntry| $ 23))
+ (|getShellEntry| $ 63)))))
(GO G191)))
(SEQ (EXIT (LETT |lp| (CDR |lp|)
|TSETCAT-;initiallyReduced?;PSB;12|)))
@@ -470,20 +457,20 @@
(COND
((SPADCALL
(SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 24))
+ (|getShellEntry| $ 23))
(SPADCALL |p|
- (|getShellEntry| $ 24))
- (|getShellEntry| $ 65))
+ (|getShellEntry| $ 23))
+ (|getShellEntry| $ 64))
(COND
((SPADCALL |p| (|SPADfirst| |lp|)
- (|getShellEntry| $ 66))
+ (|getShellEntry| $ 65))
(SEQ
(LETT |lp| (CDR |lp|)
|TSETCAT-;initiallyReduced?;PSB;12|)
(EXIT
(LETT |p|
(SPADCALL |p|
- (|getShellEntry| $ 46))
+ (|getShellEntry| $ 45))
|TSETCAT-;initiallyReduced?;PSB;12|))))
('T
(LETT |red| 'NIL
@@ -491,7 +478,7 @@
('T
(LETT |p|
(SPADCALL |p|
- (|getShellEntry| $ 46))
+ (|getShellEntry| $ 45))
|TSETCAT-;initiallyReduced?;PSB;12|)))))))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |red|)))))
@@ -501,7 +488,7 @@
(RETURN
(SEQ (COND
((OR (SPADCALL |ts| (|getShellEntry| $ 12))
- (SPADCALL |p| (|getShellEntry| $ 35)))
+ (SPADCALL |p| (|getShellEntry| $ 34)))
|p|)
('T
(SEQ (LETT |ts0| |ts| |TSETCAT-;reduce;PSMMP;13|)
@@ -512,10 +499,9 @@
(|getShellEntry| $ 12))
'NIL)
('T
- (SPADCALL
+ (NOT
(SPADCALL |p|
- (|getShellEntry| $ 35))
- (|getShellEntry| $ 20)))))
+ (|getShellEntry| $ 34))))))
(GO G191)))
(SEQ (LETT |reductor|
(PROG2
@@ -557,25 +543,23 @@
(PROG (|p| |rs|)
(RETURN
(SEQ (COND
- ((SPADCALL |ts| (|getShellEntry| $ 70)) |lp|)
+ ((SPADCALL |ts| (|getShellEntry| $ 69)) |lp|)
('T
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 32) |lp|
- (|getShellEntry| $ 34))
+ (SPADCALL (ELT $ 31) |lp|
+ (|getShellEntry| $ 33))
|TSETCAT-;rewriteSetWithReduction;LSMML;14|)
(EXIT (COND
((NULL |lp|) |lp|)
- ((SPADCALL (ELT $ 35) |lp|
- (|getShellEntry| $ 36))
- (LIST (|spadConstant| $ 71)))
+ ((SPADCALL (ELT $ 34) |lp|
+ (|getShellEntry| $ 35))
+ (LIST (|spadConstant| $ 70)))
('T
(SEQ (LETT |rs| NIL
|TSETCAT-;rewriteSetWithReduction;LSMML;14|)
(SEQ G190
(COND
- ((NULL
- (SPADCALL (NULL |lp|)
- (|getShellEntry| $ 20)))
+ ((NULL (NOT (NULL |lp|)))
(GO G191)))
(SEQ
(LETT |p| (|SPADfirst| |lp|)
@@ -586,24 +570,24 @@
(SPADCALL
(SPADCALL |p| |ts| |redOp|
|redOp?|
- (|getShellEntry| $ 72))
- (|getShellEntry| $ 47))
+ (|getShellEntry| $ 71))
+ (|getShellEntry| $ 46))
|TSETCAT-;rewriteSetWithReduction;LSMML;14|)
(EXIT
(COND
((NULL
(SPADCALL |p|
- (|getShellEntry| $ 32)))
+ (|getShellEntry| $ 31)))
(COND
((SPADCALL |p|
- (|getShellEntry| $ 35))
+ (|getShellEntry| $ 34))
(SEQ
(LETT |lp| NIL
|TSETCAT-;rewriteSetWithReduction;LSMML;14|)
(EXIT
(LETT |rs|
(LIST
- (|spadConstant| $ 71))
+ (|spadConstant| $ 70))
|TSETCAT-;rewriteSetWithReduction;LSMML;14|))))
('T
(LETT |rs|
@@ -611,60 +595,60 @@
|TSETCAT-;rewriteSetWithReduction;LSMML;14|)))))))
NIL (GO G190) G191 (EXIT NIL))
(EXIT (SPADCALL |rs|
- (|getShellEntry| $ 48))))))))))))))
+ (|getShellEntry| $ 47))))))))))))))
(DEFUN |TSETCAT-;stronglyReduce;PSP;15| (|p| |ts| $)
- (SPADCALL |p| |ts| (ELT $ 74) (ELT $ 66) (|getShellEntry| $ 72)))
+ (SPADCALL |p| |ts| (ELT $ 73) (ELT $ 65) (|getShellEntry| $ 71)))
(DEFUN |TSETCAT-;headReduce;PSP;16| (|p| |ts| $)
- (SPADCALL |p| |ts| (ELT $ 76) (ELT $ 77) (|getShellEntry| $ 72)))
+ (SPADCALL |p| |ts| (ELT $ 75) (ELT $ 76) (|getShellEntry| $ 71)))
(DEFUN |TSETCAT-;initiallyReduce;PSP;17| (|p| |ts| $)
- (SPADCALL |p| |ts| (ELT $ 79) (ELT $ 80) (|getShellEntry| $ 72)))
+ (SPADCALL |p| |ts| (ELT $ 78) (ELT $ 79) (|getShellEntry| $ 71)))
(DEFUN |TSETCAT-;removeZero;PSP;18| (|p| |ts| $)
(PROG (|v| |tsv-| #0=#:G1570 #1=#:G1579 |q|)
(RETURN
(SEQ (EXIT (COND
- ((OR (SPADCALL |p| (|getShellEntry| $ 35))
+ ((OR (SPADCALL |p| (|getShellEntry| $ 34))
(SPADCALL |ts| (|getShellEntry| $ 12)))
|p|)
('T
(SEQ (LETT |v|
- (SPADCALL |p| (|getShellEntry| $ 24))
+ (SPADCALL |p| (|getShellEntry| $ 23))
|TSETCAT-;removeZero;PSP;18|)
(LETT |tsv-|
(SPADCALL |ts| |v|
- (|getShellEntry| $ 82))
+ (|getShellEntry| $ 81))
|TSETCAT-;removeZero;PSP;18|)
(COND
- ((SPADCALL |v| |ts| (|getShellEntry| $ 83))
+ ((SPADCALL |v| |ts| (|getShellEntry| $ 82))
(SEQ (LETT |q|
(SPADCALL |p|
(PROG2
(LETT #0#
(SPADCALL |ts| |v|
- (|getShellEntry| $ 84))
+ (|getShellEntry| $ 83))
|TSETCAT-;removeZero;PSP;18|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
(|getShellEntry| $ 10) #0#))
- (|getShellEntry| $ 74))
+ (|getShellEntry| $ 73))
|TSETCAT-;removeZero;PSP;18|)
(EXIT (COND
((SPADCALL |q|
- (|getShellEntry| $ 32))
+ (|getShellEntry| $ 31))
(PROGN
(LETT #1# |q|
|TSETCAT-;removeZero;PSP;18|)
(GO #1#)))
((SPADCALL
(SPADCALL |q| |tsv-|
- (|getShellEntry| $ 85))
- (|getShellEntry| $ 32))
+ (|getShellEntry| $ 84))
+ (|getShellEntry| $ 31))
(PROGN
(LETT #1#
- (|spadConstant| $ 86)
+ (|spadConstant| $ 85)
|TSETCAT-;removeZero;PSP;18|)
(GO #1#))))))))
(EXIT (COND
@@ -672,15 +656,15 @@
(|getShellEntry| $ 12))
|p|)
('T
- (SEQ (LETT |q| (|spadConstant| $ 86)
+ (SEQ (LETT |q| (|spadConstant| $ 85)
|TSETCAT-;removeZero;PSP;18|)
(SEQ G190
(COND
((NULL
(SPADCALL
(SPADCALL |p| |v|
- (|getShellEntry| $ 87))
- (|getShellEntry| $ 89)))
+ (|getShellEntry| $ 86))
+ (|getShellEntry| $ 88)))
(GO G191)))
(SEQ
(LETT |q|
@@ -688,35 +672,35 @@
(SPADCALL
(SPADCALL
(SPADCALL |p|
- (|getShellEntry| $ 46))
+ (|getShellEntry| $ 45))
|tsv-|
- (|getShellEntry| $ 85))
+ (|getShellEntry| $ 84))
(SPADCALL |p|
- (|getShellEntry| $ 90))
- (|getShellEntry| $ 91))
- |q| (|getShellEntry| $ 92))
+ (|getShellEntry| $ 89))
+ (|getShellEntry| $ 90))
+ |q| (|getShellEntry| $ 91))
|TSETCAT-;removeZero;PSP;18|)
(EXIT
(LETT |p|
(SPADCALL |p|
- (|getShellEntry| $ 93))
+ (|getShellEntry| $ 92))
|TSETCAT-;removeZero;PSP;18|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT
(SPADCALL |q|
(SPADCALL |p| |tsv-|
- (|getShellEntry| $ 85))
- (|getShellEntry| $ 92)))))))))))
+ (|getShellEntry| $ 84))
+ (|getShellEntry| $ 91)))))))))))
#1# (EXIT #1#)))))
(DEFUN |TSETCAT-;reduceByQuasiMonic;PSP;19| (|p| |ts| $)
(COND
- ((OR (SPADCALL |p| (|getShellEntry| $ 35))
+ ((OR (SPADCALL |p| (|getShellEntry| $ 34))
(SPADCALL |ts| (|getShellEntry| $ 12)))
|p|)
('T
- (QVELT (SPADCALL |p| (SPADCALL |ts| (|getShellEntry| $ 95))
- (|getShellEntry| $ 97))
+ (QVELT (SPADCALL |p| (SPADCALL |ts| (|getShellEntry| $ 94))
+ (|getShellEntry| $ 96))
1))))
(DEFUN |TSETCAT-;autoReduced?;SMB;20| (|ts| |redOp?| $)
@@ -725,7 +709,7 @@
(SEQ (COND
((SPADCALL |ts| (|getShellEntry| $ 12)) 'T)
('T
- (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 29))
+ (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 28))
|TSETCAT-;autoReduced?;SMB;20|)
(LETT |p| (|SPADfirst| |lp|)
|TSETCAT-;autoReduced?;SMB;20|)
@@ -745,16 +729,16 @@
(EXIT (NULL |lp|)))))))))
(DEFUN |TSETCAT-;stronglyReduced?;SB;21| (|ts| $)
- (SPADCALL |ts| (ELT $ 59) (|getShellEntry| $ 101)))
+ (SPADCALL |ts| (ELT $ 58) (|getShellEntry| $ 100)))
(DEFUN |TSETCAT-;normalized?;SB;22| (|ts| $)
- (SPADCALL |ts| (ELT $ 57) (|getShellEntry| $ 101)))
+ (SPADCALL |ts| (ELT $ 56) (|getShellEntry| $ 100)))
(DEFUN |TSETCAT-;headReduced?;SB;23| (|ts| $)
- (SPADCALL |ts| (ELT $ 104) (|getShellEntry| $ 101)))
+ (SPADCALL |ts| (ELT $ 103) (|getShellEntry| $ 100)))
(DEFUN |TSETCAT-;initiallyReduced?;SB;24| (|ts| $)
- (SPADCALL |ts| (ELT $ 106) (|getShellEntry| $ 101)))
+ (SPADCALL |ts| (ELT $ 105) (|getShellEntry| $ 100)))
(DEFUN |TSETCAT-;mvar;SV;25| (|ts| $)
(PROG (#0=#:G1598)
@@ -769,7 +753,7 @@
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) (|getShellEntry| $ 10)
#0#))
- (|getShellEntry| $ 24)))))))
+ (|getShellEntry| $ 23)))))))
(DEFUN |TSETCAT-;first;SU;26| (|ts| $)
(PROG (|lp|)
@@ -778,9 +762,9 @@
((SPADCALL |ts| (|getShellEntry| $ 12)) (CONS 1 "failed"))
('T
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 23)
- (SPADCALL |ts| (|getShellEntry| $ 29))
- (|getShellEntry| $ 37))
+ (SPADCALL (ELT $ 22)
+ (SPADCALL |ts| (|getShellEntry| $ 28))
+ (|getShellEntry| $ 36))
|TSETCAT-;first;SU;26|)
(EXIT (CONS 0 (|SPADfirst| |lp|))))))))))
@@ -791,9 +775,9 @@
((SPADCALL |ts| (|getShellEntry| $ 12)) (CONS 1 "failed"))
('T
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 22)
- (SPADCALL |ts| (|getShellEntry| $ 29))
- (|getShellEntry| $ 37))
+ (SPADCALL (ELT $ 21)
+ (SPADCALL |ts| (|getShellEntry| $ 28))
+ (|getShellEntry| $ 36))
|TSETCAT-;last;SU;27|)
(EXIT (CONS 0 (|SPADfirst| |lp|))))))))))
@@ -804,17 +788,17 @@
((SPADCALL |ts| (|getShellEntry| $ 12)) (CONS 1 "failed"))
('T
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 23)
- (SPADCALL |ts| (|getShellEntry| $ 29))
- (|getShellEntry| $ 37))
+ (SPADCALL (ELT $ 22)
+ (SPADCALL |ts| (|getShellEntry| $ 28))
+ (|getShellEntry| $ 36))
|TSETCAT-;rest;SU;28|)
(EXIT (CONS 0
(SPADCALL (CDR |lp|)
- (|getShellEntry| $ 111)))))))))))
+ (|getShellEntry| $ 110)))))))))))
(DEFUN |TSETCAT-;coerce;SL;29| (|ts| $)
- (SPADCALL (ELT $ 23) (SPADCALL |ts| (|getShellEntry| $ 29))
- (|getShellEntry| $ 37)))
+ (SPADCALL (ELT $ 22) (SPADCALL |ts| (|getShellEntry| $ 28))
+ (|getShellEntry| $ 36)))
(DEFUN |TSETCAT-;algebraicVariables;SL;30| (|ts| $)
(PROG (#0=#:G1666 |p| #1=#:G1667)
@@ -822,7 +806,7 @@
(SEQ (PROGN
(LETT #0# NIL |TSETCAT-;algebraicVariables;SL;30|)
(SEQ (LETT |p| NIL |TSETCAT-;algebraicVariables;SL;30|)
- (LETT #1# (SPADCALL |ts| (|getShellEntry| $ 29))
+ (LETT #1# (SPADCALL |ts| (|getShellEntry| $ 28))
|TSETCAT-;algebraicVariables;SL;30|)
G190
(COND
@@ -835,7 +819,7 @@
(SEQ (EXIT (LETT #0#
(CONS
(SPADCALL |p|
- (|getShellEntry| $ 24))
+ (|getShellEntry| $ 23))
#0#)
|TSETCAT-;algebraicVariables;SL;30|)))
(LETT #1# (CDR #1#)
@@ -843,28 +827,26 @@
(GO G190) G191 (EXIT (NREVERSE0 #0#))))))))
(DEFUN |TSETCAT-;algebraic?;VSB;31| (|v| |ts| $)
- (SPADCALL |v| (SPADCALL |ts| (|getShellEntry| $ 116))
- (|getShellEntry| $ 117)))
+ (SPADCALL |v| (SPADCALL |ts| (|getShellEntry| $ 115))
+ (|getShellEntry| $ 116)))
(DEFUN |TSETCAT-;select;SVU;32| (|ts| |v| $)
(PROG (|lp|)
(RETURN
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 23)
- (SPADCALL |ts| (|getShellEntry| $ 29))
- (|getShellEntry| $ 37))
+ (SPADCALL (ELT $ 22)
+ (SPADCALL |ts| (|getShellEntry| $ 28))
+ (|getShellEntry| $ 36))
|TSETCAT-;select;SVU;32|)
(SEQ G190
(COND
((NULL (COND
((NULL |lp|) 'NIL)
('T
- (SPADCALL
- (SPADCALL |v|
- (SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 24))
- (|getShellEntry| $ 65))
- (|getShellEntry| $ 20)))))
+ (NOT (SPADCALL |v|
+ (SPADCALL (|SPADfirst| |lp|)
+ (|getShellEntry| $ 23))
+ (|getShellEntry| $ 64))))))
(GO G191)))
(SEQ (EXIT (LETT |lp| (CDR |lp|)
|TSETCAT-;select;SVU;32|)))
@@ -876,57 +858,52 @@
(DEFUN |TSETCAT-;collectQuasiMonic;2S;33| (|ts| $)
(PROG (|newlp| |lp|)
(RETURN
- (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 29))
+ (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 28))
|TSETCAT-;collectQuasiMonic;2S;33|)
(LETT |newlp| NIL |TSETCAT-;collectQuasiMonic;2S;33|)
- (SEQ G190
- (COND
- ((NULL (SPADCALL (NULL |lp|) (|getShellEntry| $ 20)))
- (GO G191)))
+ (SEQ G190 (COND ((NULL (NOT (NULL |lp|))) (GO G191)))
(SEQ (COND
((SPADCALL
(SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 46))
- (|getShellEntry| $ 35))
+ (|getShellEntry| $ 45))
+ (|getShellEntry| $ 34))
(LETT |newlp| (CONS (|SPADfirst| |lp|) |newlp|)
|TSETCAT-;collectQuasiMonic;2S;33|)))
(EXIT (LETT |lp| (CDR |lp|)
|TSETCAT-;collectQuasiMonic;2S;33|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |newlp| (|getShellEntry| $ 111)))))))
+ (EXIT (SPADCALL |newlp| (|getShellEntry| $ 110)))))))
(DEFUN |TSETCAT-;collectUnder;SVS;34| (|ts| |v| $)
(PROG (|lp|)
(RETURN
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 23)
- (SPADCALL |ts| (|getShellEntry| $ 29))
- (|getShellEntry| $ 37))
+ (SPADCALL (ELT $ 22)
+ (SPADCALL |ts| (|getShellEntry| $ 28))
+ (|getShellEntry| $ 36))
|TSETCAT-;collectUnder;SVS;34|)
(SEQ G190
(COND
((NULL (COND
((NULL |lp|) 'NIL)
('T
- (SPADCALL
- (SPADCALL
- (SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 24))
- |v| (|getShellEntry| $ 64))
- (|getShellEntry| $ 20)))))
+ (NOT (SPADCALL
+ (SPADCALL (|SPADfirst| |lp|)
+ (|getShellEntry| $ 23))
+ |v| (|getShellEntry| $ 63))))))
(GO G191)))
(SEQ (EXIT (LETT |lp| (CDR |lp|)
|TSETCAT-;collectUnder;SVS;34|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |lp| (|getShellEntry| $ 111)))))))
+ (EXIT (SPADCALL |lp| (|getShellEntry| $ 110)))))))
(DEFUN |TSETCAT-;collectUpper;SVS;35| (|ts| |v| $)
(PROG (|lp2| |lp1|)
(RETURN
(SEQ (LETT |lp1|
- (SPADCALL (ELT $ 23)
- (SPADCALL |ts| (|getShellEntry| $ 29))
- (|getShellEntry| $ 37))
+ (SPADCALL (ELT $ 22)
+ (SPADCALL |ts| (|getShellEntry| $ 28))
+ (|getShellEntry| $ 36))
|TSETCAT-;collectUpper;SVS;35|)
(LETT |lp2| NIL |TSETCAT-;collectUpper;SVS;35|)
(SEQ G190
@@ -936,20 +913,20 @@
('T
(SPADCALL |v|
(SPADCALL (|SPADfirst| |lp1|)
- (|getShellEntry| $ 24))
- (|getShellEntry| $ 64)))))
+ (|getShellEntry| $ 23))
+ (|getShellEntry| $ 63)))))
(GO G191)))
(SEQ (LETT |lp2| (CONS (|SPADfirst| |lp1|) |lp2|)
|TSETCAT-;collectUpper;SVS;35|)
(EXIT (LETT |lp1| (CDR |lp1|)
|TSETCAT-;collectUpper;SVS;35|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL (REVERSE |lp2|) (|getShellEntry| $ 111)))))))
+ (EXIT (SPADCALL (REVERSE |lp2|) (|getShellEntry| $ 110)))))))
(DEFUN |TSETCAT-;construct;LS;36| (|lp| $)
(PROG (|rif|)
(RETURN
- (SEQ (LETT |rif| (SPADCALL |lp| (|getShellEntry| $ 123))
+ (SEQ (LETT |rif| (SPADCALL |lp| (|getShellEntry| $ 122))
|TSETCAT-;construct;LS;36|)
(EXIT (COND
((QEQCAR |rif| 0) (QCDR |rif|))
@@ -960,26 +937,26 @@
(PROG (|rif|)
(RETURN
(SEQ (COND
- ((NULL |lp|) (CONS 0 (SPADCALL (|getShellEntry| $ 38))))
+ ((NULL |lp|) (CONS 0 (SPADCALL (|getShellEntry| $ 37))))
('T
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 23) |lp|
- (|getShellEntry| $ 37))
+ (SPADCALL (ELT $ 22) |lp|
+ (|getShellEntry| $ 36))
|TSETCAT-;retractIfCan;LU;37|)
(LETT |rif|
- (SPADCALL (CDR |lp|) (|getShellEntry| $ 123))
+ (SPADCALL (CDR |lp|) (|getShellEntry| $ 122))
|TSETCAT-;retractIfCan;LU;37|)
(EXIT (COND
((QEQCAR |rif| 0)
(SPADCALL (QCDR |rif|) (|SPADfirst| |lp|)
- (|getShellEntry| $ 125)))
+ (|getShellEntry| $ 124)))
('T
(|error| "in retractIfCan : LP -> ... from TSETCAT : bad arg")))))))))))
(DEFUN |TSETCAT-;extend;SPS;38| (|ts| |p| $)
(PROG (|eif|)
(RETURN
- (SEQ (LETT |eif| (SPADCALL |ts| |p| (|getShellEntry| $ 125))
+ (SEQ (LETT |eif| (SPADCALL |ts| |p| (|getShellEntry| $ 124))
|TSETCAT-;extend;SPS;38|)
(EXIT (COND
((QEQCAR |eif| 0) (QCDR |eif|))
@@ -989,13 +966,13 @@
(DEFUN |TSETCAT-;coHeight;SNni;39| (|ts| $)
(PROG (|n| |m| #0=#:G1662)
(RETURN
- (SEQ (LETT |n| (SPADCALL (|getShellEntry| $ 128))
+ (SEQ (LETT |n| (SPADCALL (|getShellEntry| $ 127))
|TSETCAT-;coHeight;SNni;39|)
- (LETT |m| (LENGTH (SPADCALL |ts| (|getShellEntry| $ 29)))
+ (LETT |m| (LENGTH (SPADCALL |ts| (|getShellEntry| $ 28)))
|TSETCAT-;coHeight;SNni;39|)
(EXIT (PROG2 (LETT #0#
(SPADCALL |n| |m|
- (|getShellEntry| $ 129))
+ (|getShellEntry| $ 128))
|TSETCAT-;coHeight;SNni;39|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) (|NonNegativeInteger|)
@@ -1014,7 +991,7 @@
(LETT |dv$|
(LIST '|TriangularSetCategory&| |dv$1| |dv$2| |dv$3|
|dv$4| |dv$5|) . #0#)
- (LETT $ (|newShell| 132) . #0#)
+ (LETT $ (|newShell| 131) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -1028,7 +1005,7 @@
(|setShellEntry| $ 10 |#5|)
(COND
((|testBitVector| |pv$| 1)
- (|setShellEntry| $ 130
+ (|setShellEntry| $ 129
(CONS (|dispatchFunction| |TSETCAT-;coHeight;SNni;39|)
$))))
$))))
@@ -1038,115 +1015,114 @@
(|local| |#3|) (|local| |#4|) (|local| |#5|) (|Boolean|)
(0 . |empty?|) (|Union| 10 '"failed") (5 . |first|)
(10 . =) (|Union| $ '"failed") (16 . |rest|) (21 . =)
- |TSETCAT-;=;2SB;1| (27 . |not|) (32 . |last|)
- (37 . |infRittWu?|) (43 . |supRittWu?|) (49 . |mvar|)
- (54 . |collectUpper|) (60 . |infRittWu?|)
- |TSETCAT-;infRittWu?;2SB;2| (|List| 10) (66 . |members|)
- (|Mapping| 11 10 10) |TSETCAT-;reduced?;PSMB;3|
- (71 . |zero?|) (|Mapping| 11 10) (76 . |remove|)
- (82 . |ground?|) (87 . |any?|) (93 . |sort|)
- (99 . |empty|) (103 . |extend|) (109 . |reduced?|)
- (|Record| (|:| |bas| $) (|:| |top| 28))
- (|Union| 41 '"failed") |TSETCAT-;basicSet;LMU;4|
- (116 . |concat|) |TSETCAT-;basicSet;LMMU;5| (122 . |init|)
- (127 . |primPartElseUnitCanonical|)
- (132 . |removeDuplicates|) |TSETCAT-;initials;SL;6|
- (|NonNegativeInteger|) (137 . |mdeg|)
- |TSETCAT-;degree;SNni;7| (142 . |initials|)
- (|Record| (|:| |close| 28) (|:| |open| 28))
+ |TSETCAT-;=;2SB;1| (27 . |last|) (32 . |infRittWu?|)
+ (38 . |supRittWu?|) (44 . |mvar|) (49 . |collectUpper|)
+ (55 . |infRittWu?|) |TSETCAT-;infRittWu?;2SB;2|
+ (|List| 10) (61 . |members|) (|Mapping| 11 10 10)
+ |TSETCAT-;reduced?;PSMB;3| (66 . |zero?|)
+ (|Mapping| 11 10) (71 . |remove|) (77 . |ground?|)
+ (82 . |any?|) (88 . |sort|) (94 . |empty|) (98 . |extend|)
+ (104 . |reduced?|) (|Record| (|:| |bas| $) (|:| |top| 27))
+ (|Union| 40 '"failed") |TSETCAT-;basicSet;LMU;4|
+ (111 . |concat|) |TSETCAT-;basicSet;LMMU;5| (117 . |init|)
+ (122 . |primPartElseUnitCanonical|)
+ (127 . |removeDuplicates|) |TSETCAT-;initials;SL;6|
+ (|NonNegativeInteger|) (132 . |mdeg|)
+ |TSETCAT-;degree;SNni;7| (137 . |initials|)
+ (|Record| (|:| |close| 27) (|:| |open| 27))
|TSETCAT-;quasiComponent;SR;8| (|List| $)
- (147 . |normalized?|) |TSETCAT-;normalized?;PSB;9|
- (153 . |reduced?|) |TSETCAT-;stronglyReduced?;PSB;10|
- (159 . |head|) (164 . |stronglyReduced?|)
- |TSETCAT-;headReduced?;PSB;11| (170 . <) (176 . =)
- (182 . |reduced?|) |TSETCAT-;initiallyReduced?;PSB;12|
+ (142 . |normalized?|) |TSETCAT-;normalized?;PSB;9|
+ (148 . |reduced?|) |TSETCAT-;stronglyReduced?;PSB;10|
+ (154 . |head|) (159 . |stronglyReduced?|)
+ |TSETCAT-;headReduced?;PSB;11| (165 . <) (171 . =)
+ (177 . |reduced?|) |TSETCAT-;initiallyReduced?;PSB;12|
(|Mapping| 10 10 10) |TSETCAT-;reduce;PSMMP;13|
- (188 . |trivialIdeal?|) (193 . |One|) (197 . |reduce|)
+ (183 . |trivialIdeal?|) (188 . |One|) (192 . |reduce|)
|TSETCAT-;rewriteSetWithReduction;LSMML;14|
- (205 . |lazyPrem|) |TSETCAT-;stronglyReduce;PSP;15|
- (211 . |headReduce|) (217 . |headReduced?|)
- |TSETCAT-;headReduce;PSP;16| (223 . |initiallyReduce|)
- (229 . |initiallyReduced?|)
- |TSETCAT-;initiallyReduce;PSP;17| (235 . |collectUnder|)
- (241 . |algebraic?|) (247 . |select|) (253 . |removeZero|)
- (259 . |Zero|) (263 . |degree|) (|Integer|)
- (269 . |positive?|) (274 . |mainMonomial|) (279 . *)
- (285 . +) (291 . |tail|) |TSETCAT-;removeZero;PSP;18|
- (296 . |collectQuasiMonic|)
+ (200 . |lazyPrem|) |TSETCAT-;stronglyReduce;PSP;15|
+ (206 . |headReduce|) (212 . |headReduced?|)
+ |TSETCAT-;headReduce;PSP;16| (218 . |initiallyReduce|)
+ (224 . |initiallyReduced?|)
+ |TSETCAT-;initiallyReduce;PSP;17| (230 . |collectUnder|)
+ (236 . |algebraic?|) (242 . |select|) (248 . |removeZero|)
+ (254 . |Zero|) (258 . |degree|) (|Integer|)
+ (264 . |positive?|) (269 . |mainMonomial|) (274 . *)
+ (280 . +) (286 . |tail|) |TSETCAT-;removeZero;PSP;18|
+ (291 . |collectQuasiMonic|)
(|Record| (|:| |rnum| 7) (|:| |polnum| 10) (|:| |den| 7))
- (301 . |remainder|) |TSETCAT-;reduceByQuasiMonic;PSP;19|
- (|Mapping| 11 10 28) |TSETCAT-;autoReduced?;SMB;20|
- (307 . |autoReduced?|) |TSETCAT-;stronglyReduced?;SB;21|
- |TSETCAT-;normalized?;SB;22| (313 . |headReduced?|)
- |TSETCAT-;headReduced?;SB;23| (319 . |initiallyReduced?|)
+ (296 . |remainder|) |TSETCAT-;reduceByQuasiMonic;PSP;19|
+ (|Mapping| 11 10 27) |TSETCAT-;autoReduced?;SMB;20|
+ (302 . |autoReduced?|) |TSETCAT-;stronglyReduced?;SB;21|
+ |TSETCAT-;normalized?;SB;22| (308 . |headReduced?|)
+ |TSETCAT-;headReduced?;SB;23| (314 . |initiallyReduced?|)
|TSETCAT-;initiallyReduced?;SB;24| |TSETCAT-;mvar;SV;25|
|TSETCAT-;first;SU;26| |TSETCAT-;last;SU;27|
- (325 . |construct|) |TSETCAT-;rest;SU;28|
+ (320 . |construct|) |TSETCAT-;rest;SU;28|
|TSETCAT-;coerce;SL;29| (|List| 9)
|TSETCAT-;algebraicVariables;SL;30|
- (330 . |algebraicVariables|) (335 . |member?|)
+ (325 . |algebraicVariables|) (330 . |member?|)
|TSETCAT-;algebraic?;VSB;31| |TSETCAT-;select;SVU;32|
|TSETCAT-;collectQuasiMonic;2S;33|
|TSETCAT-;collectUnder;SVS;34|
- |TSETCAT-;collectUpper;SVS;35| (341 . |retractIfCan|)
- |TSETCAT-;construct;LS;36| (346 . |extendIfCan|)
+ |TSETCAT-;collectUpper;SVS;35| (336 . |retractIfCan|)
+ |TSETCAT-;construct;LS;36| (341 . |extendIfCan|)
|TSETCAT-;retractIfCan;LU;37| |TSETCAT-;extend;SPS;38|
- (352 . |size|) (356 . |subtractIfCan|) (362 . |coHeight|)
+ (347 . |size|) (351 . |subtractIfCan|) (357 . |coHeight|)
(|OutputForm|))
- '#(|stronglyReduced?| 367 |stronglyReduce| 378 |select| 384
- |rewriteSetWithReduction| 390 |retractIfCan| 398 |rest|
- 403 |removeZero| 408 |reduced?| 414 |reduceByQuasiMonic|
- 421 |reduce| 427 |quasiComponent| 435 |normalized?| 440
- |mvar| 451 |last| 456 |initials| 461 |initiallyReduced?|
- 466 |initiallyReduce| 477 |infRittWu?| 483 |headReduced?|
- 489 |headReduce| 500 |first| 506 |extend| 511 |degree| 517
- |construct| 522 |collectUpper| 527 |collectUnder| 533
- |collectQuasiMonic| 539 |coerce| 544 |coHeight| 549
- |basicSet| 554 |autoReduced?| 567 |algebraicVariables| 573
- |algebraic?| 578 = 584)
+ '#(|stronglyReduced?| 362 |stronglyReduce| 373 |select| 379
+ |rewriteSetWithReduction| 385 |retractIfCan| 393 |rest|
+ 398 |removeZero| 403 |reduced?| 409 |reduceByQuasiMonic|
+ 416 |reduce| 422 |quasiComponent| 430 |normalized?| 435
+ |mvar| 446 |last| 451 |initials| 456 |initiallyReduced?|
+ 461 |initiallyReduce| 472 |infRittWu?| 478 |headReduced?|
+ 484 |headReduce| 495 |first| 501 |extend| 506 |degree| 512
+ |construct| 517 |collectUpper| 522 |collectUnder| 528
+ |collectQuasiMonic| 534 |coerce| 539 |coHeight| 544
+ |basicSet| 549 |autoReduced?| 562 |algebraicVariables| 568
+ |algebraic?| 573 = 579)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 130
+ (|makeByteWordVec2| 129
'(1 6 11 0 12 1 6 13 0 14 2 10 11 0 0
- 15 1 6 16 0 17 2 6 11 0 0 18 1 11 0 0
- 20 1 6 13 0 21 2 10 11 0 0 22 2 10 11
- 0 0 23 1 10 9 0 24 2 6 0 0 9 25 2 6
- 11 0 0 26 1 6 28 0 29 1 10 11 0 32 2
- 28 0 33 0 34 1 10 11 0 35 2 28 11 33
- 0 36 2 28 0 30 0 37 0 6 0 38 2 6 0 0
- 10 39 3 6 11 10 0 30 40 2 28 0 0 0 44
- 1 10 0 0 46 1 10 0 0 47 1 28 0 0 48 1
- 10 50 0 51 1 6 28 0 53 2 10 11 0 56
- 57 2 10 11 0 56 59 1 10 0 0 61 2 6 11
- 10 0 62 2 9 11 0 0 64 2 9 11 0 0 65 2
- 10 11 0 0 66 1 6 11 0 70 0 10 0 71 4
- 6 10 10 0 68 30 72 2 10 0 0 0 74 2 10
- 0 0 0 76 2 10 11 0 0 77 2 10 0 0 0 79
- 2 10 11 0 0 80 2 6 0 0 9 82 2 6 11 9
- 0 83 2 6 13 0 9 84 2 6 10 10 0 85 0
- 10 0 86 2 10 50 0 9 87 1 88 11 0 89 1
- 10 0 0 90 2 10 0 0 0 91 2 10 0 0 0 92
- 1 10 0 0 93 1 6 0 0 95 2 6 96 10 0 97
- 2 6 11 0 99 101 2 10 11 0 56 104 2 10
- 11 0 56 106 1 6 0 28 111 1 6 114 0
- 116 2 114 11 9 0 117 1 6 16 28 123 2
- 6 16 0 10 125 0 9 50 128 2 50 16 0 0
- 129 1 0 50 0 130 1 0 11 0 102 2 0 11
- 10 0 60 2 0 10 10 0 75 2 0 13 0 9 119
- 4 0 28 28 0 68 30 73 1 0 16 28 126 1
- 0 16 0 112 2 0 10 10 0 94 3 0 11 10 0
- 30 31 2 0 10 10 0 98 4 0 10 10 0 68
- 30 69 1 0 54 0 55 1 0 11 0 103 2 0 11
- 10 0 58 1 0 9 0 108 1 0 13 0 110 1 0
- 28 0 49 1 0 11 0 107 2 0 11 10 0 67 2
- 0 10 10 0 81 2 0 11 0 0 27 1 0 11 0
- 105 2 0 11 10 0 63 2 0 10 10 0 78 1 0
- 13 0 109 2 0 0 0 10 127 1 0 50 0 52 1
- 0 0 28 124 2 0 0 0 9 122 2 0 0 0 9
- 121 1 0 0 0 120 1 0 28 0 113 1 0 50 0
- 130 3 0 42 28 33 30 45 2 0 42 28 30
- 43 2 0 11 0 99 100 1 0 114 0 115 2 0
- 11 9 0 118 2 0 11 0 0 19)))))
+ 15 1 6 16 0 17 2 6 11 0 0 18 1 6 13 0
+ 20 2 10 11 0 0 21 2 10 11 0 0 22 1 10
+ 9 0 23 2 6 0 0 9 24 2 6 11 0 0 25 1 6
+ 27 0 28 1 10 11 0 31 2 27 0 32 0 33 1
+ 10 11 0 34 2 27 11 32 0 35 2 27 0 29
+ 0 36 0 6 0 37 2 6 0 0 10 38 3 6 11 10
+ 0 29 39 2 27 0 0 0 43 1 10 0 0 45 1
+ 10 0 0 46 1 27 0 0 47 1 10 49 0 50 1
+ 6 27 0 52 2 10 11 0 55 56 2 10 11 0
+ 55 58 1 10 0 0 60 2 6 11 10 0 61 2 9
+ 11 0 0 63 2 9 11 0 0 64 2 10 11 0 0
+ 65 1 6 11 0 69 0 10 0 70 4 6 10 10 0
+ 67 29 71 2 10 0 0 0 73 2 10 0 0 0 75
+ 2 10 11 0 0 76 2 10 0 0 0 78 2 10 11
+ 0 0 79 2 6 0 0 9 81 2 6 11 9 0 82 2 6
+ 13 0 9 83 2 6 10 10 0 84 0 10 0 85 2
+ 10 49 0 9 86 1 87 11 0 88 1 10 0 0 89
+ 2 10 0 0 0 90 2 10 0 0 0 91 1 10 0 0
+ 92 1 6 0 0 94 2 6 95 10 0 96 2 6 11 0
+ 98 100 2 10 11 0 55 103 2 10 11 0 55
+ 105 1 6 0 27 110 1 6 113 0 115 2 113
+ 11 9 0 116 1 6 16 27 122 2 6 16 0 10
+ 124 0 9 49 127 2 49 16 0 0 128 1 0 49
+ 0 129 1 0 11 0 101 2 0 11 10 0 59 2 0
+ 10 10 0 74 2 0 13 0 9 118 4 0 27 27 0
+ 67 29 72 1 0 16 27 125 1 0 16 0 111 2
+ 0 10 10 0 93 3 0 11 10 0 29 30 2 0 10
+ 10 0 97 4 0 10 10 0 67 29 68 1 0 53 0
+ 54 1 0 11 0 102 2 0 11 10 0 57 1 0 9
+ 0 107 1 0 13 0 109 1 0 27 0 48 1 0 11
+ 0 106 2 0 11 10 0 66 2 0 10 10 0 80 2
+ 0 11 0 0 26 1 0 11 0 104 2 0 11 10 0
+ 62 2 0 10 10 0 77 1 0 13 0 108 2 0 0
+ 0 10 126 1 0 49 0 51 1 0 0 27 123 2 0
+ 0 0 9 121 2 0 0 0 9 120 1 0 0 0 119 1
+ 0 27 0 112 1 0 49 0 129 3 0 41 27 32
+ 29 44 2 0 41 27 29 42 2 0 11 0 98 99
+ 1 0 113 0 114 2 0 11 9 0 117 2 0 11 0
+ 0 19)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/UPOLYC-.lsp b/src/algebra/strap/UPOLYC-.lsp
index ddb992a4..ef47a068 100644
--- a/src/algebra/strap/UPOLYC-.lsp
+++ b/src/algebra/strap/UPOLYC-.lsp
@@ -884,14 +884,12 @@
|UPOLYC-;elt;S2F;44|)
(SEQ G190
(COND
- ((NULL (SPADCALL
- (SPADCALL
- (LETT |p|
- (SPADCALL |p|
- (|getShellEntry| $ 56))
- |UPOLYC-;elt;S2F;44|)
- (|getShellEntry| $ 9))
- (|getShellEntry| $ 164)))
+ ((NULL (NOT (SPADCALL
+ (LETT |p|
+ (SPADCALL |p|
+ (|getShellEntry| $ 56))
+ |UPOLYC-;elt;S2F;44|)
+ (|getShellEntry| $ 9))))
(GO G191)))
(SEQ (EXIT (LETT |ans|
(SPADCALL
@@ -907,15 +905,15 @@
|UPOLYC-;elt;S2F;44|)
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 165))
- (|getShellEntry| $ 166))
+ (|getShellEntry| $ 164))
+ (|getShellEntry| $ 165))
(SPADCALL
(SPADCALL
(SPADCALL |p|
(|getShellEntry| $ 54))
(|getShellEntry| $ 30))
(|getShellEntry| $ 163))
- (|getShellEntry| $ 167))
+ (|getShellEntry| $ 166))
|UPOLYC-;elt;S2F;44|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT (COND
@@ -923,8 +921,8 @@
('T
(SPADCALL |ans|
(SPADCALL |f| |n|
- (|getShellEntry| $ 168))
- (|getShellEntry| $ 166))))))))))))
+ (|getShellEntry| $ 167))
+ (|getShellEntry| $ 165))))))))))))
(DEFUN |UPOLYC-;order;2SNni;45| (|p| |q| $)
(PROG (|u| #0=#:G1704 |ans|)
@@ -960,33 +958,33 @@
#0# (EXIT #0#)))))
(DEFUN |UPOLYC-;squareFree;SF;46| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 172)))
+ (SPADCALL |p| (|getShellEntry| $ 171)))
(DEFUN |UPOLYC-;squareFreePart;2S;47| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 174)))
+ (SPADCALL |p| (|getShellEntry| $ 173)))
(DEFUN |UPOLYC-;gcdPolynomial;3Sup;48| (|pp| |qq| $)
(COND
- ((SPADCALL |pp| (|getShellEntry| $ 176))
- (SPADCALL |qq| (|getShellEntry| $ 177)))
- ((SPADCALL |qq| (|getShellEntry| $ 176))
- (SPADCALL |pp| (|getShellEntry| $ 177)))
+ ((SPADCALL |pp| (|getShellEntry| $ 175))
+ (SPADCALL |qq| (|getShellEntry| $ 176)))
+ ((SPADCALL |qq| (|getShellEntry| $ 175))
+ (SPADCALL |pp| (|getShellEntry| $ 176)))
('T
(SPADCALL
(SPADCALL
- (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 178))
- (SPADCALL |qq| (|getShellEntry| $ 178))
+ (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 177))
+ (SPADCALL |qq| (|getShellEntry| $ 177))
(|getShellEntry| $ 126))
(SPADCALL
- (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 179))
- (SPADCALL |qq| (|getShellEntry| $ 179))
- (|getShellEntry| $ 180))
- (|getShellEntry| $ 179))
- (|getShellEntry| $ 181))
- (|getShellEntry| $ 177)))))
+ (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 178))
+ (SPADCALL |qq| (|getShellEntry| $ 178))
+ (|getShellEntry| $ 179))
+ (|getShellEntry| $ 178))
+ (|getShellEntry| $ 180))
+ (|getShellEntry| $ 176)))))
(DEFUN |UPOLYC-;squareFreePolynomial;SupF;49| (|pp| $)
- (SPADCALL |pp| (|getShellEntry| $ 184)))
+ (SPADCALL |pp| (|getShellEntry| $ 183)))
(DEFUN |UPOLYC-;elt;F2R;50| (|f| |r| $)
(SPADCALL
@@ -994,7 +992,7 @@
(|getShellEntry| $ 29))
(SPADCALL (SPADCALL |f| (|getShellEntry| $ 145)) |r|
(|getShellEntry| $ 29))
- (|getShellEntry| $ 186)))
+ (|getShellEntry| $ 185)))
(DEFUN |UPOLYC-;euclideanSize;SNni;51| (|x| $)
(COND
@@ -1014,7 +1012,7 @@
(LETT |lc|
(SPADCALL
(SPADCALL |y| (|getShellEntry| $ 54))
- (|getShellEntry| $ 189))
+ (|getShellEntry| $ 188))
|UPOLYC-;divide;2SR;52|)
(SEQ G190
(COND
@@ -1023,19 +1021,18 @@
(|getShellEntry| $ 9))
'NIL)
('T
- (SPADCALL
+ (NOT
(<
(SPADCALL |x|
(|getShellEntry| $ 11))
(SPADCALL |y|
- (|getShellEntry| $ 11)))
- (|getShellEntry| $ 164)))))
+ (|getShellEntry| $ 11)))))))
(GO G191)))
(SEQ (LETT |f|
(SPADCALL |lc|
(SPADCALL |x|
(|getShellEntry| $ 54))
- (|getShellEntry| $ 190))
+ (|getShellEntry| $ 189))
|UPOLYC-;divide;2SR;52|)
(LETT |n|
(PROG1
@@ -1073,7 +1070,7 @@
(SEQ G190
(COND
((NULL (SPADCALL |p| (|spadConstant| $ 61)
- (|getShellEntry| $ 192)))
+ (|getShellEntry| $ 191)))
(GO G191)))
(SEQ (LETT |l| (SPADCALL |p| (|getShellEntry| $ 54))
|UPOLYC-;integrate;2S;53|)
@@ -1085,11 +1082,11 @@
(SPADCALL
(SPADCALL
(SPADCALL |d|
- (|getShellEntry| $ 194))
- (|getShellEntry| $ 195))
+ (|getShellEntry| $ 193))
+ (|getShellEntry| $ 194))
(SPADCALL |l| |d|
(|getShellEntry| $ 50))
- (|getShellEntry| $ 196))
+ (|getShellEntry| $ 195))
(|getShellEntry| $ 66))
|UPOLYC-;integrate;2S;53|)
(EXIT (LETT |p|
@@ -1107,7 +1104,7 @@
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$|
(LIST '|UnivariatePolynomialCategory&| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 203) . #0#)
+ (LETT $ (|newShell| 202) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -1188,45 +1185,45 @@
(|setShellEntry| $ 161
(CONS (|dispatchFunction| |UPOLYC-;composite;2SU;43|)
$))
- (|setShellEntry| $ 169
+ (|setShellEntry| $ 168
(CONS (|dispatchFunction| |UPOLYC-;elt;S2F;44|) $))
- (|setShellEntry| $ 170
+ (|setShellEntry| $ 169
(CONS (|dispatchFunction| |UPOLYC-;order;2SNni;45|) $)))))
(COND
((|testBitVector| |pv$| 3)
(PROGN
- (|setShellEntry| $ 173
+ (|setShellEntry| $ 172
(CONS (|dispatchFunction| |UPOLYC-;squareFree;SF;46|)
$))
- (|setShellEntry| $ 175
+ (|setShellEntry| $ 174
(CONS (|dispatchFunction|
|UPOLYC-;squareFreePart;2S;47|)
$)))))
(COND
((|HasCategory| |#2| '(|PolynomialFactorizationExplicit|))
(PROGN
- (|setShellEntry| $ 182
+ (|setShellEntry| $ 181
(CONS (|dispatchFunction|
|UPOLYC-;gcdPolynomial;3Sup;48|)
$))
- (|setShellEntry| $ 185
+ (|setShellEntry| $ 184
(CONS (|dispatchFunction|
|UPOLYC-;squareFreePolynomial;SupF;49|)
$)))))
(COND
((|testBitVector| |pv$| 2)
(PROGN
- (|setShellEntry| $ 187
+ (|setShellEntry| $ 186
(CONS (|dispatchFunction| |UPOLYC-;elt;F2R;50|) $))
- (|setShellEntry| $ 188
+ (|setShellEntry| $ 187
(CONS (|dispatchFunction|
|UPOLYC-;euclideanSize;SNni;51|)
$))
- (|setShellEntry| $ 191
+ (|setShellEntry| $ 190
(CONS (|dispatchFunction| |UPOLYC-;divide;2SR;52|) $)))))
(COND
((|testBitVector| |pv$| 1)
- (|setShellEntry| $ 197
+ (|setShellEntry| $ 196
(CONS (|dispatchFunction| |UPOLYC-;integrate;2S;53|) $))))
$))))
@@ -1303,40 +1300,39 @@
(|Union| 143 '"failed") (433 . |composite|)
(439 . |ground?|) (444 . |pseudoDivide|) (450 . |exquo|)
(456 . |composite|) (462 . |Zero|) (466 . |coerce|)
- (471 . |not|) (476 . **) (482 . *) (488 . +) (494 . **)
- (500 . |elt|) (506 . |order|)
- (|UnivariatePolynomialSquareFree| 7 6)
- (512 . |squareFree|) (517 . |squareFree|)
- (522 . |squareFreePart|) (527 . |squareFreePart|)
- (532 . |zero?|) (537 . |unitCanonical|) (542 . |content|)
- (547 . |primitivePart|) (552 . |subResultantGcd|)
- (558 . *) (564 . |gcdPolynomial|)
+ (471 . **) (477 . *) (483 . +) (489 . **) (495 . |elt|)
+ (501 . |order|) (|UnivariatePolynomialSquareFree| 7 6)
+ (507 . |squareFree|) (512 . |squareFree|)
+ (517 . |squareFreePart|) (522 . |squareFreePart|)
+ (527 . |zero?|) (532 . |unitCanonical|) (537 . |content|)
+ (542 . |primitivePart|) (547 . |subResultantGcd|)
+ (553 . *) (559 . |gcdPolynomial|)
(|UnivariatePolynomialSquareFree| 6 74)
- (570 . |squareFree|) (575 . |squareFreePolynomial|)
- (580 . /) (586 . |elt|) (592 . |euclideanSize|)
- (597 . |inv|) (602 . *) (608 . |divide|) (614 . ~=)
- (|Fraction| 94) (620 . |coerce|) (625 . |inv|) (630 . *)
- (636 . |integrate|) (|Symbol|) (|List| 198)
- (|Union| 94 '"failed") (|Union| 193 '"failed")
+ (565 . |squareFree|) (570 . |squareFreePolynomial|)
+ (575 . /) (581 . |elt|) (587 . |euclideanSize|)
+ (592 . |inv|) (597 . *) (603 . |divide|) (609 . ~=)
+ (|Fraction| 94) (615 . |coerce|) (620 . |inv|) (625 . *)
+ (631 . |integrate|) (|Symbol|) (|List| 197)
+ (|Union| 94 '"failed") (|Union| 192 '"failed")
(|OutputForm|))
- '#(|vectorise| 641 |variables| 647 |unmakeSUP| 652
- |totalDegree| 657 |squareFreePolynomial| 663
- |squareFreePart| 668 |squareFree| 673
- |solveLinearPolynomialEquation| 678 |shiftRight| 684
- |shiftLeft| 690 |separate| 696 |retractIfCan| 702
- |retract| 707 |pseudoQuotient| 712 |pseudoDivide| 718
- |order| 724 |nextItem| 730 |monomial| 735 |minimumDegree|
- 742 |makeSUP| 754 |mainVariable| 759 |karatsubaDivide| 764
- |integrate| 770 |init| 775 |gcdPolynomial| 779
- |factorSquareFreePolynomial| 785 |factorPolynomial| 790
- |factor| 795 |eval| 800 |euclideanSize| 834 |elt| 839
- |divide| 857 |differentiate| 863 |degree| 887 |content|
- 899 |composite| 905 |coerce| 917)
+ '#(|vectorise| 636 |variables| 642 |unmakeSUP| 647
+ |totalDegree| 652 |squareFreePolynomial| 658
+ |squareFreePart| 663 |squareFree| 668
+ |solveLinearPolynomialEquation| 673 |shiftRight| 679
+ |shiftLeft| 685 |separate| 691 |retractIfCan| 697
+ |retract| 702 |pseudoQuotient| 707 |pseudoDivide| 713
+ |order| 719 |nextItem| 725 |monomial| 730 |minimumDegree|
+ 737 |makeSUP| 749 |mainVariable| 754 |karatsubaDivide| 759
+ |integrate| 765 |init| 770 |gcdPolynomial| 774
+ |factorSquareFreePolynomial| 780 |factorPolynomial| 785
+ |factor| 790 |eval| 795 |euclideanSize| 829 |elt| 834
+ |divide| 852 |differentiate| 858 |degree| 882 |content|
+ 894 |composite| 900 |coerce| 912)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 197
+ (|makeByteWordVec2| 196
'(1 6 8 0 9 1 6 10 0 11 0 12 0 13 1 6
10 0 17 3 6 0 0 12 0 21 2 6 0 0 0 24
3 6 0 0 12 7 26 2 6 7 0 7 29 1 6 0 7
@@ -1369,36 +1365,36 @@
154 2 141 0 6 6 155 2 0 156 143 0 157
1 6 8 0 158 2 6 152 0 0 159 2 6 120 0
7 160 2 0 120 0 0 161 0 141 0 162 1
- 141 0 6 163 1 8 0 0 164 2 141 0 0 94
- 165 2 141 0 0 0 166 2 141 0 0 0 167 2
- 141 0 0 10 168 2 0 143 0 143 169 2 0
- 10 0 0 170 1 171 100 6 172 1 0 89 0
- 173 1 171 6 6 174 1 0 0 0 175 1 74 8
- 0 176 1 74 0 0 177 1 74 6 0 178 1 74
- 0 0 179 2 74 0 0 0 180 2 74 0 6 0 181
- 2 0 79 79 79 182 1 183 83 74 184 1 0
- 85 79 185 2 7 0 0 0 186 2 0 7 143 7
- 187 1 0 10 0 188 1 7 0 0 189 2 7 0 0
- 0 190 2 0 68 0 0 191 2 6 8 0 0 192 1
- 193 0 94 194 1 193 0 0 195 2 6 0 193
- 0 196 1 0 0 0 197 2 0 109 0 10 114 1
- 0 14 0 15 1 0 0 52 67 2 0 10 0 14 18
- 1 0 85 79 185 1 0 0 0 175 1 0 89 0
- 173 2 0 81 80 79 82 2 0 0 0 10 71 2 0
- 0 0 10 73 2 0 129 0 0 130 1 0 116 0
- 117 1 0 7 0 115 2 0 0 0 0 151 2 0 152
- 0 0 153 2 0 10 0 0 170 1 0 120 0 123
- 3 0 0 0 12 10 47 2 0 19 0 14 43 2 0
- 10 0 12 42 1 0 52 0 59 1 0 34 0 40 2
- 0 68 0 10 70 1 0 0 0 197 0 0 0 119 2
- 0 79 79 79 182 1 0 85 79 88 1 0 85 79
- 86 1 0 89 0 107 3 0 0 0 12 0 25 3 0 0
- 0 14 22 23 3 0 0 0 14 27 28 3 0 0 0
- 12 7 31 2 0 0 0 38 39 1 0 10 0 188 2
- 0 143 0 143 169 2 0 7 143 7 187 2 0
- 143 143 143 147 2 0 68 0 0 191 3 0 0
- 0 133 0 134 2 0 0 0 133 137 1 0 0 0
- 138 2 0 0 0 12 140 2 0 10 0 12 16 2 0
- 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)))))
+ 141 0 6 163 2 141 0 0 94 164 2 141 0
+ 0 0 165 2 141 0 0 0 166 2 141 0 0 10
+ 167 2 0 143 0 143 168 2 0 10 0 0 169
+ 1 170 100 6 171 1 0 89 0 172 1 170 6
+ 6 173 1 0 0 0 174 1 74 8 0 175 1 74 0
+ 0 176 1 74 6 0 177 1 74 0 0 178 2 74
+ 0 0 0 179 2 74 0 6 0 180 2 0 79 79 79
+ 181 1 182 83 74 183 1 0 85 79 184 2 7
+ 0 0 0 185 2 0 7 143 7 186 1 0 10 0
+ 187 1 7 0 0 188 2 7 0 0 0 189 2 0 68
+ 0 0 190 2 6 8 0 0 191 1 192 0 94 193
+ 1 192 0 0 194 2 6 0 192 0 195 1 0 0 0
+ 196 2 0 109 0 10 114 1 0 14 0 15 1 0
+ 0 52 67 2 0 10 0 14 18 1 0 85 79 184
+ 1 0 0 0 174 1 0 89 0 172 2 0 81 80 79
+ 82 2 0 0 0 10 71 2 0 0 0 10 73 2 0
+ 129 0 0 130 1 0 116 0 117 1 0 7 0 115
+ 2 0 0 0 0 151 2 0 152 0 0 153 2 0 10
+ 0 0 169 1 0 120 0 123 3 0 0 0 12 10
+ 47 2 0 19 0 14 43 2 0 10 0 12 42 1 0
+ 52 0 59 1 0 34 0 40 2 0 68 0 10 70 1
+ 0 0 0 196 0 0 0 119 2 0 79 79 79 181
+ 1 0 85 79 88 1 0 85 79 86 1 0 89 0
+ 107 3 0 0 0 12 0 25 3 0 0 0 14 22 23
+ 3 0 0 0 14 27 28 3 0 0 0 12 7 31 2 0
+ 0 0 38 39 1 0 10 0 187 2 0 143 0 143
+ 168 2 0 7 143 7 186 2 0 143 143 143
+ 147 2 0 68 0 0 190 3 0 0 0 133 0 134
+ 2 0 0 0 133 137 1 0 0 0 138 2 0 0 0
+ 12 140 2 0 10 0 12 16 2 0 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|))
diff --git a/src/algebra/strap/URAGG-.lsp b/src/algebra/strap/URAGG-.lsp
index c5870cbe..9db94f98 100644
--- a/src/algebra/strap/URAGG-.lsp
+++ b/src/algebra/strap/URAGG-.lsp
@@ -131,12 +131,10 @@
(COND
((SPADCALL |x| (|getShellEntry| $ 20)) 'NIL)
('T
- (SPADCALL
- (SPADCALL (|URAGG-;findCycle| |x| $) (|getShellEntry| $ 20))
- (|getShellEntry| $ 21)))))
+ (NOT (SPADCALL (|URAGG-;findCycle| |x| $) (|getShellEntry| $ 20))))))
(DEFUN |URAGG-;last;AS;7| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 23))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 22))
(|getShellEntry| $ 8)))
(DEFUN |URAGG-;nodes;AL;8| (|x| $)
@@ -145,9 +143,7 @@
(SEQ (LETT |l| NIL |URAGG-;nodes;AL;8|)
(SEQ G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |x| (|getShellEntry| $ 20))
- (|getShellEntry| $ 21)))
+ ((NULL (NOT (SPADCALL |x| (|getShellEntry| $ 20))))
(GO G191)))
(SEQ (LETT |l| (CONS |x| |l|) |URAGG-;nodes;AL;8|)
(EXIT (LETT |x|
@@ -182,9 +178,7 @@
(COND
((NULL (COND
((< 0 |i|)
- (SPADCALL
- (SPADCALL |l| (|getShellEntry| $ 20))
- (|getShellEntry| $ 21)))
+ (NOT (SPADCALL |l| (|getShellEntry| $ 20))))
('T 'NIL)))
(GO G191)))
(SEQ (LETT |l| (SPADCALL |l| (|getShellEntry| $ 14))
@@ -201,9 +195,7 @@
(COND
((NULL (COND
((< 0 |i|)
- (SPADCALL
- (SPADCALL |l| (|getShellEntry| $ 20))
- (|getShellEntry| $ 21)))
+ (NOT (SPADCALL |l| (|getShellEntry| $ 20))))
('T 'NIL)))
(GO G191)))
(SEQ (LETT |l| (SPADCALL |l| (|getShellEntry| $ 14))
@@ -212,8 +204,7 @@
NIL (GO G190) G191 (EXIT NIL))
(EXIT (COND
((ZEROP |i|)
- (SPADCALL (SPADCALL |l| (|getShellEntry| $ 20))
- (|getShellEntry| $ 21)))
+ (NOT (SPADCALL |l| (|getShellEntry| $ 20))))
('T 'NIL)))))))
(DEFUN |URAGG-;size?;ANniB;14| (|l| |n| $)
@@ -239,14 +230,12 @@
(RETURN
(SEQ (SEQ (LETT |k| 0 |URAGG-;#;ANni;15|) G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |x| (|getShellEntry| $ 20))
- (|getShellEntry| $ 21)))
+ ((NULL (NOT (SPADCALL |x| (|getShellEntry| $ 20))))
(GO G191)))
(SEQ (COND
((EQL |k| 1000)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 34))
+ ((SPADCALL |x| (|getShellEntry| $ 33))
(EXIT (|error| "cyclic list"))))))
(EXIT (LETT |x|
(SPADCALL |x| (|getShellEntry| $ 14))
@@ -266,16 +255,14 @@
|URAGG-;tail;2A;16|)
(SEQ (LETT |k| 0 |URAGG-;tail;2A;16|) G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |y|
- (|getShellEntry| $ 20))
- (|getShellEntry| $ 21)))
+ ((NULL (NOT (SPADCALL |y|
+ (|getShellEntry| $ 20))))
(GO G191)))
(SEQ (COND
((EQL |k| 1000)
(COND
((SPADCALL |x|
- (|getShellEntry| $ 34))
+ (|getShellEntry| $ 33))
(EXIT (|error| "cyclic list"))))))
(EXIT (LETT |y|
(SPADCALL
@@ -293,14 +280,13 @@
|URAGG-;findCycle|)
(SEQ G190
(COND
- ((NULL (SPADCALL
+ ((NULL (NOT
(SPADCALL |y|
- (|getShellEntry| $ 20))
- (|getShellEntry| $ 21)))
+ (|getShellEntry| $ 20))))
(GO G191)))
(SEQ (COND
((SPADCALL |x| |y|
- (|getShellEntry| $ 37))
+ (|getShellEntry| $ 36))
(PROGN
(LETT #0# |x| |URAGG-;findCycle|)
(GO #0#))))
@@ -320,7 +306,7 @@
(GO #0#))))
(COND
((SPADCALL |x| |y|
- (|getShellEntry| $ 37))
+ (|getShellEntry| $ 36))
(PROGN
(LETT #0# |y| |URAGG-;findCycle|)
(GO #0#))))
@@ -338,7 +324,7 @@
(SEQ (COND
((SPADCALL
(LETT |y|
- (LETT |x| (SPADCALL |x| (|getShellEntry| $ 38))
+ (LETT |x| (SPADCALL |x| (|getShellEntry| $ 37))
|URAGG-;cycleTail;2A;18|)
|URAGG-;cycleTail;2A;18|)
(|getShellEntry| $ 20))
@@ -348,10 +334,8 @@
|URAGG-;cycleTail;2A;18|)
(SEQ G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |x| |z|
- (|getShellEntry| $ 37))
- (|getShellEntry| $ 21)))
+ ((NULL (NOT (SPADCALL |x| |z|
+ (|getShellEntry| $ 36))))
(GO G191)))
(SEQ (LETT |y| |z| |URAGG-;cycleTail;2A;18|)
(EXIT (LETT |z|
@@ -376,10 +360,8 @@
|URAGG-;cycleEntry;2A;19|)
(SEQ (LETT |l| 1 |URAGG-;cycleEntry;2A;19|) G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |y| |z|
- (|getShellEntry| $ 37))
- (|getShellEntry| $ 21)))
+ ((NULL (NOT (SPADCALL |y| |z|
+ (|getShellEntry| $ 36))))
(GO G191)))
(SEQ (EXIT (LETT |z|
(SPADCALL |z|
@@ -400,10 +382,8 @@
(GO G190) G191 (EXIT NIL))
(SEQ G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |x| |y|
- (|getShellEntry| $ 37))
- (|getShellEntry| $ 21)))
+ ((NULL (NOT (SPADCALL |x| |y|
+ (|getShellEntry| $ 36))))
(GO G191)))
(SEQ (LETT |x|
(SPADCALL |x|
@@ -431,10 +411,8 @@
|URAGG-;cycleLength;ANni;20|)
(SEQ (LETT |k| 1 |URAGG-;cycleLength;ANni;20|) G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |x| |y|
- (|getShellEntry| $ 37))
- (|getShellEntry| $ 21)))
+ ((NULL (NOT (SPADCALL |x| |y|
+ (|getShellEntry| $ 36))))
(GO G191)))
(SEQ (EXIT (LETT |y|
(SPADCALL |y|
@@ -465,7 +443,7 @@
(DEFUN |URAGG-;last;ANniA;22| (|x| |n| $)
(PROG (|m| #0=#:G1498)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 43))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 42))
|URAGG-;last;ANniA;22|)
(EXIT (COND
((< |m| |n|) (|error| "index out of range"))
@@ -476,14 +454,14 @@
|URAGG-;last;ANniA;22|)
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 44))
- (|getShellEntry| $ 45)))))))))
+ (|getShellEntry| $ 43))
+ (|getShellEntry| $ 44)))))))))
(DEFUN |URAGG-;=;2AB;23| (|x| |y| $)
(PROG (|k| #0=#:G1508)
(RETURN
(SEQ (EXIT (COND
- ((SPADCALL |x| |y| (|getShellEntry| $ 37)) 'T)
+ ((SPADCALL |x| |y| (|getShellEntry| $ 36)) 'T)
('T
(SEQ (SEQ (LETT |k| 0 |URAGG-;=;2AB;23|) G190
(COND
@@ -492,16 +470,15 @@
(|getShellEntry| $ 20))
'NIL)
('T
- (SPADCALL
+ (NOT
(SPADCALL |y|
- (|getShellEntry| $ 20))
- (|getShellEntry| $ 21)))))
+ (|getShellEntry| $ 20))))))
(GO G191)))
(SEQ (COND
((EQL |k| 1000)
(COND
((SPADCALL |x|
- (|getShellEntry| $ 34))
+ (|getShellEntry| $ 33))
(EXIT (|error| "cyclic list"))))))
(EXIT
(COND
@@ -510,7 +487,7 @@
(|getShellEntry| $ 8))
(SPADCALL |y|
(|getShellEntry| $ 8))
- (|getShellEntry| $ 47))
+ (|getShellEntry| $ 46))
(PROGN
(LETT #0# 'NIL
|URAGG-;=;2AB;23|)
@@ -539,14 +516,13 @@
(RETURN
(SEQ (EXIT (SEQ (SEQ (LETT |k| 0 |URAGG-;node?;2AB;24|) G190
(COND
- ((NULL (SPADCALL
+ ((NULL (NOT
(SPADCALL |v|
- (|getShellEntry| $ 20))
- (|getShellEntry| $ 21)))
+ (|getShellEntry| $ 20))))
(GO G191)))
(SEQ (EXIT (COND
((SPADCALL |u| |v|
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 48))
(PROGN
(LETT #0# 'T
|URAGG-;node?;2AB;24|)
@@ -557,7 +533,7 @@
((EQL |k| 1000)
(COND
((SPADCALL |v|
- (|getShellEntry| $ 34))
+ (|getShellEntry| $ 33))
(EXIT
(|error|
"cyclic list"))))))
@@ -569,39 +545,39 @@
(LETT |k| (QSADD1 |k|)
|URAGG-;node?;2AB;24|)
(GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |u| |v| (|getShellEntry| $ 49)))))
+ (EXIT (SPADCALL |u| |v| (|getShellEntry| $ 48)))))
#0# (EXIT #0#)))))
(DEFUN |URAGG-;setelt;Afirst2S;25| (|x| T3 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 51)))
+ (SPADCALL |x| |a| (|getShellEntry| $ 50)))
(DEFUN |URAGG-;setelt;Alast2S;26| (|x| T4 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 53)))
+ (SPADCALL |x| |a| (|getShellEntry| $ 52)))
(DEFUN |URAGG-;setelt;Arest2A;27| (|x| T5 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 55)))
+ (SPADCALL |x| |a| (|getShellEntry| $ 54)))
(DEFUN |URAGG-;concat;3A;28| (|x| |y| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 45)) |y|
- (|getShellEntry| $ 57)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 44)) |y|
+ (|getShellEntry| $ 56)))
(DEFUN |URAGG-;setlast!;A2S;29| (|x| |s| $)
(SEQ (COND
((SPADCALL |x| (|getShellEntry| $ 20))
(|error| "setlast: empty list"))
('T
- (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 23)) |s|
- (|getShellEntry| $ 51))
+ (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 22)) |s|
+ (|getShellEntry| $ 50))
(EXIT |s|))))))
(DEFUN |URAGG-;setchildren!;ALA;30| (|u| |lv| $)
(COND
((EQL (LENGTH |lv|) 1)
- (SPADCALL |u| (|SPADfirst| |lv|) (|getShellEntry| $ 55)))
+ (SPADCALL |u| (|SPADfirst| |lv|) (|getShellEntry| $ 54)))
('T (|error| "wrong number of children specified"))))
(DEFUN |URAGG-;setvalue!;A2S;31| (|u| |s| $)
- (SPADCALL |u| |s| (|getShellEntry| $ 51)))
+ (SPADCALL |u| |s| (|getShellEntry| $ 50)))
(DEFUN |URAGG-;split!;AIA;32| (|p| |n| $)
(PROG (#0=#:G1524 |q|)
@@ -615,12 +591,12 @@
|URAGG-;split!;AIA;32|)
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 44))
+ (|getShellEntry| $ 43))
|URAGG-;split!;AIA;32|)
(LETT |q| (SPADCALL |p| (|getShellEntry| $ 14))
|URAGG-;split!;AIA;32|)
- (SPADCALL |p| (SPADCALL (|getShellEntry| $ 62))
- (|getShellEntry| $ 55))
+ (SPADCALL |p| (SPADCALL (|getShellEntry| $ 61))
+ (|getShellEntry| $ 54))
(EXIT |q|))))))))
(DEFUN |URAGG-;cycleSplit!;2A;33| (|x| $)
@@ -628,20 +604,18 @@
(RETURN
(SEQ (COND
((OR (SPADCALL
- (LETT |y| (SPADCALL |x| (|getShellEntry| $ 38))
+ (LETT |y| (SPADCALL |x| (|getShellEntry| $ 37))
|URAGG-;cycleSplit!;2A;33|)
(|getShellEntry| $ 20))
- (SPADCALL |x| |y| (|getShellEntry| $ 37)))
+ (SPADCALL |x| |y| (|getShellEntry| $ 36)))
|y|)
('T
(SEQ (LETT |z| (SPADCALL |x| (|getShellEntry| $ 14))
|URAGG-;cycleSplit!;2A;33|)
(SEQ G190
(COND
- ((NULL (SPADCALL
- (SPADCALL |z| |y|
- (|getShellEntry| $ 37))
- (|getShellEntry| $ 21)))
+ ((NULL (NOT (SPADCALL |z| |y|
+ (|getShellEntry| $ 36))))
(GO G191)))
(SEQ (LETT |x| |z| |URAGG-;cycleSplit!;2A;33|)
(EXIT (LETT |z|
@@ -649,8 +623,8 @@
(|getShellEntry| $ 14))
|URAGG-;cycleSplit!;2A;33|)))
NIL (GO G190) G191 (EXIT NIL))
- (SPADCALL |x| (SPADCALL (|getShellEntry| $ 62))
- (|getShellEntry| $ 55))
+ (SPADCALL |x| (SPADCALL (|getShellEntry| $ 61))
+ (|getShellEntry| $ 54))
(EXIT |y|))))))))
(DEFUN |UnaryRecursiveAggregate&| (|#1| |#2|)
@@ -662,7 +636,7 @@
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$|
(LIST '|UnaryRecursiveAggregate&| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 67) . #0#)
+ (LETT $ (|newShell| 66) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -673,41 +647,41 @@
(|setShellEntry| $ 7 |#2|)
(COND
((|HasAttribute| |#1| '|finiteAggregate|)
- (|setShellEntry| $ 46
+ (|setShellEntry| $ 45
(CONS (|dispatchFunction| |URAGG-;last;ANniA;22|) $))))
(COND
((|HasCategory| |#2| '(|SetCategory|))
(PROGN
- (|setShellEntry| $ 48
+ (|setShellEntry| $ 47
(CONS (|dispatchFunction| |URAGG-;=;2AB;23|) $))
- (|setShellEntry| $ 50
+ (|setShellEntry| $ 49
(CONS (|dispatchFunction| |URAGG-;node?;2AB;24|) $)))))
(COND
((|testBitVector| |pv$| 1)
(PROGN
- (|setShellEntry| $ 52
+ (|setShellEntry| $ 51
(CONS (|dispatchFunction| |URAGG-;setelt;Afirst2S;25|)
$))
- (|setShellEntry| $ 54
+ (|setShellEntry| $ 53
(CONS (|dispatchFunction| |URAGG-;setelt;Alast2S;26|)
$))
- (|setShellEntry| $ 56
+ (|setShellEntry| $ 55
(CONS (|dispatchFunction| |URAGG-;setelt;Arest2A;27|)
$))
- (|setShellEntry| $ 58
+ (|setShellEntry| $ 57
(CONS (|dispatchFunction| |URAGG-;concat;3A;28|) $))
- (|setShellEntry| $ 59
+ (|setShellEntry| $ 58
(CONS (|dispatchFunction| |URAGG-;setlast!;A2S;29|) $))
- (|setShellEntry| $ 60
+ (|setShellEntry| $ 59
(CONS (|dispatchFunction|
|URAGG-;setchildren!;ALA;30|)
$))
- (|setShellEntry| $ 61
+ (|setShellEntry| $ 60
(CONS (|dispatchFunction| |URAGG-;setvalue!;A2S;31|)
$))
- (|setShellEntry| $ 64
+ (|setShellEntry| $ 63
(CONS (|dispatchFunction| |URAGG-;split!;AIA;32|) $))
- (|setShellEntry| $ 65
+ (|setShellEntry| $ 64
(CONS (|dispatchFunction| |URAGG-;cycleSplit!;2A;33|)
$)))))
$))))
@@ -718,55 +692,54 @@
'"last" |URAGG-;elt;AlastS;2| (10 . |rest|) '"rest"
|URAGG-;elt;ArestA;3| |URAGG-;second;AS;4|
|URAGG-;third;AS;5| (|Boolean|) (15 . |empty?|)
- (20 . |not|) |URAGG-;cyclic?;AB;6| (25 . |tail|)
- |URAGG-;last;AS;7| (|List| $) |URAGG-;nodes;AL;8|
- |URAGG-;children;AL;9| |URAGG-;leaf?;AB;10|
- |URAGG-;value;AS;11| (|NonNegativeInteger|)
- |URAGG-;less?;ANniB;12| |URAGG-;more?;ANniB;13|
- |URAGG-;size?;ANniB;14| (30 . |cyclic?|)
- |URAGG-;#;ANni;15| |URAGG-;tail;2A;16| (35 . |eq?|)
- (41 . |cycleEntry|) |URAGG-;cycleTail;2A;18|
+ |URAGG-;cyclic?;AB;6| (20 . |tail|) |URAGG-;last;AS;7|
+ (|List| $) |URAGG-;nodes;AL;8| |URAGG-;children;AL;9|
+ |URAGG-;leaf?;AB;10| |URAGG-;value;AS;11|
+ (|NonNegativeInteger|) |URAGG-;less?;ANniB;12|
+ |URAGG-;more?;ANniB;13| |URAGG-;size?;ANniB;14|
+ (25 . |cyclic?|) |URAGG-;#;ANni;15| |URAGG-;tail;2A;16|
+ (30 . |eq?|) (36 . |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 . =)
- (86 . |node?|) (92 . |setfirst!|) (98 . |setelt|)
- (105 . |setlast!|) (111 . |setelt|) (118 . |setrest!|)
- (124 . |setelt|) (131 . |concat!|) (137 . |concat|)
- (143 . |setlast!|) (149 . |setchildren!|)
- (155 . |setvalue!|) (161 . |empty|) (|Integer|)
- (165 . |split!|) (171 . |cycleSplit!|) '"value")
- '#(|value| 176 |third| 181 |tail| 186 |split!| 191 |size?|
- 197 |setvalue!| 203 |setlast!| 209 |setelt| 215
- |setchildren!| 236 |second| 242 |rest| 247 |nodes| 253
- |node?| 258 |more?| 264 |less?| 270 |leaf?| 276 |last| 281
- |elt| 292 |cyclic?| 310 |cycleTail| 315 |cycleSplit!| 320
- |cycleLength| 325 |cycleEntry| 330 |concat| 335 |children|
- 341 = 346 |#| 352)
+ |URAGG-;rest;ANniA;21| (41 . |#|) (46 . |rest|)
+ (52 . |copy|) (57 . |last|) (63 . ~=) (69 . =) (75 . =)
+ (81 . |node?|) (87 . |setfirst!|) (93 . |setelt|)
+ (100 . |setlast!|) (106 . |setelt|) (113 . |setrest!|)
+ (119 . |setelt|) (126 . |concat!|) (132 . |concat|)
+ (138 . |setlast!|) (144 . |setchildren!|)
+ (150 . |setvalue!|) (156 . |empty|) (|Integer|)
+ (160 . |split!|) (166 . |cycleSplit!|) '"value")
+ '#(|value| 171 |third| 176 |tail| 181 |split!| 186 |size?|
+ 192 |setvalue!| 198 |setlast!| 204 |setelt| 210
+ |setchildren!| 231 |second| 237 |rest| 242 |nodes| 248
+ |node?| 253 |more?| 259 |less?| 265 |leaf?| 271 |last| 276
+ |elt| 287 |cyclic?| 305 |cycleTail| 310 |cycleSplit!| 315
+ |cycleLength| 320 |cycleEntry| 325 |concat| 330 |children|
+ 336 = 341 |#| 347)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 65
+ (|makeByteWordVec2| 64
'(1 6 7 0 8 1 6 7 0 11 1 6 0 0 14 1 6
- 19 0 20 1 19 0 0 21 1 6 0 0 23 1 6 19
- 0 34 2 6 19 0 0 37 1 6 0 0 38 1 6 30
- 0 43 2 6 0 0 30 44 1 6 0 0 45 2 0 0 0
- 30 46 2 7 19 0 0 47 2 0 19 0 0 48 2 6
- 19 0 0 49 2 0 19 0 0 50 2 6 7 0 7 51
- 3 0 7 0 9 7 52 2 6 7 0 7 53 3 0 7 0
- 12 7 54 2 6 0 0 0 55 3 0 0 0 15 0 56
- 2 6 0 0 0 57 2 0 0 0 0 58 2 0 7 0 7
- 59 2 0 0 0 25 60 2 0 7 0 7 61 0 6 0
- 62 2 0 0 0 63 64 1 0 0 0 65 1 0 7 0
- 29 1 0 7 0 18 1 0 0 0 36 2 0 0 0 63
- 64 2 0 19 0 30 33 2 0 7 0 7 61 2 0 7
- 0 7 59 3 0 7 0 12 7 54 3 0 0 0 15 0
- 56 3 0 7 0 9 7 52 2 0 0 0 25 60 1 0 7
- 0 17 2 0 0 0 30 42 1 0 25 0 26 2 0 19
- 0 0 50 2 0 19 0 30 32 2 0 19 0 30 31
- 1 0 19 0 28 2 0 0 0 30 46 1 0 7 0 24
- 2 0 7 0 12 13 2 0 0 0 15 16 2 0 7 0 9
- 10 1 0 19 0 22 1 0 0 0 39 1 0 0 0 65
- 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)))))
+ 19 0 20 1 6 0 0 22 1 6 19 0 33 2 6 19
+ 0 0 36 1 6 0 0 37 1 6 29 0 42 2 6 0 0
+ 29 43 1 6 0 0 44 2 0 0 0 29 45 2 7 19
+ 0 0 46 2 0 19 0 0 47 2 6 19 0 0 48 2
+ 0 19 0 0 49 2 6 7 0 7 50 3 0 7 0 9 7
+ 51 2 6 7 0 7 52 3 0 7 0 12 7 53 2 6 0
+ 0 0 54 3 0 0 0 15 0 55 2 6 0 0 0 56 2
+ 0 0 0 0 57 2 0 7 0 7 58 2 0 0 0 24 59
+ 2 0 7 0 7 60 0 6 0 61 2 0 0 0 62 63 1
+ 0 0 0 64 1 0 7 0 28 1 0 7 0 18 1 0 0
+ 0 35 2 0 0 0 62 63 2 0 19 0 29 32 2 0
+ 7 0 7 60 2 0 7 0 7 58 3 0 7 0 12 7 53
+ 3 0 0 0 15 0 55 3 0 7 0 9 7 51 2 0 0
+ 0 24 59 1 0 7 0 17 2 0 0 0 29 41 1 0
+ 24 0 25 2 0 19 0 0 49 2 0 19 0 29 31
+ 2 0 19 0 29 30 1 0 19 0 27 2 0 0 0 29
+ 45 1 0 7 0 23 2 0 7 0 12 13 2 0 0 0
+ 15 16 2 0 7 0 9 10 1 0 19 0 21 1 0 0
+ 0 38 1 0 0 0 64 1 0 29 0 40 1 0 0 0
+ 39 2 0 0 0 0 57 1 0 24 0 26 2 0 19 0
+ 0 47 1 0 29 0 34)))))
'|lookupComplete|))
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 16:53:05 +0000