aboutsummaryrefslogtreecommitdiff
path: root/src/algebra
diff options
context:
space:
mode:
Diffstat (limited to 'src/algebra')
-rw-r--r--src/algebra/strap/ABELGRP-.lsp13
-rw-r--r--src/algebra/strap/ABELMON-.lsp6
-rw-r--r--src/algebra/strap/ABELSG-.lsp2
-rw-r--r--src/algebra/strap/BOOLEAN.lsp4
-rw-r--r--src/algebra/strap/CHAR.lsp12
-rw-r--r--src/algebra/strap/CLAGG-.lsp43
-rw-r--r--src/algebra/strap/DFLOAT.lsp68
-rw-r--r--src/algebra/strap/DIVRING-.lsp20
-rw-r--r--src/algebra/strap/EUCDOM-.lsp132
-rw-r--r--src/algebra/strap/FFIELDC-.lsp144
-rw-r--r--src/algebra/strap/FPS-.lsp8
-rw-r--r--src/algebra/strap/GCDDOM-.lsp83
-rw-r--r--src/algebra/strap/HOAGG-.lsp42
-rw-r--r--src/algebra/strap/ILIST.lsp30
-rw-r--r--src/algebra/strap/INS-.lsp138
-rw-r--r--src/algebra/strap/INT.lsp90
-rw-r--r--src/algebra/strap/INTDOM-.lsp25
-rw-r--r--src/algebra/strap/ISTRING.lsp116
-rw-r--r--src/algebra/strap/LIST.lsp103
-rw-r--r--src/algebra/strap/LNAGG-.lsp24
-rw-r--r--src/algebra/strap/LSAGG-.lsp348
-rw-r--r--src/algebra/strap/MONOID-.lsp6
-rw-r--r--src/algebra/strap/ORDRING-.lsp18
-rw-r--r--src/algebra/strap/OUTFORM.lsp20
-rw-r--r--src/algebra/strap/POLYCAT-.lsp354
-rw-r--r--src/algebra/strap/QFCAT-.lsp176
-rw-r--r--src/algebra/strap/RCAGG-.lsp7
-rw-r--r--src/algebra/strap/RING-.lsp2
-rw-r--r--src/algebra/strap/RNS-.lsp81
-rw-r--r--src/algebra/strap/SETAGG-.lsp16
-rw-r--r--src/algebra/strap/SINT.lsp46
-rw-r--r--src/algebra/strap/STAGG-.lsp123
-rw-r--r--src/algebra/strap/SYMBOL.lsp154
-rw-r--r--src/algebra/strap/UFD-.lsp14
-rw-r--r--src/algebra/strap/URAGG-.lsp216
-rw-r--r--src/algebra/strap/VECTOR.lsp10
36 files changed, 1278 insertions, 1416 deletions
diff --git a/src/algebra/strap/ABELGRP-.lsp b/src/algebra/strap/ABELGRP-.lsp
index 53465f1c..66b5ec1f 100644
--- a/src/algebra/strap/ABELGRP-.lsp
+++ b/src/algebra/strap/ABELGRP-.lsp
@@ -15,21 +15,20 @@
|ABELGRP-;*;I2S;4|))
(DEFUN |ABELGRP-;-;3S;1| (|x| |y| $)
- (SPADCALL |x| (SPADCALL |y| (|getShellEntry| $ 7))
- (|getShellEntry| $ 8)))
+ (SPADCALL |x| (SPADCALL |y| (|shellEntry| $ 7)) (|shellEntry| $ 8)))
(DEFUN |ABELGRP-;subtractIfCan;2SU;2| (|x| |y| $)
- (CONS 0 (SPADCALL |x| |y| (|getShellEntry| $ 10))))
+ (CONS 0 (SPADCALL |x| |y| (|shellEntry| $ 10))))
(DEFUN |ABELGRP-;*;Nni2S;3| (|n| |x| $)
- (SPADCALL |n| |x| (|getShellEntry| $ 14)))
+ (SPADCALL |n| |x| (|shellEntry| $ 14)))
(DEFUN |ABELGRP-;*;I2S;4| (|n| |x| $)
(COND
((ZEROP |n|) (|spadConstant| $ 19))
- ((PLUSP |n|) (SPADCALL |n| |x| (|getShellEntry| $ 24)))
- (T (SPADCALL (- |n|) (SPADCALL |x| (|getShellEntry| $ 7))
- (|getShellEntry| $ 24)))))
+ ((PLUSP |n|) (SPADCALL |n| |x| (|shellEntry| $ 24)))
+ (T (SPADCALL (- |n|) (SPADCALL |x| (|shellEntry| $ 7))
+ (|shellEntry| $ 24)))))
(DEFUN |AbelianGroup&| (|#1|)
(LET* ((|dv$1| (|devaluate| |#1|))
diff --git a/src/algebra/strap/ABELMON-.lsp b/src/algebra/strap/ABELMON-.lsp
index b73e55f3..762d1b3d 100644
--- a/src/algebra/strap/ABELMON-.lsp
+++ b/src/algebra/strap/ABELMON-.lsp
@@ -15,17 +15,17 @@
|ABELMON-;*;Nni2S;4|))
(DEFUN |ABELMON-;zero?;SB;1| (|x| $)
- (SPADCALL |x| (|spadConstant| $ 7) (|getShellEntry| $ 9)))
+ (SPADCALL |x| (|spadConstant| $ 7) (|shellEntry| $ 9)))
(DEFUN |ABELMON-;*;Pi2S;2| (|n| |x| $)
- (SPADCALL |n| |x| (|getShellEntry| $ 12)))
+ (SPADCALL |n| |x| (|shellEntry| $ 12)))
(DEFUN |ABELMON-;sample;S;3| ($) (|spadConstant| $ 7))
(DEFUN |ABELMON-;*;Nni2S;4| (|n| |x| $)
(COND
((ZEROP |n|) (|spadConstant| $ 7))
- (T (SPADCALL |n| |x| (|getShellEntry| $ 18)))))
+ (T (SPADCALL |n| |x| (|shellEntry| $ 18)))))
(DEFUN |AbelianMonoid&| (|#1|)
(LET* ((|dv$1| (|devaluate| |#1|))
diff --git a/src/algebra/strap/ABELSG-.lsp b/src/algebra/strap/ABELSG-.lsp
index a6270096..c901d63f 100644
--- a/src/algebra/strap/ABELSG-.lsp
+++ b/src/algebra/strap/ABELSG-.lsp
@@ -6,7 +6,7 @@
|ABELSG-;*;Pi2S;1|))
(DEFUN |ABELSG-;*;Pi2S;1| (|n| |x| $)
- (SPADCALL |n| |x| (|getShellEntry| $ 9)))
+ (SPADCALL |n| |x| (|shellEntry| $ 9)))
(DEFUN |AbelianSemiGroup&| (|#1|)
(LET* ((|dv$1| (|devaluate| |#1|))
diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp
index 3be57204..c6cbc624 100644
--- a/src/algebra/strap/BOOLEAN.lsp
+++ b/src/algebra/strap/BOOLEAN.lsp
@@ -135,12 +135,12 @@
(DEFUN |BOOLEAN;size;Nni;17| ($) (DECLARE (IGNORE $)) 2)
(DEFUN |BOOLEAN;index;Pi$;18| (|i| $)
- (COND ((SPADCALL |i| (|getShellEntry| $ 26)) NIL) (T T)))
+ (COND ((SPADCALL |i| (|shellEntry| $ 26)) NIL) (T T)))
(DEFUN |BOOLEAN;lookup;$Pi;19| (|a| $) (COND (|a| 1) (T 2)))
(DEFUN |BOOLEAN;random;$;20| ($)
- (COND ((SPADCALL (|random|) (|getShellEntry| $ 26)) NIL) (T T)))
+ (COND ((SPADCALL (|random|) (|shellEntry| $ 26)) NIL) (T T)))
(DEFUN |BOOLEAN;convert;$If;21| (|x| $)
(COND (|x| '|true|) (T '|false|)))
diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp
index a2a1ff14..70fb8abb 100644
--- a/src/algebra/strap/CHAR.lsp
+++ b/src/algebra/strap/CHAR.lsp
@@ -214,22 +214,22 @@
(DEFUN |CHAR;coerce;$Of;23| (|c| $) (DECLARE (IGNORE $)) |c|)
(DEFUN |CHAR;digit?;$B;24| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 40) (|getShellEntry| $ 42)))
+ (SPADCALL |c| (|spadConstant| $ 40) (|shellEntry| $ 42)))
(DEFUN |CHAR;hexDigit?;$B;25| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 44) (|getShellEntry| $ 42)))
+ (SPADCALL |c| (|spadConstant| $ 44) (|shellEntry| $ 42)))
(DEFUN |CHAR;upperCase?;$B;26| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 46) (|getShellEntry| $ 42)))
+ (SPADCALL |c| (|spadConstant| $ 46) (|shellEntry| $ 42)))
(DEFUN |CHAR;lowerCase?;$B;27| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 48) (|getShellEntry| $ 42)))
+ (SPADCALL |c| (|spadConstant| $ 48) (|shellEntry| $ 42)))
(DEFUN |CHAR;alphabetic?;$B;28| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 50) (|getShellEntry| $ 42)))
+ (SPADCALL |c| (|spadConstant| $ 50) (|shellEntry| $ 42)))
(DEFUN |CHAR;alphanumeric?;$B;29| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 52) (|getShellEntry| $ 42)))
+ (SPADCALL |c| (|spadConstant| $ 52) (|shellEntry| $ 42)))
(DEFUN |CHAR;latex;$S;30| (|c| $)
(DECLARE (IGNORE $))
diff --git a/src/algebra/strap/CLAGG-.lsp b/src/algebra/strap/CLAGG-.lsp
index e30b90d6..953b9dcf 100644
--- a/src/algebra/strap/CLAGG-.lsp
+++ b/src/algebra/strap/CLAGG-.lsp
@@ -42,11 +42,11 @@
|CLAGG-;removeDuplicates;2A;12|))
(DEFUN |CLAGG-;#;ANni;1| (|c| $)
- (LIST-LENGTH (SPADCALL |c| (|getShellEntry| $ 9))))
+ (LIST-LENGTH (SPADCALL |c| (|shellEntry| $ 9))))
(DEFUN |CLAGG-;count;MANni;2| (|f| |c| $)
(LET ((#0=#:G1377 NIL) (#1=#:G1378 T)
- (#2=#:G1404 (SPADCALL |c| (|getShellEntry| $ 9))))
+ (#2=#:G1404 (SPADCALL |c| (|shellEntry| $ 9))))
(LOOP
(COND
((ATOM #2#) (RETURN (COND (#1# 0) (T #0#))))
@@ -61,7 +61,7 @@
(DEFUN |CLAGG-;any?;MAB;3| (|f| |c| $)
(LET ((#0=#:G1382 NIL) (#1=#:G1383 T)
- (#2=#:G1405 (SPADCALL |c| (|getShellEntry| $ 9))))
+ (#2=#:G1405 (SPADCALL |c| (|shellEntry| $ 9))))
(LOOP
(COND
((ATOM #2#) (RETURN (COND (#1# NIL) (T #0#))))
@@ -73,7 +73,7 @@
(DEFUN |CLAGG-;every?;MAB;4| (|f| |c| $)
(LET ((#0=#:G1386 NIL) (#1=#:G1387 T)
- (#2=#:G1406 (SPADCALL |c| (|getShellEntry| $ 9))))
+ (#2=#:G1406 (SPADCALL |c| (|shellEntry| $ 9))))
(LOOP
(COND
((ATOM #2#) (RETURN (COND (#1# T) (T #0#))))
@@ -86,43 +86,40 @@
(SETQ #2# (CDR #2#)))))
(DEFUN |CLAGG-;find;MAU;5| (|f| |c| $)
- (SPADCALL |f| (SPADCALL |c| (|getShellEntry| $ 9))
- (|getShellEntry| $ 26)))
+ (SPADCALL |f| (SPADCALL |c| (|shellEntry| $ 9)) (|shellEntry| $ 26)))
(DEFUN |CLAGG-;reduce;MAS;6| (|f| |x| $)
- (SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9))
- (|getShellEntry| $ 29)))
+ (SPADCALL |f| (SPADCALL |x| (|shellEntry| $ 9)) (|shellEntry| $ 29)))
(DEFUN |CLAGG-;reduce;MA2S;7| (|f| |x| |s| $)
- (SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9)) |s|
- (|getShellEntry| $ 31)))
+ (SPADCALL |f| (SPADCALL |x| (|shellEntry| $ 9)) |s|
+ (|shellEntry| $ 31)))
(DEFUN |CLAGG-;remove;M2A;8| (|f| |x| $)
- (SPADCALL (SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9))
- (|getShellEntry| $ 33))
- (|getShellEntry| $ 34)))
+ (SPADCALL (SPADCALL |f| (SPADCALL |x| (|shellEntry| $ 9))
+ (|shellEntry| $ 33))
+ (|shellEntry| $ 34)))
(DEFUN |CLAGG-;select;M2A;9| (|f| |x| $)
- (SPADCALL (SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9))
- (|getShellEntry| $ 36))
- (|getShellEntry| $ 34)))
+ (SPADCALL (SPADCALL |f| (SPADCALL |x| (|shellEntry| $ 9))
+ (|shellEntry| $ 36))
+ (|shellEntry| $ 34)))
(DEFUN |CLAGG-;remove;S2A;10| (|s| |x| $)
(SPADCALL (CONS #'|CLAGG-;remove;S2A;10!0| (VECTOR $ |s|)) |x|
- (|getShellEntry| $ 39)))
+ (|shellEntry| $ 39)))
(DEFUN |CLAGG-;remove;S2A;10!0| (|#1| $$)
- (SPADCALL |#1| (SVREF $$ 1) (|getShellEntry| (SVREF $$ 0) 38)))
+ (SPADCALL |#1| (SVREF $$ 1) (|shellEntry| (SVREF $$ 0) 38)))
(DEFUN |CLAGG-;reduce;MA3S;11| (|f| |x| |s1| |s2| $)
- (SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9)) |s1| |s2|
- (|getShellEntry| $ 41)))
+ (SPADCALL |f| (SPADCALL |x| (|shellEntry| $ 9)) |s1| |s2|
+ (|shellEntry| $ 41)))
(DEFUN |CLAGG-;removeDuplicates;2A;12| (|x| $)
(SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 9))
- (|getShellEntry| $ 43))
- (|getShellEntry| $ 34)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 9)) (|shellEntry| $ 43))
+ (|shellEntry| $ 34)))
(DEFUN |Collection&| (|#1| |#2|)
(LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|))
diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp
index a5f3881d..2d0a6877 100644
--- a/src/algebra/strap/DFLOAT.lsp
+++ b/src/algebra/strap/DFLOAT.lsp
@@ -427,34 +427,33 @@
(DEFUN |DFLOAT;OMwrite;$S;1| (|x| $)
(LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
- (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 7))
- (|getShellEntry| $ 10))))
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 12))
- (SPADCALL |dev| |x| (|getShellEntry| $ 15))
- (SPADCALL |dev| (|getShellEntry| $ 16))
- (SPADCALL |dev| (|getShellEntry| $ 17))
+ (|dev| (SPADCALL |sp| (SPADCALL (|shellEntry| $ 7))
+ (|shellEntry| $ 10))))
+ (SEQ (SPADCALL |dev| (|shellEntry| $ 12))
+ (SPADCALL |dev| |x| (|shellEntry| $ 15))
+ (SPADCALL |dev| (|shellEntry| $ 16))
+ (SPADCALL |dev| (|shellEntry| $ 17))
(SETQ |s| (OM-STRINGPTRTOSTRING |sp|)) (EXIT |s|))))
(DEFUN |DFLOAT;OMwrite;$BS;2| (|x| |wholeObj| $)
(LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
- (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 7))
- (|getShellEntry| $ 10))))
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 12))))
- (SPADCALL |dev| |x| (|getShellEntry| $ 15))
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 16))))
- (SPADCALL |dev| (|getShellEntry| $ 17))
+ (|dev| (SPADCALL |sp| (SPADCALL (|shellEntry| $ 7))
+ (|shellEntry| $ 10))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 12))))
+ (SPADCALL |dev| |x| (|shellEntry| $ 15))
+ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 16))))
+ (SPADCALL |dev| (|shellEntry| $ 17))
(SETQ |s| (OM-STRINGPTRTOSTRING |sp|)) (EXIT |s|))))
(DEFUN |DFLOAT;OMwrite;Omd$V;3| (|dev| |x| $)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 12))
- (SPADCALL |dev| |x| (|getShellEntry| $ 15))
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 16)))))
+ (SEQ (SPADCALL |dev| (|shellEntry| $ 12))
+ (SPADCALL |dev| |x| (|shellEntry| $ 15))
+ (EXIT (SPADCALL |dev| (|shellEntry| $ 16)))))
(DEFUN |DFLOAT;OMwrite;Omd$BV;4| (|dev| |x| |wholeObj| $)
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 12))))
- (SPADCALL |dev| |x| (|getShellEntry| $ 15))
- (EXIT (COND
- (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 16)))))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 12))))
+ (SPADCALL |dev| |x| (|shellEntry| $ 15))
+ (EXIT (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 16)))))))
(DEFUN |DFLOAT;base;Pi;5| ($) (DECLARE (IGNORE $)) 2)
@@ -473,7 +472,7 @@
(SPADCALL 53
(C-TO-R (LOG (FLOAT 2 |$DoubleFloatMaximum|)
2))
- (|getShellEntry| $ 32)))))
+ (|shellEntry| $ 32)))))
(|check-subtype| (AND (NOT (MINUSP #0#)) (PLUSP #0#))
'(|PositiveInteger|) #0#)))))
@@ -502,10 +501,10 @@
(COERCE PI '|%DoubleFloat|))
(DEFUN |DFLOAT;coerce;$Of;17| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 48)))
+ (SPADCALL |x| (|shellEntry| $ 48)))
(DEFUN |DFLOAT;convert;$If;18| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 51)))
+ (SPADCALL |x| (|shellEntry| $ 51)))
(DEFUN |DFLOAT;<;2$B;19| (|x| |y| $) (DECLARE (IGNORE $)) (< |x| |y|))
@@ -665,10 +664,10 @@
(DEFUN |DFLOAT;differentiate;2$;70| (|x| $) (DECLARE (IGNORE $)) 0.0)
(DEFUN |DFLOAT;Gamma;2$;71| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 106)))
+ (SPADCALL |x| (|shellEntry| $ 106)))
(DEFUN |DFLOAT;Beta;3$;72| (|x| |y| $)
- (SPADCALL |x| |y| (|getShellEntry| $ 108)))
+ (SPADCALL |x| |y| (|shellEntry| $ 108)))
(DEFUN |DFLOAT;wholePart;$I;73| (|x| $)
(DECLARE (IGNORE $))
@@ -680,7 +679,7 @@
(DEFUN |DFLOAT;convert;2$;75| (|x| $) (DECLARE (IGNORE $)) |x|)
(DEFUN |DFLOAT;convert;$F;76| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 112)))
+ (SPADCALL |x| (|shellEntry| $ 112)))
(DEFUN |DFLOAT;rationalApproximation;$NniF;77| (|x| |d| $)
(|DFLOAT;rationalApproximation;$2NniF;86| |x| |d| 10 $))
@@ -777,7 +776,7 @@
(EXPT BASE
(|check-subtype| (NOT (MINUSP |ex|))
'(|NonNegativeInteger|) |ex|)))
- (|getShellEntry| $ 134)))
+ (|shellEntry| $ 134)))
(T (SEQ (LETT |de|
(EXPT BASE
(LET ((#0=#:G1525 (- |ex|)))
@@ -834,13 +833,13 @@
(ABS
(- (* |nu| |q2|)
(* |de| |p2|)))
- (|getShellEntry| $
+ (|shellEntry| $
143))
(* |de| (ABS |p2|))))
(RETURN-FROM
|DFLOAT;rationalApproximation;$2NniF;86|
(SPADCALL |p2| |q2|
- (|getShellEntry| $
+ (|shellEntry| $
141))))
(T
(SEQ
@@ -871,15 +870,14 @@
(COND
((ZEROP |x|)
(COND
- ((SPADCALL |r| (|getShellEntry| $ 145))
+ ((SPADCALL |r| (|shellEntry| $ 145))
(|error| "0**0 is undefined"))
- ((SPADCALL |r| (|getShellEntry| $ 146))
- (|error| "division by 0"))
+ ((SPADCALL |r| (|shellEntry| $ 146)) (|error| "division by 0"))
(T 0.0)))
- ((OR (SPADCALL |r| (|getShellEntry| $ 145)) (= |x| 1.0)) 1.0)
- ((SPADCALL |r| (|getShellEntry| $ 147)) |x|)
- (T (LET ((|n| (SPADCALL |r| (|getShellEntry| $ 148)))
- (|d| (SPADCALL |r| (|getShellEntry| $ 149))))
+ ((OR (SPADCALL |r| (|shellEntry| $ 145)) (= |x| 1.0)) 1.0)
+ ((SPADCALL |r| (|shellEntry| $ 147)) |x|)
+ (T (LET ((|n| (SPADCALL |r| (|shellEntry| $ 148)))
+ (|d| (SPADCALL |r| (|shellEntry| $ 149))))
(COND
((MINUSP |x|)
(COND
diff --git a/src/algebra/strap/DIVRING-.lsp b/src/algebra/strap/DIVRING-.lsp
index 822769d1..8f00ceb9 100644
--- a/src/algebra/strap/DIVRING-.lsp
+++ b/src/algebra/strap/DIVRING-.lsp
@@ -10,22 +10,22 @@
(DEFUN |DIVRING-;**;SIS;1| (|x| |n| $)
(COND
((ZEROP |n|) (|spadConstant| $ 10))
- ((SPADCALL |x| (|getShellEntry| $ 11))
+ ((SPADCALL |x| (|shellEntry| $ 11))
(COND ((MINUSP |n|) (|error| "division by zero")) (T |x|)))
((MINUSP |n|)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 15)) (- |n|)
- (|getShellEntry| $ 19)))
- (T (SPADCALL |x| |n| (|getShellEntry| $ 19)))))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 15)) (- |n|)
+ (|shellEntry| $ 19)))
+ (T (SPADCALL |x| |n| (|shellEntry| $ 19)))))
(DEFUN |DIVRING-;*;F2S;2| (|q| |x| $)
(SPADCALL
- (SPADCALL (SPADCALL |q| (|getShellEntry| $ 22))
+ (SPADCALL (SPADCALL |q| (|shellEntry| $ 22))
(SPADCALL
- (SPADCALL (SPADCALL |q| (|getShellEntry| $ 23))
- (|getShellEntry| $ 24))
- (|getShellEntry| $ 15))
- (|getShellEntry| $ 25))
- |x| (|getShellEntry| $ 26)))
+ (SPADCALL (SPADCALL |q| (|shellEntry| $ 23))
+ (|shellEntry| $ 24))
+ (|shellEntry| $ 15))
+ (|shellEntry| $ 25))
+ |x| (|shellEntry| $ 26)))
(DEFUN |DivisionRing&| (|#1|)
(LET* ((|dv$1| (|devaluate| |#1|))
diff --git a/src/algebra/strap/EUCDOM-.lsp b/src/algebra/strap/EUCDOM-.lsp
index f1cac41f..1146ff3e 100644
--- a/src/algebra/strap/EUCDOM-.lsp
+++ b/src/algebra/strap/EUCDOM-.lsp
@@ -37,58 +37,56 @@
(DEFUN |EUCDOM-;sizeLess?;2SB;1| (|x| |y| $)
(COND
- ((SPADCALL |y| (|getShellEntry| $ 8)) NIL)
- ((SPADCALL |x| (|getShellEntry| $ 8)) T)
- (T (< (SPADCALL |x| (|getShellEntry| $ 12))
- (SPADCALL |y| (|getShellEntry| $ 12))))))
+ ((SPADCALL |y| (|shellEntry| $ 8)) NIL)
+ ((SPADCALL |x| (|shellEntry| $ 8)) T)
+ (T (< (SPADCALL |x| (|shellEntry| $ 12))
+ (SPADCALL |y| (|shellEntry| $ 12))))))
(DEFUN |EUCDOM-;quo;3S;2| (|x| |y| $)
- (CAR (SPADCALL |x| |y| (|getShellEntry| $ 16))))
+ (CAR (SPADCALL |x| |y| (|shellEntry| $ 16))))
(DEFUN |EUCDOM-;rem;3S;3| (|x| |y| $)
- (CDR (SPADCALL |x| |y| (|getShellEntry| $ 16))))
+ (CDR (SPADCALL |x| |y| (|shellEntry| $ 16))))
(DEFUN |EUCDOM-;exquo;2SU;4| (|x| |y| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 8))
- (CONS 0 (|spadConstant| $ 19)))
- ((SPADCALL |y| (|getShellEntry| $ 8)) (CONS 1 "failed"))
- (T (LET ((|qr| (SPADCALL |x| |y| (|getShellEntry| $ 16))))
+ ((SPADCALL |x| (|shellEntry| $ 8)) (CONS 0 (|spadConstant| $ 19)))
+ ((SPADCALL |y| (|shellEntry| $ 8)) (CONS 1 "failed"))
+ (T (LET ((|qr| (SPADCALL |x| |y| (|shellEntry| $ 16))))
(COND
- ((SPADCALL (CDR |qr|) (|getShellEntry| $ 8))
+ ((SPADCALL (CDR |qr|) (|shellEntry| $ 8))
(CONS 0 (CAR |qr|)))
(T (CONS 1 "failed")))))))
(DEFUN |EUCDOM-;gcd;3S;5| (|x| |y| $)
(PROG (|#G13| |#G14|)
(RETURN
- (SEQ (SETQ |x| (SPADCALL |x| (|getShellEntry| $ 22)))
- (SETQ |y| (SPADCALL |y| (|getShellEntry| $ 22)))
+ (SEQ (SETQ |x| (SPADCALL |x| (|shellEntry| $ 22)))
+ (SETQ |y| (SPADCALL |y| (|shellEntry| $ 22)))
(LOOP
(COND
- ((NOT (NOT (SPADCALL |y| (|getShellEntry| $ 8))))
+ ((NOT (NOT (SPADCALL |y| (|shellEntry| $ 8))))
(RETURN NIL))
(T (SEQ (LETT |#G13| |y| |EUCDOM-;gcd;3S;5|)
(LETT |#G14|
- (SPADCALL |x| |y| (|getShellEntry| $ 24))
+ (SPADCALL |x| |y| (|shellEntry| $ 24))
|EUCDOM-;gcd;3S;5|)
(SETQ |x| |#G13|) (SETQ |y| |#G14|)
(EXIT (SETQ |y|
- (SPADCALL |y|
- (|getShellEntry| $ 22))))))))
+ (SPADCALL |y| (|shellEntry| $ 22))))))))
(EXIT |x|)))))
(DEFUN |EUCDOM-;unitNormalizeIdealElt| (|s| $)
- (LET* ((|#G16| (SPADCALL (SVREF |s| 2) (|getShellEntry| $ 27)))
+ (LET* ((|#G16| (SPADCALL (SVREF |s| 2) (|shellEntry| $ 27)))
(|u| (SVREF |#G16| 0)) (|c| (SVREF |#G16| 1))
(|a| (SVREF |#G16| 2)))
(SEQ |#G16|
(EXIT (COND
- ((SPADCALL |a| (|getShellEntry| $ 28)) |s|)
+ ((SPADCALL |a| (|shellEntry| $ 28)) |s|)
(T (VECTOR (SPADCALL |a| (SVREF |s| 0)
- (|getShellEntry| $ 29))
+ (|shellEntry| $ 29))
(SPADCALL |a| (SVREF |s| 1)
- (|getShellEntry| $ 29))
+ (|shellEntry| $ 29))
|c|)))))))
(DEFUN |EUCDOM-;extendedEuclidean;2SR;7| (|x| |y| $)
@@ -103,30 +101,30 @@
(|spadConstant| $ 30) |y|)
$)))
(COND
- ((SPADCALL |y| (|getShellEntry| $ 8)) |s1|)
- ((SPADCALL |x| (|getShellEntry| $ 8)) |s2|)
+ ((SPADCALL |y| (|shellEntry| $ 8)) |s1|)
+ ((SPADCALL |x| (|shellEntry| $ 8)) |s2|)
(T (SEQ (LOOP
(COND
((NOT (NOT (SPADCALL (SVREF |s2| 2)
- (|getShellEntry| $ 8))))
+ (|shellEntry| $ 8))))
(RETURN NIL))
(T (SEQ (LETT |qr|
(SPADCALL (SVREF |s1| 2)
(SVREF |s2| 2)
- (|getShellEntry| $ 16))
+ (|shellEntry| $ 16))
|EUCDOM-;extendedEuclidean;2SR;7|)
(LETT |s3|
(VECTOR
(SPADCALL (SVREF |s1| 0)
(SPADCALL (CAR |qr|)
(SVREF |s2| 0)
- (|getShellEntry| $ 29))
- (|getShellEntry| $ 31))
+ (|shellEntry| $ 29))
+ (|shellEntry| $ 31))
(SPADCALL (SVREF |s1| 1)
(SPADCALL (CAR |qr|)
(SVREF |s2| 1)
- (|getShellEntry| $ 29))
- (|getShellEntry| $ 31))
+ (|shellEntry| $ 29))
+ (|shellEntry| $ 31))
(CDR |qr|))
|EUCDOM-;extendedEuclidean;2SR;7|)
(SETQ |s1| |s2|)
@@ -135,18 +133,18 @@
|s3| $)))))))
(COND
((AND (NOT (SPADCALL (SVREF |s1| 0)
- (|getShellEntry| $ 8)))
+ (|shellEntry| $ 8)))
(NOT (SPADCALL (SVREF |s1| 0) |y|
- (|getShellEntry| $ 32))))
+ (|shellEntry| $ 32))))
(SEQ (SETQ |qr|
(SPADCALL (SVREF |s1| 0) |y|
- (|getShellEntry| $ 16)))
+ (|shellEntry| $ 16)))
(SETF (SVREF |s1| 0) (CDR |qr|))
(SETF (SVREF |s1| 1)
(SPADCALL (SVREF |s1| 1)
(SPADCALL (CAR |qr|) |x|
- (|getShellEntry| $ 29))
- (|getShellEntry| $ 33)))
+ (|shellEntry| $ 29))
+ (|shellEntry| $ 33)))
(EXIT (SETQ |s1|
(|EUCDOM-;unitNormalizeIdealElt|
|s1| $))))))
@@ -156,49 +154,48 @@
(PROG (|qr|)
(RETURN
(COND
- ((SPADCALL |z| (|getShellEntry| $ 8))
+ ((SPADCALL |z| (|shellEntry| $ 8))
(CONS 0 (CONS (|spadConstant| $ 19) (|spadConstant| $ 19))))
- (T (LET* ((|s| (SPADCALL |x| |y| (|getShellEntry| $ 36)))
- (|w| (SPADCALL |z| (SVREF |s| 2)
- (|getShellEntry| $ 37))))
+ (T (LET* ((|s| (SPADCALL |x| |y| (|shellEntry| $ 36)))
+ (|w| (SPADCALL |z| (SVREF |s| 2) (|shellEntry| $ 37))))
(COND
((EQL (CAR |w|) 1) (CONS 1 "failed"))
- ((SPADCALL |y| (|getShellEntry| $ 8))
+ ((SPADCALL |y| (|shellEntry| $ 8))
(CONS 0
(CONS (SPADCALL (SVREF |s| 0) (CDR |w|)
- (|getShellEntry| $ 29))
+ (|shellEntry| $ 29))
(SPADCALL (SVREF |s| 1) (CDR |w|)
- (|getShellEntry| $ 29)))))
+ (|shellEntry| $ 29)))))
(T (SEQ (LETT |qr|
(SPADCALL
(SPADCALL (SVREF |s| 0) (CDR |w|)
- (|getShellEntry| $ 29))
- |y| (|getShellEntry| $ 16))
+ (|shellEntry| $ 29))
+ |y| (|shellEntry| $ 16))
|EUCDOM-;extendedEuclidean;3SU;8|)
(EXIT (CONS 0
(CONS (CDR |qr|)
(SPADCALL
(SPADCALL (SVREF |s| 1) (CDR |w|)
- (|getShellEntry| $ 29))
+ (|shellEntry| $ 29))
(SPADCALL (CAR |qr|) |x|
- (|getShellEntry| $ 29))
- (|getShellEntry| $ 33))))))))))))))
+ (|shellEntry| $ 29))
+ (|shellEntry| $ 33))))))))))))))
(DEFUN |EUCDOM-;principalIdeal;LR;9| (|l| $)
(COND
- ((SPADCALL |l| NIL (|getShellEntry| $ 42))
+ ((SPADCALL |l| NIL (|shellEntry| $ 42))
(|error| "empty list passed to principalIdeal"))
- ((SPADCALL (CDR |l|) NIL (|getShellEntry| $ 42))
- (LET ((|uca| (SPADCALL (|SPADfirst| |l|) (|getShellEntry| $ 27))))
+ ((SPADCALL (CDR |l|) NIL (|shellEntry| $ 42))
+ (LET ((|uca| (SPADCALL (|SPADfirst| |l|) (|shellEntry| $ 27))))
(CONS (LIST (SVREF |uca| 0)) (SVREF |uca| 1))))
- ((SPADCALL (CDR (CDR |l|)) NIL (|getShellEntry| $ 42))
+ ((SPADCALL (CDR (CDR |l|)) NIL (|shellEntry| $ 42))
(LET ((|u| (SPADCALL (|SPADfirst| |l|)
- (SPADCALL |l| (|getShellEntry| $ 45))
- (|getShellEntry| $ 36))))
+ (SPADCALL |l| (|shellEntry| $ 45))
+ (|shellEntry| $ 36))))
(CONS (LIST (SVREF |u| 0) (SVREF |u| 1)) (SVREF |u| 2))))
- (T (LET* ((|v| (SPADCALL (CDR |l|) (|getShellEntry| $ 48)))
+ (T (LET* ((|v| (SPADCALL (CDR |l|) (|shellEntry| $ 48)))
(|u| (SPADCALL (|SPADfirst| |l|) (CDR |v|)
- (|getShellEntry| $ 36))))
+ (|shellEntry| $ 36))))
(CONS (CONS (SVREF |u| 0)
(LET ((#0=#:G1494 (CAR |v|)) (#1=#:G1493 NIL))
(LOOP
@@ -208,14 +205,14 @@
(SETQ #1#
(CONS
(SPADCALL (SVREF |u| 1) |vv|
- (|getShellEntry| $ 29))
+ (|shellEntry| $ 29))
#1#)))))
(SETQ #0# (CDR #0#)))))
(SVREF |u| 2))))))
(DEFUN |EUCDOM-;expressIdealMember;LSU;10| (|l| |z| $)
(COND
- ((SPADCALL |z| (|spadConstant| $ 19) (|getShellEntry| $ 51))
+ ((SPADCALL |z| (|spadConstant| $ 19) (|shellEntry| $ 51))
(CONS 0
(LET ((#0=#:G1496 |l|) (#1=#:G1495 NIL))
(LOOP
@@ -224,8 +221,8 @@
(T (LET ((|v| (CAR #0#)))
(SETQ #1# (CONS (|spadConstant| $ 19) #1#)))))
(SETQ #0# (CDR #0#))))))
- (T (LET* ((|pid| (SPADCALL |l| (|getShellEntry| $ 48)))
- (|q| (SPADCALL |z| (CDR |pid|) (|getShellEntry| $ 37))))
+ (T (LET* ((|pid| (SPADCALL |l| (|shellEntry| $ 48)))
+ (|q| (SPADCALL |z| (CDR |pid|) (|shellEntry| $ 37))))
(COND
((EQL (CAR |q|) 1) (CONS 1 "failed"))
(T (CONS 0
@@ -237,7 +234,7 @@
(SETQ #3#
(CONS
(SPADCALL (CDR |q|) |v|
- (|getShellEntry| $ 29))
+ (|shellEntry| $ 29))
#3#)))))
(SETQ #2# (CDR #2#)))))))))))
@@ -248,11 +245,11 @@
(COND
((ZEROP |n|) (|error| "empty list passed to multiEuclidean"))
((EQL |n| 1) (CONS 0 (LIST |z|)))
- (T (SEQ (LETT |l1| (SPADCALL |l| (|getShellEntry| $ 58))
+ (T (SEQ (LETT |l1| (SPADCALL |l| (|shellEntry| $ 58))
|EUCDOM-;multiEuclidean;LSU;11|)
(LETT |l2|
(SPADCALL |l1| (TRUNCATE |n| 2)
- (|getShellEntry| $ 61))
+ (|shellEntry| $ 61))
|EUCDOM-;multiEuclidean;LSU;11|)
(LETT |u|
(SPADCALL
@@ -272,7 +269,7 @@
(T
(SETQ #0#
(SPADCALL #0# #4#
- (|getShellEntry| $ 29)))))
+ (|shellEntry| $ 29)))))
(SETQ #1# NIL)))))
(SETQ #2# (CDR #2#))))
(LET ((#5=#:G1482 NIL) (#6=#:G1483 T)
@@ -291,16 +288,16 @@
(T
(SETQ #5#
(SPADCALL #5# #9#
- (|getShellEntry| $ 29)))))
+ (|shellEntry| $ 29)))))
(SETQ #6# NIL)))))
(SETQ #7# (CDR #7#))))
- |z| (|getShellEntry| $ 62))
+ |z| (|shellEntry| $ 62))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT (COND
((EQL (CAR |u|) 1) (CONS 1 "failed"))
(T (SEQ (LETT |v1|
(SPADCALL |l1| (CDR (CDR |u|))
- (|getShellEntry| $ 63))
+ (|shellEntry| $ 63))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT (COND
((EQL (CAR |v1|) 1)
@@ -310,7 +307,7 @@
(LETT |v2|
(SPADCALL |l2|
(CAR (CDR |u|))
- (|getShellEntry| $ 63))
+ (|shellEntry| $ 63))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT
(COND
@@ -320,8 +317,7 @@
(CONS 0
(SPADCALL (CDR |v1|)
(CDR |v2|)
- (|getShellEntry| $
- 64)))))))))))))))))))))
+ (|shellEntry| $ 64)))))))))))))))))))))
(DEFUN |EuclideanDomain&| (|#1|)
(LET* ((|dv$1| (|devaluate| |#1|))
diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp
index 14ce50fc..80bd0663 100644
--- a/src/algebra/strap/FFIELDC-.lsp
+++ b/src/algebra/strap/FFIELDC-.lsp
@@ -56,44 +56,41 @@
(COND
((SPADCALL
(SETQ |a|
- (SPADCALL (+ (SPADCALL |a| (|getShellEntry| $ 11)) 1)
- (|getShellEntry| $ 14)))
- (|getShellEntry| $ 16))
+ (SPADCALL (+ (SPADCALL |a| (|shellEntry| $ 11)) 1)
+ (|shellEntry| $ 14)))
+ (|shellEntry| $ 16))
(CONS 1 "failed"))
(T (CONS 0 |a|))))
(DEFUN |FFIELDC-;order;SOpc;4| (|e| $)
- (SPADCALL (SPADCALL |e| (|getShellEntry| $ 19))
- (|getShellEntry| $ 22)))
+ (SPADCALL (SPADCALL |e| (|shellEntry| $ 19)) (|shellEntry| $ 22)))
(DEFUN |FFIELDC-;conditionP;MU;5| (|mat| $)
- (LET ((|l| (SPADCALL |mat| (|getShellEntry| $ 27))))
+ (LET ((|l| (SPADCALL |mat| (|shellEntry| $ 27))))
(SEQ (COND
((OR (NULL |l|)
(SPADCALL (ELT $ 16) (|SPADfirst| |l|)
- (|getShellEntry| $ 31)))
+ (|shellEntry| $ 31)))
(EXIT (CONS 1 "failed"))))
(EXIT (CONS 0
(SPADCALL (ELT $ 32) (|SPADfirst| |l|)
- (|getShellEntry| $ 34)))))))
+ (|shellEntry| $ 34)))))))
(DEFUN |FFIELDC-;charthRoot;2S;6| (|x| $)
(SPADCALL |x|
- (TRUNCATE (SPADCALL (|getShellEntry| $ 40))
- (|spadConstant| $ 41))
- (|getShellEntry| $ 43)))
+ (TRUNCATE (SPADCALL (|shellEntry| $ 40)) (|spadConstant| $ 41))
+ (|shellEntry| $ 43)))
(DEFUN |FFIELDC-;charthRoot;SU;7| (|x| $)
- (CONS 0 (SPADCALL |x| (|getShellEntry| $ 32))))
+ (CONS 0 (SPADCALL |x| (|shellEntry| $ 32))))
(DEFUN |FFIELDC-;createPrimitiveElement;S;8| ($)
(PROG (|e|)
(RETURN
- (LET ((|sm1| (- (SPADCALL (|getShellEntry| $ 40)) 1))
+ (LET ((|sm1| (- (SPADCALL (|shellEntry| $ 40)) 1))
(|start| (COND
- ((SPADCALL (SPADCALL (|getShellEntry| $ 48))
- (CONS 1 "polynomial")
- (|getShellEntry| $ 49))
+ ((SPADCALL (SPADCALL (|shellEntry| $ 48))
+ (CONS 1 "polynomial") (|shellEntry| $ 49))
(|spadConstant| $ 41))
(T 1)))
(|found| NIL))
@@ -107,21 +104,21 @@
(AND (NOT (MINUSP |i|))
(PLUSP |i|))
'(|PositiveInteger|) |i|)
- (|getShellEntry| $ 14))
+ (|shellEntry| $ 14))
|FFIELDC-;createPrimitiveElement;S;8|)
(EXIT (SETQ |found|
(EQL
(SPADCALL |e|
- (|getShellEntry| $ 19))
+ (|shellEntry| $ 19))
|sm1|))))))
(SETQ |i| (+ |i| 1))))
(EXIT |e|))))))
(DEFUN |FFIELDC-;primitive?;SB;9| (|a| $)
(COND
- ((SPADCALL |a| (|getShellEntry| $ 16)) NIL)
- (T (LET ((|explist| (SPADCALL (|getShellEntry| $ 56)))
- (|q| (- (SPADCALL (|getShellEntry| $ 40)) 1))
+ ((SPADCALL |a| (|shellEntry| $ 16)) NIL)
+ (T (LET ((|explist| (SPADCALL (|shellEntry| $ 56)))
+ (|q| (- (SPADCALL (|shellEntry| $ 40)) 1))
(|equalone| NIL))
(SEQ (LET ((#0=#:G1488 |explist|) (|exp| NIL))
(LOOP
@@ -133,8 +130,8 @@
(SPADCALL
(SPADCALL |a|
(TRUNCATE |q| (CAR |exp|))
- (|getShellEntry| $ 58))
- (|getShellEntry| $ 59)))))
+ (|shellEntry| $ 58))
+ (|shellEntry| $ 59)))))
(SETQ #0# (CDR #0#))))
(EXIT (NOT |equalone|)))))))
@@ -142,10 +139,10 @@
(PROG (|primeDivisor| |a| |goon|)
(RETURN
(COND
- ((SPADCALL |e| (|spadConstant| $ 7) (|getShellEntry| $ 63))
+ ((SPADCALL |e| (|spadConstant| $ 7) (|shellEntry| $ 63))
(|error| "order(0) is not defined "))
- (T (LET ((|ord| (- (SPADCALL (|getShellEntry| $ 40)) 1))
- (|lof| (SPADCALL (|getShellEntry| $ 56))))
+ (T (LET ((|ord| (- (SPADCALL (|shellEntry| $ 40)) 1))
+ (|lof| (SPADCALL (|shellEntry| $ 56))))
(SEQ (LET ((#0=#:G1489 |lof|))
(LOOP
(COND
@@ -160,8 +157,8 @@
(LETT |goon|
(SPADCALL
(SPADCALL |e| |a|
- (|getShellEntry| $ 58))
- (|getShellEntry| $ 59))
+ (|shellEntry| $ 58))
+ (|shellEntry| $ 59))
|FFIELDC-;order;SPi;10|)
(LET ((|j| 0)
(#1=#:G1490 (- (CDR |rec|) 2)))
@@ -178,8 +175,8 @@
(SETQ |goon|
(SPADCALL
(SPADCALL |e| |a|
- (|getShellEntry| $ 58))
- (|getShellEntry| $ 59)))))))
+ (|shellEntry| $ 58))
+ (|shellEntry| $ 59)))))))
(SETQ |j| (+ |j| 1))))
(EXIT (COND
(|goon| (SETQ |ord| |a|))))))))
@@ -191,17 +188,17 @@
|mult| |groupord| |exp|)
(RETURN
(COND
- ((SPADCALL |b| (|getShellEntry| $ 16))
+ ((SPADCALL |b| (|shellEntry| $ 16))
(|error| "discreteLog: logarithm of zero"))
- (T (LET ((|faclist| (SPADCALL (|getShellEntry| $ 56)))
- (|a| |b|) (|gen| (SPADCALL (|getShellEntry| $ 65))))
+ (T (LET ((|faclist| (SPADCALL (|shellEntry| $ 56))) (|a| |b|)
+ (|gen| (SPADCALL (|shellEntry| $ 65))))
(COND
- ((SPADCALL |b| |gen| (|getShellEntry| $ 63)) 1)
+ ((SPADCALL |b| |gen| (|shellEntry| $ 63)) 1)
(T (SEQ (LETT |disclog| 0
|FFIELDC-;discreteLog;SNni;11|)
(LETT |mult| 1 |FFIELDC-;discreteLog;SNni;11|)
(LETT |groupord|
- (- (SPADCALL (|getShellEntry| $ 40)) 1)
+ (- (SPADCALL (|shellEntry| $ 40)) 1)
|FFIELDC-;discreteLog;SNni;11|)
(LETT |exp| |groupord|
|FFIELDC-;discreteLog;SNni;11|)
@@ -226,18 +223,15 @@
(TRUNCATE |exp| |fac|))
(LETT |exptable|
(SPADCALL |fac|
- (|getShellEntry| $
- 67))
+ (|shellEntry| $ 67))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |n|
(SPADCALL |exptable|
- (|getShellEntry| $
- 68))
+ (|shellEntry| $ 68))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |c|
(SPADCALL |a| |exp|
- (|getShellEntry| $
- 58))
+ (|shellEntry| $ 58))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |end|
(TRUNCATE (- |fac| 1)
@@ -260,10 +254,10 @@
(LETT |rho|
(SPADCALL
(SPADCALL |c|
- (|getShellEntry|
+ (|shellEntry|
$ 11))
|exptable|
- (|getShellEntry|
+ (|shellEntry|
$ 71))
|FFIELDC-;discreteLog;SNni;11|)
(EXIT
@@ -296,9 +290,9 @@
|groupord|
|fac|)
(- |n|))
- (|getShellEntry|
+ (|shellEntry|
$ 58))
- (|getShellEntry|
+ (|shellEntry|
$ 77)))))))))
(SETQ |i|
(+ |i| 1))))
@@ -316,10 +310,10 @@
(SPADCALL |a|
(SPADCALL |gen|
(- |disc1|)
- (|getShellEntry|
+ (|shellEntry|
$ 58))
- (|getShellEntry|
- $ 77))))))
+ (|shellEntry| $
+ 77))))))
(T
(|error|
"discreteLog: ?? discrete logarithm")))))))
@@ -332,30 +326,30 @@
|disclog| |mult| |exp|)
(RETURN
(COND
- ((SPADCALL |b| (|getShellEntry| $ 16))
+ ((SPADCALL |b| (|shellEntry| $ 16))
(SEQ (SPADCALL "discreteLog: logarithm of zero"
- (|getShellEntry| $ 83))
+ (|shellEntry| $ 83))
(EXIT (CONS 1 "failed"))))
- ((SPADCALL |logbase| (|getShellEntry| $ 16))
+ ((SPADCALL |logbase| (|shellEntry| $ 16))
(SEQ (SPADCALL "discreteLog: logarithm to base zero"
- (|getShellEntry| $ 83))
+ (|shellEntry| $ 83))
(EXIT (CONS 1 "failed"))))
- ((SPADCALL |b| |logbase| (|getShellEntry| $ 63)) (CONS 0 1))
+ ((SPADCALL |b| |logbase| (|shellEntry| $ 63)) (CONS 0 1))
(T (COND
((NOT (ZEROP (REM (LETT |groupord|
(SPADCALL |logbase|
- (|getShellEntry| $ 19))
+ (|shellEntry| $ 19))
|FFIELDC-;discreteLog;2SU;12|)
- (SPADCALL |b| (|getShellEntry| $ 19)))))
+ (SPADCALL |b| (|shellEntry| $ 19)))))
(SEQ (SPADCALL
"discreteLog: second argument not in cyclic group generated by first argument"
- (|getShellEntry| $ 83))
+ (|shellEntry| $ 83))
(EXIT (CONS 1 "failed"))))
(T (SEQ (LETT |faclist|
(SPADCALL
(SPADCALL |groupord|
- (|getShellEntry| $ 87))
- (|getShellEntry| $ 89))
+ (|shellEntry| $ 87))
+ (|shellEntry| $ 89))
|FFIELDC-;discreteLog;2SU;12|)
(LETT |a| |b| |FFIELDC-;discreteLog;2SU;12|)
(LETT |disclog| 0 |FFIELDC-;discreteLog;2SU;12|)
@@ -372,7 +366,7 @@
(LETT |primroot|
(SPADCALL |logbase|
(TRUNCATE |groupord| |fac|)
- (|getShellEntry| $ 58))
+ (|shellEntry| $ 58))
|FFIELDC-;discreteLog;2SU;12|)
(EXIT
(LET
@@ -388,9 +382,9 @@
(LETT |rhoHelp|
(SPADCALL |primroot|
(SPADCALL |a| |exp|
- (|getShellEntry| $ 58))
+ (|shellEntry| $ 58))
|fac|
- (|getShellEntry| $ 91))
+ (|shellEntry| $ 91))
|FFIELDC-;discreteLog;2SU;12|)
(EXIT
(COND
@@ -405,7 +399,7 @@
(SPADCALL
(CDR |rhoHelp|)
|mult|
- (|getShellEntry| $
+ (|shellEntry| $
92))
|FFIELDC-;discreteLog;2SU;12|)
(SETQ |disclog|
@@ -418,26 +412,26 @@
(SPADCALL
|logbase|
(- |rho|)
- (|getShellEntry|
- $ 58))
- (|getShellEntry|
- $ 77)))))))))))
+ (|shellEntry| $
+ 58))
+ (|shellEntry| $
+ 77)))))))))))
(SETQ |t| (+ |t| 1)))))))))
(SETQ #0# (CDR #0#))))
(EXIT (CONS 0 |disclog|))))))))))
(DEFUN |FFIELDC-;squareFreePolynomial| (|f| $)
- (SPADCALL |f| (|getShellEntry| $ 97)))
+ (SPADCALL |f| (|shellEntry| $ 97)))
(DEFUN |FFIELDC-;factorPolynomial| (|f| $)
- (SPADCALL |f| (|getShellEntry| $ 99)))
+ (SPADCALL |f| (|shellEntry| $ 99)))
(DEFUN |FFIELDC-;factorSquareFreePolynomial| (|f| $)
(COND
- ((SPADCALL |f| (|spadConstant| $ 100) (|getShellEntry| $ 101))
+ ((SPADCALL |f| (|spadConstant| $ 100) (|shellEntry| $ 101))
(|spadConstant| $ 102))
- (T (LET ((|flist| (SPADCALL |f| T (|getShellEntry| $ 106))))
- (SPADCALL (SPADCALL (CAR |flist|) (|getShellEntry| $ 107))
+ (T (LET ((|flist| (SPADCALL |f| T (|shellEntry| $ 106))))
+ (SPADCALL (SPADCALL (CAR |flist|) (|shellEntry| $ 107))
(LET ((#0=#:G1483 NIL) (#1=#:G1484 T)
(#2=#:G1495 (CDR |flist|)))
(LOOP
@@ -448,18 +442,18 @@
(T (LET ((|u| (CAR #2#)))
(LET ((#3=#:G1482
(SPADCALL (CAR |u|) (CDR |u|)
- (|getShellEntry| $ 108))))
+ (|shellEntry| $ 108))))
(COND
(#1# (SETQ #0# #3#))
(T (SETQ #0#
(SPADCALL #0# #3#
- (|getShellEntry| $ 109)))))
+ (|shellEntry| $ 109)))))
(SETQ #1# NIL)))))
(SETQ #2# (CDR #2#))))
- (|getShellEntry| $ 111))))))
+ (|shellEntry| $ 111))))))
(DEFUN |FFIELDC-;gcdPolynomial;3Sup;16| (|f| |g| $)
- (SPADCALL |f| |g| (|getShellEntry| $ 113)))
+ (SPADCALL |f| |g| (|shellEntry| $ 113)))
(DEFUN |FiniteFieldCategory&| (|#1|)
(LET* ((|dv$1| (|devaluate| |#1|))
diff --git a/src/algebra/strap/FPS-.lsp b/src/algebra/strap/FPS-.lsp
index cc13cc83..430b15c9 100644
--- a/src/algebra/strap/FPS-.lsp
+++ b/src/algebra/strap/FPS-.lsp
@@ -8,16 +8,16 @@
|FPS-;digits;Pi;2|))
(DEFUN |FPS-;float;2IS;1| (|ma| |ex| $)
- (SPADCALL |ma| |ex| (SPADCALL (|getShellEntry| $ 8))
- (|getShellEntry| $ 10)))
+ (SPADCALL |ma| |ex| (SPADCALL (|shellEntry| $ 8))
+ (|shellEntry| $ 10)))
(DEFUN |FPS-;digits;Pi;2| ($)
(LET ((#0=#:G1377
(MAX 1
(TRUNCATE
(SPADCALL 4004
- (- (SPADCALL (|getShellEntry| $ 14)) 1)
- (|getShellEntry| $ 16))
+ (- (SPADCALL (|shellEntry| $ 14)) 1)
+ (|shellEntry| $ 16))
13301))))
(|check-subtype| (AND (NOT (MINUSP #0#)) (PLUSP #0#))
'(|PositiveInteger|) #0#)))
diff --git a/src/algebra/strap/GCDDOM-.lsp b/src/algebra/strap/GCDDOM-.lsp
index 33cd4136..5cc1e7f5 100644
--- a/src/algebra/strap/GCDDOM-.lsp
+++ b/src/algebra/strap/GCDDOM-.lsp
@@ -15,39 +15,38 @@
(DEFUN |GCDDOM-;lcm;3S;1| (|x| |y| $)
(COND
- ((OR (SPADCALL |y| (|spadConstant| $ 7) (|getShellEntry| $ 9))
- (SPADCALL |x| (|spadConstant| $ 7) (|getShellEntry| $ 9)))
+ ((OR (SPADCALL |y| (|spadConstant| $ 7) (|shellEntry| $ 9))
+ (SPADCALL |x| (|spadConstant| $ 7) (|shellEntry| $ 9)))
(|spadConstant| $ 7))
- (T (LET ((LCM (SPADCALL |y|
- (SPADCALL |x| |y| (|getShellEntry| $ 10))
- (|getShellEntry| $ 12))))
+ (T (LET ((LCM (SPADCALL |y| (SPADCALL |x| |y| (|shellEntry| $ 10))
+ (|shellEntry| $ 12))))
(COND
((ZEROP (CAR LCM))
- (SPADCALL |x| (CDR LCM) (|getShellEntry| $ 13)))
+ (SPADCALL |x| (CDR LCM) (|shellEntry| $ 13)))
(T (|error| "bad gcd in lcm computation")))))))
(DEFUN |GCDDOM-;lcm;LS;2| (|l| $)
(SPADCALL (ELT $ 15) |l| (|spadConstant| $ 16) (|spadConstant| $ 7)
- (|getShellEntry| $ 19)))
+ (|shellEntry| $ 19)))
(DEFUN |GCDDOM-;gcd;LS;3| (|l| $)
(SPADCALL (ELT $ 10) |l| (|spadConstant| $ 7) (|spadConstant| $ 16)
- (|getShellEntry| $ 19)))
+ (|shellEntry| $ 19)))
(DEFUN |GCDDOM-;gcdPolynomial;3Sup;4| (|p1| |p2| $)
(PROG (|e1| |e2| |p|)
(RETURN
(COND
- ((SPADCALL |p1| (|getShellEntry| $ 24))
- (SPADCALL |p2| (|getShellEntry| $ 25)))
- ((SPADCALL |p2| (|getShellEntry| $ 24))
- (SPADCALL |p1| (|getShellEntry| $ 25)))
- (T (LET ((|c1| (SPADCALL |p1| (|getShellEntry| $ 26)))
- (|c2| (SPADCALL |p2| (|getShellEntry| $ 26))))
+ ((SPADCALL |p1| (|shellEntry| $ 24))
+ (SPADCALL |p2| (|shellEntry| $ 25)))
+ ((SPADCALL |p2| (|shellEntry| $ 24))
+ (SPADCALL |p1| (|shellEntry| $ 25)))
+ (T (LET ((|c1| (SPADCALL |p1| (|shellEntry| $ 26)))
+ (|c2| (SPADCALL |p2| (|shellEntry| $ 26))))
(SEQ (SETQ |p1|
(LET ((#0=#:G1393
(SPADCALL |p1| |c1|
- (|getShellEntry| $ 27))))
+ (|shellEntry| $ 27))))
(|check-union| (ZEROP (CAR #0#))
(|SparseUnivariatePolynomial|
(SVREF $ 6))
@@ -55,14 +54,13 @@
(CDR #0#)))
(SETQ |p2|
(LET ((#0# (SPADCALL |p2| |c2|
- (|getShellEntry| $ 27))))
+ (|shellEntry| $ 27))))
(|check-union| (ZEROP (CAR #0#))
(|SparseUnivariatePolynomial|
(SVREF $ 6))
#0#)
(CDR #0#)))
- (SEQ (LETT |e1|
- (SPADCALL |p1| (|getShellEntry| $ 29))
+ (SEQ (LETT |e1| (SPADCALL |p1| (|shellEntry| $ 29))
|GCDDOM-;gcdPolynomial;3Sup;4|)
(EXIT (COND
((PLUSP |e1|)
@@ -72,16 +70,15 @@
(SPADCALL |p1|
(SPADCALL
(|spadConstant| $ 16) |e1|
- (|getShellEntry| $ 34))
- (|getShellEntry| $ 35))))
+ (|shellEntry| $ 34))
+ (|shellEntry| $ 35))))
(|check-union|
(ZEROP (CAR #0#))
(|SparseUnivariatePolynomial|
(SVREF $ 6))
#0#)
(CDR #0#)))))))
- (SEQ (LETT |e2|
- (SPADCALL |p2| (|getShellEntry| $ 29))
+ (SEQ (LETT |e2| (SPADCALL |p2| (|shellEntry| $ 29))
|GCDDOM-;gcdPolynomial;3Sup;4|)
(EXIT (COND
((PLUSP |e2|)
@@ -91,8 +88,8 @@
(SPADCALL |p2|
(SPADCALL
(|spadConstant| $ 16) |e2|
- (|getShellEntry| $ 34))
- (|getShellEntry| $ 35))))
+ (|shellEntry| $ 34))
+ (|shellEntry| $ 35))))
(|check-union|
(ZEROP (CAR #0#))
(|SparseUnivariatePolynomial|
@@ -100,34 +97,33 @@
#0#)
(CDR #0#)))))))
(SETQ |e1| (MIN |e1| |e2|))
- (SETQ |c1|
- (SPADCALL |c1| |c2| (|getShellEntry| $ 10)))
+ (SETQ |c1| (SPADCALL |c1| |c2| (|shellEntry| $ 10)))
(SETQ |p1|
(COND
((OR (ZEROP (SPADCALL |p1|
- (|getShellEntry| $ 37)))
+ (|shellEntry| $ 37)))
(ZEROP (SPADCALL |p2|
- (|getShellEntry| $ 37))))
- (SPADCALL |c1| 0 (|getShellEntry| $ 34)))
+ (|shellEntry| $ 37))))
+ (SPADCALL |c1| 0 (|shellEntry| $ 34)))
(T (SEQ (LETT |p|
(SPADCALL |p1| |p2|
- (|getShellEntry| $ 39))
+ (|shellEntry| $ 39))
|GCDDOM-;gcdPolynomial;3Sup;4|)
(EXIT (COND
((ZEROP
(SPADCALL |p|
- (|getShellEntry| $ 37)))
+ (|shellEntry| $ 37)))
(SPADCALL |c1| 0
- (|getShellEntry| $ 34)))
+ (|shellEntry| $ 34)))
(T
(SEQ
(SETQ |c2|
(SPADCALL
(SPADCALL |p1|
- (|getShellEntry| $ 40))
+ (|shellEntry| $ 40))
(SPADCALL |p2|
- (|getShellEntry| $ 40))
- (|getShellEntry| $ 10)))
+ (|shellEntry| $ 40))
+ (|shellEntry| $ 10)))
(EXIT
(SPADCALL
(SPADCALL |c1|
@@ -136,28 +132,27 @@
((#0#
(SPADCALL
(SPADCALL |c2| |p|
- (|getShellEntry| $
+ (|shellEntry| $
41))
(SPADCALL |p|
- (|getShellEntry| $
+ (|shellEntry| $
40))
- (|getShellEntry| $
- 27))))
+ (|shellEntry| $ 27))))
(|check-union|
(ZEROP (CAR #0#))
(|SparseUnivariatePolynomial|
(SVREF $ 6))
#0#)
(CDR #0#))
- (|getShellEntry| $ 42))
- (|getShellEntry| $ 41))
- (|getShellEntry| $ 25)))))))))))
+ (|shellEntry| $ 42))
+ (|shellEntry| $ 41))
+ (|shellEntry| $ 25)))))))))))
(EXIT (COND
((ZEROP |e1|) |p1|)
(T (SPADCALL
(SPADCALL (|spadConstant| $ 16) |e1|
- (|getShellEntry| $ 34))
- |p1| (|getShellEntry| $ 44))))))))))))
+ (|shellEntry| $ 34))
+ |p1| (|shellEntry| $ 44))))))))))))
(DEFUN |GcdDomain&| (|#1|)
(LET* ((|dv$1| (|devaluate| |#1|))
diff --git a/src/algebra/strap/HOAGG-.lsp b/src/algebra/strap/HOAGG-.lsp
index 2f772779..7e964eea 100644
--- a/src/algebra/strap/HOAGG-.lsp
+++ b/src/algebra/strap/HOAGG-.lsp
@@ -35,17 +35,17 @@
(DEFUN |HOAGG-;eval;ALA;1| (|u| |l| $)
(SPADCALL (CONS #'|HOAGG-;eval;ALA;1!0| (VECTOR $ |l|)) |u|
- (|getShellEntry| $ 12)))
+ (|shellEntry| $ 12)))
(DEFUN |HOAGG-;eval;ALA;1!0| (|#1| $$)
- (SPADCALL |#1| (SVREF $$ 1) (|getShellEntry| (SVREF $$ 0) 10)))
+ (SPADCALL |#1| (SVREF $$ 1) (|shellEntry| (SVREF $$ 0) 10)))
(DEFUN |HOAGG-;#;ANni;2| (|c| $)
- (LIST-LENGTH (SPADCALL |c| (|getShellEntry| $ 15))))
+ (LIST-LENGTH (SPADCALL |c| (|shellEntry| $ 15))))
(DEFUN |HOAGG-;any?;MAB;3| (|f| |c| $)
(LET ((#0=#:G1380 NIL) (#1=#:G1381 T)
- (#2=#:G1403 (SPADCALL |c| (|getShellEntry| $ 15))))
+ (#2=#:G1403 (SPADCALL |c| (|shellEntry| $ 15))))
(LOOP
(COND
((ATOM #2#) (RETURN (COND (#1# NIL) (T #0#))))
@@ -57,7 +57,7 @@
(DEFUN |HOAGG-;every?;MAB;4| (|f| |c| $)
(LET ((#0=#:G1385 NIL) (#1=#:G1386 T)
- (#2=#:G1404 (SPADCALL |c| (|getShellEntry| $ 15))))
+ (#2=#:G1404 (SPADCALL |c| (|shellEntry| $ 15))))
(LOOP
(COND
((ATOM #2#) (RETURN (COND (#1# T) (T #0#))))
@@ -71,7 +71,7 @@
(DEFUN |HOAGG-;count;MANni;5| (|f| |c| $)
(LET ((#0=#:G1389 NIL) (#1=#:G1390 T)
- (#2=#:G1405 (SPADCALL |c| (|getShellEntry| $ 15))))
+ (#2=#:G1405 (SPADCALL |c| (|shellEntry| $ 15))))
(LOOP
(COND
((ATOM #2#) (RETURN (COND (#1# 0) (T #0#))))
@@ -85,21 +85,21 @@
(SETQ #2# (CDR #2#)))))
(DEFUN |HOAGG-;members;AL;6| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 15)))
+ (SPADCALL |x| (|shellEntry| $ 15)))
(DEFUN |HOAGG-;=;2AB;7| (|x| |y| $)
(COND
- ((SPADCALL |x| (SPADCALL |y| (|getShellEntry| $ 32))
- (|getShellEntry| $ 33))
+ ((SPADCALL |x| (SPADCALL |y| (|shellEntry| $ 32))
+ (|shellEntry| $ 33))
(LET ((#0=#:G1394 NIL) (#1=#:G1395 T)
- (#2=#:G1406 (SPADCALL |x| (|getShellEntry| $ 15)))
- (#3=#:G1407 (SPADCALL |y| (|getShellEntry| $ 15))))
+ (#2=#:G1406 (SPADCALL |x| (|shellEntry| $ 15)))
+ (#3=#:G1407 (SPADCALL |y| (|shellEntry| $ 15))))
(LOOP
(COND
((OR (ATOM #2#) (ATOM #3#)) (RETURN (COND (#1# T) (T #0#))))
(T (LET ((|a| (CAR #2#)) (|b| (CAR #3#)))
- (LET ((#4=#:G1393
- (SPADCALL |a| |b| (|getShellEntry| $ 34))))
+ (LET ((#4=#:G1393 (SPADCALL |a| |b|
+ (|shellEntry| $ 34))))
(COND
(#1# (SETQ #0# #4#))
(T (SETQ #0# (AND #0# #4#))))
@@ -110,33 +110,33 @@
(DEFUN |HOAGG-;count;SANni;8| (|s| |x| $)
(SPADCALL (CONS #'|HOAGG-;count;SANni;8!0| (VECTOR $ |s|)) |x|
- (|getShellEntry| $ 36)))
+ (|shellEntry| $ 36)))
(DEFUN |HOAGG-;count;SANni;8!0| (|#1| $$)
- (SPADCALL (SVREF $$ 1) |#1| (|getShellEntry| (SVREF $$ 0) 34)))
+ (SPADCALL (SVREF $$ 1) |#1| (|shellEntry| (SVREF $$ 0) 34)))
(DEFUN |HOAGG-;member?;SAB;9| (|e| |c| $)
(SPADCALL (CONS #'|HOAGG-;member?;SAB;9!0| (VECTOR $ |e|)) |c|
- (|getShellEntry| $ 38)))
+ (|shellEntry| $ 38)))
(DEFUN |HOAGG-;member?;SAB;9!0| (|#1| $$)
- (SPADCALL (SVREF $$ 1) |#1| (|getShellEntry| (SVREF $$ 0) 34)))
+ (SPADCALL (SVREF $$ 1) |#1| (|shellEntry| (SVREF $$ 0) 34)))
(DEFUN |HOAGG-;coerce;AOf;10| (|x| $)
(SPADCALL
(SPADCALL
- (LET ((#0=#:G1409 (SPADCALL |x| (|getShellEntry| $ 15)))
+ (LET ((#0=#:G1409 (SPADCALL |x| (|shellEntry| $ 15)))
(#1=#:G1408 NIL))
(LOOP
(COND
((ATOM #0#) (RETURN (NREVERSE #1#)))
(T (LET ((|a| (CAR #0#)))
(SETQ #1#
- (CONS (SPADCALL |a| (|getShellEntry| $ 41))
+ (CONS (SPADCALL |a| (|shellEntry| $ 41))
#1#)))))
(SETQ #0# (CDR #0#))))
- (|getShellEntry| $ 43))
- (|getShellEntry| $ 44)))
+ (|shellEntry| $ 43))
+ (|shellEntry| $ 44)))
(DEFUN |HomogeneousAggregate&| (|#1| |#2|)
(LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|))
diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp
index 8bc1239f..259e43d0 100644
--- a/src/algebra/strap/ILIST.lsp
+++ b/src/algebra/strap/ILIST.lsp
@@ -202,7 +202,7 @@
((NOT (NOT (NULL |x|))) (RETURN NIL))
(T (SEQ (COND
((AND (EQL |i| 1000)
- (SPADCALL |x| (|getShellEntry| $ 35)))
+ (SPADCALL |x| (|shellEntry| $ 35)))
(|error| "cyclic list")))
(SETQ |y| (CONS (CAR |x|) |y|))
(EXIT (SETQ |x| (CDR |x|))))))
@@ -212,23 +212,23 @@
(DEFUN |ILIST;coerce;$Of;21| (|x| $)
(PROG (|z|)
(RETURN
- (LET ((|y| NIL) (|s| (SPADCALL |x| (|getShellEntry| $ 40))))
+ (LET ((|y| NIL) (|s| (SPADCALL |x| (|shellEntry| $ 40))))
(SEQ (LOOP
(COND
((NOT (NOT (EQ |x| |s|))) (RETURN NIL))
(T (SEQ (SETQ |y|
(CONS (SPADCALL (|SPADfirst| |x|)
- (|getShellEntry| $ 41))
+ (|shellEntry| $ 41))
|y|))
(EXIT (SETQ |x| (CDR |x|)))))))
(SETQ |y| (NREVERSE |y|))
(EXIT (COND
- ((NULL |s|) (SPADCALL |y| (|getShellEntry| $ 45)))
+ ((NULL |s|) (SPADCALL |y| (|shellEntry| $ 45)))
(T (SEQ (LETT |z|
(SPADCALL
(SPADCALL (|SPADfirst| |x|)
- (|getShellEntry| $ 41))
- (|getShellEntry| $ 46))
+ (|shellEntry| $ 41))
+ (|shellEntry| $ 46))
|ILIST;coerce;$Of;21|)
(LOOP
(COND
@@ -239,16 +239,16 @@
(SETQ |z|
(CONS
(SPADCALL (|SPADfirst| |x|)
- (|getShellEntry| $ 41))
+ (|shellEntry| $ 41))
|z|)))))))
(EXIT (SPADCALL
(SPADCALL |y|
(SPADCALL
(SPADCALL (NREVERSE |z|)
- (|getShellEntry| $ 47))
- (|getShellEntry| $ 48))
- (|getShellEntry| $ 49))
- (|getShellEntry| $ 45))))))))))))
+ (|shellEntry| $ 47))
+ (|shellEntry| $ 48))
+ (|shellEntry| $ 49))
+ (|shellEntry| $ 45))))))))))))
(DEFUN |ILIST;=;2$B;22| (|x| |y| $)
(COND
@@ -259,7 +259,7 @@
(RETURN NIL))
(T (COND
((SPADCALL (CAR |x|) (CAR |y|)
- (|getShellEntry| $ 53))
+ (|shellEntry| $ 53))
(RETURN-FROM |ILIST;=;2$B;22| NIL))
(T (SEQ (SETQ |x| (CDR |x|))
(EXIT (SETQ |y| (CDR |y|)))))))))
@@ -273,7 +273,7 @@
(T (SEQ (SETQ |s|
(STRCONC |s|
(SPADCALL (CAR |x|)
- (|getShellEntry| $ 56))))
+ (|shellEntry| $ 56))))
(SETQ |x| (CDR |x|))
(EXIT (COND
((NOT (NULL |x|))
@@ -285,7 +285,7 @@
(COND
((NOT (NOT (NULL |x|))) (RETURN NIL))
(T (COND
- ((SPADCALL |s| (CAR |x|) (|getShellEntry| $ 59))
+ ((SPADCALL |s| (CAR |x|) (|shellEntry| $ 59))
(RETURN-FROM |ILIST;member?;S$B;24| T))
(T (SETQ |x| (CDR |x|)))))))
(EXIT NIL)))
@@ -327,7 +327,7 @@
(T
(COND
((SPADCALL (CAR |pr|) |f|
- (|getShellEntry| $ 59))
+ (|shellEntry| $ 59))
(RPLACD |pp| (CDR |pr|)))
(T (SETQ |pp| |pr|)))))))))))
(EXIT |l|))))))
diff --git a/src/algebra/strap/INS-.lsp b/src/algebra/strap/INS-.lsp
index f210ce16..f7993375 100644
--- a/src/algebra/strap/INS-.lsp
+++ b/src/algebra/strap/INS-.lsp
@@ -100,175 +100,165 @@
(DEFUN |INS-;differentiate;2S;2| (|x| $) (|spadConstant| $ 10))
(DEFUN |INS-;even?;SB;3| (|x| $)
- (NOT (SPADCALL |x| (|getShellEntry| $ 13))))
+ (NOT (SPADCALL |x| (|shellEntry| $ 13))))
(DEFUN |INS-;positive?;SB;4| (|x| $)
- (SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 16)))
+ (SPADCALL |x| (|spadConstant| $ 10) (|shellEntry| $ 16)))
(DEFUN |INS-;copy;2S;5| (|x| $) (DECLARE (IGNORE $)) |x|)
(DEFUN |INS-;bit?;2SB;6| (|x| |i| $)
(SPADCALL
- (SPADCALL |x| (SPADCALL |i| (|getShellEntry| $ 19))
- (|getShellEntry| $ 20))
- (|getShellEntry| $ 13)))
+ (SPADCALL |x| (SPADCALL |i| (|shellEntry| $ 19))
+ (|shellEntry| $ 20))
+ (|shellEntry| $ 13)))
(DEFUN |INS-;mask;2S;7| (|n| $)
- (SPADCALL (SPADCALL (|spadConstant| $ 22) |n| (|getShellEntry| $ 20))
- (|getShellEntry| $ 23)))
+ (SPADCALL (SPADCALL (|spadConstant| $ 22) |n| (|shellEntry| $ 20))
+ (|shellEntry| $ 23)))
(DEFUN |INS-;rational?;SB;8| (|x| $) (DECLARE (IGNORE $)) T)
(DEFUN |INS-;euclideanSize;SNni;9| (|x| $)
(COND
- ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 27))
+ ((SPADCALL |x| (|spadConstant| $ 10) (|shellEntry| $ 27))
(|error| "euclideanSize called on zero"))
- ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 28))
- (LET ((#0=#:G1401 (- (SPADCALL |x| (|getShellEntry| $ 30)))))
+ ((SPADCALL |x| (|spadConstant| $ 10) (|shellEntry| $ 28))
+ (LET ((#0=#:G1401 (- (SPADCALL |x| (|shellEntry| $ 30)))))
(|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)))
- (T (LET ((#1=#:G1402 (SPADCALL |x| (|getShellEntry| $ 30))))
+ (T (LET ((#1=#:G1402 (SPADCALL |x| (|shellEntry| $ 30))))
(|check-subtype| (NOT (MINUSP #1#)) '(|NonNegativeInteger|)
#1#)))))
(DEFUN |INS-;convert;SF;10| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30))
- (|getShellEntry| $ 34)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 30)) (|shellEntry| $ 34)))
(DEFUN |INS-;convert;SDf;11| (|x| $)
- (FLOAT (SPADCALL |x| (|getShellEntry| $ 30)) |$DoubleFloatMaximum|))
+ (FLOAT (SPADCALL |x| (|shellEntry| $ 30)) |$DoubleFloatMaximum|))
(DEFUN |INS-;convert;SIf;12| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30))
- (|getShellEntry| $ 40)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 30)) (|shellEntry| $ 40)))
(DEFUN |INS-;retract;SI;13| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 30)))
+ (SPADCALL |x| (|shellEntry| $ 30)))
(DEFUN |INS-;convert;SP;14| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30))
- (|getShellEntry| $ 44)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 30)) (|shellEntry| $ 44)))
-(DEFUN |INS-;factor;SF;15| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 48)))
+(DEFUN |INS-;factor;SF;15| (|x| $) (SPADCALL |x| (|shellEntry| $ 48)))
(DEFUN |INS-;squareFree;SF;16| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 51)))
+ (SPADCALL |x| (|shellEntry| $ 51)))
-(DEFUN |INS-;prime?;SB;17| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 54)))
+(DEFUN |INS-;prime?;SB;17| (|x| $) (SPADCALL |x| (|shellEntry| $ 54)))
(DEFUN |INS-;factorial;2S;18| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 57)))
+ (SPADCALL |x| (|shellEntry| $ 57)))
(DEFUN |INS-;binomial;3S;19| (|n| |m| $)
- (SPADCALL |n| |m| (|getShellEntry| $ 59)))
+ (SPADCALL |n| |m| (|shellEntry| $ 59)))
(DEFUN |INS-;permutation;3S;20| (|n| |m| $)
- (SPADCALL |n| |m| (|getShellEntry| $ 61)))
+ (SPADCALL |n| |m| (|shellEntry| $ 61)))
(DEFUN |INS-;retractIfCan;SU;21| (|x| $)
- (CONS 0 (SPADCALL |x| (|getShellEntry| $ 30))))
+ (CONS 0 (SPADCALL |x| (|shellEntry| $ 30))))
(DEFUN |INS-;init;S;22| ($) (|spadConstant| $ 10))
(DEFUN |INS-;nextItem;SU;23| (|n| $)
(COND
- ((SPADCALL |n| (|getShellEntry| $ 66))
- (CONS 0 (|spadConstant| $ 22)))
- ((SPADCALL |n| (|spadConstant| $ 10) (|getShellEntry| $ 16))
- (CONS 0 (SPADCALL |n| (|getShellEntry| $ 19))))
+ ((SPADCALL |n| (|shellEntry| $ 66)) (CONS 0 (|spadConstant| $ 22)))
+ ((SPADCALL |n| (|spadConstant| $ 10) (|shellEntry| $ 16))
+ (CONS 0 (SPADCALL |n| (|shellEntry| $ 19))))
(T (CONS 0
- (SPADCALL (|spadConstant| $ 22) |n|
- (|getShellEntry| $ 67))))))
+ (SPADCALL (|spadConstant| $ 22) |n| (|shellEntry| $ 67))))))
(DEFUN |INS-;patternMatch;SP2Pmr;24| (|x| |p| |l| $)
- (SPADCALL |x| |p| |l| (|getShellEntry| $ 72)))
+ (SPADCALL |x| |p| |l| (|shellEntry| $ 72)))
(DEFUN |INS-;rational;SF;25| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30))
- (|getShellEntry| $ 76)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 30)) (|shellEntry| $ 76)))
(DEFUN |INS-;rationalIfCan;SU;26| (|x| $)
(CONS 0
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30))
- (|getShellEntry| $ 76))))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 30))
+ (|shellEntry| $ 76))))
(DEFUN |INS-;symmetricRemainder;3S;27| (|x| |n| $)
- (LET ((|r| (SPADCALL |x| |n| (|getShellEntry| $ 80))))
+ (LET ((|r| (SPADCALL |x| |n| (|shellEntry| $ 80))))
(COND
- ((SPADCALL |r| (|spadConstant| $ 10) (|getShellEntry| $ 27)) |r|)
+ ((SPADCALL |r| (|spadConstant| $ 10) (|shellEntry| $ 27)) |r|)
(T (SEQ (COND
((SPADCALL |n| (|spadConstant| $ 10)
- (|getShellEntry| $ 28))
- (SETQ |n| (SPADCALL |n| (|getShellEntry| $ 19)))))
+ (|shellEntry| $ 28))
+ (SETQ |n| (SPADCALL |n| (|shellEntry| $ 19)))))
(EXIT (COND
((SPADCALL |r| (|spadConstant| $ 10)
- (|getShellEntry| $ 16))
+ (|shellEntry| $ 16))
(COND
((SPADCALL
- (SPADCALL 2 |r| (|getShellEntry| $ 82))
- |n| (|getShellEntry| $ 16))
- (SPADCALL |r| |n| (|getShellEntry| $ 67)))
+ (SPADCALL 2 |r| (|shellEntry| $ 82)) |n|
+ (|shellEntry| $ 16))
+ (SPADCALL |r| |n| (|shellEntry| $ 67)))
(T |r|)))
((NOT (SPADCALL
(SPADCALL
(SPADCALL 2 |r|
- (|getShellEntry| $ 82))
- |n| (|getShellEntry| $ 83))
+ (|shellEntry| $ 82))
+ |n| (|shellEntry| $ 83))
(|spadConstant| $ 10)
- (|getShellEntry| $ 16)))
- (SPADCALL |r| |n| (|getShellEntry| $ 83)))
+ (|shellEntry| $ 16)))
+ (SPADCALL |r| |n| (|shellEntry| $ 83)))
(T |r|))))))))
(DEFUN |INS-;invmod;3S;28| (|a| |b| $)
(PROG (|c| |c1| |d| |d1| |q| |r| |r1|)
(RETURN
(SEQ (COND
- ((SPADCALL |a| (|getShellEntry| $ 85))
- (SETQ |a| (SPADCALL |a| |b| (|getShellEntry| $ 86)))))
+ ((SPADCALL |a| (|shellEntry| $ 85))
+ (SETQ |a| (SPADCALL |a| |b| (|shellEntry| $ 86)))))
(LETT |c| |a| |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|)
(LOOP
(COND
- ((NOT (NOT (SPADCALL |d| (|getShellEntry| $ 66))))
+ ((NOT (NOT (SPADCALL |d| (|shellEntry| $ 66))))
(RETURN NIL))
- (T (SEQ (LETT |q|
- (SPADCALL |c| |d| (|getShellEntry| $ 87))
+ (T (SEQ (LETT |q| (SPADCALL |c| |d| (|shellEntry| $ 87))
|INS-;invmod;3S;28|)
(LETT |r|
(SPADCALL |c|
- (SPADCALL |q| |d|
- (|getShellEntry| $ 88))
- (|getShellEntry| $ 67))
+ (SPADCALL |q| |d| (|shellEntry| $ 88))
+ (|shellEntry| $ 67))
|INS-;invmod;3S;28|)
(LETT |r1|
(SPADCALL |c1|
(SPADCALL |q| |d1|
- (|getShellEntry| $ 88))
- (|getShellEntry| $ 67))
+ (|shellEntry| $ 88))
+ (|shellEntry| $ 67))
|INS-;invmod;3S;28|)
(SETQ |c| |d|) (SETQ |c1| |d1|) (SETQ |d| |r|)
(EXIT (SETQ |d1| |r1|))))))
(COND
- ((NOT (SPADCALL |c| (|getShellEntry| $ 89)))
+ ((NOT (SPADCALL |c| (|shellEntry| $ 89)))
(EXIT (|error| "inverse does not exist"))))
(EXIT (COND
- ((SPADCALL |c1| (|getShellEntry| $ 85))
- (SPADCALL |c1| |b| (|getShellEntry| $ 83)))
+ ((SPADCALL |c1| (|shellEntry| $ 85))
+ (SPADCALL |c1| |b| (|shellEntry| $ 83)))
(T |c1|)))))))
(DEFUN |INS-;powmod;4S;29| (|x| |n| |p| $)
(PROG (|y| |z|)
(RETURN
(SEQ (COND
- ((SPADCALL |x| (|getShellEntry| $ 85))
- (SETQ |x| (SPADCALL |x| |p| (|getShellEntry| $ 86)))))
+ ((SPADCALL |x| (|shellEntry| $ 85))
+ (SETQ |x| (SPADCALL |x| |p| (|shellEntry| $ 86)))))
(EXIT (COND
- ((SPADCALL |x| (|getShellEntry| $ 66))
+ ((SPADCALL |x| (|shellEntry| $ 66))
(|spadConstant| $ 10))
- ((SPADCALL |n| (|getShellEntry| $ 66))
+ ((SPADCALL |n| (|shellEntry| $ 66))
(|spadConstant| $ 22))
(T (SEQ (LETT |y| (|spadConstant| $ 22)
|INS-;powmod;4S;29|)
@@ -280,10 +270,10 @@
(SEQ
(COND
((SPADCALL |n|
- (|getShellEntry| $ 13))
+ (|shellEntry| $ 13))
(SETQ |y|
(SPADCALL |y| |z| |p|
- (|getShellEntry| $ 91)))))
+ (|shellEntry| $ 91)))))
(EXIT
(COND
((SPADCALL
@@ -291,16 +281,16 @@
(SPADCALL |n|
(SPADCALL
(|spadConstant| $ 22)
- (|getShellEntry| $ 19))
- (|getShellEntry| $ 20)))
- (|getShellEntry| $ 66))
+ (|shellEntry| $ 19))
+ (|shellEntry| $ 20)))
+ (|shellEntry| $ 66))
(RETURN-FROM
|INS-;powmod;4S;29|
|y|))
(T
(SETQ |z|
(SPADCALL |z| |z| |p|
- (|getShellEntry| $ 91)))))))))))))))))))
+ (|shellEntry| $ 91)))))))))))))))))))
(DEFUN |IntegerNumberSystem&| (|#1|)
(LET* ((|dv$1| (|devaluate| |#1|))
diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp
index 766191d0..c206c7d8 100644
--- a/src/algebra/strap/INT.lsp
+++ b/src/algebra/strap/INT.lsp
@@ -272,43 +272,41 @@
(DEFUN |INT;writeOMInt| (|dev| |x| $)
(COND
((MINUSP |x|)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 10))
- (SPADCALL |dev| "arith1" "unary_minus"
- (|getShellEntry| $ 12))
- (SPADCALL |dev| (- |x|) (|getShellEntry| $ 15))
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 16)))))
- (T (SPADCALL |dev| |x| (|getShellEntry| $ 15)))))
+ (SEQ (SPADCALL |dev| (|shellEntry| $ 10))
+ (SPADCALL |dev| "arith1" "unary_minus" (|shellEntry| $ 12))
+ (SPADCALL |dev| (- |x|) (|shellEntry| $ 15))
+ (EXIT (SPADCALL |dev| (|shellEntry| $ 16)))))
+ (T (SPADCALL |dev| |x| (|shellEntry| $ 15)))))
(DEFUN |INT;OMwrite;$S;2| (|x| $)
(LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
- (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 18))
- (|getShellEntry| $ 19))))
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 20))
+ (|dev| (SPADCALL |sp| (SPADCALL (|shellEntry| $ 18))
+ (|shellEntry| $ 19))))
+ (SEQ (SPADCALL |dev| (|shellEntry| $ 20))
(|INT;writeOMInt| |dev| |x| $)
- (SPADCALL |dev| (|getShellEntry| $ 21))
- (SPADCALL |dev| (|getShellEntry| $ 22))
+ (SPADCALL |dev| (|shellEntry| $ 21))
+ (SPADCALL |dev| (|shellEntry| $ 22))
(EXIT (OM-STRINGPTRTOSTRING |sp|)))))
(DEFUN |INT;OMwrite;$BS;3| (|x| |wholeObj| $)
(LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
- (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 18))
- (|getShellEntry| $ 19))))
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 20))))
+ (|dev| (SPADCALL |sp| (SPADCALL (|shellEntry| $ 18))
+ (|shellEntry| $ 19))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 20))))
(|INT;writeOMInt| |dev| |x| $)
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 21))))
- (SPADCALL |dev| (|getShellEntry| $ 22))
+ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 21))))
+ (SPADCALL |dev| (|shellEntry| $ 22))
(EXIT (OM-STRINGPTRTOSTRING |sp|)))))
(DEFUN |INT;OMwrite;Omd$V;4| (|dev| |x| $)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 20))
+ (SEQ (SPADCALL |dev| (|shellEntry| $ 20))
(|INT;writeOMInt| |dev| |x| $)
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 21)))))
+ (EXIT (SPADCALL |dev| (|shellEntry| $ 21)))))
(DEFUN |INT;OMwrite;Omd$BV;5| (|dev| |x| |wholeObj| $)
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 20))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 20))))
(|INT;writeOMInt| |dev| |x| $)
- (EXIT (COND
- (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 21)))))))
+ (EXIT (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 21)))))))
(DEFUN |INT;zero?;$B;6| (|x| $) (DECLARE (IGNORE $)) (ZEROP |x|))
@@ -332,8 +330,7 @@
(DECLARE (IGNORE $))
(MINUSP |x|))
-(DEFUN |INT;coerce;$Of;16| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 42)))
+(DEFUN |INT;coerce;$Of;16| (|x| $) (SPADCALL |x| (|shellEntry| $ 42)))
(DEFUN |INT;coerce;2$;17| (|m| $) (DECLARE (IGNORE $)) |m|)
@@ -354,15 +351,14 @@
(DECLARE (IGNORE $))
(REM (* |a| |b|) |p|))
-(DEFUN |INT;convert;$F;23| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 53)))
+(DEFUN |INT;convert;$F;23| (|x| $) (SPADCALL |x| (|shellEntry| $ 53)))
(DEFUN |INT;convert;$Df;24| (|x| $)
(DECLARE (IGNORE $))
(FLOAT |x| |$DoubleFloatMaximum|))
(DEFUN |INT;convert;$If;25| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 59)))
+ (SPADCALL |x| (|shellEntry| $ 59)))
(DEFUN |INT;convert;$S;26| (|x| $)
(DECLARE (IGNORE $))
@@ -457,46 +453,44 @@
(ABS |x|))
(DEFUN |INT;solveLinearPolynomialEquation| (|lp| |p| $)
- (SPADCALL |lp| |p| (|getShellEntry| $ 101)))
+ (SPADCALL |lp| |p| (|shellEntry| $ 101)))
(DEFUN |INT;squareFreePolynomial| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 105)))
+ (SPADCALL |p| (|shellEntry| $ 105)))
(DEFUN |INT;factorPolynomial| (|p| $)
- (LET ((|pp| (SPADCALL |p| (|getShellEntry| $ 106))))
+ (LET ((|pp| (SPADCALL |p| (|shellEntry| $ 106))))
(COND
- ((EQL (SPADCALL |pp| (|getShellEntry| $ 107))
- (SPADCALL |p| (|getShellEntry| $ 107)))
- (SPADCALL |p| (|getShellEntry| $ 109)))
- (T (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 109))
+ ((EQL (SPADCALL |pp| (|shellEntry| $ 107))
+ (SPADCALL |p| (|shellEntry| $ 107)))
+ (SPADCALL |p| (|shellEntry| $ 109)))
+ (T (SPADCALL (SPADCALL |pp| (|shellEntry| $ 109))
(SPADCALL (CONS #'|INT;factorPolynomial!0| $)
(SPADCALL
(LET ((#0=#:G1479
(SPADCALL
- (SPADCALL |p|
- (|getShellEntry| $ 107))
- (SPADCALL |pp|
- (|getShellEntry| $ 107))
- (|getShellEntry| $ 111))))
+ (SPADCALL |p| (|shellEntry| $ 107))
+ (SPADCALL |pp| (|shellEntry| $ 107))
+ (|shellEntry| $ 111))))
(|check-union| (ZEROP (CAR #0#)) $ #0#)
(CDR #0#))
- (|getShellEntry| $ 113))
- (|getShellEntry| $ 117))
- (|getShellEntry| $ 119))))))
+ (|shellEntry| $ 113))
+ (|shellEntry| $ 117))
+ (|shellEntry| $ 119))))))
(DEFUN |INT;factorPolynomial!0| (|#1| $)
- (SPADCALL |#1| (|getShellEntry| $ 110)))
+ (SPADCALL |#1| (|shellEntry| $ 110)))
(DEFUN |INT;factorSquareFreePolynomial| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 120)))
+ (SPADCALL |p| (|shellEntry| $ 120)))
(DEFUN |INT;gcdPolynomial;3Sup;60| (|p| |q| $)
(COND
- ((SPADCALL |p| (|getShellEntry| $ 121))
- (SPADCALL |q| (|getShellEntry| $ 122)))
- ((SPADCALL |q| (|getShellEntry| $ 121))
- (SPADCALL |p| (|getShellEntry| $ 122)))
- (T (SPADCALL (LIST |p| |q|) (|getShellEntry| $ 125)))))
+ ((SPADCALL |p| (|shellEntry| $ 121))
+ (SPADCALL |q| (|shellEntry| $ 122)))
+ ((SPADCALL |q| (|shellEntry| $ 121))
+ (SPADCALL |p| (|shellEntry| $ 122)))
+ (T (SPADCALL (LIST |p| |q|) (|shellEntry| $ 125)))))
(DEFUN |Integer| ()
(DECLARE (SPECIAL |$ConstructorCache|))
diff --git a/src/algebra/strap/INTDOM-.lsp b/src/algebra/strap/INTDOM-.lsp
index d6936be9..31205603 100644
--- a/src/algebra/strap/INTDOM-.lsp
+++ b/src/algebra/strap/INTDOM-.lsp
@@ -23,30 +23,27 @@
(VECTOR (|spadConstant| $ 7) |x| (|spadConstant| $ 7)))
(DEFUN |INTDOM-;unitCanonical;2S;2| (|x| $)
- (SVREF (SPADCALL |x| (|getShellEntry| $ 10)) 1))
+ (SVREF (SPADCALL |x| (|shellEntry| $ 10)) 1))
(DEFUN |INTDOM-;recip;SU;3| (|x| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 13)) (CONS 1 "failed"))
- (T (SPADCALL (|spadConstant| $ 7) |x| (|getShellEntry| $ 15)))))
+ ((SPADCALL |x| (|shellEntry| $ 13)) (CONS 1 "failed"))
+ (T (SPADCALL (|spadConstant| $ 7) |x| (|shellEntry| $ 15)))))
(DEFUN |INTDOM-;unit?;SB;4| (|x| $)
- (COND
- ((EQL (CAR (SPADCALL |x| (|getShellEntry| $ 17))) 1) NIL)
- (T T)))
+ (COND ((EQL (CAR (SPADCALL |x| (|shellEntry| $ 17))) 1) NIL) (T T)))
(DEFUN |INTDOM-;associates?;2SB;5| (|x| |y| $)
- (SPADCALL (SVREF (SPADCALL |x| (|getShellEntry| $ 10)) 1)
- (SVREF (SPADCALL |y| (|getShellEntry| $ 10)) 1)
- (|getShellEntry| $ 21)))
+ (SPADCALL (SVREF (SPADCALL |x| (|shellEntry| $ 10)) 1)
+ (SVREF (SPADCALL |y| (|shellEntry| $ 10)) 1) (|shellEntry| $ 21)))
(DEFUN |INTDOM-;associates?;2SB;6| (|x| |y| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 13))
- (SPADCALL |y| (|getShellEntry| $ 13)))
- ((OR (SPADCALL |y| (|getShellEntry| $ 13))
- (OR (EQL (CAR (SPADCALL |x| |y| (|getShellEntry| $ 15))) 1)
- (EQL (CAR (SPADCALL |y| |x| (|getShellEntry| $ 15))) 1)))
+ ((SPADCALL |x| (|shellEntry| $ 13))
+ (SPADCALL |y| (|shellEntry| $ 13)))
+ ((OR (SPADCALL |y| (|shellEntry| $ 13))
+ (OR (EQL (CAR (SPADCALL |x| |y| (|shellEntry| $ 15))) 1)
+ (EQL (CAR (SPADCALL |y| |x| (|shellEntry| $ 15))) 1)))
NIL)
(T T)))
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index 717da9eb..f9ef1671 100644
--- a/src/algebra/strap/ISTRING.lsp
+++ b/src/algebra/strap/ISTRING.lsp
@@ -164,22 +164,22 @@
(DEFUN |ISTRING;insert;2$I$;9| (|s| |t| |i| $)
(STRCONC (STRCONC (|ISTRING;elt;$Us$;31| |s|
(SPADCALL (SVREF $ 6) (- |i| 1)
- (|getShellEntry| $ 24))
+ (|shellEntry| $ 24))
$)
|t|)
(|ISTRING;elt;$Us$;31| |s|
- (SPADCALL |i| (|getShellEntry| $ 26)) $)))
+ (SPADCALL |i| (|shellEntry| $ 26)) $)))
(DEFUN |ISTRING;coerce;$Of;10| (|s| $)
- (SPADCALL |s| (|getShellEntry| $ 30)))
+ (SPADCALL |s| (|shellEntry| $ 30)))
(DEFUN |ISTRING;minIndex;$I;11| (|s| $) (SVREF $ 6))
(DEFUN |ISTRING;upperCase!;2$;12| (|s| $)
- (SPADCALL (ELT $ 35) |s| (|getShellEntry| $ 37)))
+ (SPADCALL (ELT $ 35) |s| (|shellEntry| $ 37)))
(DEFUN |ISTRING;lowerCase!;2$;13| (|s| $)
- (SPADCALL (ELT $ 40) |s| (|getShellEntry| $ 37)))
+ (SPADCALL (ELT $ 40) |s| (|shellEntry| $ 37)))
(DEFUN |ISTRING;latex;$S;14| (|s| $)
(DECLARE (IGNORE $))
@@ -188,13 +188,12 @@
(DEFUN |ISTRING;replace;$Us2$;15| (|s| |sg| |t| $)
(PROG (|r| |k|)
(RETURN
- (LET ((|l| (- (SPADCALL |sg| (|getShellEntry| $ 44)) (SVREF $ 6)))
+ (LET ((|l| (- (SPADCALL |sg| (|shellEntry| $ 44)) (SVREF $ 6)))
(|m| (LENGTH |s|)) (|n| (LENGTH |t|))
(|h| (COND
- ((SPADCALL |sg| (|getShellEntry| $ 45))
- (- (SPADCALL |sg| (|getShellEntry| $ 46))
- (SVREF $ 6)))
- (T (- (SPADCALL |s| (|getShellEntry| $ 47))
+ ((SPADCALL |sg| (|shellEntry| $ 45))
+ (- (SPADCALL |sg| (|shellEntry| $ 46)) (SVREF $ 6)))
+ (T (- (SPADCALL |s| (|shellEntry| $ 47))
(SVREF $ 6))))))
(COND
((OR (OR (MINUSP |l|) (NOT (< |h| |m|))) (< |h| (- |l| 1)))
@@ -234,7 +233,7 @@
(DEFUN |ISTRING;setelt;$I2C;16| (|s| |i| |c| $)
(COND
((OR (< |i| (SVREF $ 6))
- (< (SPADCALL |s| (|getShellEntry| $ 47)) |i|))
+ (< (SPADCALL |s| (|shellEntry| $ 47)) |i|))
(|error| "index out of range"))
(T (SEQ (SETF (CHAR |s| (- |i| (SVREF $ 6))) |c|) (EXIT |c|)))))
@@ -305,7 +304,7 @@
((> |r| #0#) (RETURN NIL))
(T (COND
((SPADCALL (CHAR |t| |r|) |cc|
- (|getShellEntry| $ 65))
+ (|shellEntry| $ 65))
(RETURN-FROM
|ISTRING;position;Cc$2I;20|
(+ |r| (SVREF $ 6)))))))
@@ -313,8 +312,8 @@
(EXIT (- (SVREF $ 6) 1))))))))
(DEFUN |ISTRING;suffix?;2$B;21| (|s| |t| $)
- (LET ((|m| (SPADCALL |s| (|getShellEntry| $ 47)))
- (|n| (SPADCALL |t| (|getShellEntry| $ 47))))
+ (LET ((|m| (SPADCALL |s| (|shellEntry| $ 47)))
+ (|n| (SPADCALL |t| (|shellEntry| $ 47))))
(COND
((< |n| |m|) NIL)
(T (|ISTRING;substring?;2$IB;17| |s| |t|
@@ -323,14 +322,13 @@
(DEFUN |ISTRING;split;$CL;22| (|s| |c| $)
(PROG (|l| |j|)
(RETURN
- (LET ((|n| (SPADCALL |s| (|getShellEntry| $ 47)))
- (|i| (SVREF $ 6)))
+ (LET ((|n| (SPADCALL |s| (|shellEntry| $ 47))) (|i| (SVREF $ 6)))
(SEQ (LOOP
(COND
((NOT (COND
((< |n| |i|) NIL)
(T (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
- |c| (|getShellEntry| $ 69)))))
+ |c| (|shellEntry| $ 69)))))
(RETURN NIL))
(T (SETQ |i| (+ |i| 1)))))
(LETT |l| NIL |ISTRING;split;$CL;22|)
@@ -345,11 +343,12 @@
(SVREF $ 6))))))
(RETURN NIL))
(T (SEQ (SETQ |l|
- (SPADCALL (|ISTRING;elt;$Us$;31| |s|
- (SPADCALL |i| (- |j| 1)
- (|getShellEntry| $ 24))
- $)
- |l| (|getShellEntry| $ 72)))
+ (SPADCALL
+ (|ISTRING;elt;$Us$;31| |s|
+ (SPADCALL |i| (- |j| 1)
+ (|shellEntry| $ 24))
+ $)
+ |l| (|shellEntry| $ 72)))
(SETQ |i| |j|)
(EXIT (LOOP
(COND
@@ -360,7 +359,7 @@
(SPADCALL
(|ISTRING;elt;$IC;30| |s| |i|
$)
- |c| (|getShellEntry| $ 69)))))
+ |c| (|shellEntry| $ 69)))))
(RETURN NIL))
(T (SETQ |i| (+ |i| 1))))))))))
(COND
@@ -368,22 +367,20 @@
(SETQ |l|
(SPADCALL
(|ISTRING;elt;$Us$;31| |s|
- (SPADCALL |i| |n| (|getShellEntry| $ 24))
- $)
- |l| (|getShellEntry| $ 72)))))
+ (SPADCALL |i| |n| (|shellEntry| $ 24)) $)
+ |l| (|shellEntry| $ 72)))))
(EXIT (NREVERSE |l|)))))))
(DEFUN |ISTRING;split;$CcL;23| (|s| |cc| $)
(PROG (|l| |j|)
(RETURN
- (LET ((|n| (SPADCALL |s| (|getShellEntry| $ 47)))
- (|i| (SVREF $ 6)))
+ (LET ((|n| (SPADCALL |s| (|shellEntry| $ 47))) (|i| (SVREF $ 6)))
(SEQ (LOOP
(COND
((NOT (COND
((< |n| |i|) NIL)
(T (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
- |cc| (|getShellEntry| $ 65)))))
+ |cc| (|shellEntry| $ 65)))))
(RETURN NIL))
(T (SETQ |i| (+ |i| 1)))))
(LETT |l| NIL |ISTRING;split;$CcL;23|)
@@ -401,9 +398,9 @@
(SPADCALL
(|ISTRING;elt;$Us$;31| |s|
(SPADCALL |i| (- |j| 1)
- (|getShellEntry| $ 24))
+ (|shellEntry| $ 24))
$)
- |l| (|getShellEntry| $ 72)))
+ |l| (|shellEntry| $ 72)))
(SETQ |i| |j|)
(EXIT (LOOP
(COND
@@ -414,7 +411,7 @@
(SPADCALL
(|ISTRING;elt;$IC;30| |s| |i|
$)
- |cc| (|getShellEntry| $ 65)))))
+ |cc| (|shellEntry| $ 65)))))
(RETURN NIL))
(T (SETQ |i| (+ |i| 1))))))))))
(COND
@@ -422,67 +419,66 @@
(SETQ |l|
(SPADCALL
(|ISTRING;elt;$Us$;31| |s|
- (SPADCALL |i| |n| (|getShellEntry| $ 24))
- $)
- |l| (|getShellEntry| $ 72)))))
+ (SPADCALL |i| |n| (|shellEntry| $ 24)) $)
+ |l| (|shellEntry| $ 72)))))
(EXIT (NREVERSE |l|)))))))
(DEFUN |ISTRING;leftTrim;$C$;24| (|s| |c| $)
- (LET ((|n| (SPADCALL |s| (|getShellEntry| $ 47))) (|i| (SVREF $ 6)))
+ (LET ((|n| (SPADCALL |s| (|shellEntry| $ 47))) (|i| (SVREF $ 6)))
(SEQ (LOOP
(COND
((NOT (COND
((< |n| |i|) NIL)
(T (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) |c|
- (|getShellEntry| $ 69)))))
+ (|shellEntry| $ 69)))))
(RETURN NIL))
(T (SETQ |i| (+ |i| 1)))))
(EXIT (|ISTRING;elt;$Us$;31| |s|
- (SPADCALL |i| |n| (|getShellEntry| $ 24)) $)))))
+ (SPADCALL |i| |n| (|shellEntry| $ 24)) $)))))
(DEFUN |ISTRING;leftTrim;$Cc$;25| (|s| |cc| $)
- (LET ((|n| (SPADCALL |s| (|getShellEntry| $ 47))) (|i| (SVREF $ 6)))
+ (LET ((|n| (SPADCALL |s| (|shellEntry| $ 47))) (|i| (SVREF $ 6)))
(SEQ (LOOP
(COND
((NOT (COND
((< |n| |i|) NIL)
(T (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) |cc|
- (|getShellEntry| $ 65)))))
+ (|shellEntry| $ 65)))))
(RETURN NIL))
(T (SETQ |i| (+ |i| 1)))))
(EXIT (|ISTRING;elt;$Us$;31| |s|
- (SPADCALL |i| |n| (|getShellEntry| $ 24)) $)))))
+ (SPADCALL |i| |n| (|shellEntry| $ 24)) $)))))
(DEFUN |ISTRING;rightTrim;$C$;26| (|s| |c| $)
- (LET ((|j| (SPADCALL |s| (|getShellEntry| $ 47))))
+ (LET ((|j| (SPADCALL |s| (|shellEntry| $ 47))))
(SEQ (LOOP
(COND
((NOT (COND
((NOT (< |j| (SVREF $ 6)))
(SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $) |c|
- (|getShellEntry| $ 69)))
+ (|shellEntry| $ 69)))
(T NIL)))
(RETURN NIL))
(T (SETQ |j| (- |j| 1)))))
(EXIT (|ISTRING;elt;$Us$;31| |s|
(SPADCALL (|ISTRING;minIndex;$I;11| |s| $) |j|
- (|getShellEntry| $ 24))
+ (|shellEntry| $ 24))
$)))))
(DEFUN |ISTRING;rightTrim;$Cc$;27| (|s| |cc| $)
- (LET ((|j| (SPADCALL |s| (|getShellEntry| $ 47))))
+ (LET ((|j| (SPADCALL |s| (|shellEntry| $ 47))))
(SEQ (LOOP
(COND
((NOT (COND
((NOT (< |j| (SVREF $ 6)))
(SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $) |cc|
- (|getShellEntry| $ 65)))
+ (|shellEntry| $ 65)))
(T NIL)))
(RETURN NIL))
(T (SETQ |j| (- |j| 1)))))
(EXIT (|ISTRING;elt;$Us$;31| |s|
(SPADCALL (|ISTRING;minIndex;$I;11| |s| $) |j|
- (|getShellEntry| $ 24))
+ (|shellEntry| $ 24))
$)))))
(DEFUN |ISTRING;concat;L$;28| (|l| $)
@@ -522,16 +518,16 @@
(DEFUN |ISTRING;elt;$IC;30| (|s| |i| $)
(COND
((OR (< |i| (SVREF $ 6))
- (< (SPADCALL |s| (|getShellEntry| $ 47)) |i|))
+ (< (SPADCALL |s| (|shellEntry| $ 47)) |i|))
(|error| "index out of range"))
(T (CHAR |s| (- |i| (SVREF $ 6))))))
(DEFUN |ISTRING;elt;$Us$;31| (|s| |sg| $)
- (LET ((|l| (- (SPADCALL |sg| (|getShellEntry| $ 44)) (SVREF $ 6)))
+ (LET ((|l| (- (SPADCALL |sg| (|shellEntry| $ 44)) (SVREF $ 6)))
(|h| (COND
- ((SPADCALL |sg| (|getShellEntry| $ 45))
- (- (SPADCALL |sg| (|getShellEntry| $ 46)) (SVREF $ 6)))
- (T (- (SPADCALL |s| (|getShellEntry| $ 47)) (SVREF $ 6))))))
+ ((SPADCALL |sg| (|shellEntry| $ 45))
+ (- (SPADCALL |sg| (|shellEntry| $ 46)) (SVREF $ 6)))
+ (T (- (SPADCALL |s| (|shellEntry| $ 47)) (SVREF $ 6))))))
(COND
((OR (MINUSP |l|) (NOT (< |h| (LENGTH |s|))))
(|error| "index out of bound"))
@@ -547,7 +543,7 @@
(DEFUN |ISTRING;match?;2$CB;34| (|pattern| |target| |dontcare| $)
(PROG (|m| |p| |i| |q| |s|)
(RETURN
- (LET ((|n| (SPADCALL |pattern| (|getShellEntry| $ 47))))
+ (LET ((|n| (SPADCALL |pattern| (|shellEntry| $ 47))))
(SEQ (LETT |p|
(LET ((#0=#:G1501
(|ISTRING;position;C$2I;19| |dontcare|
@@ -563,13 +559,13 @@
(EXIT (COND
((EQL |p| (- |m| 1))
(NOT (NULL (STRING= |pattern| |target|))))
- ((AND (SPADCALL |p| |m| (|getShellEntry| $ 87))
+ ((AND (SPADCALL |p| |m| (|shellEntry| $ 87))
(NOT (SPADCALL
(|ISTRING;elt;$Us$;31| |pattern|
(SPADCALL |m| (- |p| 1)
- (|getShellEntry| $ 24))
+ (|shellEntry| $ 24))
$)
- |target| (|getShellEntry| $ 88))))
+ |target| (|shellEntry| $ 88))))
NIL)
(T (SEQ (LETT |i| |p| |ISTRING;match?;2$CB;34|)
(LETT |q|
@@ -585,13 +581,13 @@
(LOOP
(COND
((NOT (SPADCALL |q| (- |m| 1)
- (|getShellEntry| $ 87)))
+ (|shellEntry| $ 87)))
(RETURN NIL))
(T (SEQ
(LETT |s|
(|ISTRING;elt;$Us$;31| |pattern|
(SPADCALL (+ |p| 1) (- |q| 1)
- (|getShellEntry| $ 24))
+ (|shellEntry| $ 24))
$)
|ISTRING;match?;2$CB;34|)
(SETQ |i|
@@ -626,12 +622,12 @@
#3#))))))))))))
(COND
((AND (SPADCALL |p| |n|
- (|getShellEntry| $ 87))
+ (|shellEntry| $ 87))
(NOT
(|ISTRING;suffix?;2$B;21|
(|ISTRING;elt;$Us$;31| |pattern|
(SPADCALL (+ |p| 1) |n|
- (|getShellEntry| $ 24))
+ (|shellEntry| $ 24))
$)
|target| $)))
(EXIT NIL)))
diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp
index eb9c9390..6c4ca272 100644
--- a/src/algebra/strap/LIST.lsp
+++ b/src/algebra/strap/LIST.lsp
@@ -62,110 +62,103 @@
(APPEND |l| |t|))
(DEFUN |LIST;writeOMList| (|dev| |x| $)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 16))
- (SPADCALL |dev| "list1" "list" (|getShellEntry| $ 18))
+ (SEQ (SPADCALL |dev| (|shellEntry| $ 16))
+ (SPADCALL |dev| "list1" "list" (|shellEntry| $ 18))
(LOOP
(COND
((NOT (NOT (NULL |x|))) (RETURN NIL))
- (T (SEQ (SPADCALL |dev|
- (SPADCALL |x| (|getShellEntry| $ 20)) NIL
- (|getShellEntry| $ 22))
- (EXIT (SETQ |x|
- (SPADCALL |x| (|getShellEntry| $ 23))))))))
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 24)))))
+ (T (SEQ (SPADCALL |dev| (SPADCALL |x| (|shellEntry| $ 20))
+ NIL (|shellEntry| $ 22))
+ (EXIT (SETQ |x| (SPADCALL |x| (|shellEntry| $ 23))))))))
+ (EXIT (SPADCALL |dev| (|shellEntry| $ 24)))))
(DEFUN |LIST;OMwrite;$S;6| (|x| $)
(LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
- (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 26))
- (|getShellEntry| $ 27))))
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 28))
+ (|dev| (SPADCALL |sp| (SPADCALL (|shellEntry| $ 26))
+ (|shellEntry| $ 27))))
+ (SEQ (SPADCALL |dev| (|shellEntry| $ 28))
(|LIST;writeOMList| |dev| |x| $)
- (SPADCALL |dev| (|getShellEntry| $ 29))
- (SPADCALL |dev| (|getShellEntry| $ 30))
+ (SPADCALL |dev| (|shellEntry| $ 29))
+ (SPADCALL |dev| (|shellEntry| $ 30))
(SETQ |s| (OM-STRINGPTRTOSTRING |sp|)) (EXIT |s|))))
(DEFUN |LIST;OMwrite;$BS;7| (|x| |wholeObj| $)
(LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
- (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 26))
- (|getShellEntry| $ 27))))
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 28))))
+ (|dev| (SPADCALL |sp| (SPADCALL (|shellEntry| $ 26))
+ (|shellEntry| $ 27))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 28))))
(|LIST;writeOMList| |dev| |x| $)
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 29))))
- (SPADCALL |dev| (|getShellEntry| $ 30))
+ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 29))))
+ (SPADCALL |dev| (|shellEntry| $ 30))
(SETQ |s| (OM-STRINGPTRTOSTRING |sp|)) (EXIT |s|))))
(DEFUN |LIST;OMwrite;Omd$V;8| (|dev| |x| $)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 28))
+ (SEQ (SPADCALL |dev| (|shellEntry| $ 28))
(|LIST;writeOMList| |dev| |x| $)
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 29)))))
+ (EXIT (SPADCALL |dev| (|shellEntry| $ 29)))))
(DEFUN |LIST;OMwrite;Omd$BV;9| (|dev| |x| |wholeObj| $)
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 28))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 28))))
(|LIST;writeOMList| |dev| |x| $)
- (EXIT (COND
- (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 29)))))))
+ (EXIT (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 29)))))))
(DEFUN |LIST;setUnion;3$;10| (|l1| |l2| $)
- (SPADCALL (SPADCALL |l1| |l2| (|getShellEntry| $ 35))
- (|getShellEntry| $ 36)))
+ (SPADCALL (SPADCALL |l1| |l2| (|shellEntry| $ 35))
+ (|shellEntry| $ 36)))
(DEFUN |LIST;setIntersection;3$;11| (|l1| |l2| $)
- (LET ((|u| (SPADCALL (|getShellEntry| $ 38))))
- (SEQ (SETQ |l1| (SPADCALL |l1| (|getShellEntry| $ 36)))
+ (LET ((|u| (SPADCALL (|shellEntry| $ 38))))
+ (SEQ (SETQ |l1| (SPADCALL |l1| (|shellEntry| $ 36)))
(LOOP
(COND
- ((NOT (NOT (SPADCALL |l1| (|getShellEntry| $ 39))))
+ ((NOT (NOT (SPADCALL |l1| (|shellEntry| $ 39))))
(RETURN NIL))
(T (SEQ (COND
- ((SPADCALL
- (SPADCALL |l1| (|getShellEntry| $ 20)) |l2|
- (|getShellEntry| $ 40))
+ ((SPADCALL (SPADCALL |l1| (|shellEntry| $ 20))
+ |l2| (|shellEntry| $ 40))
(SETQ |u|
- (CONS (SPADCALL |l1|
- (|getShellEntry| $ 20))
+ (CONS (SPADCALL |l1| (|shellEntry| $ 20))
|u|))))
(EXIT (SETQ |l1|
- (SPADCALL |l1| (|getShellEntry| $ 23))))))))
+ (SPADCALL |l1| (|shellEntry| $ 23))))))))
(EXIT |u|))))
(DEFUN |LIST;setDifference;3$;12| (|l1| |l2| $)
(PROG (|lu| |l11|)
(RETURN
- (SEQ (SETQ |l1| (SPADCALL |l1| (|getShellEntry| $ 36)))
- (LETT |lu| (SPADCALL (|getShellEntry| $ 38))
+ (SEQ (SETQ |l1| (SPADCALL |l1| (|shellEntry| $ 36)))
+ (LETT |lu| (SPADCALL (|shellEntry| $ 38))
|LIST;setDifference;3$;12|)
(LOOP
(COND
- ((NOT (NOT (SPADCALL |l1| (|getShellEntry| $ 39))))
+ ((NOT (NOT (SPADCALL |l1| (|shellEntry| $ 39))))
(RETURN NIL))
(T (SEQ (LETT |l11|
- (SPADCALL |l1| 1 (|getShellEntry| $ 42))
+ (SPADCALL |l1| 1 (|shellEntry| $ 42))
|LIST;setDifference;3$;12|)
(COND
((NOT (SPADCALL |l11| |l2|
- (|getShellEntry| $ 40)))
+ (|shellEntry| $ 40)))
(SETQ |lu|
(SPADCALL |l11| |lu|
- (|getShellEntry| $ 43)))))
+ (|shellEntry| $ 43)))))
(EXIT (SETQ |l1|
- (SPADCALL |l1|
- (|getShellEntry| $ 23))))))))
+ (SPADCALL |l1| (|shellEntry| $ 23))))))))
(EXIT |lu|)))))
(DEFUN |LIST;convert;$If;13| (|x| $)
- (SPADCALL
- (CONS (SPADCALL '|construct| (|getShellEntry| $ 47))
- (LET ((#0=#:G1420 |x|) (#1=#:G1419 NIL))
- (LOOP
- (COND
- ((ATOM #0#) (RETURN (NREVERSE #1#)))
- (T (LET ((|a| (CAR #0#)))
- (SETQ #1#
- (CONS (SPADCALL |a|
- (|getShellEntry| $ 48))
- #1#)))))
- (SETQ #0# (CDR #0#)))))
- (|getShellEntry| $ 52)))
+ (SPADCALL (CONS (SPADCALL '|construct| (|shellEntry| $ 47))
+ (LET ((#0=#:G1420 |x|) (#1=#:G1419 NIL))
+ (LOOP
+ (COND
+ ((ATOM #0#) (RETURN (NREVERSE #1#)))
+ (T (LET ((|a| (CAR #0#)))
+ (SETQ #1#
+ (CONS
+ (SPADCALL |a| (|shellEntry| $ 48))
+ #1#)))))
+ (SETQ #0# (CDR #0#)))))
+ (|shellEntry| $ 52)))
(DEFUN |List| (#0=#:G1421)
(DECLARE (SPECIAL |$ConstructorCache|))
diff --git a/src/algebra/strap/LNAGG-.lsp b/src/algebra/strap/LNAGG-.lsp
index 8fbb4a9f..1fa8e5c4 100644
--- a/src/algebra/strap/LNAGG-.lsp
+++ b/src/algebra/strap/LNAGG-.lsp
@@ -21,8 +21,8 @@
|LNAGG-;maxIndex;AI;6|))
(DEFUN |LNAGG-;indices;AL;1| (|a| $)
- (LET ((|i| (SPADCALL |a| (|getShellEntry| $ 9)))
- (#0=#:G1387 (SPADCALL |a| (|getShellEntry| $ 10)))
+ (LET ((|i| (SPADCALL |a| (|shellEntry| $ 9)))
+ (#0=#:G1387 (SPADCALL |a| (|shellEntry| $ 10)))
(#1=#:G1386 NIL))
(LOOP
(COND
@@ -32,25 +32,25 @@
(DEFUN |LNAGG-;index?;IAB;2| (|i| |a| $)
(COND
- ((NOT (< |i| (SPADCALL |a| (|getShellEntry| $ 9))))
- (NOT (< (SPADCALL |a| (|getShellEntry| $ 10)) |i|)))
+ ((NOT (< |i| (SPADCALL |a| (|shellEntry| $ 9))))
+ (NOT (< (SPADCALL |a| (|shellEntry| $ 10)) |i|)))
(T NIL)))
(DEFUN |LNAGG-;concat;ASA;3| (|a| |x| $)
- (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 22))
- (|getShellEntry| $ 23)))
+ (SPADCALL |a| (SPADCALL 1 |x| (|shellEntry| $ 22))
+ (|shellEntry| $ 23)))
(DEFUN |LNAGG-;concat;S2A;4| (|x| |y| $)
- (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 22)) |y|
- (|getShellEntry| $ 23)))
+ (SPADCALL (SPADCALL 1 |x| (|shellEntry| $ 22)) |y|
+ (|shellEntry| $ 23)))
(DEFUN |LNAGG-;insert;SAIA;5| (|x| |a| |i| $)
- (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 22)) |a| |i|
- (|getShellEntry| $ 26)))
+ (SPADCALL (SPADCALL 1 |x| (|shellEntry| $ 22)) |a| |i|
+ (|shellEntry| $ 26)))
(DEFUN |LNAGG-;maxIndex;AI;6| (|l| $)
- (+ (- (SPADCALL |l| (|getShellEntry| $ 28)) 1)
- (SPADCALL |l| (|getShellEntry| $ 9))))
+ (+ (- (SPADCALL |l| (|shellEntry| $ 28)) 1)
+ (SPADCALL |l| (|shellEntry| $ 9))))
(DEFUN |LinearAggregate&| (|#1| |#2|)
(LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|))
diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp
index 501455dc..2373264b 100644
--- a/src/algebra/strap/LSAGG-.lsp
+++ b/src/algebra/strap/LSAGG-.lsp
@@ -89,23 +89,21 @@
|LSAGG-;<;2AB;25|))
(DEFUN |LSAGG-;sort!;M2A;1| (|f| |l| $)
- (|LSAGG-;mergeSort| |f| |l| (SPADCALL |l| (|getShellEntry| $ 9)) $))
+ (|LSAGG-;mergeSort| |f| |l| (SPADCALL |l| (|shellEntry| $ 9)) $))
(DEFUN |LSAGG-;list;SA;2| (|x| $)
- (SPADCALL |x| (SPADCALL (|getShellEntry| $ 13))
- (|getShellEntry| $ 14)))
+ (SPADCALL |x| (SPADCALL (|shellEntry| $ 13)) (|shellEntry| $ 14)))
(DEFUN |LSAGG-;reduce;MAS;3| (|f| |x| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 16))
+ ((SPADCALL |x| (|shellEntry| $ 16))
(|error| "reducing over an empty list needs the 3 argument form"))
- (T (SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 17))
- (SPADCALL |x| (|getShellEntry| $ 18))
- (|getShellEntry| $ 20)))))
+ (T (SPADCALL |f| (SPADCALL |x| (|shellEntry| $ 17))
+ (SPADCALL |x| (|shellEntry| $ 18)) (|shellEntry| $ 20)))))
(DEFUN |LSAGG-;merge;M3A;4| (|f| |p| |q| $)
- (SPADCALL |f| (SPADCALL |p| (|getShellEntry| $ 22))
- (SPADCALL |q| (|getShellEntry| $ 22)) (|getShellEntry| $ 23)))
+ (SPADCALL |f| (SPADCALL |p| (|shellEntry| $ 22))
+ (SPADCALL |q| (|shellEntry| $ 22)) (|shellEntry| $ 23)))
(DEFUN |LSAGG-;select!;M2A;5| (|f| |x| $)
(PROG (|y| |z|)
@@ -113,137 +111,128 @@
(SEQ (LOOP
(COND
((NOT (COND
- ((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
+ ((SPADCALL |x| (|shellEntry| $ 16)) NIL)
(T (NOT (SPADCALL
- (SPADCALL |x|
- (|getShellEntry| $ 18))
+ (SPADCALL |x| (|shellEntry| $ 18))
|f|)))))
(RETURN NIL))
- (T (SETQ |x| (SPADCALL |x| (|getShellEntry| $ 17))))))
+ (T (SETQ |x| (SPADCALL |x| (|shellEntry| $ 17))))))
(EXIT (COND
- ((SPADCALL |x| (|getShellEntry| $ 16)) |x|)
+ ((SPADCALL |x| (|shellEntry| $ 16)) |x|)
(T (SEQ (LETT |y| |x| |LSAGG-;select!;M2A;5|)
- (LETT |z|
- (SPADCALL |y| (|getShellEntry| $ 17))
+ (LETT |z| (SPADCALL |y| (|shellEntry| $ 17))
|LSAGG-;select!;M2A;5|)
(LOOP
(COND
((NOT (NOT
(SPADCALL |z|
- (|getShellEntry| $ 16))))
+ (|shellEntry| $ 16))))
(RETURN NIL))
(T (COND
((SPADCALL
(SPADCALL |z|
- (|getShellEntry| $ 18))
+ (|shellEntry| $ 18))
|f|)
(SEQ (SETQ |y| |z|)
(EXIT
(SETQ |z|
(SPADCALL |z|
- (|getShellEntry| $ 17))))))
+ (|shellEntry| $ 17))))))
(T
(SEQ
(SETQ |z|
(SPADCALL |z|
- (|getShellEntry| $ 17)))
+ (|shellEntry| $ 17)))
(EXIT
(SPADCALL |y| |z|
- (|getShellEntry| $ 27)))))))))
+ (|shellEntry| $ 27)))))))))
(EXIT |x|)))))))))
(DEFUN |LSAGG-;merge!;M3A;6| (|f| |p| |q| $)
(PROG (|r| |t|)
(RETURN
(COND
- ((SPADCALL |p| (|getShellEntry| $ 16)) |q|)
- ((SPADCALL |q| (|getShellEntry| $ 16)) |p|)
- ((SPADCALL |p| |q| (|getShellEntry| $ 30))
+ ((SPADCALL |p| (|shellEntry| $ 16)) |q|)
+ ((SPADCALL |q| (|shellEntry| $ 16)) |p|)
+ ((SPADCALL |p| |q| (|shellEntry| $ 30))
(|error| "cannot merge a list into itself"))
(T (SEQ (COND
- ((SPADCALL (SPADCALL |p| (|getShellEntry| $ 18))
- (SPADCALL |q| (|getShellEntry| $ 18)) |f|)
+ ((SPADCALL (SPADCALL |p| (|shellEntry| $ 18))
+ (SPADCALL |q| (|shellEntry| $ 18)) |f|)
(SEQ (LETT |r| (LETT |t| |p| |LSAGG-;merge!;M3A;6|)
|LSAGG-;merge!;M3A;6|)
(EXIT (SETQ |p|
- (SPADCALL |p|
- (|getShellEntry| $ 17))))))
+ (SPADCALL |p| (|shellEntry| $ 17))))))
(T (SEQ (LETT |r|
(LETT |t| |q| |LSAGG-;merge!;M3A;6|)
|LSAGG-;merge!;M3A;6|)
(EXIT (SETQ |q|
(SPADCALL |q|
- (|getShellEntry| $ 17)))))))
+ (|shellEntry| $ 17)))))))
(LOOP
(COND
((NOT (COND
- ((SPADCALL |p| (|getShellEntry| $ 16)) NIL)
- (T (NOT (SPADCALL |q|
- (|getShellEntry| $ 16))))))
+ ((SPADCALL |p| (|shellEntry| $ 16)) NIL)
+ (T (NOT (SPADCALL |q| (|shellEntry| $ 16))))))
(RETURN NIL))
(T (COND
- ((SPADCALL
- (SPADCALL |p| (|getShellEntry| $ 18))
- (SPADCALL |q| (|getShellEntry| $ 18))
- |f|)
- (SEQ (SPADCALL |t| |p|
- (|getShellEntry| $ 27))
+ ((SPADCALL (SPADCALL |p| (|shellEntry| $ 18))
+ (SPADCALL |q| (|shellEntry| $ 18)) |f|)
+ (SEQ (SPADCALL |t| |p| (|shellEntry| $ 27))
(LETT |t| |p| |LSAGG-;merge!;M3A;6|)
(EXIT (SETQ |p|
(SPADCALL |p|
- (|getShellEntry| $ 17))))))
- (T (SEQ (SPADCALL |t| |q|
- (|getShellEntry| $ 27))
+ (|shellEntry| $ 17))))))
+ (T (SEQ (SPADCALL |t| |q| (|shellEntry| $ 27))
(LETT |t| |q| |LSAGG-;merge!;M3A;6|)
(EXIT (SETQ |q|
(SPADCALL |q|
- (|getShellEntry| $ 17))))))))))
+ (|shellEntry| $ 17))))))))))
(SPADCALL |t|
(COND
- ((SPADCALL |p| (|getShellEntry| $ 16)) |q|)
+ ((SPADCALL |p| (|shellEntry| $ 16)) |q|)
(T |p|))
- (|getShellEntry| $ 27))
+ (|shellEntry| $ 27))
(EXIT |r|)))))))
(DEFUN |LSAGG-;insert!;SAIA;7| (|s| |x| |i| $)
(PROG (|y| |z|)
(RETURN
- (LET ((|m| (SPADCALL |x| (|getShellEntry| $ 33))))
+ (LET ((|m| (SPADCALL |x| (|shellEntry| $ 33))))
(COND
((< |i| |m|) (|error| "index out of range"))
- ((EQL |i| |m|) (SPADCALL |s| |x| (|getShellEntry| $ 14)))
+ ((EQL |i| |m|) (SPADCALL |s| |x| (|shellEntry| $ 14)))
(T (SEQ (LETT |y|
(SPADCALL |x|
(LET ((#0=#:G1442 (- (- |i| 1) |m|)))
(|check-subtype| (NOT (MINUSP #0#))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 39))
+ (|shellEntry| $ 39))
|LSAGG-;insert!;SAIA;7|)
- (LETT |z| (SPADCALL |y| (|getShellEntry| $ 17))
+ (LETT |z| (SPADCALL |y| (|shellEntry| $ 17))
|LSAGG-;insert!;SAIA;7|)
- (SPADCALL |y|
- (SPADCALL |s| |z| (|getShellEntry| $ 14))
- (|getShellEntry| $ 27))
+ (SPADCALL |y| (SPADCALL |s| |z| (|shellEntry| $ 14))
+ (|shellEntry| $ 27))
(EXIT |x|))))))))
(DEFUN |LSAGG-;insert!;2AIA;8| (|w| |x| |i| $)
(PROG (|y| |z|)
(RETURN
- (LET ((|m| (SPADCALL |x| (|getShellEntry| $ 33))))
+ (LET ((|m| (SPADCALL |x| (|shellEntry| $ 33))))
(COND
((< |i| |m|) (|error| "index out of range"))
- ((EQL |i| |m|) (SPADCALL |w| |x| (|getShellEntry| $ 41)))
+ ((EQL |i| |m|) (SPADCALL |w| |x| (|shellEntry| $ 41)))
(T (SEQ (LETT |y|
(SPADCALL |x|
(LET ((#0=#:G1446 (- (- |i| 1) |m|)))
(|check-subtype| (NOT (MINUSP #0#))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 39))
+ (|shellEntry| $ 39))
|LSAGG-;insert!;2AIA;8|)
- (LETT |z| (SPADCALL |y| (|getShellEntry| $ 17))
+ (LETT |z| (SPADCALL |y| (|shellEntry| $ 17))
|LSAGG-;insert!;2AIA;8|)
- (SPADCALL |y| |w| (|getShellEntry| $ 27))
- (SPADCALL |y| |z| (|getShellEntry| $ 41)) (EXIT |x|))))))))
+ (SPADCALL |y| |w| (|shellEntry| $ 27))
+ (SPADCALL |y| |z| (|shellEntry| $ 41)) (EXIT |x|))))))))
(DEFUN |LSAGG-;remove!;M2A;9| (|f| |x| $)
(PROG (|p| |q|)
@@ -251,72 +240,70 @@
(SEQ (LOOP
(COND
((NOT (COND
- ((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
- (T (SPADCALL
- (SPADCALL |x| (|getShellEntry| $ 18))
+ ((SPADCALL |x| (|shellEntry| $ 16)) NIL)
+ (T (SPADCALL (SPADCALL |x| (|shellEntry| $ 18))
|f|))))
(RETURN NIL))
- (T (SETQ |x| (SPADCALL |x| (|getShellEntry| $ 17))))))
+ (T (SETQ |x| (SPADCALL |x| (|shellEntry| $ 17))))))
(EXIT (COND
- ((SPADCALL |x| (|getShellEntry| $ 16)) |x|)
+ ((SPADCALL |x| (|shellEntry| $ 16)) |x|)
(T (SEQ (LETT |p| |x| |LSAGG-;remove!;M2A;9|)
- (LETT |q|
- (SPADCALL |x| (|getShellEntry| $ 17))
+ (LETT |q| (SPADCALL |x| (|shellEntry| $ 17))
|LSAGG-;remove!;M2A;9|)
(LOOP
(COND
((NOT (NOT
(SPADCALL |q|
- (|getShellEntry| $ 16))))
+ (|shellEntry| $ 16))))
(RETURN NIL))
(T (COND
((SPADCALL
(SPADCALL |q|
- (|getShellEntry| $ 18))
+ (|shellEntry| $ 18))
|f|)
(SETQ |q|
(SPADCALL |p|
(SPADCALL |q|
- (|getShellEntry| $ 17))
- (|getShellEntry| $ 27))))
+ (|shellEntry| $ 17))
+ (|shellEntry| $ 27))))
(T
(SEQ (SETQ |p| |q|)
(EXIT
(SETQ |q|
(SPADCALL |q|
- (|getShellEntry| $ 17))))))))))
+ (|shellEntry| $ 17))))))))))
(EXIT |x|)))))))))
(DEFUN |LSAGG-;delete!;AIA;10| (|x| |i| $)
(PROG (|y|)
(RETURN
- (LET ((|m| (SPADCALL |x| (|getShellEntry| $ 33))))
+ (LET ((|m| (SPADCALL |x| (|shellEntry| $ 33))))
(COND
((< |i| |m|) (|error| "index out of range"))
- ((EQL |i| |m|) (SPADCALL |x| (|getShellEntry| $ 17)))
+ ((EQL |i| |m|) (SPADCALL |x| (|shellEntry| $ 17)))
(T (SEQ (LETT |y|
(SPADCALL |x|
(LET ((#0=#:G1458 (- (- |i| 1) |m|)))
(|check-subtype| (NOT (MINUSP #0#))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 39))
+ (|shellEntry| $ 39))
|LSAGG-;delete!;AIA;10|)
- (SPADCALL |y| (SPADCALL |y| 2 (|getShellEntry| $ 39))
- (|getShellEntry| $ 27))
+ (SPADCALL |y| (SPADCALL |y| 2 (|shellEntry| $ 39))
+ (|shellEntry| $ 27))
(EXIT |x|))))))))
(DEFUN |LSAGG-;delete!;AUsA;11| (|x| |i| $)
(PROG (|h| |t|)
(RETURN
- (LET ((|l| (SPADCALL |i| (|getShellEntry| $ 46)))
- (|m| (SPADCALL |x| (|getShellEntry| $ 33))))
+ (LET ((|l| (SPADCALL |i| (|shellEntry| $ 46)))
+ (|m| (SPADCALL |x| (|shellEntry| $ 33))))
(COND
((< |l| |m|) (|error| "index out of range"))
(T (SEQ (LETT |h|
(COND
- ((SPADCALL |i| (|getShellEntry| $ 47))
- (SPADCALL |i| (|getShellEntry| $ 48)))
- (T (SPADCALL |x| (|getShellEntry| $ 49))))
+ ((SPADCALL |i| (|shellEntry| $ 47))
+ (SPADCALL |i| (|shellEntry| $ 48)))
+ (T (SPADCALL |x| (|shellEntry| $ 49))))
|LSAGG-;delete!;AUsA;11|)
(EXIT (COND
((< |h| |l|) |x|)
@@ -325,7 +312,7 @@
(LET ((#0=#:G1464 (- (+ |h| 1) |m|)))
(|check-subtype| (NOT (MINUSP #0#))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 39)))
+ (|shellEntry| $ 39)))
(T (SEQ (LETT |t|
(SPADCALL |x|
(LET
@@ -335,7 +322,7 @@
(NOT (MINUSP #1#))
'(|NonNegativeInteger|)
#1#))
- (|getShellEntry| $ 39))
+ (|shellEntry| $ 39))
|LSAGG-;delete!;AUsA;11|)
(SPADCALL |t|
(SPADCALL |t|
@@ -344,40 +331,38 @@
(|check-subtype|
(NOT (MINUSP #2#))
'(|NonNegativeInteger|) #2#))
- (|getShellEntry| $ 39))
- (|getShellEntry| $ 27))
+ (|shellEntry| $ 39))
+ (|shellEntry| $ 27))
(EXIT |x|))))))))))))
(DEFUN |LSAGG-;find;MAU;12| (|f| |x| $)
(SEQ (LOOP
(COND
((NOT (COND
- ((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
- (T (NOT (SPADCALL
- (SPADCALL |x| (|getShellEntry| $ 18))
+ ((SPADCALL |x| (|shellEntry| $ 16)) NIL)
+ (T (NOT (SPADCALL (SPADCALL |x| (|shellEntry| $ 18))
|f|)))))
(RETURN NIL))
- (T (SETQ |x| (SPADCALL |x| (|getShellEntry| $ 17))))))
+ (T (SETQ |x| (SPADCALL |x| (|shellEntry| $ 17))))))
(EXIT (COND
- ((SPADCALL |x| (|getShellEntry| $ 16))
- (CONS 1 "failed"))
- (T (CONS 0 (SPADCALL |x| (|getShellEntry| $ 18))))))))
+ ((SPADCALL |x| (|shellEntry| $ 16)) (CONS 1 "failed"))
+ (T (CONS 0 (SPADCALL |x| (|shellEntry| $ 18))))))))
(DEFUN |LSAGG-;position;MAI;13| (|f| |x| $)
- (LET ((|k| (SPADCALL |x| (|getShellEntry| $ 33))))
+ (LET ((|k| (SPADCALL |x| (|shellEntry| $ 33))))
(SEQ (LOOP
(COND
((NOT (COND
- ((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
+ ((SPADCALL |x| (|shellEntry| $ 16)) NIL)
(T (NOT (SPADCALL
- (SPADCALL |x| (|getShellEntry| $ 18))
+ (SPADCALL |x| (|shellEntry| $ 18))
|f|)))))
(RETURN NIL))
- (T (SEQ (SETQ |x| (SPADCALL |x| (|getShellEntry| $ 17)))
+ (T (SEQ (SETQ |x| (SPADCALL |x| (|shellEntry| $ 17)))
(EXIT (SETQ |k| (+ |k| 1)))))))
(EXIT (COND
- ((SPADCALL |x| (|getShellEntry| $ 16))
- (- (SPADCALL |x| (|getShellEntry| $ 33)) 1))
+ ((SPADCALL |x| (|shellEntry| $ 16))
+ (- (SPADCALL |x| (|shellEntry| $ 33)) 1))
(T |k|))))))
(DEFUN |LSAGG-;mergeSort| (|f| |p| |n| $)
@@ -386,10 +371,10 @@
(SEQ (COND
((AND (EQL |n| 2)
(SPADCALL
- (SPADCALL (SPADCALL |p| (|getShellEntry| $ 17))
- (|getShellEntry| $ 18))
- (SPADCALL |p| (|getShellEntry| $ 18)) |f|))
- (SETQ |p| (SPADCALL |p| (|getShellEntry| $ 55)))))
+ (SPADCALL (SPADCALL |p| (|shellEntry| $ 17))
+ (|shellEntry| $ 18))
+ (SPADCALL |p| (|shellEntry| $ 18)) |f|))
+ (SETQ |p| (SPADCALL |p| (|shellEntry| $ 55)))))
(EXIT (COND
((< |n| 3) |p|)
(T (SEQ (LETT |l|
@@ -398,8 +383,7 @@
'(|NonNegativeInteger|) #0#))
|LSAGG-;mergeSort|)
(LETT |q|
- (SPADCALL |p| |l|
- (|getShellEntry| $ 57))
+ (SPADCALL |p| |l| (|shellEntry| $ 57))
|LSAGG-;mergeSort|)
(SETQ |p|
(|LSAGG-;mergeSort| |f| |p| |l| $))
@@ -407,41 +391,40 @@
(|LSAGG-;mergeSort| |f| |q|
(- |n| |l|) $))
(EXIT (SPADCALL |f| |p| |q|
- (|getShellEntry| $ 23)))))))))))
+ (|shellEntry| $ 23)))))))))))
(DEFUN |LSAGG-;sorted?;MAB;15| (|f| |l| $)
(COND
- ((SPADCALL |l| (|getShellEntry| $ 16)) T)
- (T (LET ((|p| (SPADCALL |l| (|getShellEntry| $ 17))))
+ ((SPADCALL |l| (|shellEntry| $ 16)) T)
+ (T (LET ((|p| (SPADCALL |l| (|shellEntry| $ 17))))
(SEQ (LOOP
(COND
- ((NOT (NOT (SPADCALL |p| (|getShellEntry| $ 16))))
+ ((NOT (NOT (SPADCALL |p| (|shellEntry| $ 16))))
(RETURN NIL))
(T (SEQ (COND
((NOT (SPADCALL
(SPADCALL |l|
- (|getShellEntry| $ 18))
+ (|shellEntry| $ 18))
(SPADCALL |p|
- (|getShellEntry| $ 18))
+ (|shellEntry| $ 18))
|f|))
(RETURN-FROM |LSAGG-;sorted?;MAB;15| NIL)))
(EXIT (SETQ |p|
(SPADCALL (SETQ |l| |p|)
- (|getShellEntry| $ 17))))))))
+ (|shellEntry| $ 17))))))))
(EXIT T))))))
(DEFUN |LSAGG-;reduce;MA2S;16| (|f| |x| |i| $)
(LET ((|r| |i|))
(SEQ (LOOP
(COND
- ((NOT (NOT (SPADCALL |x| (|getShellEntry| $ 16))))
+ ((NOT (NOT (SPADCALL |x| (|shellEntry| $ 16))))
(RETURN NIL))
(T (SEQ (SETQ |r|
(SPADCALL |r|
- (SPADCALL |x| (|getShellEntry| $ 18))
- |f|))
+ (SPADCALL |x| (|shellEntry| $ 18)) |f|))
(EXIT (SETQ |x|
- (SPADCALL |x| (|getShellEntry| $ 17))))))))
+ (SPADCALL |x| (|shellEntry| $ 17))))))))
(EXIT |r|))))
(DEFUN |LSAGG-;reduce;MA3S;17| (|f| |x| |i| |a| $)
@@ -449,98 +432,95 @@
(SEQ (LOOP
(COND
((NOT (COND
- ((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
- (T (SPADCALL |r| |a| (|getShellEntry| $ 61)))))
+ ((SPADCALL |x| (|shellEntry| $ 16)) NIL)
+ (T (SPADCALL |r| |a| (|shellEntry| $ 61)))))
(RETURN NIL))
(T (SEQ (SETQ |r|
(SPADCALL |r|
- (SPADCALL |x| (|getShellEntry| $ 18))
- |f|))
+ (SPADCALL |x| (|shellEntry| $ 18)) |f|))
(EXIT (SETQ |x|
- (SPADCALL |x| (|getShellEntry| $ 17))))))))
+ (SPADCALL |x| (|shellEntry| $ 17))))))))
(EXIT |r|))))
(DEFUN |LSAGG-;new;NniSA;18| (|n| |s| $)
- (LET ((|l| (SPADCALL (|getShellEntry| $ 13))))
+ (LET ((|l| (SPADCALL (|shellEntry| $ 13))))
(SEQ (LET ((|k| 1))
(LOOP
(COND
((> |k| |n|) (RETURN NIL))
- (T (SETQ |l| (SPADCALL |s| |l| (|getShellEntry| $ 14)))))
+ (T (SETQ |l| (SPADCALL |s| |l| (|shellEntry| $ 14)))))
(SETQ |k| (+ |k| 1))))
(EXIT |l|))))
(DEFUN |LSAGG-;map;M3A;19| (|f| |x| |y| $)
- (LET ((|z| (SPADCALL (|getShellEntry| $ 13))))
+ (LET ((|z| (SPADCALL (|shellEntry| $ 13))))
(SEQ (LOOP
(COND
((NOT (COND
- ((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
- (T (NOT (SPADCALL |y| (|getShellEntry| $ 16))))))
+ ((SPADCALL |x| (|shellEntry| $ 16)) NIL)
+ (T (NOT (SPADCALL |y| (|shellEntry| $ 16))))))
(RETURN NIL))
(T (SEQ (SETQ |z|
(SPADCALL
(SPADCALL
- (SPADCALL |x|
- (|getShellEntry| $ 18))
- (SPADCALL |y|
- (|getShellEntry| $ 18))
+ (SPADCALL |x| (|shellEntry| $ 18))
+ (SPADCALL |y| (|shellEntry| $ 18))
|f|)
- |z| (|getShellEntry| $ 14)))
- (SETQ |x| (SPADCALL |x| (|getShellEntry| $ 17)))
+ |z| (|shellEntry| $ 14)))
+ (SETQ |x| (SPADCALL |x| (|shellEntry| $ 17)))
(EXIT (SETQ |y|
- (SPADCALL |y| (|getShellEntry| $ 17))))))))
- (EXIT (SPADCALL |z| (|getShellEntry| $ 55))))))
+ (SPADCALL |y| (|shellEntry| $ 17))))))))
+ (EXIT (SPADCALL |z| (|shellEntry| $ 55))))))
(DEFUN |LSAGG-;reverse!;2A;20| (|x| $)
(PROG (|y| |z|)
(RETURN
(COND
- ((OR (SPADCALL |x| (|getShellEntry| $ 16))
+ ((OR (SPADCALL |x| (|shellEntry| $ 16))
(SPADCALL
- (LETT |y| (SPADCALL |x| (|getShellEntry| $ 17))
+ (LETT |y| (SPADCALL |x| (|shellEntry| $ 17))
|LSAGG-;reverse!;2A;20|)
- (|getShellEntry| $ 16)))
+ (|shellEntry| $ 16)))
|x|)
- (T (SEQ (SPADCALL |x| (SPADCALL (|getShellEntry| $ 13))
- (|getShellEntry| $ 27))
+ (T (SEQ (SPADCALL |x| (SPADCALL (|shellEntry| $ 13))
+ (|shellEntry| $ 27))
(LOOP
(COND
- ((NOT (NOT (SPADCALL |y| (|getShellEntry| $ 16))))
+ ((NOT (NOT (SPADCALL |y| (|shellEntry| $ 16))))
(RETURN NIL))
(T (SEQ (LETT |z|
- (SPADCALL |y| (|getShellEntry| $ 17))
+ (SPADCALL |y| (|shellEntry| $ 17))
|LSAGG-;reverse!;2A;20|)
- (SPADCALL |y| |x| (|getShellEntry| $ 27))
+ (SPADCALL |y| |x| (|shellEntry| $ 27))
(SETQ |x| |y|) (EXIT (SETQ |y| |z|))))))
(EXIT |x|)))))))
(DEFUN |LSAGG-;copy;2A;21| (|x| $)
- (LET ((|y| (SPADCALL (|getShellEntry| $ 13))))
+ (LET ((|y| (SPADCALL (|shellEntry| $ 13))))
(SEQ (LET ((|k| 0))
(LOOP
(COND
- ((NOT (NOT (SPADCALL |x| (|getShellEntry| $ 16))))
+ ((NOT (NOT (SPADCALL |x| (|shellEntry| $ 16))))
(RETURN NIL))
(T (COND
((AND (EQL |k| 1000)
- (SPADCALL |x| (|getShellEntry| $ 67)))
+ (SPADCALL |x| (|shellEntry| $ 67)))
(|error| "cyclic list"))
(T (SEQ (SETQ |y|
(SPADCALL
(SPADCALL |x|
- (|getShellEntry| $ 18))
- |y| (|getShellEntry| $ 14)))
+ (|shellEntry| $ 18))
+ |y| (|shellEntry| $ 14)))
(EXIT (SETQ |x|
(SPADCALL |x|
- (|getShellEntry| $ 17)))))))))
+ (|shellEntry| $ 17)))))))))
(SETQ |k| (+ |k| 1))))
- (EXIT (SPADCALL |y| (|getShellEntry| $ 55))))))
+ (EXIT (SPADCALL |y| (|shellEntry| $ 55))))))
(DEFUN |LSAGG-;copyInto!;2AIA;22| (|y| |x| |s| $)
(PROG (|z|)
(RETURN
- (LET ((|m| (SPADCALL |y| (|getShellEntry| $ 33))))
+ (LET ((|m| (SPADCALL |y| (|shellEntry| $ 33))))
(COND
((< |s| |m|) (|error| "index out of range"))
(T (SEQ (LETT |z|
@@ -548,31 +528,28 @@
(LET ((#0=#:G1527 (- |s| |m|)))
(|check-subtype| (NOT (MINUSP #0#))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 39))
+ (|shellEntry| $ 39))
|LSAGG-;copyInto!;2AIA;22|)
(LOOP
(COND
((NOT (COND
- ((SPADCALL |z| (|getShellEntry| $ 16))
- NIL)
+ ((SPADCALL |z| (|shellEntry| $ 16)) NIL)
(T (NOT (SPADCALL |x|
- (|getShellEntry| $ 16))))))
+ (|shellEntry| $ 16))))))
(RETURN NIL))
(T (SEQ (SPADCALL |z|
- (SPADCALL |x| (|getShellEntry| $ 18))
- (|getShellEntry| $ 69))
+ (SPADCALL |x| (|shellEntry| $ 18))
+ (|shellEntry| $ 69))
(SETQ |x|
- (SPADCALL |x|
- (|getShellEntry| $ 17)))
+ (SPADCALL |x| (|shellEntry| $ 17)))
(EXIT (SETQ |z|
- (SPADCALL |z|
- (|getShellEntry| $ 17))))))))
+ (SPADCALL |z| (|shellEntry| $ 17))))))))
(EXIT |y|))))))))
(DEFUN |LSAGG-;position;SA2I;23| (|w| |x| |s| $)
(PROG (|k|)
(RETURN
- (LET ((|m| (SPADCALL |x| (|getShellEntry| $ 33))))
+ (LET ((|m| (SPADCALL |x| (|shellEntry| $ 33))))
(COND
((< |s| |m|) (|error| "index out of range"))
(T (SEQ (SETQ |x|
@@ -580,71 +557,66 @@
(LET ((#0=#:G1534 (- |s| |m|)))
(|check-subtype| (NOT (MINUSP #0#))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 39)))
+ (|shellEntry| $ 39)))
(LETT |k| |s| |LSAGG-;position;SA2I;23|)
(LOOP
(COND
((NOT (COND
- ((SPADCALL |x| (|getShellEntry| $ 16))
- NIL)
+ ((SPADCALL |x| (|shellEntry| $ 16)) NIL)
(T (SPADCALL |w|
- (SPADCALL |x|
- (|getShellEntry| $ 18))
- (|getShellEntry| $ 61)))))
+ (SPADCALL |x| (|shellEntry| $ 18))
+ (|shellEntry| $ 61)))))
(RETURN NIL))
(T (SEQ (SETQ |x|
- (SPADCALL |x|
- (|getShellEntry| $ 17)))
+ (SPADCALL |x| (|shellEntry| $ 17)))
(EXIT (SETQ |k| (+ |k| 1)))))))
(EXIT (COND
- ((SPADCALL |x| (|getShellEntry| $ 16))
- (- (SPADCALL |x| (|getShellEntry| $ 33)) 1))
+ ((SPADCALL |x| (|shellEntry| $ 16))
+ (- (SPADCALL |x| (|shellEntry| $ 33)) 1))
(T |k|))))))))))
(DEFUN |LSAGG-;removeDuplicates!;2A;24| (|l| $)
(LET ((|p| |l|))
(SEQ (LOOP
(COND
- ((NOT (NOT (SPADCALL |p| (|getShellEntry| $ 16))))
+ ((NOT (NOT (SPADCALL |p| (|shellEntry| $ 16))))
(RETURN NIL))
(T (SETQ |p|
(SPADCALL |p|
(SPADCALL
(CONS #'|LSAGG-;removeDuplicates!;2A;24!0|
(VECTOR $ |p|))
- (SPADCALL |p| (|getShellEntry| $ 17))
- (|getShellEntry| $ 73))
- (|getShellEntry| $ 27))))))
+ (SPADCALL |p| (|shellEntry| $ 17))
+ (|shellEntry| $ 73))
+ (|shellEntry| $ 27))))))
(EXIT |l|))))
(DEFUN |LSAGG-;removeDuplicates!;2A;24!0| (|#1| $$)
(LET (($ (SVREF $$ 0)))
- (SPADCALL |#1| (SPADCALL (SVREF $$ 1) (|getShellEntry| $ 18))
- (|getShellEntry| $ 72))))
+ (SPADCALL |#1| (SPADCALL (SVREF $$ 1) (|shellEntry| $ 18))
+ (|shellEntry| $ 72))))
(DEFUN |LSAGG-;<;2AB;25| (|x| |y| $)
(SEQ (LOOP
(COND
((NOT (COND
- ((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
- (T (NOT (SPADCALL |y| (|getShellEntry| $ 16))))))
+ ((SPADCALL |x| (|shellEntry| $ 16)) NIL)
+ (T (NOT (SPADCALL |y| (|shellEntry| $ 16))))))
(RETURN NIL))
(T (COND
- ((SPADCALL (SPADCALL |x| (|getShellEntry| $ 18))
- (SPADCALL |y| (|getShellEntry| $ 18))
- (|getShellEntry| $ 61))
+ ((SPADCALL (SPADCALL |x| (|shellEntry| $ 18))
+ (SPADCALL |y| (|shellEntry| $ 18))
+ (|shellEntry| $ 61))
(RETURN-FROM |LSAGG-;<;2AB;25|
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 18))
- (SPADCALL |y| (|getShellEntry| $ 18))
- (|getShellEntry| $ 75))))
- (T (SEQ (SETQ |x|
- (SPADCALL |x| (|getShellEntry| $ 17)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 18))
+ (SPADCALL |y| (|shellEntry| $ 18))
+ (|shellEntry| $ 75))))
+ (T (SEQ (SETQ |x| (SPADCALL |x| (|shellEntry| $ 17)))
(EXIT (SETQ |y|
- (SPADCALL |y|
- (|getShellEntry| $ 17))))))))))
+ (SPADCALL |y| (|shellEntry| $ 17))))))))))
(EXIT (COND
- ((SPADCALL |x| (|getShellEntry| $ 16))
- (NOT (SPADCALL |y| (|getShellEntry| $ 16))))
+ ((SPADCALL |x| (|shellEntry| $ 16))
+ (NOT (SPADCALL |y| (|shellEntry| $ 16))))
(T NIL)))))
(DEFUN |ListAggregate&| (|#1| |#2|)
diff --git a/src/algebra/strap/MONOID-.lsp b/src/algebra/strap/MONOID-.lsp
index 625ae8e5..e04b7bc3 100644
--- a/src/algebra/strap/MONOID-.lsp
+++ b/src/algebra/strap/MONOID-.lsp
@@ -14,19 +14,19 @@
|MONOID-;**;SNniS;4|))
(DEFUN |MONOID-;one?;SB;1| (|x| $)
- (SPADCALL |x| (|spadConstant| $ 7) (|getShellEntry| $ 9)))
+ (SPADCALL |x| (|spadConstant| $ 7) (|shellEntry| $ 9)))
(DEFUN |MONOID-;sample;S;2| ($) (|spadConstant| $ 7))
(DEFUN |MONOID-;recip;SU;3| (|x| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 12)) (CONS 0 |x|))
+ ((SPADCALL |x| (|shellEntry| $ 12)) (CONS 0 |x|))
(T (CONS 1 "failed"))))
(DEFUN |MONOID-;**;SNniS;4| (|x| |n| $)
(COND
((ZEROP |n|) (|spadConstant| $ 7))
- (T (SPADCALL |x| |n| (|getShellEntry| $ 19)))))
+ (T (SPADCALL |x| |n| (|shellEntry| $ 19)))))
(DEFUN |Monoid&| (|#1|)
(LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|Monoid&| |dv$1|))
diff --git a/src/algebra/strap/ORDRING-.lsp b/src/algebra/strap/ORDRING-.lsp
index 802dee65..c50c7657 100644
--- a/src/algebra/strap/ORDRING-.lsp
+++ b/src/algebra/strap/ORDRING-.lsp
@@ -14,24 +14,24 @@
|ORDRING-;abs;2S;4|))
(DEFUN |ORDRING-;positive?;SB;1| (|x| $)
- (SPADCALL |x| (|spadConstant| $ 7) (|getShellEntry| $ 9)))
+ (SPADCALL |x| (|spadConstant| $ 7) (|shellEntry| $ 9)))
(DEFUN |ORDRING-;negative?;SB;2| (|x| $)
- (SPADCALL |x| (|spadConstant| $ 7) (|getShellEntry| $ 11)))
+ (SPADCALL |x| (|spadConstant| $ 7) (|shellEntry| $ 11)))
(DEFUN |ORDRING-;sign;SI;3| (|x| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 13)) 1)
- ((SPADCALL |x| (|getShellEntry| $ 16)) -1)
- ((SPADCALL |x| (|getShellEntry| $ 19)) 0)
+ ((SPADCALL |x| (|shellEntry| $ 13)) 1)
+ ((SPADCALL |x| (|shellEntry| $ 16)) -1)
+ ((SPADCALL |x| (|shellEntry| $ 19)) 0)
(T (|error| "x satisfies neither positive?, negative? or zero?"))))
(DEFUN |ORDRING-;abs;2S;4| (|x| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 13)) |x|)
- ((SPADCALL |x| (|getShellEntry| $ 16))
- (SPADCALL |x| (|getShellEntry| $ 22)))
- ((SPADCALL |x| (|getShellEntry| $ 19)) (|spadConstant| $ 7))
+ ((SPADCALL |x| (|shellEntry| $ 13)) |x|)
+ ((SPADCALL |x| (|shellEntry| $ 16))
+ (SPADCALL |x| (|shellEntry| $ 22)))
+ ((SPADCALL |x| (|shellEntry| $ 19)) (|spadConstant| $ 7))
(T (|error| "x satisfies neither positive?, negative? or zero?"))))
(DEFUN |OrderedRing&| (|#1|)
diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp
index 4ab17df6..36423f85 100644
--- a/src/algebra/strap/OUTFORM.lsp
+++ b/src/algebra/strap/OUTFORM.lsp
@@ -569,8 +569,8 @@
(DEFUN |OUTFORM;outputForm;S$;15| (|s| $)
(SPADCALL (|spadConstant| $ 27)
- (SPADCALL |s| (|spadConstant| $ 27) (|getShellEntry| $ 28))
- (|getShellEntry| $ 29)))
+ (SPADCALL |s| (|spadConstant| $ 27) (|shellEntry| $ 28))
+ (|shellEntry| $ 29)))
(DEFUN |OUTFORM;width;$I;16| (|a| $)
(DECLARE (IGNORE $))
@@ -711,7 +711,7 @@
(COND
((NULL |l|) |a|)
((NULL (CDR |l|))
- (|OUTFORM;sub;3$;42| |a| (SPADCALL |l| (|getShellEntry| $ 78)) $))
+ (|OUTFORM;sub;3$;42| |a| (SPADCALL |l| (|shellEntry| $ 78)) $))
(T (CONS 'SUPERSUB (CONS |a| |l|)))))
(DEFUN |OUTFORM;supersub;$L$;47| (|a| |l| $)
@@ -840,10 +840,10 @@
(DEFUN |OUTFORM;infix;$L$;77| (|a| |l| $)
(COND
((NULL |l|) (|OUTFORM;empty;$;73| $))
- ((NULL (CDR |l|)) (SPADCALL |l| (|getShellEntry| $ 78)))
+ ((NULL (CDR |l|)) (SPADCALL |l| (|shellEntry| $ 78)))
((|OUTFORM;infix?;$B;74| |a| $) (CONS |a| |l|))
(T (|OUTFORM;hconcat;L$;49|
- (LIST (SPADCALL |l| (|getShellEntry| $ 78)) |a|
+ (LIST (SPADCALL |l| (|shellEntry| $ 78)) |a|
(|OUTFORM;infix;$L$;77| |a| (CDR |l|) $))
$))))
@@ -877,13 +877,11 @@
(LIST 'SUPERSUB |a| " " '|,|))
(DEFUN |OUTFORM;dot;$Nni$;85| (|a| |nn| $)
- (LET ((|s| (MAKE-FULL-CVEC |nn|
- (SPADCALL "." (|getShellEntry| $ 119)))))
+ (LET ((|s| (MAKE-FULL-CVEC |nn| (SPADCALL "." (|shellEntry| $ 119)))))
(LIST 'SUPERSUB |a| " " |s|)))
(DEFUN |OUTFORM;prime;$Nni$;86| (|a| |nn| $)
- (LET ((|s| (MAKE-FULL-CVEC |nn|
- (SPADCALL "," (|getShellEntry| $ 119)))))
+ (LET ((|s| (MAKE-FULL-CVEC |nn| (SPADCALL "," (|shellEntry| $ 119)))))
(LIST 'SUPERSUB |a| " " |s|)))
(DEFUN |OUTFORM;overlabel;3$;87| (|a| |b| $)
@@ -933,8 +931,8 @@
(T (LET* ((|r| (SPADCALL
(|check-subtype| (PLUSP |nn|)
'(|PositiveInteger|) |nn|)
- (|getShellEntry| $ 137)))
- (|s| (SPADCALL |r| (|getShellEntry| $ 138))))
+ (|shellEntry| $ 137)))
+ (|s| (SPADCALL |r| (|shellEntry| $ 138))))
(|OUTFORM;super;3$;43| |a| (LIST 'PAREN |s|) $)))))
(DEFUN |OUTFORM;sum;2$;98| (|a| $)
diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp
index e343ce8d..faaf12c9 100644
--- a/src/algebra/strap/POLYCAT-.lsp
+++ b/src/algebra/strap/POLYCAT-.lsp
@@ -154,9 +154,8 @@
(COND
((EQL (CAR
(SPADCALL
- (SPADCALL |e|
- (|getShellEntry| $ 14))
- (|getShellEntry| $ 16)))
+ (SPADCALL |e| (|shellEntry| $ 14))
+ (|shellEntry| $ 16)))
1)
(RETURN
(|error| "cannot find a variable to evaluate")))))))
@@ -171,8 +170,8 @@
(CONS
(SPADCALL
(SPADCALL |e|
- (|getShellEntry| $ 14))
- (|getShellEntry| $ 17))
+ (|shellEntry| $ 14))
+ (|shellEntry| $ 17))
#2#)))))
(SETQ #1# (CDR #1#))))
|POLYCAT-;eval;SLS;1|)
@@ -185,30 +184,30 @@
(SETQ #4#
(CONS
(SPADCALL |e|
- (|getShellEntry| $ 18))
+ (|shellEntry| $ 18))
#4#)))))
(SETQ #3# (CDR #3#))))
- (|getShellEntry| $ 21)))))))))
+ (|shellEntry| $ 21)))))))))
(DEFUN |POLYCAT-;monomials;SL;2| (|p| $)
(LET ((|ml| NIL))
(SEQ (LOOP
(COND
((NOT (SPADCALL |p| (|spadConstant| $ 27)
- (|getShellEntry| $ 29)))
+ (|shellEntry| $ 29)))
(RETURN NIL))
(T (SEQ (SETQ |ml|
- (CONS (SPADCALL |p| (|getShellEntry| $ 30))
+ (CONS (SPADCALL |p| (|shellEntry| $ 30))
|ml|))
(EXIT (SETQ |p|
- (SPADCALL |p| (|getShellEntry| $ 32))))))))
+ (SPADCALL |p| (|shellEntry| $ 32))))))))
(EXIT (REVERSE |ml|)))))
(DEFUN |POLYCAT-;isPlus;SU;3| (|p| $)
(PROG (|l|)
(RETURN
(COND
- ((NULL (CDR (LETT |l| (SPADCALL |p| (|getShellEntry| $ 35))
+ ((NULL (CDR (LETT |l| (SPADCALL |p| (|shellEntry| $ 35))
|POLYCAT-;isPlus;SU;3|)))
(CONS 1 "failed"))
(T (CONS 0 |l|))))))
@@ -217,9 +216,9 @@
(PROG (|lv| |l| |r|)
(RETURN
(COND
- ((OR (NULL (LETT |lv| (SPADCALL |p| (|getShellEntry| $ 40))
+ ((OR (NULL (LETT |lv| (SPADCALL |p| (|shellEntry| $ 40))
|POLYCAT-;isTimes;SU;4|))
- (NOT (SPADCALL |p| (|getShellEntry| $ 42))))
+ (NOT (SPADCALL |p| (|shellEntry| $ 42))))
(CONS 1 "failed"))
(T (SEQ (LETT |l|
(LET ((#0=#:G1672 |lv|) (#1=#:G1671 NIL))
@@ -232,46 +231,45 @@
(SPADCALL (|spadConstant| $ 43)
|v|
(SPADCALL |p| |v|
- (|getShellEntry| $ 46))
- (|getShellEntry| $ 47))
+ (|shellEntry| $ 46))
+ (|shellEntry| $ 47))
#1#)))))
(SETQ #0# (CDR #0#))))
|POLYCAT-;isTimes;SU;4|)
(EXIT (COND
((SPADCALL
(LETT |r|
- (SPADCALL |p|
- (|getShellEntry| $ 48))
+ (SPADCALL |p| (|shellEntry| $ 48))
|POLYCAT-;isTimes;SU;4|)
- (|getShellEntry| $ 49))
+ (|shellEntry| $ 49))
(COND
((NULL (CDR |lv|)) (CONS 1 "failed"))
(T (CONS 0 |l|))))
(T (CONS 0
(CONS (SPADCALL |r|
- (|getShellEntry| $ 51))
+ (|shellEntry| $ 51))
|l|)))))))))))
(DEFUN |POLYCAT-;isExpt;SU;5| (|p| $)
(PROG (|d|)
(RETURN
- (LET ((|u| (SPADCALL |p| (|getShellEntry| $ 53))))
+ (LET ((|u| (SPADCALL |p| (|shellEntry| $ 53))))
(COND
((OR (EQL (CAR |u|) 1)
(NOT (SPADCALL |p|
(SPADCALL (|spadConstant| $ 43) (CDR |u|)
(LETT |d|
(SPADCALL |p| (CDR |u|)
- (|getShellEntry| $ 46))
+ (|shellEntry| $ 46))
|POLYCAT-;isExpt;SU;5|)
- (|getShellEntry| $ 47))
- (|getShellEntry| $ 54))))
+ (|shellEntry| $ 47))
+ (|shellEntry| $ 54))))
(CONS 1 "failed"))
(T (CONS 0 (CONS (CDR |u|) |d|))))))))
(DEFUN |POLYCAT-;coefficient;SVarSetNniS;6| (|p| |v| |n| $)
- (SPADCALL (SPADCALL |p| |v| (|getShellEntry| $ 59)) |n|
- (|getShellEntry| $ 61)))
+ (SPADCALL (SPADCALL |p| |v| (|shellEntry| $ 59)) |n|
+ (|shellEntry| $ 61)))
(DEFUN |POLYCAT-;coefficient;SLLS;7| (|p| |lv| |ln| $)
(COND
@@ -282,9 +280,9 @@
((NULL |ln|) (|error| "mismatched lists in coefficient"))
(T (SPADCALL
(SPADCALL
- (SPADCALL |p| (|SPADfirst| |lv|) (|getShellEntry| $ 59))
- (|SPADfirst| |ln|) (|getShellEntry| $ 61))
- (CDR |lv|) (CDR |ln|) (|getShellEntry| $ 68)))))
+ (SPADCALL |p| (|SPADfirst| |lv|) (|shellEntry| $ 59))
+ (|SPADfirst| |ln|) (|shellEntry| $ 61))
+ (CDR |lv|) (CDR |ln|) (|shellEntry| $ 68)))))
(DEFUN |POLYCAT-;monomial;SLLS;8| (|p| |lv| |ln| $)
(COND
@@ -295,31 +293,30 @@
((NULL |ln|) (|error| "mismatched lists in monomial"))
(T (SPADCALL
(SPADCALL |p| (|SPADfirst| |lv|) (|SPADfirst| |ln|)
- (|getShellEntry| $ 47))
- (CDR |lv|) (CDR |ln|) (|getShellEntry| $ 70)))))
+ (|shellEntry| $ 47))
+ (CDR |lv|) (CDR |ln|) (|shellEntry| $ 70)))))
(DEFUN |POLYCAT-;retract;SVarSet;9| (|p| $)
- (LET ((|q| (LET ((#0=#:G1453 (SPADCALL |p| (|getShellEntry| $ 53))))
+ (LET ((|q| (LET ((#0=#:G1453 (SPADCALL |p| (|shellEntry| $ 53))))
(|check-union| (ZEROP (CAR #0#)) (SVREF $ 9) #0#)
(CDR #0#))))
(COND
- ((SPADCALL (SPADCALL |q| (|getShellEntry| $ 72)) |p|
- (|getShellEntry| $ 54))
+ ((SPADCALL (SPADCALL |q| (|shellEntry| $ 72)) |p|
+ (|shellEntry| $ 54))
|q|)
(T (|error| "Polynomial is not a single variable")))))
(DEFUN |POLYCAT-;retractIfCan;SU;10| (|p| $)
(PROG (|q| #0=#:G1461)
(RETURN
- (SEQ (EXIT (SEQ (SEQ (LETT |q|
- (SPADCALL |p| (|getShellEntry| $ 53))
+ (SEQ (EXIT (SEQ (SEQ (LETT |q| (SPADCALL |p| (|shellEntry| $ 53))
|POLYCAT-;retractIfCan;SU;10|)
(EXIT (COND
((AND (ZEROP (CAR |q|))
(SPADCALL
(SPADCALL (CDR |q|)
- (|getShellEntry| $ 72))
- |p| (|getShellEntry| $ 54)))
+ (|shellEntry| $ 72))
+ |p| (|shellEntry| $ 54)))
(PROGN
(LETT #0# |q|
|POLYCAT-;retractIfCan;SU;10|)
@@ -328,11 +325,11 @@
#0# (EXIT #0#)))))
(DEFUN |POLYCAT-;mkPrim| (|p| $)
- (SPADCALL (|spadConstant| $ 44) (SPADCALL |p| (|getShellEntry| $ 75))
- (|getShellEntry| $ 76)))
+ (SPADCALL (|spadConstant| $ 44) (SPADCALL |p| (|shellEntry| $ 75))
+ (|shellEntry| $ 76)))
(DEFUN |POLYCAT-;primitiveMonomials;SL;12| (|p| $)
- (LET ((#0=#:G1674 (SPADCALL |p| (|getShellEntry| $ 35)))
+ (LET ((#0=#:G1674 (SPADCALL |p| (|shellEntry| $ 35)))
(#1=#:G1673 NIL))
(LOOP
(COND
@@ -343,84 +340,83 @@
(DEFUN |POLYCAT-;totalDegree;SNni;13| (|p| $)
(COND
- ((SPADCALL |p| (|getShellEntry| $ 78)) 0)
+ ((SPADCALL |p| (|shellEntry| $ 78)) 0)
(T (LET ((|u| (SPADCALL |p|
(LET ((#0=#:G1467
- (SPADCALL |p| (|getShellEntry| $ 53))))
+ (SPADCALL |p| (|shellEntry| $ 53))))
(|check-union| (ZEROP (CAR #0#)) (SVREF $ 9)
#0#)
(CDR #0#))
- (|getShellEntry| $ 59)))
+ (|shellEntry| $ 59)))
(|d| 0))
(SEQ (LOOP
(COND
((NOT (SPADCALL |u| (|spadConstant| $ 80)
- (|getShellEntry| $ 81)))
+ (|shellEntry| $ 81)))
(RETURN NIL))
(T (SEQ (SETQ |d|
(MAX |d|
(+
(SPADCALL |u|
- (|getShellEntry| $ 82))
+ (|shellEntry| $ 82))
(SPADCALL
(SPADCALL |u|
- (|getShellEntry| $ 83))
- (|getShellEntry| $ 84)))))
+ (|shellEntry| $ 83))
+ (|shellEntry| $ 84)))))
(EXIT (SETQ |u|
(SPADCALL |u|
- (|getShellEntry| $ 87))))))))
+ (|shellEntry| $ 87))))))))
(EXIT |d|))))))
(DEFUN |POLYCAT-;totalDegree;SLNni;14| (|p| |lv| $)
(PROG (|v| |u| |d| |w|)
(RETURN
(COND
- ((SPADCALL |p| (|getShellEntry| $ 78)) 0)
+ ((SPADCALL |p| (|shellEntry| $ 78)) 0)
(T (SEQ (LETT |u|
(SPADCALL |p|
(LETT |v|
(LET ((#0=#:G1475
(SPADCALL |p|
- (|getShellEntry| $ 53))))
+ (|shellEntry| $ 53))))
(|check-union| (ZEROP (CAR #0#))
(SVREF $ 9) #0#)
(CDR #0#))
|POLYCAT-;totalDegree;SLNni;14|)
- (|getShellEntry| $ 59))
+ (|shellEntry| $ 59))
|POLYCAT-;totalDegree;SLNni;14|)
(LETT |d| 0 |POLYCAT-;totalDegree;SLNni;14|)
(LETT |w| 0 |POLYCAT-;totalDegree;SLNni;14|)
(COND
- ((SPADCALL |v| |lv| (|getShellEntry| $ 89))
+ ((SPADCALL |v| |lv| (|shellEntry| $ 89))
(SETQ |w| 1)))
(LOOP
(COND
((NOT (SPADCALL |u| (|spadConstant| $ 80)
- (|getShellEntry| $ 81)))
+ (|shellEntry| $ 81)))
(RETURN NIL))
(T (SEQ (SETQ |d|
(MAX |d|
(+
(* |w|
(SPADCALL |u|
- (|getShellEntry| $ 82)))
+ (|shellEntry| $ 82)))
(SPADCALL
(SPADCALL |u|
- (|getShellEntry| $ 83))
- |lv| (|getShellEntry| $ 92)))))
+ (|shellEntry| $ 83))
+ |lv| (|shellEntry| $ 92)))))
(EXIT (SETQ |u|
(SPADCALL |u|
- (|getShellEntry| $ 87))))))))
+ (|shellEntry| $ 87))))))))
(EXIT |d|)))))))
(DEFUN |POLYCAT-;resultant;2SVarSetS;15| (|p1| |p2| |mvar| $)
- (SPADCALL (SPADCALL |p1| |mvar| (|getShellEntry| $ 59))
- (SPADCALL |p2| |mvar| (|getShellEntry| $ 59))
- (|getShellEntry| $ 94)))
+ (SPADCALL (SPADCALL |p1| |mvar| (|shellEntry| $ 59))
+ (SPADCALL |p2| |mvar| (|shellEntry| $ 59)) (|shellEntry| $ 94)))
(DEFUN |POLYCAT-;discriminant;SVarSetS;16| (|p| |var| $)
- (SPADCALL (SPADCALL |p| |var| (|getShellEntry| $ 59))
- (|getShellEntry| $ 96)))
+ (SPADCALL (SPADCALL |p| |var| (|shellEntry| $ 59))
+ (|shellEntry| $ 96)))
(DEFUN |POLYCAT-;allMonoms| (|l| $)
(SPADCALL
@@ -431,24 +427,23 @@
((ATOM #0#) (RETURN (NREVERSE #1#)))
(T (LET ((|p| (CAR #0#)))
(SETQ #1#
- (CONS (SPADCALL |p| (|getShellEntry| $ 98))
+ (CONS (SPADCALL |p| (|shellEntry| $ 98))
#1#)))))
(SETQ #0# (CDR #0#))))
- (|getShellEntry| $ 99))
- (|getShellEntry| $ 100)))
+ (|shellEntry| $ 99))
+ (|shellEntry| $ 100)))
(DEFUN |POLYCAT-;P2R| (|p| |b| |n| $)
- (LET ((|w| (SPADCALL |n| (|spadConstant| $ 28)
- (|getShellEntry| $ 102))))
- (SEQ (LET ((|i| (SPADCALL |w| (|getShellEntry| $ 104)))
+ (LET ((|w| (SPADCALL |n| (|spadConstant| $ 28) (|shellEntry| $ 102))))
+ (SEQ (LET ((|i| (SPADCALL |w| (|shellEntry| $ 104)))
(#0=#:G1677 (|sizeOfSimpleArray| |w|)) (#1=#:G1678 |b|))
(LOOP
(COND
((OR (> |i| #0#) (ATOM #1#)) (RETURN NIL))
(T (LET ((|bj| (CAR #1#)))
(SPADCALL |w| |i|
- (SPADCALL |p| |bj| (|getShellEntry| $ 106))
- (|getShellEntry| $ 107)))))
+ (SPADCALL |p| |bj| (|shellEntry| $ 106))
+ (|shellEntry| $ 107)))))
(SETQ |i| (+ |i| 1))
(SETQ #1# (CDR #1#))))
(EXIT |w|))))
@@ -470,15 +465,15 @@
(SETQ #3#
(CONS
(SPADCALL |p| |bj|
- (|getShellEntry| $ 106))
+ (|shellEntry| $ 106))
#3#)))))
(SETQ #2# (CDR #2#))))
#1#)))))
(SETQ #0# (CDR #0#))))
- (|getShellEntry| $ 111)))
+ (|shellEntry| $ 111)))
(DEFUN |POLYCAT-;reducedSystem;MM;20| (|m| $)
- (LET* ((|l| (SPADCALL |m| (|getShellEntry| $ 114)))
+ (LET* ((|l| (SPADCALL |m| (|shellEntry| $ 114)))
(|b| (SPADCALL
(SPADCALL
(LET ((#0=#:G1684 |l|) (#1=#:G1683 NIL))
@@ -491,8 +486,8 @@
(|POLYCAT-;allMonoms| |r| $)
#1#)))))
(SETQ #0# (CDR #0#))))
- (|getShellEntry| $ 99))
- (|getShellEntry| $ 100)))
+ (|shellEntry| $ 99))
+ (|shellEntry| $ 100)))
(|d| (LET ((#2=#:G1686 |b|) (#3=#:G1685 NIL))
(LOOP
(COND
@@ -500,7 +495,7 @@
(T (LET ((|bj| (CAR #2#)))
(SETQ #3#
(CONS (SPADCALL |bj|
- (|getShellEntry| $ 75))
+ (|shellEntry| $ 75))
#3#)))))
(SETQ #2# (CDR #2#)))))
(|mm| (|POLYCAT-;eq2R| (|SPADfirst| |l|) |d| $)))
@@ -512,13 +507,13 @@
(SPADCALL |mm|
(|POLYCAT-;eq2R| (|SPADfirst| |l|) |d|
$)
- (|getShellEntry| $ 119)))
+ (|shellEntry| $ 119)))
(EXIT (SETQ |l| (CDR |l|)))))))
(EXIT |mm|))))
(DEFUN |POLYCAT-;reducedSystem;MVR;21| (|m| |v| $)
- (LET* ((|l| (SPADCALL |m| (|getShellEntry| $ 114)))
- (|r| (SPADCALL |v| (|getShellEntry| $ 123)))
+ (LET* ((|l| (SPADCALL |m| (|shellEntry| $ 114)))
+ (|r| (SPADCALL |v| (|shellEntry| $ 123)))
(|b| (SPADCALL
(SPADCALL (|POLYCAT-;allMonoms| |r| $)
(SPADCALL
@@ -532,9 +527,9 @@
(|POLYCAT-;allMonoms| |s| $)
#1#)))))
(SETQ #0# (CDR #0#))))
- (|getShellEntry| $ 99))
- (|getShellEntry| $ 124))
- (|getShellEntry| $ 100)))
+ (|shellEntry| $ 99))
+ (|shellEntry| $ 124))
+ (|shellEntry| $ 100)))
(|d| (LET ((#2=#:G1690 |b|) (#3=#:G1689 NIL))
(LOOP
(COND
@@ -542,7 +537,7 @@
(T (LET ((|bj| (CAR #2#)))
(SETQ #3#
(CONS (SPADCALL |bj|
- (|getShellEntry| $ 75))
+ (|shellEntry| $ 75))
#3#)))))
(SETQ #2# (CDR #2#)))))
(|n| (LIST-LENGTH |d|))
@@ -556,44 +551,44 @@
(SPADCALL |mm|
(|POLYCAT-;eq2R| (|SPADfirst| |l|) |d|
$)
- (|getShellEntry| $ 119)))
+ (|shellEntry| $ 119)))
(SETQ |w|
(SPADCALL |w|
(|POLYCAT-;P2R| (|SPADfirst| |r|) |d|
|n| $)
- (|getShellEntry| $ 128)))
+ (|shellEntry| $ 128)))
(SETQ |l| (CDR |l|)) (EXIT (SETQ |r| (CDR |r|)))))))
(EXIT (CONS |mm| |w|)))))
(DEFUN |POLYCAT-;gcdPolynomial;3Sup;22| (|pp| |qq| $)
- (SPADCALL |pp| |qq| (|getShellEntry| $ 133)))
+ (SPADCALL |pp| |qq| (|shellEntry| $ 133)))
(DEFUN |POLYCAT-;solveLinearPolynomialEquation;LSupU;23| (|lpp| |pp| $)
- (SPADCALL |lpp| |pp| (|getShellEntry| $ 138)))
+ (SPADCALL |lpp| |pp| (|shellEntry| $ 138)))
(DEFUN |POLYCAT-;factorPolynomial;SupF;24| (|pp| $)
- (SPADCALL |pp| (|getShellEntry| $ 143)))
+ (SPADCALL |pp| (|shellEntry| $ 143)))
(DEFUN |POLYCAT-;factorSquareFreePolynomial;SupF;25| (|pp| $)
- (SPADCALL |pp| (|getShellEntry| $ 146)))
+ (SPADCALL |pp| (|shellEntry| $ 146)))
(DEFUN |POLYCAT-;factor;SF;26| (|p| $)
(PROG (|ansR| |up| |ansSUP|)
(RETURN
- (LET ((|v| (SPADCALL |p| (|getShellEntry| $ 53))))
+ (LET ((|v| (SPADCALL |p| (|shellEntry| $ 53))))
(COND
((EQL (CAR |v|) 1)
(SEQ (LETT |ansR|
- (SPADCALL (SPADCALL |p| (|getShellEntry| $ 48))
- (|getShellEntry| $ 149))
+ (SPADCALL (SPADCALL |p| (|shellEntry| $ 48))
+ (|shellEntry| $ 149))
|POLYCAT-;factor;SF;26|)
(EXIT (SPADCALL
(SPADCALL
- (SPADCALL |ansR| (|getShellEntry| $ 151))
- (|getShellEntry| $ 51))
+ (SPADCALL |ansR| (|shellEntry| $ 151))
+ (|shellEntry| $ 51))
(LET ((#0=#:G1692
(SPADCALL |ansR|
- (|getShellEntry| $ 155)))
+ (|shellEntry| $ 155)))
(#1=#:G1691 NIL))
(LOOP
(COND
@@ -603,25 +598,24 @@
(CONS
(VECTOR (SVREF |w| 0)
(SPADCALL (SVREF |w| 1)
- (|getShellEntry| $ 51))
+ (|shellEntry| $ 51))
(SVREF |w| 2))
#1#)))))
(SETQ #0# (CDR #0#))))
- (|getShellEntry| $ 159)))))
+ (|shellEntry| $ 159)))))
(T (SEQ (LETT |up|
- (SPADCALL |p| (CDR |v|) (|getShellEntry| $ 59))
+ (SPADCALL |p| (CDR |v|) (|shellEntry| $ 59))
|POLYCAT-;factor;SF;26|)
- (LETT |ansSUP|
- (SPADCALL |up| (|getShellEntry| $ 143))
+ (LETT |ansSUP| (SPADCALL |up| (|shellEntry| $ 143))
|POLYCAT-;factor;SF;26|)
(EXIT (SPADCALL
(SPADCALL
(SPADCALL |ansSUP|
- (|getShellEntry| $ 160))
- (CDR |v|) (|getShellEntry| $ 161))
+ (|shellEntry| $ 160))
+ (CDR |v|) (|shellEntry| $ 161))
(LET ((#2=#:G1694
(SPADCALL |ansSUP|
- (|getShellEntry| $ 164)))
+ (|shellEntry| $ 164)))
(#3=#:G1693 NIL))
(LOOP
(COND
@@ -632,17 +626,17 @@
(VECTOR (SVREF |ww| 0)
(SPADCALL (SVREF |ww| 1)
(CDR |v|)
- (|getShellEntry| $ 161))
+ (|shellEntry| $ 161))
(SVREF |ww| 2))
#3#)))))
(SETQ #2# (CDR #2#))))
- (|getShellEntry| $ 159))))))))))
+ (|shellEntry| $ 159))))))))))
(DEFUN |POLYCAT-;conditionP;MU;27| (|mat| $)
(PROG (|nd| |vars| |degs| |deg1| |mons| |redmons| |ans| |i|)
(RETURN
- (LET* ((|ll| (SPADCALL (SPADCALL |mat| (|getShellEntry| $ 166))
- (|getShellEntry| $ 114)))
+ (LET* ((|ll| (SPADCALL (SPADCALL |mat| (|shellEntry| $ 166))
+ (|shellEntry| $ 114)))
(|llR| (LET ((#0=#:G1706 (|SPADfirst| |ll|))
(#1=#:G1705 NIL))
(LOOP
@@ -675,14 +669,13 @@
(LET
((#6=#:G1556
(SPADCALL |u|
- (|getShellEntry| $ 98))))
+ (|shellEntry| $ 98))))
(COND
(#4# (SETQ #3# #6#))
(T
(SETQ #3#
(SPADCALL #3# #6#
- (|getShellEntry| $
- 170)))))
+ (|shellEntry| $ 170)))))
(SETQ #4# NIL)))))
(SETQ #5# (CDR #5#))))
|POLYCAT-;conditionP;MU;27|)
@@ -697,11 +690,11 @@
(SEQ
(LETT |vars|
(SPADCALL |m|
- (|getShellEntry| $ 40))
+ (|shellEntry| $ 40))
|POLYCAT-;conditionP;MU;27|)
(LETT |degs|
(SPADCALL |m| |vars|
- (|getShellEntry| $ 171))
+ (|shellEntry| $ 171))
|POLYCAT-;conditionP;MU;27|)
(LETT |deg1|
(LET
@@ -718,8 +711,8 @@
(SEQ
(LETT |nd|
(SPADCALL |d| |ch|
- (|getShellEntry|
- $ 173))
+ (|shellEntry| $
+ 173))
|POLYCAT-;conditionP;MU;27|)
(EXIT
(COND
@@ -746,8 +739,7 @@
(CONS
(SPADCALL
(|spadConstant| $ 43) |vars|
- |deg1|
- (|getShellEntry| $ 70))
+ |deg1| (|shellEntry| $ 70))
|redmons|))
(EXIT
(SETQ |llR|
@@ -771,10 +763,10 @@
(SPADCALL
(SPADCALL |u|
|vars| |degs|
- (|getShellEntry|
- $ 68))
- (|getShellEntry|
- $ 175))
+ (|shellEntry| $
+ 68))
+ (|shellEntry| $
+ 175))
|v|)
#13#)))))
(SETQ #11# (CDR #11#))
@@ -785,10 +777,9 @@
(SETQ #2# (CDR #2#))))
(LETT |ans|
(SPADCALL
- (SPADCALL
- (SPADCALL |llR| (|getShellEntry| $ 111))
- (|getShellEntry| $ 178))
- (|getShellEntry| $ 180))
+ (SPADCALL (SPADCALL |llR| (|shellEntry| $ 111))
+ (|shellEntry| $ 178))
+ (|shellEntry| $ 180))
|POLYCAT-;conditionP;MU;27|)
(EXIT (COND
((EQL (CAR |ans|) 1) (CONS 1 "failed"))
@@ -798,7 +789,7 @@
((#14=#:G1587
(|makeSimpleArray|
(|getVMType|
- (|getShellEntry| $ 6))
+ (|shellEntry| $ 6))
(SIZE |monslist|))))
(LET
((#15=#:G1703 |monslist|)
@@ -839,11 +830,11 @@
|i|
(+ |i|
1))
- (|getShellEntry|
+ (|shellEntry|
$ 181))
- (|getShellEntry|
+ (|shellEntry|
$ 51))
- (|getShellEntry|
+ (|shellEntry|
$ 182))))
(COND
(#18#
@@ -856,7 +847,7 @@
(SPADCALL
#17#
#20#
- (|getShellEntry|
+ (|shellEntry|
$ 183)))))
(SETQ #18#
NIL)))))
@@ -868,18 +859,18 @@
(DEFUN |POLYCAT-;charthRoot;SU;28| (|p| $)
(PROG (|ans| |ch|)
(RETURN
- (LET ((|vars| (SPADCALL |p| (|getShellEntry| $ 40))))
+ (LET ((|vars| (SPADCALL |p| (|shellEntry| $ 40))))
(COND
((NULL |vars|)
(SEQ (LETT |ans|
- (SPADCALL (SPADCALL |p| (|getShellEntry| $ 175))
- (|getShellEntry| $ 185))
+ (SPADCALL (SPADCALL |p| (|shellEntry| $ 175))
+ (|shellEntry| $ 185))
|POLYCAT-;charthRoot;SU;28|)
(EXIT (COND
((EQL (CAR |ans|) 1) (CONS 1 "failed"))
(T (CONS 0
(SPADCALL (CDR |ans|)
- (|getShellEntry| $ 51))))))))
+ (|shellEntry| $ 51))))))))
(T (SEQ (LETT |ch| (|spadConstant| $ 169)
|POLYCAT-;charthRoot;SU;28|)
(EXIT (|POLYCAT-;charthRootlv| |p| |vars| |ch| $)))))))))
@@ -889,14 +880,14 @@
(RETURN
(COND
((NULL |vars|)
- (LET ((|ans| (SPADCALL (SPADCALL |p| (|getShellEntry| $ 175))
- (|getShellEntry| $ 185))))
+ (LET ((|ans| (SPADCALL (SPADCALL |p| (|shellEntry| $ 175))
+ (|shellEntry| $ 185))))
(COND
((EQL (CAR |ans|) 1) (CONS 1 "failed"))
- (T (CONS 0 (SPADCALL (CDR |ans|) (|getShellEntry| $ 51)))))))
+ (T (CONS 0 (SPADCALL (CDR |ans|) (|shellEntry| $ 51)))))))
(T (LET ((|v| (|SPADfirst| |vars|)))
(SEQ (SETQ |vars| (CDR |vars|))
- (LETT |d| (SPADCALL |p| |v| (|getShellEntry| $ 46))
+ (LETT |d| (SPADCALL |p| |v| (|shellEntry| $ 46))
|POLYCAT-;charthRootlv|)
(LETT |ans| (|spadConstant| $ 27)
|POLYCAT-;charthRootlv|)
@@ -905,7 +896,7 @@
((NOT (PLUSP |d|)) (RETURN NIL))
(T (SEQ (LETT |dd|
(SPADCALL |d| |ch|
- (|getShellEntry| $ 173))
+ (|shellEntry| $ 173))
|POLYCAT-;charthRootlv|)
(EXIT (COND
((EQL (CAR |dd|) 1)
@@ -916,13 +907,13 @@
(SEQ
(LETT |cp|
(SPADCALL |p| |v| |d|
- (|getShellEntry| $ 188))
+ (|shellEntry| $ 188))
|POLYCAT-;charthRootlv|)
(SETQ |p|
(SPADCALL |p|
(SPADCALL |cp| |v| |d|
- (|getShellEntry| $ 47))
- (|getShellEntry| $ 189)))
+ (|shellEntry| $ 47))
+ (|shellEntry| $ 189)))
(LETT |ansx|
(|POLYCAT-;charthRootlv| |cp|
|vars| |ch| $)
@@ -937,7 +928,7 @@
(SEQ
(SETQ |d|
(SPADCALL |p| |v|
- (|getShellEntry| $ 46)))
+ (|shellEntry| $ 46)))
(EXIT
(SETQ |ans|
(SPADCALL |ans|
@@ -950,8 +941,8 @@
(NOT (MINUSP #0#))
'(|NonNegativeInteger|)
#0#))
- (|getShellEntry| $ 47))
- (|getShellEntry| $ 183))))))))))))))))
+ (|shellEntry| $ 47))
+ (|shellEntry| $ 183))))))))))))))))
(LETT |ansx|
(|POLYCAT-;charthRootlv| |p| |vars| |ch| $)
|POLYCAT-;charthRootlv|)
@@ -962,35 +953,35 @@
(T (RETURN-FROM |POLYCAT-;charthRootlv|
(CONS 0
(SPADCALL |ans| (CDR |ansx|)
- (|getShellEntry| $ 183))))))))))))))
+ (|shellEntry| $ 183))))))))))))))
(DEFUN |POLYCAT-;monicDivide;2SVarSetR;30| (|p1| |p2| |mvar| $)
(LET ((|result|
- (SPADCALL (SPADCALL |p1| |mvar| (|getShellEntry| $ 59))
- (SPADCALL |p2| |mvar| (|getShellEntry| $ 59))
- (|getShellEntry| $ 191))))
- (CONS (SPADCALL (CAR |result|) |mvar| (|getShellEntry| $ 161))
- (SPADCALL (CDR |result|) |mvar| (|getShellEntry| $ 161)))))
+ (SPADCALL (SPADCALL |p1| |mvar| (|shellEntry| $ 59))
+ (SPADCALL |p2| |mvar| (|shellEntry| $ 59))
+ (|shellEntry| $ 191))))
+ (CONS (SPADCALL (CAR |result|) |mvar| (|shellEntry| $ 161))
+ (SPADCALL (CDR |result|) |mvar| (|shellEntry| $ 161)))))
(DEFUN |POLYCAT-;squareFree;SF;31| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 194)))
+ (SPADCALL |p| (|shellEntry| $ 194)))
(DEFUN |POLYCAT-;squareFree;SF;32| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 197)))
+ (SPADCALL |p| (|shellEntry| $ 197)))
(DEFUN |POLYCAT-;squareFree;SF;33| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 197)))
+ (SPADCALL |p| (|shellEntry| $ 197)))
(DEFUN |POLYCAT-;squareFreePart;2S;34| (|p| $)
(PROG (|s|)
(RETURN
(SPADCALL
(SPADCALL
- (LETT |s| (SPADCALL |p| (|getShellEntry| $ 198))
+ (LETT |s| (SPADCALL |p| (|shellEntry| $ 198))
|POLYCAT-;squareFreePart;2S;34|)
- (|getShellEntry| $ 199))
+ (|shellEntry| $ 199))
(LET ((#0=#:G1628 NIL) (#1=#:G1629 T)
- (#2=#:G1707 (SPADCALL |s| (|getShellEntry| $ 202))))
+ (#2=#:G1707 (SPADCALL |s| (|shellEntry| $ 202))))
(LOOP
(COND
((ATOM #2#)
@@ -1001,67 +992,66 @@
(#1# (SETQ #0# #3#))
(T (SETQ #0#
(SPADCALL #0# #3#
- (|getShellEntry| $ 182)))))
+ (|shellEntry| $ 182)))))
(SETQ #1# NIL)))))
(SETQ #2# (CDR #2#))))
- (|getShellEntry| $ 182)))))
+ (|shellEntry| $ 182)))))
(DEFUN |POLYCAT-;content;SVarSetS;35| (|p| |v| $)
- (SPADCALL (SPADCALL |p| |v| (|getShellEntry| $ 59))
- (|getShellEntry| $ 204)))
+ (SPADCALL (SPADCALL |p| |v| (|shellEntry| $ 59))
+ (|shellEntry| $ 204)))
(DEFUN |POLYCAT-;primitivePart;2S;36| (|p| $)
(SVREF (SPADCALL
(LET ((#0=#:G1633
(SPADCALL |p|
- (SPADCALL |p| (|getShellEntry| $ 206))
- (|getShellEntry| $ 207))))
+ (SPADCALL |p| (|shellEntry| $ 206))
+ (|shellEntry| $ 207))))
(|check-union| (ZEROP (CAR #0#)) (SVREF $ 6) #0#)
(CDR #0#))
- (|getShellEntry| $ 209))
+ (|shellEntry| $ 209))
1))
(DEFUN |POLYCAT-;primitivePart;SVarSetS;37| (|p| |v| $)
(SVREF (SPADCALL
(LET ((#0=#:G1639
(SPADCALL |p|
- (SPADCALL |p| |v| (|getShellEntry| $ 211))
- (|getShellEntry| $ 212))))
+ (SPADCALL |p| |v| (|shellEntry| $ 211))
+ (|shellEntry| $ 212))))
(|check-union| (ZEROP (CAR #0#)) (SVREF $ 6) #0#)
(CDR #0#))
- (|getShellEntry| $ 209))
+ (|shellEntry| $ 209))
1))
(DEFUN |POLYCAT-;before?;2SB;38| (|p| |q| $)
- (LET ((|dp| (SPADCALL |p| (|getShellEntry| $ 75)))
- (|dq| (SPADCALL |q| (|getShellEntry| $ 75))))
+ (LET ((|dp| (SPADCALL |p| (|shellEntry| $ 75)))
+ (|dq| (SPADCALL |q| (|shellEntry| $ 75))))
(COND
- ((SPADCALL |dp| |dq| (|getShellEntry| $ 214))
+ ((SPADCALL |dp| |dq| (|shellEntry| $ 214))
(SPADCALL (|spadConstant| $ 28)
- (SPADCALL |q| (|getShellEntry| $ 48))
- (|getShellEntry| $ 215)))
- ((SPADCALL |dq| |dp| (|getShellEntry| $ 214))
- (SPADCALL (SPADCALL |p| (|getShellEntry| $ 48))
- (|spadConstant| $ 28) (|getShellEntry| $ 215)))
+ (SPADCALL |q| (|shellEntry| $ 48)) (|shellEntry| $ 215)))
+ ((SPADCALL |dq| |dp| (|shellEntry| $ 214))
+ (SPADCALL (SPADCALL |p| (|shellEntry| $ 48))
+ (|spadConstant| $ 28) (|shellEntry| $ 215)))
(T (SPADCALL
- (SPADCALL (SPADCALL |p| |q| (|getShellEntry| $ 189))
- (|getShellEntry| $ 48))
- (|spadConstant| $ 28) (|getShellEntry| $ 215))))))
+ (SPADCALL (SPADCALL |p| |q| (|shellEntry| $ 189))
+ (|shellEntry| $ 48))
+ (|spadConstant| $ 28) (|shellEntry| $ 215))))))
(DEFUN |POLYCAT-;patternMatch;SP2Pmr;39| (|p| |pat| |l| $)
- (SPADCALL |p| |pat| |l| (|getShellEntry| $ 220)))
+ (SPADCALL |p| |pat| |l| (|shellEntry| $ 220)))
(DEFUN |POLYCAT-;patternMatch;SP2Pmr;40| (|p| |pat| |l| $)
- (SPADCALL |p| |pat| |l| (|getShellEntry| $ 227)))
+ (SPADCALL |p| |pat| |l| (|shellEntry| $ 227)))
(DEFUN |POLYCAT-;convert;SP;41| (|x| $)
- (SPADCALL (ELT $ 230) (ELT $ 231) |x| (|getShellEntry| $ 235)))
+ (SPADCALL (ELT $ 230) (ELT $ 231) |x| (|shellEntry| $ 235)))
(DEFUN |POLYCAT-;convert;SP;42| (|x| $)
- (SPADCALL (ELT $ 237) (ELT $ 238) |x| (|getShellEntry| $ 242)))
+ (SPADCALL (ELT $ 237) (ELT $ 238) |x| (|shellEntry| $ 242)))
(DEFUN |POLYCAT-;convert;SIf;43| (|p| $)
- (SPADCALL (ELT $ 245) (ELT $ 246) |p| (|getShellEntry| $ 250)))
+ (SPADCALL (ELT $ 245) (ELT $ 246) |p| (|shellEntry| $ 250)))
(DEFUN |PolynomialCategory&| (|#1| |#2| |#3| |#4|)
(LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|))
diff --git a/src/algebra/strap/QFCAT-.lsp b/src/algebra/strap/QFCAT-.lsp
index 33c7bf71..844c206c 100644
--- a/src/algebra/strap/QFCAT-.lsp
+++ b/src/algebra/strap/QFCAT-.lsp
@@ -83,173 +83,154 @@
|QFCAT-;reducedSystem;MVR;27|))
(DEFUN |QFCAT-;numerator;2A;1| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 8)) (|getShellEntry| $ 9)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 8)) (|shellEntry| $ 9)))
(DEFUN |QFCAT-;denominator;2A;2| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 11))
- (|getShellEntry| $ 9)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 11)) (|shellEntry| $ 9)))
(DEFUN |QFCAT-;init;A;3| ($)
(SPADCALL (|spadConstant| $ 13) (|spadConstant| $ 14)
- (|getShellEntry| $ 15)))
+ (|shellEntry| $ 15)))
(DEFUN |QFCAT-;nextItem;AU;4| (|n| $)
- (LET ((|m| (SPADCALL (SPADCALL |n| (|getShellEntry| $ 8))
- (|getShellEntry| $ 18))))
+ (LET ((|m| (SPADCALL (SPADCALL |n| (|shellEntry| $ 8))
+ (|shellEntry| $ 18))))
(COND
((EQL (CAR |m|) 1)
(|error| "We seem to have a Fraction of a finite object"))
(T (CONS 0
(SPADCALL (CDR |m|) (|spadConstant| $ 14)
- (|getShellEntry| $ 15)))))))
+ (|shellEntry| $ 15)))))))
(DEFUN |QFCAT-;map;M2A;5| (|fn| |x| $)
- (SPADCALL (SPADCALL (SPADCALL |x| (|getShellEntry| $ 8)) |fn|)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 11)) |fn|)
- (|getShellEntry| $ 15)))
+ (SPADCALL (SPADCALL (SPADCALL |x| (|shellEntry| $ 8)) |fn|)
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 11)) |fn|)
+ (|shellEntry| $ 15)))
(DEFUN |QFCAT-;reducedSystem;MM;6| (|m| $)
- (SPADCALL |m| (|getShellEntry| $ 26)))
+ (SPADCALL |m| (|shellEntry| $ 26)))
(DEFUN |QFCAT-;characteristic;Nni;7| ($) (|spadConstant| $ 30))
(DEFUN |QFCAT-;differentiate;AMA;8| (|x| |deriv| $)
- (LET ((|n| (SPADCALL |x| (|getShellEntry| $ 8)))
- (|d| (SPADCALL |x| (|getShellEntry| $ 11))))
+ (LET ((|n| (SPADCALL |x| (|shellEntry| $ 8)))
+ (|d| (SPADCALL |x| (|shellEntry| $ 11))))
(SPADCALL
(SPADCALL
- (SPADCALL (SPADCALL |n| |deriv|) |d|
- (|getShellEntry| $ 32))
- (SPADCALL |n| (SPADCALL |d| |deriv|)
- (|getShellEntry| $ 32))
- (|getShellEntry| $ 33))
- (SPADCALL |d| 2 (|getShellEntry| $ 35)) (|getShellEntry| $ 15))))
+ (SPADCALL (SPADCALL |n| |deriv|) |d| (|shellEntry| $ 32))
+ (SPADCALL |n| (SPADCALL |d| |deriv|) (|shellEntry| $ 32))
+ (|shellEntry| $ 33))
+ (SPADCALL |d| 2 (|shellEntry| $ 35)) (|shellEntry| $ 15))))
(DEFUN |QFCAT-;convert;AIf;9| (|x| $)
(SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 8))
- (|getShellEntry| $ 38))
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 11))
- (|getShellEntry| $ 38))
- (|getShellEntry| $ 39)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 8)) (|shellEntry| $ 38))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 11)) (|shellEntry| $ 38))
+ (|shellEntry| $ 39)))
(DEFUN |QFCAT-;convert;AF;10| (|x| $)
(SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 8))
- (|getShellEntry| $ 42))
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 11))
- (|getShellEntry| $ 42))
- (|getShellEntry| $ 43)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 8)) (|shellEntry| $ 42))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 11)) (|shellEntry| $ 42))
+ (|shellEntry| $ 43)))
(DEFUN |QFCAT-;convert;ADf;11| (|x| $)
- (/ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 8))
- (|getShellEntry| $ 46))
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 11))
- (|getShellEntry| $ 46))))
+ (/ (SPADCALL (SPADCALL |x| (|shellEntry| $ 8)) (|shellEntry| $ 46))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 11)) (|shellEntry| $ 46))))
(DEFUN |QFCAT-;<;2AB;12| (|x| |y| $)
(SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 8))
- (SPADCALL |y| (|getShellEntry| $ 11)) (|getShellEntry| $ 32))
- (SPADCALL (SPADCALL |y| (|getShellEntry| $ 8))
- (SPADCALL |x| (|getShellEntry| $ 11)) (|getShellEntry| $ 32))
- (|getShellEntry| $ 50)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 8))
+ (SPADCALL |y| (|shellEntry| $ 11)) (|shellEntry| $ 32))
+ (SPADCALL (SPADCALL |y| (|shellEntry| $ 8))
+ (SPADCALL |x| (|shellEntry| $ 11)) (|shellEntry| $ 32))
+ (|shellEntry| $ 50)))
(DEFUN |QFCAT-;<;2AB;13| (|x| |y| $)
(PROG (|#G19| |#G20| |#G21| |#G22|)
(RETURN
(SEQ (COND
- ((SPADCALL (SPADCALL |x| (|getShellEntry| $ 11))
- (|spadConstant| $ 52) (|getShellEntry| $ 50))
+ ((SPADCALL (SPADCALL |x| (|shellEntry| $ 11))
+ (|spadConstant| $ 52) (|shellEntry| $ 50))
(PROGN
(LETT |#G19| |y| |QFCAT-;<;2AB;13|)
(LETT |#G20| |x| |QFCAT-;<;2AB;13|)
(SETQ |x| |#G19|)
(SETQ |y| |#G20|))))
(COND
- ((SPADCALL (SPADCALL |y| (|getShellEntry| $ 11))
- (|spadConstant| $ 52) (|getShellEntry| $ 50))
+ ((SPADCALL (SPADCALL |y| (|shellEntry| $ 11))
+ (|spadConstant| $ 52) (|shellEntry| $ 50))
(PROGN
(LETT |#G21| |y| |QFCAT-;<;2AB;13|)
(LETT |#G22| |x| |QFCAT-;<;2AB;13|)
(SETQ |x| |#G21|)
(SETQ |y| |#G22|))))
(EXIT (SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 8))
- (SPADCALL |y| (|getShellEntry| $ 11))
- (|getShellEntry| $ 32))
- (SPADCALL (SPADCALL |y| (|getShellEntry| $ 8))
- (SPADCALL |x| (|getShellEntry| $ 11))
- (|getShellEntry| $ 32))
- (|getShellEntry| $ 50)))))))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 8))
+ (SPADCALL |y| (|shellEntry| $ 11))
+ (|shellEntry| $ 32))
+ (SPADCALL (SPADCALL |y| (|shellEntry| $ 8))
+ (SPADCALL |x| (|shellEntry| $ 11))
+ (|shellEntry| $ 32))
+ (|shellEntry| $ 50)))))))
(DEFUN |QFCAT-;<;2AB;14| (|x| |y| $)
(SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 8))
- (SPADCALL |y| (|getShellEntry| $ 11)) (|getShellEntry| $ 32))
- (SPADCALL (SPADCALL |y| (|getShellEntry| $ 8))
- (SPADCALL |x| (|getShellEntry| $ 11)) (|getShellEntry| $ 32))
- (|getShellEntry| $ 50)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 8))
+ (SPADCALL |y| (|shellEntry| $ 11)) (|shellEntry| $ 32))
+ (SPADCALL (SPADCALL |y| (|shellEntry| $ 8))
+ (SPADCALL |x| (|shellEntry| $ 11)) (|shellEntry| $ 32))
+ (|shellEntry| $ 50)))
(DEFUN |QFCAT-;fractionPart;2A;15| (|x| $)
(SPADCALL |x|
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 53))
- (|getShellEntry| $ 9))
- (|getShellEntry| $ 54)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 53)) (|shellEntry| $ 9))
+ (|shellEntry| $ 54)))
(DEFUN |QFCAT-;coerce;SA;16| (|s| $)
- (SPADCALL (SPADCALL |s| (|getShellEntry| $ 57))
- (|getShellEntry| $ 9)))
+ (SPADCALL (SPADCALL |s| (|shellEntry| $ 57)) (|shellEntry| $ 9)))
(DEFUN |QFCAT-;retract;AS;17| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 59))
- (|getShellEntry| $ 60)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 59)) (|shellEntry| $ 60)))
(DEFUN |QFCAT-;retractIfCan;AU;18| (|x| $)
- (LET ((|r| (SPADCALL |x| (|getShellEntry| $ 63))))
+ (LET ((|r| (SPADCALL |x| (|shellEntry| $ 63))))
(COND
((EQL (CAR |r|) 1) (CONS 1 "failed"))
- (T (SPADCALL (CDR |r|) (|getShellEntry| $ 65))))))
+ (T (SPADCALL (CDR |r|) (|shellEntry| $ 65))))))
(DEFUN |QFCAT-;convert;AP;19| (|x| $)
(SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 8))
- (|getShellEntry| $ 69))
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 11))
- (|getShellEntry| $ 69))
- (|getShellEntry| $ 70)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 8)) (|shellEntry| $ 69))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 11)) (|shellEntry| $ 69))
+ (|shellEntry| $ 70)))
(DEFUN |QFCAT-;patternMatch;AP2Pmr;20| (|x| |p| |l| $)
- (SPADCALL |x| |p| |l| (|getShellEntry| $ 74)))
+ (SPADCALL |x| |p| |l| (|shellEntry| $ 74)))
(DEFUN |QFCAT-;convert;AP;21| (|x| $)
(SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 8))
- (|getShellEntry| $ 78))
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 11))
- (|getShellEntry| $ 78))
- (|getShellEntry| $ 79)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 8)) (|shellEntry| $ 78))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 11)) (|shellEntry| $ 78))
+ (|shellEntry| $ 79)))
(DEFUN |QFCAT-;patternMatch;AP2Pmr;22| (|x| |p| |l| $)
- (SPADCALL |x| |p| |l| (|getShellEntry| $ 83)))
+ (SPADCALL |x| |p| |l| (|shellEntry| $ 83)))
(DEFUN |QFCAT-;coerce;FA;23| (|x| $)
(SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 87))
- (|getShellEntry| $ 88))
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 89))
- (|getShellEntry| $ 88))
- (|getShellEntry| $ 90)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 87)) (|shellEntry| $ 88))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 89)) (|shellEntry| $ 88))
+ (|shellEntry| $ 90)))
(DEFUN |QFCAT-;retract;AI;24| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 59))
- (|getShellEntry| $ 92)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 59)) (|shellEntry| $ 92)))
(DEFUN |QFCAT-;retractIfCan;AU;25| (|x| $)
- (LET ((|u| (SPADCALL |x| (|getShellEntry| $ 63))))
+ (LET ((|u| (SPADCALL |x| (|shellEntry| $ 63))))
(COND
((EQL (CAR |u|) 1) (CONS 1 "failed"))
- (T (SPADCALL (CDR |u|) (|getShellEntry| $ 95))))))
+ (T (SPADCALL (CDR |u|) (|shellEntry| $ 95))))))
(DEFUN |QFCAT-;random;A;26| ($)
(PROG (|d|)
@@ -257,26 +238,25 @@
(SEQ (LOOP
(COND
((NOT (SPADCALL
- (LETT |d| (SPADCALL (|getShellEntry| $ 97))
+ (LETT |d| (SPADCALL (|shellEntry| $ 97))
|QFCAT-;random;A;26|)
- (|getShellEntry| $ 98)))
+ (|shellEntry| $ 98)))
(RETURN NIL))
(T |d|)))
- (EXIT (SPADCALL (SPADCALL (|getShellEntry| $ 97)) |d|
- (|getShellEntry| $ 15)))))))
+ (EXIT (SPADCALL (SPADCALL (|shellEntry| $ 97)) |d|
+ (|shellEntry| $ 15)))))))
(DEFUN |QFCAT-;reducedSystem;MVR;27| (|m| |v| $)
(LET ((|n| (SPADCALL
- (SPADCALL (SPADCALL |v| (|getShellEntry| $ 101)) |m|
- (|getShellEntry| $ 102))
- (|getShellEntry| $ 103))))
- (CONS (SPADCALL |n| (SPADCALL |n| (|getShellEntry| $ 104))
- (SPADCALL |n| (|getShellEntry| $ 105))
- (+ 1 (SPADCALL |n| (|getShellEntry| $ 107)))
- (SPADCALL |n| (|getShellEntry| $ 109))
- (|getShellEntry| $ 110))
- (SPADCALL |n| (SPADCALL |n| (|getShellEntry| $ 107))
- (|getShellEntry| $ 112)))))
+ (SPADCALL (SPADCALL |v| (|shellEntry| $ 101)) |m|
+ (|shellEntry| $ 102))
+ (|shellEntry| $ 103))))
+ (CONS (SPADCALL |n| (SPADCALL |n| (|shellEntry| $ 104))
+ (SPADCALL |n| (|shellEntry| $ 105))
+ (+ 1 (SPADCALL |n| (|shellEntry| $ 107)))
+ (SPADCALL |n| (|shellEntry| $ 109)) (|shellEntry| $ 110))
+ (SPADCALL |n| (SPADCALL |n| (|shellEntry| $ 107))
+ (|shellEntry| $ 112)))))
(DEFUN |QuotientFieldCategory&| (|#1| |#2|)
(LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|))
diff --git a/src/algebra/strap/RCAGG-.lsp b/src/algebra/strap/RCAGG-.lsp
index fb482a14..5bdb2577 100644
--- a/src/algebra/strap/RCAGG-.lsp
+++ b/src/algebra/strap/RCAGG-.lsp
@@ -12,14 +12,13 @@
|RCAGG-;child?;2AB;3|))
(DEFUN |RCAGG-;elt;AvalueS;1| (|x| T0 $)
- (SPADCALL |x| (|getShellEntry| $ 8)))
+ (SPADCALL |x| (|shellEntry| $ 8)))
(DEFUN |RCAGG-;setelt;Avalue2S;2| (|x| T1 |y| $)
- (SPADCALL |x| |y| (|getShellEntry| $ 11)))
+ (SPADCALL |x| |y| (|shellEntry| $ 11)))
(DEFUN |RCAGG-;child?;2AB;3| (|x| |l| $)
- (SPADCALL |x| (SPADCALL |l| (|getShellEntry| $ 14))
- (|getShellEntry| $ 17)))
+ (SPADCALL |x| (SPADCALL |l| (|shellEntry| $ 14)) (|shellEntry| $ 17)))
(DEFUN |RecursiveAggregate&| (|#1| |#2|)
(LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|))
diff --git a/src/algebra/strap/RING-.lsp b/src/algebra/strap/RING-.lsp
index 0d9d5bb1..dac04c20 100644
--- a/src/algebra/strap/RING-.lsp
+++ b/src/algebra/strap/RING-.lsp
@@ -5,7 +5,7 @@
|RING-;coerce;IS;1|))
(DEFUN |RING-;coerce;IS;1| (|n| $)
- (SPADCALL |n| (|spadConstant| $ 7) (|getShellEntry| $ 9)))
+ (SPADCALL |n| (|spadConstant| $ 7) (|shellEntry| $ 9)))
(DEFUN |Ring&| (|#1|)
(LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|Ring&| |dv$1|))
diff --git a/src/algebra/strap/RNS-.lsp b/src/algebra/strap/RNS-.lsp
index 4db9f921..8888a730 100644
--- a/src/algebra/strap/RNS-.lsp
+++ b/src/algebra/strap/RNS-.lsp
@@ -37,83 +37,78 @@
(DEFUN |RNS-;characteristic;Nni;1| ($) (DECLARE (IGNORE $)) 0)
(DEFUN |RNS-;fractionPart;2S;2| (|x| $)
- (SPADCALL |x| (SPADCALL |x| (|getShellEntry| $ 10))
- (|getShellEntry| $ 11)))
+ (SPADCALL |x| (SPADCALL |x| (|shellEntry| $ 10)) (|shellEntry| $ 11)))
(DEFUN |RNS-;truncate;2S;3| (|x| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 14))
+ ((SPADCALL |x| (|shellEntry| $ 14))
(SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 15))
- (|getShellEntry| $ 16))
- (|getShellEntry| $ 15)))
- (T (SPADCALL |x| (|getShellEntry| $ 16)))))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 15))
+ (|shellEntry| $ 16))
+ (|shellEntry| $ 15)))
+ (T (SPADCALL |x| (|shellEntry| $ 16)))))
(DEFUN |RNS-;round;2S;4| (|x| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 14))
+ ((SPADCALL |x| (|shellEntry| $ 14))
(SPADCALL
(SPADCALL |x|
(SPADCALL (|spadConstant| $ 18)
- (SPADCALL 2 (|getShellEntry| $ 20))
- (|getShellEntry| $ 21))
- (|getShellEntry| $ 11))
- (|getShellEntry| $ 10)))
+ (SPADCALL 2 (|shellEntry| $ 20)) (|shellEntry| $ 21))
+ (|shellEntry| $ 11))
+ (|shellEntry| $ 10)))
(T (SPADCALL
(SPADCALL |x|
(SPADCALL (|spadConstant| $ 18)
- (SPADCALL 2 (|getShellEntry| $ 20))
- (|getShellEntry| $ 21))
- (|getShellEntry| $ 24))
- (|getShellEntry| $ 10)))))
+ (SPADCALL 2 (|shellEntry| $ 20))
+ (|shellEntry| $ 21))
+ (|shellEntry| $ 24))
+ (|shellEntry| $ 10)))))
-(DEFUN |RNS-;norm;2S;5| (|x| $) (SPADCALL |x| (|getShellEntry| $ 26)))
+(DEFUN |RNS-;norm;2S;5| (|x| $) (SPADCALL |x| (|shellEntry| $ 26)))
(DEFUN |RNS-;coerce;FS;6| (|x| $)
(SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 29))
- (|getShellEntry| $ 20))
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30))
- (|getShellEntry| $ 20))
- (|getShellEntry| $ 21)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 29)) (|shellEntry| $ 20))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 30)) (|shellEntry| $ 20))
+ (|shellEntry| $ 21)))
(DEFUN |RNS-;convert;SP;7| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 33))
- (|getShellEntry| $ 35)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 33)) (|shellEntry| $ 35)))
(DEFUN |RNS-;floor;2S;8| (|x| $)
- (LET ((|x1| (SPADCALL (SPADCALL |x| (|getShellEntry| $ 37))
- (|getShellEntry| $ 20))))
+ (LET ((|x1| (SPADCALL (SPADCALL |x| (|shellEntry| $ 37))
+ (|shellEntry| $ 20))))
(COND
- ((SPADCALL |x| |x1| (|getShellEntry| $ 38)) |x|)
- ((SPADCALL |x| (|spadConstant| $ 39) (|getShellEntry| $ 41))
- (SPADCALL |x1| (|spadConstant| $ 18) (|getShellEntry| $ 11)))
+ ((SPADCALL |x| |x1| (|shellEntry| $ 38)) |x|)
+ ((SPADCALL |x| (|spadConstant| $ 39) (|shellEntry| $ 41))
+ (SPADCALL |x1| (|spadConstant| $ 18) (|shellEntry| $ 11)))
(T |x1|))))
(DEFUN |RNS-;ceiling;2S;9| (|x| $)
- (LET ((|x1| (SPADCALL (SPADCALL |x| (|getShellEntry| $ 37))
- (|getShellEntry| $ 20))))
+ (LET ((|x1| (SPADCALL (SPADCALL |x| (|shellEntry| $ 37))
+ (|shellEntry| $ 20))))
(COND
- ((SPADCALL |x| |x1| (|getShellEntry| $ 38)) |x|)
- ((SPADCALL |x| (|spadConstant| $ 39) (|getShellEntry| $ 44))
- (SPADCALL |x1| (|spadConstant| $ 18) (|getShellEntry| $ 24)))
+ ((SPADCALL |x| |x1| (|shellEntry| $ 38)) |x|)
+ ((SPADCALL |x| (|spadConstant| $ 39) (|shellEntry| $ 44))
+ (SPADCALL |x1| (|spadConstant| $ 18) (|shellEntry| $ 24)))
(T |x1|))))
(DEFUN |RNS-;patternMatch;SP2Pmr;10| (|x| |p| |l| $)
(COND
- ((SPADCALL |p| (|getShellEntry| $ 46))
- (SPADCALL |p| |x| |l| (|getShellEntry| $ 48)))
- ((SPADCALL |p| (|getShellEntry| $ 49))
- (LET ((|r| (SPADCALL |p| (|getShellEntry| $ 51))))
+ ((SPADCALL |p| (|shellEntry| $ 46))
+ (SPADCALL |p| |x| |l| (|shellEntry| $ 48)))
+ ((SPADCALL |p| (|shellEntry| $ 49))
+ (LET ((|r| (SPADCALL |p| (|shellEntry| $ 51))))
(COND
((ZEROP (CAR |r|))
(COND
- ((SPADCALL (SPADCALL |x| (|getShellEntry| $ 33)) (CDR |r|)
- (|getShellEntry| $ 52))
+ ((SPADCALL (SPADCALL |x| (|shellEntry| $ 33)) (CDR |r|)
+ (|shellEntry| $ 52))
|l|)
- (T (SPADCALL (|getShellEntry| $ 53)))))
- (T (SPADCALL (|getShellEntry| $ 53))))))
- (T (SPADCALL (|getShellEntry| $ 53)))))
+ (T (SPADCALL (|shellEntry| $ 53)))))
+ (T (SPADCALL (|shellEntry| $ 53))))))
+ (T (SPADCALL (|shellEntry| $ 53)))))
(DEFUN |RealNumberSystem&| (|#1|)
(LET* ((|dv$1| (|devaluate| |#1|))
diff --git a/src/algebra/strap/SETAGG-.lsp b/src/algebra/strap/SETAGG-.lsp
index 23a77815..18c5bc2b 100644
--- a/src/algebra/strap/SETAGG-.lsp
+++ b/src/algebra/strap/SETAGG-.lsp
@@ -14,20 +14,20 @@
|SETAGG-;difference;ASA;4|))
(DEFUN |SETAGG-;symmetricDifference;3A;1| (|x| |y| $)
- (SPADCALL (SPADCALL |x| |y| (|getShellEntry| $ 8))
- (SPADCALL |y| |x| (|getShellEntry| $ 8)) (|getShellEntry| $ 9)))
+ (SPADCALL (SPADCALL |x| |y| (|shellEntry| $ 8))
+ (SPADCALL |y| |x| (|shellEntry| $ 8)) (|shellEntry| $ 9)))
(DEFUN |SETAGG-;union;ASA;2| (|s| |x| $)
- (SPADCALL |s| (SPADCALL (LIST |x|) (|getShellEntry| $ 12))
- (|getShellEntry| $ 9)))
+ (SPADCALL |s| (SPADCALL (LIST |x|) (|shellEntry| $ 12))
+ (|shellEntry| $ 9)))
(DEFUN |SETAGG-;union;S2A;3| (|x| |s| $)
- (SPADCALL |s| (SPADCALL (LIST |x|) (|getShellEntry| $ 12))
- (|getShellEntry| $ 9)))
+ (SPADCALL |s| (SPADCALL (LIST |x|) (|shellEntry| $ 12))
+ (|shellEntry| $ 9)))
(DEFUN |SETAGG-;difference;ASA;4| (|s| |x| $)
- (SPADCALL |s| (SPADCALL (LIST |x|) (|getShellEntry| $ 12))
- (|getShellEntry| $ 8)))
+ (SPADCALL |s| (SPADCALL (LIST |x|) (|shellEntry| $ 12))
+ (|shellEntry| $ 8)))
(DEFUN |SetAggregate&| (|#1| |#2|)
(LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|))
diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp
index 2c1ddab4..683dbae2 100644
--- a/src/algebra/strap/SINT.lsp
+++ b/src/algebra/strap/SINT.lsp
@@ -293,52 +293,50 @@
(DEFUN |SINT;writeOMSingleInt| (|dev| |x| $)
(COND
((MINUSP |x|)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 11))
- (SPADCALL |dev| "arith1" "unaryminus" (|getShellEntry| $ 13))
- (SPADCALL |dev| (- |x|) (|getShellEntry| $ 16))
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 17)))))
- (T (SPADCALL |dev| |x| (|getShellEntry| $ 16)))))
+ (SEQ (SPADCALL |dev| (|shellEntry| $ 11))
+ (SPADCALL |dev| "arith1" "unaryminus" (|shellEntry| $ 13))
+ (SPADCALL |dev| (- |x|) (|shellEntry| $ 16))
+ (EXIT (SPADCALL |dev| (|shellEntry| $ 17)))))
+ (T (SPADCALL |dev| |x| (|shellEntry| $ 16)))))
(DEFUN |SINT;OMwrite;$S;2| (|x| $)
(LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
- (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 19))
- (|getShellEntry| $ 20))))
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 21))
+ (|dev| (SPADCALL |sp| (SPADCALL (|shellEntry| $ 19))
+ (|shellEntry| $ 20))))
+ (SEQ (SPADCALL |dev| (|shellEntry| $ 21))
(|SINT;writeOMSingleInt| |dev| |x| $)
- (SPADCALL |dev| (|getShellEntry| $ 22))
- (SPADCALL |dev| (|getShellEntry| $ 23))
+ (SPADCALL |dev| (|shellEntry| $ 22))
+ (SPADCALL |dev| (|shellEntry| $ 23))
(SETQ |s| (OM-STRINGPTRTOSTRING |sp|)) (EXIT |s|))))
(DEFUN |SINT;OMwrite;$BS;3| (|x| |wholeObj| $)
(LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
- (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 19))
- (|getShellEntry| $ 20))))
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 21))))
+ (|dev| (SPADCALL |sp| (SPADCALL (|shellEntry| $ 19))
+ (|shellEntry| $ 20))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 21))))
(|SINT;writeOMSingleInt| |dev| |x| $)
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 22))))
- (SPADCALL |dev| (|getShellEntry| $ 23))
+ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 22))))
+ (SPADCALL |dev| (|shellEntry| $ 23))
(SETQ |s| (OM-STRINGPTRTOSTRING |sp|)) (EXIT |s|))))
(DEFUN |SINT;OMwrite;Omd$V;4| (|dev| |x| $)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 21))
+ (SEQ (SPADCALL |dev| (|shellEntry| $ 21))
(|SINT;writeOMSingleInt| |dev| |x| $)
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 22)))))
+ (EXIT (SPADCALL |dev| (|shellEntry| $ 22)))))
(DEFUN |SINT;OMwrite;Omd$BV;5| (|dev| |x| |wholeObj| $)
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 21))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 21))))
(|SINT;writeOMSingleInt| |dev| |x| $)
- (EXIT (COND
- (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 22)))))))
+ (EXIT (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 22)))))))
(DEFUN |SINT;reducedSystem;MM;6| (|m| $) (DECLARE (IGNORE $)) |m|)
-(DEFUN |SINT;coerce;$Of;7| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 32)))
+(DEFUN |SINT;coerce;$Of;7| (|x| $) (SPADCALL |x| (|shellEntry| $ 32)))
(DEFUN |SINT;convert;$I;8| (|x| $) (DECLARE (IGNORE $)) |x|)
(DEFUN |SINT;*;I2$;9| (|i| |y| $)
- (* (SPADCALL |i| (|getShellEntry| $ 34)) |y|))
+ (* (SPADCALL |i| (|shellEntry| $ 34)) |y|))
(DEFUN |SINT;Zero;$;10| ($) (DECLARE (IGNORE $)) 0)
@@ -411,7 +409,7 @@
(DEFUN |SINT;*;3$;35| (|x| |y| $) (DECLARE (IGNORE $)) (* |x| |y|))
(DEFUN |SINT;**;$Nni$;36| (|x| |n| $)
- (SPADCALL (EXPT |x| |n|) (|getShellEntry| $ 34)))
+ (SPADCALL (EXPT |x| |n|) (|shellEntry| $ 34)))
(DEFUN |SINT;quo;3$;37| (|x| |y| $)
(DECLARE (IGNORE $))
diff --git a/src/algebra/strap/STAGG-.lsp b/src/algebra/strap/STAGG-.lsp
index be3c7a7b..15f0a80f 100644
--- a/src/algebra/strap/STAGG-.lsp
+++ b/src/algebra/strap/STAGG-.lsp
@@ -44,10 +44,10 @@
|STAGG-;concat!;3A;13|))
(DEFUN |STAGG-;explicitlyFinite?;AB;1| (|x| $)
- (NOT (SPADCALL |x| (|getShellEntry| $ 9))))
+ (NOT (SPADCALL |x| (|shellEntry| $ 9))))
(DEFUN |STAGG-;possiblyInfinite?;AB;2| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 9)))
+ (SPADCALL |x| (|shellEntry| $ 9)))
(DEFUN |STAGG-;first;ANniA;3| (|x| |n| $)
(SPADCALL
@@ -58,21 +58,19 @@
(T (SETQ #0#
(CONS (|STAGG-;c2| |x|
(SETQ |x|
- (SPADCALL |x|
- (|getShellEntry| $ 13)))
+ (SPADCALL |x| (|shellEntry| $ 13)))
$)
#0#))))
(SETQ |i| (+ |i| 1))))
- (|getShellEntry| $ 15)))
+ (|shellEntry| $ 15)))
(DEFUN |STAGG-;c2| (|x| |r| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 18))
- (|error| "Index out of range"))
- (T (SPADCALL |x| (|getShellEntry| $ 19)))))
+ ((SPADCALL |x| (|shellEntry| $ 18)) (|error| "Index out of range"))
+ (T (SPADCALL |x| (|shellEntry| $ 19)))))
(DEFUN |STAGG-;elt;AIS;5| (|x| |i| $)
- (SEQ (SETQ |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 21))))
+ (SEQ (SETQ |i| (- |i| (SPADCALL |x| (|shellEntry| $ 21))))
(EXIT (COND
((OR (MINUSP |i|)
(SPADCALL
@@ -80,81 +78,80 @@
(SPADCALL |x|
(|check-subtype| (NOT (MINUSP |i|))
'(|NonNegativeInteger|) |i|)
- (|getShellEntry| $ 25)))
- (|getShellEntry| $ 18)))
+ (|shellEntry| $ 25)))
+ (|shellEntry| $ 18)))
(|error| "index out of range"))
- (T (SPADCALL |x| (|getShellEntry| $ 19)))))))
+ (T (SPADCALL |x| (|shellEntry| $ 19)))))))
(DEFUN |STAGG-;elt;AUsA;6| (|x| |i| $)
(PROG (|h|)
(RETURN
- (LET ((|l| (- (SPADCALL |i| (|getShellEntry| $ 28))
- (SPADCALL |x| (|getShellEntry| $ 21)))))
+ (LET ((|l| (- (SPADCALL |i| (|shellEntry| $ 28))
+ (SPADCALL |x| (|shellEntry| $ 21)))))
(COND
((MINUSP |l|) (|error| "index out of range"))
- ((NOT (SPADCALL |i| (|getShellEntry| $ 29)))
+ ((NOT (SPADCALL |i| (|shellEntry| $ 29)))
(SPADCALL
(SPADCALL |x|
(|check-subtype| (NOT (MINUSP |l|))
'(|NonNegativeInteger|) |l|)
- (|getShellEntry| $ 25))
- (|getShellEntry| $ 30)))
+ (|shellEntry| $ 25))
+ (|shellEntry| $ 30)))
(T (SEQ (LETT |h|
- (- (SPADCALL |i| (|getShellEntry| $ 31))
- (SPADCALL |x| (|getShellEntry| $ 21)))
+ (- (SPADCALL |i| (|shellEntry| $ 31))
+ (SPADCALL |x| (|shellEntry| $ 21)))
|STAGG-;elt;AUsA;6|)
(EXIT (COND
- ((< |h| |l|)
- (SPADCALL (|getShellEntry| $ 32)))
- (T (SPADCALL
- (SPADCALL |x|
- (|check-subtype|
- (NOT (MINUSP |l|))
- '(|NonNegativeInteger|) |l|)
- (|getShellEntry| $ 25))
- (LET ((#0=#:G1395 (+ (- |h| |l|) 1)))
- (|check-subtype| (NOT (MINUSP #0#))
- '(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 35))))))))))))
+ ((< |h| |l|) (SPADCALL (|shellEntry| $ 32)))
+ (T (SPADCALL (SPADCALL |x|
+ (|check-subtype|
+ (NOT (MINUSP |l|))
+ '(|NonNegativeInteger|) |l|)
+ (|shellEntry| $ 25))
+ (LET
+ ((#0=#:G1395 (+ (- |h| |l|) 1)))
+ (|check-subtype|
+ (NOT (MINUSP #0#))
+ '(|NonNegativeInteger|) #0#))
+ (|shellEntry| $ 35))))))))))))
(DEFUN |STAGG-;concat;3A;7| (|x| |y| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30)) |y|
- (|getShellEntry| $ 37)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 30)) |y| (|shellEntry| $ 37)))
(DEFUN |STAGG-;concat;LA;8| (|l| $)
(COND
- ((NULL |l|) (SPADCALL (|getShellEntry| $ 32)))
- (T (SPADCALL (SPADCALL (|SPADfirst| |l|) (|getShellEntry| $ 30))
- (SPADCALL (CDR |l|) (|getShellEntry| $ 44))
- (|getShellEntry| $ 37)))))
+ ((NULL |l|) (SPADCALL (|shellEntry| $ 32)))
+ (T (SPADCALL (SPADCALL (|SPADfirst| |l|) (|shellEntry| $ 30))
+ (SPADCALL (CDR |l|) (|shellEntry| $ 44))
+ (|shellEntry| $ 37)))))
(DEFUN |STAGG-;map!;M2A;9| (|f| |l| $)
(LET ((|y| |l|))
(SEQ (LOOP
(COND
- ((NOT (NOT (SPADCALL |l| (|getShellEntry| $ 18))))
+ ((NOT (NOT (SPADCALL |l| (|shellEntry| $ 18))))
(RETURN NIL))
(T (SEQ (SPADCALL |l|
- (SPADCALL
- (SPADCALL |l| (|getShellEntry| $ 19)) |f|)
- (|getShellEntry| $ 46))
+ (SPADCALL (SPADCALL |l| (|shellEntry| $ 19))
+ |f|)
+ (|shellEntry| $ 46))
(EXIT (SETQ |l|
- (SPADCALL |l| (|getShellEntry| $ 13))))))))
+ (SPADCALL |l| (|shellEntry| $ 13))))))))
(EXIT |y|))))
(DEFUN |STAGG-;fill!;ASA;10| (|x| |s| $)
(LET ((|y| |x|))
(SEQ (LOOP
(COND
- ((NOT (NOT (SPADCALL |y| (|getShellEntry| $ 18))))
+ ((NOT (NOT (SPADCALL |y| (|shellEntry| $ 18))))
(RETURN NIL))
- (T (SEQ (SPADCALL |y| |s| (|getShellEntry| $ 46))
+ (T (SEQ (SPADCALL |y| |s| (|shellEntry| $ 46))
(EXIT (SETQ |y|
- (SPADCALL |y| (|getShellEntry| $ 13))))))))
+ (SPADCALL |y| (|shellEntry| $ 13))))))))
(EXIT |x|))))
(DEFUN |STAGG-;setelt;AI2S;11| (|x| |i| |s| $)
- (SEQ (SETQ |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 21))))
+ (SEQ (SETQ |i| (- |i| (SPADCALL |x| (|shellEntry| $ 21))))
(EXIT (COND
((OR (MINUSP |i|)
(SPADCALL
@@ -162,24 +159,24 @@
(SPADCALL |x|
(|check-subtype| (NOT (MINUSP |i|))
'(|NonNegativeInteger|) |i|)
- (|getShellEntry| $ 25)))
- (|getShellEntry| $ 18)))
+ (|shellEntry| $ 25)))
+ (|shellEntry| $ 18)))
(|error| "index out of range"))
- (T (SPADCALL |x| |s| (|getShellEntry| $ 46)))))))
+ (T (SPADCALL |x| |s| (|shellEntry| $ 46)))))))
(DEFUN |STAGG-;setelt;AUs2S;12| (|x| |i| |s| $)
(PROG (|h| |y| |z|)
(RETURN
- (LET ((|l| (- (SPADCALL |i| (|getShellEntry| $ 28))
- (SPADCALL |x| (|getShellEntry| $ 21)))))
+ (LET ((|l| (- (SPADCALL |i| (|shellEntry| $ 28))
+ (SPADCALL |x| (|shellEntry| $ 21)))))
(COND
((MINUSP |l|) (|error| "index out of range"))
(T (SEQ (LETT |h|
(COND
- ((SPADCALL |i| (|getShellEntry| $ 29))
- (- (SPADCALL |i| (|getShellEntry| $ 31))
- (SPADCALL |x| (|getShellEntry| $ 21))))
- (T (SPADCALL |x| (|getShellEntry| $ 51))))
+ ((SPADCALL |i| (|shellEntry| $ 29))
+ (- (SPADCALL |i| (|shellEntry| $ 31))
+ (SPADCALL |x| (|shellEntry| $ 21))))
+ (T (SPADCALL |x| (|shellEntry| $ 51))))
|STAGG-;setelt;AUs2S;12|)
(EXIT (COND
((< |h| |l|) |s|)
@@ -188,7 +185,7 @@
(|check-subtype|
(NOT (MINUSP |l|))
'(|NonNegativeInteger|) |l|)
- (|getShellEntry| $ 25))
+ (|shellEntry| $ 25))
|STAGG-;setelt;AUs2S;12|)
(LETT |z|
(SPADCALL |y|
@@ -199,30 +196,30 @@
(NOT (MINUSP #0#))
'(|NonNegativeInteger|)
#0#))
- (|getShellEntry| $ 25))
+ (|shellEntry| $ 25))
|STAGG-;setelt;AUs2S;12|)
(LOOP
(COND
((NOT
(NOT
(SPADCALL |y| |z|
- (|getShellEntry| $ 52))))
+ (|shellEntry| $ 52))))
(RETURN NIL))
(T
(SEQ
(SPADCALL |y| |s|
- (|getShellEntry| $ 46))
+ (|shellEntry| $ 46))
(EXIT
(SETQ |y|
(SPADCALL |y|
- (|getShellEntry| $ 13))))))))
+ (|shellEntry| $ 13))))))))
(EXIT |s|))))))))))))
(DEFUN |STAGG-;concat!;3A;13| (|x| |y| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 18)) |y|)
- (T (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 54)) |y|
- (|getShellEntry| $ 55))
+ ((SPADCALL |x| (|shellEntry| $ 18)) |y|)
+ (T (SEQ (SPADCALL (SPADCALL |x| (|shellEntry| $ 54)) |y|
+ (|shellEntry| $ 55))
(EXIT |x|)))))
(DEFUN |StreamAggregate&| (|#1| |#2|)
diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp
index 7cc3845c..5191e56c 100644
--- a/src/algebra/strap/SYMBOL.lsp
+++ b/src/algebra/strap/SYMBOL.lsp
@@ -120,41 +120,40 @@
(COND
((CONSP |x|)
(|error| "Cannot convert a scripted symbol to OpenMath"))
- (T (SPADCALL |dev| |x| (|getShellEntry| $ 27)))))
+ (T (SPADCALL |dev| |x| (|shellEntry| $ 27)))))
(DEFUN |SYMBOL;OMwrite;$S;2| (|x| $)
(LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
- (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 29))
- (|getShellEntry| $ 30))))
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 31))
+ (|dev| (SPADCALL |sp| (SPADCALL (|shellEntry| $ 29))
+ (|shellEntry| $ 30))))
+ (SEQ (SPADCALL |dev| (|shellEntry| $ 31))
(|SYMBOL;writeOMSym| |dev| |x| $)
- (SPADCALL |dev| (|getShellEntry| $ 32))
- (SPADCALL |dev| (|getShellEntry| $ 33))
+ (SPADCALL |dev| (|shellEntry| $ 32))
+ (SPADCALL |dev| (|shellEntry| $ 33))
(SETQ |s| (OM-STRINGPTRTOSTRING |sp|)) (EXIT |s|))))
(DEFUN |SYMBOL;OMwrite;$BS;3| (|x| |wholeObj| $)
(LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
- (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 29))
- (|getShellEntry| $ 30))))
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 31))))
+ (|dev| (SPADCALL |sp| (SPADCALL (|shellEntry| $ 29))
+ (|shellEntry| $ 30))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 31))))
(|SYMBOL;writeOMSym| |dev| |x| $)
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 32))))
- (SPADCALL |dev| (|getShellEntry| $ 33))
+ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 32))))
+ (SPADCALL |dev| (|shellEntry| $ 33))
(SETQ |s| (OM-STRINGPTRTOSTRING |sp|)) (EXIT |s|))))
(DEFUN |SYMBOL;OMwrite;Omd$V;4| (|dev| |x| $)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 31))
+ (SEQ (SPADCALL |dev| (|shellEntry| $ 31))
(|SYMBOL;writeOMSym| |dev| |x| $)
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 32)))))
+ (EXIT (SPADCALL |dev| (|shellEntry| $ 32)))))
(DEFUN |SYMBOL;OMwrite;Omd$BV;5| (|dev| |x| |wholeObj| $)
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 31))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 31))))
(|SYMBOL;writeOMSym| |dev| |x| $)
- (EXIT (COND
- (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 32)))))))
+ (EXIT (COND (|wholeObj| (SPADCALL |dev| (|shellEntry| $ 32)))))))
(DEFUN |SYMBOL;convert;$If;6| (|s| $)
- (SPADCALL |s| (|getShellEntry| $ 47)))
+ (SPADCALL |s| (|shellEntry| $ 47)))
(DEFUN |SYMBOL;convert;2$;7| (|s| $) (DECLARE (IGNORE $)) |s|)
@@ -169,7 +168,7 @@
(GGREATERP |y| |x|))
(DEFUN |SYMBOL;coerce;$Of;11| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 54)))
+ (SPADCALL |x| (|shellEntry| $ 54)))
(DEFUN |SYMBOL;subscript;$L$;12| (|sy| |lx| $)
(|SYMBOL;script;$L$;22| |sy| (LIST |lx| NIL NIL NIL NIL) $))
@@ -184,16 +183,16 @@
(|SYMBOL;script;$L$;22| |sy| (LIST NIL NIL NIL NIL |lx|) $))
(DEFUN |SYMBOL;patternMatch;$P2Pmr;16| (|x| |p| |l| $)
- (SPADCALL |x| |p| |l| (|getShellEntry| $ 67)))
+ (SPADCALL |x| |p| |l| (|shellEntry| $ 67)))
(DEFUN |SYMBOL;patternMatch;$P2Pmr;17| (|x| |p| |l| $)
- (SPADCALL |x| |p| |l| (|getShellEntry| $ 74)))
+ (SPADCALL |x| |p| |l| (|shellEntry| $ 74)))
(DEFUN |SYMBOL;convert;$P;18| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 77)))
+ (SPADCALL |x| (|shellEntry| $ 77)))
(DEFUN |SYMBOL;convert;$P;19| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 79)))
+ (SPADCALL |x| (|shellEntry| $ 79)))
(DEFUN |SYMBOL;syprefix| (|sc| $)
(LET ((|ns| (LIST (LIST-LENGTH (SVREF |sc| 3))
@@ -222,17 +221,17 @@
(CONS (|SYMBOL;istring| |n| $)
#1#)))))
(SETQ #0# (CDR #0#)))))
- (|getShellEntry| $ 93))))))
+ (|shellEntry| $ 93))))))
(DEFUN |SYMBOL;syscripts| (|sc| $)
(LET ((|all| (SVREF |sc| 3)))
(SEQ (SETQ |all|
- (SPADCALL (SVREF |sc| 2) |all| (|getShellEntry| $ 94)))
+ (SPADCALL (SVREF |sc| 2) |all| (|shellEntry| $ 94)))
(SETQ |all|
- (SPADCALL (SVREF |sc| 1) |all| (|getShellEntry| $ 94)))
+ (SPADCALL (SVREF |sc| 1) |all| (|shellEntry| $ 94)))
(SETQ |all|
- (SPADCALL (SVREF |sc| 0) |all| (|getShellEntry| $ 94)))
- (EXIT (SPADCALL |all| (SVREF |sc| 4) (|getShellEntry| $ 94))))))
+ (SPADCALL (SVREF |sc| 0) |all| (|shellEntry| $ 94)))
+ (EXIT (SPADCALL |all| (SVREF |sc| 4) (|shellEntry| $ 94))))))
(DEFUN |SYMBOL;script;$L$;22| (|sy| |ls| $)
(LET ((|sc| (VECTOR NIL NIL NIL NIL NIL)))
@@ -281,9 +280,9 @@
(LET ((|s| (PNAME (|SYMBOL;name;2$;31| |e| $))))
(SEQ (COND
((AND (< 1 (LENGTH |s|))
- (SPADCALL (SPADCALL |s| 1 (|getShellEntry| $ 106))
- (SPADCALL "\\" (|getShellEntry| $ 43))
- (|getShellEntry| $ 107)))
+ (SPADCALL (SPADCALL |s| 1 (|shellEntry| $ 106))
+ (SPADCALL "\\" (|shellEntry| $ 43))
+ (|shellEntry| $ 107)))
(SETQ |s| (STRCONC "\\mbox{\\it " (STRCONC |s| "}")))))
(COND ((NOT (CONSP |e|)) (EXIT |s|)))
(LETT |ss| (|SYMBOL;scripts;$R;32| |e| $)
@@ -298,7 +297,7 @@
(T (SEQ (SETQ |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 112))))
+ (|shellEntry| $ 112))))
(SETQ |lo| (CDR |lo|))
(EXIT (COND
((NOT (NULL |lo|))
@@ -316,7 +315,7 @@
(T (SEQ (SETQ |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 112))))
+ (|shellEntry| $ 112))))
(SETQ |lo| (CDR |lo|))
(EXIT (COND
((NOT (NULL |lo|))
@@ -334,7 +333,7 @@
(T (SEQ (SETQ |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 112))))
+ (|shellEntry| $ 112))))
(SETQ |lo| (CDR |lo|))
(EXIT (COND
((NOT (NULL |lo|))
@@ -352,7 +351,7 @@
(T (SEQ (SETQ |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 112))))
+ (|shellEntry| $ 112))))
(SETQ |lo| (CDR |lo|))
(EXIT (COND
((NOT (NULL |lo|))
@@ -370,7 +369,7 @@
(T (SEQ (SETQ |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 112))))
+ (|shellEntry| $ 112))))
(SETQ |lo| (CDR |lo|))
(EXIT (COND
((NOT (NULL |lo|))
@@ -397,20 +396,20 @@
(SPADCALL |s|
(+ (CDR |qr|)
(SPADCALL |s|
- (|getShellEntry| $ 117)))
- (|getShellEntry| $ 106))
- |ns| (|getShellEntry| $ 119)))
+ (|shellEntry| $ 117)))
+ (|shellEntry| $ 106))
+ |ns| (|shellEntry| $ 119)))
(EXIT (COND
((ZEROP |n|)
(RETURN-FROM |SYMBOL;anyRadix| |ns|))))))))))))
(DEFUN |SYMBOL;new;$;27| ($)
(LET ((|sym| (|SYMBOL;anyRadix|
- (SPADCALL (SVREF $ 10) (|getShellEntry| $ 120))
+ (SPADCALL (SVREF $ 10) (|shellEntry| $ 120))
(SVREF $ 20) $)))
(SEQ (SPADCALL (SVREF $ 10)
- (+ (SPADCALL (SVREF $ 10) (|getShellEntry| $ 120)) 1)
- (|getShellEntry| $ 121))
+ (+ (SPADCALL (SVREF $ 10) (|shellEntry| $ 120)) 1)
+ (|shellEntry| $ 121))
(EXIT (|SYMBOL;coerce;S$;8| (STRCONC "%" |sym|) $)))))
(DEFUN |SYMBOL;new;2$;28| (|x| $)
@@ -419,13 +418,13 @@
(SEQ (LETT |n|
(SEQ (LETT |u|
(SPADCALL |x| (SVREF $ 13)
- (|getShellEntry| $ 124))
+ (|shellEntry| $ 124))
|SYMBOL;new;2$;28|)
(EXIT (COND
((EQL (CAR |u|) 1) 0)
(T (+ (CDR |u|) 1)))))
|SYMBOL;new;2$;28|)
- (SPADCALL (SVREF $ 13) |x| |n| (|getShellEntry| $ 127))
+ (SPADCALL (SVREF $ 13) |x| |n| (|shellEntry| $ 127))
(LETT |xx|
(COND
((NOT (CONSP |x|)) (|SYMBOL;string;$S;24| |x| $))
@@ -438,11 +437,11 @@
((NOT (< (SPADCALL
(SPADCALL |xx|
(SPADCALL |xx|
- (|getShellEntry| $ 128))
- (|getShellEntry| $ 106))
- (SVREF $ 19) (|getShellEntry| $ 129))
+ (|shellEntry| $ 128))
+ (|shellEntry| $ 106))
+ (SVREF $ 19) (|shellEntry| $ 129))
(SPADCALL (SVREF $ 19)
- (|getShellEntry| $ 117))))
+ (|shellEntry| $ 117))))
(STRCONC |xx|
(|SYMBOL;anyRadix| |n| (SVREF $ 21) $)))
(T (STRCONC |xx|
@@ -453,15 +452,15 @@
(|SYMBOL;scripts;$R;32| |x| $) $))))))
(DEFUN |SYMBOL;resetNew;V;29| ($)
- (SEQ (SPADCALL (SVREF $ 10) 0 (|getShellEntry| $ 121))
+ (SEQ (SPADCALL (SVREF $ 10) 0 (|shellEntry| $ 121))
(EXIT (LET ((#0=#:G1525
- (SPADCALL (SVREF $ 13) (|getShellEntry| $ 133))))
+ (SPADCALL (SVREF $ 13) (|shellEntry| $ 133))))
(LOOP
(COND
((ATOM #0#) (RETURN NIL))
(T (LET ((|k| (CAR #0#)))
(SPADCALL |k| (SVREF $ 13)
- (|getShellEntry| $ 134)))))
+ (|shellEntry| $ 134)))))
(SETQ #0# (CDR #0#)))))))
(DEFUN |SYMBOL;scripted?;$B;30| (|sy| $)
@@ -473,7 +472,7 @@
((NOT (CONSP |sy|)) |sy|)
(T (LET ((|str| (|SYMBOL;string;$S;24|
(SPADCALL (|SYMBOL;list;$L;34| |sy| $)
- (|getShellEntry| $ 137))
+ (|shellEntry| $ 137))
$)))
(SEQ (LET ((|i| (+ (SVREF $ 41) 1))
(#0=#:G1526 (LENGTH |str|)))
@@ -483,14 +482,14 @@
(T (COND
((NOT (SPADCALL
(SPADCALL |str| |i|
- (|getShellEntry| $ 106))
- (|getShellEntry| $ 139)))
+ (|shellEntry| $ 106))
+ (|shellEntry| $ 139)))
(RETURN-FROM |SYMBOL;name;2$;31|
(|SYMBOL;coerce;S$;8|
(SPADCALL |str|
(SPADCALL |i| (LENGTH |str|)
- (|getShellEntry| $ 141))
- (|getShellEntry| $ 142))
+ (|shellEntry| $ 141))
+ (|shellEntry| $ 142))
$))))))
(SETQ |i| (+ |i| 1))))
(EXIT (|error| "Improper scripted symbol")))))))
@@ -504,40 +503,39 @@
(|lscripts| (LIST NIL NIL NIL NIL NIL))
(|str| (|SYMBOL;string;$S;24|
(SPADCALL (|SYMBOL;list;$L;34| |sy| $)
- (|getShellEntry| $ 137))
+ (|shellEntry| $ 137))
$))
(|nstr| (LENGTH |str|))
- (|m| (SPADCALL |nscripts| (|getShellEntry| $ 144))))
+ (|m| (SPADCALL |nscripts| (|shellEntry| $ 144))))
(SEQ (LET ((|i| |m|) (|j| (+ (SVREF $ 41) 1)))
(LOOP
(COND
((OR (> |j| |nstr|)
(NOT (SPADCALL
(SPADCALL |str| |j|
- (|getShellEntry| $ 106))
- (|getShellEntry| $ 139))))
+ (|shellEntry| $ 106))
+ (|shellEntry| $ 139))))
(RETURN NIL))
(T (SPADCALL |nscripts| |i|
(LET ((#0=#:G1517
(-
(SPADCALL
(SPADCALL |str| |j|
- (|getShellEntry| $ 106))
- (|getShellEntry| $ 44))
+ (|shellEntry| $ 106))
+ (|shellEntry| $ 44))
(SVREF $ 45))))
(|check-subtype| (NOT (MINUSP #0#))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 148))))
+ (|shellEntry| $ 148))))
(SETQ |i| (+ |i| 1))
(SETQ |j| (+ |j| 1))))
(SETQ |nscripts|
(SPADCALL (CDR |nscripts|)
(|SPADfirst| |nscripts|)
- (|getShellEntry| $ 151)))
+ (|shellEntry| $ 151)))
(LETT |allscripts| (CDR (|SYMBOL;list;$L;34| |sy| $))
|SYMBOL;scripts;$R;32|)
- (SETQ |m|
- (SPADCALL |lscripts| (|getShellEntry| $ 153)))
+ (SETQ |m| (SPADCALL |lscripts| (|shellEntry| $ 153)))
(LET ((|i| |m|) (#1=#:G1527 |nscripts|))
(LOOP
(COND
@@ -550,7 +548,7 @@
(LET
((#2=#:G1529
(SPADCALL |allscripts| |n|
- (|getShellEntry| $ 156)))
+ (|shellEntry| $ 156)))
(#3=#:G1528 NIL))
(LOOP
(COND
@@ -564,23 +562,23 @@
|a| $)
#3#)))))
(SETQ #2# (CDR #2#))))
- (|getShellEntry| $ 157))
+ (|shellEntry| $ 157))
(EXIT
(SETQ |allscripts|
(SPADCALL |allscripts| |n|
- (|getShellEntry| $ 158))))))))))
+ (|shellEntry| $ 158))))))))))
(SETQ |i| (+ |i| 1))
(SETQ #1# (CDR #1#))))
(EXIT (VECTOR (SPADCALL |lscripts| |m|
- (|getShellEntry| $ 159))
+ (|shellEntry| $ 159))
(SPADCALL |lscripts| (+ |m| 1)
- (|getShellEntry| $ 159))
+ (|shellEntry| $ 159))
(SPADCALL |lscripts| (+ |m| 2)
- (|getShellEntry| $ 159))
+ (|shellEntry| $ 159))
(SPADCALL |lscripts| (+ |m| 3)
- (|getShellEntry| $ 159))
+ (|shellEntry| $ 159))
(SPADCALL |lscripts| (+ |m| 4)
- (|getShellEntry| $ 159)))))))))))
+ (|shellEntry| $ 159)))))))))))
(DEFUN |SYMBOL;istring| (|n| $)
(COND
@@ -616,19 +614,19 @@
(SETF (|shellEntry| $ 3) |pv$|)
(|haddProp| |$ConstructorCache| '|Symbol| NIL (CONS 1 $))
(|stuffDomainSlots| $)
- (SETF (|shellEntry| $ 10) (SPADCALL 0 (|getShellEntry| $ 9)))
- (SETF (|shellEntry| $ 13) (SPADCALL (|getShellEntry| $ 12)))
+ (SETF (|shellEntry| $ 10) (SPADCALL 0 (|shellEntry| $ 9)))
+ (SETF (|shellEntry| $ 13) (SPADCALL (|shellEntry| $ 12)))
(SETF (|shellEntry| $ 18)
(SPADCALL '("0" "1" "2" "3" "4" "5" "6" "7" "8" "9")
- (|getShellEntry| $ 17)))
+ (|shellEntry| $ 17)))
(SETF (|shellEntry| $ 19) "0123456789")
(SETF (|shellEntry| $ 20) "ABCDEFGHIJKLMNOPQRSTUVWXYZ")
(SETF (|shellEntry| $ 21) "abcdefghijklmnopqrstuvwxyz")
(SETF (|shellEntry| $ 38) "*")
(SETF (|shellEntry| $ 41) (LENGTH (SVREF $ 38)))
(SETF (|shellEntry| $ 45)
- (SPADCALL (SPADCALL "0" (|getShellEntry| $ 43))
- (|getShellEntry| $ 44)))
+ (SPADCALL (SPADCALL "0" (|shellEntry| $ 43))
+ (|shellEntry| $ 44)))
$))
(MAKEPROP '|Symbol| '|infovec|
diff --git a/src/algebra/strap/UFD-.lsp b/src/algebra/strap/UFD-.lsp
index 504f5eb8..c947b666 100644
--- a/src/algebra/strap/UFD-.lsp
+++ b/src/algebra/strap/UFD-.lsp
@@ -12,11 +12,11 @@
(RETURN
(SPADCALL
(SPADCALL
- (LETT |s| (SPADCALL |x| (|getShellEntry| $ 8))
+ (LETT |s| (SPADCALL |x| (|shellEntry| $ 8))
|UFD-;squareFreePart;2S;1|)
- (|getShellEntry| $ 10))
+ (|shellEntry| $ 10))
(LET ((#0=#:G1380 NIL) (#1=#:G1381 T)
- (#2=#:G1394 (SPADCALL |s| (|getShellEntry| $ 14))))
+ (#2=#:G1394 (SPADCALL |s| (|shellEntry| $ 14))))
(LOOP
(COND
((ATOM #2#)
@@ -27,15 +27,15 @@
(#1# (SETQ #0# #3#))
(T (SETQ #0#
(SPADCALL #0# #3#
- (|getShellEntry| $ 15)))))
+ (|shellEntry| $ 15)))))
(SETQ #1# NIL)))))
(SETQ #2# (CDR #2#))))
- (|getShellEntry| $ 15)))))
+ (|shellEntry| $ 15)))))
(DEFUN |UFD-;prime?;SB;2| (|x| $)
(EQL (LIST-LENGTH
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 18))
- (|getShellEntry| $ 22)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 18))
+ (|shellEntry| $ 22)))
1))
(DEFUN |UniqueFactorizationDomain&| (|#1|)
diff --git a/src/algebra/strap/URAGG-.lsp b/src/algebra/strap/URAGG-.lsp
index e18e2164..b1961279 100644
--- a/src/algebra/strap/URAGG-.lsp
+++ b/src/algebra/strap/URAGG-.lsp
@@ -109,59 +109,55 @@
|URAGG-;cycleSplit!;2A;33|))
(DEFUN |URAGG-;elt;AfirstS;1| (|x| T0 $)
- (SPADCALL |x| (|getShellEntry| $ 8)))
+ (SPADCALL |x| (|shellEntry| $ 8)))
(DEFUN |URAGG-;elt;AlastS;2| (|x| T1 $)
- (SPADCALL |x| (|getShellEntry| $ 11)))
+ (SPADCALL |x| (|shellEntry| $ 11)))
(DEFUN |URAGG-;elt;ArestA;3| (|x| T2 $)
- (SPADCALL |x| (|getShellEntry| $ 14)))
+ (SPADCALL |x| (|shellEntry| $ 14)))
(DEFUN |URAGG-;second;AS;4| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 14))
- (|getShellEntry| $ 8)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 14)) (|shellEntry| $ 8)))
(DEFUN |URAGG-;third;AS;5| (|x| $)
(SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 14))
- (|getShellEntry| $ 14))
- (|getShellEntry| $ 8)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 14)) (|shellEntry| $ 14))
+ (|shellEntry| $ 8)))
(DEFUN |URAGG-;cyclic?;AB;6| (|x| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 20)) NIL)
- (T (NOT (SPADCALL (|URAGG-;findCycle| |x| $)
- (|getShellEntry| $ 20))))))
+ ((SPADCALL |x| (|shellEntry| $ 20)) NIL)
+ (T (NOT (SPADCALL (|URAGG-;findCycle| |x| $) (|shellEntry| $ 20))))))
(DEFUN |URAGG-;last;AS;7| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 24))
- (|getShellEntry| $ 8)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 24)) (|shellEntry| $ 8)))
(DEFUN |URAGG-;nodes;AL;8| (|x| $)
(LET ((|l| NIL))
(SEQ (LOOP
(COND
- ((NOT (NOT (SPADCALL |x| (|getShellEntry| $ 20))))
+ ((NOT (NOT (SPADCALL |x| (|shellEntry| $ 20))))
(RETURN NIL))
(T (SEQ (SETQ |l| (CONS |x| |l|))
(EXIT (SETQ |x|
- (SPADCALL |x| (|getShellEntry| $ 14))))))))
+ (SPADCALL |x| (|shellEntry| $ 14))))))))
(EXIT (NREVERSE |l|)))))
(DEFUN |URAGG-;children;AL;9| (|x| $)
(LET ((|l| NIL))
(COND
- ((SPADCALL |x| (|getShellEntry| $ 20)) |l|)
- (T (CONS (SPADCALL |x| (|getShellEntry| $ 14)) |l|)))))
+ ((SPADCALL |x| (|shellEntry| $ 20)) |l|)
+ (T (CONS (SPADCALL |x| (|shellEntry| $ 14)) |l|)))))
(DEFUN |URAGG-;leaf?;AB;10| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 20)))
+ (SPADCALL |x| (|shellEntry| $ 20)))
(DEFUN |URAGG-;value;AS;11| (|x| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 20))
+ ((SPADCALL |x| (|shellEntry| $ 20))
(|error| "value of empty object"))
- (T (SPADCALL |x| (|getShellEntry| $ 8)))))
+ (T (SPADCALL |x| (|shellEntry| $ 8)))))
(DEFUN |URAGG-;less?;ANniB;12| (|l| |n| $)
(LET ((|i| |n|))
@@ -169,10 +165,10 @@
(COND
((NOT (COND
((PLUSP |i|)
- (NOT (SPADCALL |l| (|getShellEntry| $ 20))))
+ (NOT (SPADCALL |l| (|shellEntry| $ 20))))
(T NIL)))
(RETURN NIL))
- (T (SEQ (SETQ |l| (SPADCALL |l| (|getShellEntry| $ 14)))
+ (T (SEQ (SETQ |l| (SPADCALL |l| (|shellEntry| $ 14)))
(EXIT (SETQ |i| (- |i| 1)))))))
(EXIT (PLUSP |i|)))))
@@ -182,14 +178,13 @@
(COND
((NOT (COND
((PLUSP |i|)
- (NOT (SPADCALL |l| (|getShellEntry| $ 20))))
+ (NOT (SPADCALL |l| (|shellEntry| $ 20))))
(T NIL)))
(RETURN NIL))
- (T (SEQ (SETQ |l| (SPADCALL |l| (|getShellEntry| $ 14)))
+ (T (SEQ (SETQ |l| (SPADCALL |l| (|shellEntry| $ 14)))
(EXIT (SETQ |i| (- |i| 1)))))))
(EXIT (COND
- ((ZEROP |i|)
- (NOT (SPADCALL |l| (|getShellEntry| $ 20))))
+ ((ZEROP |i|) (NOT (SPADCALL |l| (|shellEntry| $ 20))))
(T NIL))))))
(DEFUN |URAGG-;size?;ANniB;14| (|l| |n| $)
@@ -197,68 +192,67 @@
(SEQ (LOOP
(COND
((NOT (COND
- ((SPADCALL |l| (|getShellEntry| $ 20)) NIL)
+ ((SPADCALL |l| (|shellEntry| $ 20)) NIL)
(T (PLUSP |i|))))
(RETURN NIL))
- (T (SEQ (SETQ |l| (SPADCALL |l| (|getShellEntry| $ 14)))
+ (T (SEQ (SETQ |l| (SPADCALL |l| (|shellEntry| $ 14)))
(EXIT (SETQ |i| (- |i| 1)))))))
(EXIT (COND
- ((SPADCALL |l| (|getShellEntry| $ 20)) (ZEROP |i|))
+ ((SPADCALL |l| (|shellEntry| $ 20)) (ZEROP |i|))
(T NIL))))))
(DEFUN |URAGG-;#;ANni;15| (|x| $)
(LET ((|k| 0))
(SEQ (LOOP
(COND
- ((NOT (NOT (SPADCALL |x| (|getShellEntry| $ 20))))
+ ((NOT (NOT (SPADCALL |x| (|shellEntry| $ 20))))
(RETURN NIL))
(T (COND
((AND (EQL |k| 1000)
- (SPADCALL |x| (|getShellEntry| $ 48)))
+ (SPADCALL |x| (|shellEntry| $ 48)))
(|error| "cyclic list"))
- (T (SEQ (SETQ |x|
- (SPADCALL |x| (|getShellEntry| $ 14)))
+ (T (SEQ (SETQ |x| (SPADCALL |x| (|shellEntry| $ 14)))
(EXIT (SETQ |k| (+ |k| 1)))))))))
(EXIT |k|))))
(DEFUN |URAGG-;tail;2A;16| (|x| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 20)) (|error| "empty list"))
- (T (LET ((|y| (SPADCALL |x| (|getShellEntry| $ 14))))
+ ((SPADCALL |x| (|shellEntry| $ 20)) (|error| "empty list"))
+ (T (LET ((|y| (SPADCALL |x| (|shellEntry| $ 14))))
(SEQ (LET ((|k| 0))
(LOOP
(COND
- ((NOT (NOT (SPADCALL |y| (|getShellEntry| $ 20))))
+ ((NOT (NOT (SPADCALL |y| (|shellEntry| $ 20))))
(RETURN NIL))
(T (COND
((AND (EQL |k| 1000)
- (SPADCALL |x| (|getShellEntry| $ 48)))
+ (SPADCALL |x| (|shellEntry| $ 48)))
(|error| "cyclic list"))
(T (SETQ |y|
(SPADCALL (SETQ |x| |y|)
- (|getShellEntry| $ 14)))))))
+ (|shellEntry| $ 14)))))))
(SETQ |k| (+ |k| 1))))
(EXIT |x|))))))
(DEFUN |URAGG-;findCycle| (|x| $)
- (LET ((|y| (SPADCALL |x| (|getShellEntry| $ 14))))
+ (LET ((|y| (SPADCALL |x| (|shellEntry| $ 14))))
(SEQ (LOOP
(COND
- ((NOT (NOT (SPADCALL |y| (|getShellEntry| $ 20))))
+ ((NOT (NOT (SPADCALL |y| (|shellEntry| $ 20))))
(RETURN NIL))
(T (SEQ (COND
- ((SPADCALL |x| |y| (|getShellEntry| $ 54))
+ ((SPADCALL |x| |y| (|shellEntry| $ 54))
(RETURN-FROM |URAGG-;findCycle| |x|)))
- (SETQ |x| (SPADCALL |x| (|getShellEntry| $ 14)))
- (SETQ |y| (SPADCALL |y| (|getShellEntry| $ 14)))
+ (SETQ |x| (SPADCALL |x| (|shellEntry| $ 14)))
+ (SETQ |y| (SPADCALL |y| (|shellEntry| $ 14)))
(COND
- ((SPADCALL |y| (|getShellEntry| $ 20))
+ ((SPADCALL |y| (|shellEntry| $ 20))
(RETURN-FROM |URAGG-;findCycle| |y|)))
(COND
- ((SPADCALL |x| |y| (|getShellEntry| $ 54))
+ ((SPADCALL |x| |y| (|shellEntry| $ 54))
(RETURN-FROM |URAGG-;findCycle| |y|)))
(EXIT (SETQ |y|
- (SPADCALL |y| (|getShellEntry| $ 14))))))))
+ (SPADCALL |y| (|shellEntry| $ 14))))))))
(EXIT |y|))))
(DEFUN |URAGG-;cycleTail;2A;18| (|x| $)
@@ -266,77 +260,72 @@
(RETURN
(COND
((SPADCALL
- (LETT |y| (SETQ |x| (SPADCALL |x| (|getShellEntry| $ 55)))
+ (LETT |y| (SETQ |x| (SPADCALL |x| (|shellEntry| $ 55)))
|URAGG-;cycleTail;2A;18|)
- (|getShellEntry| $ 20))
+ (|shellEntry| $ 20))
|x|)
- (T (SEQ (LETT |z| (SPADCALL |x| (|getShellEntry| $ 14))
+ (T (SEQ (LETT |z| (SPADCALL |x| (|shellEntry| $ 14))
|URAGG-;cycleTail;2A;18|)
(LOOP
(COND
- ((NOT (NOT (SPADCALL |x| |z|
- (|getShellEntry| $ 54))))
+ ((NOT (NOT (SPADCALL |x| |z| (|shellEntry| $ 54))))
(RETURN NIL))
(T (SEQ (SETQ |y| |z|)
(EXIT (SETQ |z|
(SPADCALL |z|
- (|getShellEntry| $ 14))))))))
+ (|shellEntry| $ 14))))))))
(EXIT |y|)))))))
(DEFUN |URAGG-;cycleEntry;2A;19| (|x| $)
(PROG (|y| |z| |l|)
(RETURN
(COND
- ((SPADCALL |x| (|getShellEntry| $ 20)) |x|)
+ ((SPADCALL |x| (|shellEntry| $ 20)) |x|)
((SPADCALL
(LETT |y| (|URAGG-;findCycle| |x| $)
|URAGG-;cycleEntry;2A;19|)
- (|getShellEntry| $ 20))
+ (|shellEntry| $ 20))
|y|)
- (T (SEQ (LETT |z| (SPADCALL |y| (|getShellEntry| $ 14))
+ (T (SEQ (LETT |z| (SPADCALL |y| (|shellEntry| $ 14))
|URAGG-;cycleEntry;2A;19|)
(LETT |l| 1 |URAGG-;cycleEntry;2A;19|)
(LOOP
(COND
- ((NOT (NOT (SPADCALL |y| |z|
- (|getShellEntry| $ 54))))
+ ((NOT (NOT (SPADCALL |y| |z| (|shellEntry| $ 54))))
(RETURN NIL))
(T (SEQ (SETQ |z|
- (SPADCALL |z| (|getShellEntry| $ 14)))
+ (SPADCALL |z| (|shellEntry| $ 14)))
(EXIT (SETQ |l| (+ |l| 1)))))))
(SETQ |y| |x|)
(LET ((|k| 1))
(LOOP
(COND
((> |k| |l|) (RETURN NIL))
- (T (SETQ |y|
- (SPADCALL |y| (|getShellEntry| $ 14)))))
+ (T (SETQ |y| (SPADCALL |y| (|shellEntry| $ 14)))))
(SETQ |k| (+ |k| 1))))
(LOOP
(COND
- ((NOT (NOT (SPADCALL |x| |y|
- (|getShellEntry| $ 54))))
+ ((NOT (NOT (SPADCALL |x| |y| (|shellEntry| $ 54))))
(RETURN NIL))
(T (SEQ (SETQ |x|
- (SPADCALL |x| (|getShellEntry| $ 14)))
+ (SPADCALL |x| (|shellEntry| $ 14)))
(EXIT (SETQ |y|
(SPADCALL |y|
- (|getShellEntry| $ 14))))))))
+ (|shellEntry| $ 14))))))))
(EXIT |x|)))))))
(DEFUN |URAGG-;cycleLength;ANni;20| (|x| $)
(COND
- ((OR (SPADCALL |x| (|getShellEntry| $ 20))
+ ((OR (SPADCALL |x| (|shellEntry| $ 20))
(SPADCALL (SETQ |x| (|URAGG-;findCycle| |x| $))
- (|getShellEntry| $ 20)))
+ (|shellEntry| $ 20)))
0)
- (T (LET ((|y| (SPADCALL |x| (|getShellEntry| $ 14))) (|k| 1))
+ (T (LET ((|y| (SPADCALL |x| (|shellEntry| $ 14))) (|k| 1))
(SEQ (LOOP
(COND
- ((NOT (NOT (SPADCALL |x| |y| (|getShellEntry| $ 54))))
+ ((NOT (NOT (SPADCALL |x| |y| (|shellEntry| $ 54))))
(RETURN NIL))
- (T (SEQ (SETQ |y|
- (SPADCALL |y| (|getShellEntry| $ 14)))
+ (T (SEQ (SETQ |y| (SPADCALL |y| (|shellEntry| $ 14)))
(EXIT (SETQ |k| (+ |k| 1)))))))
(EXIT |k|))))))
@@ -346,14 +335,14 @@
(COND
((> |i| |n|) (RETURN NIL))
(T (COND
- ((SPADCALL |x| (|getShellEntry| $ 20))
+ ((SPADCALL |x| (|shellEntry| $ 20))
(|error| "Index out of range"))
- (T (SETQ |x| (SPADCALL |x| (|getShellEntry| $ 14)))))))
+ (T (SETQ |x| (SPADCALL |x| (|shellEntry| $ 14)))))))
(SETQ |i| (+ |i| 1))))
(EXIT |x|)))
(DEFUN |URAGG-;last;ANniA;22| (|x| |n| $)
- (LET ((|m| (SPADCALL |x| (|getShellEntry| $ 60))))
+ (LET ((|m| (SPADCALL |x| (|shellEntry| $ 60))))
(COND
((< |m| |n|) (|error| "index out of range"))
(T (SPADCALL
@@ -361,84 +350,82 @@
(LET ((#0=#:G1477 (- |m| |n|)))
(|check-subtype| (NOT (MINUSP #0#))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 62))
- (|getShellEntry| $ 63))))))
+ (|shellEntry| $ 62))
+ (|shellEntry| $ 63))))))
(DEFUN |URAGG-;=;2AB;23| (|x| |y| $)
(COND
- ((SPADCALL |x| |y| (|getShellEntry| $ 54)) T)
+ ((SPADCALL |x| |y| (|shellEntry| $ 54)) T)
(T (SEQ (LET ((|k| 0))
(LOOP
(COND
((NOT (COND
- ((SPADCALL |x| (|getShellEntry| $ 20)) NIL)
- (T (NOT (SPADCALL |y| (|getShellEntry| $ 20))))))
+ ((SPADCALL |x| (|shellEntry| $ 20)) NIL)
+ (T (NOT (SPADCALL |y| (|shellEntry| $ 20))))))
(RETURN NIL))
(T (COND
((AND (EQL |k| 1000)
- (SPADCALL |x| (|getShellEntry| $ 48)))
+ (SPADCALL |x| (|shellEntry| $ 48)))
(|error| "cyclic list"))
- ((SPADCALL (SPADCALL |x| (|getShellEntry| $ 8))
- (SPADCALL |y| (|getShellEntry| $ 8))
- (|getShellEntry| $ 66))
+ ((SPADCALL (SPADCALL |x| (|shellEntry| $ 8))
+ (SPADCALL |y| (|shellEntry| $ 8))
+ (|shellEntry| $ 66))
(RETURN-FROM |URAGG-;=;2AB;23| NIL))
(T (SEQ (SETQ |x|
- (SPADCALL |x|
- (|getShellEntry| $ 14)))
+ (SPADCALL |x| (|shellEntry| $ 14)))
(EXIT (SETQ |y|
(SPADCALL |y|
- (|getShellEntry| $ 14)))))))))
+ (|shellEntry| $ 14)))))))))
(SETQ |k| (+ |k| 1))))
(EXIT (COND
- ((SPADCALL |x| (|getShellEntry| $ 20))
- (SPADCALL |y| (|getShellEntry| $ 20)))
+ ((SPADCALL |x| (|shellEntry| $ 20))
+ (SPADCALL |y| (|shellEntry| $ 20)))
(T NIL)))))))
(DEFUN |URAGG-;node?;2AB;24| (|u| |v| $)
(SEQ (LET ((|k| 0))
(LOOP
(COND
- ((NOT (NOT (SPADCALL |v| (|getShellEntry| $ 20))))
+ ((NOT (NOT (SPADCALL |v| (|shellEntry| $ 20))))
(RETURN NIL))
(T (COND
- ((SPADCALL |u| |v| (|getShellEntry| $ 68))
+ ((SPADCALL |u| |v| (|shellEntry| $ 68))
(RETURN-FROM |URAGG-;node?;2AB;24| T))
((AND (EQL |k| 1000)
- (SPADCALL |v| (|getShellEntry| $ 48)))
+ (SPADCALL |v| (|shellEntry| $ 48)))
(|error| "cyclic list"))
- (T (SETQ |v| (SPADCALL |v| (|getShellEntry| $ 14)))))))
+ (T (SETQ |v| (SPADCALL |v| (|shellEntry| $ 14)))))))
(SETQ |k| (+ |k| 1))))
- (EXIT (SPADCALL |u| |v| (|getShellEntry| $ 68)))))
+ (EXIT (SPADCALL |u| |v| (|shellEntry| $ 68)))))
(DEFUN |URAGG-;setelt;Afirst2S;25| (|x| T3 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 70)))
+ (SPADCALL |x| |a| (|shellEntry| $ 70)))
(DEFUN |URAGG-;setelt;Alast2S;26| (|x| T4 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 72)))
+ (SPADCALL |x| |a| (|shellEntry| $ 72)))
(DEFUN |URAGG-;setelt;Arest2A;27| (|x| T5 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 74)))
+ (SPADCALL |x| |a| (|shellEntry| $ 74)))
(DEFUN |URAGG-;concat;3A;28| (|x| |y| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 63)) |y|
- (|getShellEntry| $ 76)))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 63)) |y| (|shellEntry| $ 76)))
(DEFUN |URAGG-;setlast!;A2S;29| (|x| |s| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 20))
+ ((SPADCALL |x| (|shellEntry| $ 20))
(|error| "setlast: empty list"))
- (T (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 24)) |s|
- (|getShellEntry| $ 70))
+ (T (SEQ (SPADCALL (SPADCALL |x| (|shellEntry| $ 24)) |s|
+ (|shellEntry| $ 70))
(EXIT |s|)))))
(DEFUN |URAGG-;setchildren!;ALA;30| (|u| |lv| $)
(COND
((EQL (LIST-LENGTH |lv|) 1)
- (SPADCALL |u| (|SPADfirst| |lv|) (|getShellEntry| $ 74)))
+ (SPADCALL |u| (|SPADfirst| |lv|) (|shellEntry| $ 74)))
(T (|error| "wrong number of children specified"))))
(DEFUN |URAGG-;setvalue!;A2S;31| (|u| |s| $)
- (SPADCALL |u| |s| (|getShellEntry| $ 70)))
+ (SPADCALL |u| |s| (|shellEntry| $ 70)))
(DEFUN |URAGG-;split!;AIA;32| (|p| |n| $)
(PROG (|q|)
@@ -450,11 +437,11 @@
(LET ((#0=#:G1503 (- |n| 1)))
(|check-subtype| (NOT (MINUSP #0#))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 62)))
- (LETT |q| (SPADCALL |p| (|getShellEntry| $ 14))
+ (|shellEntry| $ 62)))
+ (LETT |q| (SPADCALL |p| (|shellEntry| $ 14))
|URAGG-;split!;AIA;32|)
- (SPADCALL |p| (SPADCALL (|getShellEntry| $ 84))
- (|getShellEntry| $ 74))
+ (SPADCALL |p| (SPADCALL (|shellEntry| $ 84))
+ (|shellEntry| $ 74))
(EXIT |q|)))))))
(DEFUN |URAGG-;cycleSplit!;2A;33| (|x| $)
@@ -462,24 +449,23 @@
(RETURN
(COND
((OR (SPADCALL
- (LETT |y| (SPADCALL |x| (|getShellEntry| $ 55))
+ (LETT |y| (SPADCALL |x| (|shellEntry| $ 55))
|URAGG-;cycleSplit!;2A;33|)
- (|getShellEntry| $ 20))
- (SPADCALL |x| |y| (|getShellEntry| $ 54)))
+ (|shellEntry| $ 20))
+ (SPADCALL |x| |y| (|shellEntry| $ 54)))
|y|)
- (T (SEQ (LETT |z| (SPADCALL |x| (|getShellEntry| $ 14))
+ (T (SEQ (LETT |z| (SPADCALL |x| (|shellEntry| $ 14))
|URAGG-;cycleSplit!;2A;33|)
(LOOP
(COND
- ((NOT (NOT (SPADCALL |z| |y|
- (|getShellEntry| $ 54))))
+ ((NOT (NOT (SPADCALL |z| |y| (|shellEntry| $ 54))))
(RETURN NIL))
(T (SEQ (SETQ |x| |z|)
(EXIT (SETQ |z|
(SPADCALL |z|
- (|getShellEntry| $ 14))))))))
- (SPADCALL |x| (SPADCALL (|getShellEntry| $ 84))
- (|getShellEntry| $ 74))
+ (|shellEntry| $ 14))))))))
+ (SPADCALL |x| (SPADCALL (|shellEntry| $ 84))
+ (|shellEntry| $ 74))
(EXIT |y|)))))))
(DEFUN |UnaryRecursiveAggregate&| (|#1| |#2|)
diff --git a/src/algebra/strap/VECTOR.lsp b/src/algebra/strap/VECTOR.lsp
index 01f3fe2c..fa232c7d 100644
--- a/src/algebra/strap/VECTOR.lsp
+++ b/src/algebra/strap/VECTOR.lsp
@@ -13,7 +13,7 @@
|VECTOR;convert;$If;3|))
(DEFUN |VECTOR;vector;L$;1| (|l| $)
- (SPADCALL |l| (|getShellEntry| $ 10)))
+ (SPADCALL |l| (|shellEntry| $ 10)))
(DEFUN |VECTOR;maxIndex;$I;2| (|x| $)
(DECLARE (IGNORE $))
@@ -21,10 +21,10 @@
(DEFUN |VECTOR;convert;$If;3| (|x| $)
(SPADCALL
- (LIST (SPADCALL '|vector| (|getShellEntry| $ 15))
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 16))
- (|getShellEntry| $ 17)))
- (|getShellEntry| $ 19)))
+ (LIST (SPADCALL '|vector| (|shellEntry| $ 15))
+ (SPADCALL (SPADCALL |x| (|shellEntry| $ 16))
+ (|shellEntry| $ 17)))
+ (|shellEntry| $ 19)))
(DEFUN |Vector| (#0=#:G1383)
(DECLARE (SPECIAL |$ConstructorCache|))