aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/strap
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2009-05-29 19:09:54 +0000
committerdos-reis <gdr@axiomatics.org>2009-05-29 19:09:54 +0000
commitc39287d87b632b3582b0e179b08d44dc6c27510f (patch)
tree88c661ea1bd325ad74b4f3f472c052687e8ca1d4 /src/algebra/strap
parenta17c2d47d4df5af5ef5e624ac6c5636b2741dd4a (diff)
downloadopen-axiom-c39287d87b632b3582b0e179b08d44dc6c27510f.tar.gz
* algebra/algext.spad.pamphlet: Qualify `characteristic'.
* algebra/clifford.spad.pamphlet: Likewise. * algebra/complet.spad.pamphlet: Likewise. * algebra/contfrac.spad.pamphlet: Likewise. * algebra/curve.spad.pamphlet: Likewise. * algebra/ddfact.spad.pamphlet: Likewise. * algebra/derham.spad.pamphlet: Likewise. * algebra/equation2.spad.pamphlet: Likewise. * algebra/ffcat.spad.pamphlet: Likewise. * algebra/ffcg.spad.pamphlet: Likewise. * algebra/fff.spad.pamphlet: Likewise. * algebra/ffnb.spad.pamphlet: Likewise. * algebra/ffp.spad.pamphlet: Likewise. * algebra/ffpoly.spad.pamphlet: Likewise. * algebra/ffx.spad.pamphlet: Likewise. * algebra/fmod.spad.pamphlet: Likewise. * algebra/fortmac.spad.pamphlet: Likewise. * algebra/fr.spad.pamphlet: Likewise. * algebra/fraction.spad.pamphlet: Likewise. * algebra/fspace.spad.pamphlet: Likewise. * algebra/gaussian.spad.pamphlet: Likewise. * algebra/gpol.spad.pamphlet: Likewise. * algebra/intclos.spad.pamphlet: Likewise. * algebra/interval.spad.pamphlet: Likewise. * algebra/laurent.spad.pamphlet: Likewise. * algebra/matrix.spad.pamphlet: Likewise. * algebra/modring.spad.pamphlet: Likewise. * algebra/oct.spad.pamphlet: Likewise. * algebra/opalg.spad.pamphlet: Likewise. * algebra/padic.spad.pamphlet: Likewise. * algebra/perman.spad.pamphlet: Likewise. * algebra/pf.spad.pamphlet: Likewise. * algebra/pfr.spad.pamphlet: Likewise. * algebra/poly.spad.pamphlet: Likewise. * algebra/polycat.spad.pamphlet: Likewise. * algebra/puiseux.spad.pamphlet: Likewise. * algebra/quat.spad.pamphlet: Likewise. * algebra/radix.spad.pamphlet: Likewise. * algebra/reclos.spad.pamphlet: Likewise. * algebra/resring.spad.pamphlet: Likewise. * algebra/sf.spad.pamphlet: Likewise. * algebra/si.spad.pamphlet: Likewise. * algebra/solvefor.spad.pamphlet: Likewise. * algebra/sups.spad.pamphlet: Likewise. * algebra/taylor.spad.pamphlet: Likewise. * algebra/vector.spad.pamphlet: Likewise. * algebra/xpoly.spad.pamphlet: Likewise.
Diffstat (limited to 'src/algebra/strap')
-rw-r--r--src/algebra/strap/CHAR.lsp4
-rw-r--r--src/algebra/strap/DFLOAT.lsp17
-rw-r--r--src/algebra/strap/FFIELDC-.lsp223
-rw-r--r--src/algebra/strap/FPS-.lsp3
-rw-r--r--src/algebra/strap/ILIST.lsp6
-rw-r--r--src/algebra/strap/INS-.lsp8
-rw-r--r--src/algebra/strap/ISTRING.lsp18
-rw-r--r--src/algebra/strap/LSAGG-.lsp30
-rw-r--r--src/algebra/strap/STAGG-.lsp25
-rw-r--r--src/algebra/strap/URAGG-.lsp6
10 files changed, 152 insertions, 188 deletions
diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp
index f16acad3..6e24716c 100644
--- a/src/algebra/strap/CHAR.lsp
+++ b/src/algebra/strap/CHAR.lsp
@@ -100,8 +100,8 @@
(RETURN
(CODE-CHAR
(PROG1 (LETT #0# (- |n| 1) |CHAR;index;Pi$;4|)
- (|check-subtype| (COND ((< #0# 0) 'NIL) ('T 'T))
- '(|NonNegativeInteger|) #0#))))))
+ (|check-subtype| (NOT (< #0# 0)) '(|NonNegativeInteger|)
+ #0#))))))
(DEFUN |CHAR;lookup;$Pi;5| (|c| $)
(PROG (#0=#:G1404)
diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp
index f6af98ec..58577fe4 100644
--- a/src/algebra/strap/DFLOAT.lsp
+++ b/src/algebra/strap/DFLOAT.lsp
@@ -450,8 +450,7 @@
$)
(|getShellEntry| $ 35)))
|DFLOAT;bits;Pi;10|)
- (|check-subtype|
- (AND (COND ((< #0# 0) 'NIL) ('T 'T)) (< 0 #0#))
+ (|check-subtype| (AND (NOT (< #0# 0)) (< 0 #0#))
'(|PositiveInteger|) #0#)))))))
(DEFUN |DFLOAT;max;$;11| ($)
@@ -641,8 +640,8 @@
(|DFLOAT;rationalApproximation;$2NniF;84| |x|
(PROG1 (LETT #0# (- (FLOAT-DIGITS 0.0) 1)
|DFLOAT;retract;$F;77|)
- (|check-subtype| (COND ((< #0# 0) 'NIL) ('T 'T))
- '(|NonNegativeInteger|) #0#))
+ (|check-subtype| (NOT (< #0# 0)) '(|NonNegativeInteger|)
+ #0#))
(FLOAT-RADIX 0.0) $))))
(DEFUN |DFLOAT;retractIfCan;$U;78| (|x| $)
@@ -652,7 +651,7 @@
(|DFLOAT;rationalApproximation;$2NniF;84| |x|
(PROG1 (LETT #0# (- (FLOAT-DIGITS 0.0) 1)
|DFLOAT;retractIfCan;$U;78|)
- (|check-subtype| (COND ((< #0# 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
(FLOAT-RADIX 0.0) $)))))
@@ -737,9 +736,7 @@
(LETT #0# (- |ex|)
|DFLOAT;rationalApproximation;$2NniF;84|)
(|check-subtype|
- (COND
- ((< #0# 0) 'NIL)
- ('T 'T))
+ (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#)))
|DFLOAT;rationalApproximation;$2NniF;84|)
(EXIT
@@ -834,9 +831,7 @@
(EXPT BASE
(PROG1 |ex|
(|check-subtype|
- (COND
- ((< |ex| 0) 'NIL)
- ('T 'T))
+ (NOT (< |ex| 0))
'(|NonNegativeInteger|) |ex|))))
(|getShellEntry| $ 142)))))))
#1# (EXIT #1#)))))
diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp
index f29249fc..c9d9c3e1 100644
--- a/src/algebra/strap/FFIELDC-.lsp
+++ b/src/algebra/strap/FFIELDC-.lsp
@@ -82,7 +82,10 @@
(|getShellEntry| $ 34))))))))
(DEFUN |FFIELDC-;charthRoot;2S;6| (|x| $)
- (SPADCALL |x| (QUOTIENT2 2 0) (|getShellEntry| $ 43)))
+ (SPADCALL |x|
+ (QUOTIENT2 (SPADCALL (|getShellEntry| $ 40))
+ (|spadConstant| $ 41))
+ (|getShellEntry| $ 43)))
(DEFUN |FFIELDC-;charthRoot;SU;7| (|x| $)
(CONS 0 (SPADCALL |x| (|getShellEntry| $ 32))))
@@ -90,13 +93,13 @@
(DEFUN |FFIELDC-;createPrimitiveElement;S;8| ($)
(PROG (|sm1| |start| |i| |e| |found|)
(RETURN
- (SEQ (LETT |sm1| (- (SPADCALL (|getShellEntry| $ 46)) 1)
+ (SEQ (LETT |sm1| (- (SPADCALL (|getShellEntry| $ 40)) 1)
|FFIELDC-;createPrimitiveElement;S;8|)
(LETT |start|
(COND
- ((SPADCALL (SPADCALL (|getShellEntry| $ 49))
- (CONS 1 "polynomial") (|getShellEntry| $ 50))
- 0)
+ ((SPADCALL (SPADCALL (|getShellEntry| $ 48))
+ (CONS 1 "polynomial") (|getShellEntry| $ 49))
+ (|spadConstant| $ 41))
('T 1))
|FFIELDC-;createPrimitiveElement;S;8|)
(LETT |found| 'NIL |FFIELDC-;createPrimitiveElement;S;8|)
@@ -107,9 +110,7 @@
(SPADCALL
(PROG1 |i|
(|check-subtype|
- (AND
- (COND ((< |i| 0) 'NIL) ('T 'T))
- (< 0 |i|))
+ (AND (NOT (< |i| 0)) (< 0 |i|))
'(|PositiveInteger|) |i|))
(|getShellEntry| $ 14))
|FFIELDC-;createPrimitiveElement;S;8|)
@@ -129,9 +130,10 @@
(SEQ (COND
((SPADCALL |a| (|getShellEntry| $ 16)) 'NIL)
('T
- (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 57))
+ (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 56))
+ |FFIELDC-;primitive?;SB;9|)
+ (LETT |q| (- (SPADCALL (|getShellEntry| $ 40)) 1)
|FFIELDC-;primitive?;SB;9|)
- (LETT |q| (- 2 1) |FFIELDC-;primitive?;SB;9|)
(LETT |equalone| 'NIL |FFIELDC-;primitive?;SB;9|)
(SEQ (LETT |exp| NIL |FFIELDC-;primitive?;SB;9|)
(LETT #0# |explist| |FFIELDC-;primitive?;SB;9|)
@@ -148,8 +150,8 @@
(SPADCALL
(SPADCALL |a|
(QUOTIENT2 |q| (QCAR |exp|))
- (|getShellEntry| $ 59))
- (|getShellEntry| $ 60))
+ (|getShellEntry| $ 58))
+ (|getShellEntry| $ 59))
|FFIELDC-;primitive?;SB;9|)))
(LETT #0# (CDR #0#) |FFIELDC-;primitive?;SB;9|)
(GO G190) G191 (EXIT NIL))
@@ -161,12 +163,12 @@
(RETURN
(SEQ (COND
((SPADCALL |e| (|spadConstant| $ 7)
- (|getShellEntry| $ 64))
+ (|getShellEntry| $ 63))
(|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| $ 57))
+ (SEQ (LETT |ord| (- (SPADCALL (|getShellEntry| $ 40)) 1)
+ |FFIELDC-;order;SPi;10|)
+ (LETT |lof| (SPADCALL (|getShellEntry| $ 56))
|FFIELDC-;order;SPi;10|)
(SEQ (LETT |rec| NIL |FFIELDC-;order;SPi;10|)
(LETT #0# |lof| |FFIELDC-;order;SPi;10|) G190
@@ -185,8 +187,8 @@
(LETT |goon|
(SPADCALL
(SPADCALL |e| |a|
- (|getShellEntry| $ 59))
- (|getShellEntry| $ 60))
+ (|getShellEntry| $ 58))
+ (|getShellEntry| $ 59))
|FFIELDC-;order;SPi;10|)
(SEQ (LETT |j| 0 |FFIELDC-;order;SPi;10|)
(LETT #1# (- (QCDR |rec|) 2)
@@ -206,8 +208,8 @@
(LETT |goon|
(SPADCALL
(SPADCALL |e| |a|
- (|getShellEntry| $ 59))
- (|getShellEntry| $ 60))
+ (|getShellEntry| $ 58))
+ (|getShellEntry| $ 59))
|FFIELDC-;order;SPi;10|)))
(LETT |j| (QSADD1 |j|)
|FFIELDC-;order;SPi;10|)
@@ -229,20 +231,24 @@
((SPADCALL |b| (|getShellEntry| $ 16))
(|error| "discreteLog: logarithm of zero"))
('T
- (SEQ (LETT |faclist| (SPADCALL (|getShellEntry| $ 57))
+ (SEQ (LETT |faclist| (SPADCALL (|getShellEntry| $ 56))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |a| |b| |FFIELDC-;discreteLog;SNni;11|)
- (LETT |gen| (SPADCALL (|getShellEntry| $ 68))
+ (LETT |gen| (SPADCALL (|getShellEntry| $ 67))
|FFIELDC-;discreteLog;SNni;11|)
(EXIT (COND
- ((SPADCALL |b| |gen| (|getShellEntry| $ 64))
+ ((SPADCALL |b| |gen| (|getShellEntry| $ 63))
1)
('T
(SEQ (LETT |disclog| 0
|FFIELDC-;discreteLog;SNni;11|)
(LETT |mult| 1
|FFIELDC-;discreteLog;SNni;11|)
- (LETT |groupord| (- 2 1)
+ (LETT |groupord|
+ (-
+ (SPADCALL
+ (|getShellEntry| $ 40))
+ 1)
|FFIELDC-;discreteLog;SNni;11|)
(LETT |exp| |groupord|
|FFIELDC-;discreteLog;SNni;11|)
@@ -277,15 +283,15 @@
|FFIELDC-;discreteLog;SNni;11|)
(LETT |exptable|
(SPADCALL |fac|
- (|getShellEntry| $ 70))
+ (|getShellEntry| $ 69))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |n|
(SPADCALL |exptable|
- (|getShellEntry| $ 71))
+ (|getShellEntry| $ 70))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |c|
(SPADCALL |a| |exp|
- (|getShellEntry| $ 59))
+ (|getShellEntry| $ 58))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |end|
(QUOTIENT2 (- |fac| 1) |n|)
@@ -309,7 +315,7 @@
(SPADCALL |c|
(|getShellEntry| $ 11))
|exptable|
- (|getShellEntry| $ 74))
+ (|getShellEntry| $ 73))
|FFIELDC-;discreteLog;SNni;11|)
(EXIT
(COND
@@ -333,9 +339,9 @@
|groupord| |fac|)
(- |n|))
(|getShellEntry| $
- 59))
+ 58))
(|getShellEntry| $
- 80))
+ 79))
|FFIELDC-;discreteLog;SNni;11|)))))
(LETT |i| (QSADD1 |i|)
|FFIELDC-;discreteLog;SNni;11|)
@@ -356,9 +362,9 @@
(SPADCALL |gen|
(- |disc1|)
(|getShellEntry| $
- 59))
+ 58))
(|getShellEntry| $
- 80))
+ 79))
|FFIELDC-;discreteLog;SNni;11|))))
('T
(|error|
@@ -379,14 +385,14 @@
(SEQ (EXIT (COND
((SPADCALL |b| (|getShellEntry| $ 16))
(SEQ (SPADCALL "discreteLog: logarithm of zero"
- (|getShellEntry| $ 86))
+ (|getShellEntry| $ 85))
(EXIT (CONS 1 "failed"))))
((SPADCALL |logbase| (|getShellEntry| $ 16))
(SEQ (SPADCALL
"discreteLog: logarithm to base zero"
- (|getShellEntry| $ 86))
+ (|getShellEntry| $ 85))
(EXIT (CONS 1 "failed"))))
- ((SPADCALL |b| |logbase| (|getShellEntry| $ 64))
+ ((SPADCALL |b| |logbase| (|getShellEntry| $ 63))
(CONS 0 1))
('T
(COND
@@ -399,14 +405,14 @@
(|getShellEntry| $ 19)))))
(SEQ (SPADCALL
"discreteLog: second argument not in cyclic group generated by first argument"
- (|getShellEntry| $ 86))
+ (|getShellEntry| $ 85))
(EXIT (CONS 1 "failed"))))
('T
(SEQ (LETT |faclist|
(SPADCALL
(SPADCALL |groupord|
- (|getShellEntry| $ 90))
- (|getShellEntry| $ 92))
+ (|getShellEntry| $ 89))
+ (|getShellEntry| $ 91))
|FFIELDC-;discreteLog;2SU;12|)
(LETT |a| |b|
|FFIELDC-;discreteLog;2SU;12|)
@@ -433,7 +439,7 @@
(LETT |primroot|
(SPADCALL |logbase|
(QUOTIENT2 |groupord| |fac|)
- (|getShellEntry| $ 59))
+ (|getShellEntry| $ 58))
|FFIELDC-;discreteLog;2SU;12|)
(EXIT
(SEQ
@@ -452,9 +458,9 @@
(LETT |rhoHelp|
(SPADCALL |primroot|
(SPADCALL |a| |exp|
- (|getShellEntry| $ 59))
+ (|getShellEntry| $ 58))
|fac|
- (|getShellEntry| $ 94))
+ (|getShellEntry| $ 93))
|FFIELDC-;discreteLog;2SU;12|)
(EXIT
(COND
@@ -482,8 +488,8 @@
(SPADCALL |logbase|
(- |rho|)
(|getShellEntry| $
- 59))
- (|getShellEntry| $ 80))
+ 58))
+ (|getShellEntry| $ 79))
|FFIELDC-;discreteLog;2SU;12|)))))))
(LETT |t| (QSADD1 |t|)
|FFIELDC-;discreteLog;2SU;12|)
@@ -495,25 +501,25 @@
#2# (EXIT #2#)))))
(DEFUN |FFIELDC-;squareFreePolynomial| (|f| $)
- (SPADCALL |f| (|getShellEntry| $ 99)))
+ (SPADCALL |f| (|getShellEntry| $ 98)))
(DEFUN |FFIELDC-;factorPolynomial| (|f| $)
- (SPADCALL |f| (|getShellEntry| $ 101)))
+ (SPADCALL |f| (|getShellEntry| $ 100)))
(DEFUN |FFIELDC-;factorSquareFreePolynomial| (|f| $)
(PROG (|flist| |u| #0=#:G1521 #1=#:G1510 #2=#:G1508 #3=#:G1509)
(RETURN
(SEQ (COND
- ((SPADCALL |f| (|spadConstant| $ 102)
- (|getShellEntry| $ 103))
- (|spadConstant| $ 104))
+ ((SPADCALL |f| (|spadConstant| $ 101)
+ (|getShellEntry| $ 102))
+ (|spadConstant| $ 103))
('T
(SEQ (LETT |flist|
- (SPADCALL |f| 'T (|getShellEntry| $ 108))
+ (SPADCALL |f| 'T (|getShellEntry| $ 107))
|FFIELDC-;factorSquareFreePolynomial|)
(EXIT (SPADCALL
(SPADCALL (QCAR |flist|)
- (|getShellEntry| $ 109))
+ (|getShellEntry| $ 108))
(PROGN
(LETT #3# NIL
|FFIELDC-;factorSquareFreePolynomial|)
@@ -535,13 +541,13 @@
(LETT #1#
(SPADCALL (QCAR |u|)
(QCDR |u|)
- (|getShellEntry| $ 110))
+ (|getShellEntry| $ 109))
|FFIELDC-;factorSquareFreePolynomial|)
(COND
(#3#
(LETT #2#
(SPADCALL #2# #1#
- (|getShellEntry| $ 111))
+ (|getShellEntry| $ 110))
|FFIELDC-;factorSquareFreePolynomial|))
('T
(PROGN
@@ -554,11 +560,11 @@
(GO G190) G191 (EXIT NIL))
(COND
(#3# #2#)
- ('T (|spadConstant| $ 112))))
- (|getShellEntry| $ 113))))))))))
+ ('T (|spadConstant| $ 111))))
+ (|getShellEntry| $ 112))))))))))
(DEFUN |FFIELDC-;gcdPolynomial;3Sup;16| (|f| |g| $)
- (SPADCALL |f| |g| (|getShellEntry| $ 115)))
+ (SPADCALL |f| |g| (|getShellEntry| $ 114)))
(DEFUN |FiniteFieldCategory&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -566,7 +572,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|FiniteFieldCategory&|))
(LETT |dv$| (LIST '|FiniteFieldCategory&| |dv$1|) . #0#)
- (LETT $ (|newShell| 118) . #0#)
+ (LETT $ (|newShell| 117) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -590,72 +596,71 @@
(|NonNegativeInteger|) (71 . |size|)
(75 . |characteristic|) (79 . |quo|) (85 . **)
|FFIELDC-;charthRoot;2S;6| |FFIELDC-;charthRoot;SU;7|
- (91 . |size|) (95 . -)
+ (91 . -)
(|Union| '"prime" '"polynomial" '"normal" '"cyclic")
- (101 . |representationType|) (105 . =) (111 . |false|)
- (115 . |not|) (120 . =)
+ (97 . |representationType|) (101 . =) (107 . |false|)
+ (111 . |not|) (116 . =)
|FFIELDC-;createPrimitiveElement;S;8|
(|Record| (|:| |factor| 20) (|:| |exponent| 20))
- (|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 . +)
+ (|List| 54) (122 . |factorsOfCyclicGroupSize|)
+ (126 . |quo|) (132 . **) (138 . |one?|)
+ |FFIELDC-;primitive?;SB;9| (143 . |Zero|) (147 . |Zero|)
+ (151 . =) (|SingleInteger|) (157 . |Zero|)
+ |FFIELDC-;order;SPi;10| (161 . |primitiveElement|)
+ (|Table| 10 39) (165 . |tableForDiscreteLogarithm|)
+ (170 . |#|) (175 . |One|) (|Union| 39 '"failed")
+ (179 . |search|) (185 . |true|) (189 . *) (195 . +)
+ (201 . *) (207 . -) (212 . *) (218 . +)
|FFIELDC-;discreteLog;SNni;11| (|Void|) (|String|)
- (|OutputForm|) (228 . |messagePrint|) (233 . |rem|)
- (239 . |zero?|) (|Factored| $) (244 . |factor|)
- (|Factored| 20) (249 . |factors|)
+ (|OutputForm|) (224 . |messagePrint|) (229 . |rem|)
+ (235 . |zero?|) (|Factored| $) (240 . |factor|)
+ (|Factored| 20) (245 . |factors|)
(|DiscreteLogarithmPackage| 6)
- (254 . |shanksDiscLogAlgorithm|)
+ (250 . |shanksDiscLogAlgorithm|)
|FFIELDC-;discreteLog;2SU;12|
- (|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| $)
+ (|SparseUnivariatePolynomial| 6) (|Factored| 95)
+ (|UnivariatePolynomialSquareFree| 6 95)
+ (257 . |squareFree|) (|DistinctDegreeFactorize| 6 95)
+ (262 . |factor|) (267 . |Zero|) (271 . =) (277 . |Zero|)
+ (|Record| (|:| |irr| 95) (|:| |pow| 20)) (|List| 104)
+ (|Record| (|:| |cont| 6) (|:| |factors| 105))
+ (281 . |distdfact|) (287 . |coerce|) (292 . |primeFactor|)
+ (298 . *) (304 . |One|) (308 . *) (|EuclideanDomain&| 95)
+ (314 . |gcd|) (|SparseUnivariatePolynomial| $)
|FFIELDC-;gcdPolynomial;3Sup;16|)
- '#(|primitive?| 324 |order| 329 |nextItem| 339 |init| 344
- |gcdPolynomial| 348 |discreteLog| 354 |differentiate| 365
- |createPrimitiveElement| 370 |conditionP| 374 |charthRoot|
- 379)
+ '#(|primitive?| 320 |order| 325 |nextItem| 335 |init| 340
+ |gcdPolynomial| 344 |discreteLog| 350 |differentiate| 361
+ |createPrimitiveElement| 366 |conditionP| 370 |charthRoot|
+ 375)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 117
+ (|makeByteWordVec2| 116
'(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
15 0 28 1 25 24 0 29 2 24 15 30 0 31
- 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 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)))))
+ 1 6 0 0 32 2 24 0 33 0 34 0 6 39 40 0
+ 6 39 41 2 39 0 0 0 42 2 6 0 0 39 43 2
+ 20 0 0 0 46 0 6 47 48 2 47 15 0 0 49
+ 0 15 0 50 1 15 0 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)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/FPS-.lsp b/src/algebra/strap/FPS-.lsp
index c85e10be..20b4f76e 100644
--- a/src/algebra/strap/FPS-.lsp
+++ b/src/algebra/strap/FPS-.lsp
@@ -22,8 +22,7 @@
(|getShellEntry| $ 16))
13301))
|FPS-;digits;Pi;2|)
- (|check-subtype|
- (AND (COND ((< #0# 0) 'NIL) ('T 'T)) (< 0 #0#))
+ (|check-subtype| (AND (NOT (< #0# 0)) (< 0 #0#))
'(|PositiveInteger|) #0#)))))
(DEFUN |FloatingPointSystem&| (|#1|)
diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp
index 5f67bbd8..ee920771 100644
--- a/src/algebra/strap/ILIST.lsp
+++ b/src/algebra/strap/ILIST.lsp
@@ -437,8 +437,7 @@
(|ILIST;rest;$Nni$;19| |p|
(PROG1 (LETT #0# (- |n| 1)
|ILIST;split!;$I$;29|)
- (|check-subtype|
- (COND ((< #0# 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
$)
|ILIST;split!;$I$;29|)
@@ -460,8 +459,7 @@
(SEQ (LETT |l|
(PROG1 (LETT #0# (QUOTIENT2 |n| 2)
|ILIST;mergeSort|)
- (|check-subtype|
- (COND ((< #0# 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
|ILIST;mergeSort|)
(LETT |q| (|ILIST;split!;$I$;29| |p| |l| $)
diff --git a/src/algebra/strap/INS-.lsp b/src/algebra/strap/INS-.lsp
index ff98f1df..20c9737a 100644
--- a/src/algebra/strap/INS-.lsp
+++ b/src/algebra/strap/INS-.lsp
@@ -128,13 +128,13 @@
((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#)))
+ (|check-subtype| (NOT (< #0# 0)) '(|NonNegativeInteger|)
+ #0#)))
('T
(PROG1 (LETT #1# (SPADCALL |x| (|getShellEntry| $ 29))
|INS-;euclideanSize;SNni;9|)
- (|check-subtype| (COND ((< #1# 0) 'NIL) ('T 'T))
- '(|NonNegativeInteger|) #1#)))))))
+ (|check-subtype| (NOT (< #1# 0)) '(|NonNegativeInteger|)
+ #1#)))))))
(DEFUN |INS-;convert;SF;10| (|x| $)
(SPADCALL (SPADCALL |x| (|getShellEntry| $ 29))
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index 5698408d..f0cba6fe 100644
--- a/src/algebra/strap/ISTRING.lsp
+++ b/src/algebra/strap/ISTRING.lsp
@@ -206,7 +206,7 @@
(MAKE-FULL-CVEC
(PROG1 (LETT #0# (+ (- |m| (+ (- |h| |l|) 1)) |n|)
|ISTRING;replace;$Us2$;15|)
- (|check-subtype| (COND ((< #0# 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
(SPADCALL (|getShellEntry| $ 52)))
|ISTRING;replace;$Us2$;15|)
@@ -750,8 +750,7 @@
|ISTRING;match?;2$CB;34|)
$)
|ISTRING;match?;2$CB;34|)
- (|check-subtype|
- (COND ((< #0# 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
|ISTRING;match?;2$CB;34|)
(EXIT (COND
@@ -781,10 +780,7 @@
|dontcare| |pattern| (+ |p| 1)
$)
|ISTRING;match?;2$CB;34|)
- (|check-subtype|
- (COND
- ((< #1# 0) 'NIL)
- ('T 'T))
+ (|check-subtype| (NOT (< #1# 0))
'(|NonNegativeInteger|) #1#))
|ISTRING;match?;2$CB;34|)
(SEQ G190
@@ -807,9 +803,7 @@
|s| |target| |i| $)
|ISTRING;match?;2$CB;34|)
(|check-subtype|
- (COND
- ((< #2# 0) 'NIL)
- ('T 'T))
+ (NOT (< #2# 0))
'(|NonNegativeInteger|) #2#))
|ISTRING;match?;2$CB;34|)
(EXIT
@@ -835,9 +829,7 @@
(+ |q| 1) $)
|ISTRING;match?;2$CB;34|)
(|check-subtype|
- (COND
- ((< #4# 0) 'NIL)
- ('T 'T))
+ (NOT (< #4# 0))
'(|NonNegativeInteger|)
#4#))
|ISTRING;match?;2$CB;34|)))))))
diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp
index 09fe53fb..72f15b22 100644
--- a/src/algebra/strap/LSAGG-.lsp
+++ b/src/algebra/strap/LSAGG-.lsp
@@ -252,8 +252,7 @@
(PROG1
(LETT #0# (- (- |i| 1) |m|)
|LSAGG-;insert!;SAIA;7|)
- (|check-subtype|
- (COND ((< #0# 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
(|getShellEntry| $ 39))
|LSAGG-;insert!;SAIA;7|)
@@ -280,8 +279,7 @@
(PROG1
(LETT #0# (- (- |i| 1) |m|)
|LSAGG-;insert!;2AIA;8|)
- (|check-subtype|
- (COND ((< #0# 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
(|getShellEntry| $ 39))
|LSAGG-;insert!;2AIA;8|)
@@ -360,8 +358,7 @@
(PROG1
(LETT #0# (- (- |i| 1) |m|)
|LSAGG-;delete!;AIA;10|)
- (|check-subtype|
- (COND ((< #0# 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
(|getShellEntry| $ 39))
|LSAGG-;delete!;AIA;10|)
@@ -395,9 +392,7 @@
(LETT #0# (- (+ |h| 1) |m|)
|LSAGG-;delete!;AUsA;11|)
(|check-subtype|
- (COND
- ((< #0# 0) 'NIL)
- ('T 'T))
+ (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
(|getShellEntry| $ 39)))
('T
@@ -407,9 +402,7 @@
(LETT #1# (- (- |l| 1) |m|)
|LSAGG-;delete!;AUsA;11|)
(|check-subtype|
- (COND
- ((< #1# 0) 'NIL)
- ('T 'T))
+ (NOT (< #1# 0))
'(|NonNegativeInteger|)
#1#))
(|getShellEntry| $ 39))
@@ -420,9 +413,7 @@
(LETT #2# (+ (- |h| |l|) 2)
|LSAGG-;delete!;AUsA;11|)
(|check-subtype|
- (COND
- ((< #2# 0) 'NIL)
- ('T 'T))
+ (NOT (< #2# 0))
'(|NonNegativeInteger|)
#2#))
(|getShellEntry| $ 39))
@@ -490,8 +481,7 @@
(SEQ (LETT |l|
(PROG1 (LETT #0# (QUOTIENT2 |n| 2)
|LSAGG-;mergeSort|)
- (|check-subtype|
- (COND ((< #0# 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
|LSAGG-;mergeSort|)
(LETT |q|
@@ -700,8 +690,7 @@
(PROG1
(LETT #0# (- |s| |m|)
|LSAGG-;copyInto!;2AIA;22|)
- (|check-subtype|
- (COND ((< #0# 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
(|getShellEntry| $ 39))
|LSAGG-;copyInto!;2AIA;22|)
@@ -745,8 +734,7 @@
(PROG1
(LETT #0# (- |s| |m|)
|LSAGG-;position;SA2I;23|)
- (|check-subtype|
- (COND ((< #0# 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
(|getShellEntry| $ 39))
|LSAGG-;position;SA2I;23|)
diff --git a/src/algebra/strap/STAGG-.lsp b/src/algebra/strap/STAGG-.lsp
index 53a1ca39..d461af4c 100644
--- a/src/algebra/strap/STAGG-.lsp
+++ b/src/algebra/strap/STAGG-.lsp
@@ -86,8 +86,7 @@
(LETT |x|
(SPADCALL |x|
(PROG1 |i|
- (|check-subtype|
- (COND ((< |i| 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< |i| 0))
'(|NonNegativeInteger|) |i|))
(|getShellEntry| $ 28))
|STAGG-;elt;AIS;5|)
@@ -108,8 +107,7 @@
(SPADCALL
(SPADCALL |x|
(PROG1 |l|
- (|check-subtype|
- (COND ((< |l| 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< |l| 0))
'(|NonNegativeInteger|) |l|))
(|getShellEntry| $ 28))
(|getShellEntry| $ 33)))
@@ -126,18 +124,14 @@
(SPADCALL |x|
(PROG1 |l|
(|check-subtype|
- (COND
- ((< |l| 0) 'NIL)
- ('T 'T))
+ (NOT (< |l| 0))
'(|NonNegativeInteger|) |l|))
(|getShellEntry| $ 28))
(PROG1
(LETT #0# (+ (- |h| |l|) 1)
|STAGG-;elt;AUsA;6|)
(|check-subtype|
- (COND
- ((< #0# 0) 'NIL)
- ('T 'T))
+ (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
(|getShellEntry| $ 37)))))))))))))
@@ -195,8 +189,7 @@
(LETT |x|
(SPADCALL |x|
(PROG1 |i|
- (|check-subtype|
- (COND ((< |i| 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< |i| 0))
'(|NonNegativeInteger|) |i|))
(|getShellEntry| $ 28))
|STAGG-;setelt;AI2S;11|)
@@ -231,9 +224,7 @@
(SPADCALL |x|
(PROG1 |l|
(|check-subtype|
- (COND
- ((< |l| 0) 'NIL)
- ('T 'T))
+ (NOT (< |l| 0))
'(|NonNegativeInteger|)
|l|))
(|getShellEntry| $ 28))
@@ -244,9 +235,7 @@
(LETT #0# (+ (- |h| |l|) 1)
|STAGG-;setelt;AUs2S;12|)
(|check-subtype|
- (COND
- ((< #0# 0) 'NIL)
- ('T 'T))
+ (NOT (< #0# 0))
'(|NonNegativeInteger|)
#0#))
(|getShellEntry| $ 28))
diff --git a/src/algebra/strap/URAGG-.lsp b/src/algebra/strap/URAGG-.lsp
index 6679030e..5d4e9577 100644
--- a/src/algebra/strap/URAGG-.lsp
+++ b/src/algebra/strap/URAGG-.lsp
@@ -452,8 +452,7 @@
(SPADCALL |x|
(PROG1 (LETT #0# (- |m| |n|)
|URAGG-;last;ANniA;22|)
- (|check-subtype|
- (COND ((< #0# 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
(|getShellEntry| $ 62))
(|getShellEntry| $ 63)))))))))
@@ -590,8 +589,7 @@
(SPADCALL |p|
(PROG1 (LETT #0# (- |n| 1)
|URAGG-;split!;AIA;32|)
- (|check-subtype|
- (COND ((< #0# 0) 'NIL) ('T 'T))
+ (|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
(|getShellEntry| $ 62))
|URAGG-;split!;AIA;32|)