aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/strap
diff options
context:
space:
mode:
Diffstat (limited to 'src/algebra/strap')
-rw-r--r--src/algebra/strap/DFLOAT.lsp16
-rw-r--r--src/algebra/strap/EUCDOM-.lsp35
-rw-r--r--src/algebra/strap/FFIELDC-.lsp20
-rw-r--r--src/algebra/strap/POLYCAT-.lsp6
-rw-r--r--src/algebra/strap/SYMBOL.lsp4
-rw-r--r--src/algebra/strap/UFD-.lsp3
6 files changed, 41 insertions, 43 deletions
diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp
index 89d19692..5a1cdc90 100644
--- a/src/algebra/strap/DFLOAT.lsp
+++ b/src/algebra/strap/DFLOAT.lsp
@@ -451,9 +451,9 @@
(DEFUN |DFLOAT;base;Pi;6| ($) (DECLARE (IGNORE $)) (FLOAT-RADIX 0.0))
-(DEFUN |DFLOAT;mantissa;$I;7| (|x| $) (QCAR (|DFLOAT;manexp| |x| $)))
+(DEFUN |DFLOAT;mantissa;$I;7| (|x| $) (CAR (|DFLOAT;manexp| |x| $)))
-(DEFUN |DFLOAT;exponent;$I;8| (|x| $) (QCDR (|DFLOAT;manexp| |x| $)))
+(DEFUN |DFLOAT;exponent;$I;8| (|x| $) (CDR (|DFLOAT;manexp| |x| $)))
(DEFUN |DFLOAT;precision;Pi;9| ($)
(DECLARE (IGNORE $))
@@ -733,8 +733,8 @@
(FLOAT-DIGITS 0.0))
|DFLOAT;manexp|)
(EXIT (CONS (* |s|
- (FIX (* |two53| (QCAR |me|))))
- (- (QCDR |me|) (FLOAT-DIGITS 0.0))))))))
+ (FIX (* |two53| (CAR |me|))))
+ (- (CDR |me|) (FLOAT-DIGITS 0.0))))))))
#0# (EXIT #0#)))))
(DEFUN |DFLOAT;rationalApproximation;$2NniF;87| (|f| |d| |b| $)
@@ -744,9 +744,9 @@
(RETURN
(SEQ (EXIT (SEQ (LETT |#G109| (|DFLOAT;manexp| |f| $)
|DFLOAT;rationalApproximation;$2NniF;87|)
- (LETT |nu| (QCAR |#G109|)
+ (LETT |nu| (CAR |#G109|)
|DFLOAT;rationalApproximation;$2NniF;87|)
- (LETT |ex| (QCDR |#G109|)
+ (LETT |ex| (CDR |#G109|)
|DFLOAT;rationalApproximation;$2NniF;87|)
|#G109|
(LETT BASE (FLOAT-RADIX 0.0)
@@ -792,9 +792,9 @@
(LETT |#G110|
(DIVIDE2 |s| |t|)
|DFLOAT;rationalApproximation;$2NniF;87|)
- (LETT |q| (QCAR |#G110|)
+ (LETT |q| (CAR |#G110|)
|DFLOAT;rationalApproximation;$2NniF;87|)
- (LETT |r| (QCDR |#G110|)
+ (LETT |r| (CDR |#G110|)
|DFLOAT;rationalApproximation;$2NniF;87|)
|#G110|
(LETT |p2|
diff --git a/src/algebra/strap/EUCDOM-.lsp b/src/algebra/strap/EUCDOM-.lsp
index 659824d5..d4b615b5 100644
--- a/src/algebra/strap/EUCDOM-.lsp
+++ b/src/algebra/strap/EUCDOM-.lsp
@@ -44,10 +44,10 @@
(SPADCALL |y| (|getShellEntry| $ 12))))))
(DEFUN |EUCDOM-;quo;3S;2| (|x| |y| $)
- (QCAR (SPADCALL |x| |y| (|getShellEntry| $ 16))))
+ (CAR (SPADCALL |x| |y| (|getShellEntry| $ 16))))
(DEFUN |EUCDOM-;rem;3S;3| (|x| |y| $)
- (QCDR (SPADCALL |x| |y| (|getShellEntry| $ 16))))
+ (CDR (SPADCALL |x| |y| (|getShellEntry| $ 16))))
(DEFUN |EUCDOM-;exquo;2SU;4| (|x| |y| $)
(PROG (|qr|)
@@ -60,9 +60,8 @@
(SEQ (LETT |qr| (SPADCALL |x| |y| (|getShellEntry| $ 16))
|EUCDOM-;exquo;2SU;4|)
(EXIT (COND
- ((SPADCALL (QCDR |qr|)
- (|getShellEntry| $ 8))
- (CONS 0 (QCAR |qr|)))
+ ((SPADCALL (CDR |qr|) (|getShellEntry| $ 8))
+ (CONS 0 (CAR |qr|)))
('T (CONS 1 "failed")))))))))))
(DEFUN |EUCDOM-;gcd;3S;5| (|x| |y| $)
@@ -139,16 +138,16 @@
(LETT |s3|
(VECTOR
(SPADCALL (QVELT |s1| 0)
- (SPADCALL (QCAR |qr|)
+ (SPADCALL (CAR |qr|)
(QVELT |s2| 0)
(|getShellEntry| $ 29))
(|getShellEntry| $ 31))
(SPADCALL (QVELT |s1| 1)
- (SPADCALL (QCAR |qr|)
+ (SPADCALL (CAR |qr|)
(QVELT |s2| 1)
(|getShellEntry| $ 29))
(|getShellEntry| $ 31))
- (QCDR |qr|))
+ (CDR |qr|))
|EUCDOM-;extendedEuclidean;2SR;7|)
(LETT |s1| |s2|
|EUCDOM-;extendedEuclidean;2SR;7|)
@@ -168,10 +167,10 @@
(SPADCALL (QVELT |s1| 0) |y|
(|getShellEntry| $ 16))
|EUCDOM-;extendedEuclidean;2SR;7|)
- (QSETVELT |s1| 0 (QCDR |qr|))
+ (QSETVELT |s1| 0 (CDR |qr|))
(QSETVELT |s1| 1
(SPADCALL (QVELT |s1| 1)
- (SPADCALL (QCAR |qr|) |x|
+ (SPADCALL (CAR |qr|) |x|
(|getShellEntry| $ 29))
(|getShellEntry| $ 33)))
(EXIT
@@ -214,12 +213,12 @@
|y| (|getShellEntry| $ 16))
|EUCDOM-;extendedEuclidean;3SU;8|)
(EXIT (CONS 0
- (CONS (QCDR |qr|)
+ (CONS (CDR |qr|)
(SPADCALL
(SPADCALL (QVELT |s| 1)
(CDR |w|)
(|getShellEntry| $ 29))
- (SPADCALL (QCAR |qr|) |x|
+ (SPADCALL (CAR |qr|) |x|
(|getShellEntry| $ 29))
(|getShellEntry| $ 33))))))))))))))))
@@ -248,7 +247,7 @@
(SPADCALL (CDR |l|) (|getShellEntry| $ 48))
|EUCDOM-;principalIdeal;LR;9|)
(LETT |u|
- (SPADCALL (|SPADfirst| |l|) (QCDR |v|)
+ (SPADCALL (|SPADfirst| |l|) (CDR |v|)
(|getShellEntry| $ 36))
|EUCDOM-;principalIdeal;LR;9|)
(EXIT (CONS (CONS (QVELT |u| 0)
@@ -258,7 +257,7 @@
(SEQ
(LETT |vv| NIL
|EUCDOM-;principalIdeal;LR;9|)
- (LETT #1# (QCAR |v|)
+ (LETT #1# (CAR |v|)
|EUCDOM-;principalIdeal;LR;9|)
G190
(COND
@@ -311,7 +310,7 @@
(SEQ (LETT |pid| (SPADCALL |l| (|getShellEntry| $ 48))
|EUCDOM-;expressIdealMember;LSU;10|)
(LETT |q|
- (SPADCALL |z| (QCDR |pid|)
+ (SPADCALL |z| (CDR |pid|)
(|getShellEntry| $ 37))
|EUCDOM-;expressIdealMember;LSU;10|)
(EXIT (COND
@@ -324,7 +323,7 @@
(SEQ
(LETT |v| NIL
|EUCDOM-;expressIdealMember;LSU;10|)
- (LETT #3# (QCAR |pid|)
+ (LETT #3# (CAR |pid|)
|EUCDOM-;expressIdealMember;LSU;10|)
G190
(COND
@@ -449,7 +448,7 @@
((EQL (CAR |u|) 1) (CONS 1 "failed"))
('T
(SEQ (LETT |v1|
- (SPADCALL |l1| (QCDR (CDR |u|))
+ (SPADCALL |l1| (CDR (CDR |u|))
(|getShellEntry| $ 63))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT
@@ -460,7 +459,7 @@
(SEQ
(LETT |v2|
(SPADCALL |l2|
- (QCAR (CDR |u|))
+ (CAR (CDR |u|))
(|getShellEntry| $ 63))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT
diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp
index 6064e646..56792e88 100644
--- a/src/algebra/strap/FFIELDC-.lsp
+++ b/src/algebra/strap/FFIELDC-.lsp
@@ -148,7 +148,7 @@
(LETT |equalone|
(SPADCALL
(SPADCALL |a|
- (QUOTIENT2 |q| (QCAR |exp|))
+ (QUOTIENT2 |q| (CAR |exp|))
(|getShellEntry| $ 58))
(|getShellEntry| $ 59))
|FFIELDC-;primitive?;SB;9|)
@@ -180,7 +180,7 @@
(GO G191)))
(SEQ (LETT |a|
(QUOTIENT2 |ord|
- (LETT |primeDivisor| (QCAR |rec|)
+ (LETT |primeDivisor| (CAR |rec|)
|FFIELDC-;order;SPi;10|))
|FFIELDC-;order;SPi;10|)
(LETT |goon|
@@ -190,7 +190,7 @@
(|getShellEntry| $ 59))
|FFIELDC-;order;SPi;10|)
(SEQ (LETT |j| 0 |FFIELDC-;order;SPi;10|)
- (LETT #1# (- (QCDR |rec|) 2)
+ (LETT #1# (- (CDR |rec|) 2)
|FFIELDC-;order;SPi;10|)
G190
(COND
@@ -264,13 +264,13 @@
NIL))
(GO G191)))
(SEQ
- (LETT |fac| (QCAR |f|)
+ (LETT |fac| (CAR |f|)
|FFIELDC-;discreteLog;SNni;11|)
(EXIT
(SEQ
(LETT |t| 0
|FFIELDC-;discreteLog;SNni;11|)
- (LETT #1# (- (QCDR |f|) 1)
+ (LETT #1# (- (CDR |f|) 1)
|FFIELDC-;discreteLog;SNni;11|)
G190
(COND
@@ -433,7 +433,7 @@
|FFIELDC-;discreteLog;2SU;12|)
NIL))
(GO G191)))
- (SEQ (LETT |fac| (QCAR |f|)
+ (SEQ (LETT |fac| (CAR |f|)
|FFIELDC-;discreteLog;2SU;12|)
(LETT |primroot|
(SPADCALL |logbase|
@@ -444,7 +444,7 @@
(SEQ
(LETT |t| 0
|FFIELDC-;discreteLog;2SU;12|)
- (LETT #1# (- (QCDR |f|) 1)
+ (LETT #1# (- (CDR |f|) 1)
|FFIELDC-;discreteLog;2SU;12|)
G190
(COND
@@ -517,14 +517,14 @@
(SPADCALL |f| T (|getShellEntry| $ 105))
|FFIELDC-;factorSquareFreePolynomial|)
(EXIT (SPADCALL
- (SPADCALL (QCAR |flist|)
+ (SPADCALL (CAR |flist|)
(|getShellEntry| $ 106))
(PROGN
(LETT #3# NIL
|FFIELDC-;factorSquareFreePolynomial|)
(SEQ (LETT |u| NIL
|FFIELDC-;factorSquareFreePolynomial|)
- (LETT #0# (QCDR |flist|)
+ (LETT #0# (CDR |flist|)
|FFIELDC-;factorSquareFreePolynomial|)
G190
(COND
@@ -536,7 +536,7 @@
(GO G191)))
(PROGN
(LETT #1#
- (SPADCALL (QCAR |u|) (QCDR |u|)
+ (SPADCALL (CAR |u|) (CDR |u|)
(|getShellEntry| $ 107))
|FFIELDC-;factorSquareFreePolynomial|)
(COND
diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp
index ebf96a67..f6bfa595 100644
--- a/src/algebra/strap/POLYCAT-.lsp
+++ b/src/algebra/strap/POLYCAT-.lsp
@@ -1379,9 +1379,9 @@
(SPADCALL |p2| |mvar| (|getShellEntry| $ 59))
(|getShellEntry| $ 191))
|POLYCAT-;monicDivide;2SVarSetR;30|)
- (EXIT (CONS (SPADCALL (QCAR |result|) |mvar|
+ (EXIT (CONS (SPADCALL (CAR |result|) |mvar|
(|getShellEntry| $ 161))
- (SPADCALL (QCDR |result|) |mvar|
+ (SPADCALL (CDR |result|) |mvar|
(|getShellEntry| $ 161))))))))
(DEFUN |POLYCAT-;squareFree;SF;31| (|p| $)
@@ -1415,7 +1415,7 @@
NIL))
(GO G191)))
(PROGN
- (LETT #1# (QCAR |f|)
+ (LETT #1# (CAR |f|)
|POLYCAT-;squareFreePart;2S;34|)
(COND
(#3# (LETT #2#
diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp
index 56acba33..e9cc7814 100644
--- a/src/algebra/strap/SYMBOL.lsp
+++ b/src/algebra/strap/SYMBOL.lsp
@@ -445,12 +445,12 @@
(SEQ (LETT |qr|
(DIVIDE2 |n| (QCSIZE |s|))
|SYMBOL;anyRadix|)
- (LETT |n| (QCAR |qr|)
+ (LETT |n| (CAR |qr|)
|SYMBOL;anyRadix|)
(LETT |ns|
(SPADCALL
(SPADCALL |s|
- (+ (QCDR |qr|)
+ (+ (CDR |qr|)
(SPADCALL |s|
(|getShellEntry| $ 117)))
(|getShellEntry| $ 106))
diff --git a/src/algebra/strap/UFD-.lsp b/src/algebra/strap/UFD-.lsp
index c6a03416..014395a3 100644
--- a/src/algebra/strap/UFD-.lsp
+++ b/src/algebra/strap/UFD-.lsp
@@ -29,8 +29,7 @@
NIL))
(GO G191)))
(PROGN
- (LETT #1# (QCAR |f|)
- |UFD-;squareFreePart;2S;1|)
+ (LETT #1# (CAR |f|) |UFD-;squareFreePart;2S;1|)
(COND
(#3# (LETT #2#
(SPADCALL #2# #1#
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 21:49:58 +0000