aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/algebra/strap/EUCDOM-.lsp159
-rw-r--r--src/algebra/strap/FFIELDC-.lsp184
-rw-r--r--src/algebra/strap/INS-.lsp260
-rw-r--r--src/algebra/strap/ISTRING.lsp173
-rw-r--r--src/algebra/strap/LIST.lsp148
-rw-r--r--src/algebra/strap/LNAGG-.lsp44
-rw-r--r--src/algebra/strap/LSAGG-.lsp197
-rw-r--r--src/algebra/strap/NNI.lsp52
-rw-r--r--src/algebra/strap/POLYCAT-.lsp431
-rw-r--r--src/algebra/strap/STAGG-.lsp186
-rw-r--r--src/algebra/strap/SYMBOL.lsp94
-rw-r--r--src/algebra/strap/URAGG-.lsp207
-rw-r--r--src/interp/compiler.boot37
14 files changed, 1095 insertions, 1083 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d60aba65..198e4647 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
2009-05-28 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * interp/compiler.boot (getSuccessEnvironment): Tidy.
+ (getInverseEnvironment): Likewise.
+ (compLogicalNot): Don't normalize to if-statement.
+
+2009-05-28 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* interp/compiler.boot (compVector): Tidy code generation.
(checkExternalEntity): Handle Builtin external entities.
(compSignatureImport): Likewise.
diff --git a/src/algebra/strap/EUCDOM-.lsp b/src/algebra/strap/EUCDOM-.lsp
index 7972f055..6e7b0c5f 100644
--- a/src/algebra/strap/EUCDOM-.lsp
+++ b/src/algebra/strap/EUCDOM-.lsp
@@ -79,7 +79,7 @@
(SEQ (PROGN
(LETT |#G13| |y| |EUCDOM-;gcd;3S;5|)
(LETT |#G14|
- (SPADCALL |x| |y| (|getShellEntry| $ 23))
+ (SPADCALL |x| |y| (|getShellEntry| $ 24))
|EUCDOM-;gcd;3S;5|)
(LETT |x| |#G13| |EUCDOM-;gcd;3S;5|)
(LETT |y| |#G14| |EUCDOM-;gcd;3S;5|))
@@ -94,7 +94,7 @@
(RETURN
(SEQ (PROGN
(LETT |#G16|
- (SPADCALL (QVELT |s| 2) (|getShellEntry| $ 26))
+ (SPADCALL (QVELT |s| 2) (|getShellEntry| $ 27))
|EUCDOM-;unitNormalizeIdealElt|)
(LETT |u| (QVELT |#G16| 0)
|EUCDOM-;unitNormalizeIdealElt|)
@@ -104,12 +104,12 @@
|EUCDOM-;unitNormalizeIdealElt|)
|#G16|)
(EXIT (COND
- ((SPADCALL |a| (|getShellEntry| $ 27)) |s|)
+ ((SPADCALL |a| (|getShellEntry| $ 28)) |s|)
('T
(VECTOR (SPADCALL |a| (QVELT |s| 0)
- (|getShellEntry| $ 28))
+ (|getShellEntry| $ 29))
(SPADCALL |a| (QVELT |s| 1)
- (|getShellEntry| $ 28))
+ (|getShellEntry| $ 29))
|c|))))))))
(DEFUN |EUCDOM-;extendedEuclidean;2SR;7| (|x| |y| $)
@@ -117,14 +117,14 @@
(RETURN
(SEQ (LETT |s1|
(|EUCDOM-;unitNormalizeIdealElt|
- (VECTOR (|spadConstant| $ 29)
+ (VECTOR (|spadConstant| $ 30)
(|spadConstant| $ 19) |x|)
$)
|EUCDOM-;extendedEuclidean;2SR;7|)
(LETT |s2|
(|EUCDOM-;unitNormalizeIdealElt|
(VECTOR (|spadConstant| $ 19)
- (|spadConstant| $ 29) |y|)
+ (|spadConstant| $ 30) |y|)
$)
|EUCDOM-;extendedEuclidean;2SR;7|)
(EXIT (COND
@@ -147,13 +147,13 @@
(SPADCALL (QVELT |s1| 0)
(SPADCALL (QCAR |qr|)
(QVELT |s2| 0)
- (|getShellEntry| $ 28))
- (|getShellEntry| $ 30))
+ (|getShellEntry| $ 29))
+ (|getShellEntry| $ 31))
(SPADCALL (QVELT |s1| 1)
(SPADCALL (QCAR |qr|)
(QVELT |s2| 1)
- (|getShellEntry| $ 28))
- (|getShellEntry| $ 30))
+ (|getShellEntry| $ 29))
+ (|getShellEntry| $ 31))
(QCDR |qr|))
|EUCDOM-;extendedEuclidean;2SR;7|)
(LETT |s1| |s2|
@@ -169,7 +169,7 @@
(|getShellEntry| $ 8)))
(COND
((NOT (SPADCALL (QVELT |s1| 0) |y|
- (|getShellEntry| $ 31)))
+ (|getShellEntry| $ 32)))
(SEQ (LETT |qr|
(SPADCALL (QVELT |s1| 0) |y|
(|getShellEntry| $ 16))
@@ -178,8 +178,8 @@
(QSETVELT |s1| 1
(SPADCALL (QVELT |s1| 1)
(SPADCALL (QCAR |qr|) |x|
- (|getShellEntry| $ 28))
- (|getShellEntry| $ 32)))
+ (|getShellEntry| $ 29))
+ (|getShellEntry| $ 33)))
(EXIT
(LETT |s1|
(|EUCDOM-;unitNormalizeIdealElt|
@@ -195,11 +195,11 @@
(CONS 0
(CONS (|spadConstant| $ 19) (|spadConstant| $ 19))))
('T
- (SEQ (LETT |s| (SPADCALL |x| |y| (|getShellEntry| $ 35))
+ (SEQ (LETT |s| (SPADCALL |x| |y| (|getShellEntry| $ 36))
|EUCDOM-;extendedEuclidean;3SU;8|)
(LETT |w|
(SPADCALL |z| (QVELT |s| 2)
- (|getShellEntry| $ 36))
+ (|getShellEntry| $ 37))
|EUCDOM-;extendedEuclidean;3SU;8|)
(EXIT (COND
((QEQCAR |w| 1) (CONS 1 "failed"))
@@ -207,16 +207,16 @@
(CONS 0
(CONS (SPADCALL (QVELT |s| 0)
(QCDR |w|)
- (|getShellEntry| $ 28))
+ (|getShellEntry| $ 29))
(SPADCALL (QVELT |s| 1)
(QCDR |w|)
- (|getShellEntry| $ 28)))))
+ (|getShellEntry| $ 29)))))
('T
(SEQ (LETT |qr|
(SPADCALL
(SPADCALL (QVELT |s| 0)
(QCDR |w|)
- (|getShellEntry| $ 28))
+ (|getShellEntry| $ 29))
|y| (|getShellEntry| $ 16))
|EUCDOM-;extendedEuclidean;3SU;8|)
(EXIT (CONS 0
@@ -224,38 +224,38 @@
(SPADCALL
(SPADCALL (QVELT |s| 1)
(QCDR |w|)
- (|getShellEntry| $ 28))
+ (|getShellEntry| $ 29))
(SPADCALL (QCAR |qr|) |x|
- (|getShellEntry| $ 28))
- (|getShellEntry| $ 32))))))))))))))))
+ (|getShellEntry| $ 29))
+ (|getShellEntry| $ 33))))))))))))))))
(DEFUN |EUCDOM-;principalIdeal;LR;9| (|l| $)
(PROG (|uca| |v| |u| #0=#:G1519 |vv| #1=#:G1520)
(RETURN
(SEQ (COND
- ((SPADCALL |l| NIL (|getShellEntry| $ 41))
+ ((SPADCALL |l| NIL (|getShellEntry| $ 42))
(|error| "empty list passed to principalIdeal"))
- ((SPADCALL (CDR |l|) NIL (|getShellEntry| $ 41))
+ ((SPADCALL (CDR |l|) NIL (|getShellEntry| $ 42))
(SEQ (LETT |uca|
(SPADCALL (|SPADfirst| |l|)
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 27))
|EUCDOM-;principalIdeal;LR;9|)
(EXIT (CONS (LIST (QVELT |uca| 0)) (QVELT |uca| 1)))))
- ((SPADCALL (CDR (CDR |l|)) NIL (|getShellEntry| $ 41))
+ ((SPADCALL (CDR (CDR |l|)) NIL (|getShellEntry| $ 42))
(SEQ (LETT |u|
(SPADCALL (|SPADfirst| |l|)
- (SPADCALL |l| (|getShellEntry| $ 44))
- (|getShellEntry| $ 35))
+ (SPADCALL |l| (|getShellEntry| $ 45))
+ (|getShellEntry| $ 36))
|EUCDOM-;principalIdeal;LR;9|)
(EXIT (CONS (LIST (QVELT |u| 0) (QVELT |u| 1))
(QVELT |u| 2)))))
('T
(SEQ (LETT |v|
- (SPADCALL (CDR |l|) (|getShellEntry| $ 47))
+ (SPADCALL (CDR |l|) (|getShellEntry| $ 48))
|EUCDOM-;principalIdeal;LR;9|)
(LETT |u|
(SPADCALL (|SPADfirst| |l|) (QCDR |v|)
- (|getShellEntry| $ 35))
+ (|getShellEntry| $ 36))
|EUCDOM-;principalIdeal;LR;9|)
(EXIT (CONS (CONS (QVELT |u| 0)
(PROGN
@@ -280,7 +280,7 @@
(CONS
(SPADCALL (QVELT |u| 1)
|vv|
- (|getShellEntry| $ 28))
+ (|getShellEntry| $ 29))
#0#)
|EUCDOM-;principalIdeal;LR;9|)))
(LETT #1# (CDR #1#)
@@ -294,7 +294,7 @@
(RETURN
(SEQ (COND
((SPADCALL |z| (|spadConstant| $ 19)
- (|getShellEntry| $ 50))
+ (|getShellEntry| $ 51))
(CONS 0
(PROGN
(LETT #0# NIL
@@ -318,11 +318,11 @@
|EUCDOM-;expressIdealMember;LSU;10|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))))
('T
- (SEQ (LETT |pid| (SPADCALL |l| (|getShellEntry| $ 47))
+ (SEQ (LETT |pid| (SPADCALL |l| (|getShellEntry| $ 48))
|EUCDOM-;expressIdealMember;LSU;10|)
(LETT |q|
(SPADCALL |z| (QCDR |pid|)
- (|getShellEntry| $ 36))
+ (|getShellEntry| $ 37))
|EUCDOM-;expressIdealMember;LSU;10|)
(EXIT (COND
((QEQCAR |q| 1) (CONS 1 "failed"))
@@ -349,7 +349,7 @@
(LETT #2#
(CONS
(SPADCALL (QCDR |q|) |v|
- (|getShellEntry| $ 28))
+ (|getShellEntry| $ 29))
#2#)
|EUCDOM-;expressIdealMember;LSU;10|)))
(LETT #3# (CDR #3#)
@@ -369,11 +369,11 @@
((EQL |n| 1) (CONS 0 (LIST |z|)))
('T
(SEQ (LETT |l1|
- (SPADCALL |l| (|getShellEntry| $ 57))
+ (SPADCALL |l| (|getShellEntry| $ 58))
|EUCDOM-;multiEuclidean;LSU;11|)
(LETT |l2|
(SPADCALL |l1| (QUOTIENT2 |n| 2)
- (|getShellEntry| $ 60))
+ (|getShellEntry| $ 61))
|EUCDOM-;multiEuclidean;LSU;11|)
(LETT |u|
(SPADCALL
@@ -402,7 +402,7 @@
(#4#
(LETT #3#
(SPADCALL #3# #2#
- (|getShellEntry| $ 28))
+ (|getShellEntry| $ 29))
|EUCDOM-;multiEuclidean;LSU;11|))
('T
(PROGN
@@ -415,7 +415,7 @@
(GO G190) G191 (EXIT NIL))
(COND
(#4# #3#)
- ('T (|spadConstant| $ 29))))
+ ('T (|spadConstant| $ 30))))
(PROGN
(LETT #9# NIL
|EUCDOM-;multiEuclidean;LSU;11|)
@@ -441,7 +441,7 @@
(#9#
(LETT #8#
(SPADCALL #8# #7#
- (|getShellEntry| $ 28))
+ (|getShellEntry| $ 29))
|EUCDOM-;multiEuclidean;LSU;11|))
('T
(PROGN
@@ -454,8 +454,8 @@
(GO G190) G191 (EXIT NIL))
(COND
(#9# #8#)
- ('T (|spadConstant| $ 29))))
- |z| (|getShellEntry| $ 61))
+ ('T (|spadConstant| $ 30))))
+ |z| (|getShellEntry| $ 62))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT (COND
((QEQCAR |u| 1) (CONS 1 "failed"))
@@ -463,7 +463,7 @@
(SEQ (LETT |v1|
(SPADCALL |l1|
(QCDR (QCDR |u|))
- (|getShellEntry| $ 62))
+ (|getShellEntry| $ 63))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT
(COND
@@ -474,7 +474,7 @@
(LETT |v2|
(SPADCALL |l2|
(QCAR (QCDR |u|))
- (|getShellEntry| $ 62))
+ (|getShellEntry| $ 63))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT
(COND
@@ -485,7 +485,7 @@
(SPADCALL (QCDR |v1|)
(QCDR |v2|)
(|getShellEntry| $
- 63))))))))))))))))))))))
+ 64))))))))))))))))))))))
(DEFUN |EuclideanDomain&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -493,7 +493,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|EuclideanDomain&|))
(LETT |dv$| (LIST '|EuclideanDomain&| |dv$1|) . #0#)
- (LETT $ (|newShell| 65) . #0#)
+ (LETT $ (|newShell| 66) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -509,49 +509,50 @@
(|Record| (|:| |quotient| $) (|:| |remainder| $))
(24 . |divide|) |EUCDOM-;quo;3S;2| |EUCDOM-;rem;3S;3|
(30 . |Zero|) (|Union| $ '"failed") |EUCDOM-;exquo;2SU;4|
- (34 . |unitCanonical|) (39 . |rem|) |EUCDOM-;gcd;3S;5|
+ (34 . |unitCanonical|) (39 . |not|) (44 . |rem|)
+ |EUCDOM-;gcd;3S;5|
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $))
- (45 . |unitNormal|) (50 . |one?|) (55 . *) (61 . |One|)
- (65 . -) (71 . |sizeLess?|) (77 . +)
+ (50 . |unitNormal|) (55 . |one?|) (60 . *) (66 . |One|)
+ (70 . -) (76 . |sizeLess?|) (82 . +)
(|Record| (|:| |coef1| $) (|:| |coef2| $)
(|:| |generator| $))
|EUCDOM-;extendedEuclidean;2SR;7|
- (83 . |extendedEuclidean|) (89 . |exquo|)
+ (88 . |extendedEuclidean|) (94 . |exquo|)
(|Record| (|:| |coef1| $) (|:| |coef2| $))
- (|Union| 37 '"failed") |EUCDOM-;extendedEuclidean;3SU;8|
- (|List| 6) (95 . =) (101 . |rest|) (106 . |first|)
- (111 . |second|) (|List| $)
- (|Record| (|:| |coef| 45) (|:| |generator| $))
- (116 . |principalIdeal|) (121 . |cons|)
- |EUCDOM-;principalIdeal;LR;9| (127 . =)
- (|Union| 45 '"failed") |EUCDOM-;expressIdealMember;LSU;10|
- (133 . |#|) (138 . |zero?|) (143 . |One|) (147 . =)
- (153 . |copy|) (158 . |quo|) (|Integer|) (164 . |split!|)
- (170 . |extendedEuclidean|) (177 . |multiEuclidean|)
- (183 . |concat|) |EUCDOM-;multiEuclidean;LSU;11|)
- '#(|sizeLess?| 189 |rem| 195 |quo| 201 |principalIdeal| 207
- |multiEuclidean| 212 |gcd| 218 |extendedEuclidean| 224
- |exquo| 237 |expressIdealMember| 243)
+ (|Union| 38 '"failed") |EUCDOM-;extendedEuclidean;3SU;8|
+ (|List| 6) (100 . =) (106 . |rest|) (111 . |first|)
+ (116 . |second|) (|List| $)
+ (|Record| (|:| |coef| 46) (|:| |generator| $))
+ (121 . |principalIdeal|) (126 . |cons|)
+ |EUCDOM-;principalIdeal;LR;9| (132 . =)
+ (|Union| 46 '"failed") |EUCDOM-;expressIdealMember;LSU;10|
+ (138 . |#|) (143 . |zero?|) (148 . |One|) (152 . =)
+ (158 . |copy|) (163 . |quo|) (|Integer|) (169 . |split!|)
+ (175 . |extendedEuclidean|) (182 . |multiEuclidean|)
+ (188 . |concat|) |EUCDOM-;multiEuclidean;LSU;11|)
+ '#(|sizeLess?| 194 |rem| 200 |quo| 206 |principalIdeal| 212
+ |multiEuclidean| 217 |gcd| 223 |extendedEuclidean| 229
+ |exquo| 242 |expressIdealMember| 248)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 64
+ (|makeByteWordVec2| 65
'(1 6 7 0 8 0 7 0 9 0 7 0 10 1 6 11 0
12 2 11 7 0 0 13 2 6 15 0 0 16 0 6 0
- 19 1 6 0 0 22 2 6 0 0 0 23 1 6 25 0
- 26 1 6 7 0 27 2 6 0 0 0 28 0 6 0 29 2
- 6 0 0 0 30 2 6 7 0 0 31 2 6 0 0 0 32
- 2 6 33 0 0 35 2 6 20 0 0 36 2 40 7 0
- 0 41 1 40 0 0 42 1 40 6 0 43 1 40 6 0
- 44 1 6 46 45 47 2 40 0 6 0 48 2 6 7 0
- 0 50 1 40 11 0 53 1 11 7 0 54 0 11 0
- 55 2 11 7 0 0 56 1 40 0 0 57 2 11 0 0
- 0 58 2 40 0 0 59 60 3 6 38 0 0 0 61 2
- 6 51 45 0 62 2 40 0 0 0 63 2 0 7 0 0
- 14 2 0 0 0 0 18 2 0 0 0 0 17 1 0 46
- 45 49 2 0 51 45 0 64 2 0 0 0 0 24 3 0
- 38 0 0 0 39 2 0 33 0 0 34 2 0 20 0 0
- 21 2 0 51 45 0 52)))))
+ 19 1 6 0 0 22 1 7 0 0 23 2 6 0 0 0 24
+ 1 6 26 0 27 1 6 7 0 28 2 6 0 0 0 29 0
+ 6 0 30 2 6 0 0 0 31 2 6 7 0 0 32 2 6
+ 0 0 0 33 2 6 34 0 0 36 2 6 20 0 0 37
+ 2 41 7 0 0 42 1 41 0 0 43 1 41 6 0 44
+ 1 41 6 0 45 1 6 47 46 48 2 41 0 6 0
+ 49 2 6 7 0 0 51 1 41 11 0 54 1 11 7 0
+ 55 0 11 0 56 2 11 7 0 0 57 1 41 0 0
+ 58 2 11 0 0 0 59 2 41 0 0 60 61 3 6
+ 39 0 0 0 62 2 6 52 46 0 63 2 41 0 0 0
+ 64 2 0 7 0 0 14 2 0 0 0 0 18 2 0 0 0
+ 0 17 1 0 47 46 50 2 0 52 46 0 65 2 0
+ 0 0 0 25 3 0 39 0 0 0 40 2 0 34 0 0
+ 35 2 0 20 0 0 21 2 0 52 46 0 53)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp
index 826615e8..f29249fc 100644
--- a/src/algebra/strap/FFIELDC-.lsp
+++ b/src/algebra/strap/FFIELDC-.lsp
@@ -129,7 +129,7 @@
(SEQ (COND
((SPADCALL |a| (|getShellEntry| $ 16)) 'NIL)
('T
- (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 56))
+ (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 57))
|FFIELDC-;primitive?;SB;9|)
(LETT |q| (- 2 1) |FFIELDC-;primitive?;SB;9|)
(LETT |equalone| 'NIL |FFIELDC-;primitive?;SB;9|)
@@ -148,8 +148,8 @@
(SPADCALL
(SPADCALL |a|
(QUOTIENT2 |q| (QCAR |exp|))
- (|getShellEntry| $ 58))
- (|getShellEntry| $ 59))
+ (|getShellEntry| $ 59))
+ (|getShellEntry| $ 60))
|FFIELDC-;primitive?;SB;9|)))
(LETT #0# (CDR #0#) |FFIELDC-;primitive?;SB;9|)
(GO G190) G191 (EXIT NIL))
@@ -161,12 +161,12 @@
(RETURN
(SEQ (COND
((SPADCALL |e| (|spadConstant| $ 7)
- (|getShellEntry| $ 63))
+ (|getShellEntry| $ 64))
(|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| $ 56))
+ (LETT |lof| (SPADCALL (|getShellEntry| $ 57))
|FFIELDC-;order;SPi;10|)
(SEQ (LETT |rec| NIL |FFIELDC-;order;SPi;10|)
(LETT #0# |lof| |FFIELDC-;order;SPi;10|) G190
@@ -185,8 +185,8 @@
(LETT |goon|
(SPADCALL
(SPADCALL |e| |a|
- (|getShellEntry| $ 58))
- (|getShellEntry| $ 59))
+ (|getShellEntry| $ 59))
+ (|getShellEntry| $ 60))
|FFIELDC-;order;SPi;10|)
(SEQ (LETT |j| 0 |FFIELDC-;order;SPi;10|)
(LETT #1# (- (QCDR |rec|) 2)
@@ -206,8 +206,8 @@
(LETT |goon|
(SPADCALL
(SPADCALL |e| |a|
- (|getShellEntry| $ 58))
- (|getShellEntry| $ 59))
+ (|getShellEntry| $ 59))
+ (|getShellEntry| $ 60))
|FFIELDC-;order;SPi;10|)))
(LETT |j| (QSADD1 |j|)
|FFIELDC-;order;SPi;10|)
@@ -229,13 +229,13 @@
((SPADCALL |b| (|getShellEntry| $ 16))
(|error| "discreteLog: logarithm of zero"))
('T
- (SEQ (LETT |faclist| (SPADCALL (|getShellEntry| $ 56))
+ (SEQ (LETT |faclist| (SPADCALL (|getShellEntry| $ 57))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |a| |b| |FFIELDC-;discreteLog;SNni;11|)
- (LETT |gen| (SPADCALL (|getShellEntry| $ 67))
+ (LETT |gen| (SPADCALL (|getShellEntry| $ 68))
|FFIELDC-;discreteLog;SNni;11|)
(EXIT (COND
- ((SPADCALL |b| |gen| (|getShellEntry| $ 63))
+ ((SPADCALL |b| |gen| (|getShellEntry| $ 64))
1)
('T
(SEQ (LETT |disclog| 0
@@ -277,15 +277,15 @@
|FFIELDC-;discreteLog;SNni;11|)
(LETT |exptable|
(SPADCALL |fac|
- (|getShellEntry| $ 69))
+ (|getShellEntry| $ 70))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |n|
(SPADCALL |exptable|
- (|getShellEntry| $ 70))
+ (|getShellEntry| $ 71))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |c|
(SPADCALL |a| |exp|
- (|getShellEntry| $ 58))
+ (|getShellEntry| $ 59))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |end|
(QUOTIENT2 (- |fac| 1) |n|)
@@ -309,7 +309,7 @@
(SPADCALL |c|
(|getShellEntry| $ 11))
|exptable|
- (|getShellEntry| $ 73))
+ (|getShellEntry| $ 74))
|FFIELDC-;discreteLog;SNni;11|)
(EXIT
(COND
@@ -333,9 +333,9 @@
|groupord| |fac|)
(- |n|))
(|getShellEntry| $
- 58))
+ 59))
(|getShellEntry| $
- 79))
+ 80))
|FFIELDC-;discreteLog;SNni;11|)))))
(LETT |i| (QSADD1 |i|)
|FFIELDC-;discreteLog;SNni;11|)
@@ -356,9 +356,9 @@
(SPADCALL |gen|
(- |disc1|)
(|getShellEntry| $
- 58))
+ 59))
(|getShellEntry| $
- 79))
+ 80))
|FFIELDC-;discreteLog;SNni;11|))))
('T
(|error|
@@ -379,14 +379,14 @@
(SEQ (EXIT (COND
((SPADCALL |b| (|getShellEntry| $ 16))
(SEQ (SPADCALL "discreteLog: logarithm of zero"
- (|getShellEntry| $ 85))
+ (|getShellEntry| $ 86))
(EXIT (CONS 1 "failed"))))
((SPADCALL |logbase| (|getShellEntry| $ 16))
(SEQ (SPADCALL
"discreteLog: logarithm to base zero"
- (|getShellEntry| $ 85))
+ (|getShellEntry| $ 86))
(EXIT (CONS 1 "failed"))))
- ((SPADCALL |b| |logbase| (|getShellEntry| $ 63))
+ ((SPADCALL |b| |logbase| (|getShellEntry| $ 64))
(CONS 0 1))
('T
(COND
@@ -399,14 +399,14 @@
(|getShellEntry| $ 19)))))
(SEQ (SPADCALL
"discreteLog: second argument not in cyclic group generated by first argument"
- (|getShellEntry| $ 85))
+ (|getShellEntry| $ 86))
(EXIT (CONS 1 "failed"))))
('T
(SEQ (LETT |faclist|
(SPADCALL
(SPADCALL |groupord|
- (|getShellEntry| $ 89))
- (|getShellEntry| $ 91))
+ (|getShellEntry| $ 90))
+ (|getShellEntry| $ 92))
|FFIELDC-;discreteLog;2SU;12|)
(LETT |a| |b|
|FFIELDC-;discreteLog;2SU;12|)
@@ -433,7 +433,7 @@
(LETT |primroot|
(SPADCALL |logbase|
(QUOTIENT2 |groupord| |fac|)
- (|getShellEntry| $ 58))
+ (|getShellEntry| $ 59))
|FFIELDC-;discreteLog;2SU;12|)
(EXIT
(SEQ
@@ -452,9 +452,9 @@
(LETT |rhoHelp|
(SPADCALL |primroot|
(SPADCALL |a| |exp|
- (|getShellEntry| $ 58))
+ (|getShellEntry| $ 59))
|fac|
- (|getShellEntry| $ 93))
+ (|getShellEntry| $ 94))
|FFIELDC-;discreteLog;2SU;12|)
(EXIT
(COND
@@ -482,8 +482,8 @@
(SPADCALL |logbase|
(- |rho|)
(|getShellEntry| $
- 58))
- (|getShellEntry| $ 79))
+ 59))
+ (|getShellEntry| $ 80))
|FFIELDC-;discreteLog;2SU;12|)))))))
(LETT |t| (QSADD1 |t|)
|FFIELDC-;discreteLog;2SU;12|)
@@ -495,25 +495,25 @@
#2# (EXIT #2#)))))
(DEFUN |FFIELDC-;squareFreePolynomial| (|f| $)
- (SPADCALL |f| (|getShellEntry| $ 98)))
+ (SPADCALL |f| (|getShellEntry| $ 99)))
(DEFUN |FFIELDC-;factorPolynomial| (|f| $)
- (SPADCALL |f| (|getShellEntry| $ 100)))
+ (SPADCALL |f| (|getShellEntry| $ 101)))
(DEFUN |FFIELDC-;factorSquareFreePolynomial| (|f| $)
(PROG (|flist| |u| #0=#:G1521 #1=#:G1510 #2=#:G1508 #3=#:G1509)
(RETURN
(SEQ (COND
- ((SPADCALL |f| (|spadConstant| $ 101)
- (|getShellEntry| $ 102))
- (|spadConstant| $ 103))
+ ((SPADCALL |f| (|spadConstant| $ 102)
+ (|getShellEntry| $ 103))
+ (|spadConstant| $ 104))
('T
(SEQ (LETT |flist|
- (SPADCALL |f| 'T (|getShellEntry| $ 107))
+ (SPADCALL |f| 'T (|getShellEntry| $ 108))
|FFIELDC-;factorSquareFreePolynomial|)
(EXIT (SPADCALL
(SPADCALL (QCAR |flist|)
- (|getShellEntry| $ 108))
+ (|getShellEntry| $ 109))
(PROGN
(LETT #3# NIL
|FFIELDC-;factorSquareFreePolynomial|)
@@ -535,13 +535,13 @@
(LETT #1#
(SPADCALL (QCAR |u|)
(QCDR |u|)
- (|getShellEntry| $ 109))
+ (|getShellEntry| $ 110))
|FFIELDC-;factorSquareFreePolynomial|)
(COND
(#3#
(LETT #2#
(SPADCALL #2# #1#
- (|getShellEntry| $ 110))
+ (|getShellEntry| $ 111))
|FFIELDC-;factorSquareFreePolynomial|))
('T
(PROGN
@@ -554,11 +554,11 @@
(GO G190) G191 (EXIT NIL))
(COND
(#3# #2#)
- ('T (|spadConstant| $ 111))))
- (|getShellEntry| $ 112))))))))))
+ ('T (|spadConstant| $ 112))))
+ (|getShellEntry| $ 113))))))))))
(DEFUN |FFIELDC-;gcdPolynomial;3Sup;16| (|f| |g| $)
- (SPADCALL |f| |g| (|getShellEntry| $ 114)))
+ (SPADCALL |f| |g| (|getShellEntry| $ 115)))
(DEFUN |FiniteFieldCategory&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -566,7 +566,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|FiniteFieldCategory&|))
(LETT |dv$| (LIST '|FiniteFieldCategory&| |dv$1|) . #0#)
- (LETT $ (|newShell| 117) . #0#)
+ (LETT $ (|newShell| 118) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -593,43 +593,44 @@
(91 . |size|) (95 . -)
(|Union| '"prime" '"polynomial" '"normal" '"cyclic")
(101 . |representationType|) (105 . =) (111 . |false|)
- (115 . =) |FFIELDC-;createPrimitiveElement;S;8|
+ (115 . |not|) (120 . =)
+ |FFIELDC-;createPrimitiveElement;S;8|
(|Record| (|:| |factor| 20) (|:| |exponent| 20))
- (|List| 54) (121 . |factorsOfCyclicGroupSize|)
- (125 . |quo|) (131 . **) (137 . |one?|)
- |FFIELDC-;primitive?;SB;9| (142 . |Zero|) (146 . |Zero|)
- (150 . =) (|SingleInteger|) (156 . |Zero|)
- |FFIELDC-;order;SPi;10| (160 . |primitiveElement|)
- (|Table| 10 39) (164 . |tableForDiscreteLogarithm|)
- (169 . |#|) (174 . |One|) (|Union| 39 '"failed")
- (178 . |search|) (184 . |true|) (188 . *) (194 . +)
- (200 . *) (206 . -) (211 . *) (217 . +)
+ (|List| 55) (126 . |factorsOfCyclicGroupSize|)
+ (130 . |quo|) (136 . **) (142 . |one?|)
+ |FFIELDC-;primitive?;SB;9| (147 . |Zero|) (151 . |Zero|)
+ (155 . =) (|SingleInteger|) (161 . |Zero|)
+ |FFIELDC-;order;SPi;10| (165 . |primitiveElement|)
+ (|Table| 10 39) (169 . |tableForDiscreteLogarithm|)
+ (174 . |#|) (179 . |One|) (|Union| 39 '"failed")
+ (183 . |search|) (189 . |true|) (193 . *) (199 . +)
+ (205 . *) (211 . -) (216 . *) (222 . +)
|FFIELDC-;discreteLog;SNni;11| (|Void|) (|String|)
- (|OutputForm|) (223 . |messagePrint|) (228 . |rem|)
- (234 . |zero?|) (|Factored| $) (239 . |factor|)
- (|Factored| 20) (244 . |factors|)
+ (|OutputForm|) (228 . |messagePrint|) (233 . |rem|)
+ (239 . |zero?|) (|Factored| $) (244 . |factor|)
+ (|Factored| 20) (249 . |factors|)
(|DiscreteLogarithmPackage| 6)
- (249 . |shanksDiscLogAlgorithm|)
+ (254 . |shanksDiscLogAlgorithm|)
|FFIELDC-;discreteLog;2SU;12|
- (|SparseUnivariatePolynomial| 6) (|Factored| 95)
- (|UnivariatePolynomialSquareFree| 6 95)
- (256 . |squareFree|) (|DistinctDegreeFactorize| 6 95)
- (261 . |factor|) (266 . |Zero|) (270 . =) (276 . |Zero|)
- (|Record| (|:| |irr| 95) (|:| |pow| 20)) (|List| 104)
- (|Record| (|:| |cont| 6) (|:| |factors| 105))
- (280 . |distdfact|) (286 . |coerce|) (291 . |primeFactor|)
- (297 . *) (303 . |One|) (307 . *) (|EuclideanDomain&| 95)
- (313 . |gcd|) (|SparseUnivariatePolynomial| $)
+ (|SparseUnivariatePolynomial| 6) (|Factored| 96)
+ (|UnivariatePolynomialSquareFree| 6 96)
+ (261 . |squareFree|) (|DistinctDegreeFactorize| 6 96)
+ (266 . |factor|) (271 . |Zero|) (275 . =) (281 . |Zero|)
+ (|Record| (|:| |irr| 96) (|:| |pow| 20)) (|List| 105)
+ (|Record| (|:| |cont| 6) (|:| |factors| 106))
+ (285 . |distdfact|) (291 . |coerce|) (296 . |primeFactor|)
+ (302 . *) (308 . |One|) (312 . *) (|EuclideanDomain&| 96)
+ (318 . |gcd|) (|SparseUnivariatePolynomial| $)
|FFIELDC-;gcdPolynomial;3Sup;16|)
- '#(|primitive?| 319 |order| 324 |nextItem| 334 |init| 339
- |gcdPolynomial| 343 |discreteLog| 349 |differentiate| 360
- |createPrimitiveElement| 365 |conditionP| 369 |charthRoot|
- 374)
+ '#(|primitive?| 324 |order| 329 |nextItem| 339 |init| 344
+ |gcdPolynomial| 348 |discreteLog| 354 |differentiate| 365
+ |createPrimitiveElement| 370 |conditionP| 374 |charthRoot|
+ 379)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 116
+ (|makeByteWordVec2| 117
'(0 6 0 7 1 6 10 0 11 0 10 0 12 2 10 0
0 0 13 1 6 0 10 14 1 6 15 0 16 1 6 10
0 19 1 21 0 20 22 1 26 25 0 27 1 25
@@ -637,23 +638,24 @@
1 6 0 0 32 2 24 0 33 0 34 0 15 39 40
0 20 39 41 2 39 0 0 0 42 2 6 0 0 39
43 0 6 39 46 2 20 0 0 0 47 0 6 48 49
- 2 48 15 0 0 50 0 15 0 51 2 10 15 0 0
- 52 0 6 55 56 2 20 0 0 0 57 2 6 0 0 20
- 58 1 6 15 0 59 0 39 0 61 0 20 0 62 2
- 6 15 0 0 63 0 64 0 65 0 6 0 67 1 6 68
- 20 69 1 68 39 0 70 0 39 0 71 2 68 72
- 10 0 73 0 15 0 74 2 39 0 39 0 75 2 39
- 0 0 0 76 2 20 0 20 0 77 1 20 0 0 78 2
- 6 0 0 0 79 2 20 0 0 0 80 1 84 82 83
- 85 2 39 0 0 0 86 1 39 15 0 87 1 20 88
- 0 89 1 90 55 0 91 3 92 72 6 6 39 93 1
- 97 96 95 98 1 99 96 95 100 0 95 0 101
- 2 95 15 0 0 102 0 96 0 103 2 99 106
- 95 15 107 1 95 0 6 108 2 96 0 95 20
- 109 2 96 0 0 0 110 0 96 0 111 2 96 0
- 95 0 112 2 113 0 0 0 114 1 0 15 0 60
- 1 0 10 0 66 1 0 21 0 23 1 0 17 0 18 0
- 0 0 9 2 0 115 115 115 116 1 0 39 0 81
- 2 0 72 0 0 94 1 0 0 0 8 0 0 0 53 1 0
- 36 37 38 1 0 0 0 44 1 0 17 0 45)))))
+ 2 48 15 0 0 50 0 15 0 51 1 15 0 0 52
+ 2 10 15 0 0 53 0 6 56 57 2 20 0 0 0
+ 58 2 6 0 0 20 59 1 6 15 0 60 0 39 0
+ 62 0 20 0 63 2 6 15 0 0 64 0 65 0 66
+ 0 6 0 68 1 6 69 20 70 1 69 39 0 71 0
+ 39 0 72 2 69 73 10 0 74 0 15 0 75 2
+ 39 0 39 0 76 2 39 0 0 0 77 2 20 0 20
+ 0 78 1 20 0 0 79 2 6 0 0 0 80 2 20 0
+ 0 0 81 1 85 83 84 86 2 39 0 0 0 87 1
+ 39 15 0 88 1 20 89 0 90 1 91 56 0 92
+ 3 93 73 6 6 39 94 1 98 97 96 99 1 100
+ 97 96 101 0 96 0 102 2 96 15 0 0 103
+ 0 97 0 104 2 100 107 96 15 108 1 96 0
+ 6 109 2 97 0 96 20 110 2 97 0 0 0 111
+ 0 97 0 112 2 97 0 96 0 113 2 114 0 0
+ 0 115 1 0 15 0 61 1 0 10 0 67 1 0 21
+ 0 23 1 0 17 0 18 0 0 0 9 2 0 116 116
+ 116 117 1 0 39 0 82 2 0 73 0 0 95 1 0
+ 0 0 8 0 0 0 54 1 0 36 37 38 1 0 0 0
+ 44 1 0 17 0 45)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/INS-.lsp b/src/algebra/strap/INS-.lsp
index 2ac58e9a..ff98f1df 100644
--- a/src/algebra/strap/INS-.lsp
+++ b/src/algebra/strap/INS-.lsp
@@ -103,19 +103,19 @@
(NOT (SPADCALL |x| (|getShellEntry| $ 13))))
(DEFUN |INS-;positive?;SB;4| (|x| $)
- (SPADCALL (|spadConstant| $ 10) |x| (|getShellEntry| $ 15)))
+ (SPADCALL (|spadConstant| $ 10) |x| (|getShellEntry| $ 16)))
(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| $ 19))
+ (|getShellEntry| $ 20))
(|getShellEntry| $ 13)))
(DEFUN |INS-;mask;2S;7| (|n| $)
- (SPADCALL (SPADCALL (|spadConstant| $ 21) |n| (|getShellEntry| $ 19))
- (|getShellEntry| $ 22)))
+ (SPADCALL (SPADCALL (|spadConstant| $ 22) |n| (|getShellEntry| $ 20))
+ (|getShellEntry| $ 23)))
(DEFUN |INS-;rational?;SB;8| (|x| $) (DECLARE (IGNORE $)) 'T)
@@ -123,148 +123,148 @@
(PROG (#0=#:G1426 #1=#:G1427)
(RETURN
(COND
- ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 26))
+ ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 27))
(|error| "euclideanSize called on zero"))
- ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 15))
- (PROG1 (LETT #0# (- (SPADCALL |x| (|getShellEntry| $ 28)))
+ ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 16))
+ (PROG1 (LETT #0# (- (SPADCALL |x| (|getShellEntry| $ 29)))
|INS-;euclideanSize;SNni;9|)
(|check-subtype| (COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#)))
('T
- (PROG1 (LETT #1# (SPADCALL |x| (|getShellEntry| $ 28))
+ (PROG1 (LETT #1# (SPADCALL |x| (|getShellEntry| $ 29))
|INS-;euclideanSize;SNni;9|)
(|check-subtype| (COND ((< #1# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #1#)))))))
(DEFUN |INS-;convert;SF;10| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 28))
- (|getShellEntry| $ 32)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 29))
+ (|getShellEntry| $ 33)))
(DEFUN |INS-;convert;SDf;11| (|x| $)
- (FLOAT (SPADCALL |x| (|getShellEntry| $ 28)) |$DoubleFloatMaximum|))
+ (FLOAT (SPADCALL |x| (|getShellEntry| $ 29)) |$DoubleFloatMaximum|))
(DEFUN |INS-;convert;SIf;12| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 28))
- (|getShellEntry| $ 38)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 29))
+ (|getShellEntry| $ 39)))
(DEFUN |INS-;retract;SI;13| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 28)))
+ (SPADCALL |x| (|getShellEntry| $ 29)))
(DEFUN |INS-;convert;SP;14| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 28))
- (|getShellEntry| $ 42)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 29))
+ (|getShellEntry| $ 43)))
(DEFUN |INS-;factor;SF;15| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 46)))
+ (SPADCALL |x| (|getShellEntry| $ 47)))
(DEFUN |INS-;squareFree;SF;16| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 49)))
+ (SPADCALL |x| (|getShellEntry| $ 50)))
(DEFUN |INS-;prime?;SB;17| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 52)))
+ (SPADCALL |x| (|getShellEntry| $ 53)))
(DEFUN |INS-;factorial;2S;18| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 55)))
+ (SPADCALL |x| (|getShellEntry| $ 56)))
(DEFUN |INS-;binomial;3S;19| (|n| |m| $)
- (SPADCALL |n| |m| (|getShellEntry| $ 57)))
+ (SPADCALL |n| |m| (|getShellEntry| $ 58)))
(DEFUN |INS-;permutation;3S;20| (|n| |m| $)
- (SPADCALL |n| |m| (|getShellEntry| $ 59)))
+ (SPADCALL |n| |m| (|getShellEntry| $ 60)))
(DEFUN |INS-;retractIfCan;SU;21| (|x| $)
- (CONS 0 (SPADCALL |x| (|getShellEntry| $ 28))))
+ (CONS 0 (SPADCALL |x| (|getShellEntry| $ 29))))
(DEFUN |INS-;init;S;22| ($) (|spadConstant| $ 10))
(DEFUN |INS-;nextItem;SU;23| (|n| $)
(COND
- ((SPADCALL |n| (|getShellEntry| $ 64))
- (CONS 0 (|spadConstant| $ 21)))
- ((SPADCALL (|spadConstant| $ 10) |n| (|getShellEntry| $ 15))
- (CONS 0 (SPADCALL |n| (|getShellEntry| $ 18))))
+ ((SPADCALL |n| (|getShellEntry| $ 65))
+ (CONS 0 (|spadConstant| $ 22)))
+ ((SPADCALL (|spadConstant| $ 10) |n| (|getShellEntry| $ 16))
+ (CONS 0 (SPADCALL |n| (|getShellEntry| $ 19))))
('T
(CONS 0
- (SPADCALL (|spadConstant| $ 21) |n| (|getShellEntry| $ 65))))))
+ (SPADCALL (|spadConstant| $ 22) |n| (|getShellEntry| $ 66))))))
(DEFUN |INS-;patternMatch;SP2Pmr;24| (|x| |p| |l| $)
- (SPADCALL |x| |p| |l| (|getShellEntry| $ 70)))
+ (SPADCALL |x| |p| |l| (|getShellEntry| $ 71)))
(DEFUN |INS-;rational;SF;25| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 28))
- (|getShellEntry| $ 74)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 29))
+ (|getShellEntry| $ 75)))
(DEFUN |INS-;rationalIfCan;SU;26| (|x| $)
(CONS 0
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 28))
- (|getShellEntry| $ 74))))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 29))
+ (|getShellEntry| $ 75))))
(DEFUN |INS-;symmetricRemainder;3S;27| (|x| |n| $)
(PROG (|r|)
(RETURN
- (SEQ (LETT |r| (SPADCALL |x| |n| (|getShellEntry| $ 78))
+ (SEQ (LETT |r| (SPADCALL |x| |n| (|getShellEntry| $ 79))
|INS-;symmetricRemainder;3S;27|)
(EXIT (COND
((SPADCALL |r| (|spadConstant| $ 10)
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 27))
|r|)
('T
(SEQ (COND
((SPADCALL |n| (|spadConstant| $ 10)
- (|getShellEntry| $ 15))
+ (|getShellEntry| $ 16))
(LETT |n|
- (SPADCALL |n| (|getShellEntry| $ 18))
+ (SPADCALL |n| (|getShellEntry| $ 19))
|INS-;symmetricRemainder;3S;27|)))
(EXIT (COND
((SPADCALL (|spadConstant| $ 10) |r|
- (|getShellEntry| $ 15))
+ (|getShellEntry| $ 16))
(COND
((SPADCALL |n|
(SPADCALL 2 |r|
- (|getShellEntry| $ 80))
- (|getShellEntry| $ 15))
+ (|getShellEntry| $ 81))
+ (|getShellEntry| $ 16))
(SPADCALL |r| |n|
- (|getShellEntry| $ 65)))
+ (|getShellEntry| $ 66)))
('T |r|)))
((NOT (SPADCALL (|spadConstant| $ 10)
(SPADCALL
(SPADCALL 2 |r|
- (|getShellEntry| $ 80))
- |n| (|getShellEntry| $ 81))
- (|getShellEntry| $ 15)))
+ (|getShellEntry| $ 81))
+ |n| (|getShellEntry| $ 82))
+ (|getShellEntry| $ 16)))
(SPADCALL |r| |n|
- (|getShellEntry| $ 81)))
+ (|getShellEntry| $ 82)))
('T |r|)))))))))))
(DEFUN |INS-;invmod;3S;28| (|a| |b| $)
(PROG (|q| |r| |r1| |c| |c1| |d| |d1|)
(RETURN
(SEQ (COND
- ((SPADCALL |a| (|getShellEntry| $ 83))
- (LETT |a| (SPADCALL |a| |b| (|getShellEntry| $ 84))
+ ((SPADCALL |a| (|getShellEntry| $ 84))
+ (LETT |a| (SPADCALL |a| |b| (|getShellEntry| $ 85))
|INS-;invmod;3S;28|)))
(LETT |c| |a| |INS-;invmod;3S;28|)
- (LETT |c1| (|spadConstant| $ 21) |INS-;invmod;3S;28|)
+ (LETT |c1| (|spadConstant| $ 22) |INS-;invmod;3S;28|)
(LETT |d| |b| |INS-;invmod;3S;28|)
(LETT |d1| (|spadConstant| $ 10) |INS-;invmod;3S;28|)
(SEQ G190
(COND
- ((NULL (NOT (SPADCALL |d| (|getShellEntry| $ 64))))
+ ((NULL (NOT (SPADCALL |d| (|getShellEntry| $ 65))))
(GO G191)))
(SEQ (LETT |q|
- (SPADCALL |c| |d| (|getShellEntry| $ 85))
+ (SPADCALL |c| |d| (|getShellEntry| $ 86))
|INS-;invmod;3S;28|)
(LETT |r|
(SPADCALL |c|
(SPADCALL |q| |d|
- (|getShellEntry| $ 86))
- (|getShellEntry| $ 65))
+ (|getShellEntry| $ 87))
+ (|getShellEntry| $ 66))
|INS-;invmod;3S;28|)
(LETT |r1|
(SPADCALL |c1|
(SPADCALL |q| |d1|
- (|getShellEntry| $ 86))
- (|getShellEntry| $ 65))
+ (|getShellEntry| $ 87))
+ (|getShellEntry| $ 66))
|INS-;invmod;3S;28|)
(LETT |c| |d| |INS-;invmod;3S;28|)
(LETT |c1| |d1| |INS-;invmod;3S;28|)
@@ -272,29 +272,29 @@
(EXIT (LETT |d1| |r1| |INS-;invmod;3S;28|)))
NIL (GO G190) G191 (EXIT NIL))
(COND
- ((NOT (SPADCALL |c| (|getShellEntry| $ 87)))
+ ((NOT (SPADCALL |c| (|getShellEntry| $ 88)))
(EXIT (|error| "inverse does not exist"))))
(EXIT (COND
- ((SPADCALL |c1| (|getShellEntry| $ 83))
- (SPADCALL |c1| |b| (|getShellEntry| $ 81)))
+ ((SPADCALL |c1| (|getShellEntry| $ 84))
+ (SPADCALL |c1| |b| (|getShellEntry| $ 82)))
('T |c1|)))))))
(DEFUN |INS-;powmod;4S;29| (|x| |n| |p| $)
(PROG (|y| #0=#:G1484 |z|)
(RETURN
(SEQ (EXIT (SEQ (COND
- ((SPADCALL |x| (|getShellEntry| $ 83))
+ ((SPADCALL |x| (|getShellEntry| $ 84))
(LETT |x|
(SPADCALL |x| |p|
- (|getShellEntry| $ 84))
+ (|getShellEntry| $ 85))
|INS-;powmod;4S;29|)))
(EXIT (COND
- ((SPADCALL |x| (|getShellEntry| $ 64))
+ ((SPADCALL |x| (|getShellEntry| $ 65))
(|spadConstant| $ 10))
- ((SPADCALL |n| (|getShellEntry| $ 64))
- (|spadConstant| $ 21))
+ ((SPADCALL |n| (|getShellEntry| $ 65))
+ (|spadConstant| $ 22))
('T
- (SEQ (LETT |y| (|spadConstant| $ 21)
+ (SEQ (LETT |y| (|spadConstant| $ 22)
|INS-;powmod;4S;29|)
(LETT |z| |x| |INS-;powmod;4S;29|)
(EXIT
@@ -305,7 +305,7 @@
(|getShellEntry| $ 13))
(LETT |y|
(SPADCALL |y| |z| |p|
- (|getShellEntry| $ 89))
+ (|getShellEntry| $ 90))
|INS-;powmod;4S;29|)))
(EXIT
(COND
@@ -313,11 +313,11 @@
(LETT |n|
(SPADCALL |n|
(SPADCALL
- (|spadConstant| $ 21)
- (|getShellEntry| $ 18))
- (|getShellEntry| $ 19))
+ (|spadConstant| $ 22)
+ (|getShellEntry| $ 19))
+ (|getShellEntry| $ 20))
|INS-;powmod;4S;29|)
- (|getShellEntry| $ 64))
+ (|getShellEntry| $ 65))
(PROGN
(LETT #0# |y|
|INS-;powmod;4S;29|)
@@ -325,7 +325,7 @@
('T
(LETT |z|
(SPADCALL |z| |z| |p|
- (|getShellEntry| $ 89))
+ (|getShellEntry| $ 90))
|INS-;powmod;4S;29|)))))
NIL (GO G190) G191 (EXIT NIL)))))))))
#0# (EXIT #0#)))))
@@ -336,7 +336,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|IntegerNumberSystem&|))
(LETT |dv$| (LIST '|IntegerNumberSystem&| |dv$1|) . #0#)
- (LETT $ (|newShell| 91) . #0#)
+ (LETT $ (|newShell| 92) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -349,70 +349,70 @@
(|NonNegativeInteger|) (0 . |Zero|)
|INS-;characteristic;Nni;1| (4 . |Zero|)
|INS-;differentiate;2S;2| (|Boolean|) (8 . |odd?|)
- |INS-;even?;SB;3| (13 . <) |INS-;positive?;SB;4|
- |INS-;copy;2S;5| (19 . -) (24 . |shift|) |INS-;bit?;2SB;6|
- (30 . |One|) (34 . |dec|) |INS-;mask;2S;7| (39 . |true|)
- |INS-;rational?;SB;8| (43 . =) (|Integer|)
- (49 . |convert|) (54 . -) |INS-;euclideanSize;SNni;9|
- (|Float|) (59 . |coerce|) |INS-;convert;SF;10|
- (|DoubleFloat|) (64 . |coerce|) |INS-;convert;SDf;11|
- (|InputForm|) (69 . |convert|) |INS-;convert;SIf;12|
- |INS-;retract;SI;13| (|Pattern| 27) (74 . |coerce|)
- |INS-;convert;SP;14| (|Factored| 6)
- (|IntegerFactorizationPackage| 6) (79 . |factor|)
- (|Factored| $) |INS-;factor;SF;15| (84 . |squareFree|)
+ (13 . |not|) |INS-;even?;SB;3| (18 . <)
+ |INS-;positive?;SB;4| |INS-;copy;2S;5| (24 . -)
+ (29 . |shift|) |INS-;bit?;2SB;6| (35 . |One|) (39 . |dec|)
+ |INS-;mask;2S;7| (44 . |true|) |INS-;rational?;SB;8|
+ (48 . =) (|Integer|) (54 . |convert|) (59 . -)
+ |INS-;euclideanSize;SNni;9| (|Float|) (64 . |coerce|)
+ |INS-;convert;SF;10| (|DoubleFloat|) (69 . |coerce|)
+ |INS-;convert;SDf;11| (|InputForm|) (74 . |convert|)
+ |INS-;convert;SIf;12| |INS-;retract;SI;13| (|Pattern| 28)
+ (79 . |coerce|) |INS-;convert;SP;14| (|Factored| 6)
+ (|IntegerFactorizationPackage| 6) (84 . |factor|)
+ (|Factored| $) |INS-;factor;SF;15| (89 . |squareFree|)
|INS-;squareFree;SF;16| (|IntegerPrimesPackage| 6)
- (89 . |prime?|) |INS-;prime?;SB;17|
- (|IntegerCombinatoricFunctions| 6) (94 . |factorial|)
- |INS-;factorial;2S;18| (99 . |binomial|)
- |INS-;binomial;3S;19| (105 . |permutation|)
- |INS-;permutation;3S;20| (|Union| 27 '"failed")
- |INS-;retractIfCan;SU;21| |INS-;init;S;22| (111 . |zero?|)
- (116 . -) (|Union| $ '"failed") |INS-;nextItem;SU;23|
- (|PatternMatchResult| 27 6)
+ (94 . |prime?|) |INS-;prime?;SB;17|
+ (|IntegerCombinatoricFunctions| 6) (99 . |factorial|)
+ |INS-;factorial;2S;18| (104 . |binomial|)
+ |INS-;binomial;3S;19| (110 . |permutation|)
+ |INS-;permutation;3S;20| (|Union| 28 '"failed")
+ |INS-;retractIfCan;SU;21| |INS-;init;S;22| (116 . |zero?|)
+ (121 . -) (|Union| $ '"failed") |INS-;nextItem;SU;23|
+ (|PatternMatchResult| 28 6)
(|PatternMatchIntegerNumberSystem| 6)
- (122 . |patternMatch|) (|PatternMatchResult| 27 $)
- |INS-;patternMatch;SP2Pmr;24| (|Fraction| 27)
- (129 . |coerce|) |INS-;rational;SF;25|
- (|Union| 73 '"failed") |INS-;rationalIfCan;SU;26|
- (134 . |rem|) (|PositiveInteger|) (140 . *) (146 . +)
- |INS-;symmetricRemainder;3S;27| (152 . |negative?|)
- (157 . |positiveRemainder|) (163 . |quo|) (169 . *)
- (175 . |one?|) |INS-;invmod;3S;28| (180 . |mulmod|)
+ (127 . |patternMatch|) (|PatternMatchResult| 28 $)
+ |INS-;patternMatch;SP2Pmr;24| (|Fraction| 28)
+ (134 . |coerce|) |INS-;rational;SF;25|
+ (|Union| 74 '"failed") |INS-;rationalIfCan;SU;26|
+ (139 . |rem|) (|PositiveInteger|) (145 . *) (151 . +)
+ |INS-;symmetricRemainder;3S;27| (157 . |negative?|)
+ (162 . |positiveRemainder|) (168 . |quo|) (174 . *)
+ (180 . |one?|) |INS-;invmod;3S;28| (185 . |mulmod|)
|INS-;powmod;4S;29|)
- '#(|symmetricRemainder| 187 |squareFree| 193 |retractIfCan|
- 198 |retract| 203 |rationalIfCan| 208 |rational?| 213
- |rational| 218 |prime?| 223 |powmod| 228 |positive?| 235
- |permutation| 240 |patternMatch| 246 |nextItem| 253 |mask|
- 258 |invmod| 263 |init| 269 |factorial| 273 |factor| 278
- |even?| 283 |euclideanSize| 288 |differentiate| 293 |copy|
- 298 |convert| 303 |characteristic| 323 |bit?| 327
- |binomial| 333)
+ '#(|symmetricRemainder| 192 |squareFree| 198 |retractIfCan|
+ 203 |retract| 208 |rationalIfCan| 213 |rational?| 218
+ |rational| 223 |prime?| 228 |powmod| 233 |positive?| 240
+ |permutation| 245 |patternMatch| 251 |nextItem| 258 |mask|
+ 263 |invmod| 268 |init| 274 |factorial| 278 |factor| 283
+ |even?| 288 |euclideanSize| 293 |differentiate| 298 |copy|
+ 303 |convert| 308 |characteristic| 328 |bit?| 332
+ |binomial| 338)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 90
- '(0 7 0 8 0 6 0 10 1 6 12 0 13 2 6 12 0
- 0 15 1 6 0 0 18 2 6 0 0 0 19 0 6 0 21
- 1 6 0 0 22 0 12 0 24 2 6 12 0 0 26 1
- 6 27 0 28 1 27 0 0 29 1 31 0 27 32 1
- 34 0 27 35 1 37 0 27 38 1 41 0 27 42
- 1 45 44 6 46 1 45 44 6 49 1 51 12 6
- 52 1 54 6 6 55 2 54 6 6 6 57 2 54 6 6
- 6 59 1 6 12 0 64 2 6 0 0 0 65 3 69 68
- 6 41 68 70 1 73 0 27 74 2 6 0 0 0 78
- 2 6 0 79 0 80 2 6 0 0 0 81 1 6 12 0
- 83 2 6 0 0 0 84 2 6 0 0 0 85 2 6 0 0
- 0 86 1 6 12 0 87 3 6 0 0 0 0 89 2 0 0
- 0 0 82 1 0 47 0 50 1 0 61 0 62 1 0 27
- 0 40 1 0 76 0 77 1 0 12 0 25 1 0 73 0
- 75 1 0 12 0 53 3 0 0 0 0 0 90 1 0 12
- 0 16 2 0 0 0 0 60 3 0 71 0 41 71 72 1
- 0 66 0 67 1 0 0 0 23 2 0 0 0 0 88 0 0
- 0 63 1 0 0 0 56 1 0 47 0 48 1 0 12 0
- 14 1 0 7 0 30 1 0 0 0 11 1 0 0 0 17 1
- 0 34 0 36 1 0 31 0 33 1 0 41 0 43 1 0
- 37 0 39 0 0 7 9 2 0 12 0 0 20 2 0 0 0
- 0 58)))))
+ (|makeByteWordVec2| 91
+ '(0 7 0 8 0 6 0 10 1 6 12 0 13 1 12 0 0
+ 14 2 6 12 0 0 16 1 6 0 0 19 2 6 0 0 0
+ 20 0 6 0 22 1 6 0 0 23 0 12 0 25 2 6
+ 12 0 0 27 1 6 28 0 29 1 28 0 0 30 1
+ 32 0 28 33 1 35 0 28 36 1 38 0 28 39
+ 1 42 0 28 43 1 46 45 6 47 1 46 45 6
+ 50 1 52 12 6 53 1 55 6 6 56 2 55 6 6
+ 6 58 2 55 6 6 6 60 1 6 12 0 65 2 6 0
+ 0 0 66 3 70 69 6 42 69 71 1 74 0 28
+ 75 2 6 0 0 0 79 2 6 0 80 0 81 2 6 0 0
+ 0 82 1 6 12 0 84 2 6 0 0 0 85 2 6 0 0
+ 0 86 2 6 0 0 0 87 1 6 12 0 88 3 6 0 0
+ 0 0 90 2 0 0 0 0 83 1 0 48 0 51 1 0
+ 62 0 63 1 0 28 0 41 1 0 77 0 78 1 0
+ 12 0 26 1 0 74 0 76 1 0 12 0 54 3 0 0
+ 0 0 0 91 1 0 12 0 17 2 0 0 0 0 61 3 0
+ 72 0 42 72 73 1 0 67 0 68 1 0 0 0 24
+ 2 0 0 0 0 89 0 0 0 64 1 0 0 0 57 1 0
+ 48 0 49 1 0 12 0 15 1 0 7 0 31 1 0 0
+ 0 11 1 0 0 0 18 1 0 35 0 37 1 0 32 0
+ 34 1 0 42 0 44 1 0 38 0 40 0 0 7 9 2
+ 0 12 0 0 21 2 0 0 0 0 59)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index dbc68e7c..5698408d 100644
--- a/src/algebra/strap/ISTRING.lsp
+++ b/src/algebra/strap/ISTRING.lsp
@@ -442,7 +442,7 @@
(SPADCALL |i| (- |j| 1)
(|getShellEntry| $ 24))
$)
- |l| (|getShellEntry| $ 71))
+ |l| (|getShellEntry| $ 72))
|ISTRING;split;$CL;22|)
(EXIT (SEQ (LETT |i| |j| |ISTRING;split;$CL;22|)
G190
@@ -465,9 +465,9 @@
(|ISTRING;elt;$Us$;31| |s|
(SPADCALL |i| |n| (|getShellEntry| $ 24))
$)
- |l| (|getShellEntry| $ 71))
+ |l| (|getShellEntry| $ 72))
|ISTRING;split;$CL;22|)))
- (EXIT (SPADCALL |l| (|getShellEntry| $ 72)))))))
+ (EXIT (SPADCALL |l| (|getShellEntry| $ 73)))))))
(DEFUN |ISTRING;split;$CcL;23| (|s| |cc| $)
(PROG (|n| |j| |i| |l|)
@@ -504,7 +504,7 @@
(SPADCALL |i| (- |j| 1)
(|getShellEntry| $ 24))
$)
- |l| (|getShellEntry| $ 71))
+ |l| (|getShellEntry| $ 72))
|ISTRING;split;$CcL;23|)
(EXIT (SEQ (LETT |i| |j| |ISTRING;split;$CcL;23|)
G190
@@ -527,9 +527,9 @@
(|ISTRING;elt;$Us$;31| |s|
(SPADCALL |i| |n| (|getShellEntry| $ 24))
$)
- |l| (|getShellEntry| $ 71))
+ |l| (|getShellEntry| $ 72))
|ISTRING;split;$CcL;23|)))
- (EXIT (SPADCALL |l| (|getShellEntry| $ 72)))))))
+ (EXIT (SPADCALL |l| (|getShellEntry| $ 73)))))))
(DEFUN |ISTRING;leftTrim;$C$;24| (|s| |c| $)
(PROG (|n| |i|)
@@ -712,23 +712,23 @@
(SPADCALL
(|ISTRING;elt;$IC;30| |s| (|getShellEntry| $ 6)
$)
- (|getShellEntry| $ 87)))
+ (|getShellEntry| $ 88)))
('T
(* (* (SPADCALL
(|ISTRING;elt;$IC;30| |s|
(|getShellEntry| $ 6) $)
- (|getShellEntry| $ 87))
+ (|getShellEntry| $ 88))
(SPADCALL
(|ISTRING;elt;$IC;30| |s|
(- (+ (|getShellEntry| $ 6) |n|) 1)
$)
- (|getShellEntry| $ 87)))
+ (|getShellEntry| $ 88)))
(SPADCALL
(|ISTRING;elt;$IC;30| |s|
(+ (|getShellEntry| $ 6)
(QUOTIENT2 |n| 2))
$)
- (|getShellEntry| $ 87))))))))))
+ (|getShellEntry| $ 88))))))))))
(DEFUN |ISTRING;match;2$CNni;33| (|pattern| |target| |wildcard| $)
(|stringMatch| |pattern| |target| (CHARACTER |wildcard|)))
@@ -760,7 +760,7 @@
('T
(SEQ (COND
((SPADCALL |p| |m|
- (|getShellEntry| $ 92))
+ (|getShellEntry| $ 93))
(COND
((NOT
(SPADCALL
@@ -770,7 +770,7 @@
(|getShellEntry| $ 24))
$)
|target|
- (|getShellEntry| $ 93)))
+ (|getShellEntry| $ 94)))
(EXIT 'NIL)))))
(LETT |i| |p|
|ISTRING;match?;2$CB;34|)
@@ -791,7 +791,7 @@
(COND
((NULL
(SPADCALL |q| (- |m| 1)
- (|getShellEntry| $ 92)))
+ (|getShellEntry| $ 93)))
(GO G191)))
(SEQ
(LETT |s|
@@ -844,7 +844,7 @@
NIL (GO G190) G191 (EXIT NIL))
(COND
((SPADCALL |p| |n|
- (|getShellEntry| $ 92))
+ (|getShellEntry| $ 93))
(COND
((NOT
(|ISTRING;suffix?;2$B;21|
@@ -884,7 +884,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|IndexedString|))
(LETT |dv$| (LIST '|IndexedString| |dv$1|) . #0#)
- (LETT $ (|newShell| 105) . #0#)
+ (LETT $ (|newShell| 106) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -951,37 +951,37 @@
(126 . -) |ISTRING;position;C$2I;19| (132 . |member?|)
|ISTRING;position;Cc$2I;20| |ISTRING;suffix?;2$B;21|
|ISTRING;elt;$IC;30| (138 . =) (|List| $$) (144 . |empty|)
- (148 . |concat|) (154 . |reverse!|) (|List| $)
- |ISTRING;split;$CL;22| |ISTRING;split;$CcL;23|
+ (148 . |not|) (153 . |concat|) (159 . |reverse!|)
+ (|List| $) |ISTRING;split;$CL;22| |ISTRING;split;$CcL;23|
|ISTRING;leftTrim;$C$;24| |ISTRING;leftTrim;$Cc$;25|
- (159 . -) |ISTRING;rightTrim;$C$;26|
- |ISTRING;rightTrim;$Cc$;27| (164 . +)
+ (164 . -) |ISTRING;rightTrim;$C$;26|
+ |ISTRING;rightTrim;$Cc$;27| (169 . +)
|ISTRING;copyInto!;2$I$;29| |ISTRING;concat;L$;28|
- (170 . |max|) (176 . |zero?|) (181 . |one?|) (186 . |ord|)
- (191 . *) (197 . |quo|) |ISTRING;hash;$I;32|
- |ISTRING;match;2$CNni;33| (203 . ~=) (209 . |prefix?|)
+ (175 . |max|) (181 . |zero?|) (186 . |one?|) (191 . |ord|)
+ (196 . *) (202 . |quo|) |ISTRING;hash;$I;32|
+ |ISTRING;match;2$CNni;33| (208 . ~=) (214 . |prefix?|)
|ISTRING;match?;2$CB;34| (|List| 8) (|Equation| 8)
- (|List| 96) (|Mapping| 8 8 8) (|InputForm|)
+ (|List| 97) (|Mapping| 8 8 8) (|InputForm|)
(|Mapping| 13 8) (|Mapping| 13 8 8) (|Void|)
(|Union| 8 '"failed") (|List| 11))
- '#(~= 215 |upperCase!| 221 |upperCase| 226 |trim| 231 |swap!|
- 243 |suffix?| 250 |substring?| 256 |split| 263 |sorted?|
- 275 |sort!| 286 |sort| 297 |size?| 308 |setelt| 314
- |select| 328 |sample| 334 |rightTrim| 338 |reverse!| 350
- |reverse| 355 |replace| 360 |removeDuplicates| 367
- |remove| 372 |reduce| 384 |qsetelt!| 405 |qelt| 412
- |prefix?| 418 |position| 424 |parts| 457 |new| 462 |more?|
- 468 |minIndex| 474 |min| 479 |merge| 485 |members| 498
- |member?| 503 |maxIndex| 509 |max| 514 |match?| 520
- |match| 527 |map!| 534 |map| 540 |lowerCase!| 553
- |lowerCase| 558 |less?| 563 |leftTrim| 569 |latex| 581
- |insert| 586 |indices| 600 |index?| 605 |hash| 611 |first|
- 621 |find| 626 |fill!| 632 |every?| 638 |eval| 644 |eq?|
- 670 |entry?| 676 |entries| 682 |empty?| 687 |empty| 692
- |elt| 696 |delete| 721 |count| 733 |copyInto!| 745 |copy|
- 752 |convert| 757 |construct| 762 |concat| 767 |coerce|
- 790 |before?| 800 |any?| 806 >= 812 > 818 = 824 <= 830 <
- 836 |#| 842)
+ '#(~= 220 |upperCase!| 226 |upperCase| 231 |trim| 236 |swap!|
+ 248 |suffix?| 255 |substring?| 261 |split| 268 |sorted?|
+ 280 |sort!| 291 |sort| 302 |size?| 313 |setelt| 319
+ |select| 333 |sample| 339 |rightTrim| 343 |reverse!| 355
+ |reverse| 360 |replace| 365 |removeDuplicates| 372
+ |remove| 377 |reduce| 389 |qsetelt!| 410 |qelt| 417
+ |prefix?| 423 |position| 429 |parts| 462 |new| 467 |more?|
+ 473 |minIndex| 479 |min| 484 |merge| 490 |members| 503
+ |member?| 508 |maxIndex| 514 |max| 519 |match?| 525
+ |match| 532 |map!| 539 |map| 545 |lowerCase!| 558
+ |lowerCase| 563 |less?| 568 |leftTrim| 574 |latex| 586
+ |insert| 591 |indices| 605 |index?| 610 |hash| 616 |first|
+ 626 |find| 631 |fill!| 637 |every?| 643 |eval| 649 |eq?|
+ 675 |entry?| 681 |entries| 687 |empty?| 692 |empty| 697
+ |elt| 701 |delete| 726 |count| 738 |copyInto!| 750 |copy|
+ 757 |convert| 762 |construct| 767 |concat| 772 |coerce|
+ 795 |before?| 805 |any?| 811 >= 817 > 823 = 829 <= 835 <
+ 841 |#| 847)
'((|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))
@@ -1004,9 +1004,9 @@
(|EltableAggregate| 11 8) (|Evalable| 8)
(|SetCategory|) (|Type|)
(|Eltable| 11 8) (|InnerEvalable| 8 8)
- (|CoercibleTo| 29) (|ConvertibleTo| 99)
+ (|CoercibleTo| 29) (|ConvertibleTo| 100)
(|BasicType|))
- (|makeByteWordVec2| 104
+ (|makeByteWordVec2| 105
'(0 11 0 12 2 11 13 0 0 14 0 11 0 21 2
11 0 0 0 22 2 23 0 11 11 24 1 23 0 11
26 1 29 0 28 30 0 33 0 34 1 8 0 0 35
@@ -1016,47 +1016,48 @@
11 13 0 0 49 0 7 0 50 2 11 0 0 0 51 0
8 0 52 0 53 0 54 0 53 0 55 0 13 0 58
0 13 0 59 2 53 0 0 0 62 2 33 13 8 0
- 64 2 8 13 0 0 68 0 69 0 70 2 69 0 2 0
- 71 1 69 0 0 72 1 53 0 0 78 2 7 0 0 0
- 81 2 11 0 0 0 84 1 11 13 0 85 1 11 13
- 0 86 1 8 7 0 87 2 11 0 11 0 88 2 11 0
- 0 0 89 2 11 13 0 0 92 2 0 13 0 0 93 2
- 7 13 0 0 1 1 0 0 0 38 1 0 0 0 1 2 0 0
- 0 33 1 2 0 0 0 8 1 3 0 102 0 11 11 1
- 2 0 13 0 0 66 3 0 13 0 0 11 60 2 0 73
- 0 8 74 2 0 73 0 33 75 1 5 13 0 1 2 0
- 13 101 0 1 1 5 0 0 1 2 0 0 101 0 1 1
- 5 0 0 1 2 0 0 101 0 1 2 0 13 0 7 1 3
- 0 8 0 23 8 1 3 0 8 0 11 8 57 2 0 0
- 100 0 1 0 0 0 1 2 0 0 0 33 80 2 0 0 0
- 8 79 1 0 0 0 1 1 0 0 0 1 3 0 0 0 23 0
- 56 1 7 0 0 1 2 7 0 8 0 1 2 0 0 100 0
- 1 4 7 8 98 0 8 8 1 2 0 8 98 0 1 3 0 8
- 98 0 8 1 3 0 8 0 11 8 1 2 0 8 0 11 1
- 2 0 13 0 0 93 2 7 11 8 0 1 3 7 11 8 0
- 11 63 3 0 11 0 0 11 61 3 0 11 33 0 11
- 65 2 0 11 100 0 1 1 0 95 0 1 2 0 0 7
- 8 9 2 0 13 0 7 1 1 6 11 0 32 2 5 0 0
- 0 1 2 5 0 0 0 1 3 0 0 101 0 0 1 1 0
- 95 0 1 2 7 13 8 0 1 1 6 11 0 47 2 5 0
- 0 0 1 3 0 13 0 0 8 94 3 0 7 0 0 8 91
- 2 0 0 36 0 37 3 0 0 98 0 0 1 2 0 0 36
- 0 1 1 0 0 0 41 1 0 0 0 1 2 0 13 0 7 1
- 2 0 0 0 33 77 2 0 0 0 8 76 1 7 28 0
- 43 3 0 0 0 0 11 27 3 0 0 8 0 11 1 1 0
- 104 0 1 2 0 13 11 0 1 1 7 53 0 1 1 0
- 11 0 90 1 6 8 0 1 2 0 103 100 0 1 2 0
- 0 0 8 1 2 0 13 100 0 1 3 9 0 0 95 95
- 1 3 9 0 0 8 8 1 2 9 0 0 97 1 2 9 0 0
- 96 1 2 0 13 0 0 1 2 7 13 8 0 1 1 0 95
- 0 1 1 0 13 0 15 0 0 0 10 2 0 0 0 0 1
- 2 0 0 0 23 25 2 0 8 0 11 67 3 0 8 0
- 11 8 1 2 0 0 0 23 1 2 0 0 0 11 1 2 7
- 7 8 0 1 2 0 7 100 0 1 3 0 0 0 0 11 82
- 1 0 0 0 20 1 3 99 0 1 1 0 0 95 1 1 0
- 0 73 83 2 0 0 8 0 1 2 0 0 0 0 19 2 0
- 0 0 8 1 1 8 29 0 31 1 0 0 8 1 2 7 13
- 0 0 1 2 0 13 100 0 1 2 5 13 0 0 1 2 5
- 13 0 0 1 2 7 13 0 0 17 2 5 13 0 0 1 2
- 5 13 0 0 18 1 0 7 0 16)))))
+ 64 2 8 13 0 0 68 0 69 0 70 1 13 0 0
+ 71 2 69 0 2 0 72 1 69 0 0 73 1 53 0 0
+ 79 2 7 0 0 0 82 2 11 0 0 0 85 1 11 13
+ 0 86 1 11 13 0 87 1 8 7 0 88 2 11 0
+ 11 0 89 2 11 0 0 0 90 2 11 13 0 0 93
+ 2 0 13 0 0 94 2 7 13 0 0 1 1 0 0 0 38
+ 1 0 0 0 1 2 0 0 0 33 1 2 0 0 0 8 1 3
+ 0 103 0 11 11 1 2 0 13 0 0 66 3 0 13
+ 0 0 11 60 2 0 74 0 8 75 2 0 74 0 33
+ 76 1 5 13 0 1 2 0 13 102 0 1 1 5 0 0
+ 1 2 0 0 102 0 1 1 5 0 0 1 2 0 0 102 0
+ 1 2 0 13 0 7 1 3 0 8 0 23 8 1 3 0 8 0
+ 11 8 57 2 0 0 101 0 1 0 0 0 1 2 0 0 0
+ 33 81 2 0 0 0 8 80 1 0 0 0 1 1 0 0 0
+ 1 3 0 0 0 23 0 56 1 7 0 0 1 2 7 0 8 0
+ 1 2 0 0 101 0 1 4 7 8 99 0 8 8 1 2 0
+ 8 99 0 1 3 0 8 99 0 8 1 3 0 8 0 11 8
+ 1 2 0 8 0 11 1 2 0 13 0 0 94 2 7 11 8
+ 0 1 3 7 11 8 0 11 63 3 0 11 0 0 11 61
+ 3 0 11 33 0 11 65 2 0 11 101 0 1 1 0
+ 96 0 1 2 0 0 7 8 9 2 0 13 0 7 1 1 6
+ 11 0 32 2 5 0 0 0 1 2 5 0 0 0 1 3 0 0
+ 102 0 0 1 1 0 96 0 1 2 7 13 8 0 1 1 6
+ 11 0 47 2 5 0 0 0 1 3 0 13 0 0 8 95 3
+ 0 7 0 0 8 92 2 0 0 36 0 37 3 0 0 99 0
+ 0 1 2 0 0 36 0 1 1 0 0 0 41 1 0 0 0 1
+ 2 0 13 0 7 1 2 0 0 0 33 78 2 0 0 0 8
+ 77 1 7 28 0 43 3 0 0 0 0 11 27 3 0 0
+ 8 0 11 1 1 0 105 0 1 2 0 13 11 0 1 1
+ 7 53 0 1 1 0 11 0 91 1 6 8 0 1 2 0
+ 104 101 0 1 2 0 0 0 8 1 2 0 13 101 0
+ 1 3 9 0 0 96 96 1 3 9 0 0 8 8 1 2 9 0
+ 0 98 1 2 9 0 0 97 1 2 0 13 0 0 1 2 7
+ 13 8 0 1 1 0 96 0 1 1 0 13 0 15 0 0 0
+ 10 2 0 0 0 0 1 2 0 0 0 23 25 2 0 8 0
+ 11 67 3 0 8 0 11 8 1 2 0 0 0 23 1 2 0
+ 0 0 11 1 2 7 7 8 0 1 2 0 7 101 0 1 3
+ 0 0 0 0 11 83 1 0 0 0 20 1 3 100 0 1
+ 1 0 0 96 1 1 0 0 74 84 2 0 0 8 0 1 2
+ 0 0 0 0 19 2 0 0 0 8 1 1 8 29 0 31 1
+ 0 0 8 1 2 7 13 0 0 1 2 0 13 101 0 1 2
+ 5 13 0 0 1 2 5 13 0 0 1 2 7 13 0 0 17
+ 2 5 13 0 0 1 2 5 13 0 0 18 1 0 7 0
+ 16)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp
index e4a2353e..26eaf30c 100644
--- a/src/algebra/strap/LIST.lsp
+++ b/src/algebra/strap/LIST.lsp
@@ -65,10 +65,10 @@
(SPADCALL |dev| "list1" "list" (|getShellEntry| $ 18))
(SEQ G190 (COND ((NULL (NOT (NULL |x|))) (GO G191)))
(SEQ (SPADCALL |dev| (|SPADfirst| |x|) 'NIL
- (|getShellEntry| $ 21))
+ (|getShellEntry| $ 22))
(EXIT (LETT |x| (CDR |x|) |LIST;writeOMList|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 23)))))
+ (EXIT (SPADCALL |dev| (|getShellEntry| $ 24)))))
(DEFUN |LIST;OMwrite;$S;6| (|x| $)
(PROG (|sp| |dev| |s|)
@@ -76,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| $ 25))
- (|getShellEntry| $ 26))
+ (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 26))
+ (|getShellEntry| $ 27))
|LIST;OMwrite;$S;6|)
- (SPADCALL |dev| (|getShellEntry| $ 27))
- (|LIST;writeOMList| |dev| |x| $)
(SPADCALL |dev| (|getShellEntry| $ 28))
+ (|LIST;writeOMList| |dev| |x| $)
(SPADCALL |dev| (|getShellEntry| $ 29))
+ (SPADCALL |dev| (|getShellEntry| $ 30))
(LETT |s| (OM-STRINGPTRTOSTRING |sp|) |LIST;OMwrite;$S;6|)
(EXIT |s|)))))
@@ -92,41 +92,41 @@
(SEQ (LETT |s| "" |LIST;OMwrite;$BS;7|)
(LETT |sp| (OM-STRINGTOSTRINGPTR |s|) |LIST;OMwrite;$BS;7|)
(LETT |dev|
- (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 25))
- (|getShellEntry| $ 26))
+ (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 26))
+ (|getShellEntry| $ 27))
|LIST;OMwrite;$BS;7|)
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 27))))
- (|LIST;writeOMList| |dev| |x| $)
(COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 28))))
- (SPADCALL |dev| (|getShellEntry| $ 29))
+ (|LIST;writeOMList| |dev| |x| $)
+ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 29))))
+ (SPADCALL |dev| (|getShellEntry| $ 30))
(LETT |s| (OM-STRINGPTRTOSTRING |sp|) |LIST;OMwrite;$BS;7|)
(EXIT |s|)))))
(DEFUN |LIST;OMwrite;Omd$V;8| (|dev| |x| $)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 27))
+ (SEQ (SPADCALL |dev| (|getShellEntry| $ 28))
(|LIST;writeOMList| |dev| |x| $)
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 28)))))
+ (EXIT (SPADCALL |dev| (|getShellEntry| $ 29)))))
(DEFUN |LIST;OMwrite;Omd$BV;9| (|dev| |x| |wholeObj| $)
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 27))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 28))))
(|LIST;writeOMList| |dev| |x| $)
(EXIT (COND
- (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 28)))))))
+ (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 29)))))))
(DEFUN |LIST;setUnion;3$;10| (|l1| |l2| $)
- (SPADCALL (SPADCALL |l1| |l2| (|getShellEntry| $ 34))
- (|getShellEntry| $ 35)))
+ (SPADCALL (SPADCALL |l1| |l2| (|getShellEntry| $ 35))
+ (|getShellEntry| $ 36)))
(DEFUN |LIST;setIntersection;3$;11| (|l1| |l2| $)
(PROG (|u|)
(RETURN
(SEQ (LETT |u| NIL |LIST;setIntersection;3$;11|)
- (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 35))
+ (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 36))
|LIST;setIntersection;3$;11|)
(SEQ G190 (COND ((NULL (NOT (NULL |l1|))) (GO G191)))
(SEQ (COND
((SPADCALL (|SPADfirst| |l1|) |l2|
- (|getShellEntry| $ 39))
+ (|getShellEntry| $ 40))
(LETT |u| (CONS (|SPADfirst| |l1|) |u|)
|LIST;setIntersection;3$;11|)))
(EXIT (LETT |l1| (CDR |l1|)
@@ -137,16 +137,16 @@
(DEFUN |LIST;setDifference;3$;12| (|l1| |l2| $)
(PROG (|l11| |lu|)
(RETURN
- (SEQ (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 35))
+ (SEQ (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 36))
|LIST;setDifference;3$;12|)
(LETT |lu| NIL |LIST;setDifference;3$;12|)
(SEQ G190 (COND ((NULL (NOT (NULL |l1|))) (GO G191)))
(SEQ (LETT |l11|
- (SPADCALL |l1| 1 (|getShellEntry| $ 41))
+ (SPADCALL |l1| 1 (|getShellEntry| $ 42))
|LIST;setDifference;3$;12|)
(COND
((NOT (SPADCALL |l11| |l2|
- (|getShellEntry| $ 39)))
+ (|getShellEntry| $ 40)))
(LETT |lu| (CONS |l11| |lu|)
|LIST;setDifference;3$;12|)))
(EXIT (LETT |l1| (CDR |l1|)
@@ -158,7 +158,7 @@
(PROG (#0=#:G1444 |a| #1=#:G1445)
(RETURN
(SEQ (SPADCALL
- (CONS (SPADCALL '|construct| (|getShellEntry| $ 46))
+ (CONS (SPADCALL '|construct| (|getShellEntry| $ 47))
(PROGN
(LETT #0# NIL |LIST;convert;$If;13|)
(SEQ (LETT |a| NIL |LIST;convert;$If;13|)
@@ -173,12 +173,12 @@
(SEQ (EXIT (LETT #0#
(CONS
(SPADCALL |a|
- (|getShellEntry| $ 47))
+ (|getShellEntry| $ 48))
#0#)
|LIST;convert;$If;13|)))
(LETT #1# (CDR #1#) |LIST;convert;$If;13|)
(GO G190) G191 (EXIT (NREVERSE0 #0#)))))
- (|getShellEntry| $ 51))))))
+ (|getShellEntry| $ 52))))))
(DEFUN |List| (#0=#:G1446)
(PROG ()
@@ -203,7 +203,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|List|))
(LETT |dv$| (LIST '|List| |dv$1|) . #0#)
- (LETT $ (|newShell| 69) . #0#)
+ (LETT $ (|newShell| 70) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -246,29 +246,29 @@
(COND
((|testBitVector| |pv$| 6)
(PROGN
- (|setShellEntry| $ 30
- (CONS (|dispatchFunction| |LIST;OMwrite;$S;6|) $))
(|setShellEntry| $ 31
- (CONS (|dispatchFunction| |LIST;OMwrite;$BS;7|) $))
+ (CONS (|dispatchFunction| |LIST;OMwrite;$S;6|) $))
(|setShellEntry| $ 32
- (CONS (|dispatchFunction| |LIST;OMwrite;Omd$V;8|) $))
+ (CONS (|dispatchFunction| |LIST;OMwrite;$BS;7|) $))
(|setShellEntry| $ 33
+ (CONS (|dispatchFunction| |LIST;OMwrite;Omd$V;8|) $))
+ (|setShellEntry| $ 34
(CONS (|dispatchFunction| |LIST;OMwrite;Omd$BV;9|) $)))))
(COND
((|testBitVector| |pv$| 8)
(PROGN
- (|setShellEntry| $ 36
+ (|setShellEntry| $ 37
(CONS (|dispatchFunction| |LIST;setUnion;3$;10|) $))
- (|setShellEntry| $ 40
+ (|setShellEntry| $ 41
(CONS (|dispatchFunction|
|LIST;setIntersection;3$;11|)
$))
- (|setShellEntry| $ 43
+ (|setShellEntry| $ 44
(CONS (|dispatchFunction| |LIST;setDifference;3$;12|)
$)))))
(COND
((|testBitVector| |pv$| 3)
- (|setShellEntry| $ 52
+ (|setShellEntry| $ 53
(CONS (|dispatchFunction| |LIST;convert;$If;13|) $))))
$))))
@@ -278,28 +278,28 @@
(|Boolean|) |LIST;null;$B;2| |LIST;cons;S2$;3|
|LIST;append;3$;4| (|Void|) (|OpenMathDevice|)
(4 . |OMputApp|) (|String|) (9 . |OMputSymbol|)
- (16 . |first|) (21 . |false|) (25 . |OMwrite|)
- (32 . |rest|) (37 . |OMputEndApp|) (|OpenMathEncoding|)
- (42 . |OMencodingXML|) (46 . |OMopenString|)
- (52 . |OMputObject|) (57 . |OMputEndObject|)
- (62 . |OMclose|) (67 . |OMwrite|) (72 . |OMwrite|)
- (78 . |OMwrite|) (84 . |OMwrite|) (91 . |concat|)
- (97 . |removeDuplicates|) (102 . |setUnion|)
- (108 . |empty|) (112 . |empty?|) (117 . |member?|)
- (123 . |setIntersection|) (129 . |elt|) (135 . |concat|)
- (141 . |setDifference|) (|OutputForm|) (|InputForm|)
- (147 . |convert|) (152 . |convert|) (|List| 45)
- (157 . |concat|) (|List| $) (163 . |convert|)
- (168 . |convert|) (|Mapping| 6 6 6) (|NonNegativeInteger|)
- (|List| 6) (|Equation| 6) (|List| 56) (|Mapping| 10 6)
+ (16 . |not|) (21 . |first|) (26 . |false|)
+ (30 . |OMwrite|) (37 . |rest|) (42 . |OMputEndApp|)
+ (|OpenMathEncoding|) (47 . |OMencodingXML|)
+ (51 . |OMopenString|) (57 . |OMputObject|)
+ (62 . |OMputEndObject|) (67 . |OMclose|) (72 . |OMwrite|)
+ (77 . |OMwrite|) (83 . |OMwrite|) (89 . |OMwrite|)
+ (96 . |concat|) (102 . |removeDuplicates|)
+ (107 . |setUnion|) (113 . |empty|) (117 . |empty?|)
+ (122 . |member?|) (128 . |setIntersection|) (134 . |elt|)
+ (140 . |concat|) (146 . |setDifference|) (|OutputForm|)
+ (|InputForm|) (152 . |convert|) (157 . |convert|)
+ (|List| 46) (162 . |concat|) (|List| $) (168 . |convert|)
+ (173 . |convert|) (|Mapping| 6 6 6) (|NonNegativeInteger|)
+ (|List| 6) (|Equation| 6) (|List| 57) (|Mapping| 10 6)
(|Mapping| 10 6 6) (|UniversalSegment| 7) '"last" '"rest"
'"first" '"value" (|Mapping| 6 6) (|SingleInteger|)
(|List| 7) (|Union| 6 '"failed"))
- '#(|setUnion| 173 |setIntersection| 179 |setDifference| 185
- |rest| 191 |removeDuplicates| 196 |null| 201 |nil| 206
- |member?| 210 |first| 216 |empty?| 221 |empty| 226 |elt|
- 230 |convert| 236 |cons| 241 |concat| 247 |append| 259
- |OMwrite| 265)
+ '#(|setUnion| 178 |setIntersection| 184 |setDifference| 190
+ |rest| 196 |removeDuplicates| 201 |null| 206 |nil| 211
+ |member?| 215 |first| 221 |empty?| 226 |empty| 231 |elt|
+ 235 |convert| 241 |cons| 246 |concat| 252 |append| 264
+ |OMwrite| 270)
'((|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))
@@ -325,27 +325,27 @@
(|OrderedSet|) (|Aggregate|)
(|EltableAggregate| 7 6) (|Evalable| 6)
(|SetCategory|) (|Type|) (|Eltable| 7 6)
- (|InnerEvalable| 6 6) (|CoercibleTo| 44)
- (|ConvertibleTo| 45) (|BasicType|)
+ (|InnerEvalable| 6 6) (|CoercibleTo| 45)
+ (|ConvertibleTo| 46) (|BasicType|)
(|OpenMath|))
- (|makeByteWordVec2| 52
+ (|makeByteWordVec2| 53
'(0 7 0 8 1 15 14 0 16 3 15 14 0 17 17
- 18 1 0 6 0 19 0 10 0 20 3 6 14 15 0
- 10 21 1 0 0 0 22 1 15 14 0 23 0 24 0
- 25 2 15 0 17 24 26 1 15 14 0 27 1 15
- 14 0 28 1 15 14 0 29 1 0 17 0 30 2 0
- 17 0 10 31 2 0 14 15 0 32 3 0 14 15 0
- 10 33 2 0 0 0 0 34 1 0 0 0 35 2 0 0 0
- 0 36 0 0 0 37 1 0 10 0 38 2 0 10 6 0
- 39 2 0 0 0 0 40 2 0 6 0 7 41 2 0 0 6
- 0 42 2 0 0 0 0 43 1 45 0 44 46 1 6 45
- 0 47 2 48 0 45 0 49 1 45 0 50 51 1 0
- 45 0 52 2 8 0 0 0 36 2 8 0 0 0 40 2 8
- 0 0 0 43 1 0 0 0 22 1 8 0 0 35 1 0 10
- 0 11 0 0 0 9 2 8 10 6 0 39 1 0 6 0 19
- 1 0 10 0 38 0 0 0 37 2 0 6 0 7 41 1 3
- 45 0 52 2 0 0 6 0 12 2 0 0 0 0 34 2 0
- 0 6 0 42 2 0 0 0 0 13 3 6 14 15 0 10
- 33 2 6 17 0 10 31 2 6 14 15 0 32 1 6
- 17 0 30)))))
+ 18 1 10 0 0 19 1 0 6 0 20 0 10 0 21 3
+ 6 14 15 0 10 22 1 0 0 0 23 1 15 14 0
+ 24 0 25 0 26 2 15 0 17 25 27 1 15 14
+ 0 28 1 15 14 0 29 1 15 14 0 30 1 0 17
+ 0 31 2 0 17 0 10 32 2 0 14 15 0 33 3
+ 0 14 15 0 10 34 2 0 0 0 0 35 1 0 0 0
+ 36 2 0 0 0 0 37 0 0 0 38 1 0 10 0 39
+ 2 0 10 6 0 40 2 0 0 0 0 41 2 0 6 0 7
+ 42 2 0 0 6 0 43 2 0 0 0 0 44 1 46 0
+ 45 47 1 6 46 0 48 2 49 0 46 0 50 1 46
+ 0 51 52 1 0 46 0 53 2 8 0 0 0 37 2 8
+ 0 0 0 41 2 8 0 0 0 44 1 0 0 0 23 1 8
+ 0 0 36 1 0 10 0 11 0 0 0 9 2 8 10 6 0
+ 40 1 0 6 0 20 1 0 10 0 39 0 0 0 38 2
+ 0 6 0 7 42 1 3 46 0 53 2 0 0 6 0 12 2
+ 0 0 0 0 35 2 0 0 6 0 43 2 0 0 0 0 13
+ 3 6 14 15 0 10 34 2 6 17 0 10 32 2 6
+ 14 15 0 33 1 6 17 0 31)))))
'|lookupIncomplete|))
diff --git a/src/algebra/strap/LNAGG-.lsp b/src/algebra/strap/LNAGG-.lsp
index d140a5dc..912a1dcb 100644
--- a/src/algebra/strap/LNAGG-.lsp
+++ b/src/algebra/strap/LNAGG-.lsp
@@ -41,19 +41,19 @@
('T (NOT (< (SPADCALL |a| (|getShellEntry| $ 10)) |i|)))))
(DEFUN |LNAGG-;concat;ASA;3| (|a| |x| $)
- (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 20))
- (|getShellEntry| $ 21)))
+ (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 21))
+ (|getShellEntry| $ 22)))
(DEFUN |LNAGG-;concat;S2A;4| (|x| |y| $)
- (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 20)) |y|
- (|getShellEntry| $ 21)))
+ (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 21)) |y|
+ (|getShellEntry| $ 22)))
(DEFUN |LNAGG-;insert;SAIA;5| (|x| |a| |i| $)
- (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 20)) |a| |i|
- (|getShellEntry| $ 24)))
+ (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 21)) |a| |i|
+ (|getShellEntry| $ 25)))
(DEFUN |LNAGG-;maxIndex;AI;6| (|l| $)
- (+ (- (SPADCALL |l| (|getShellEntry| $ 26)) 1)
+ (+ (- (SPADCALL |l| (|getShellEntry| $ 27)) 1)
(SPADCALL |l| (|getShellEntry| $ 9))))
(DEFUN |LinearAggregate&| (|#1| |#2|)
@@ -63,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| 31) . #0#)
+ (LETT $ (|newShell| 32) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -74,7 +74,7 @@
(|setShellEntry| $ 7 |#2|)
(COND
((|HasAttribute| |#1| '|finiteAggregate|)
- (|setShellEntry| $ 29
+ (|setShellEntry| $ 30
(CONS (|dispatchFunction| |LNAGG-;maxIndex;AI;6|) $))))
$))))
@@ -82,23 +82,23 @@
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|)
(|Integer|) (0 . |minIndex|) (5 . |maxIndex|) (|List| 8)
|LNAGG-;indices;AL;1| (|Boolean|) (10 . <) (16 . |false|)
- |LNAGG-;index?;IAB;2| (|NonNegativeInteger|) (20 . |One|)
- (24 . |One|) (28 . |new|) (34 . |concat|)
+ (20 . |not|) |LNAGG-;index?;IAB;2| (|NonNegativeInteger|)
+ (25 . |One|) (29 . |One|) (33 . |new|) (39 . |concat|)
|LNAGG-;concat;ASA;3| |LNAGG-;concat;S2A;4|
- (40 . |insert|) |LNAGG-;insert;SAIA;5| (47 . |#|) (52 . -)
- (58 . +) (64 . |maxIndex|) (|List| $))
- '#(|maxIndex| 69 |insert| 74 |indices| 81 |index?| 86
- |concat| 92)
+ (45 . |insert|) |LNAGG-;insert;SAIA;5| (52 . |#|) (57 . -)
+ (63 . +) (69 . |maxIndex|) (|List| $))
+ '#(|maxIndex| 74 |insert| 79 |indices| 86 |index?| 91
+ |concat| 97)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 29
+ (|makeByteWordVec2| 30
'(1 6 8 0 9 1 6 8 0 10 2 8 13 0 0 14 0
- 13 0 15 0 17 0 18 0 8 0 19 2 6 0 17 7
- 20 2 6 0 0 0 21 3 6 0 0 0 8 24 1 6 17
- 0 26 2 8 0 0 0 27 2 8 0 0 0 28 1 0 8
- 0 29 1 0 8 0 29 3 0 0 7 0 8 25 1 0 11
- 0 12 2 0 13 8 0 16 2 0 0 0 7 22 2 0 0
- 7 0 23)))))
+ 13 0 15 1 13 0 0 16 0 18 0 19 0 8 0
+ 20 2 6 0 18 7 21 2 6 0 0 0 22 3 6 0 0
+ 0 8 25 1 6 18 0 27 2 8 0 0 0 28 2 8 0
+ 0 0 29 1 0 8 0 30 1 0 8 0 30 3 0 0 7
+ 0 8 26 1 0 11 0 12 2 0 13 8 0 17 2 0
+ 0 0 7 23 2 0 0 7 0 24)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp
index c5006e53..09fe53fb 100644
--- a/src/algebra/strap/LSAGG-.lsp
+++ b/src/algebra/strap/LSAGG-.lsp
@@ -159,7 +159,7 @@
|LSAGG-;select!;M2A;5|)
(EXIT
(SPADCALL |y| |z|
- (|getShellEntry| $ 26))))))))
+ (|getShellEntry| $ 27))))))))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |x|)))))))))
@@ -169,7 +169,7 @@
(SEQ (COND
((SPADCALL |p| (|getShellEntry| $ 16)) |q|)
((SPADCALL |q| (|getShellEntry| $ 16)) |p|)
- ((SPADCALL |p| |q| (|getShellEntry| $ 29))
+ ((SPADCALL |p| |q| (|getShellEntry| $ 30))
(|error| "cannot merge a list into itself"))
('T
(SEQ (COND
@@ -210,7 +210,7 @@
|f|)
(SEQ
(SPADCALL |t| |p|
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 27))
(LETT |t| |p|
|LSAGG-;merge!;M3A;6|)
(EXIT
@@ -221,7 +221,7 @@
('T
(SEQ
(SPADCALL |t| |q|
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 27))
(LETT |t| |q|
|LSAGG-;merge!;M3A;6|)
(EXIT
@@ -234,13 +234,13 @@
(COND
((SPADCALL |p| (|getShellEntry| $ 16)) |q|)
('T |p|))
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 27))
(EXIT |r|))))))))
(DEFUN |LSAGG-;insert!;SAIA;7| (|s| |x| |i| $)
(PROG (|m| #0=#:G1465 |y| |z|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 33))
|LSAGG-;insert!;SAIA;7|)
(EXIT (COND
((< |i| |m|) (|error| "index out of range"))
@@ -255,25 +255,25 @@
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 38))
+ (|getShellEntry| $ 39))
|LSAGG-;insert!;SAIA;7|)
(LETT |z|
(SPADCALL |y| (|getShellEntry| $ 17))
|LSAGG-;insert!;SAIA;7|)
(SPADCALL |y|
(SPADCALL |s| |z| (|getShellEntry| $ 14))
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 27))
(EXIT |x|)))))))))
(DEFUN |LSAGG-;insert!;2AIA;8| (|w| |x| |i| $)
(PROG (|m| #0=#:G1469 |y| |z|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 33))
|LSAGG-;insert!;2AIA;8|)
(EXIT (COND
((< |i| |m|) (|error| "index out of range"))
((EQL |i| |m|)
- (SPADCALL |w| |x| (|getShellEntry| $ 40)))
+ (SPADCALL |w| |x| (|getShellEntry| $ 41)))
('T
(SEQ (LETT |y|
(SPADCALL |x|
@@ -283,13 +283,13 @@
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 38))
+ (|getShellEntry| $ 39))
|LSAGG-;insert!;2AIA;8|)
(LETT |z|
(SPADCALL |y| (|getShellEntry| $ 17))
|LSAGG-;insert!;2AIA;8|)
- (SPADCALL |y| |w| (|getShellEntry| $ 26))
- (SPADCALL |y| |z| (|getShellEntry| $ 40))
+ (SPADCALL |y| |w| (|getShellEntry| $ 27))
+ (SPADCALL |y| |z| (|getShellEntry| $ 41))
(EXIT |x|)))))))))
(DEFUN |LSAGG-;remove!;M2A;9| (|f| |x| $)
@@ -331,7 +331,7 @@
(SPADCALL |p|
(SPADCALL |q|
(|getShellEntry| $ 17))
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 27))
|LSAGG-;remove!;M2A;9|))
('T
(SEQ
@@ -348,7 +348,7 @@
(DEFUN |LSAGG-;delete!;AIA;10| (|x| |i| $)
(PROG (|m| #0=#:G1481 |y|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 33))
|LSAGG-;delete!;AIA;10|)
(EXIT (COND
((< |i| |m|) (|error| "index out of range"))
@@ -363,29 +363,29 @@
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 38))
+ (|getShellEntry| $ 39))
|LSAGG-;delete!;AIA;10|)
(SPADCALL |y|
- (SPADCALL |y| 2 (|getShellEntry| $ 38))
- (|getShellEntry| $ 26))
+ (SPADCALL |y| 2 (|getShellEntry| $ 39))
+ (|getShellEntry| $ 27))
(EXIT |x|)))))))))
(DEFUN |LSAGG-;delete!;AUsA;11| (|x| |i| $)
(PROG (|l| |m| |h| #0=#:G1486 #1=#:G1487 |t| #2=#:G1488)
(RETURN
- (SEQ (LETT |l| (SPADCALL |i| (|getShellEntry| $ 45))
+ (SEQ (LETT |l| (SPADCALL |i| (|getShellEntry| $ 46))
|LSAGG-;delete!;AUsA;11|)
- (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 33))
|LSAGG-;delete!;AUsA;11|)
(EXIT (COND
((< |l| |m|) (|error| "index out of range"))
('T
(SEQ (LETT |h|
(COND
- ((SPADCALL |i| (|getShellEntry| $ 46))
- (SPADCALL |i| (|getShellEntry| $ 47)))
+ ((SPADCALL |i| (|getShellEntry| $ 47))
+ (SPADCALL |i| (|getShellEntry| $ 48)))
('T
- (SPADCALL |x| (|getShellEntry| $ 48))))
+ (SPADCALL |x| (|getShellEntry| $ 49))))
|LSAGG-;delete!;AUsA;11|)
(EXIT (COND
((< |h| |l|) |x|)
@@ -399,7 +399,7 @@
((< #0# 0) 'NIL)
('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 38)))
+ (|getShellEntry| $ 39)))
('T
(SEQ (LETT |t|
(SPADCALL |x|
@@ -412,7 +412,7 @@
('T 'T))
'(|NonNegativeInteger|)
#1#))
- (|getShellEntry| $ 38))
+ (|getShellEntry| $ 39))
|LSAGG-;delete!;AUsA;11|)
(SPADCALL |t|
(SPADCALL |t|
@@ -425,8 +425,8 @@
('T 'T))
'(|NonNegativeInteger|)
#2#))
- (|getShellEntry| $ 38))
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 39))
+ (|getShellEntry| $ 27))
(EXIT |x|)))))))))))))
(DEFUN |LSAGG-;find;MAU;12| (|f| |x| $)
@@ -450,7 +450,7 @@
(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| $ 33))
|LSAGG-;position;MAI;13|)
G190
(COND
@@ -469,7 +469,7 @@
G191 (EXIT NIL))
(EXIT (COND
((SPADCALL |x| (|getShellEntry| $ 16))
- (- (SPADCALL |x| (|getShellEntry| $ 32)) 1))
+ (- (SPADCALL |x| (|getShellEntry| $ 33)) 1))
('T |k|)))))))
(DEFUN |LSAGG-;mergeSort| (|f| |p| |n| $)
@@ -482,7 +482,7 @@
(SPADCALL (SPADCALL |p| (|getShellEntry| $ 17))
(|getShellEntry| $ 18))
(SPADCALL |p| (|getShellEntry| $ 18)) |f|)
- (LETT |p| (SPADCALL |p| (|getShellEntry| $ 56))
+ (LETT |p| (SPADCALL |p| (|getShellEntry| $ 57))
|LSAGG-;mergeSort|)))))
(EXIT (COND
((< |n| 3) |p|)
@@ -496,7 +496,7 @@
|LSAGG-;mergeSort|)
(LETT |q|
(SPADCALL |p| |l|
- (|getShellEntry| $ 58))
+ (|getShellEntry| $ 59))
|LSAGG-;mergeSort|)
(LETT |p| (|LSAGG-;mergeSort| |f| |p| |l| $)
|LSAGG-;mergeSort|)
@@ -574,7 +574,7 @@
((NULL (COND
((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL)
('T
- (SPADCALL |r| |a| (|getShellEntry| $ 62)))))
+ (SPADCALL |r| |a| (|getShellEntry| $ 63)))))
(GO G191)))
(SEQ (LETT |r|
(SPADCALL |r|
@@ -630,7 +630,7 @@
(SPADCALL |y| (|getShellEntry| $ 17))
|LSAGG-;map;M3A;19|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |z| (|getShellEntry| $ 56)))))))
+ (EXIT (SPADCALL |z| (|getShellEntry| $ 57)))))))
(DEFUN |LSAGG-;reverse!;2A;20| (|x| $)
(PROG (|z| |y|)
@@ -644,7 +644,7 @@
|x|)
('T
(SEQ (SPADCALL |x| (SPADCALL (|getShellEntry| $ 13))
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 27))
(SEQ G190
(COND
((NULL (NOT (SPADCALL |y|
@@ -654,7 +654,7 @@
(SPADCALL |y|
(|getShellEntry| $ 17))
|LSAGG-;reverse!;2A;20|)
- (SPADCALL |y| |x| (|getShellEntry| $ 26))
+ (SPADCALL |y| |x| (|getShellEntry| $ 27))
(LETT |x| |y| |LSAGG-;reverse!;2A;20|)
(EXIT (LETT |y| |z|
|LSAGG-;reverse!;2A;20|)))
@@ -673,7 +673,7 @@
(SEQ (COND
((EQL |k| 1000)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 70))
+ ((SPADCALL |x| (|getShellEntry| $ 71))
(EXIT (|error| "cyclic list"))))))
(LETT |y|
(SPADCALL
@@ -685,12 +685,12 @@
|LSAGG-;copy;2A;21|)))
(LETT |k| (QSADD1 |k|) |LSAGG-;copy;2A;21|) (GO G190)
G191 (EXIT NIL))
- (EXIT (SPADCALL |y| (|getShellEntry| $ 56)))))))
+ (EXIT (SPADCALL |y| (|getShellEntry| $ 57)))))))
(DEFUN |LSAGG-;copyInto!;2AIA;22| (|y| |x| |s| $)
(PROG (|m| #0=#:G1546 |z|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |y| (|getShellEntry| $ 32))
+ (SEQ (LETT |m| (SPADCALL |y| (|getShellEntry| $ 33))
|LSAGG-;copyInto!;2AIA;22|)
(EXIT (COND
((< |s| |m|) (|error| "index out of range"))
@@ -703,7 +703,7 @@
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 38))
+ (|getShellEntry| $ 39))
|LSAGG-;copyInto!;2AIA;22|)
(SEQ G190
(COND
@@ -719,7 +719,7 @@
(SEQ (SPADCALL |z|
(SPADCALL |x|
(|getShellEntry| $ 18))
- (|getShellEntry| $ 72))
+ (|getShellEntry| $ 73))
(LETT |x|
(SPADCALL |x|
(|getShellEntry| $ 17))
@@ -735,7 +735,7 @@
(DEFUN |LSAGG-;position;SA2I;23| (|w| |x| |s| $)
(PROG (|m| #0=#:G1553 |k|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 33))
|LSAGG-;position;SA2I;23|)
(EXIT (COND
((< |s| |m|) (|error| "index out of range"))
@@ -748,7 +748,7 @@
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 38))
+ (|getShellEntry| $ 39))
|LSAGG-;position;SA2I;23|)
(SEQ (LETT |k| |s| |LSAGG-;position;SA2I;23|)
G190
@@ -761,7 +761,7 @@
(SPADCALL |w|
(SPADCALL |x|
(|getShellEntry| $ 18))
- (|getShellEntry| $ 62)))))
+ (|getShellEntry| $ 63)))))
(GO G191)))
(SEQ (EXIT
(LETT |x|
@@ -774,7 +774,7 @@
(EXIT (COND
((SPADCALL |x| (|getShellEntry| $ 16))
(- (SPADCALL |x|
- (|getShellEntry| $ 32))
+ (|getShellEntry| $ 33))
1))
('T |k|)))))))))))
@@ -794,8 +794,8 @@
(VECTOR $ |p|))
(SPADCALL |p|
(|getShellEntry| $ 17))
- (|getShellEntry| $ 76))
- (|getShellEntry| $ 26))
+ (|getShellEntry| $ 77))
+ (|getShellEntry| $ 27))
|LSAGG-;removeDuplicates!;2A;24|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |l|)))))
@@ -807,7 +807,7 @@
(PROGN
(SPADCALL |#1|
(SPADCALL (|getShellEntry| $$ 1) (|getShellEntry| $ 18))
- (|getShellEntry| $ 75))))))
+ (|getShellEntry| $ 76))))))
(DEFUN |LSAGG-;<;2AB;25| (|x| |y| $)
(PROG (#0=#:G1567)
@@ -829,7 +829,7 @@
(|getShellEntry| $ 18))
(SPADCALL |y|
(|getShellEntry| $ 18))
- (|getShellEntry| $ 62))
+ (|getShellEntry| $ 63))
(PROGN
(LETT #0#
(SPADCALL
@@ -837,7 +837,7 @@
(|getShellEntry| $ 18))
(SPADCALL |y|
(|getShellEntry| $ 18))
- (|getShellEntry| $ 78))
+ (|getShellEntry| $ 79))
|LSAGG-;<;2AB;25|)
(GO #0#)))
('T
@@ -866,7 +866,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| 81) . #0#)
+ (LETT $ (|newShell| 82) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -875,21 +875,21 @@
(|setShellEntry| $ 7 |#2|)
(COND
((|HasCategory| |#2| '(|SetCategory|))
- (|setShellEntry| $ 63
+ (|setShellEntry| $ 64
(CONS (|dispatchFunction| |LSAGG-;reduce;MA3S;17|) $))))
(COND
((|HasCategory| |#2| '(|SetCategory|))
(PROGN
- (|setShellEntry| $ 74
+ (|setShellEntry| $ 75
(CONS (|dispatchFunction| |LSAGG-;position;SA2I;23|)
$))
- (|setShellEntry| $ 77
+ (|setShellEntry| $ 78
(CONS (|dispatchFunction|
|LSAGG-;removeDuplicates!;2A;24|)
$)))))
(COND
((|HasCategory| |#2| '(|OrderedSet|))
- (|setShellEntry| $ 79
+ (|setShellEntry| $ 80
(CONS (|dispatchFunction| |LSAGG-;<;2AB;25|) $))))
$))))
@@ -901,59 +901,60 @@
(20 . |rest|) (25 . |first|) (|Mapping| 7 7 7)
(30 . |reduce|) |LSAGG-;reduce;MAS;3| (37 . |copy|)
(42 . |merge!|) |LSAGG-;merge;M3A;4| (49 . |false|)
- (53 . |setrest!|) (|Mapping| 10 7) |LSAGG-;select!;M2A;5|
- (59 . |eq?|) |LSAGG-;merge!;M3A;6| (|Integer|)
- (65 . |minIndex|) (70 . <) (76 . =) (82 . |One|)
- (86 . |One|) (90 . -) (96 . |rest|)
- |LSAGG-;insert!;SAIA;7| (102 . |concat!|)
+ (53 . |not|) (58 . |setrest!|) (|Mapping| 10 7)
+ |LSAGG-;select!;M2A;5| (64 . |eq?|) |LSAGG-;merge!;M3A;6|
+ (|Integer|) (70 . |minIndex|) (75 . <) (81 . =)
+ (87 . |One|) (91 . |One|) (95 . -) (101 . |rest|)
+ |LSAGG-;insert!;SAIA;7| (107 . |concat!|)
|LSAGG-;insert!;2AIA;8| |LSAGG-;remove!;M2A;9|
- |LSAGG-;delete!;AIA;10| (|UniversalSegment| 31)
- (108 . |lo|) (113 . |hasHi|) (118 . |hi|)
- (123 . |maxIndex|) (128 . +) |LSAGG-;delete!;AUsA;11|
+ |LSAGG-;delete!;AIA;10| (|UniversalSegment| 32)
+ (113 . |lo|) (118 . |hasHi|) (123 . |hi|)
+ (128 . |maxIndex|) (133 . +) |LSAGG-;delete!;AUsA;11|
(|Union| 7 '"failed") |LSAGG-;find;MAU;12|
- (|SingleInteger|) (134 . |One|) |LSAGG-;position;MAI;13|
- (138 . |reverse!|) (143 . |quo|) (149 . |split!|)
- (155 . |true|) |LSAGG-;sorted?;MAB;15|
- |LSAGG-;reduce;MA2S;16| (159 . ~=) (165 . |reduce|)
+ (|SingleInteger|) (139 . |One|) |LSAGG-;position;MAI;13|
+ (143 . |reverse!|) (148 . |quo|) (154 . |split!|)
+ (160 . |true|) |LSAGG-;sorted?;MAB;15|
+ |LSAGG-;reduce;MA2S;16| (164 . ~=) (170 . |reduce|)
|LSAGG-;new;NniSA;18| |LSAGG-;map;M3A;19|
- |LSAGG-;reverse!;2A;20| (173 . |Zero|) (177 . |Zero|)
- (181 . =) (187 . |cyclic?|) |LSAGG-;copy;2A;21|
- (192 . |setfirst!|) |LSAGG-;copyInto!;2AIA;22|
- (198 . |position|) (205 . =) (211 . |remove!|)
- (217 . |removeDuplicates!|) (222 . <) (228 . <)
+ |LSAGG-;reverse!;2A;20| (178 . |Zero|) (182 . |Zero|)
+ (186 . =) (192 . |cyclic?|) |LSAGG-;copy;2A;21|
+ (197 . |setfirst!|) |LSAGG-;copyInto!;2AIA;22|
+ (203 . |position|) (210 . =) (216 . |remove!|)
+ (222 . |removeDuplicates!|) (227 . <) (233 . <)
(|Mapping| 7 7))
- '#(|sorted?| 234 |sort!| 240 |select!| 246 |reverse!| 252
- |removeDuplicates!| 257 |remove!| 262 |reduce| 268
- |position| 289 |new| 302 |merge!| 308 |merge| 315 |map|
- 322 |list| 329 |insert!| 334 |find| 348 |delete!| 354
- |copyInto!| 366 |copy| 373 < 378)
+ '#(|sorted?| 239 |sort!| 245 |select!| 251 |reverse!| 257
+ |removeDuplicates!| 262 |remove!| 267 |reduce| 273
+ |position| 294 |new| 307 |merge!| 313 |merge| 320 |map|
+ 327 |list| 334 |insert!| 339 |find| 353 |delete!| 359
+ |copyInto!| 371 |copy| 378 < 383)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 79
+ (|makeByteWordVec2| 80
'(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
- 0 10 0 25 2 6 0 0 0 26 2 6 10 0 0 29
- 1 6 31 0 32 2 31 10 0 0 33 2 31 10 0
- 0 34 0 8 0 35 0 31 0 36 2 31 0 0 0 37
- 2 6 0 0 8 38 2 6 0 0 0 40 1 44 31 0
- 45 1 44 10 0 46 1 44 31 0 47 1 6 31 0
- 48 2 31 0 0 0 49 0 53 0 54 1 6 0 0 56
- 2 31 0 0 0 57 2 6 0 0 31 58 0 10 0 59
- 2 7 10 0 0 62 4 0 7 19 0 7 7 63 0 53
- 0 67 0 8 0 68 2 8 10 0 0 69 1 6 10 0
- 70 2 6 7 0 7 72 3 0 31 7 0 31 74 2 7
- 10 0 0 75 2 6 0 27 0 76 1 0 0 0 77 2
- 7 10 0 0 78 2 0 10 0 0 79 2 0 10 11 0
- 60 2 0 0 11 0 12 2 0 0 27 0 28 1 0 0
- 0 66 1 0 0 0 77 2 0 0 27 0 42 3 0 7
- 19 0 7 61 4 0 7 19 0 7 7 63 2 0 7 19
- 0 21 2 0 31 27 0 55 3 0 31 7 0 31 74
- 2 0 0 8 7 64 3 0 0 11 0 0 30 3 0 0 11
- 0 0 24 3 0 0 19 0 0 65 1 0 0 7 15 3 0
- 0 7 0 31 39 3 0 0 0 0 31 41 2 0 51 27
- 0 52 2 0 0 0 44 50 2 0 0 0 31 43 3 0
- 0 0 0 31 73 1 0 0 0 71 2 0 10 0 0 79)))))
+ 0 10 0 25 1 10 0 0 26 2 6 0 0 0 27 2
+ 6 10 0 0 30 1 6 32 0 33 2 32 10 0 0
+ 34 2 32 10 0 0 35 0 8 0 36 0 32 0 37
+ 2 32 0 0 0 38 2 6 0 0 8 39 2 6 0 0 0
+ 41 1 45 32 0 46 1 45 10 0 47 1 45 32
+ 0 48 1 6 32 0 49 2 32 0 0 0 50 0 54 0
+ 55 1 6 0 0 57 2 32 0 0 0 58 2 6 0 0
+ 32 59 0 10 0 60 2 7 10 0 0 63 4 0 7
+ 19 0 7 7 64 0 54 0 68 0 8 0 69 2 8 10
+ 0 0 70 1 6 10 0 71 2 6 7 0 7 73 3 0
+ 32 7 0 32 75 2 7 10 0 0 76 2 6 0 28 0
+ 77 1 0 0 0 78 2 7 10 0 0 79 2 0 10 0
+ 0 80 2 0 10 11 0 61 2 0 0 11 0 12 2 0
+ 0 28 0 29 1 0 0 0 67 1 0 0 0 78 2 0 0
+ 28 0 43 3 0 7 19 0 7 62 4 0 7 19 0 7
+ 7 64 2 0 7 19 0 21 2 0 32 28 0 56 3 0
+ 32 7 0 32 75 2 0 0 8 7 65 3 0 0 11 0
+ 0 31 3 0 0 11 0 0 24 3 0 0 19 0 0 66
+ 1 0 0 7 15 3 0 0 7 0 32 40 3 0 0 0 0
+ 32 42 2 0 52 28 0 53 2 0 0 0 45 51 2
+ 0 0 0 32 44 3 0 0 0 0 32 74 1 0 0 0
+ 72 2 0 10 0 0 80)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp
index 1e1305b4..1c9a7a9c 100644
--- a/src/algebra/strap/NNI.lsp
+++ b/src/algebra/strap/NNI.lsp
@@ -2,7 +2,7 @@
(/VERSIONCHECK 2)
(|noteSubDomainInfo| '|NonNegativeInteger| '(|Integer|)
- '(COND ((< |#1| 0) 'NIL) ('T 'T)))
+ '(NOT (< |#1| 0)))
(DECLAIM (FTYPE (FUNCTION
((|%IntegerSection| 0) (|%IntegerSection| 0)
@@ -39,8 +39,7 @@
('T
(CONS 0
(PROG1 |c|
- (|check-subtype|
- (COND ((< |c| 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< |c| 0))
'(|NonNegativeInteger|) |c|))))))))))
(DEFUN |NonNegativeInteger| ()
@@ -70,7 +69,7 @@
(PROGN
(LETT |dv$| '(|NonNegativeInteger|)
. #0=(|NonNegativeInteger|))
- (LETT $ (|newShell| 23) . #0#)
+ (LETT $ (|newShell| 21) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -81,18 +80,17 @@
(MAKEPROP '|NonNegativeInteger| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL (|Integer|) (0 . |Zero|) (4 . |Zero|)
- (|Boolean|) (8 . <) (14 . |false|) (18 . |true|)
- |NNI;sup;3$;1| |NNI;shift;$I$;2| (22 . -)
- (|Union| $ '"failed") |NNI;subtractIfCan;2$U;3|
+ (|Boolean|) (8 . <) |NNI;sup;3$;1| |NNI;shift;$I$;2|
+ (14 . -) (|Union| $ '"failed") |NNI;subtractIfCan;2$U;3|
(|Record| (|:| |quotient| $) (|:| |remainder| $))
(|PositiveInteger|) (|NonNegativeInteger|)
(|SingleInteger|) (|String|) (|OutputForm|))
- '#(~= 28 |zero?| 34 |sup| 39 |subtractIfCan| 45 |shift| 51
- |sample| 57 |rem| 61 |recip| 67 |random| 72 |quo| 77
- |one?| 83 |min| 88 |max| 94 |latex| 100 |hash| 105 |gcd|
- 110 |exquo| 116 |divide| 122 |coerce| 128 |before?| 133
- |Zero| 139 |One| 143 >= 147 > 153 = 159 <= 165 < 171 + 177
- ** 183 * 195)
+ '#(~= 20 |zero?| 26 |sup| 31 |subtractIfCan| 37 |shift| 43
+ |sample| 49 |rem| 53 |recip| 59 |random| 64 |quo| 69
+ |one?| 75 |min| 80 |max| 86 |latex| 92 |hash| 97 |gcd| 102
+ |exquo| 108 |divide| 114 |coerce| 120 |before?| 125 |Zero|
+ 131 |One| 135 >= 139 > 145 = 151 <= 157 < 163 + 169 ** 175
+ * 187)
'(((|commutative| "*") . 0))
(CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0))
(CONS '#(NIL NIL NIL NIL NIL |Monoid&| |AbelianMonoid&|
@@ -106,20 +104,20 @@
(|AbelianMonoid|) (|OrderedSet|)
(|SemiGroup|) (|AbelianSemiGroup|)
(|SetCategory|) (|BasicType|)
- (|CoercibleTo| 22))
- (|makeByteWordVec2| 22
- '(0 0 0 6 0 5 0 7 2 5 8 0 0 9 0 8 0 10
- 0 8 0 11 2 5 0 0 0 14 2 0 8 0 0 1 1 0
- 8 0 1 2 0 0 0 0 12 2 0 15 0 0 16 2 0
- 0 0 5 13 0 0 0 1 2 0 0 0 0 1 1 0 15 0
- 1 1 0 0 0 1 2 0 0 0 0 1 1 0 8 0 1 2 0
- 0 0 0 1 2 0 0 0 0 1 1 0 21 0 1 1 0 20
- 0 1 2 0 0 0 0 1 2 0 15 0 0 1 2 0 17 0
- 0 1 1 0 22 0 1 2 0 8 0 0 1 0 0 0 6 0
- 0 0 1 2 0 8 0 0 1 2 0 8 0 0 1 2 0 8 0
- 0 1 2 0 8 0 0 1 2 0 8 0 0 1 2 0 0 0 0
- 1 2 0 0 0 18 1 2 0 0 0 19 1 2 0 0 0 0
- 1 2 0 0 19 0 1 2 0 0 18 0 1)))))
+ (|CoercibleTo| 20))
+ (|makeByteWordVec2| 20
+ '(0 0 0 6 0 5 0 7 2 5 8 0 0 9 2 5 0 0 0
+ 12 2 0 8 0 0 1 1 0 8 0 1 2 0 0 0 0 10
+ 2 0 13 0 0 14 2 0 0 0 5 11 0 0 0 1 2
+ 0 0 0 0 1 1 0 13 0 1 1 0 0 0 1 2 0 0
+ 0 0 1 1 0 8 0 1 2 0 0 0 0 1 2 0 0 0 0
+ 1 1 0 19 0 1 1 0 18 0 1 2 0 0 0 0 1 2
+ 0 13 0 0 1 2 0 15 0 0 1 1 0 20 0 1 2
+ 0 8 0 0 1 0 0 0 6 0 0 0 1 2 0 8 0 0 1
+ 2 0 8 0 0 1 2 0 8 0 0 1 2 0 8 0 0 1 2
+ 0 8 0 0 1 2 0 0 0 0 1 2 0 0 0 16 1 2
+ 0 0 0 17 1 2 0 0 0 0 1 2 0 0 17 0 1 2
+ 0 0 16 0 1)))))
'|lookupComplete|))
(MAKEPROP '|NonNegativeInteger| 'NILADIC T)
diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp
index 902eba73..3c1f11fa 100644
--- a/src/algebra/strap/POLYCAT-.lsp
+++ b/src/algebra/strap/POLYCAT-.lsp
@@ -697,7 +697,7 @@
(SPADCALL |mm|
(|POLYCAT-;eq2R| (|SPADfirst| |l|) |d|
$)
- (|getShellEntry| $ 118))
+ (|getShellEntry| $ 119))
|POLYCAT-;reducedSystem;MM;20|)
(EXIT (LETT |l| (CDR |l|)
|POLYCAT-;reducedSystem;MM;20|)))
@@ -710,7 +710,7 @@
(RETURN
(SEQ (LETT |l| (SPADCALL |m| (|getShellEntry| $ 114))
|POLYCAT-;reducedSystem;MVR;21|)
- (LETT |r| (SPADCALL |v| (|getShellEntry| $ 122))
+ (LETT |r| (SPADCALL |v| (|getShellEntry| $ 123))
|POLYCAT-;reducedSystem;MVR;21|)
(LETT |b|
(SPADCALL
@@ -743,7 +743,7 @@
(GO G190) G191
(EXIT (NREVERSE0 #0#))))
(|getShellEntry| $ 99))
- (|getShellEntry| $ 123))
+ (|getShellEntry| $ 124))
(|getShellEntry| $ 100))
|POLYCAT-;reducedSystem;MVR;21|)
(LETT |d|
@@ -781,13 +781,13 @@
(SPADCALL |mm|
(|POLYCAT-;eq2R| (|SPADfirst| |l|) |d|
$)
- (|getShellEntry| $ 118))
+ (|getShellEntry| $ 119))
|POLYCAT-;reducedSystem;MVR;21|)
(LETT |w|
(SPADCALL |w|
(|POLYCAT-;P2R| (|SPADfirst| |r|) |d|
|n| $)
- (|getShellEntry| $ 127))
+ (|getShellEntry| $ 128))
|POLYCAT-;reducedSystem;MVR;21|)
(LETT |l| (CDR |l|)
|POLYCAT-;reducedSystem;MVR;21|)
@@ -797,16 +797,16 @@
(EXIT (CONS |mm| |w|))))))
(DEFUN |POLYCAT-;gcdPolynomial;3Sup;22| (|pp| |qq| $)
- (SPADCALL |pp| |qq| (|getShellEntry| $ 132)))
+ (SPADCALL |pp| |qq| (|getShellEntry| $ 133)))
(DEFUN |POLYCAT-;solveLinearPolynomialEquation;LSupU;23| (|lpp| |pp| $)
- (SPADCALL |lpp| |pp| (|getShellEntry| $ 137)))
+ (SPADCALL |lpp| |pp| (|getShellEntry| $ 138)))
(DEFUN |POLYCAT-;factorPolynomial;SupF;24| (|pp| $)
- (SPADCALL |pp| (|getShellEntry| $ 142)))
+ (SPADCALL |pp| (|getShellEntry| $ 143)))
(DEFUN |POLYCAT-;factorSquareFreePolynomial;SupF;25| (|pp| $)
- (SPADCALL |pp| (|getShellEntry| $ 145)))
+ (SPADCALL |pp| (|getShellEntry| $ 146)))
(DEFUN |POLYCAT-;factor;SF;26| (|p| $)
(PROG (|v| |ansR| #0=#:G1715 |w| #1=#:G1716 |up| |ansSUP| #2=#:G1717
@@ -820,12 +820,12 @@
(SPADCALL
(SPADCALL |p|
(|getShellEntry| $ 48))
- (|getShellEntry| $ 148))
+ (|getShellEntry| $ 149))
|POLYCAT-;factor;SF;26|)
(EXIT (SPADCALL
(SPADCALL
(SPADCALL |ansR|
- (|getShellEntry| $ 150))
+ (|getShellEntry| $ 151))
(|getShellEntry| $ 51))
(PROGN
(LETT #0# NIL
@@ -835,7 +835,7 @@
|POLYCAT-;factor;SF;26|)
(LETT #1#
(SPADCALL |ansR|
- (|getShellEntry| $ 154))
+ (|getShellEntry| $ 155))
|POLYCAT-;factor;SF;26|)
G190
(COND
@@ -859,20 +859,20 @@
|POLYCAT-;factor;SF;26|)
(GO G190) G191
(EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 158)))))
+ (|getShellEntry| $ 159)))))
('T
(SEQ (LETT |up|
(SPADCALL |p| (QCDR |v|)
(|getShellEntry| $ 59))
|POLYCAT-;factor;SF;26|)
(LETT |ansSUP|
- (SPADCALL |up| (|getShellEntry| $ 142))
+ (SPADCALL |up| (|getShellEntry| $ 143))
|POLYCAT-;factor;SF;26|)
(EXIT (SPADCALL
(SPADCALL
(SPADCALL |ansSUP|
- (|getShellEntry| $ 159))
- (QCDR |v|) (|getShellEntry| $ 160))
+ (|getShellEntry| $ 160))
+ (QCDR |v|) (|getShellEntry| $ 161))
(PROGN
(LETT #2# NIL
|POLYCAT-;factor;SF;26|)
@@ -881,7 +881,7 @@
|POLYCAT-;factor;SF;26|)
(LETT #3#
(SPADCALL |ansSUP|
- (|getShellEntry| $ 163))
+ (|getShellEntry| $ 164))
|POLYCAT-;factor;SF;26|)
G190
(COND
@@ -898,7 +898,7 @@
(VECTOR (QVELT |ww| 0)
(SPADCALL (QVELT |ww| 1)
(QCDR |v|)
- (|getShellEntry| $ 160))
+ (|getShellEntry| $ 161))
(QVELT |ww| 2))
#2#)
|POLYCAT-;factor;SF;26|)))
@@ -906,7 +906,7 @@
|POLYCAT-;factor;SF;26|)
(GO G190) G191
(EXIT (NREVERSE0 #2#))))
- (|getShellEntry| $ 158)))))))))))
+ (|getShellEntry| $ 159)))))))))))
(DEFUN |POLYCAT-;conditionP;MU;27| (|mat| $)
(PROG (|ll| #0=#:G1719 |z| #1=#:G1720 |ch| |l| #2=#:G1721 #3=#:G1722
@@ -920,7 +920,7 @@
(SEQ (EXIT (SEQ (LETT |ll|
(SPADCALL
(SPADCALL |mat|
- (|getShellEntry| $ 165))
+ (|getShellEntry| $ 166))
(|getShellEntry| $ 114))
|POLYCAT-;conditionP;MU;27|)
(LETT |llR|
@@ -949,7 +949,7 @@
(EXIT (NREVERSE0 #0#))))
|POLYCAT-;conditionP;MU;27|)
(LETT |monslist| NIL |POLYCAT-;conditionP;MU;27|)
- (LETT |ch| (|spadConstant| $ 168)
+ (LETT |ch| (|spadConstant| $ 169)
|POLYCAT-;conditionP;MU;27|)
(SEQ (LETT |l| NIL |POLYCAT-;conditionP;MU;27|)
(LETT #2# |ll| |POLYCAT-;conditionP;MU;27|)
@@ -990,7 +990,7 @@
(LETT #5#
(SPADCALL #5# #4#
(|getShellEntry| $
- 169))
+ 170))
|POLYCAT-;conditionP;MU;27|))
('T
(PROGN
@@ -1028,7 +1028,7 @@
|POLYCAT-;conditionP;MU;27|)
(LETT |degs|
(SPADCALL |m| |vars|
- (|getShellEntry| $ 170))
+ (|getShellEntry| $ 171))
|POLYCAT-;conditionP;MU;27|)
(LETT |deg1|
(PROGN
@@ -1055,7 +1055,7 @@
(LETT |nd|
(SPADCALL |d| |ch|
(|getShellEntry| $
- 172))
+ 173))
|POLYCAT-;conditionP;MU;27|)
(EXIT
(COND
@@ -1071,10 +1071,7 @@
(QCDR |nd|)
|POLYCAT-;conditionP;MU;27|)
(|check-subtype|
- (COND
- ((< #11# 0)
- 'NIL)
- ('T 'T))
+ (NOT (< #11# 0))
'(|NonNegativeInteger|)
#11#))))))
#8#)
@@ -1129,7 +1126,7 @@
(|getShellEntry| $
68))
(|getShellEntry| $
- 174))
+ 175))
|v|)
#12#)
|POLYCAT-;conditionP;MU;27|)))
@@ -1155,8 +1152,8 @@
(SPADCALL
(SPADCALL |llR|
(|getShellEntry| $ 111))
- (|getShellEntry| $ 177))
- (|getShellEntry| $ 179))
+ (|getShellEntry| $ 178))
+ (|getShellEntry| $ 180))
|POLYCAT-;conditionP;MU;27|)
(EXIT (COND
((QEQCAR |ans| 1) (CONS 1 "failed"))
@@ -1217,11 +1214,11 @@
(+ |i| 1)
|POLYCAT-;conditionP;MU;27|)
(|getShellEntry|
- $ 180))
+ $ 181))
(|getShellEntry|
$ 51))
(|getShellEntry|
- $ 181))
+ $ 182))
|POLYCAT-;conditionP;MU;27|)
(COND
(#21#
@@ -1229,7 +1226,7 @@
(SPADCALL #20#
#19#
(|getShellEntry|
- $ 182))
+ $ 183))
|POLYCAT-;conditionP;MU;27|))
('T
(PROGN
@@ -1265,8 +1262,8 @@
(SEQ (LETT |ans|
(SPADCALL
(SPADCALL |p|
- (|getShellEntry| $ 174))
- (|getShellEntry| $ 184))
+ (|getShellEntry| $ 175))
+ (|getShellEntry| $ 185))
|POLYCAT-;charthRoot;SU;28|)
(EXIT (COND
((QEQCAR |ans| 1) (CONS 1 "failed"))
@@ -1275,7 +1272,7 @@
(SPADCALL (QCDR |ans|)
(|getShellEntry| $ 51))))))))
('T
- (SEQ (LETT |ch| (|spadConstant| $ 168)
+ (SEQ (LETT |ch| (|spadConstant| $ 169)
|POLYCAT-;charthRoot;SU;28|)
(EXIT (|POLYCAT-;charthRootlv| |p| |vars| |ch|
$))))))))))
@@ -1288,8 +1285,8 @@
(SEQ (LETT |ans|
(SPADCALL
(SPADCALL |p|
- (|getShellEntry| $ 174))
- (|getShellEntry| $ 184))
+ (|getShellEntry| $ 175))
+ (|getShellEntry| $ 185))
|POLYCAT-;charthRootlv|)
(EXIT (COND
((QEQCAR |ans| 1) (CONS 1 "failed"))
@@ -1311,7 +1308,7 @@
(SEQ G190 (COND ((NULL (< 0 |d|)) (GO G191)))
(SEQ (LETT |dd|
(SPADCALL |d| |ch|
- (|getShellEntry| $ 172))
+ (|getShellEntry| $ 173))
|POLYCAT-;charthRootlv|)
(EXIT
(COND
@@ -1324,13 +1321,13 @@
(SEQ
(LETT |cp|
(SPADCALL |p| |v| |d|
- (|getShellEntry| $ 189))
+ (|getShellEntry| $ 190))
|POLYCAT-;charthRootlv|)
(LETT |p|
(SPADCALL |p|
(SPADCALL |cp| |v| |d|
(|getShellEntry| $ 47))
- (|getShellEntry| $ 190))
+ (|getShellEntry| $ 191))
|POLYCAT-;charthRootlv|)
(LETT |ansx|
(|POLYCAT-;charthRootlv| |cp|
@@ -1359,13 +1356,11 @@
(LETT #0# (QCDR |dd|)
|POLYCAT-;charthRootlv|)
(|check-subtype|
- (COND
- ((< #0# 0) 'NIL)
- ('T 'T))
+ (NOT (< #0# 0))
'(|NonNegativeInteger|)
#0#))
(|getShellEntry| $ 47))
- (|getShellEntry| $ 182))
+ (|getShellEntry| $ 183))
|POLYCAT-;charthRootlv|)))))))))))
NIL (GO G190) G191 (EXIT NIL))
(LETT |ansx|
@@ -1383,7 +1378,7 @@
(LETT #1#
(CONS 0
(SPADCALL |ans| (QCDR |ansx|)
- (|getShellEntry| $ 182)))
+ (|getShellEntry| $ 183)))
|POLYCAT-;charthRootlv|)
(GO #1#)))))))))
#1# (EXIT #1#)))))
@@ -1395,34 +1390,34 @@
(SPADCALL
(SPADCALL |p1| |mvar| (|getShellEntry| $ 59))
(SPADCALL |p2| |mvar| (|getShellEntry| $ 59))
- (|getShellEntry| $ 192))
+ (|getShellEntry| $ 193))
|POLYCAT-;monicDivide;2SVarSetR;30|)
(EXIT (CONS (SPADCALL (QCAR |result|) |mvar|
- (|getShellEntry| $ 160))
+ (|getShellEntry| $ 161))
(SPADCALL (QCDR |result|) |mvar|
- (|getShellEntry| $ 160))))))))
+ (|getShellEntry| $ 161))))))))
(DEFUN |POLYCAT-;squareFree;SF;31| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 195)))
+ (SPADCALL |p| (|getShellEntry| $ 196)))
(DEFUN |POLYCAT-;squareFree;SF;32| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 198)))
+ (SPADCALL |p| (|getShellEntry| $ 199)))
(DEFUN |POLYCAT-;squareFree;SF;33| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 198)))
+ (SPADCALL |p| (|getShellEntry| $ 199)))
(DEFUN |POLYCAT-;squareFreePart;2S;34| (|p| $)
(PROG (|s| |f| #0=#:G1733 #1=#:G1653 #2=#:G1651 #3=#:G1652)
(RETURN
(SEQ (SPADCALL
(SPADCALL
- (LETT |s| (SPADCALL |p| (|getShellEntry| $ 199))
+ (LETT |s| (SPADCALL |p| (|getShellEntry| $ 200))
|POLYCAT-;squareFreePart;2S;34|)
- (|getShellEntry| $ 200))
+ (|getShellEntry| $ 201))
(PROGN
(LETT #3# NIL |POLYCAT-;squareFreePart;2S;34|)
(SEQ (LETT |f| NIL |POLYCAT-;squareFreePart;2S;34|)
- (LETT #0# (SPADCALL |s| (|getShellEntry| $ 203))
+ (LETT #0# (SPADCALL |s| (|getShellEntry| $ 204))
|POLYCAT-;squareFreePart;2S;34|)
G190
(COND
@@ -1439,7 +1434,7 @@
(#3#
(LETT #2#
(SPADCALL #2# #1#
- (|getShellEntry| $ 181))
+ (|getShellEntry| $ 182))
|POLYCAT-;squareFreePart;2S;34|))
('T
(PROGN
@@ -1451,11 +1446,11 @@
|POLYCAT-;squareFreePart;2S;34|)
(GO G190) G191 (EXIT NIL))
(COND (#3# #2#) ('T (|spadConstant| $ 43))))
- (|getShellEntry| $ 181))))))
+ (|getShellEntry| $ 182))))))
(DEFUN |POLYCAT-;content;SVarSetS;35| (|p| |v| $)
(SPADCALL (SPADCALL |p| |v| (|getShellEntry| $ 59))
- (|getShellEntry| $ 205)))
+ (|getShellEntry| $ 206)))
(DEFUN |POLYCAT-;primitivePart;2S;36| (|p| $)
(PROG (#0=#:G1657)
@@ -1464,13 +1459,13 @@
(PROG2 (LETT #0#
(SPADCALL |p|
(SPADCALL |p|
- (|getShellEntry| $ 207))
- (|getShellEntry| $ 208))
+ (|getShellEntry| $ 208))
+ (|getShellEntry| $ 209))
|POLYCAT-;primitivePart;2S;36|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) (|getShellEntry| $ 6)
#0#))
- (|getShellEntry| $ 210))
+ (|getShellEntry| $ 211))
1))))
(DEFUN |POLYCAT-;primitivePart;SVarSetS;37| (|p| |v| $)
@@ -1480,13 +1475,13 @@
(PROG2 (LETT #0#
(SPADCALL |p|
(SPADCALL |p| |v|
- (|getShellEntry| $ 212))
- (|getShellEntry| $ 213))
+ (|getShellEntry| $ 213))
+ (|getShellEntry| $ 214))
|POLYCAT-;primitivePart;SVarSetS;37|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) (|getShellEntry| $ 6)
#0#))
- (|getShellEntry| $ 210))
+ (|getShellEntry| $ 211))
1))))
(DEFUN |POLYCAT-;before?;2SB;38| (|p| |q| $)
@@ -1497,34 +1492,34 @@
(LETT |dq| (SPADCALL |q| (|getShellEntry| $ 75))
|POLYCAT-;before?;2SB;38|)
(EXIT (COND
- ((SPADCALL |dp| |dq| (|getShellEntry| $ 215))
+ ((SPADCALL |dp| |dq| (|getShellEntry| $ 216))
(SPADCALL (|spadConstant| $ 28)
(SPADCALL |q| (|getShellEntry| $ 48))
- (|getShellEntry| $ 216)))
- ((SPADCALL |dq| |dp| (|getShellEntry| $ 215))
+ (|getShellEntry| $ 217)))
+ ((SPADCALL |dq| |dp| (|getShellEntry| $ 216))
(SPADCALL (SPADCALL |p| (|getShellEntry| $ 48))
- (|spadConstant| $ 28) (|getShellEntry| $ 216)))
+ (|spadConstant| $ 28) (|getShellEntry| $ 217)))
('T
(SPADCALL
(SPADCALL (SPADCALL |p| |q|
- (|getShellEntry| $ 190))
+ (|getShellEntry| $ 191))
(|getShellEntry| $ 48))
- (|spadConstant| $ 28) (|getShellEntry| $ 216)))))))))
+ (|spadConstant| $ 28) (|getShellEntry| $ 217)))))))))
(DEFUN |POLYCAT-;patternMatch;SP2Pmr;39| (|p| |pat| |l| $)
- (SPADCALL |p| |pat| |l| (|getShellEntry| $ 221)))
+ (SPADCALL |p| |pat| |l| (|getShellEntry| $ 222)))
(DEFUN |POLYCAT-;patternMatch;SP2Pmr;40| (|p| |pat| |l| $)
- (SPADCALL |p| |pat| |l| (|getShellEntry| $ 228)))
+ (SPADCALL |p| |pat| |l| (|getShellEntry| $ 229)))
(DEFUN |POLYCAT-;convert;SP;41| (|x| $)
- (SPADCALL (ELT $ 231) (ELT $ 232) |x| (|getShellEntry| $ 236)))
+ (SPADCALL (ELT $ 232) (ELT $ 233) |x| (|getShellEntry| $ 237)))
(DEFUN |POLYCAT-;convert;SP;42| (|x| $)
- (SPADCALL (ELT $ 238) (ELT $ 239) |x| (|getShellEntry| $ 243)))
+ (SPADCALL (ELT $ 239) (ELT $ 240) |x| (|getShellEntry| $ 244)))
(DEFUN |POLYCAT-;convert;SIf;43| (|p| $)
- (SPADCALL (ELT $ 246) (ELT $ 247) |p| (|getShellEntry| $ 251)))
+ (SPADCALL (ELT $ 247) (ELT $ 248) |p| (|getShellEntry| $ 252)))
(DEFUN |PolynomialCategory&| (|#1| |#2| |#3| |#4|)
(PROG (|dv$1| |dv$2| |dv$3| |dv$4| |dv$| $ |pv$|)
@@ -1536,7 +1531,7 @@
(LETT |dv$4| (|devaluate| |#4|) . #0#)
(LETT |dv$|
(LIST '|PolynomialCategory&| |dv$1| |dv$2| |dv$3| |dv$4|) . #0#)
- (LETT $ (|newShell| 260) . #0#)
+ (LETT $ (|newShell| 261) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -1590,46 +1585,46 @@
(COND
((|HasCategory| |#2| '(|IntegralDomain|))
(PROGN
- (|setShellEntry| $ 120
+ (|setShellEntry| $ 121
(CONS (|dispatchFunction|
|POLYCAT-;reducedSystem;MM;20|)
$))
- (|setShellEntry| $ 130
+ (|setShellEntry| $ 131
(CONS (|dispatchFunction|
|POLYCAT-;reducedSystem;MVR;21|)
$)))))
(COND
((|testBitVector| |pv$| 1)
(PROGN
- (|setShellEntry| $ 133
+ (|setShellEntry| $ 134
(CONS (|dispatchFunction|
|POLYCAT-;gcdPolynomial;3Sup;22|)
$))
- (|setShellEntry| $ 140
+ (|setShellEntry| $ 141
(CONS (|dispatchFunction|
|POLYCAT-;solveLinearPolynomialEquation;LSupU;23|)
$))
- (|setShellEntry| $ 144
+ (|setShellEntry| $ 145
(CONS (|dispatchFunction|
|POLYCAT-;factorPolynomial;SupF;24|)
$))
- (|setShellEntry| $ 146
+ (|setShellEntry| $ 147
(CONS (|dispatchFunction|
|POLYCAT-;factorSquareFreePolynomial;SupF;25|)
$))
- (|setShellEntry| $ 164
+ (|setShellEntry| $ 165
(CONS (|dispatchFunction| |POLYCAT-;factor;SF;26|) $))
(COND
((|HasCategory| |#2| '(|CharacteristicNonZero|))
(PROGN
- (|setShellEntry| $ 183
+ (|setShellEntry| $ 184
(CONS (|dispatchFunction|
|POLYCAT-;conditionP;MU;27|)
$))))))))
(COND
((|HasCategory| |#2| '(|CharacteristicNonZero|))
(PROGN
- (|setShellEntry| $ 185
+ (|setShellEntry| $ 186
(CONS (|dispatchFunction| |POLYCAT-;charthRoot;SU;28|)
$)))))
(COND
@@ -1639,33 +1634,33 @@
((|HasCategory| |#2| '(|EuclideanDomain|))
(COND
((|HasCategory| |#2| '(|CharacteristicZero|))
- (|setShellEntry| $ 196
+ (|setShellEntry| $ 197
(CONS (|dispatchFunction|
|POLYCAT-;squareFree;SF;31|)
$)))
('T
- (|setShellEntry| $ 196
+ (|setShellEntry| $ 197
(CONS (|dispatchFunction|
|POLYCAT-;squareFree;SF;32|)
$)))))
('T
- (|setShellEntry| $ 196
+ (|setShellEntry| $ 197
(CONS (|dispatchFunction|
|POLYCAT-;squareFree;SF;33|)
$))))
- (|setShellEntry| $ 204
+ (|setShellEntry| $ 205
(CONS (|dispatchFunction|
|POLYCAT-;squareFreePart;2S;34|)
$))
- (|setShellEntry| $ 206
+ (|setShellEntry| $ 207
(CONS (|dispatchFunction|
|POLYCAT-;content;SVarSetS;35|)
$))
- (|setShellEntry| $ 211
+ (|setShellEntry| $ 212
(CONS (|dispatchFunction|
|POLYCAT-;primitivePart;2S;36|)
$))
- (|setShellEntry| $ 214
+ (|setShellEntry| $ 215
(CONS (|dispatchFunction|
|POLYCAT-;primitivePart;SVarSetS;37|)
$)))))
@@ -1673,7 +1668,7 @@
((|testBitVector| |pv$| 8)
(COND
((|testBitVector| |pv$| 7)
- (|setShellEntry| $ 223
+ (|setShellEntry| $ 224
(CONS (|dispatchFunction|
|POLYCAT-;patternMatch;SP2Pmr;39|)
$))))))
@@ -1681,7 +1676,7 @@
((|testBitVector| |pv$| 6)
(COND
((|testBitVector| |pv$| 5)
- (|setShellEntry| $ 230
+ (|setShellEntry| $ 231
(CONS (|dispatchFunction|
|POLYCAT-;patternMatch;SP2Pmr;40|)
$))))))
@@ -1689,21 +1684,21 @@
((|testBitVector| |pv$| 12)
(COND
((|testBitVector| |pv$| 11)
- (|setShellEntry| $ 237
+ (|setShellEntry| $ 238
(CONS (|dispatchFunction| |POLYCAT-;convert;SP;41|)
$))))))
(COND
((|testBitVector| |pv$| 10)
(COND
((|testBitVector| |pv$| 9)
- (|setShellEntry| $ 244
+ (|setShellEntry| $ 245
(CONS (|dispatchFunction| |POLYCAT-;convert;SP;42|)
$))))))
(COND
((|testBitVector| |pv$| 14)
(COND
((|testBitVector| |pv$| 13)
- (|setShellEntry| $ 252
+ (|setShellEntry| $ 253
(CONS (|dispatchFunction| |POLYCAT-;convert;SIf;43|)
$))))))
$))))
@@ -1753,92 +1748,92 @@
(349 . |qsetelt!|) (|List| 7) (|List| 108) (|Matrix| 7)
(356 . |matrix|) (|List| 25) (|Matrix| 6)
(361 . |listOfLists|) (366 . |first|) (371 . |rest|)
- (376 . |empty?|) (381 . |vertConcat|) (|Matrix| $)
- (387 . |reducedSystem|) (|Vector| 6) (392 . |entries|)
- (397 . |concat|) (|List| 8) (403 . |#|) (408 . |first|)
- (413 . |concat|)
+ (376 . |empty?|) (381 . |not|) (386 . |vertConcat|)
+ (|Matrix| $) (392 . |reducedSystem|) (|Vector| 6)
+ (397 . |entries|) (402 . |concat|) (|List| 8) (408 . |#|)
+ (413 . |first|) (418 . |concat|)
(|Record| (|:| |mat| 110) (|:| |vec| 101)) (|Vector| $)
- (419 . |reducedSystem|)
+ (424 . |reducedSystem|)
(|GeneralPolynomialGcdPackage| 8 9 7 6)
- (425 . |gcdPolynomial|) (431 . |gcdPolynomial|)
- (|List| 60) (|Union| 134 '"failed")
+ (430 . |gcdPolynomial|) (436 . |gcdPolynomial|)
+ (|List| 60) (|Union| 135 '"failed")
(|PolynomialFactorizationByRecursion| 7 8 9 6)
- (437 . |solveLinearPolynomialEquationByRecursion|)
- (|List| 58) (|Union| 138 '"failed")
- (443 . |solveLinearPolynomialEquation|) (|Factored| 60)
- (449 . |factorByRecursion|) (|Factored| 58)
- (454 . |factorPolynomial|)
- (459 . |factorSquareFreeByRecursion|)
- (464 . |factorSquareFreePolynomial|) (|Factored| $)
- (469 . |factor|) (|Factored| 7) (474 . |unit|)
+ (442 . |solveLinearPolynomialEquationByRecursion|)
+ (|List| 58) (|Union| 139 '"failed")
+ (448 . |solveLinearPolynomialEquation|) (|Factored| 60)
+ (454 . |factorByRecursion|) (|Factored| 58)
+ (459 . |factorPolynomial|)
+ (464 . |factorSquareFreeByRecursion|)
+ (469 . |factorSquareFreePolynomial|) (|Factored| $)
+ (474 . |factor|) (|Factored| 7) (479 . |unit|)
(|Union| '"nil" '"sqfr" '"irred" '"prime")
- (|Record| (|:| |flg| 151) (|:| |fctr| 7) (|:| |xpnt| 103))
- (|List| 152) (479 . |factorList|)
- (|Record| (|:| |flg| 151) (|:| |fctr| 6) (|:| |xpnt| 103))
- (|List| 155) (|Factored| 6) (484 . |makeFR|)
- (490 . |unit|) (495 . |multivariate|)
- (|Record| (|:| |flg| 151) (|:| |fctr| 60)
+ (|Record| (|:| |flg| 152) (|:| |fctr| 7) (|:| |xpnt| 103))
+ (|List| 153) (484 . |factorList|)
+ (|Record| (|:| |flg| 152) (|:| |fctr| 6) (|:| |xpnt| 103))
+ (|List| 156) (|Factored| 6) (489 . |makeFR|)
+ (495 . |unit|) (500 . |multivariate|)
+ (|Record| (|:| |flg| 152) (|:| |fctr| 60)
(|:| |xpnt| 103))
- (|List| 161) (501 . |factorList|) (506 . |factor|)
- (511 . |transpose|) (516 . |empty|) (520 . |empty|)
- (524 . |characteristic|) (528 . |setUnion|)
- (534 . |degree|) (|Union| $ '"failed") (540 . |exquo|)
- (546 . |cons|) (552 . |ground|) (557 . |cons|)
- (563 . |cons|) (569 . |transpose|) (|Union| 129 '"failed")
- (574 . |conditionP|) (579 . |elt|) (585 . *) (591 . +)
- (597 . |conditionP|) (602 . |charthRoot|)
- (607 . |charthRoot|) (612 . |Zero|) (616 . |Zero|)
- (620 . <) (626 . |coefficient|) (633 . -)
+ (|List| 162) (506 . |factorList|) (511 . |factor|)
+ (516 . |transpose|) (521 . |empty|) (525 . |empty|)
+ (529 . |characteristic|) (533 . |setUnion|)
+ (539 . |degree|) (|Union| $ '"failed") (545 . |exquo|)
+ (551 . |cons|) (557 . |ground|) (562 . |cons|)
+ (568 . |cons|) (574 . |transpose|) (|Union| 130 '"failed")
+ (579 . |conditionP|) (584 . |elt|) (590 . *) (596 . +)
+ (602 . |conditionP|) (607 . |charthRoot|)
+ (612 . |charthRoot|) (617 . |Zero|) (621 . |Zero|)
+ (625 . <) (631 . |coefficient|) (638 . -)
(|Record| (|:| |quotient| $) (|:| |remainder| $))
- (639 . |monicDivide|) |POLYCAT-;monicDivide;2SVarSetR;30|
- (|MultivariateSquareFree| 8 9 7 6) (645 . |squareFree|)
- (650 . |squareFree|) (|PolynomialSquareFree| 9 8 7 6)
- (655 . |squareFree|) (660 . |squareFree|) (665 . |unit|)
+ (644 . |monicDivide|) |POLYCAT-;monicDivide;2SVarSetR;30|
+ (|MultivariateSquareFree| 8 9 7 6) (650 . |squareFree|)
+ (655 . |squareFree|) (|PolynomialSquareFree| 9 8 7 6)
+ (660 . |squareFree|) (665 . |squareFree|) (670 . |unit|)
(|Record| (|:| |factor| 6) (|:| |exponent| 103))
- (|List| 201) (670 . |factors|) (675 . |squareFreePart|)
- (680 . |content|) (685 . |content|) (691 . |content|)
- (696 . |exquo|)
+ (|List| 202) (675 . |factors|) (680 . |squareFreePart|)
+ (685 . |content|) (690 . |content|) (696 . |content|)
+ (701 . |exquo|)
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $))
- (702 . |unitNormal|) (707 . |primitivePart|)
- (712 . |content|) (718 . |exquo|) (724 . |primitivePart|)
- (730 . <) (736 . |before?|) |POLYCAT-;before?;2SB;38|
+ (707 . |unitNormal|) (712 . |primitivePart|)
+ (717 . |content|) (723 . |exquo|) (729 . |primitivePart|)
+ (735 . <) (741 . |before?|) |POLYCAT-;before?;2SB;38|
(|PatternMatchResult| 103 6) (|Pattern| 103)
(|PatternMatchPolynomialCategory| 103 8 9 7 6)
- (742 . |patternMatch|) (|PatternMatchResult| 103 $)
- (749 . |patternMatch|) (|Float|)
- (|PatternMatchResult| 224 6) (|Pattern| 224)
- (|PatternMatchPolynomialCategory| 224 8 9 7 6)
- (756 . |patternMatch|) (|PatternMatchResult| 224 $)
- (763 . |patternMatch|) (770 . |convert|) (775 . |convert|)
- (|Mapping| 219 9) (|Mapping| 219 7)
- (|PolynomialCategoryLifting| 8 9 7 6 219) (780 . |map|)
- (787 . |convert|) (792 . |convert|) (797 . |convert|)
- (|Mapping| 226 9) (|Mapping| 226 7)
- (|PolynomialCategoryLifting| 8 9 7 6 226) (802 . |map|)
- (809 . |convert|) (|InputForm|) (814 . |convert|)
- (819 . |convert|) (|Mapping| 245 9) (|Mapping| 245 7)
- (|PolynomialCategoryLifting| 8 9 7 6 245) (824 . |map|)
- (831 . |convert|) (|Matrix| 103) (|Vector| 103)
- (|Record| (|:| |mat| 253) (|:| |vec| 254))
+ (747 . |patternMatch|) (|PatternMatchResult| 103 $)
+ (754 . |patternMatch|) (|Float|)
+ (|PatternMatchResult| 225 6) (|Pattern| 225)
+ (|PatternMatchPolynomialCategory| 225 8 9 7 6)
+ (761 . |patternMatch|) (|PatternMatchResult| 225 $)
+ (768 . |patternMatch|) (775 . |convert|) (780 . |convert|)
+ (|Mapping| 220 9) (|Mapping| 220 7)
+ (|PolynomialCategoryLifting| 8 9 7 6 220) (785 . |map|)
+ (792 . |convert|) (797 . |convert|) (802 . |convert|)
+ (|Mapping| 227 9) (|Mapping| 227 7)
+ (|PolynomialCategoryLifting| 8 9 7 6 227) (807 . |map|)
+ (814 . |convert|) (|InputForm|) (819 . |convert|)
+ (824 . |convert|) (|Mapping| 246 9) (|Mapping| 246 7)
+ (|PolynomialCategoryLifting| 8 9 7 6 246) (829 . |map|)
+ (836 . |convert|) (|Matrix| 103) (|Vector| 103)
+ (|Record| (|:| |mat| 254) (|:| |vec| 255))
(|Union| 103 '"failed") (|Fraction| 103)
- (|Union| 257 '"failed") (|Union| 7 '"failed"))
- '#(|totalDegree| 836 |squareFreePart| 847 |squareFree| 852
- |solveLinearPolynomialEquation| 857 |retractIfCan| 863
- |retract| 868 |resultant| 873 |reducedSystem| 880
- |primitivePart| 891 |primitiveMonomials| 902
- |patternMatch| 907 |monomials| 921 |monomial| 926
- |monicDivide| 933 |isTimes| 940 |isPlus| 945 |isExpt| 950
- |gcdPolynomial| 955 |factorSquareFreePolynomial| 961
- |factorPolynomial| 966 |factor| 971 |eval| 976
- |discriminant| 982 |convert| 988 |content| 1003
- |conditionP| 1009 |coefficient| 1014 |charthRoot| 1028
- |before?| 1033)
+ (|Union| 258 '"failed") (|Union| 7 '"failed"))
+ '#(|totalDegree| 841 |squareFreePart| 852 |squareFree| 857
+ |solveLinearPolynomialEquation| 862 |retractIfCan| 868
+ |retract| 873 |resultant| 878 |reducedSystem| 885
+ |primitivePart| 896 |primitiveMonomials| 907
+ |patternMatch| 912 |monomials| 926 |monomial| 931
+ |monicDivide| 938 |isTimes| 945 |isPlus| 950 |isExpt| 955
+ |gcdPolynomial| 960 |factorSquareFreePolynomial| 966
+ |factorPolynomial| 971 |factor| 976 |eval| 981
+ |discriminant| 987 |convert| 993 |content| 1008
+ |conditionP| 1014 |coefficient| 1019 |charthRoot| 1033
+ |before?| 1038)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 252
+ (|makeByteWordVec2| 253
'(1 12 10 0 13 1 11 6 0 14 1 6 15 0 16
1 6 9 0 17 1 11 6 0 18 3 6 0 0 19 20
21 0 25 0 26 0 6 0 27 0 7 0 28 2 6 10
@@ -1864,54 +1859,54 @@
103 0 105 2 6 7 0 8 106 3 101 7 0 103
7 107 1 110 0 109 111 1 113 112 0 114
1 112 25 0 115 1 112 0 0 116 1 112 10
- 0 117 2 110 0 0 0 118 1 0 110 119 120
- 1 121 25 0 122 2 25 0 0 0 123 1 124
- 45 0 125 1 25 6 0 126 2 101 0 0 0 127
- 2 0 128 119 129 130 2 131 60 60 60
- 132 2 0 58 58 58 133 2 136 135 134 60
- 137 2 0 139 138 58 140 1 136 141 60
- 142 1 0 143 58 144 1 136 141 60 145 1
- 0 143 58 146 1 7 147 0 148 1 149 7 0
- 150 1 149 153 0 154 2 157 0 6 156 158
- 1 141 60 0 159 2 6 0 58 9 160 1 141
- 162 0 163 1 0 147 0 164 1 113 0 0 165
- 0 108 0 166 0 112 0 167 0 6 45 168 2
- 25 0 0 0 169 2 6 63 0 19 170 2 103
- 171 0 0 172 2 25 0 6 0 173 1 6 7 0
- 174 2 108 0 7 0 175 2 112 0 25 0 176
- 1 110 0 0 177 1 7 178 119 179 2 101 7
- 0 103 180 2 6 0 0 0 181 2 6 0 0 0 182
- 1 0 178 119 183 1 7 171 0 184 1 0 171
- 0 185 0 8 0 186 0 103 0 187 2 45 10 0
- 0 188 3 6 0 0 9 45 189 2 6 0 0 0 190
- 2 60 191 0 0 192 1 194 157 6 195 1 0
- 147 0 196 1 197 157 6 198 1 6 147 0
- 199 1 157 6 0 200 1 157 202 0 203 1 0
- 0 0 204 1 60 6 0 205 2 0 0 0 9 206 1
- 6 7 0 207 2 6 171 0 7 208 1 6 209 0
- 210 1 0 0 0 211 2 6 0 0 9 212 2 6 171
- 0 0 213 2 0 0 0 9 214 2 8 10 0 0 215
- 2 7 10 0 0 216 3 220 218 6 219 218
- 221 3 0 222 0 219 222 223 3 227 225 6
- 226 225 228 3 0 229 0 226 229 230 1 9
- 219 0 231 1 7 219 0 232 3 235 219 233
- 234 6 236 1 0 219 0 237 1 9 226 0 238
- 1 7 226 0 239 3 242 226 240 241 6 243
- 1 0 226 0 244 1 9 245 0 246 1 7 245 0
- 247 3 250 245 248 249 6 251 1 0 245 0
- 252 2 0 45 0 19 93 1 0 45 0 88 1 0 0
- 0 204 1 0 147 0 196 2 0 139 138 58
- 140 1 0 15 0 74 1 0 9 0 73 3 0 0 0 0
- 9 95 2 0 128 119 129 130 1 0 110 119
- 120 2 0 0 0 9 214 1 0 0 0 211 1 0 20
- 0 77 3 0 229 0 226 229 230 3 0 222 0
- 219 222 223 1 0 20 0 34 3 0 0 0 19 63
- 71 3 0 191 0 0 9 193 1 0 38 0 52 1 0
- 38 0 39 1 0 56 0 57 2 0 58 58 58 133
- 1 0 143 58 146 1 0 143 58 144 1 0 147
- 0 164 2 0 0 0 23 24 2 0 0 0 9 97 1 0
- 219 0 237 1 0 245 0 252 1 0 226 0 244
- 2 0 0 0 9 206 1 0 178 119 183 3 0 0 0
- 9 45 62 3 0 0 0 19 63 69 1 0 171 0
- 185 2 0 10 0 0 217)))))
+ 0 117 1 10 0 0 118 2 110 0 0 0 119 1
+ 0 110 120 121 1 122 25 0 123 2 25 0 0
+ 0 124 1 125 45 0 126 1 25 6 0 127 2
+ 101 0 0 0 128 2 0 129 120 130 131 2
+ 132 60 60 60 133 2 0 58 58 58 134 2
+ 137 136 135 60 138 2 0 140 139 58 141
+ 1 137 142 60 143 1 0 144 58 145 1 137
+ 142 60 146 1 0 144 58 147 1 7 148 0
+ 149 1 150 7 0 151 1 150 154 0 155 2
+ 158 0 6 157 159 1 142 60 0 160 2 6 0
+ 58 9 161 1 142 163 0 164 1 0 148 0
+ 165 1 113 0 0 166 0 108 0 167 0 112 0
+ 168 0 6 45 169 2 25 0 0 0 170 2 6 63
+ 0 19 171 2 103 172 0 0 173 2 25 0 6 0
+ 174 1 6 7 0 175 2 108 0 7 0 176 2 112
+ 0 25 0 177 1 110 0 0 178 1 7 179 120
+ 180 2 101 7 0 103 181 2 6 0 0 0 182 2
+ 6 0 0 0 183 1 0 179 120 184 1 7 172 0
+ 185 1 0 172 0 186 0 8 0 187 0 103 0
+ 188 2 45 10 0 0 189 3 6 0 0 9 45 190
+ 2 6 0 0 0 191 2 60 192 0 0 193 1 195
+ 158 6 196 1 0 148 0 197 1 198 158 6
+ 199 1 6 148 0 200 1 158 6 0 201 1 158
+ 203 0 204 1 0 0 0 205 1 60 6 0 206 2
+ 0 0 0 9 207 1 6 7 0 208 2 6 172 0 7
+ 209 1 6 210 0 211 1 0 0 0 212 2 6 0 0
+ 9 213 2 6 172 0 0 214 2 0 0 0 9 215 2
+ 8 10 0 0 216 2 7 10 0 0 217 3 221 219
+ 6 220 219 222 3 0 223 0 220 223 224 3
+ 228 226 6 227 226 229 3 0 230 0 227
+ 230 231 1 9 220 0 232 1 7 220 0 233 3
+ 236 220 234 235 6 237 1 0 220 0 238 1
+ 9 227 0 239 1 7 227 0 240 3 243 227
+ 241 242 6 244 1 0 227 0 245 1 9 246 0
+ 247 1 7 246 0 248 3 251 246 249 250 6
+ 252 1 0 246 0 253 2 0 45 0 19 93 1 0
+ 45 0 88 1 0 0 0 205 1 0 148 0 197 2 0
+ 140 139 58 141 1 0 15 0 74 1 0 9 0 73
+ 3 0 0 0 0 9 95 2 0 129 120 130 131 1
+ 0 110 120 121 2 0 0 0 9 215 1 0 0 0
+ 212 1 0 20 0 77 3 0 230 0 227 230 231
+ 3 0 223 0 220 223 224 1 0 20 0 34 3 0
+ 0 0 19 63 71 3 0 192 0 0 9 194 1 0 38
+ 0 52 1 0 38 0 39 1 0 56 0 57 2 0 58
+ 58 58 134 1 0 144 58 147 1 0 144 58
+ 145 1 0 148 0 165 2 0 0 0 23 24 2 0 0
+ 0 9 97 1 0 220 0 238 1 0 246 0 253 1
+ 0 227 0 245 2 0 0 0 9 207 1 0 179 120
+ 184 3 0 0 0 9 45 62 3 0 0 0 19 63 69
+ 1 0 172 0 186 2 0 10 0 0 218)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/STAGG-.lsp b/src/algebra/strap/STAGG-.lsp
index cb3671d0..53a1ca39 100644
--- a/src/algebra/strap/STAGG-.lsp
+++ b/src/algebra/strap/STAGG-.lsp
@@ -62,23 +62,23 @@
(|STAGG-;c2| |x|
(LETT |x|
(SPADCALL |x|
- (|getShellEntry| $ 16))
+ (|getShellEntry| $ 17))
|STAGG-;first;ANniA;3|)
$)
#0#)
|STAGG-;first;ANniA;3|)))
(LETT |i| (QSADD1 |i|) |STAGG-;first;ANniA;3|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 18))))))
+ (|getShellEntry| $ 19))))))
(DEFUN |STAGG-;c2| (|x| |r| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 20))
+ ((SPADCALL |x| (|getShellEntry| $ 21))
(|error| "Index out of range"))
- ('T (SPADCALL |x| (|getShellEntry| $ 21)))))
+ ('T (SPADCALL |x| (|getShellEntry| $ 22)))))
(DEFUN |STAGG-;elt;AIS;5| (|x| |i| $)
- (SEQ (LETT |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 23)))
+ (SEQ (LETT |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 24)))
|STAGG-;elt;AIS;5|)
(COND
((OR (< |i| 0)
@@ -89,38 +89,38 @@
(|check-subtype|
(COND ((< |i| 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) |i|))
- (|getShellEntry| $ 27))
+ (|getShellEntry| $ 28))
|STAGG-;elt;AIS;5|)
- (|getShellEntry| $ 20)))
+ (|getShellEntry| $ 21)))
(EXIT (|error| "index out of range"))))
- (EXIT (SPADCALL |x| (|getShellEntry| $ 21)))))
+ (EXIT (SPADCALL |x| (|getShellEntry| $ 22)))))
(DEFUN |STAGG-;elt;AUsA;6| (|x| |i| $)
(PROG (|l| |h| #0=#:G1418)
(RETURN
(SEQ (LETT |l|
- (- (SPADCALL |i| (|getShellEntry| $ 30))
- (SPADCALL |x| (|getShellEntry| $ 23)))
+ (- (SPADCALL |i| (|getShellEntry| $ 31))
+ (SPADCALL |x| (|getShellEntry| $ 24)))
|STAGG-;elt;AUsA;6|)
(EXIT (COND
((< |l| 0) (|error| "index out of range"))
- ((NOT (SPADCALL |i| (|getShellEntry| $ 31)))
+ ((NOT (SPADCALL |i| (|getShellEntry| $ 32)))
(SPADCALL
(SPADCALL |x|
(PROG1 |l|
(|check-subtype|
(COND ((< |l| 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) |l|))
- (|getShellEntry| $ 27))
- (|getShellEntry| $ 32)))
+ (|getShellEntry| $ 28))
+ (|getShellEntry| $ 33)))
('T
(SEQ (LETT |h|
- (- (SPADCALL |i| (|getShellEntry| $ 33))
- (SPADCALL |x| (|getShellEntry| $ 23)))
+ (- (SPADCALL |i| (|getShellEntry| $ 34))
+ (SPADCALL |x| (|getShellEntry| $ 24)))
|STAGG-;elt;AUsA;6|)
(EXIT (COND
((< |h| |l|)
- (SPADCALL (|getShellEntry| $ 34)))
+ (SPADCALL (|getShellEntry| $ 35)))
('T
(SPADCALL
(SPADCALL |x|
@@ -130,7 +130,7 @@
((< |l| 0) 'NIL)
('T 'T))
'(|NonNegativeInteger|) |l|))
- (|getShellEntry| $ 27))
+ (|getShellEntry| $ 28))
(PROG1
(LETT #0# (+ (- |h| |l|) 1)
|STAGG-;elt;AUsA;6|)
@@ -139,19 +139,19 @@
((< #0# 0) 'NIL)
('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 36)))))))))))))
+ (|getShellEntry| $ 37)))))))))))))
(DEFUN |STAGG-;concat;3A;7| (|x| |y| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 32)) |y|
- (|getShellEntry| $ 38)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 33)) |y|
+ (|getShellEntry| $ 39)))
(DEFUN |STAGG-;concat;LA;8| (|l| $)
(COND
- ((NULL |l|) (SPADCALL (|getShellEntry| $ 34)))
+ ((NULL |l|) (SPADCALL (|getShellEntry| $ 35)))
('T
- (SPADCALL (SPADCALL (|SPADfirst| |l|) (|getShellEntry| $ 32))
- (SPADCALL (CDR |l|) (|getShellEntry| $ 45))
- (|getShellEntry| $ 38)))))
+ (SPADCALL (SPADCALL (|SPADfirst| |l|) (|getShellEntry| $ 33))
+ (SPADCALL (CDR |l|) (|getShellEntry| $ 46))
+ (|getShellEntry| $ 39)))))
(DEFUN |STAGG-;map!;M2A;9| (|f| |l| $)
(PROG (|y|)
@@ -159,14 +159,14 @@
(SEQ (LETT |y| |l| |STAGG-;map!;M2A;9|)
(SEQ G190
(COND
- ((NULL (NOT (SPADCALL |l| (|getShellEntry| $ 20))))
+ ((NULL (NOT (SPADCALL |l| (|getShellEntry| $ 21))))
(GO G191)))
(SEQ (SPADCALL |l|
(SPADCALL
- (SPADCALL |l| (|getShellEntry| $ 21)) |f|)
- (|getShellEntry| $ 47))
+ (SPADCALL |l| (|getShellEntry| $ 22)) |f|)
+ (|getShellEntry| $ 48))
(EXIT (LETT |l|
- (SPADCALL |l| (|getShellEntry| $ 16))
+ (SPADCALL |l| (|getShellEntry| $ 17))
|STAGG-;map!;M2A;9|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |y|)))))
@@ -177,17 +177,17 @@
(SEQ (LETT |y| |x| |STAGG-;fill!;ASA;10|)
(SEQ G190
(COND
- ((NULL (NOT (SPADCALL |y| (|getShellEntry| $ 20))))
+ ((NULL (NOT (SPADCALL |y| (|getShellEntry| $ 21))))
(GO G191)))
- (SEQ (SPADCALL |y| |s| (|getShellEntry| $ 47))
+ (SEQ (SPADCALL |y| |s| (|getShellEntry| $ 48))
(EXIT (LETT |y|
- (SPADCALL |y| (|getShellEntry| $ 16))
+ (SPADCALL |y| (|getShellEntry| $ 17))
|STAGG-;fill!;ASA;10|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |x|)))))
(DEFUN |STAGG-;setelt;AI2S;11| (|x| |i| |s| $)
- (SEQ (LETT |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 23)))
+ (SEQ (LETT |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 24)))
|STAGG-;setelt;AI2S;11|)
(COND
((OR (< |i| 0)
@@ -198,31 +198,31 @@
(|check-subtype|
(COND ((< |i| 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) |i|))
- (|getShellEntry| $ 27))
+ (|getShellEntry| $ 28))
|STAGG-;setelt;AI2S;11|)
- (|getShellEntry| $ 20)))
+ (|getShellEntry| $ 21)))
(EXIT (|error| "index out of range"))))
- (EXIT (SPADCALL |x| |s| (|getShellEntry| $ 47)))))
+ (EXIT (SPADCALL |x| |s| (|getShellEntry| $ 48)))))
(DEFUN |STAGG-;setelt;AUs2S;12| (|x| |i| |s| $)
(PROG (|l| |h| #0=#:G1438 |z| |y|)
(RETURN
(SEQ (LETT |l|
- (- (SPADCALL |i| (|getShellEntry| $ 30))
- (SPADCALL |x| (|getShellEntry| $ 23)))
+ (- (SPADCALL |i| (|getShellEntry| $ 31))
+ (SPADCALL |x| (|getShellEntry| $ 24)))
|STAGG-;setelt;AUs2S;12|)
(EXIT (COND
((< |l| 0) (|error| "index out of range"))
('T
(SEQ (LETT |h|
(COND
- ((SPADCALL |i| (|getShellEntry| $ 31))
+ ((SPADCALL |i| (|getShellEntry| $ 32))
(- (SPADCALL |i|
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 34))
(SPADCALL |x|
- (|getShellEntry| $ 23))))
+ (|getShellEntry| $ 24))))
('T
- (SPADCALL |x| (|getShellEntry| $ 52))))
+ (SPADCALL |x| (|getShellEntry| $ 53))))
|STAGG-;setelt;AUs2S;12|)
(EXIT (COND
((< |h| |l|) |s|)
@@ -236,7 +236,7 @@
('T 'T))
'(|NonNegativeInteger|)
|l|))
- (|getShellEntry| $ 27))
+ (|getShellEntry| $ 28))
|STAGG-;setelt;AUs2S;12|)
(LETT |z|
(SPADCALL |y|
@@ -249,32 +249,32 @@
('T 'T))
'(|NonNegativeInteger|)
#0#))
- (|getShellEntry| $ 27))
+ (|getShellEntry| $ 28))
|STAGG-;setelt;AUs2S;12|)
(SEQ G190
(COND
((NULL
(NOT
(SPADCALL |y| |z|
- (|getShellEntry| $ 53))))
+ (|getShellEntry| $ 54))))
(GO G191)))
(SEQ
(SPADCALL |y| |s|
- (|getShellEntry| $ 47))
+ (|getShellEntry| $ 48))
(EXIT
(LETT |y|
(SPADCALL |y|
- (|getShellEntry| $ 16))
+ (|getShellEntry| $ 17))
|STAGG-;setelt;AUs2S;12|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |s|)))))))))))))
(DEFUN |STAGG-;concat!;3A;13| (|x| |y| $)
(SEQ (COND
- ((SPADCALL |x| (|getShellEntry| $ 20)) |y|)
+ ((SPADCALL |x| (|getShellEntry| $ 21)) |y|)
('T
- (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 55)) |y|
- (|getShellEntry| $ 56))
+ (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 56)) |y|
+ (|getShellEntry| $ 57))
(EXIT |x|))))))
(DEFUN |StreamAggregate&| (|#1| |#2|)
@@ -284,7 +284,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| 62) . #0#)
+ (LETT $ (|newShell| 63) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -294,65 +294,65 @@
(COND
((|HasAttribute| |#1| '|shallowlyMutable|)
(PROGN
- (|setShellEntry| $ 39
+ (|setShellEntry| $ 40
(CONS (|dispatchFunction| |STAGG-;concat;3A;7|) $))
- (|setShellEntry| $ 46
+ (|setShellEntry| $ 47
(CONS (|dispatchFunction| |STAGG-;concat;LA;8|) $))
- (|setShellEntry| $ 49
- (CONS (|dispatchFunction| |STAGG-;map!;M2A;9|) $))
(|setShellEntry| $ 50
- (CONS (|dispatchFunction| |STAGG-;fill!;ASA;10|) $))
+ (CONS (|dispatchFunction| |STAGG-;map!;M2A;9|) $))
(|setShellEntry| $ 51
+ (CONS (|dispatchFunction| |STAGG-;fill!;ASA;10|) $))
+ (|setShellEntry| $ 52
(CONS (|dispatchFunction| |STAGG-;setelt;AI2S;11|) $))
- (|setShellEntry| $ 54
+ (|setShellEntry| $ 55
(CONS (|dispatchFunction| |STAGG-;setelt;AUs2S;12|) $))
- (|setShellEntry| $ 57
+ (|setShellEntry| $ 58
(CONS (|dispatchFunction| |STAGG-;concat!;3A;13|) $)))))
$))))
(MAKEPROP '|StreamAggregate&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|)
- (|Boolean|) (0 . |cyclic?|)
+ (|Boolean|) (0 . |cyclic?|) (5 . |not|)
|STAGG-;explicitlyFinite?;AB;1|
|STAGG-;possiblyInfinite?;AB;2| (|SingleInteger|)
- (5 . |One|) (|NonNegativeInteger|) (9 . |One|)
- (13 . |rest|) (|List| 7) (18 . |construct|)
- |STAGG-;first;ANniA;3| (23 . |empty?|) (28 . |first|)
- (|Integer|) (33 . |minIndex|) (38 . -) (44 . |Zero|)
- (48 . <) (54 . |rest|) |STAGG-;elt;AIS;5|
- (|UniversalSegment| 22) (60 . |lo|) (65 . |hasHi|)
- (70 . |copy|) (75 . |hi|) (80 . |empty|) (84 . +)
- (90 . |first|) |STAGG-;elt;AUsA;6| (96 . |concat!|)
- (102 . |concat|) (|List| 6) (108 . |empty?|)
- (113 . |first|) (118 . |rest|) (|List| $) (123 . |concat|)
- (128 . |concat|) (133 . |setfirst!|) (|Mapping| 7 7)
- (139 . |map!|) (145 . |fill!|) (151 . |setelt|)
- (158 . |maxIndex|) (163 . |eq?|) (169 . |setelt|)
- (176 . |tail|) (181 . |setrest!|) (187 . |concat!|)
+ (10 . |One|) (|NonNegativeInteger|) (14 . |One|)
+ (18 . |rest|) (|List| 7) (23 . |construct|)
+ |STAGG-;first;ANniA;3| (28 . |empty?|) (33 . |first|)
+ (|Integer|) (38 . |minIndex|) (43 . -) (49 . |Zero|)
+ (53 . <) (59 . |rest|) |STAGG-;elt;AIS;5|
+ (|UniversalSegment| 23) (65 . |lo|) (70 . |hasHi|)
+ (75 . |copy|) (80 . |hi|) (85 . |empty|) (89 . +)
+ (95 . |first|) |STAGG-;elt;AUsA;6| (101 . |concat!|)
+ (107 . |concat|) (|List| 6) (113 . |empty?|)
+ (118 . |first|) (123 . |rest|) (|List| $) (128 . |concat|)
+ (133 . |concat|) (138 . |setfirst!|) (|Mapping| 7 7)
+ (144 . |map!|) (150 . |fill!|) (156 . |setelt|)
+ (163 . |maxIndex|) (168 . |eq?|) (174 . |setelt|)
+ (181 . |tail|) (186 . |setrest!|) (192 . |concat!|)
'"rest" '"last" '"first" '"value")
- '#(|setelt| 193 |possiblyInfinite?| 207 |map!| 212 |first|
- 218 |fill!| 224 |explicitlyFinite?| 230 |elt| 235
- |concat!| 247 |concat| 253)
+ '#(|setelt| 198 |possiblyInfinite?| 212 |map!| 217 |first|
+ 223 |fill!| 229 |explicitlyFinite?| 235 |elt| 240
+ |concat!| 252 |concat| 258)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 57
- '(1 6 8 0 9 0 12 0 13 0 14 0 15 1 6 0 0
- 16 1 6 0 17 18 1 6 8 0 20 1 6 7 0 21
- 1 6 22 0 23 2 22 0 0 0 24 0 22 0 25 2
- 22 8 0 0 26 2 6 0 0 14 27 1 29 22 0
- 30 1 29 8 0 31 1 6 0 0 32 1 29 22 0
- 33 0 6 0 34 2 22 0 0 0 35 2 6 0 0 14
- 36 2 6 0 0 0 38 2 0 0 0 0 39 1 40 8 0
- 41 1 40 6 0 42 1 40 0 0 43 1 6 0 44
- 45 1 0 0 44 46 2 6 7 0 7 47 2 0 0 48
- 0 49 2 0 0 0 7 50 3 0 7 0 22 7 51 1 6
- 22 0 52 2 6 8 0 0 53 3 0 7 0 29 7 54
- 1 6 0 0 55 2 6 0 0 0 56 2 0 0 0 0 57
- 3 0 7 0 22 7 51 3 0 7 0 29 7 54 1 0 8
- 0 11 2 0 0 48 0 49 2 0 0 0 14 19 2 0
- 0 0 7 50 1 0 8 0 10 2 0 7 0 22 28 2 0
- 0 0 29 37 2 0 0 0 0 57 1 0 0 44 46 2
- 0 0 0 0 39)))))
+ (|makeByteWordVec2| 58
+ '(1 6 8 0 9 1 8 0 0 10 0 13 0 14 0 15 0
+ 16 1 6 0 0 17 1 6 0 18 19 1 6 8 0 21
+ 1 6 7 0 22 1 6 23 0 24 2 23 0 0 0 25
+ 0 23 0 26 2 23 8 0 0 27 2 6 0 0 15 28
+ 1 30 23 0 31 1 30 8 0 32 1 6 0 0 33 1
+ 30 23 0 34 0 6 0 35 2 23 0 0 0 36 2 6
+ 0 0 15 37 2 6 0 0 0 39 2 0 0 0 0 40 1
+ 41 8 0 42 1 41 6 0 43 1 41 0 0 44 1 6
+ 0 45 46 1 0 0 45 47 2 6 7 0 7 48 2 0
+ 0 49 0 50 2 0 0 0 7 51 3 0 7 0 23 7
+ 52 1 6 23 0 53 2 6 8 0 0 54 3 0 7 0
+ 30 7 55 1 6 0 0 56 2 6 0 0 0 57 2 0 0
+ 0 0 58 3 0 7 0 23 7 52 3 0 7 0 30 7
+ 55 1 0 8 0 12 2 0 0 49 0 50 2 0 0 0
+ 15 20 2 0 0 0 7 51 1 0 8 0 11 2 0 7 0
+ 23 29 2 0 0 0 30 38 2 0 0 0 0 58 1 0
+ 0 45 47 2 0 0 0 0 40)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp
index 14835f6d..6ac82a00 100644
--- a/src/algebra/strap/SYMBOL.lsp
+++ b/src/algebra/strap/SYMBOL.lsp
@@ -337,7 +337,7 @@
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 112)))
+ (|getShellEntry| $ 113)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -358,7 +358,7 @@
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 112)))
+ (|getShellEntry| $ 113)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -379,7 +379,7 @@
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 112)))
+ (|getShellEntry| $ 113)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -400,7 +400,7 @@
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 112)))
+ (|getShellEntry| $ 113)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -421,7 +421,7 @@
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 112)))
+ (|getShellEntry| $ 113)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -451,9 +451,9 @@
(SPADCALL |s|
(+ (QCDR |qr|)
(SPADCALL |s|
- (|getShellEntry| $ 117)))
+ (|getShellEntry| $ 118)))
(|getShellEntry| $ 107))
- |ns| (|getShellEntry| $ 119))
+ |ns| (|getShellEntry| $ 120))
|SYMBOL;anyRadix|)
(EXIT
(COND
@@ -471,14 +471,14 @@
(SEQ (LETT |sym|
(|SYMBOL;anyRadix|
(SPADCALL (|getShellEntry| $ 10)
- (|getShellEntry| $ 120))
+ (|getShellEntry| $ 121))
(|getShellEntry| $ 20) $)
|SYMBOL;new;$;27|)
(SPADCALL (|getShellEntry| $ 10)
(+ (SPADCALL (|getShellEntry| $ 10)
- (|getShellEntry| $ 120))
+ (|getShellEntry| $ 121))
1)
- (|getShellEntry| $ 121))
+ (|getShellEntry| $ 122))
(EXIT (|SYMBOL;coerce;S$;8| (STRCONC "%" |sym|) $))))))
(DEFUN |SYMBOL;new;2$;28| (|x| $)
@@ -487,14 +487,14 @@
(SEQ (LETT |n|
(SEQ (LETT |u|
(SPADCALL |x| (|getShellEntry| $ 13)
- (|getShellEntry| $ 124))
+ (|getShellEntry| $ 125))
|SYMBOL;new;2$;28|)
(EXIT (COND
((QEQCAR |u| 1) 0)
('T (+ (QCDR |u|) 1)))))
|SYMBOL;new;2$;28|)
(SPADCALL (|getShellEntry| $ 13) |x| |n|
- (|getShellEntry| $ 127))
+ (|getShellEntry| $ 128))
(LETT |xx|
(COND
((NOT (|SYMBOL;scripted?;$B;30| |x| $))
@@ -509,12 +509,12 @@
((NOT (< (SPADCALL
(SPADCALL |xx|
(SPADCALL |xx|
- (|getShellEntry| $ 128))
+ (|getShellEntry| $ 129))
(|getShellEntry| $ 107))
(|getShellEntry| $ 19)
- (|getShellEntry| $ 129))
+ (|getShellEntry| $ 130))
(SPADCALL (|getShellEntry| $ 19)
- (|getShellEntry| $ 117))))
+ (|getShellEntry| $ 118))))
(STRCONC |xx|
(|SYMBOL;anyRadix| |n|
(|getShellEntry| $ 21) $)))
@@ -532,11 +532,11 @@
(DEFUN |SYMBOL;resetNew;V;29| ($)
(PROG (|k| #0=#:G1552)
(RETURN
- (SEQ (SPADCALL (|getShellEntry| $ 10) 0 (|getShellEntry| $ 121))
+ (SEQ (SPADCALL (|getShellEntry| $ 10) 0 (|getShellEntry| $ 122))
(SEQ (LETT |k| NIL |SYMBOL;resetNew;V;29|)
(LETT #0#
(SPADCALL (|getShellEntry| $ 13)
- (|getShellEntry| $ 133))
+ (|getShellEntry| $ 134))
|SYMBOL;resetNew;V;29|)
G190
(COND
@@ -546,10 +546,10 @@
NIL))
(GO G191)))
(SEQ (EXIT (SPADCALL |k| (|getShellEntry| $ 13)
- (|getShellEntry| $ 134))))
+ (|getShellEntry| $ 135))))
(LETT #0# (CDR #0#) |SYMBOL;resetNew;V;29|) (GO G190)
G191 (EXIT NIL))
- (EXIT (SPADCALL (|getShellEntry| $ 135)))))))
+ (EXIT (SPADCALL (|getShellEntry| $ 136)))))))
(DEFUN |SYMBOL;scripted?;$B;30| (|sy| $) (NOT (ATOM |sy|)))
@@ -648,8 +648,7 @@
(|getShellEntry| $ 44))
(|getShellEntry| $ 45))
|SYMBOL;scripts;$R;32|)
- (|check-subtype|
- (COND ((< #0# 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
(|getShellEntry| $ 150))))
(LETT |i|
@@ -840,18 +839,19 @@
|SYMBOL;script;$R$;23| |SYMBOL;name;2$;31|
|SYMBOL;string;$S;24| (188 . |concat|) (194 . |One|)
(198 . |One|) (202 . |elt|) (208 . ~=)
- |SYMBOL;scripts;$R;32| (214 . |empty?|) (219 . |first|)
- (224 . |latex|) (229 . |rest|) |SYMBOL;latex;$S;25|
+ |SYMBOL;scripts;$R;32| (214 . |empty?|) (219 . |not|)
+ (224 . |first|) (229 . |latex|) (234 . |rest|)
+ |SYMBOL;latex;$S;25|
(|Record| (|:| |quotient| $) (|:| |remainder| $))
- (234 . |divide|) (240 . |minIndex|) (245 . +)
- (251 . |concat|) (257 . |elt|) (262 . |setelt|)
- |SYMBOL;new;$;27| (|Union| 6 '"failed") (268 . |search|)
- (274 . |Zero|) (278 . |inc|) (283 . |setelt|)
- (290 . |maxIndex|) (295 . |position|) (301 . <)
- |SYMBOL;new;2$;28| (|List| $$) (307 . |keys|)
- (312 . |remove!|) (318 . |void|) |SYMBOL;resetNew;V;29|
- (322 . |not|) |SYMBOL;list;$L;34| (327 . |first|)
- (|SingleInteger|) (332 . |One|) (336 . +) (342 . |digit?|)
+ (239 . |divide|) (245 . |minIndex|) (250 . +)
+ (256 . |concat|) (262 . |elt|) (267 . |setelt|)
+ |SYMBOL;new;$;27| (|Union| 6 '"failed") (273 . |search|)
+ (279 . |Zero|) (283 . |inc|) (288 . |setelt|)
+ (295 . |maxIndex|) (300 . |position|) (306 . <)
+ |SYMBOL;new;2$;28| (|List| $$) (312 . |keys|)
+ (317 . |remove!|) (323 . |void|) |SYMBOL;resetNew;V;29|
+ |SYMBOL;list;$L;34| (327 . |first|) (|SingleInteger|)
+ (332 . |One|) (336 . +) (342 . |digit?|)
(|UniversalSegment| 6) (347 . SEGMENT) (353 . |elt|)
(|List| 39) (359 . |minIndex|) (364 . -) (370 . |setelt|)
(377 . |rest|) (382 . |first|) (387 . |concat|)
@@ -895,29 +895,29 @@
0 97 1 59 57 0 98 1 59 0 0 99 2 57 0
53 0 104 0 39 0 105 0 6 0 106 2 14 42
0 6 107 2 42 22 0 0 108 1 57 22 0 110
- 1 57 53 0 111 1 53 14 0 112 1 57 0 0
- 113 2 6 115 0 0 116 1 14 6 0 117 2 6
- 0 0 0 118 2 14 0 42 0 119 1 8 6 0 120
- 2 8 6 0 6 121 2 11 123 2 0 124 0 39 0
- 125 1 6 0 0 126 3 11 6 0 2 6 127 1 14
- 6 0 128 2 14 6 42 0 129 2 6 22 0 0
- 130 1 11 132 0 133 2 11 123 2 0 134 0
- 24 0 135 1 22 0 0 137 1 132 2 0 139 0
- 140 0 141 2 39 0 0 0 142 1 42 22 0
+ 1 22 0 0 111 1 57 53 0 112 1 53 14 0
+ 113 1 57 0 0 114 2 6 116 0 0 117 1 14
+ 6 0 118 2 6 0 0 0 119 2 14 0 42 0 120
+ 1 8 6 0 121 2 8 6 0 6 122 2 11 124 2
+ 0 125 0 39 0 126 1 6 0 0 127 3 11 6 0
+ 2 6 128 1 14 6 0 129 2 14 6 42 0 130
+ 2 6 22 0 0 131 1 11 133 0 134 2 11
+ 124 2 0 135 0 24 0 136 1 133 2 0 139
+ 0 140 0 141 2 39 0 0 0 142 1 42 22 0
143 2 144 0 6 6 145 2 14 0 0 144 146
1 147 6 0 148 2 6 0 0 0 149 3 147 39
0 6 39 150 1 147 0 0 151 1 147 39 0
- 152 2 147 0 0 39 153 1 132 0 0 154 1
- 59 6 0 155 1 132 39 0 156 2 132 0 0
- 39 157 3 59 57 0 6 57 158 2 132 0 0
+ 152 2 147 0 0 39 153 1 133 0 0 154 1
+ 59 6 0 155 1 133 39 0 156 2 133 0 0
+ 39 157 3 59 57 0 6 57 158 2 133 0 0
39 159 2 59 57 0 6 160 1 16 6 0 161 2
16 14 0 6 162 2 0 22 0 0 1 2 0 0 0 57
64 2 0 0 0 57 62 1 0 14 0 103 1 0 100
0 109 1 0 22 0 23 2 0 0 0 59 61 2 0 0
- 0 100 101 0 0 0 163 0 0 24 136 3 0 77
+ 0 100 101 0 0 0 163 0 0 24 137 3 0 77
0 74 77 78 3 0 70 0 67 70 71 1 0 0 0
- 131 0 0 0 122 1 0 0 0 102 2 0 0 0 0 1
- 2 0 0 0 0 1 1 0 94 0 138 1 0 14 0 114
+ 132 0 0 0 123 1 0 0 0 102 2 0 0 0 0 1
+ 2 0 0 0 0 1 1 0 94 0 138 1 0 14 0 115
1 0 140 0 1 2 0 0 0 57 63 1 0 67 0 82
1 0 74 0 80 1 0 25 0 49 1 0 46 0 48 1
0 0 14 50 1 0 53 0 55 2 0 22 0 0 1 2
diff --git a/src/algebra/strap/URAGG-.lsp b/src/algebra/strap/URAGG-.lsp
index 50039169..6679030e 100644
--- a/src/algebra/strap/URAGG-.lsp
+++ b/src/algebra/strap/URAGG-.lsp
@@ -134,7 +134,7 @@
(NOT (SPADCALL (|URAGG-;findCycle| |x| $) (|getShellEntry| $ 20))))))
(DEFUN |URAGG-;last;AS;7| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 23))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 24))
(|getShellEntry| $ 8)))
(DEFUN |URAGG-;nodes;AL;8| (|x| $)
@@ -235,7 +235,7 @@
(SEQ (COND
((EQL |k| 1000)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 49))
+ ((SPADCALL |x| (|getShellEntry| $ 50))
(EXIT (|error| "cyclic list"))))))
(EXIT (LETT |x|
(SPADCALL |x| (|getShellEntry| $ 14))
@@ -262,7 +262,7 @@
((EQL |k| 1000)
(COND
((SPADCALL |x|
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 50))
(EXIT (|error| "cyclic list"))))))
(EXIT (LETT |y|
(SPADCALL
@@ -286,7 +286,7 @@
(GO G191)))
(SEQ (COND
((SPADCALL |x| |y|
- (|getShellEntry| $ 52))
+ (|getShellEntry| $ 53))
(PROGN
(LETT #0# |x| |URAGG-;findCycle|)
(GO #0#))))
@@ -306,7 +306,7 @@
(GO #0#))))
(COND
((SPADCALL |x| |y|
- (|getShellEntry| $ 52))
+ (|getShellEntry| $ 53))
(PROGN
(LETT #0# |y| |URAGG-;findCycle|)
(GO #0#))))
@@ -324,7 +324,7 @@
(SEQ (COND
((SPADCALL
(LETT |y|
- (LETT |x| (SPADCALL |x| (|getShellEntry| $ 53))
+ (LETT |x| (SPADCALL |x| (|getShellEntry| $ 54))
|URAGG-;cycleTail;2A;18|)
|URAGG-;cycleTail;2A;18|)
(|getShellEntry| $ 20))
@@ -335,7 +335,7 @@
(SEQ G190
(COND
((NULL (NOT (SPADCALL |x| |z|
- (|getShellEntry| $ 52))))
+ (|getShellEntry| $ 53))))
(GO G191)))
(SEQ (LETT |y| |z| |URAGG-;cycleTail;2A;18|)
(EXIT (LETT |z|
@@ -361,7 +361,7 @@
(SEQ (LETT |l| 1 |URAGG-;cycleEntry;2A;19|) G190
(COND
((NULL (NOT (SPADCALL |y| |z|
- (|getShellEntry| $ 52))))
+ (|getShellEntry| $ 53))))
(GO G191)))
(SEQ (EXIT (LETT |z|
(SPADCALL |z|
@@ -383,7 +383,7 @@
(SEQ G190
(COND
((NULL (NOT (SPADCALL |x| |y|
- (|getShellEntry| $ 52))))
+ (|getShellEntry| $ 53))))
(GO G191)))
(SEQ (LETT |x|
(SPADCALL |x|
@@ -412,7 +412,7 @@
(SEQ (LETT |k| 1 |URAGG-;cycleLength;ANni;20|) G190
(COND
((NULL (NOT (SPADCALL |x| |y|
- (|getShellEntry| $ 52))))
+ (|getShellEntry| $ 53))))
(GO G191)))
(SEQ (EXIT (LETT |y|
(SPADCALL |y|
@@ -443,7 +443,7 @@
(DEFUN |URAGG-;last;ANniA;22| (|x| |n| $)
(PROG (|m| #0=#:G1499)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 59))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 60))
|URAGG-;last;ANniA;22|)
(EXIT (COND
((< |m| |n|) (|error| "index out of range"))
@@ -455,14 +455,14 @@
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 61))
- (|getShellEntry| $ 62)))))))))
+ (|getShellEntry| $ 62))
+ (|getShellEntry| $ 63)))))))))
(DEFUN |URAGG-;=;2AB;23| (|x| |y| $)
(PROG (|k| #0=#:G1509)
(RETURN
(SEQ (EXIT (COND
- ((SPADCALL |x| |y| (|getShellEntry| $ 52)) 'T)
+ ((SPADCALL |x| |y| (|getShellEntry| $ 53)) 'T)
('T
(SEQ (SEQ (LETT |k| 0 |URAGG-;=;2AB;23|) G190
(COND
@@ -479,7 +479,7 @@
((EQL |k| 1000)
(COND
((SPADCALL |x|
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 50))
(EXIT (|error| "cyclic list"))))))
(EXIT
(COND
@@ -488,7 +488,7 @@
(|getShellEntry| $ 8))
(SPADCALL |y|
(|getShellEntry| $ 8))
- (|getShellEntry| $ 65))
+ (|getShellEntry| $ 66))
(PROGN
(LETT #0# 'NIL
|URAGG-;=;2AB;23|)
@@ -523,7 +523,7 @@
(GO G191)))
(SEQ (EXIT (COND
((SPADCALL |u| |v|
- (|getShellEntry| $ 67))
+ (|getShellEntry| $ 68))
(PROGN
(LETT #0# 'T
|URAGG-;node?;2AB;24|)
@@ -534,7 +534,7 @@
((EQL |k| 1000)
(COND
((SPADCALL |v|
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 50))
(EXIT
(|error|
"cyclic list"))))))
@@ -546,39 +546,39 @@
(LETT |k| (QSADD1 |k|)
|URAGG-;node?;2AB;24|)
(GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |u| |v| (|getShellEntry| $ 67)))))
+ (EXIT (SPADCALL |u| |v| (|getShellEntry| $ 68)))))
#0# (EXIT #0#)))))
(DEFUN |URAGG-;setelt;Afirst2S;25| (|x| T3 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 69)))
+ (SPADCALL |x| |a| (|getShellEntry| $ 70)))
(DEFUN |URAGG-;setelt;Alast2S;26| (|x| T4 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 71)))
+ (SPADCALL |x| |a| (|getShellEntry| $ 72)))
(DEFUN |URAGG-;setelt;Arest2A;27| (|x| T5 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 73)))
+ (SPADCALL |x| |a| (|getShellEntry| $ 74)))
(DEFUN |URAGG-;concat;3A;28| (|x| |y| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 62)) |y|
- (|getShellEntry| $ 75)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 63)) |y|
+ (|getShellEntry| $ 76)))
(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| $ 69))
+ (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 24)) |s|
+ (|getShellEntry| $ 70))
(EXIT |s|))))))
(DEFUN |URAGG-;setchildren!;ALA;30| (|u| |lv| $)
(COND
((EQL (LENGTH |lv|) 1)
- (SPADCALL |u| (|SPADfirst| |lv|) (|getShellEntry| $ 73)))
+ (SPADCALL |u| (|SPADfirst| |lv|) (|getShellEntry| $ 74)))
('T (|error| "wrong number of children specified"))))
(DEFUN |URAGG-;setvalue!;A2S;31| (|u| |s| $)
- (SPADCALL |u| |s| (|getShellEntry| $ 69)))
+ (SPADCALL |u| |s| (|getShellEntry| $ 70)))
(DEFUN |URAGG-;split!;AIA;32| (|p| |n| $)
(PROG (#0=#:G1525 |q|)
@@ -593,12 +593,12 @@
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 61))
+ (|getShellEntry| $ 62))
|URAGG-;split!;AIA;32|)
(LETT |q| (SPADCALL |p| (|getShellEntry| $ 14))
|URAGG-;split!;AIA;32|)
- (SPADCALL |p| (SPADCALL (|getShellEntry| $ 82))
- (|getShellEntry| $ 73))
+ (SPADCALL |p| (SPADCALL (|getShellEntry| $ 83))
+ (|getShellEntry| $ 74))
(EXIT |q|))))))))
(DEFUN |URAGG-;cycleSplit!;2A;33| (|x| $)
@@ -606,10 +606,10 @@
(RETURN
(SEQ (COND
((OR (SPADCALL
- (LETT |y| (SPADCALL |x| (|getShellEntry| $ 53))
+ (LETT |y| (SPADCALL |x| (|getShellEntry| $ 54))
|URAGG-;cycleSplit!;2A;33|)
(|getShellEntry| $ 20))
- (SPADCALL |x| |y| (|getShellEntry| $ 52)))
+ (SPADCALL |x| |y| (|getShellEntry| $ 53)))
|y|)
('T
(SEQ (LETT |z| (SPADCALL |x| (|getShellEntry| $ 14))
@@ -617,7 +617,7 @@
(SEQ G190
(COND
((NULL (NOT (SPADCALL |z| |y|
- (|getShellEntry| $ 52))))
+ (|getShellEntry| $ 53))))
(GO G191)))
(SEQ (LETT |x| |z| |URAGG-;cycleSplit!;2A;33|)
(EXIT (LETT |z|
@@ -625,8 +625,8 @@
(|getShellEntry| $ 14))
|URAGG-;cycleSplit!;2A;33|)))
NIL (GO G190) G191 (EXIT NIL))
- (SPADCALL |x| (SPADCALL (|getShellEntry| $ 82))
- (|getShellEntry| $ 73))
+ (SPADCALL |x| (SPADCALL (|getShellEntry| $ 83))
+ (|getShellEntry| $ 74))
(EXIT |y|))))))))
(DEFUN |UnaryRecursiveAggregate&| (|#1| |#2|)
@@ -638,7 +638,7 @@
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$|
(LIST '|UnaryRecursiveAggregate&| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 86) . #0#)
+ (LETT $ (|newShell| 87) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -649,41 +649,41 @@
(|setShellEntry| $ 7 |#2|)
(COND
((|HasAttribute| |#1| '|finiteAggregate|)
- (|setShellEntry| $ 63
+ (|setShellEntry| $ 64
(CONS (|dispatchFunction| |URAGG-;last;ANniA;22|) $))))
(COND
((|HasCategory| |#2| '(|SetCategory|))
(PROGN
- (|setShellEntry| $ 66
+ (|setShellEntry| $ 67
(CONS (|dispatchFunction| |URAGG-;=;2AB;23|) $))
- (|setShellEntry| $ 68
+ (|setShellEntry| $ 69
(CONS (|dispatchFunction| |URAGG-;node?;2AB;24|) $)))))
(COND
((|testBitVector| |pv$| 1)
(PROGN
- (|setShellEntry| $ 70
+ (|setShellEntry| $ 71
(CONS (|dispatchFunction| |URAGG-;setelt;Afirst2S;25|)
$))
- (|setShellEntry| $ 72
+ (|setShellEntry| $ 73
(CONS (|dispatchFunction| |URAGG-;setelt;Alast2S;26|)
$))
- (|setShellEntry| $ 74
+ (|setShellEntry| $ 75
(CONS (|dispatchFunction| |URAGG-;setelt;Arest2A;27|)
$))
- (|setShellEntry| $ 76
- (CONS (|dispatchFunction| |URAGG-;concat;3A;28|) $))
(|setShellEntry| $ 77
+ (CONS (|dispatchFunction| |URAGG-;concat;3A;28|) $))
+ (|setShellEntry| $ 78
(CONS (|dispatchFunction| |URAGG-;setlast!;A2S;29|) $))
- (|setShellEntry| $ 80
+ (|setShellEntry| $ 81
(CONS (|dispatchFunction|
|URAGG-;setchildren!;ALA;30|)
$))
- (|setShellEntry| $ 81
+ (|setShellEntry| $ 82
(CONS (|dispatchFunction| |URAGG-;setvalue!;A2S;31|)
$))
- (|setShellEntry| $ 83
- (CONS (|dispatchFunction| |URAGG-;split!;AIA;32|) $))
(|setShellEntry| $ 84
+ (CONS (|dispatchFunction| |URAGG-;split!;AIA;32|) $))
+ (|setShellEntry| $ 85
(CONS (|dispatchFunction| |URAGG-;cycleSplit!;2A;33|)
$)))))
$))))
@@ -694,66 +694,67 @@
'"last" |URAGG-;elt;AlastS;2| (10 . |rest|) '"rest"
|URAGG-;elt;ArestA;3| |URAGG-;second;AS;4|
|URAGG-;third;AS;5| (|Boolean|) (15 . |empty?|)
- (20 . |false|) |URAGG-;cyclic?;AB;6| (24 . |tail|)
- |URAGG-;last;AS;7| (|List| 6) (29 . |empty|)
- (33 . |concat|) (39 . |reverse!|) (|List| $)
+ (20 . |false|) (24 . |not|) |URAGG-;cyclic?;AB;6|
+ (29 . |tail|) |URAGG-;last;AS;7| (|List| 6) (34 . |empty|)
+ (38 . |concat|) (44 . |reverse!|) (|List| $)
|URAGG-;nodes;AL;8| |URAGG-;children;AL;9|
|URAGG-;leaf?;AB;10| |URAGG-;value;AS;11|
- (|NonNegativeInteger|) (44 . |Zero|) (|Integer|)
- (48 . |Zero|) (52 . <) (58 . |One|) (62 . |One|) (66 . -)
- |URAGG-;less?;ANniB;12| (72 . |zero?|)
+ (|NonNegativeInteger|) (49 . |Zero|) (|Integer|)
+ (53 . |Zero|) (57 . <) (63 . |One|) (67 . |One|) (71 . -)
+ |URAGG-;less?;ANniB;12| (77 . |zero?|)
|URAGG-;more?;ANniB;13| |URAGG-;size?;ANniB;14|
- (|SingleInteger|) (77 . |Zero|) (81 . =) (87 . |cyclic?|)
- |URAGG-;#;ANni;15| |URAGG-;tail;2A;16| (92 . |eq?|)
- (98 . |cycleEntry|) |URAGG-;cycleTail;2A;18| (103 . |One|)
- |URAGG-;cycleEntry;2A;19| |URAGG-;cycleLength;ANni;20|
- |URAGG-;rest;ANniA;21| (107 . |#|) (112 . <)
- (118 . |rest|) (124 . |copy|) (129 . |last|)
- (135 . |true|) (139 . ~=) (145 . =) (151 . =)
- (157 . |node?|) (163 . |setfirst!|) (169 . |setelt|)
- (176 . |setlast!|) (182 . |setelt|) (189 . |setrest!|)
- (195 . |setelt|) (202 . |concat!|) (208 . |concat|)
- (214 . |setlast!|) (220 . |#|) (225 . |first|)
- (230 . |setchildren!|) (236 . |setvalue!|) (242 . |empty|)
- (246 . |split!|) (252 . |cycleSplit!|) '"value")
- '#(|value| 257 |third| 262 |tail| 267 |split!| 272 |size?|
- 278 |setvalue!| 284 |setlast!| 290 |setelt| 296
- |setchildren!| 317 |second| 323 |rest| 328 |nodes| 334
- |node?| 339 |more?| 345 |less?| 351 |leaf?| 357 |last| 362
- |elt| 373 |cyclic?| 391 |cycleTail| 396 |cycleSplit!| 401
- |cycleLength| 406 |cycleEntry| 411 |concat| 416 |children|
- 422 = 427 |#| 433)
+ (|SingleInteger|) (82 . |Zero|) (86 . =) (92 . |cyclic?|)
+ |URAGG-;#;ANni;15| |URAGG-;tail;2A;16| (97 . |eq?|)
+ (103 . |cycleEntry|) |URAGG-;cycleTail;2A;18|
+ (108 . |One|) |URAGG-;cycleEntry;2A;19|
+ |URAGG-;cycleLength;ANni;20| |URAGG-;rest;ANniA;21|
+ (112 . |#|) (117 . <) (123 . |rest|) (129 . |copy|)
+ (134 . |last|) (140 . |true|) (144 . ~=) (150 . =)
+ (156 . =) (162 . |node?|) (168 . |setfirst!|)
+ (174 . |setelt|) (181 . |setlast!|) (187 . |setelt|)
+ (194 . |setrest!|) (200 . |setelt|) (207 . |concat!|)
+ (213 . |concat|) (219 . |setlast!|) (225 . |#|)
+ (230 . |first|) (235 . |setchildren!|) (241 . |setvalue!|)
+ (247 . |empty|) (251 . |split!|) (257 . |cycleSplit!|)
+ '"value")
+ '#(|value| 262 |third| 267 |tail| 272 |split!| 277 |size?|
+ 283 |setvalue!| 289 |setlast!| 295 |setelt| 301
+ |setchildren!| 322 |second| 328 |rest| 333 |nodes| 339
+ |node?| 344 |more?| 350 |less?| 356 |leaf?| 362 |last| 367
+ |elt| 378 |cyclic?| 396 |cycleTail| 401 |cycleSplit!| 406
+ |cycleLength| 411 |cycleEntry| 416 |concat| 421 |children|
+ 427 = 432 |#| 438)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 84
+ (|makeByteWordVec2| 85
'(1 6 7 0 8 1 6 7 0 11 1 6 0 0 14 1 6
- 19 0 20 0 19 0 21 1 6 0 0 23 0 25 0
- 26 2 25 0 6 0 27 1 25 0 0 28 0 34 0
- 35 0 36 0 37 2 36 19 0 0 38 0 34 0 39
- 0 36 0 40 2 36 0 0 0 41 1 36 19 0 43
- 0 46 0 47 2 34 19 0 0 48 1 6 19 0 49
- 2 6 19 0 0 52 1 6 0 0 53 0 46 0 55 1
- 6 34 0 59 2 34 19 0 0 60 2 6 0 0 34
- 61 1 6 0 0 62 2 0 0 0 34 63 0 19 0 64
- 2 7 19 0 0 65 2 0 19 0 0 66 2 6 19 0
- 0 67 2 0 19 0 0 68 2 6 7 0 7 69 3 0 7
- 0 9 7 70 2 6 7 0 7 71 3 0 7 0 12 7 72
- 2 6 0 0 0 73 3 0 0 0 15 0 74 2 6 0 0
- 0 75 2 0 0 0 0 76 2 0 7 0 7 77 1 25
- 34 0 78 1 25 6 0 79 2 0 0 0 29 80 2 0
- 7 0 7 81 0 6 0 82 2 0 0 0 36 83 1 0 0
- 0 84 1 0 7 0 33 1 0 7 0 18 1 0 0 0 51
- 2 0 0 0 36 83 2 0 19 0 34 45 2 0 7 0
- 7 81 2 0 7 0 7 77 3 0 7 0 12 7 72 3 0
- 0 0 15 0 74 3 0 7 0 9 7 70 2 0 0 0 29
- 80 1 0 7 0 17 2 0 0 0 34 58 1 0 29 0
- 30 2 0 19 0 0 68 2 0 19 0 34 44 2 0
- 19 0 34 42 1 0 19 0 32 2 0 0 0 34 63
- 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
- 54 1 0 0 0 84 1 0 34 0 57 1 0 0 0 56
- 2 0 0 0 0 76 1 0 29 0 31 2 0 19 0 0
- 66 1 0 34 0 50)))))
+ 19 0 20 0 19 0 21 1 19 0 0 22 1 6 0 0
+ 24 0 26 0 27 2 26 0 6 0 28 1 26 0 0
+ 29 0 35 0 36 0 37 0 38 2 37 19 0 0 39
+ 0 35 0 40 0 37 0 41 2 37 0 0 0 42 1
+ 37 19 0 44 0 47 0 48 2 35 19 0 0 49 1
+ 6 19 0 50 2 6 19 0 0 53 1 6 0 0 54 0
+ 47 0 56 1 6 35 0 60 2 35 19 0 0 61 2
+ 6 0 0 35 62 1 6 0 0 63 2 0 0 0 35 64
+ 0 19 0 65 2 7 19 0 0 66 2 0 19 0 0 67
+ 2 6 19 0 0 68 2 0 19 0 0 69 2 6 7 0 7
+ 70 3 0 7 0 9 7 71 2 6 7 0 7 72 3 0 7
+ 0 12 7 73 2 6 0 0 0 74 3 0 0 0 15 0
+ 75 2 6 0 0 0 76 2 0 0 0 0 77 2 0 7 0
+ 7 78 1 26 35 0 79 1 26 6 0 80 2 0 0 0
+ 30 81 2 0 7 0 7 82 0 6 0 83 2 0 0 0
+ 37 84 1 0 0 0 85 1 0 7 0 34 1 0 7 0
+ 18 1 0 0 0 52 2 0 0 0 37 84 2 0 19 0
+ 35 46 2 0 7 0 7 82 2 0 7 0 7 78 3 0 7
+ 0 12 7 73 3 0 0 0 15 0 75 3 0 7 0 9 7
+ 71 2 0 0 0 30 81 1 0 7 0 17 2 0 0 0
+ 35 59 1 0 30 0 31 2 0 19 0 0 69 2 0
+ 19 0 35 45 2 0 19 0 35 43 1 0 19 0 33
+ 2 0 0 0 35 64 1 0 7 0 25 2 0 7 0 12
+ 13 2 0 0 0 15 16 2 0 7 0 9 10 1 0 19
+ 0 23 1 0 0 0 55 1 0 0 0 85 1 0 35 0
+ 58 1 0 0 0 57 2 0 0 0 0 77 1 0 30 0
+ 32 2 0 19 0 0 67 1 0 35 0 51)))))
'|lookupComplete|))
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index cf86b490..1aa087cb 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -1249,21 +1249,28 @@ getSuccessEnvironment(a,e) ==
e
a is ["case",x,m] and IDENTP x =>
put(x,"condition",[a,:get(x,"condition",e)],e)
+ a is ["and",:args] =>
+ for form in args repeat
+ e := getSuccessEnvironment(form,e)
+ e
+ a is ["not",a'] => getInverseEnvironment(a',e)
e
-getInverseEnvironment(a,E) ==
+getInverseEnvironment(a,e) ==
a is ["case",x,m] and IDENTP x =>
--the next two lines are necessary to get 3-branched Unions to work
-- old-style unions, that is
- (get(x,"condition",E) is [["OR",:oldpred]]) and member(a,oldpred) =>
- put(x,"condition",LIST MKPF(delete(a,oldpred),"OR"),E)
- getUnionMode(x,E) is ["Union",:l]
- l':= delete(m,l)
- for u in l' repeat
- if u is ['_:,=m,:.] then l':= delete(u,l')
- newpred:= MKPF([["case",x,m'] for m' in l'],"OR")
- put(x,"condition",[newpred,:get(x,"condition",E)],E)
- E
+ (get(x,"condition",e) is [["OR",:oldpred]]) and member(a,oldpred) =>
+ put(x,"condition",LIST MKPF(delete(a,oldpred),"OR"),e)
+ getUnionMode(x,e) is ["Union",:l] =>
+ l':= delete(m,l)
+ for u in l' repeat
+ if u is ['_:,=m,:.] then l':= delete(u,l')
+ newpred:= MKPF([["case",x,m'] for m' in l'],"OR")
+ put(x,"condition",[newpred,:get(x,"condition",e)],e)
+ e
+ a is ["not",a'] => getSuccessEnvironment(a',e)
+ e
getUnionMode(x,e) ==
m:=
@@ -1428,11 +1435,11 @@ compLogicalNot(x,m,e) ==
-- ??? selected through general modemaps, and their semantics
-- ??? are quite hardwired with their syntax.
-- ??? Eventually, we should not need to do this.
- $normalizeTree => compIf(["IF",y,"false","true"],m,e)
- yT := comp(y,$EmptyMode,e) or return nil
- yT.mode = $Boolean =>
- e := getInverseEnvironment(y,yT.env)
- convert([["NOT",yT.expr],$Boolean,e],m)
+ yTarget :=
+ $normalizeTree and resolve(m,$Boolean) = $Boolean => $Boolean
+ $EmptyMode
+ yT := comp(y,yTarget,e) or return nil
+ yTarget = $Boolean => (rplac(first yT, ["NOT",yT.expr]); yT)
compResolveCall("not",[yT],m,yT.env)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 15:51:23 +0000