aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/strap
diff options
context:
space:
mode:
Diffstat (limited to 'src/algebra/strap')
-rw-r--r--src/algebra/strap/ABELGRP-.lsp29
-rw-r--r--src/algebra/strap/ABELMON-.lsp21
-rw-r--r--src/algebra/strap/BOOLEAN.lsp74
-rw-r--r--src/algebra/strap/CHAR.lsp85
-rw-r--r--src/algebra/strap/CLAGG-.lsp106
-rw-r--r--src/algebra/strap/DFLOAT.lsp325
-rw-r--r--src/algebra/strap/DIFRING-.lsp20
-rw-r--r--src/algebra/strap/DIVRING-.lsp50
-rw-r--r--src/algebra/strap/ES-.lsp363
-rw-r--r--src/algebra/strap/EUCDOM-.lsp197
-rw-r--r--src/algebra/strap/FFIELDC-.lsp257
-rw-r--r--src/algebra/strap/FPS-.lsp21
-rw-r--r--src/algebra/strap/GCDDOM-.lsp67
-rw-r--r--src/algebra/strap/HOAGG-.lsp86
-rw-r--r--src/algebra/strap/ILIST.lsp211
-rw-r--r--src/algebra/strap/INS-.lsp284
-rw-r--r--src/algebra/strap/INT.lsp345
-rw-r--r--src/algebra/strap/INTDOM-.lsp26
-rw-r--r--src/algebra/strap/ISTRING.lsp324
-rw-r--r--src/algebra/strap/LIST.lsp171
-rw-r--r--src/algebra/strap/LNAGG-.lsp45
-rw-r--r--src/algebra/strap/LSAGG-.lsp193
-rw-r--r--src/algebra/strap/MONOID-.lsp20
-rw-r--r--src/algebra/strap/NNI.lsp49
-rw-r--r--src/algebra/strap/ORDRING-.lsp32
-rw-r--r--src/algebra/strap/OUTFORM.lsp221
-rw-r--r--src/algebra/strap/PI.lsp32
-rw-r--r--src/algebra/strap/POLYCAT-.lsp780
-rw-r--r--src/algebra/strap/PRIMARR.lsp106
-rw-r--r--src/algebra/strap/PSETCAT-.lsp332
-rw-r--r--src/algebra/strap/QFCAT-.lsp240
-rw-r--r--src/algebra/strap/RNS-.lsp164
-rw-r--r--src/algebra/strap/SINT.lsp242
-rw-r--r--src/algebra/strap/STAGG-.lsp182
-rw-r--r--src/algebra/strap/SYMBOL.lsp426
-rw-r--r--src/algebra/strap/TSETCAT-.lsp515
-rw-r--r--src/algebra/strap/UFD-.lsp12
-rw-r--r--src/algebra/strap/UPOLYC-.lsp803
-rw-r--r--src/algebra/strap/URAGG-.lsp194
-rw-r--r--src/algebra/strap/VECTOR.lsp55
40 files changed, 3968 insertions, 3737 deletions
diff --git a/src/algebra/strap/ABELGRP-.lsp b/src/algebra/strap/ABELGRP-.lsp
index dc10e8f6..b25c65a5 100644
--- a/src/algebra/strap/ABELGRP-.lsp
+++ b/src/algebra/strap/ABELGRP-.lsp
@@ -26,11 +26,11 @@
(DEFUN |ABELGRP-;*;I2S;4| (|n| |x| $)
(COND
- ((ZEROP |n|) (|spadConstant| $ 17))
- ((< 0 |n|) (SPADCALL |n| |x| (|getShellEntry| $ 20)))
+ ((ZEROP |n|) (|spadConstant| $ 19))
+ ((< 0 |n|) (SPADCALL |n| |x| (|getShellEntry| $ 24)))
('T
(SPADCALL (- |n|) (SPADCALL |x| (|getShellEntry| $ 7))
- (|getShellEntry| $ 20)))))
+ (|getShellEntry| $ 24)))))
(DEFUN |AbelianGroup&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -38,7 +38,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|AbelianGroup&|))
(LETT |dv$| (LIST '|AbelianGroup&| |dv$1|) . #0#)
- (LETT $ (|newShell| 22) . #0#)
+ (LETT $ (|newShell| 27) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -47,7 +47,7 @@
(COND
((|HasCategory| |#1| '(|Ring|)))
('T
- (|setShellEntry| $ 21
+ (|setShellEntry| $ 26
(CONS (|dispatchFunction| |ABELGRP-;*;I2S;4|) $))))
$))))
@@ -55,16 +55,19 @@
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (0 . -) (5 . +)
|ABELGRP-;-;3S;1| (11 . -) (|Union| $ '"failed")
|ABELGRP-;subtractIfCan;2SU;2| (|Integer|) (17 . *)
- (|NonNegativeInteger|) |ABELGRP-;*;Nni2S;3| (23 . |Zero|)
- (|PositiveInteger|) (|RepeatedDoubling| 6) (27 . |double|)
- (33 . *))
- '#(|subtractIfCan| 39 - 45 * 51) 'NIL
+ (|NonNegativeInteger|) |ABELGRP-;*;Nni2S;3| (|Boolean|)
+ (23 . |zero?|) (28 . |Zero|) (32 . |Zero|) (36 . <)
+ (|PositiveInteger|) (|RepeatedDoubling| 6) (42 . |double|)
+ (48 . -) (53 . *))
+ '#(|subtractIfCan| 59 - 65 * 71) 'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 21
+ (|makeByteWordVec2| 26
'(1 6 0 0 7 2 6 0 0 0 8 2 6 0 0 0 10 2
- 6 0 13 0 14 0 6 0 17 2 19 6 18 6 20 2
- 0 0 13 0 21 2 0 11 0 0 12 2 0 0 0 0 9
- 2 0 0 13 0 21 2 0 0 15 0 16)))))
+ 6 0 13 0 14 1 13 17 0 18 0 6 0 19 0
+ 13 0 20 2 13 17 0 0 21 2 23 6 22 6 24
+ 1 13 0 0 25 2 0 0 13 0 26 2 0 11 0 0
+ 12 2 0 0 0 0 9 2 0 0 13 0 26 2 0 0 15
+ 0 16)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/ABELMON-.lsp b/src/algebra/strap/ABELMON-.lsp
index bfdc7eee..c0a9b85f 100644
--- a/src/algebra/strap/ABELMON-.lsp
+++ b/src/algebra/strap/ABELMON-.lsp
@@ -25,7 +25,7 @@
(DEFUN |ABELMON-;*;Nni2S;4| (|n| |x| $)
(COND
((ZEROP |n|) (|spadConstant| $ 7))
- ('T (SPADCALL |n| |x| (|getShellEntry| $ 17)))))
+ ('T (SPADCALL |n| |x| (|getShellEntry| $ 18)))))
(DEFUN |AbelianMonoid&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -33,7 +33,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|AbelianMonoid&|))
(LETT |dv$| (LIST '|AbelianMonoid&| |dv$1|) . #0#)
- (LETT $ (|newShell| 19) . #0#)
+ (LETT $ (|newShell| 20) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -42,7 +42,7 @@
(COND
((|HasCategory| |#1| '(|Ring|)))
('T
- (|setShellEntry| $ 18
+ (|setShellEntry| $ 19
(CONS (|dispatchFunction| |ABELMON-;*;Nni2S;4|) $))))
$))))
@@ -50,14 +50,15 @@
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (0 . |Zero|)
(|Boolean|) (4 . =) |ABELMON-;zero?;SB;1|
(|NonNegativeInteger|) (10 . *) (|PositiveInteger|)
- |ABELMON-;*;Pi2S;2| |ABELMON-;sample;S;3|
- (|RepeatedDoubling| 6) (16 . |double|) (22 . *))
- '#(|zero?| 28 |sample| 33 * 37) 'NIL
+ |ABELMON-;*;Pi2S;2| |ABELMON-;sample;S;3| (16 . |zero?|)
+ (|RepeatedDoubling| 6) (21 . |double|) (27 . *))
+ '#(|zero?| 33 |sample| 38 * 42) 'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 18
- '(0 6 0 7 2 6 8 0 0 9 2 6 0 11 0 12 2
- 16 6 13 6 17 2 0 0 11 0 18 1 0 8 0 10
- 0 0 0 15 2 0 0 11 0 18 2 0 0 13 0 14)))))
+ (|makeByteWordVec2| 19
+ '(0 6 0 7 2 6 8 0 0 9 2 6 0 11 0 12 1
+ 11 8 0 16 2 17 6 13 6 18 2 0 0 11 0
+ 19 1 0 8 0 10 0 0 0 15 2 0 0 11 0 19
+ 2 0 0 13 0 14)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp
index 93546360..9241d5a1 100644
--- a/src/algebra/strap/BOOLEAN.lsp
+++ b/src/algebra/strap/BOOLEAN.lsp
@@ -143,18 +143,18 @@
(DEFUN |BOOLEAN;size;Nni;18| ($) (DECLARE (IGNORE $)) 2)
(DEFUN |BOOLEAN;index;Pi$;19| (|i| $)
- (COND ((SPADCALL |i| (|getShellEntry| $ 26)) 'NIL) ('T 'T)))
+ (COND ((SPADCALL |i| (|getShellEntry| $ 28)) 'NIL) ('T 'T)))
(DEFUN |BOOLEAN;lookup;$Pi;20| (|a| $) (COND (|a| 1) ('T 2)))
(DEFUN |BOOLEAN;random;$;21| ($)
- (COND ((SPADCALL (|random|) (|getShellEntry| $ 26)) 'NIL) ('T 'T)))
+ (COND ((SPADCALL (|random|) (|getShellEntry| $ 28)) 'NIL) ('T 'T)))
(DEFUN |BOOLEAN;convert;$If;22| (|x| $)
- (SPADCALL (COND (|x| '|true|) ('T '|false|)) (|getShellEntry| $ 33)))
+ (SPADCALL (COND (|x| '|true|) ('T '|false|)) (|getShellEntry| $ 37)))
(DEFUN |BOOLEAN;coerce;$Of;23| (|x| $)
- (SPADCALL (COND (|x| '|true|) ('T '|false|)) (|getShellEntry| $ 36)))
+ (SPADCALL (COND (|x| '|true|) ('T '|false|)) (|getShellEntry| $ 40)))
(DEFUN |Boolean| ()
(PROG ()
@@ -178,7 +178,7 @@
(RETURN
(PROGN
(LETT |dv$| '(|Boolean|) . #0=(|Boolean|))
- (LETT $ (|newShell| 40) . #0#)
+ (LETT $ (|newShell| 44) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -192,24 +192,25 @@
(FUNCALL (|dispatchFunction| |BOOLEAN;true;$;3|) $))
(CONS IDENTITY
(FUNCALL (|dispatchFunction| |BOOLEAN;false;$;4|) $))
- |BOOLEAN;not;2$;5| |BOOLEAN;~;2$;6| |BOOLEAN;and;3$;7|
- |BOOLEAN;/\\;3$;8| |BOOLEAN;or;3$;9| |BOOLEAN;\\/;3$;10|
- |BOOLEAN;xor;3$;11| |BOOLEAN;nor;3$;12|
- |BOOLEAN;nand;3$;13| (|Boolean|) |BOOLEAN;=;3$;14|
+ |BOOLEAN;not;2$;5| (|Boolean|) (0 . |false|) (4 . |true|)
+ |BOOLEAN;~;2$;6| |BOOLEAN;and;3$;7| |BOOLEAN;/\\;3$;8|
+ |BOOLEAN;or;3$;9| |BOOLEAN;\\/;3$;10| |BOOLEAN;xor;3$;11|
+ |BOOLEAN;nor;3$;12| |BOOLEAN;nand;3$;13| |BOOLEAN;=;3$;14|
|BOOLEAN;implies;3$;15| |BOOLEAN;equiv;3$;16|
|BOOLEAN;<;3$;17| (|NonNegativeInteger|)
- |BOOLEAN;size;Nni;18| (|Integer|) (0 . |even?|)
- (|PositiveInteger|) |BOOLEAN;index;Pi$;19|
- |BOOLEAN;lookup;$Pi;20| |BOOLEAN;random;$;21| (|Symbol|)
- (|InputForm|) (5 . |convert|) |BOOLEAN;convert;$If;22|
- (|OutputForm|) (10 . |outputForm|) |BOOLEAN;coerce;$Of;23|
- (|String|) (|SingleInteger|))
- '#(~= 15 ~ 21 |xor| 26 |true| 32 |test| 36 |size| 41 |random|
- 45 |or| 49 |not| 55 |nor| 60 |nand| 66 |min| 72 |max| 82
- |lookup| 92 |latex| 97 |index| 102 |implies| 107 |hash|
- 113 |false| 118 |equiv| 122 |convert| 128 |coerce| 133
- |and| 138 |\\/| 144 >= 150 > 156 = 162 <= 168 < 174 |/\\|
- 180)
+ |BOOLEAN;size;Nni;18| (|Integer|) (8 . |even?|)
+ (|PositiveInteger|) |BOOLEAN;index;Pi$;19| (13 . |One|)
+ |BOOLEAN;lookup;$Pi;20| (17 . |random|)
+ |BOOLEAN;random;$;21| (|Symbol|) (|InputForm|)
+ (21 . |convert|) |BOOLEAN;convert;$If;22| (|OutputForm|)
+ (26 . |outputForm|) |BOOLEAN;coerce;$Of;23| (|String|)
+ (|SingleInteger|))
+ '#(~= 31 ~ 37 |xor| 42 |true| 48 |test| 52 |size| 57 |random|
+ 61 |or| 65 |not| 71 |nor| 76 |nand| 82 |min| 88 |max| 98
+ |lookup| 108 |latex| 113 |index| 118 |implies| 123 |hash|
+ 129 |false| 134 |equiv| 138 |convert| 144 |coerce| 149
+ |and| 154 |\\/| 160 >= 166 > 172 = 178 <= 184 < 190 |/\\|
+ 196)
'NIL
(CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0))
(CONS '#(NIL |OrderedSet&| NIL NIL |Logic&|
@@ -217,21 +218,22 @@
(CONS '#((|OrderedFinite|) (|OrderedSet|)
(|PropositionalLogic|) (|Finite|)
(|Logic|) (|SetCategory|)
- (|ConvertibleTo| 32) (|BasicType|)
- (|CoercibleTo| 35))
- (|makeByteWordVec2| 39
- '(1 25 18 0 26 1 32 0 31 33 1 35 0 31
- 36 2 0 18 0 0 1 1 0 0 0 10 2 0 0 0 0
- 15 0 0 0 7 1 0 0 0 6 0 0 23 24 0 0 0
- 30 2 0 0 0 0 13 1 0 0 0 9 2 0 0 0 0
- 16 2 0 0 0 0 17 0 0 0 1 2 0 0 0 0 1 0
- 0 0 1 2 0 0 0 0 1 1 0 27 0 29 1 0 38
- 0 1 1 0 0 27 28 2 0 0 0 0 20 1 0 39 0
- 1 0 0 0 8 2 0 0 0 0 21 1 0 32 0 34 1
- 0 35 0 37 2 0 0 0 0 11 2 0 0 0 0 14 2
- 0 18 0 0 1 2 0 18 0 0 1 2 0 18 0 0 19
- 2 0 18 0 0 1 2 0 18 0 0 22 2 0 0 0 0
- 12)))))
+ (|ConvertibleTo| 36) (|BasicType|)
+ (|CoercibleTo| 39))
+ (|makeByteWordVec2| 43
+ '(0 10 0 11 0 10 0 12 1 27 10 0 28 0 29
+ 0 31 0 27 0 33 1 36 0 35 37 1 39 0 35
+ 40 2 0 10 0 0 1 1 0 0 0 13 2 0 0 0 0
+ 18 0 0 0 7 1 0 0 0 6 0 0 25 26 0 0 0
+ 34 2 0 0 0 0 16 1 0 0 0 9 2 0 0 0 0
+ 19 2 0 0 0 0 20 0 0 0 1 2 0 0 0 0 1 0
+ 0 0 1 2 0 0 0 0 1 1 0 29 0 32 1 0 42
+ 0 1 1 0 0 29 30 2 0 0 0 0 22 1 0 43 0
+ 1 0 0 0 8 2 0 0 0 0 23 1 0 36 0 38 1
+ 0 39 0 41 2 0 0 0 0 14 2 0 0 0 0 17 2
+ 0 10 0 0 1 2 0 10 0 0 1 2 0 10 0 0 21
+ 2 0 10 0 0 1 2 0 10 0 0 24 2 0 0 0 0
+ 15)))))
'|lookupComplete|))
(MAKEPROP '|Boolean| 'NILADIC T)
diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp
index 9fd5e64d..ef10b20b 100644
--- a/src/algebra/strap/CHAR.lsp
+++ b/src/algebra/strap/CHAR.lsp
@@ -126,22 +126,22 @@
(DEFUN |CHAR;coerce;$Of;12| (|c| $) (DECLARE (IGNORE $)) |c|)
(DEFUN |CHAR;digit?;$B;13| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 23) (|getShellEntry| $ 25)))
+ (SPADCALL |c| (|spadConstant| $ 29) (|getShellEntry| $ 31)))
(DEFUN |CHAR;hexDigit?;$B;14| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 27) (|getShellEntry| $ 25)))
+ (SPADCALL |c| (|spadConstant| $ 33) (|getShellEntry| $ 31)))
(DEFUN |CHAR;upperCase?;$B;15| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 29) (|getShellEntry| $ 25)))
+ (SPADCALL |c| (|spadConstant| $ 35) (|getShellEntry| $ 31)))
(DEFUN |CHAR;lowerCase?;$B;16| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 31) (|getShellEntry| $ 25)))
+ (SPADCALL |c| (|spadConstant| $ 37) (|getShellEntry| $ 31)))
(DEFUN |CHAR;alphabetic?;$B;17| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 33) (|getShellEntry| $ 25)))
+ (SPADCALL |c| (|spadConstant| $ 39) (|getShellEntry| $ 31)))
(DEFUN |CHAR;alphanumeric?;$B;18| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 35) (|getShellEntry| $ 25)))
+ (SPADCALL |c| (|spadConstant| $ 41) (|getShellEntry| $ 31)))
(DEFUN |CHAR;latex;$S;19| (|c| $)
(STRCONC "\\mbox{`" (STRCONC (MAKE-FULL-CVEC 1 |c|) "'}")))
@@ -149,8 +149,8 @@
(DEFUN |CHAR;char;S$;20| (|s| $)
(COND
((EQL (QCSIZE |s|) 1)
- (SPADCALL |s| (SPADCALL |s| (|getShellEntry| $ 40))
- (|getShellEntry| $ 41)))
+ (SPADCALL |s| (SPADCALL |s| (|getShellEntry| $ 49))
+ (|getShellEntry| $ 50)))
('T (|userError| "String is not a single character"))))
(DEFUN |CHAR;upperCase;2$;21| (|c| $)
@@ -184,7 +184,7 @@
(RETURN
(PROGN
(LETT |dv$| '(|Character|) . #0=(|Character|))
- (LETT $ (|newShell| 46) . #0#)
+ (LETT $ (|newShell| 55) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -195,45 +195,50 @@
(MAKEPROP '|Character| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|Boolean|) |CHAR;=;2$B;1|
|CHAR;<;2$B;2| (|NonNegativeInteger|) |CHAR;size;Nni;3|
- |CHAR;char;Nni$;6| (|PositiveInteger|) |CHAR;index;Pi$;4|
- |CHAR;ord;$Nni;7| |CHAR;lookup;$Pi;5| |CHAR;random;$;8|
- |CHAR;space;$;9| |CHAR;quote;$;10| |CHAR;escape;$;11|
- (|OutputForm|) |CHAR;coerce;$Of;12| (|CharacterClass|)
- (0 . |digit|) (|Character|) (4 . |member?|)
- |CHAR;digit?;$B;13| (10 . |hexDigit|)
- |CHAR;hexDigit?;$B;14| (14 . |upperCase|)
- |CHAR;upperCase?;$B;15| (18 . |lowerCase|)
- |CHAR;lowerCase?;$B;16| (22 . |alphabetic|)
- |CHAR;alphabetic?;$B;17| (26 . |alphanumeric|)
- |CHAR;alphanumeric?;$B;18| (|String|) |CHAR;latex;$S;19|
- (|Integer|) (30 . |minIndex|) (35 . |elt|)
+ (|PositiveInteger|) (0 . |One|) (4 . |One|) (|Integer|)
+ (8 . -) |CHAR;char;Nni$;6| |CHAR;index;Pi$;4|
+ |CHAR;ord;$Nni;7| (14 . +) |CHAR;lookup;$Pi;5|
+ (20 . |random|) |CHAR;random;$;8| |CHAR;space;$;9|
+ |CHAR;quote;$;10| |CHAR;escape;$;11| (|OutputForm|)
+ |CHAR;coerce;$Of;12| (|CharacterClass|) (25 . |digit|)
+ (|Character|) (29 . |member?|) |CHAR;digit?;$B;13|
+ (35 . |hexDigit|) |CHAR;hexDigit?;$B;14|
+ (39 . |upperCase|) |CHAR;upperCase?;$B;15|
+ (43 . |lowerCase|) |CHAR;lowerCase?;$B;16|
+ (47 . |alphabetic|) |CHAR;alphabetic?;$B;17|
+ (51 . |alphanumeric|) |CHAR;alphanumeric?;$B;18|
+ (|String|) (55 . |new|) (61 . |concat|) |CHAR;latex;$S;19|
+ (67 . |#|) (72 . |one?|) (77 . |minIndex|) (82 . |elt|)
|CHAR;char;S$;20| |CHAR;upperCase;2$;21|
|CHAR;lowerCase;2$;22| (|SingleInteger|))
- '#(~= 41 |upperCase?| 47 |upperCase| 52 |space| 57 |size| 61
- |random| 65 |quote| 69 |ord| 73 |min| 78 |max| 88
- |lowerCase?| 98 |lowerCase| 103 |lookup| 108 |latex| 113
- |index| 118 |hexDigit?| 123 |hash| 128 |escape| 133
- |digit?| 137 |coerce| 142 |char| 147 |alphanumeric?| 157
- |alphabetic?| 162 >= 167 > 173 = 179 <= 185 < 191)
+ '#(~= 88 |upperCase?| 94 |upperCase| 99 |space| 104 |size|
+ 108 |random| 112 |quote| 116 |ord| 120 |min| 125 |max| 135
+ |lowerCase?| 145 |lowerCase| 150 |lookup| 155 |latex| 160
+ |index| 165 |hexDigit?| 170 |hash| 175 |escape| 180
+ |digit?| 184 |coerce| 189 |char| 194 |alphanumeric?| 204
+ |alphabetic?| 209 >= 214 > 220 = 226 <= 232 < 238)
'NIL
(CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0))
(CONS '#(NIL |OrderedSet&| NIL |SetCategory&|
|BasicType&| NIL)
(CONS '#((|OrderedFinite|) (|OrderedSet|)
(|Finite|) (|SetCategory|) (|BasicType|)
- (|CoercibleTo| 20))
- (|makeByteWordVec2| 45
- '(0 22 0 23 2 22 6 24 0 25 0 22 0 27 0
- 22 0 29 0 22 0 31 0 22 0 33 0 22 0 35
- 1 37 39 0 40 2 37 24 0 39 41 2 0 6 0
- 0 1 1 0 6 0 30 1 0 0 0 43 0 0 0 17 0
- 0 9 10 0 0 0 16 0 0 0 18 1 0 9 0 14 0
- 0 0 1 2 0 0 0 0 1 0 0 0 1 2 0 0 0 0 1
- 1 0 6 0 32 1 0 0 0 44 1 0 12 0 15 1 0
- 37 0 38 1 0 0 12 13 1 0 6 0 28 1 0 45
- 0 1 0 0 0 19 1 0 6 0 26 1 0 20 0 21 1
- 0 0 9 11 1 0 0 37 42 1 0 6 0 36 1 0 6
- 0 34 2 0 6 0 0 1 2 0 6 0 0 1 2 0 6 0
+ (|CoercibleTo| 26))
+ (|makeByteWordVec2| 54
+ '(0 11 0 12 0 9 0 13 2 14 0 0 0 15 2 9
+ 0 0 0 19 1 9 0 0 21 0 28 0 29 2 28 6
+ 30 0 31 0 28 0 33 0 28 0 35 0 28 0 37
+ 0 28 0 39 0 28 0 41 2 43 0 9 30 44 2
+ 43 0 0 0 45 1 43 9 0 47 1 9 6 0 48 1
+ 43 14 0 49 2 43 30 0 14 50 2 0 6 0 0
+ 1 1 0 6 0 36 1 0 0 0 52 0 0 0 23 0 0
+ 9 10 0 0 0 22 0 0 0 24 1 0 9 0 18 0 0
+ 0 1 2 0 0 0 0 1 0 0 0 1 2 0 0 0 0 1 1
+ 0 6 0 38 1 0 0 0 53 1 0 11 0 20 1 0
+ 43 0 46 1 0 0 11 17 1 0 6 0 34 1 0 54
+ 0 1 0 0 0 25 1 0 6 0 32 1 0 26 0 27 1
+ 0 0 9 16 1 0 0 43 51 1 0 6 0 42 1 0 6
+ 0 40 2 0 6 0 0 1 2 0 6 0 0 1 2 0 6 0
0 7 2 0 6 0 0 1 2 0 6 0 0 8)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/CLAGG-.lsp b/src/algebra/strap/CLAGG-.lsp
index 8af8cab5..6f4a5528 100644
--- a/src/algebra/strap/CLAGG-.lsp
+++ b/src/algebra/strap/CLAGG-.lsp
@@ -140,43 +140,43 @@
(DEFUN |CLAGG-;find;MAU;5| (|f| |c| $)
(SPADCALL |f| (SPADCALL |c| (|getShellEntry| $ 9))
- (|getShellEntry| $ 18)))
+ (|getShellEntry| $ 24)))
(DEFUN |CLAGG-;reduce;MAS;6| (|f| |x| $)
(SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9))
- (|getShellEntry| $ 21)))
+ (|getShellEntry| $ 27)))
(DEFUN |CLAGG-;reduce;MA2S;7| (|f| |x| |s| $)
(SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9)) |s|
- (|getShellEntry| $ 23)))
+ (|getShellEntry| $ 29)))
(DEFUN |CLAGG-;remove;M2A;8| (|f| |x| $)
(SPADCALL (SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9))
- (|getShellEntry| $ 25))
- (|getShellEntry| $ 26)))
+ (|getShellEntry| $ 31))
+ (|getShellEntry| $ 32)))
(DEFUN |CLAGG-;select;M2A;9| (|f| |x| $)
(SPADCALL (SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9))
- (|getShellEntry| $ 28))
- (|getShellEntry| $ 26)))
+ (|getShellEntry| $ 34))
+ (|getShellEntry| $ 32)))
(DEFUN |CLAGG-;remove;S2A;10| (|s| |x| $)
(SPADCALL (CONS #'|CLAGG-;remove;S2A;10!0| (VECTOR $ |s|)) |x|
- (|getShellEntry| $ 31)))
+ (|getShellEntry| $ 37)))
(DEFUN |CLAGG-;remove;S2A;10!0| (|#1| $$)
(SPADCALL |#1| (|getShellEntry| $$ 1)
- (|getShellEntry| (|getShellEntry| $$ 0) 30)))
+ (|getShellEntry| (|getShellEntry| $$ 0) 36)))
(DEFUN |CLAGG-;reduce;MA3S;11| (|f| |x| |s1| |s2| $)
(SPADCALL |f| (SPADCALL |x| (|getShellEntry| $ 9)) |s1| |s2|
- (|getShellEntry| $ 33)))
+ (|getShellEntry| $ 39)))
(DEFUN |CLAGG-;removeDuplicates;2A;12| (|x| $)
(SPADCALL
(SPADCALL (SPADCALL |x| (|getShellEntry| $ 9))
- (|getShellEntry| $ 35))
- (|getShellEntry| $ 26)))
+ (|getShellEntry| $ 41))
+ (|getShellEntry| $ 32)))
(DEFUN |Collection&| (|#1| |#2|)
(PROG (|dv$1| |dv$2| |dv$| $ |pv$|)
@@ -185,7 +185,7 @@
(LETT |dv$1| (|devaluate| |#1|) . #0=(|Collection&|))
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$| (LIST '|Collection&| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 37) . #0#)
+ (LETT $ (|newShell| 43) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -200,35 +200,35 @@
(COND
((|testBitVector| |pv$| 3)
(PROGN
- (|setShellEntry| $ 11
+ (|setShellEntry| $ 12
(CONS (|dispatchFunction| |CLAGG-;#;ANni;1|) $))
- (|setShellEntry| $ 14
+ (|setShellEntry| $ 18
(CONS (|dispatchFunction| |CLAGG-;count;MANni;2|) $))
- (|setShellEntry| $ 15
+ (|setShellEntry| $ 21
(CONS (|dispatchFunction| |CLAGG-;any?;MAB;3|) $))
- (|setShellEntry| $ 16
+ (|setShellEntry| $ 22
(CONS (|dispatchFunction| |CLAGG-;every?;MAB;4|) $))
- (|setShellEntry| $ 19
+ (|setShellEntry| $ 25
(CONS (|dispatchFunction| |CLAGG-;find;MAU;5|) $))
- (|setShellEntry| $ 22
+ (|setShellEntry| $ 28
(CONS (|dispatchFunction| |CLAGG-;reduce;MAS;6|) $))
- (|setShellEntry| $ 24
+ (|setShellEntry| $ 30
(CONS (|dispatchFunction| |CLAGG-;reduce;MA2S;7|) $))
- (|setShellEntry| $ 27
+ (|setShellEntry| $ 33
(CONS (|dispatchFunction| |CLAGG-;remove;M2A;8|) $))
- (|setShellEntry| $ 29
+ (|setShellEntry| $ 35
(CONS (|dispatchFunction| |CLAGG-;select;M2A;9|) $))
(COND
((|testBitVector| |pv$| 2)
(PROGN
- (|setShellEntry| $ 32
+ (|setShellEntry| $ 38
(CONS (|dispatchFunction| |CLAGG-;remove;S2A;10|)
$))
- (|setShellEntry| $ 34
+ (|setShellEntry| $ 40
(CONS (|dispatchFunction|
|CLAGG-;reduce;MA3S;11|)
$))
- (|setShellEntry| $ 36
+ (|setShellEntry| $ 42
(CONS (|dispatchFunction|
|CLAGG-;removeDuplicates;2A;12|)
$))))))))
@@ -237,34 +237,38 @@
(MAKEPROP '|Collection&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|)
(|List| 7) (0 . |parts|) (|NonNegativeInteger|) (5 . |#|)
- (|Boolean|) (|Mapping| 12 7) (10 . |count|) (16 . |any?|)
- (22 . |every?|) (|Union| 7 '"failed") (28 . |find|)
- (34 . |find|) (|Mapping| 7 7 7) (40 . |reduce|)
- (46 . |reduce|) (52 . |reduce|) (59 . |reduce|)
- (66 . |remove|) (72 . |construct|) (77 . |remove|)
- (83 . |select|) (89 . |select|) (95 . =) (101 . |remove|)
- (107 . |remove|) (113 . |reduce|) (121 . |reduce|)
- (129 . |removeDuplicates|) (134 . |removeDuplicates|))
- '#(|select| 139 |removeDuplicates| 145 |remove| 150 |reduce|
- 162 |find| 183 |every?| 189 |count| 195 |any?| 201 |#|
- 207)
+ (10 . |#|) (15 . |One|) (19 . +) (25 . |Zero|) (|Boolean|)
+ (|Mapping| 16 7) (29 . |count|) (35 . |true|)
+ (39 . |false|) (43 . |any?|) (49 . |every?|)
+ (|Union| 7 '"failed") (55 . |find|) (61 . |find|)
+ (|Mapping| 7 7 7) (67 . |reduce|) (73 . |reduce|)
+ (79 . |reduce|) (86 . |reduce|) (93 . |remove|)
+ (99 . |construct|) (104 . |remove|) (110 . |select|)
+ (116 . |select|) (122 . =) (128 . |remove|)
+ (134 . |remove|) (140 . |reduce|) (148 . |reduce|)
+ (156 . |removeDuplicates|) (161 . |removeDuplicates|))
+ '#(|select| 166 |removeDuplicates| 172 |remove| 177 |reduce|
+ 189 |find| 210 |every?| 216 |count| 222 |any?| 228 |#|
+ 234)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 36
- '(1 6 8 0 9 1 0 10 0 11 2 0 10 13 0 14
- 2 0 12 13 0 15 2 0 12 13 0 16 2 8 17
- 13 0 18 2 0 17 13 0 19 2 8 7 20 0 21
- 2 0 7 20 0 22 3 8 7 20 0 7 23 3 0 7
- 20 0 7 24 2 8 0 13 0 25 1 6 0 8 26 2
- 0 0 13 0 27 2 8 0 13 0 28 2 0 0 13 0
- 29 2 7 12 0 0 30 2 6 0 13 0 31 2 0 0
- 7 0 32 4 8 7 20 0 7 7 33 4 0 7 20 0 7
- 7 34 1 8 0 0 35 1 0 0 0 36 2 0 0 13 0
- 29 1 0 0 0 36 2 0 0 7 0 32 2 0 0 13 0
- 27 4 0 7 20 0 7 7 34 3 0 7 20 0 7 24
- 2 0 7 20 0 22 2 0 17 13 0 19 2 0 12
- 13 0 16 2 0 10 13 0 14 2 0 12 13 0 15
- 1 0 10 0 11)))))
+ (|makeByteWordVec2| 42
+ '(1 6 8 0 9 1 8 10 0 11 1 0 10 0 12 0
+ 10 0 13 2 10 0 0 0 14 0 10 0 15 2 0
+ 10 17 0 18 0 16 0 19 0 16 0 20 2 0 16
+ 17 0 21 2 0 16 17 0 22 2 8 23 17 0 24
+ 2 0 23 17 0 25 2 8 7 26 0 27 2 0 7 26
+ 0 28 3 8 7 26 0 7 29 3 0 7 26 0 7 30
+ 2 8 0 17 0 31 1 6 0 8 32 2 0 0 17 0
+ 33 2 8 0 17 0 34 2 0 0 17 0 35 2 7 16
+ 0 0 36 2 6 0 17 0 37 2 0 0 7 0 38 4 8
+ 7 26 0 7 7 39 4 0 7 26 0 7 7 40 1 8 0
+ 0 41 1 0 0 0 42 2 0 0 17 0 35 1 0 0 0
+ 42 2 0 0 7 0 38 2 0 0 17 0 33 4 0 7
+ 26 0 7 7 40 3 0 7 26 0 7 30 2 0 7 26
+ 0 28 2 0 23 17 0 25 2 0 16 17 0 22 2
+ 0 10 17 0 18 2 0 16 17 0 21 1 0 10 0
+ 12)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp
index d3096b93..5e8043f1 100644
--- a/src/algebra/strap/DFLOAT.lsp
+++ b/src/algebra/strap/DFLOAT.lsp
@@ -386,9 +386,9 @@
(|getShellEntry| $ 10))
|DFLOAT;OMwrite;$S;1|)
(SPADCALL |dev| (|getShellEntry| $ 12))
- (SPADCALL |dev| |x| (|getShellEntry| $ 14))
- (SPADCALL |dev| (|getShellEntry| $ 15))
+ (SPADCALL |dev| |x| (|getShellEntry| $ 15))
(SPADCALL |dev| (|getShellEntry| $ 16))
+ (SPADCALL |dev| (|getShellEntry| $ 17))
(LETT |s| (OM-STRINGPTRTOSTRING |sp|) |DFLOAT;OMwrite;$S;1|)
(EXIT |s|)))))
@@ -403,23 +403,23 @@
(|getShellEntry| $ 10))
|DFLOAT;OMwrite;$BS;2|)
(COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 12))))
- (SPADCALL |dev| |x| (|getShellEntry| $ 14))
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 15))))
- (SPADCALL |dev| (|getShellEntry| $ 16))
+ (SPADCALL |dev| |x| (|getShellEntry| $ 15))
+ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 16))))
+ (SPADCALL |dev| (|getShellEntry| $ 17))
(LETT |s| (OM-STRINGPTRTOSTRING |sp|)
|DFLOAT;OMwrite;$BS;2|)
(EXIT |s|)))))
(DEFUN |DFLOAT;OMwrite;Omd$V;3| (|dev| |x| $)
(SEQ (SPADCALL |dev| (|getShellEntry| $ 12))
- (SPADCALL |dev| |x| (|getShellEntry| $ 14))
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 15)))))
+ (SPADCALL |dev| |x| (|getShellEntry| $ 15))
+ (EXIT (SPADCALL |dev| (|getShellEntry| $ 16)))))
(DEFUN |DFLOAT;OMwrite;Omd$BV;4| (|dev| |x| |wholeObj| $)
(SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 12))))
- (SPADCALL |dev| |x| (|getShellEntry| $ 14))
+ (SPADCALL |dev| |x| (|getShellEntry| $ 15))
(EXIT (COND
- (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 15)))))))
+ (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 16)))))))
(DEFUN |DFLOAT;checkComplex| (|x| $)
(DECLARE (IGNORE $))
@@ -448,7 +448,7 @@
(FLOAT (FLOAT-RADIX 0.0)
|$DoubleFloatMaximum|)
$)
- (|getShellEntry| $ 29)))
+ (|getShellEntry| $ 35)))
|DFLOAT;bits;Pi;10|)
(|check-subtype|
(AND (COND ((< #0# 0) 'NIL) ('T 'T)) (< 0 #0#))
@@ -480,10 +480,10 @@
(DEFUN |DFLOAT;pi;$;17| ($) (DECLARE (IGNORE $)) PI)
(DEFUN |DFLOAT;coerce;$Of;18| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 39)))
+ (SPADCALL |x| (|getShellEntry| $ 49)))
(DEFUN |DFLOAT;convert;$If;19| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 42)))
+ (SPADCALL |x| (|getShellEntry| $ 52)))
(DEFUN |DFLOAT;<;2$B;20| (|x| |y| $) (DECLARE (IGNORE $)) (< |x| |y|))
@@ -595,10 +595,10 @@
(DEFUN |DFLOAT;differentiate;2$;68| (|x| $) (DECLARE (IGNORE $)) 0.0)
(DEFUN |DFLOAT;Gamma;2$;69| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 95)))
+ (SPADCALL |x| (|getShellEntry| $ 104)))
(DEFUN |DFLOAT;Beta;3$;70| (|x| |y| $)
- (SPADCALL |x| |y| (|getShellEntry| $ 97)))
+ (SPADCALL |x| |y| (|getShellEntry| $ 106)))
(DEFUN |DFLOAT;wholePart;$I;71| (|x| $)
(DECLARE (IGNORE $))
@@ -610,7 +610,7 @@
(DEFUN |DFLOAT;convert;2$;73| (|x| $) (DECLARE (IGNORE $)) |x|)
(DEFUN |DFLOAT;convert;$F;74| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 103)))
+ (SPADCALL |x| (|getShellEntry| $ 110)))
(DEFUN |DFLOAT;rationalApproximation;$NniF;75| (|x| |d| $)
(|DFLOAT;rationalApproximation;$2NniF;84| |x| |d| 10 $))
@@ -716,7 +716,7 @@
(DEFUN |DFLOAT;rationalApproximation;$2NniF;84| (|f| |d| |b| $)
(PROG (|#G103| |nu| |ex| BASE #0=#:G1530 |de| |tol| |#G104| |q| |r|
- |p2| |q2| #1=#:G1538 |#G105| |#G106| |p0| |p1| |#G107|
+ |p2| |q2| #1=#:G1539 |#G105| |#G106| |p0| |p1| |#G107|
|#G108| |q0| |q1| |#G109| |#G110| |s| |t|)
(RETURN
(SEQ (EXIT (SEQ (PROGN
@@ -788,14 +788,14 @@
(- (* |nu| |q2|)
(* |de| |p2|)))
(|getShellEntry| $
- 120))
+ 141))
(* |de| (ABS |p2|))))
(EXIT
(PROGN
(LETT #1#
(SPADCALL |p2| |q2|
(|getShellEntry| $
- 119))
+ 139))
|DFLOAT;rationalApproximation;$2NniF;84|)
(GO #1#)))))
(PROGN
@@ -838,34 +838,34 @@
((< |ex| 0) 'NIL)
('T 'T))
'(|NonNegativeInteger|) |ex|))))
- (|getShellEntry| $ 121)))))))
+ (|getShellEntry| $ 142)))))))
#1# (EXIT #1#)))))
(DEFUN |DFLOAT;**;$F$;85| (|x| |r| $)
- (PROG (|n| |d| #0=#:G1548)
+ (PROG (|n| |d| #0=#:G1549)
(RETURN
(SEQ (EXIT (COND
((ZEROP |x|)
(COND
- ((SPADCALL |r| (|getShellEntry| $ 122))
+ ((SPADCALL |r| (|getShellEntry| $ 143))
(|error| "0**0 is undefined"))
- ((SPADCALL |r| (|getShellEntry| $ 123))
+ ((SPADCALL |r| (|getShellEntry| $ 144))
(|error| "division by 0"))
('T 0.0)))
- ((OR (SPADCALL |r| (|getShellEntry| $ 122))
+ ((OR (SPADCALL |r| (|getShellEntry| $ 143))
(= |x| 1.0))
1.0)
('T
(COND
- ((SPADCALL |r| (|getShellEntry| $ 124)) |x|)
+ ((SPADCALL |r| (|getShellEntry| $ 145)) |x|)
('T
(SEQ (LETT |n|
(SPADCALL |r|
- (|getShellEntry| $ 125))
+ (|getShellEntry| $ 146))
|DFLOAT;**;$F$;85|)
(LETT |d|
(SPADCALL |r|
- (|getShellEntry| $ 126))
+ (|getShellEntry| $ 147))
|DFLOAT;**;$F$;85|)
(EXIT (COND
((MINUSP |x|)
@@ -925,7 +925,7 @@
(RETURN
(PROGN
(LETT |dv$| '(|DoubleFloat|) . #0=(|DoubleFloat|))
- (LETT $ (|newShell| 140) . #0#)
+ (LETT $ (|newShell| 161) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -937,26 +937,28 @@
(LIST '#(NIL NIL NIL NIL NIL NIL (|OpenMathEncoding|)
(0 . |OMencodingXML|) (|String|) (|OpenMathDevice|)
(4 . |OMopenString|) (|Void|) (10 . |OMputObject|)
- (|DoubleFloat|) (15 . |OMputFloat|)
+ (|DoubleFloat|) |DFLOAT;convert;2$;73| (15 . |OMputFloat|)
(21 . |OMputEndObject|) (26 . |OMclose|)
|DFLOAT;OMwrite;$S;1| (|Boolean|) |DFLOAT;OMwrite;$BS;2|
|DFLOAT;OMwrite;Omd$V;3| |DFLOAT;OMwrite;Omd$BV;4|
- (|PositiveInteger|) |DFLOAT;base;Pi;6| (|Integer|)
- |DFLOAT;mantissa;$I;7| |DFLOAT;exponent;$I;8|
- |DFLOAT;precision;Pi;9| |DFLOAT;log2;2$;37| (31 . *)
- |DFLOAT;bits;Pi;10| |DFLOAT;max;$;11| |DFLOAT;min;$;12|
- |DFLOAT;order;$I;13|
(CONS IDENTITY
(FUNCALL (|dispatchFunction| |DFLOAT;Zero;$;14|) $))
+ (|PositiveInteger|) |DFLOAT;base;Pi;6| (|Integer|)
+ |DFLOAT;mantissa;$I;7| |DFLOAT;exponent;$I;8|
+ |DFLOAT;precision;Pi;9| (31 . |base|) (35 . =) (41 . *)
+ (47 . |coerce|) |DFLOAT;log2;2$;37| (52 . *)
+ |DFLOAT;wholePart;$I;71| |DFLOAT;bits;Pi;10|
+ |DFLOAT;max;$;11| |DFLOAT;min;$;12| (58 . +) (64 . |One|)
+ (68 . -) |DFLOAT;order;$I;13|
(CONS IDENTITY
(FUNCALL (|dispatchFunction| |DFLOAT;One;$;15|) $))
- |DFLOAT;exp1;$;16| |DFLOAT;pi;$;17| (|OutputForm|)
- (37 . |outputForm|) |DFLOAT;coerce;$Of;18| (|InputForm|)
- (42 . |convert|) |DFLOAT;convert;$If;19| |DFLOAT;<;2$B;20|
- |DFLOAT;-;2$;21| |DFLOAT;+;3$;22| |DFLOAT;-;3$;23|
- |DFLOAT;*;3$;24| |DFLOAT;*;I2$;25| |DFLOAT;max;3$;26|
- |DFLOAT;min;3$;27| |DFLOAT;=;2$B;28| |DFLOAT;/;$I$;29|
- |DFLOAT;sqrt;2$;30| |DFLOAT;log10;2$;31|
+ |DFLOAT;/;3$;62| |DFLOAT;exp1;$;16| |DFLOAT;pi;$;17|
+ (|OutputForm|) (74 . |outputForm|) |DFLOAT;coerce;$Of;18|
+ (|InputForm|) (79 . |convert|) |DFLOAT;convert;$If;19|
+ |DFLOAT;<;2$B;20| |DFLOAT;-;2$;21| |DFLOAT;+;3$;22|
+ |DFLOAT;-;3$;23| |DFLOAT;*;3$;24| |DFLOAT;*;I2$;25|
+ |DFLOAT;max;3$;26| |DFLOAT;min;3$;27| |DFLOAT;=;2$B;28|
+ |DFLOAT;/;$I$;29| |DFLOAT;sqrt;2$;30| |DFLOAT;log10;2$;31|
|DFLOAT;**;$I$;32| |DFLOAT;**;3$;33| |DFLOAT;coerce;I$;34|
|DFLOAT;exp;2$;35| |DFLOAT;log;2$;36| |DFLOAT;sin;2$;38|
|DFLOAT;cos;2$;39| |DFLOAT;tan;2$;40| |DFLOAT;cot;2$;41|
@@ -969,62 +971,63 @@
|DFLOAT;sech;2$;55| |DFLOAT;asinh;2$;56|
|DFLOAT;acosh;2$;57| |DFLOAT;atanh;2$;58|
|DFLOAT;acsch;2$;59| |DFLOAT;acoth;2$;60|
- |DFLOAT;asech;2$;61| |DFLOAT;/;3$;62|
- |DFLOAT;negative?;$B;63| |DFLOAT;zero?;$B;64|
- |DFLOAT;one?;$B;65| (|SingleInteger|) |DFLOAT;hash;$Si;66|
- (|Union| $ '"failed") |DFLOAT;recip;$U;67|
- |DFLOAT;differentiate;2$;68|
- (|DoubleFloatSpecialFunctions|) (47 . |Gamma|)
- |DFLOAT;Gamma;2$;69| (52 . |Beta|) |DFLOAT;Beta;3$;70|
- |DFLOAT;wholePart;$I;71| |DFLOAT;float;2IPi$;72|
- |DFLOAT;convert;2$;73| (|Float|) (58 . |convert|)
- |DFLOAT;convert;$F;74| (|Fraction| 24)
+ |DFLOAT;asech;2$;61| |DFLOAT;negative?;$B;63|
+ |DFLOAT;zero?;$B;64| |DFLOAT;one?;$B;65| (|SingleInteger|)
+ |DFLOAT;hash;$Si;66| (|Union| $ '"failed")
+ |DFLOAT;recip;$U;67| |DFLOAT;differentiate;2$;68|
+ (|DoubleFloatSpecialFunctions|) (84 . |Gamma|)
+ |DFLOAT;Gamma;2$;69| (89 . |Beta|) |DFLOAT;Beta;3$;70|
+ |DFLOAT;float;2IPi$;72| (|Float|) (95 . |convert|)
+ |DFLOAT;convert;$F;74| (|Fraction| 26)
(|NonNegativeInteger|)
|DFLOAT;rationalApproximation;$2NniF;84|
- |DFLOAT;rationalApproximation;$NniF;75|
- |DFLOAT;atan;3$;76| |DFLOAT;retract;$F;77|
- (|Union| 105 '"failed") |DFLOAT;retractIfCan;$U;78|
- |DFLOAT;retract;$I;79| (|Union| 24 '"failed")
- |DFLOAT;retractIfCan;$U;80| |DFLOAT;sign;$I;81|
- |DFLOAT;abs;2$;82| (63 . |Zero|) (67 . /) (73 . *)
- (79 . |coerce|) (84 . |zero?|) (89 . |negative?|)
- (94 . |one?|) (99 . |numer|) (104 . |denom|)
- |DFLOAT;**;$F$;85| (|PatternMatchResult| 102 $)
- (|Pattern| 102) (|Factored| $)
- (|Record| (|:| |coef1| $) (|:| |coef2| $))
- (|Union| 131 '"failed") (|List| $) (|Union| 133 '"failed")
+ |DFLOAT;rationalApproximation;$NniF;75| (100 . |Zero|)
+ |DFLOAT;abs;2$;82| |DFLOAT;atan;3$;76| (104 . |One|)
+ |DFLOAT;retract;$F;77| (|Union| 112 '"failed")
+ |DFLOAT;retractIfCan;$U;78| |DFLOAT;retract;$I;79|
+ (|Union| 26 '"failed") |DFLOAT;retractIfCan;$U;80|
+ |DFLOAT;sign;$I;81| (108 . *) (114 . **) (120 . |Zero|)
+ (124 . |Zero|) (128 . <) (134 . -) (139 . **) (145 . <)
+ (151 . **)
+ (|Record| (|:| |quotient| $) (|:| |remainder| $))
+ (157 . |divide|) (163 . =) (169 . /) (175 . |abs|)
+ (180 . *) (186 . |coerce|) (191 . |zero?|)
+ (196 . |negative?|) (201 . |one?|) (206 . |numer|)
+ (211 . |denom|) (216 . |odd?|) |DFLOAT;**;$F$;85|
+ (|PatternMatchResult| 109 $) (|Pattern| 109)
+ (|Factored| $) (|Record| (|:| |coef1| $) (|:| |coef2| $))
+ (|Union| 153 '"failed") (|List| $) (|Union| 155 '"failed")
(|Record| (|:| |coef1| $) (|:| |coef2| $)
(|:| |generator| $))
- (|Record| (|:| |quotient| $) (|:| |remainder| $))
(|SparseUnivariatePolynomial| $)
- (|Record| (|:| |coef| 133) (|:| |generator| $))
+ (|Record| (|:| |coef| 155) (|:| |generator| $))
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $)))
- '#(~= 109 |zero?| 115 |wholePart| 120 |unitNormal| 125
- |unitCanonical| 130 |unit?| 135 |truncate| 140 |tanh| 145
- |tan| 150 |subtractIfCan| 155 |squareFreePart| 161
- |squareFree| 166 |sqrt| 171 |sizeLess?| 176 |sinh| 182
- |sin| 187 |sign| 192 |sech| 197 |sec| 202 |sample| 207
- |round| 211 |retractIfCan| 216 |retract| 226 |rem| 236
- |recip| 242 |rationalApproximation| 247 |quo| 260
- |principalIdeal| 266 |prime?| 271 |precision| 276
- |positive?| 280 |pi| 285 |patternMatch| 289 |order| 296
- |one?| 301 |nthRoot| 306 |norm| 312 |negative?| 317
- |multiEuclidean| 322 |min| 328 |max| 338 |mantissa| 348
- |log2| 353 |log10| 358 |log| 363 |lcm| 368 |latex| 379
- |inv| 384 |hash| 389 |gcdPolynomial| 394 |gcd| 400
- |fractionPart| 411 |floor| 416 |float| 421 |factor| 434
- |extendedEuclidean| 439 |exquo| 452 |expressIdealMember|
- 458 |exponent| 464 |exp1| 469 |exp| 473 |euclideanSize|
- 478 |divide| 483 |digits| 489 |differentiate| 493 |csch|
- 504 |csc| 509 |coth| 514 |cot| 519 |cosh| 524 |cos| 529
- |convert| 534 |coerce| 554 |characteristic| 584 |ceiling|
- 588 |bits| 593 |base| 597 |atanh| 601 |atan| 606
- |associates?| 617 |asinh| 623 |asin| 628 |asech| 633
- |asec| 638 |acsch| 643 |acsc| 648 |acoth| 653 |acot| 658
- |acosh| 663 |acos| 668 |abs| 673 |Zero| 678 |One| 682
- |OMwrite| 686 |Gamma| 710 D 715 |Beta| 726 >= 732 > 738 =
- 744 <= 750 < 756 / 762 - 774 + 785 ** 791 * 821)
+ '#(~= 221 |zero?| 227 |wholePart| 232 |unitNormal| 237
+ |unitCanonical| 242 |unit?| 247 |truncate| 252 |tanh| 257
+ |tan| 262 |subtractIfCan| 267 |squareFreePart| 273
+ |squareFree| 278 |sqrt| 283 |sizeLess?| 288 |sinh| 294
+ |sin| 299 |sign| 304 |sech| 309 |sec| 314 |sample| 319
+ |round| 323 |retractIfCan| 328 |retract| 338 |rem| 348
+ |recip| 354 |rationalApproximation| 359 |quo| 372
+ |principalIdeal| 378 |prime?| 383 |precision| 388
+ |positive?| 392 |pi| 397 |patternMatch| 401 |order| 408
+ |one?| 413 |nthRoot| 418 |norm| 424 |negative?| 429
+ |multiEuclidean| 434 |min| 440 |max| 450 |mantissa| 460
+ |log2| 465 |log10| 470 |log| 475 |lcm| 480 |latex| 491
+ |inv| 496 |hash| 501 |gcdPolynomial| 506 |gcd| 512
+ |fractionPart| 523 |floor| 528 |float| 533 |factor| 546
+ |extendedEuclidean| 551 |exquo| 564 |expressIdealMember|
+ 570 |exponent| 576 |exp1| 581 |exp| 585 |euclideanSize|
+ 590 |divide| 595 |digits| 601 |differentiate| 605 |csch|
+ 616 |csc| 621 |coth| 626 |cot| 631 |cosh| 636 |cos| 641
+ |convert| 646 |coerce| 666 |characteristic| 696 |ceiling|
+ 700 |bits| 705 |base| 709 |atanh| 713 |atan| 718
+ |associates?| 729 |asinh| 735 |asin| 740 |asech| 745
+ |asec| 750 |acsch| 755 |acsc| 760 |acoth| 765 |acot| 770
+ |acosh| 775 |acos| 780 |abs| 785 |Zero| 790 |One| 794
+ |OMwrite| 798 |Gamma| 822 D 827 |Beta| 838 >= 844 > 850 =
+ 856 <= 862 < 868 / 874 - 886 + 897 ** 903 * 933)
'((|approximate| . 0) (|canonicalsClosed| . 0)
(|canonicalUnitNormal| . 0) (|noZeroDivisors| . 0)
((|commutative| "*") . 0) (|rightUnitary| . 0)
@@ -1058,14 +1061,14 @@
(|PrincipalIdealDomain|)
(|UniqueFactorizationDomain|)
(|GcdDomain|) (|DivisionRing|)
- (|IntegralDomain|) (|Algebra| 105)
+ (|IntegralDomain|) (|Algebra| 112)
(|Algebra| $$) (|DifferentialRing|)
(|CharacteristicZero|) (|OrderedRing|)
- (|Module| 105) (|EntireRing|)
+ (|Module| 112) (|EntireRing|)
(|CommutativeRing|) (|Module| $$)
- (|BiModule| 105 105) (|BiModule| $$ $$)
+ (|BiModule| 112 112) (|BiModule| $$ $$)
(|Ring|) (|OrderedAbelianGroup|)
- (|RightModule| 105) (|LeftModule| 105)
+ (|RightModule| 112) (|LeftModule| 112)
(|LeftModule| $$) (|Rng|)
(|RightModule| $$)
(|OrderedCancellationAbelianMonoid|)
@@ -1074,81 +1077,89 @@
(|CancellationAbelianMonoid|)
(|OrderedAbelianSemiGroup|)
(|AbelianMonoid|) (|Monoid|)
- (|PatternMatchable| 102) (|OrderedSet|)
+ (|PatternMatchable| 109) (|OrderedSet|)
(|AbelianSemiGroup|) (|SemiGroup|)
(|TranscendentalFunctionCategory|)
- (|RetractableTo| 105)
- (|RetractableTo| 24) (|RealConstant|)
- (|SetCategory|) (|ConvertibleTo| 41)
+ (|RetractableTo| 112)
+ (|RetractableTo| 26) (|RealConstant|)
+ (|SetCategory|) (|ConvertibleTo| 51)
(|ElementaryFunctionCategory|)
(|ArcHyperbolicFunctionCategory|)
(|HyperbolicFunctionCategory|)
(|ArcTrigonometricFunctionCategory|)
(|TrigonometricFunctionCategory|)
- (|OpenMath|) (|ConvertibleTo| 129)
+ (|OpenMath|) (|ConvertibleTo| 151)
(|RadicalCategory|)
- (|ConvertibleTo| 102)
+ (|ConvertibleTo| 109)
(|ConvertibleTo| 13)
- (|CoercibleFrom| 105)
+ (|CoercibleFrom| 112)
(|CoercibleFrom| $$)
- (|CoercibleFrom| 24) (|BasicType|)
- (|CoercibleTo| 38))
- (|makeByteWordVec2| 139
+ (|CoercibleFrom| 26) (|BasicType|)
+ (|CoercibleTo| 48))
+ (|makeByteWordVec2| 160
'(0 6 0 7 2 9 0 8 6 10 1 9 11 0 12 2 9
- 11 0 13 14 1 9 11 0 15 1 9 11 0 16 2
- 0 0 22 0 29 1 38 0 13 39 1 41 0 13 42
- 1 94 13 13 95 2 94 13 13 13 97 1 102
- 0 13 103 0 105 0 118 2 105 0 24 24
- 119 2 24 0 106 0 120 1 105 0 24 121 1
- 105 18 0 122 1 105 18 0 123 1 105 18
- 0 124 1 105 24 0 125 1 105 24 0 126 2
- 0 18 0 0 1 1 0 18 0 87 1 0 24 0 99 1
- 0 139 0 1 1 0 0 0 1 1 0 18 0 1 1 0 0
- 0 1 1 0 0 0 75 1 0 0 0 63 2 0 91 0 0
- 1 1 0 0 0 1 1 0 130 0 1 1 0 0 0 54 2
- 0 18 0 0 1 1 0 0 0 73 1 0 0 0 61 1 0
- 24 0 116 1 0 0 0 78 1 0 0 0 65 0 0 0
- 1 1 0 0 0 1 1 0 111 0 112 1 0 114 0
- 115 1 0 105 0 110 1 0 24 0 113 2 0 0
- 0 0 1 1 0 91 0 92 2 0 105 0 106 108 3
- 0 105 0 106 106 107 2 0 0 0 0 1 1 0
- 138 133 1 1 0 18 0 1 0 0 22 27 1 0 18
- 0 1 0 0 0 37 3 0 128 0 129 128 1 1 0
- 24 0 33 1 0 18 0 88 2 0 0 0 24 1 1 0
- 0 0 1 1 0 18 0 86 2 0 134 133 0 1 0 0
- 0 32 2 0 0 0 0 51 0 0 0 31 2 0 0 0 0
- 50 1 0 24 0 25 1 0 0 0 28 1 0 0 0 55
- 1 0 0 0 60 2 0 0 0 0 1 1 0 0 133 1 1
- 0 8 0 1 1 0 0 0 1 1 0 89 0 90 2 0 137
- 137 137 1 1 0 0 133 1 2 0 0 0 0 1 1 0
- 0 0 1 1 0 0 0 1 3 0 0 24 24 22 100 2
- 0 0 24 24 1 1 0 130 0 1 3 0 132 0 0 0
- 1 2 0 135 0 0 1 2 0 91 0 0 1 2 0 134
- 133 0 1 1 0 24 0 26 0 0 0 36 1 0 0 0
- 59 1 0 106 0 1 2 0 136 0 0 1 0 0 22 1
- 1 0 0 0 93 2 0 0 0 106 1 1 0 0 0 76 1
- 0 0 0 66 1 0 0 0 77 1 0 0 0 64 1 0 0
- 0 74 1 0 0 0 62 1 0 41 0 43 1 0 129 0
- 1 1 0 102 0 104 1 0 13 0 101 1 0 0
- 105 1 1 0 0 24 58 1 0 0 105 1 1 0 0 0
- 1 1 0 0 24 58 1 0 38 0 40 0 0 106 1 1
- 0 0 0 1 0 0 22 30 0 0 22 23 1 0 0 0
- 81 2 0 0 0 0 109 1 0 0 0 69 2 0 18 0
- 0 1 1 0 0 0 79 1 0 0 0 67 1 0 0 0 84
- 1 0 0 0 72 1 0 0 0 82 1 0 0 0 70 1 0
- 0 0 83 1 0 0 0 71 1 0 0 0 80 1 0 0 0
- 68 1 0 0 0 117 0 0 0 34 0 0 0 35 2 0
- 11 9 0 20 3 0 11 9 0 18 21 1 0 8 0 17
- 2 0 8 0 18 19 1 0 0 0 96 1 0 0 0 1 2
- 0 0 0 106 1 2 0 0 0 0 98 2 0 18 0 0 1
- 2 0 18 0 0 1 2 0 18 0 0 52 2 0 18 0 0
- 1 2 0 18 0 0 44 2 0 0 0 24 53 2 0 0 0
- 0 85 2 0 0 0 0 47 1 0 0 0 45 2 0 0 0
- 0 46 2 0 0 0 0 57 2 0 0 0 105 127 2 0
- 0 0 24 56 2 0 0 0 106 1 2 0 0 0 22 1
- 2 0 0 105 0 1 2 0 0 0 105 1 2 0 0 0 0
- 48 2 0 0 24 0 49 2 0 0 106 0 1 2 0 0
- 22 0 29)))))
+ 11 0 13 15 1 9 11 0 16 1 9 11 0 17 0
+ 26 0 30 2 24 19 0 0 31 2 24 0 24 0 32
+ 1 0 0 26 33 2 0 0 24 0 35 2 26 0 0 0
+ 40 0 26 0 41 2 26 0 0 0 42 1 48 0 13
+ 49 1 51 0 13 52 1 103 13 13 104 2 103
+ 13 13 13 106 1 109 0 13 110 0 26 0
+ 116 0 24 0 119 2 26 0 26 0 127 2 26 0
+ 0 113 128 0 112 0 129 0 113 0 130 2
+ 26 19 0 0 131 1 26 0 0 132 2 24 0 0
+ 113 133 2 113 19 0 0 134 2 113 0 0
+ 113 135 2 26 136 0 0 137 2 26 19 0 0
+ 138 2 112 0 26 26 139 1 26 0 0 140 2
+ 26 0 113 0 141 1 112 0 26 142 1 112
+ 19 0 143 1 112 19 0 144 1 112 19 0
+ 145 1 112 26 0 146 1 112 26 0 147 1
+ 26 19 0 148 2 0 19 0 0 1 1 0 19 0 96
+ 1 0 26 0 36 1 0 160 0 1 1 0 0 0 1 1 0
+ 19 0 1 1 0 0 0 1 1 0 0 0 85 1 0 0 0
+ 73 2 0 100 0 0 1 1 0 0 0 1 1 0 152 0
+ 1 1 0 0 0 64 2 0 19 0 0 1 1 0 0 0 83
+ 1 0 0 0 71 1 0 26 0 126 1 0 0 0 88 1
+ 0 0 0 75 0 0 0 1 1 0 0 0 1 1 0 121 0
+ 122 1 0 124 0 125 1 0 112 0 120 1 0
+ 26 0 123 2 0 0 0 0 1 1 0 100 0 101 2
+ 0 112 0 113 115 3 0 112 0 113 113 114
+ 2 0 0 0 0 1 1 0 159 155 1 1 0 19 0 1
+ 0 0 24 29 1 0 19 0 1 0 0 0 47 3 0 150
+ 0 151 150 1 1 0 26 0 43 1 0 19 0 97 2
+ 0 0 0 26 1 1 0 0 0 1 1 0 19 0 95 2 0
+ 156 155 0 1 0 0 0 39 2 0 0 0 0 61 0 0
+ 0 38 2 0 0 0 0 60 1 0 26 0 27 1 0 0 0
+ 34 1 0 0 0 65 1 0 0 0 70 2 0 0 0 0 1
+ 1 0 0 155 1 1 0 8 0 1 1 0 0 0 1 1 0
+ 98 0 99 2 0 158 158 158 1 1 0 0 155 1
+ 2 0 0 0 0 1 1 0 0 0 1 1 0 0 0 1 3 0 0
+ 26 26 24 108 2 0 0 26 26 1 1 0 152 0
+ 1 3 0 154 0 0 0 1 2 0 157 0 0 1 2 0
+ 100 0 0 1 2 0 156 155 0 1 1 0 26 0 28
+ 0 0 0 46 1 0 0 0 69 1 0 113 0 1 2 0
+ 136 0 0 1 0 0 24 1 1 0 0 0 102 2 0 0
+ 0 113 1 1 0 0 0 86 1 0 0 0 76 1 0 0 0
+ 87 1 0 0 0 74 1 0 0 0 84 1 0 0 0 72 1
+ 0 51 0 53 1 0 151 0 1 1 0 109 0 111 1
+ 0 13 0 14 1 0 0 112 1 1 0 0 26 68 1 0
+ 0 112 1 1 0 0 0 1 1 0 0 26 68 1 0 48
+ 0 50 0 0 113 1 1 0 0 0 1 0 0 24 37 0
+ 0 24 25 1 0 0 0 91 2 0 0 0 0 118 1 0
+ 0 0 79 2 0 19 0 0 1 1 0 0 0 89 1 0 0
+ 0 77 1 0 0 0 94 1 0 0 0 82 1 0 0 0 92
+ 1 0 0 0 80 1 0 0 0 93 1 0 0 0 81 1 0
+ 0 0 90 1 0 0 0 78 1 0 0 0 117 0 0 0
+ 23 0 0 0 44 2 0 11 9 0 21 3 0 11 9 0
+ 19 22 1 0 8 0 18 2 0 8 0 19 20 1 0 0
+ 0 105 1 0 0 0 1 2 0 0 0 113 1 2 0 0 0
+ 0 107 2 0 19 0 0 1 2 0 19 0 0 1 2 0
+ 19 0 0 62 2 0 19 0 0 1 2 0 19 0 0 54
+ 2 0 0 0 26 63 2 0 0 0 0 45 2 0 0 0 0
+ 57 1 0 0 0 55 2 0 0 0 0 56 2 0 0 0 0
+ 67 2 0 0 0 112 149 2 0 0 0 26 66 2 0
+ 0 0 113 1 2 0 0 0 24 1 2 0 0 112 0 1
+ 2 0 0 0 112 1 2 0 0 0 0 58 2 0 0 26 0
+ 59 2 0 0 113 0 1 2 0 0 24 0 35)))))
'|lookupComplete|))
(MAKEPROP '|DoubleFloat| 'NILADIC T)
diff --git a/src/algebra/strap/DIFRING-.lsp b/src/algebra/strap/DIFRING-.lsp
index 1c9f8444..b3562e91 100644
--- a/src/algebra/strap/DIFRING-.lsp
+++ b/src/algebra/strap/DIFRING-.lsp
@@ -28,7 +28,7 @@
(EXIT |r|)))))
(DEFUN |DIFRING-;D;SNniS;3| (|r| |n| $)
- (SPADCALL |r| |n| (|getShellEntry| $ 11)))
+ (SPADCALL |r| |n| (|getShellEntry| $ 14)))
(DEFUN |DifferentialRing&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -36,7 +36,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|DifferentialRing&|))
(LETT |dv$| (LIST '|DifferentialRing&| |dv$1|) . #0#)
- (LETT $ (|newShell| 13) . #0#)
+ (LETT $ (|newShell| 16) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -46,14 +46,16 @@
(MAKEPROP '|DifferentialRing&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|)
- (0 . |differentiate|) |DIFRING-;D;2S;1|
- (|NonNegativeInteger|) |DIFRING-;differentiate;SNniS;2|
- (5 . |differentiate|) |DIFRING-;D;SNniS;3|)
- '#(|differentiate| 11 D 17) 'NIL
+ (0 . |differentiate|) |DIFRING-;D;2S;1| (|SingleInteger|)
+ (5 . |One|) (|NonNegativeInteger|) (9 . |One|)
+ |DIFRING-;differentiate;SNniS;2| (13 . |differentiate|)
+ |DIFRING-;D;SNniS;3|)
+ '#(|differentiate| 19 D 25) 'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 12
- '(1 6 0 0 7 2 6 0 0 9 11 2 0 0 0 9 10 2
- 0 0 0 9 12 1 0 0 0 8)))))
+ (|makeByteWordVec2| 15
+ '(1 6 0 0 7 0 9 0 10 0 11 0 12 2 6 0 0
+ 11 14 2 0 0 0 11 13 2 0 0 0 11 15 1 0
+ 0 0 8)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/DIVRING-.lsp b/src/algebra/strap/DIVRING-.lsp
index 4a61885c..219bf0ab 100644
--- a/src/algebra/strap/DIVRING-.lsp
+++ b/src/algebra/strap/DIVRING-.lsp
@@ -9,23 +9,23 @@
(DEFUN |DIVRING-;**;SIS;1| (|x| |n| $)
(COND
- ((ZEROP |n|) (|spadConstant| $ 7))
- ((SPADCALL |x| (|getShellEntry| $ 9))
+ ((ZEROP |n|) (|spadConstant| $ 10))
+ ((SPADCALL |x| (|getShellEntry| $ 11))
(COND ((< |n| 0) (|error| "division by zero")) ('T |x|)))
((< |n| 0)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 11)) (- |n|)
- (|getShellEntry| $ 14)))
- ('T (SPADCALL |x| |n| (|getShellEntry| $ 14)))))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 15)) (- |n|)
+ (|getShellEntry| $ 19)))
+ ('T (SPADCALL |x| |n| (|getShellEntry| $ 19)))))
(DEFUN |DIVRING-;*;F2S;2| (|q| |x| $)
(SPADCALL
- (SPADCALL (SPADCALL |q| (|getShellEntry| $ 18))
+ (SPADCALL (SPADCALL |q| (|getShellEntry| $ 22))
(SPADCALL
- (SPADCALL (SPADCALL |q| (|getShellEntry| $ 19))
- (|getShellEntry| $ 20))
- (|getShellEntry| $ 11))
- (|getShellEntry| $ 21))
- |x| (|getShellEntry| $ 22)))
+ (SPADCALL (SPADCALL |q| (|getShellEntry| $ 23))
+ (|getShellEntry| $ 24))
+ (|getShellEntry| $ 15))
+ (|getShellEntry| $ 25))
+ |x| (|getShellEntry| $ 26)))
(DEFUN |DivisionRing&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -33,7 +33,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|DivisionRing&|))
(LETT |dv$| (LIST '|DivisionRing&| |dv$1|) . #0#)
- (LETT $ (|newShell| 25) . #0#)
+ (LETT $ (|newShell| 29) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -42,19 +42,21 @@
$))))
(MAKEPROP '|DivisionRing&| '|infovec|
- (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (0 . |One|)
- (|Boolean|) (4 . |zero?|) (9 . |Zero|) (13 . |inv|)
- (|PositiveInteger|) (|RepeatedSquaring| 6) (18 . |expt|)
- (|Integer|) |DIVRING-;**;SIS;1| (|Fraction| 15)
- (24 . |numer|) (29 . |denom|) (34 . |coerce|) (39 . *)
- (45 . *) |DIVRING-;*;F2S;2| (|NonNegativeInteger|))
- '#(** 51 * 57) 'NIL
+ (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|Boolean|)
+ (|Integer|) (0 . |zero?|) (5 . |One|) (9 . |zero?|)
+ (14 . |Zero|) (18 . |Zero|) (22 . <) (28 . |inv|) (33 . -)
+ (|PositiveInteger|) (|RepeatedSquaring| 6) (38 . |expt|)
+ |DIVRING-;**;SIS;1| (|Fraction| 8) (44 . |numer|)
+ (49 . |denom|) (54 . |coerce|) (59 . *) (65 . *)
+ |DIVRING-;*;F2S;2| (|NonNegativeInteger|))
+ '#(** 71 * 77) 'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 23
- '(0 6 0 7 1 6 8 0 9 0 6 0 10 1 6 0 0 11
- 2 13 6 6 12 14 1 17 15 0 18 1 17 15 0
- 19 1 6 0 15 20 2 6 0 15 0 21 2 6 0 0
- 0 22 2 0 0 0 15 16 2 0 0 17 0 23)))))
+ (|makeByteWordVec2| 27
+ '(1 8 7 0 9 0 6 0 10 1 6 7 0 11 0 6 0
+ 12 0 8 0 13 2 8 7 0 0 14 1 6 0 0 15 1
+ 8 0 0 16 2 18 6 6 17 19 1 21 8 0 22 1
+ 21 8 0 23 1 6 0 8 24 2 6 0 8 0 25 2 6
+ 0 0 0 26 2 0 0 0 8 20 2 0 0 21 0 27)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/ES-.lsp b/src/algebra/strap/ES-.lsp
index 0d783c8e..e7eed238 100644
--- a/src/algebra/strap/ES-.lsp
+++ b/src/algebra/strap/ES-.lsp
@@ -153,15 +153,15 @@
('T (SPADCALL |op| (|getShellEntry| $ 14) (|getShellEntry| $ 21)))))
(DEFUN |ES-;listk| (|f| $)
- (SPADCALL (|ES-;allKernels| |f| $) (|getShellEntry| $ 26)))
+ (SPADCALL (|ES-;allKernels| |f| $) (|getShellEntry| $ 27)))
(DEFUN |ES-;tower;SL;5| (|f| $)
- (SPADCALL (|ES-;listk| |f| $) (|getShellEntry| $ 27)))
+ (SPADCALL (|ES-;listk| |f| $) (|getShellEntry| $ 28)))
(DEFUN |ES-;allk| (|l| $)
(PROG (#0=#:G1579 |f| #1=#:G1580)
(RETURN
- (SEQ (SPADCALL (ELT $ 32)
+ (SEQ (SPADCALL (ELT $ 33)
(PROGN
(LETT #0# NIL |ES-;allk|)
(SEQ (LETT |f| NIL |ES-;allk|)
@@ -178,8 +178,8 @@
|ES-;allk|)))
(LETT #1# (CDR #1#) |ES-;allk|) (GO G190) G191
(EXIT (NREVERSE0 #0#))))
- (SPADCALL NIL (|getShellEntry| $ 31))
- (|getShellEntry| $ 35))))))
+ (SPADCALL NIL (|getShellEntry| $ 32))
+ (|getShellEntry| $ 36))))))
(DEFUN |ES-;operators;SL;7| (|f| $)
(PROG (#0=#:G1581 |k| #1=#:G1582)
@@ -198,7 +198,7 @@
(SEQ (EXIT (LETT #0#
(CONS
(SPADCALL |k|
- (|getShellEntry| $ 36))
+ (|getShellEntry| $ 37))
#0#)
|ES-;operators;SL;7|)))
(LETT #1# (CDR #1#) |ES-;operators;SL;7|) (GO G190)
@@ -207,11 +207,11 @@
(DEFUN |ES-;height;SNni;8| (|f| $)
(PROG (#0=#:G1583 |k| #1=#:G1584)
(RETURN
- (SEQ (SPADCALL (ELT $ 42)
+ (SEQ (SPADCALL (ELT $ 44)
(PROGN
(LETT #0# NIL |ES-;height;SNni;8|)
(SEQ (LETT |k| NIL |ES-;height;SNni;8|)
- (LETT #1# (SPADCALL |f| (|getShellEntry| $ 39))
+ (LETT #1# (SPADCALL |f| (|getShellEntry| $ 40))
|ES-;height;SNni;8|)
G190
(COND
@@ -223,12 +223,12 @@
(SEQ (EXIT (LETT #0#
(CONS
(SPADCALL |k|
- (|getShellEntry| $ 41))
+ (|getShellEntry| $ 42))
#0#)
|ES-;height;SNni;8|)))
(LETT #1# (CDR #1#) |ES-;height;SNni;8|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
- 0 (|getShellEntry| $ 45))))))
+ 0 (|getShellEntry| $ 47))))))
(DEFUN |ES-;freeOf?;SSB;9| (|x| |s| $)
(PROG (#0=#:G1585 |k| #1=#:G1586)
@@ -250,12 +250,12 @@
(SEQ (EXIT (LETT #0#
(CONS
(SPADCALL |k|
- (|getShellEntry| $ 47))
+ (|getShellEntry| $ 49))
#0#)
|ES-;freeOf?;SSB;9|)))
(LETT #1# (CDR #1#) |ES-;freeOf?;SSB;9|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 49)))))))
+ (|getShellEntry| $ 51)))))))
(DEFUN |ES-;distribute;2S;10| (|x| $)
(PROG (#0=#:G1587 |k| #1=#:G1588)
@@ -277,7 +277,7 @@
(SEQ (EXIT (COND
((SPADCALL |k|
(|getShellEntry| $ 13)
- (|getShellEntry| $ 51))
+ (|getShellEntry| $ 53))
(LETT #0# (CONS |k| #0#)
|ES-;distribute;2S;10|)))))
(LETT #1# (CDR #1#) |ES-;distribute;2S;10|)
@@ -285,57 +285,57 @@
|x| $)))))
(DEFUN |ES-;box;LS;11| (|l| $)
- (SPADCALL (|getShellEntry| $ 14) |l| (|getShellEntry| $ 53)))
+ (SPADCALL (|getShellEntry| $ 14) |l| (|getShellEntry| $ 55)))
(DEFUN |ES-;paren;LS;12| (|l| $)
- (SPADCALL (|getShellEntry| $ 13) |l| (|getShellEntry| $ 53)))
+ (SPADCALL (|getShellEntry| $ 13) |l| (|getShellEntry| $ 55)))
(DEFUN |ES-;freeOf?;2SB;13| (|x| |k| $)
- (NOT (SPADCALL (SPADCALL |k| (|getShellEntry| $ 56))
- (|ES-;listk| |x| $) (|getShellEntry| $ 57))))
+ (NOT (SPADCALL (SPADCALL |k| (|getShellEntry| $ 58))
+ (|ES-;listk| |x| $) (|getShellEntry| $ 59))))
(DEFUN |ES-;kernel;Bo2S;14| (|op| |arg| $)
- (SPADCALL |op| (LIST |arg|) (|getShellEntry| $ 59)))
+ (SPADCALL |op| (LIST |arg|) (|getShellEntry| $ 61)))
(DEFUN |ES-;elt;Bo2S;15| (|op| |x| $)
- (SPADCALL |op| (LIST |x|) (|getShellEntry| $ 53)))
+ (SPADCALL |op| (LIST |x|) (|getShellEntry| $ 55)))
(DEFUN |ES-;elt;Bo3S;16| (|op| |x| |y| $)
- (SPADCALL |op| (LIST |x| |y|) (|getShellEntry| $ 53)))
+ (SPADCALL |op| (LIST |x| |y|) (|getShellEntry| $ 55)))
(DEFUN |ES-;elt;Bo4S;17| (|op| |x| |y| |z| $)
- (SPADCALL |op| (LIST |x| |y| |z|) (|getShellEntry| $ 53)))
+ (SPADCALL |op| (LIST |x| |y| |z|) (|getShellEntry| $ 55)))
(DEFUN |ES-;elt;Bo5S;18| (|op| |x| |y| |z| |t| $)
- (SPADCALL |op| (LIST |x| |y| |z| |t|) (|getShellEntry| $ 53)))
+ (SPADCALL |op| (LIST |x| |y| |z| |t|) (|getShellEntry| $ 55)))
(DEFUN |ES-;eval;SSMS;19| (|x| |s| |f| $)
- (SPADCALL |x| (LIST |s|) (LIST |f|) (|getShellEntry| $ 67)))
+ (SPADCALL |x| (LIST |s|) (LIST |f|) (|getShellEntry| $ 69)))
(DEFUN |ES-;eval;SBoMS;20| (|x| |s| |f| $)
- (SPADCALL |x| (LIST (SPADCALL |s| (|getShellEntry| $ 69))) (LIST |f|)
- (|getShellEntry| $ 67)))
+ (SPADCALL |x| (LIST (SPADCALL |s| (|getShellEntry| $ 71))) (LIST |f|)
+ (|getShellEntry| $ 69)))
(DEFUN |ES-;eval;SSMS;21| (|x| |s| |f| $)
(SPADCALL |x| (LIST |s|)
(LIST (CONS #'|ES-;eval;SSMS;21!0| (VECTOR |f| $)))
- (|getShellEntry| $ 67)))
+ (|getShellEntry| $ 69)))
(DEFUN |ES-;eval;SSMS;21!0| (|#1| $$)
- (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 72))
+ (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 74))
(|getShellEntry| $$ 0)))
(DEFUN |ES-;eval;SBoMS;22| (|x| |s| |f| $)
(SPADCALL |x| (LIST |s|)
(LIST (CONS #'|ES-;eval;SBoMS;22!0| (VECTOR |f| $)))
- (|getShellEntry| $ 75)))
+ (|getShellEntry| $ 77)))
(DEFUN |ES-;eval;SBoMS;22!0| (|#1| $$)
- (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 72))
+ (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 74))
(|getShellEntry| $$ 0)))
(DEFUN |ES-;subst;SES;23| (|x| |e| $)
- (SPADCALL |x| (LIST |e|) (|getShellEntry| $ 79)))
+ (SPADCALL |x| (LIST |e|) (|getShellEntry| $ 81)))
(DEFUN |ES-;eval;SLLS;24| (|x| |ls| |lf| $)
(PROG (#0=#:G1589 |f| #1=#:G1590)
@@ -359,10 +359,10 @@
|ES-;eval;SLLS;24|)))
(LETT #1# (CDR #1#) |ES-;eval;SLLS;24|) (GO G190)
G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 75))))))
+ (|getShellEntry| $ 77))))))
(DEFUN |ES-;eval;SLLS;24!0| (|#1| $$)
- (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 72))
+ (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 74))
(|getShellEntry| $$ 0)))
(DEFUN |ES-;eval;SLLS;25| (|x| |ls| |lf| $)
@@ -387,10 +387,10 @@
|ES-;eval;SLLS;25|)))
(LETT #1# (CDR #1#) |ES-;eval;SLLS;25|) (GO G190)
G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 67))))))
+ (|getShellEntry| $ 69))))))
(DEFUN |ES-;eval;SLLS;25!0| (|#1| $$)
- (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 72))
+ (SPADCALL (SPADCALL |#1| (|getShellEntry| (|getShellEntry| $$ 1) 74))
(|getShellEntry| $$ 0)))
(DEFUN |ES-;eval;SLLS;26| (|x| |ls| |lf| $)
@@ -410,12 +410,12 @@
(SEQ (EXIT (LETT #0#
(CONS
(SPADCALL |s|
- (|getShellEntry| $ 69))
+ (|getShellEntry| $ 71))
#0#)
|ES-;eval;SLLS;26|)))
(LETT #1# (CDR #1#) |ES-;eval;SLLS;26|) (GO G190)
G191 (EXIT (NREVERSE0 #0#))))
- |lf| (|getShellEntry| $ 67))))))
+ |lf| (|getShellEntry| $ 69))))))
(DEFUN |ES-;map;MKS;27| (|fn| |k| $)
(PROG (#0=#:G1595 |x| #1=#:G1596 |l|)
@@ -428,7 +428,7 @@
(SEQ (LETT |x| NIL |ES-;map;MKS;27|)
(LETT #1#
(SPADCALL |k|
- (|getShellEntry| $ 85))
+ (|getShellEntry| $ 87))
|ES-;map;MKS;27|)
G190
(COND
@@ -445,20 +445,20 @@
(LETT #1# (CDR #1#) |ES-;map;MKS;27|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
|ES-;map;MKS;27|)
- (SPADCALL |k| (|getShellEntry| $ 85))
- (|getShellEntry| $ 86))
- (SPADCALL |k| (|getShellEntry| $ 87)))
+ (SPADCALL |k| (|getShellEntry| $ 87))
+ (|getShellEntry| $ 88))
+ (SPADCALL |k| (|getShellEntry| $ 89)))
('T
- (SPADCALL (SPADCALL |k| (|getShellEntry| $ 36)) |l|
- (|getShellEntry| $ 53))))))))
+ (SPADCALL (SPADCALL |k| (|getShellEntry| $ 37)) |l|
+ (|getShellEntry| $ 55))))))))
(DEFUN |ES-;operator;2Bo;28| (|op| $)
(COND
((SPADCALL |op| (SPADCALL "%paren" (|getShellEntry| $ 9))
- (|getShellEntry| $ 89))
+ (|getShellEntry| $ 91))
(|getShellEntry| $ 13))
((SPADCALL |op| (SPADCALL "%box" (|getShellEntry| $ 9))
- (|getShellEntry| $ 89))
+ (|getShellEntry| $ 91))
(|getShellEntry| $ 14))
('T (|error| "Unknown operator"))))
@@ -466,7 +466,7 @@
(PROG (|l| |kk| #0=#:G1597 |n| |k|)
(RETURN
(SEQ (COND
- ((NULL (LETT |l| (SPADCALL |x| (|getShellEntry| $ 39))
+ ((NULL (LETT |l| (SPADCALL |x| (|getShellEntry| $ 40))
|ES-;mainKernel;SU;29|))
(CONS 1 "failed"))
('T
@@ -474,7 +474,7 @@
(SPADCALL
(LETT |k| (|SPADfirst| |l|)
|ES-;mainKernel;SU;29|)
- (|getShellEntry| $ 41))
+ (|getShellEntry| $ 42))
|ES-;mainKernel;SU;29|)
(SEQ (LETT |kk| NIL |ES-;mainKernel;SU;29|)
(LETT #0# (CDR |l|) |ES-;mainKernel;SU;29|)
@@ -489,11 +489,11 @@
(SEQ (EXIT (COND
((< |n|
(SPADCALL |kk|
- (|getShellEntry| $ 41)))
+ (|getShellEntry| $ 42)))
(SEQ
(LETT |n|
(SPADCALL |kk|
- (|getShellEntry| $ 41))
+ (|getShellEntry| $ 42))
|ES-;mainKernel;SU;29|)
(EXIT
(LETT |k| |kk|
@@ -507,9 +507,9 @@
(RETURN
(SEQ (LETT |s|
(SPADCALL
- (LETT |l| (SPADCALL |f| (|getShellEntry| $ 39))
+ (LETT |l| (SPADCALL |f| (|getShellEntry| $ 40))
|ES-;allKernels|)
- (|getShellEntry| $ 31))
+ (|getShellEntry| $ 32))
|ES-;allKernels|)
(SEQ (LETT |k| NIL |ES-;allKernels|)
(LETT #0# |l| |ES-;allKernels|) G190
@@ -523,26 +523,26 @@
(SEQ (LETT |u|
(SPADCALL
(SPADCALL |k|
- (|getShellEntry| $ 36))
+ (|getShellEntry| $ 37))
"%dummyVar"
- (|getShellEntry| $ 95))
+ (|getShellEntry| $ 101))
|ES-;allKernels|)
(EXIT (COND
((QEQCAR |u| 0)
(SEQ
(LETT |arg|
(SPADCALL |k|
- (|getShellEntry| $ 85))
+ (|getShellEntry| $ 87))
|ES-;allKernels|)
(LETT |s0|
(SPADCALL
(SPADCALL
(SPADCALL |arg|
- (|getShellEntry| $ 96))
- (|getShellEntry| $ 56))
+ (|getShellEntry| $ 102))
+ (|getShellEntry| $ 58))
(|ES-;allKernels|
(|SPADfirst| |arg|) $)
- (|getShellEntry| $ 97))
+ (|getShellEntry| $ 103))
|ES-;allKernels|)
(LETT |arg| (CDR (CDR |arg|))
|ES-;allKernels|)
@@ -555,16 +555,16 @@
(EXIT
(SPADCALL |s0|
(|ES-;allk| |arg| $)
- (|getShellEntry| $ 32)))))
+ (|getShellEntry| $ 33)))))
('T
(|ES-;allk|
(SPADCALL |k|
- (|getShellEntry| $ 85))
+ (|getShellEntry| $ 87))
$)))))
|ES-;allKernels|)
(EXIT (LETT |s|
(SPADCALL |s| |t|
- (|getShellEntry| $ 32))
+ (|getShellEntry| $ 33))
|ES-;allKernels|)))
(LETT #0# (CDR #0#) |ES-;allKernels|) (GO G190) G191
(EXIT NIL))
@@ -572,7 +572,7 @@
(DEFUN |ES-;kernel;BoLS;31| (|op| |args| $)
(COND
- ((NULL (SPADCALL |op| (|getShellEntry| $ 98)))
+ ((NULL (SPADCALL |op| (|getShellEntry| $ 108)))
(|error| "Unknown operator"))
('T (|ES-;okkernel| |op| |args| $))))
@@ -582,7 +582,7 @@
(SEQ (SPADCALL
(SPADCALL |op| |l|
(+ 1
- (SPADCALL (ELT $ 42)
+ (SPADCALL (ELT $ 44)
(PROGN
(LETT #0# NIL |ES-;okkernel|)
(SEQ (LETT |f| NIL |ES-;okkernel|)
@@ -598,32 +598,32 @@
(LETT #0#
(CONS
(SPADCALL |f|
- (|getShellEntry| $ 100))
+ (|getShellEntry| $ 110))
#0#)
|ES-;okkernel|)))
(LETT #1# (CDR #1#) |ES-;okkernel|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
- 0 (|getShellEntry| $ 45)))
- (|getShellEntry| $ 101))
- (|getShellEntry| $ 87))))))
+ 0 (|getShellEntry| $ 47)))
+ (|getShellEntry| $ 112))
+ (|getShellEntry| $ 89))))))
(DEFUN |ES-;elt;BoLS;33| (|op| |args| $)
(PROG (|u| #0=#:G1522 |v|)
(RETURN
(SEQ (EXIT (COND
- ((NULL (SPADCALL |op| (|getShellEntry| $ 98)))
+ ((NULL (SPADCALL |op| (|getShellEntry| $ 108)))
(|error| "Unknown operator"))
('T
(SEQ (SEQ (LETT |u|
(SPADCALL |op|
- (|getShellEntry| $ 103))
+ (|getShellEntry| $ 114))
|ES-;elt;BoLS;33|)
(EXIT (COND
((QEQCAR |u| 0)
(COND
((SPADCALL (LENGTH |args|)
(QCDR |u|)
- (|getShellEntry| $ 104))
+ (|getShellEntry| $ 116))
(PROGN
(LETT #0#
(|error|
@@ -632,7 +632,7 @@
(GO #0#))))))))
(LETT |v|
(SPADCALL |op| |args|
- (|getShellEntry| $ 107))
+ (|getShellEntry| $ 119))
|ES-;elt;BoLS;33|)
(EXIT (COND
((QEQCAR |v| 0) (QCDR |v|))
@@ -642,50 +642,50 @@
(DEFUN |ES-;retract;SK;34| (|f| $)
(PROG (|k|)
(RETURN
- (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 109))
+ (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 121))
|ES-;retract;SK;34|)
(EXIT (COND
((OR (QEQCAR |k| 1)
(SPADCALL
(SPADCALL (QCDR |k|)
- (|getShellEntry| $ 87))
- |f| (|getShellEntry| $ 110)))
+ (|getShellEntry| $ 89))
+ |f| (|getShellEntry| $ 122)))
(|error| "not a kernel"))
('T (QCDR |k|))))))))
(DEFUN |ES-;retractIfCan;SU;35| (|f| $)
(PROG (|k|)
(RETURN
- (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 109))
+ (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 121))
|ES-;retractIfCan;SU;35|)
(EXIT (COND
((OR (QEQCAR |k| 1)
(SPADCALL
(SPADCALL (QCDR |k|)
- (|getShellEntry| $ 87))
- |f| (|getShellEntry| $ 110)))
+ (|getShellEntry| $ 89))
+ |f| (|getShellEntry| $ 122)))
(CONS 1 "failed"))
('T |k|)))))))
(DEFUN |ES-;is?;SSB;36| (|f| |s| $)
(PROG (|k|)
(RETURN
- (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 113))
+ (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 125))
|ES-;is?;SSB;36|)
(EXIT (COND
((QEQCAR |k| 1) 'NIL)
('T
- (SPADCALL (QCDR |k|) |s| (|getShellEntry| $ 114)))))))))
+ (SPADCALL (QCDR |k|) |s| (|getShellEntry| $ 127)))))))))
(DEFUN |ES-;is?;SBoB;37| (|f| |op| $)
(PROG (|k|)
(RETURN
- (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 113))
+ (SEQ (LETT |k| (SPADCALL |f| (|getShellEntry| $ 125))
|ES-;is?;SBoB;37|)
(EXIT (COND
((QEQCAR |k| 1) 'NIL)
('T
- (SPADCALL (QCDR |k|) |op| (|getShellEntry| $ 51)))))))))
+ (SPADCALL (QCDR |k|) |op| (|getShellEntry| $ 53)))))))))
(DEFUN |ES-;unwrap| (|l| |x| $)
(PROG (|k| #0=#:G1601)
@@ -700,8 +700,8 @@
(SPADCALL |x| |k|
(|SPADfirst|
(SPADCALL |k|
- (|getShellEntry| $ 85)))
- (|getShellEntry| $ 117))
+ (|getShellEntry| $ 87)))
+ (|getShellEntry| $ 131))
|ES-;unwrap|)))
(LETT #0# (CDR #0#) |ES-;unwrap|) (GO G190) G191
(EXIT NIL))
@@ -710,7 +710,7 @@
(DEFUN |ES-;distribute;3S;39| (|x| |y| $)
(PROG (|ky| #0=#:G1602 |k| #1=#:G1603)
(RETURN
- (SEQ (LETT |ky| (SPADCALL |y| (|getShellEntry| $ 56))
+ (SEQ (LETT |ky| (SPADCALL |y| (|getShellEntry| $ 58))
|ES-;distribute;3S;39|)
(EXIT (|ES-;unwrap|
(PROGN
@@ -731,13 +731,13 @@
((SPADCALL |k|
(SPADCALL "%paren"
(|getShellEntry| $ 9))
- (|getShellEntry| $ 114))
+ (|getShellEntry| $ 127))
(SPADCALL |ky|
(|ES-;listk|
(SPADCALL |k|
- (|getShellEntry| $ 87))
+ (|getShellEntry| $ 89))
$)
- (|getShellEntry| $ 57)))
+ (|getShellEntry| $ 59)))
('T 'NIL))
(LETT #0# (CONS |k| #0#)
|ES-;distribute;3S;39|)))))
@@ -750,14 +750,14 @@
(RETURN
(SEQ (LETT |rec| (|ES-;mkKerLists| |leq| $) |ES-;eval;SLS;40|)
(EXIT (SPADCALL |f| (QCAR |rec|) (QCDR |rec|)
- (|getShellEntry| $ 119)))))))
+ (|getShellEntry| $ 133)))))))
(DEFUN |ES-;subst;SLS;41| (|f| |leq| $)
(PROG (|rec|)
(RETURN
(SEQ (LETT |rec| (|ES-;mkKerLists| |leq| $) |ES-;subst;SLS;41|)
(EXIT (SPADCALL |f| (QCAR |rec|) (QCDR |rec|)
- (|getShellEntry| $ 121)))))))
+ (|getShellEntry| $ 135)))))))
(DEFUN |ES-;mkKerLists| (|leq| $)
(PROG (|eq| #0=#:G1604 |k| |lk| |lv|)
@@ -774,35 +774,35 @@
(GO G191)))
(SEQ (LETT |k|
(SPADCALL
- (SPADCALL |eq| (|getShellEntry| $ 124))
- (|getShellEntry| $ 113))
+ (SPADCALL |eq| (|getShellEntry| $ 140))
+ (|getShellEntry| $ 125))
|ES-;mkKerLists|)
(EXIT (COND
((QEQCAR |k| 1)
(|error| "left hand side must be a single kernel"))
((NULL (SPADCALL (QCDR |k|) |lk|
- (|getShellEntry| $ 57)))
+ (|getShellEntry| $ 59)))
(SEQ (LETT |lk| (CONS (QCDR |k|) |lk|)
|ES-;mkKerLists|)
(EXIT
(LETT |lv|
(CONS
(SPADCALL |eq|
- (|getShellEntry| $ 125))
+ (|getShellEntry| $ 142))
|lv|)
|ES-;mkKerLists|)))))))
(LETT #0# (CDR #0#) |ES-;mkKerLists|) (GO G190) G191
(EXIT NIL))
(EXIT (CONS |lk| |lv|))))))
-(DEFUN |ES-;even?;SB;43| (|x| $) (|ES-;intpred?| |x| (ELT $ 127) $))
+(DEFUN |ES-;even?;SB;43| (|x| $) (|ES-;intpred?| |x| (ELT $ 144) $))
-(DEFUN |ES-;odd?;SB;44| (|x| $) (|ES-;intpred?| |x| (ELT $ 129) $))
+(DEFUN |ES-;odd?;SB;44| (|x| $) (|ES-;intpred?| |x| (ELT $ 146) $))
(DEFUN |ES-;intpred?| (|x| |pred?| $)
(PROG (|u|)
(RETURN
- (SEQ (LETT |u| (SPADCALL |x| (|getShellEntry| $ 132))
+ (SEQ (LETT |u| (SPADCALL |x| (|getShellEntry| $ 149))
|ES-;intpred?|)
(EXIT (COND
((QEQCAR |u| 0) (SPADCALL (QCDR |u|) |pred?|))
@@ -814,7 +814,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|ExpressionSpace&|))
(LETT |dv$| (LIST '|ExpressionSpace&| |dv$1|) . #0#)
- (LETT $ (|newShell| 133) . #0#)
+ (LETT $ (|newShell| 150) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -833,9 +833,9 @@
(COND
((|testBitVector| |pv$| 1)
(PROGN
- (|setShellEntry| $ 128
+ (|setShellEntry| $ 145
(CONS (|dispatchFunction| |ES-;even?;SB;43|) $))
- (|setShellEntry| $ 130
+ (|setShellEntry| $ 147
(CONS (|dispatchFunction| |ES-;odd?;SB;44|) $)))))
$))))
@@ -844,88 +844,99 @@
(|Symbol|) (0 . |coerce|) (|BasicOperator|)
(|CommonOperators|) (5 . |operator|) '|oppren| '|opbox|
(|List| $) (10 . |box|) |ES-;box;2S;1| (15 . |paren|)
- |ES-;paren;2S;2| (|Boolean|) (20 . =) |ES-;belong?;BoB;3|
- (|Kernel| 6) (|List| 23) (|Set| 23) (26 . |parts|)
- (31 . |sort!|) (|Kernel| $) (|List| 28) |ES-;tower;SL;5|
- (36 . |brace|) (41 . |union|) (|Mapping| 25 25 25)
- (|List| 25) (47 . |reduce|) (54 . |operator|) (|List| 10)
- |ES-;operators;SL;7| (59 . |kernels|)
- (|NonNegativeInteger|) (64 . |height|) (69 . |max|)
- (|Mapping| 40 40 40) (|List| 40) (75 . |reduce|)
- |ES-;height;SNni;8| (82 . |name|) (|List| 8)
- (87 . |member?|) |ES-;freeOf?;SSB;9| (93 . |is?|)
- |ES-;distribute;2S;10| (99 . |elt|) |ES-;box;LS;11|
- |ES-;paren;LS;12| (105 . |retract|) (110 . |member?|)
- |ES-;freeOf?;2SB;13| (116 . |kernel|) |ES-;kernel;Bo2S;14|
- |ES-;elt;Bo2S;15| |ES-;elt;Bo3S;16| |ES-;elt;Bo4S;17|
- |ES-;elt;Bo5S;18| (|Mapping| $ 15) (|List| 65)
- (122 . |eval|) |ES-;eval;SSMS;19| (129 . |name|)
- |ES-;eval;SBoMS;20| (|List| 6) (134 . |first|)
- (|Mapping| $ $) |ES-;eval;SSMS;21| (139 . |eval|)
- |ES-;eval;SBoMS;22| (|Equation| $) (|List| 77)
- (146 . |subst|) |ES-;subst;SES;23| (|List| 73)
- |ES-;eval;SLLS;24| |ES-;eval;SLLS;25| |ES-;eval;SLLS;26|
- (152 . |argument|) (157 . =) (163 . |coerce|)
- |ES-;map;MKS;27| (168 . |is?|) |ES-;operator;2Bo;28|
- (|Union| 28 '"failed") |ES-;mainKernel;SU;29| (|None|)
- (|Union| 93 '"failed") (174 . |property|) (180 . |second|)
- (185 . |remove!|) (191 . |belong?|) |ES-;kernel;BoLS;31|
- (196 . |height|) (201 . |kernel|) (|Union| 40 '"failed")
- (208 . |arity|) (213 . ~=) (|Union| 6 '"failed")
- (|BasicOperatorFunctions1| 6) (219 . |evaluate|)
- |ES-;elt;BoLS;33| (225 . |mainKernel|) (230 . ~=)
- |ES-;retract;SK;34| |ES-;retractIfCan;SU;35|
- (236 . |retractIfCan|) (241 . |is?|) |ES-;is?;SSB;36|
- |ES-;is?;SBoB;37| (247 . |eval|) |ES-;distribute;3S;39|
- (254 . |eval|) |ES-;eval;SLS;40| (261 . |subst|)
- |ES-;subst;SLS;41| (|Equation| 6) (268 . |lhs|)
- (273 . |rhs|) (|Integer|) (278 . |even?|) (283 . |even?|)
- (288 . |odd?|) (293 . |odd?|) (|Union| 126 '"failed")
- (298 . |retractIfCan|))
- '#(|tower| 303 |subst| 308 |retractIfCan| 320 |retract| 325
- |paren| 330 |operators| 340 |operator| 345 |odd?| 350
- |map| 355 |mainKernel| 361 |kernel| 366 |is?| 378 |height|
- 390 |freeOf?| 395 |even?| 407 |eval| 412 |elt| 467
- |distribute| 503 |box| 514 |belong?| 524)
+ |ES-;paren;2S;2| (|Boolean|) (20 . =) (26 . |true|)
+ |ES-;belong?;BoB;3| (|Kernel| 6) (|List| 24) (|Set| 24)
+ (30 . |parts|) (35 . |sort!|) (|Kernel| $) (|List| 29)
+ |ES-;tower;SL;5| (40 . |brace|) (45 . |union|)
+ (|Mapping| 26 26 26) (|List| 26) (51 . |reduce|)
+ (58 . |operator|) (|List| 10) |ES-;operators;SL;7|
+ (63 . |kernels|) (|NonNegativeInteger|) (68 . |height|)
+ (73 . |Zero|) (77 . |max|) (|Mapping| 41 41 41)
+ (|List| 41) (83 . |reduce|) |ES-;height;SNni;8|
+ (90 . |name|) (|List| 8) (95 . |member?|)
+ |ES-;freeOf?;SSB;9| (101 . |is?|) |ES-;distribute;2S;10|
+ (107 . |elt|) |ES-;box;LS;11| |ES-;paren;LS;12|
+ (113 . |retract|) (118 . |member?|) |ES-;freeOf?;2SB;13|
+ (124 . |kernel|) |ES-;kernel;Bo2S;14| |ES-;elt;Bo2S;15|
+ |ES-;elt;Bo3S;16| |ES-;elt;Bo4S;17| |ES-;elt;Bo5S;18|
+ (|Mapping| $ 15) (|List| 67) (130 . |eval|)
+ |ES-;eval;SSMS;19| (137 . |name|) |ES-;eval;SBoMS;20|
+ (|List| 6) (142 . |first|) (|Mapping| $ $)
+ |ES-;eval;SSMS;21| (147 . |eval|) |ES-;eval;SBoMS;22|
+ (|Equation| $) (|List| 79) (154 . |subst|)
+ |ES-;subst;SES;23| (|List| 75) |ES-;eval;SLLS;24|
+ |ES-;eval;SLLS;25| |ES-;eval;SLLS;26| (160 . |argument|)
+ (165 . =) (171 . |coerce|) |ES-;map;MKS;27| (176 . |is?|)
+ |ES-;operator;2Bo;28| (182 . |empty?|) (187 . |first|)
+ (192 . |rest|) (197 . <) (|Union| 29 '"failed")
+ |ES-;mainKernel;SU;29| (|None|) (|Union| 99 '"failed")
+ (203 . |property|) (209 . |second|) (214 . |remove!|)
+ (220 . |rest|) (225 . |One|) (|Integer|) (229 . |One|)
+ (233 . |belong?|) |ES-;kernel;BoLS;31| (238 . |height|)
+ (243 . +) (249 . |kernel|) (|Union| 41 '"failed")
+ (256 . |arity|) (261 . |#|) (266 . ~=)
+ (|Union| 6 '"failed") (|BasicOperatorFunctions1| 6)
+ (272 . |evaluate|) |ES-;elt;BoLS;33| (278 . |mainKernel|)
+ (283 . ~=) |ES-;retract;SK;34| |ES-;retractIfCan;SU;35|
+ (289 . |retractIfCan|) (294 . |false|) (298 . |is?|)
+ |ES-;is?;SSB;36| |ES-;is?;SBoB;37| (304 . |reverse!|)
+ (309 . |eval|) |ES-;distribute;3S;39| (316 . |eval|)
+ |ES-;eval;SLS;40| (323 . |subst|) |ES-;subst;SLS;41|
+ (330 . |empty|) (334 . |empty|) (|Equation| 6)
+ (338 . |lhs|) (343 . |concat|) (349 . |rhs|)
+ (354 . |concat|) (360 . |even?|) (365 . |even?|)
+ (370 . |odd?|) (375 . |odd?|) (|Union| 106 '"failed")
+ (380 . |retractIfCan|))
+ '#(|tower| 385 |subst| 390 |retractIfCan| 402 |retract| 407
+ |paren| 412 |operators| 422 |operator| 427 |odd?| 432
+ |map| 437 |mainKernel| 443 |kernel| 448 |is?| 460 |height|
+ 472 |freeOf?| 477 |even?| 489 |eval| 494 |elt| 549
+ |distribute| 585 |box| 596 |belong?| 606)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 132
+ (|makeByteWordVec2| 149
'(1 8 0 7 9 1 11 10 8 12 1 6 0 15 16 1
- 6 0 15 18 2 10 20 0 0 21 1 25 24 0 26
- 1 24 0 0 27 1 25 0 24 31 2 25 0 0 0
- 32 3 34 25 33 0 25 35 1 23 10 0 36 1
- 6 29 0 39 1 23 40 0 41 2 40 0 0 0 42
- 3 44 40 43 0 40 45 1 23 8 0 47 2 48
- 20 8 0 49 2 23 20 0 10 51 2 6 0 10 15
- 53 1 6 28 0 56 2 24 20 23 0 57 2 6 0
- 10 15 59 3 6 0 0 48 66 67 1 10 8 0 69
- 1 71 6 0 72 3 6 0 0 37 66 75 2 6 0 0
- 78 79 1 23 71 0 85 2 71 20 0 0 86 1 6
- 0 28 87 2 10 20 0 8 89 2 10 94 0 7 95
- 1 71 6 0 96 2 25 0 23 0 97 1 6 20 10
- 98 1 6 40 0 100 3 23 0 10 71 40 101 1
- 10 102 0 103 2 40 20 0 0 104 2 106
- 105 10 71 107 1 6 91 0 109 2 6 20 0 0
- 110 1 6 91 0 113 2 23 20 0 8 114 3 6
- 0 0 28 0 117 3 6 0 0 29 15 119 3 6 0
- 0 29 15 121 1 123 6 0 124 1 123 6 0
- 125 1 126 20 0 127 1 0 20 0 128 1 126
- 20 0 129 1 0 20 0 130 1 6 131 0 132 1
- 0 29 0 30 2 0 0 0 78 122 2 0 0 0 77
- 80 1 0 91 0 112 1 0 28 0 111 1 0 0 0
- 19 1 0 0 15 55 1 0 37 0 38 1 0 10 10
- 90 1 0 20 0 130 2 0 0 73 28 88 1 0 91
- 0 92 2 0 0 10 15 99 2 0 0 10 0 60 2 0
- 20 0 8 115 2 0 20 0 10 116 1 0 40 0
- 46 2 0 20 0 8 50 2 0 20 0 0 58 1 0 20
- 0 128 3 0 0 0 10 73 76 3 0 0 0 37 66
- 84 3 0 0 0 10 65 70 3 0 0 0 37 81 82
- 3 0 0 0 8 65 68 3 0 0 0 8 73 74 3 0 0
- 0 48 81 83 2 0 0 0 78 120 2 0 0 10 15
- 108 5 0 0 10 0 0 0 0 64 3 0 0 10 0 0
- 62 4 0 0 10 0 0 0 63 2 0 0 10 0 61 2
- 0 0 0 0 118 1 0 0 0 52 1 0 0 15 54 1
- 0 0 0 17 1 0 20 10 22)))))
+ 6 0 15 18 2 10 20 0 0 21 0 20 0 22 1
+ 26 25 0 27 1 25 0 0 28 1 26 0 25 32 2
+ 26 0 0 0 33 3 35 26 34 0 26 36 1 24
+ 10 0 37 1 6 30 0 40 1 24 41 0 42 0 41
+ 0 43 2 41 0 0 0 44 3 46 41 45 0 41 47
+ 1 24 8 0 49 2 50 20 8 0 51 2 24 20 0
+ 10 53 2 6 0 10 15 55 1 6 29 0 58 2 25
+ 20 24 0 59 2 6 0 10 15 61 3 6 0 0 50
+ 68 69 1 10 8 0 71 1 73 6 0 74 3 6 0 0
+ 38 68 77 2 6 0 0 80 81 1 24 73 0 87 2
+ 73 20 0 0 88 1 6 0 29 89 2 10 20 0 8
+ 91 1 25 20 0 93 1 25 24 0 94 1 25 0 0
+ 95 2 41 20 0 0 96 2 10 100 0 7 101 1
+ 73 6 0 102 2 26 0 24 0 103 1 73 0 0
+ 104 0 41 0 105 0 106 0 107 1 6 20 10
+ 108 1 6 41 0 110 2 41 0 0 0 111 3 24
+ 0 10 73 41 112 1 10 113 0 114 1 73 41
+ 0 115 2 41 20 0 0 116 2 118 117 10 73
+ 119 1 6 97 0 121 2 6 20 0 0 122 1 6
+ 97 0 125 0 20 0 126 2 24 20 0 8 127 1
+ 25 0 0 130 3 6 0 0 29 0 131 3 6 0 0
+ 30 15 133 3 6 0 0 30 15 135 0 25 0
+ 137 0 73 0 138 1 139 6 0 140 2 25 0
+ 24 0 141 1 139 6 0 142 2 73 0 6 0 143
+ 1 106 20 0 144 1 0 20 0 145 1 106 20
+ 0 146 1 0 20 0 147 1 6 148 0 149 1 0
+ 30 0 31 2 0 0 0 80 136 2 0 0 0 79 82
+ 1 0 97 0 124 1 0 29 0 123 1 0 0 0 19
+ 1 0 0 15 57 1 0 38 0 39 1 0 10 10 92
+ 1 0 20 0 147 2 0 0 75 29 90 1 0 97 0
+ 98 2 0 0 10 15 109 2 0 0 10 0 62 2 0
+ 20 0 8 128 2 0 20 0 10 129 1 0 41 0
+ 48 2 0 20 0 8 52 2 0 20 0 0 60 1 0 20
+ 0 145 3 0 0 0 10 75 78 3 0 0 0 38 68
+ 86 3 0 0 0 10 67 72 3 0 0 0 38 83 84
+ 3 0 0 0 8 67 70 3 0 0 0 8 75 76 3 0 0
+ 0 50 83 85 2 0 0 0 80 134 2 0 0 10 15
+ 120 5 0 0 10 0 0 0 0 66 3 0 0 10 0 0
+ 64 4 0 0 10 0 0 0 65 2 0 0 10 0 63 2
+ 0 0 0 0 132 1 0 0 0 54 1 0 0 15 56 1
+ 0 0 0 17 1 0 20 10 23)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/EUCDOM-.lsp b/src/algebra/strap/EUCDOM-.lsp
index ba98d42c..1f2691f3 100644
--- a/src/algebra/strap/EUCDOM-.lsp
+++ b/src/algebra/strap/EUCDOM-.lsp
@@ -40,24 +40,24 @@
((SPADCALL |y| (|getShellEntry| $ 8)) 'NIL)
((SPADCALL |x| (|getShellEntry| $ 8)) 'T)
('T
- (< (SPADCALL |x| (|getShellEntry| $ 10))
- (SPADCALL |y| (|getShellEntry| $ 10))))))
+ (< (SPADCALL |x| (|getShellEntry| $ 12))
+ (SPADCALL |y| (|getShellEntry| $ 12))))))
(DEFUN |EUCDOM-;quo;3S;2| (|x| |y| $)
- (QCAR (SPADCALL |x| |y| (|getShellEntry| $ 13))))
+ (QCAR (SPADCALL |x| |y| (|getShellEntry| $ 16))))
(DEFUN |EUCDOM-;rem;3S;3| (|x| |y| $)
- (QCDR (SPADCALL |x| |y| (|getShellEntry| $ 13))))
+ (QCDR (SPADCALL |x| |y| (|getShellEntry| $ 16))))
(DEFUN |EUCDOM-;exquo;2SU;4| (|x| |y| $)
(PROG (|qr|)
(RETURN
(SEQ (COND
((SPADCALL |x| (|getShellEntry| $ 8))
- (CONS 0 (|spadConstant| $ 16)))
+ (CONS 0 (|spadConstant| $ 19)))
((SPADCALL |y| (|getShellEntry| $ 8)) (CONS 1 "failed"))
('T
- (SEQ (LETT |qr| (SPADCALL |x| |y| (|getShellEntry| $ 13))
+ (SEQ (LETT |qr| (SPADCALL |x| |y| (|getShellEntry| $ 16))
|EUCDOM-;exquo;2SU;4|)
(EXIT (COND
((SPADCALL (QCDR |qr|)
@@ -68,9 +68,9 @@
(DEFUN |EUCDOM-;gcd;3S;5| (|x| |y| $)
(PROG (|#G13| |#G14|)
(RETURN
- (SEQ (LETT |x| (SPADCALL |x| (|getShellEntry| $ 19))
+ (SEQ (LETT |x| (SPADCALL |x| (|getShellEntry| $ 22))
|EUCDOM-;gcd;3S;5|)
- (LETT |y| (SPADCALL |y| (|getShellEntry| $ 19))
+ (LETT |y| (SPADCALL |y| (|getShellEntry| $ 22))
|EUCDOM-;gcd;3S;5|)
(SEQ G190
(COND
@@ -79,12 +79,12 @@
(SEQ (PROGN
(LETT |#G13| |y| |EUCDOM-;gcd;3S;5|)
(LETT |#G14|
- (SPADCALL |x| |y| (|getShellEntry| $ 20))
+ (SPADCALL |x| |y| (|getShellEntry| $ 23))
|EUCDOM-;gcd;3S;5|)
(LETT |x| |#G13| |EUCDOM-;gcd;3S;5|)
(LETT |y| |#G14| |EUCDOM-;gcd;3S;5|))
(EXIT (LETT |y|
- (SPADCALL |y| (|getShellEntry| $ 19))
+ (SPADCALL |y| (|getShellEntry| $ 22))
|EUCDOM-;gcd;3S;5|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |x|)))))
@@ -94,7 +94,7 @@
(RETURN
(SEQ (PROGN
(LETT |#G16|
- (SPADCALL (QVELT |s| 2) (|getShellEntry| $ 23))
+ (SPADCALL (QVELT |s| 2) (|getShellEntry| $ 26))
|EUCDOM-;unitNormalizeIdealElt|)
(LETT |u| (QVELT |#G16| 0)
|EUCDOM-;unitNormalizeIdealElt|)
@@ -104,12 +104,12 @@
|EUCDOM-;unitNormalizeIdealElt|)
|#G16|)
(EXIT (COND
- ((SPADCALL |a| (|getShellEntry| $ 24)) |s|)
+ ((SPADCALL |a| (|getShellEntry| $ 27)) |s|)
('T
(VECTOR (SPADCALL |a| (QVELT |s| 0)
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 28))
(SPADCALL |a| (QVELT |s| 1)
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 28))
|c|))))))))
(DEFUN |EUCDOM-;extendedEuclidean;2SR;7| (|x| |y| $)
@@ -117,14 +117,14 @@
(RETURN
(SEQ (LETT |s1|
(|EUCDOM-;unitNormalizeIdealElt|
- (VECTOR (|spadConstant| $ 26)
- (|spadConstant| $ 16) |x|)
+ (VECTOR (|spadConstant| $ 29)
+ (|spadConstant| $ 19) |x|)
$)
|EUCDOM-;extendedEuclidean;2SR;7|)
(LETT |s2|
(|EUCDOM-;unitNormalizeIdealElt|
- (VECTOR (|spadConstant| $ 16)
- (|spadConstant| $ 26) |y|)
+ (VECTOR (|spadConstant| $ 19)
+ (|spadConstant| $ 29) |y|)
$)
|EUCDOM-;extendedEuclidean;2SR;7|)
(EXIT (COND
@@ -140,20 +140,20 @@
(SEQ (LETT |qr|
(SPADCALL (QVELT |s1| 2)
(QVELT |s2| 2)
- (|getShellEntry| $ 13))
+ (|getShellEntry| $ 16))
|EUCDOM-;extendedEuclidean;2SR;7|)
(LETT |s3|
(VECTOR
(SPADCALL (QVELT |s1| 0)
(SPADCALL (QCAR |qr|)
(QVELT |s2| 0)
- (|getShellEntry| $ 25))
- (|getShellEntry| $ 27))
+ (|getShellEntry| $ 28))
+ (|getShellEntry| $ 30))
(SPADCALL (QVELT |s1| 1)
(SPADCALL (QCAR |qr|)
(QVELT |s2| 1)
- (|getShellEntry| $ 25))
- (|getShellEntry| $ 27))
+ (|getShellEntry| $ 28))
+ (|getShellEntry| $ 30))
(QCDR |qr|))
|EUCDOM-;extendedEuclidean;2SR;7|)
(LETT |s1| |s2|
@@ -169,17 +169,17 @@
(|getShellEntry| $ 8)))
(COND
((NULL (SPADCALL (QVELT |s1| 0) |y|
- (|getShellEntry| $ 28)))
+ (|getShellEntry| $ 31)))
(SEQ (LETT |qr|
(SPADCALL (QVELT |s1| 0) |y|
- (|getShellEntry| $ 13))
+ (|getShellEntry| $ 16))
|EUCDOM-;extendedEuclidean;2SR;7|)
(QSETVELT |s1| 0 (QCDR |qr|))
(QSETVELT |s1| 1
(SPADCALL (QVELT |s1| 1)
(SPADCALL (QCAR |qr|) |x|
- (|getShellEntry| $ 25))
- (|getShellEntry| $ 29)))
+ (|getShellEntry| $ 28))
+ (|getShellEntry| $ 32)))
(EXIT
(LETT |s1|
(|EUCDOM-;unitNormalizeIdealElt|
@@ -193,13 +193,13 @@
(SEQ (COND
((SPADCALL |z| (|getShellEntry| $ 8))
(CONS 0
- (CONS (|spadConstant| $ 16) (|spadConstant| $ 16))))
+ (CONS (|spadConstant| $ 19) (|spadConstant| $ 19))))
('T
- (SEQ (LETT |s| (SPADCALL |x| |y| (|getShellEntry| $ 32))
+ (SEQ (LETT |s| (SPADCALL |x| |y| (|getShellEntry| $ 35))
|EUCDOM-;extendedEuclidean;3SU;8|)
(LETT |w|
(SPADCALL |z| (QVELT |s| 2)
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 36))
|EUCDOM-;extendedEuclidean;3SU;8|)
(EXIT (COND
((QEQCAR |w| 1) (CONS 1 "failed"))
@@ -207,55 +207,55 @@
(CONS 0
(CONS (SPADCALL (QVELT |s| 0)
(QCDR |w|)
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 28))
(SPADCALL (QVELT |s| 1)
(QCDR |w|)
- (|getShellEntry| $ 25)))))
+ (|getShellEntry| $ 28)))))
('T
(SEQ (LETT |qr|
(SPADCALL
(SPADCALL (QVELT |s| 0)
(QCDR |w|)
- (|getShellEntry| $ 25))
- |y| (|getShellEntry| $ 13))
+ (|getShellEntry| $ 28))
+ |y| (|getShellEntry| $ 16))
|EUCDOM-;extendedEuclidean;3SU;8|)
(EXIT (CONS 0
(CONS (QCDR |qr|)
(SPADCALL
(SPADCALL (QVELT |s| 1)
(QCDR |w|)
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 28))
(SPADCALL (QCAR |qr|) |x|
- (|getShellEntry| $ 25))
- (|getShellEntry| $ 29))))))))))))))))
+ (|getShellEntry| $ 28))
+ (|getShellEntry| $ 32))))))))))))))))
(DEFUN |EUCDOM-;principalIdeal;LR;9| (|l| $)
(PROG (|uca| |v| |u| #0=#:G1519 |vv| #1=#:G1520)
(RETURN
(SEQ (COND
- ((SPADCALL |l| NIL (|getShellEntry| $ 38))
+ ((SPADCALL |l| NIL (|getShellEntry| $ 41))
(|error| "empty list passed to principalIdeal"))
- ((SPADCALL (CDR |l|) NIL (|getShellEntry| $ 38))
+ ((SPADCALL (CDR |l|) NIL (|getShellEntry| $ 41))
(SEQ (LETT |uca|
(SPADCALL (|SPADfirst| |l|)
- (|getShellEntry| $ 23))
+ (|getShellEntry| $ 26))
|EUCDOM-;principalIdeal;LR;9|)
(EXIT (CONS (LIST (QVELT |uca| 0)) (QVELT |uca| 1)))))
- ((SPADCALL (CDR (CDR |l|)) NIL (|getShellEntry| $ 38))
+ ((SPADCALL (CDR (CDR |l|)) NIL (|getShellEntry| $ 41))
(SEQ (LETT |u|
(SPADCALL (|SPADfirst| |l|)
- (SPADCALL |l| (|getShellEntry| $ 39))
- (|getShellEntry| $ 32))
+ (SPADCALL |l| (|getShellEntry| $ 44))
+ (|getShellEntry| $ 35))
|EUCDOM-;principalIdeal;LR;9|)
(EXIT (CONS (LIST (QVELT |u| 0) (QVELT |u| 1))
(QVELT |u| 2)))))
('T
(SEQ (LETT |v|
- (SPADCALL (CDR |l|) (|getShellEntry| $ 42))
+ (SPADCALL (CDR |l|) (|getShellEntry| $ 47))
|EUCDOM-;principalIdeal;LR;9|)
(LETT |u|
(SPADCALL (|SPADfirst| |l|) (QCDR |v|)
- (|getShellEntry| $ 32))
+ (|getShellEntry| $ 35))
|EUCDOM-;principalIdeal;LR;9|)
(EXIT (CONS (CONS (QVELT |u| 0)
(PROGN
@@ -280,7 +280,7 @@
(CONS
(SPADCALL (QVELT |u| 1)
|vv|
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 28))
#0#)
|EUCDOM-;principalIdeal;LR;9|)))
(LETT #1# (CDR #1#)
@@ -293,8 +293,8 @@
(PROG (#0=#:G1521 #1=#:G1522 |pid| |q| #2=#:G1523 |v| #3=#:G1524)
(RETURN
(SEQ (COND
- ((SPADCALL |z| (|spadConstant| $ 16)
- (|getShellEntry| $ 44))
+ ((SPADCALL |z| (|spadConstant| $ 19)
+ (|getShellEntry| $ 50))
(CONS 0
(PROGN
(LETT #0# NIL
@@ -312,17 +312,17 @@
NIL))
(GO G191)))
(SEQ (EXIT (LETT #0#
- (CONS (|spadConstant| $ 16) #0#)
+ (CONS (|spadConstant| $ 19) #0#)
|EUCDOM-;expressIdealMember;LSU;10|)))
(LETT #1# (CDR #1#)
|EUCDOM-;expressIdealMember;LSU;10|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))))
('T
- (SEQ (LETT |pid| (SPADCALL |l| (|getShellEntry| $ 42))
+ (SEQ (LETT |pid| (SPADCALL |l| (|getShellEntry| $ 47))
|EUCDOM-;expressIdealMember;LSU;10|)
(LETT |q|
(SPADCALL |z| (QCDR |pid|)
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 36))
|EUCDOM-;expressIdealMember;LSU;10|)
(EXIT (COND
((QEQCAR |q| 1) (CONS 1 "failed"))
@@ -349,7 +349,7 @@
(LETT #2#
(CONS
(SPADCALL (QCDR |q|) |v|
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 28))
#2#)
|EUCDOM-;expressIdealMember;LSU;10|)))
(LETT #3# (CDR #3#)
@@ -369,11 +369,11 @@
((EQL |n| 1) (CONS 0 (LIST |z|)))
('T
(SEQ (LETT |l1|
- (SPADCALL |l| (|getShellEntry| $ 47))
+ (SPADCALL |l| (|getShellEntry| $ 57))
|EUCDOM-;multiEuclidean;LSU;11|)
(LETT |l2|
(SPADCALL |l1| (QUOTIENT2 |n| 2)
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 60))
|EUCDOM-;multiEuclidean;LSU;11|)
(LETT |u|
(SPADCALL
@@ -402,7 +402,7 @@
(#4#
(LETT #3#
(SPADCALL #3# #2#
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 28))
|EUCDOM-;multiEuclidean;LSU;11|))
('T
(PROGN
@@ -415,7 +415,7 @@
(GO G190) G191 (EXIT NIL))
(COND
(#4# #3#)
- ('T (|spadConstant| $ 26))))
+ ('T (|spadConstant| $ 29))))
(PROGN
(LETT #9# NIL
|EUCDOM-;multiEuclidean;LSU;11|)
@@ -441,7 +441,7 @@
(#9#
(LETT #8#
(SPADCALL #8# #7#
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 28))
|EUCDOM-;multiEuclidean;LSU;11|))
('T
(PROGN
@@ -454,8 +454,8 @@
(GO G190) G191 (EXIT NIL))
(COND
(#9# #8#)
- ('T (|spadConstant| $ 26))))
- |z| (|getShellEntry| $ 50))
+ ('T (|spadConstant| $ 29))))
+ |z| (|getShellEntry| $ 61))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT (COND
((QEQCAR |u| 1) (CONS 1 "failed"))
@@ -463,7 +463,7 @@
(SEQ (LETT |v1|
(SPADCALL |l1|
(QCDR (QCDR |u|))
- (|getShellEntry| $ 51))
+ (|getShellEntry| $ 62))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT
(COND
@@ -474,7 +474,7 @@
(LETT |v2|
(SPADCALL |l2|
(QCAR (QCDR |u|))
- (|getShellEntry| $ 51))
+ (|getShellEntry| $ 62))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT
(COND
@@ -485,7 +485,7 @@
(SPADCALL (QCDR |v1|)
(QCDR |v2|)
(|getShellEntry| $
- 52))))))))))))))))))))))
+ 63))))))))))))))))))))))
(DEFUN |EuclideanDomain&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -493,7 +493,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|EuclideanDomain&|))
(LETT |dv$| (LIST '|EuclideanDomain&| |dv$1|) . #0#)
- (LETT $ (|newShell| 54) . #0#)
+ (LETT $ (|newShell| 65) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -503,48 +503,55 @@
(MAKEPROP '|EuclideanDomain&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|Boolean|)
- (0 . |zero?|) (|NonNegativeInteger|) (5 . |euclideanSize|)
+ (0 . |zero?|) (5 . |false|) (9 . |true|)
+ (|NonNegativeInteger|) (13 . |euclideanSize|) (18 . <)
|EUCDOM-;sizeLess?;2SB;1|
(|Record| (|:| |quotient| $) (|:| |remainder| $))
- (10 . |divide|) |EUCDOM-;quo;3S;2| |EUCDOM-;rem;3S;3|
- (16 . |Zero|) (|Union| $ '"failed") |EUCDOM-;exquo;2SU;4|
- (20 . |unitCanonical|) (25 . |rem|) |EUCDOM-;gcd;3S;5|
+ (24 . |divide|) |EUCDOM-;quo;3S;2| |EUCDOM-;rem;3S;3|
+ (30 . |Zero|) (|Union| $ '"failed") |EUCDOM-;exquo;2SU;4|
+ (34 . |unitCanonical|) (39 . |rem|) |EUCDOM-;gcd;3S;5|
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $))
- (31 . |unitNormal|) (36 . |one?|) (41 . *) (47 . |One|)
- (51 . -) (57 . |sizeLess?|) (63 . +)
+ (45 . |unitNormal|) (50 . |one?|) (55 . *) (61 . |One|)
+ (65 . -) (71 . |sizeLess?|) (77 . +)
(|Record| (|:| |coef1| $) (|:| |coef2| $)
(|:| |generator| $))
|EUCDOM-;extendedEuclidean;2SR;7|
- (69 . |extendedEuclidean|) (75 . |exquo|)
+ (83 . |extendedEuclidean|) (89 . |exquo|)
(|Record| (|:| |coef1| $) (|:| |coef2| $))
- (|Union| 34 '"failed") |EUCDOM-;extendedEuclidean;3SU;8|
- (|List| 6) (81 . =) (87 . |second|) (|List| $)
- (|Record| (|:| |coef| 40) (|:| |generator| $))
- (92 . |principalIdeal|) |EUCDOM-;principalIdeal;LR;9|
- (97 . =) (|Union| 40 '"failed")
- |EUCDOM-;expressIdealMember;LSU;10| (103 . |copy|)
- (|Integer|) (108 . |split!|) (114 . |extendedEuclidean|)
- (121 . |multiEuclidean|) (127 . |concat|)
- |EUCDOM-;multiEuclidean;LSU;11|)
- '#(|sizeLess?| 133 |rem| 139 |quo| 145 |principalIdeal| 151
- |multiEuclidean| 156 |gcd| 162 |extendedEuclidean| 168
- |exquo| 181 |expressIdealMember| 187)
+ (|Union| 37 '"failed") |EUCDOM-;extendedEuclidean;3SU;8|
+ (|List| 6) (95 . =) (101 . |rest|) (106 . |first|)
+ (111 . |second|) (|List| $)
+ (|Record| (|:| |coef| 45) (|:| |generator| $))
+ (116 . |principalIdeal|) (121 . |cons|)
+ |EUCDOM-;principalIdeal;LR;9| (127 . =)
+ (|Union| 45 '"failed") |EUCDOM-;expressIdealMember;LSU;10|
+ (133 . |#|) (138 . |zero?|) (143 . |One|) (147 . =)
+ (153 . |copy|) (158 . |quo|) (|Integer|) (164 . |split!|)
+ (170 . |extendedEuclidean|) (177 . |multiEuclidean|)
+ (183 . |concat|) |EUCDOM-;multiEuclidean;LSU;11|)
+ '#(|sizeLess?| 189 |rem| 195 |quo| 201 |principalIdeal| 207
+ |multiEuclidean| 212 |gcd| 218 |extendedEuclidean| 224
+ |exquo| 237 |expressIdealMember| 243)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 53
- '(1 6 7 0 8 1 6 9 0 10 2 6 12 0 0 13 0
- 6 0 16 1 6 0 0 19 2 6 0 0 0 20 1 6 22
- 0 23 1 6 7 0 24 2 6 0 0 0 25 0 6 0 26
- 2 6 0 0 0 27 2 6 7 0 0 28 2 6 0 0 0
- 29 2 6 30 0 0 32 2 6 17 0 0 33 2 37 7
- 0 0 38 1 37 6 0 39 1 6 41 40 42 2 6 7
- 0 0 44 1 37 0 0 47 2 37 0 0 48 49 3 6
- 35 0 0 0 50 2 6 45 40 0 51 2 37 0 0 0
- 52 2 0 7 0 0 11 2 0 0 0 0 15 2 0 0 0
- 0 14 1 0 41 40 43 2 0 45 40 0 53 2 0
- 0 0 0 21 3 0 35 0 0 0 36 2 0 30 0 0
- 31 2 0 17 0 0 18 2 0 45 40 0 46)))))
+ (|makeByteWordVec2| 64
+ '(1 6 7 0 8 0 7 0 9 0 7 0 10 1 6 11 0
+ 12 2 11 7 0 0 13 2 6 15 0 0 16 0 6 0
+ 19 1 6 0 0 22 2 6 0 0 0 23 1 6 25 0
+ 26 1 6 7 0 27 2 6 0 0 0 28 0 6 0 29 2
+ 6 0 0 0 30 2 6 7 0 0 31 2 6 0 0 0 32
+ 2 6 33 0 0 35 2 6 20 0 0 36 2 40 7 0
+ 0 41 1 40 0 0 42 1 40 6 0 43 1 40 6 0
+ 44 1 6 46 45 47 2 40 0 6 0 48 2 6 7 0
+ 0 50 1 40 11 0 53 1 11 7 0 54 0 11 0
+ 55 2 11 7 0 0 56 1 40 0 0 57 2 11 0 0
+ 0 58 2 40 0 0 59 60 3 6 38 0 0 0 61 2
+ 6 51 45 0 62 2 40 0 0 0 63 2 0 7 0 0
+ 14 2 0 0 0 0 18 2 0 0 0 0 17 1 0 46
+ 45 49 2 0 51 45 0 64 2 0 0 0 0 24 3 0
+ 38 0 0 0 39 2 0 33 0 0 34 2 0 20 0 0
+ 21 2 0 51 45 0 52)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp
index 2a3322ff..6742951f 100644
--- a/src/algebra/strap/FFIELDC-.lsp
+++ b/src/algebra/strap/FFIELDC-.lsp
@@ -57,45 +57,45 @@
((SPADCALL
(LETT |a|
(SPADCALL (+ (SPADCALL |a| (|getShellEntry| $ 11)) 1)
- (|getShellEntry| $ 12))
+ (|getShellEntry| $ 14))
|FFIELDC-;nextItem;SU;3|)
- (|getShellEntry| $ 14))
+ (|getShellEntry| $ 16))
(CONS 1 "failed"))
('T (CONS 0 |a|))))
(DEFUN |FFIELDC-;order;SOpc;4| (|e| $)
- (SPADCALL (SPADCALL |e| (|getShellEntry| $ 17))
- (|getShellEntry| $ 20)))
+ (SPADCALL (SPADCALL |e| (|getShellEntry| $ 19))
+ (|getShellEntry| $ 22)))
(DEFUN |FFIELDC-;conditionP;MU;5| (|mat| $)
(PROG (|l|)
(RETURN
- (SEQ (LETT |l| (SPADCALL |mat| (|getShellEntry| $ 25))
+ (SEQ (LETT |l| (SPADCALL |mat| (|getShellEntry| $ 27))
|FFIELDC-;conditionP;MU;5|)
(COND
((OR (NULL |l|)
- (SPADCALL (ELT $ 14) (|SPADfirst| |l|)
- (|getShellEntry| $ 27)))
+ (SPADCALL (ELT $ 16) (|SPADfirst| |l|)
+ (|getShellEntry| $ 31)))
(EXIT (CONS 1 "failed"))))
(EXIT (CONS 0
- (SPADCALL (ELT $ 28) (|SPADfirst| |l|)
- (|getShellEntry| $ 30))))))))
+ (SPADCALL (ELT $ 32) (|SPADfirst| |l|)
+ (|getShellEntry| $ 34))))))))
(DEFUN |FFIELDC-;charthRoot;2S;6| (|x| $)
- (SPADCALL |x| (QUOTIENT2 2 0) (|getShellEntry| $ 36)))
+ (SPADCALL |x| (QUOTIENT2 2 0) (|getShellEntry| $ 43)))
(DEFUN |FFIELDC-;charthRoot;SU;7| (|x| $)
- (CONS 0 (SPADCALL |x| (|getShellEntry| $ 28))))
+ (CONS 0 (SPADCALL |x| (|getShellEntry| $ 32))))
(DEFUN |FFIELDC-;createPrimitiveElement;S;8| ($)
(PROG (|sm1| |start| |i| |e| |found|)
(RETURN
- (SEQ (LETT |sm1| (- (SPADCALL (|getShellEntry| $ 39)) 1)
+ (SEQ (LETT |sm1| (- (SPADCALL (|getShellEntry| $ 46)) 1)
|FFIELDC-;createPrimitiveElement;S;8|)
(LETT |start|
(COND
- ((SPADCALL (SPADCALL (|getShellEntry| $ 41))
- (CONS 1 "polynomial") (|getShellEntry| $ 42))
+ ((SPADCALL (SPADCALL (|getShellEntry| $ 49))
+ (CONS 1 "polynomial") (|getShellEntry| $ 50))
0)
('T 1))
|FFIELDC-;createPrimitiveElement;S;8|)
@@ -111,11 +111,11 @@
(COND ((< |i| 0) 'NIL) ('T 'T))
(< 0 |i|))
'(|PositiveInteger|) |i|))
- (|getShellEntry| $ 12))
+ (|getShellEntry| $ 14))
|FFIELDC-;createPrimitiveElement;S;8|)
(EXIT (LETT |found|
(EQL (SPADCALL |e|
- (|getShellEntry| $ 17))
+ (|getShellEntry| $ 19))
|sm1|)
|FFIELDC-;createPrimitiveElement;S;8|)))
(LETT |i| (+ |i| 1)
@@ -127,9 +127,9 @@
(PROG (|explist| |q| |exp| #0=#:G1514 |equalone|)
(RETURN
(SEQ (COND
- ((SPADCALL |a| (|getShellEntry| $ 14)) 'NIL)
+ ((SPADCALL |a| (|getShellEntry| $ 16)) 'NIL)
('T
- (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 46))
+ (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 56))
|FFIELDC-;primitive?;SB;9|)
(LETT |q| (- 2 1) |FFIELDC-;primitive?;SB;9|)
(LETT |equalone| 'NIL |FFIELDC-;primitive?;SB;9|)
@@ -148,8 +148,8 @@
(SPADCALL
(SPADCALL |a|
(QUOTIENT2 |q| (QCAR |exp|))
- (|getShellEntry| $ 47))
- (|getShellEntry| $ 48))
+ (|getShellEntry| $ 58))
+ (|getShellEntry| $ 59))
|FFIELDC-;primitive?;SB;9|)))
(LETT #0# (CDR #0#) |FFIELDC-;primitive?;SB;9|)
(GO G190) G191 (EXIT NIL))
@@ -161,12 +161,12 @@
(RETURN
(SEQ (COND
((SPADCALL |e| (|spadConstant| $ 7)
- (|getShellEntry| $ 50))
+ (|getShellEntry| $ 63))
(|error| "order(0) is not defined "))
('T
(SEQ (LETT |ord| (- 2 1) |FFIELDC-;order;SPi;10|)
(LETT |a| 0 |FFIELDC-;order;SPi;10|)
- (LETT |lof| (SPADCALL (|getShellEntry| $ 46))
+ (LETT |lof| (SPADCALL (|getShellEntry| $ 56))
|FFIELDC-;order;SPi;10|)
(SEQ (LETT |rec| NIL |FFIELDC-;order;SPi;10|)
(LETT #0# |lof| |FFIELDC-;order;SPi;10|) G190
@@ -185,8 +185,8 @@
(LETT |goon|
(SPADCALL
(SPADCALL |e| |a|
- (|getShellEntry| $ 47))
- (|getShellEntry| $ 48))
+ (|getShellEntry| $ 58))
+ (|getShellEntry| $ 59))
|FFIELDC-;order;SPi;10|)
(SEQ (LETT |j| 0 |FFIELDC-;order;SPi;10|)
(LETT #1# (- (QCDR |rec|) 2)
@@ -206,8 +206,8 @@
(LETT |goon|
(SPADCALL
(SPADCALL |e| |a|
- (|getShellEntry| $ 47))
- (|getShellEntry| $ 48))
+ (|getShellEntry| $ 58))
+ (|getShellEntry| $ 59))
|FFIELDC-;order;SPi;10|)))
(LETT |j| (QSADD1 |j|)
|FFIELDC-;order;SPi;10|)
@@ -226,16 +226,16 @@
|mult| |disclog| |a|)
(RETURN
(SEQ (COND
- ((SPADCALL |b| (|getShellEntry| $ 14))
+ ((SPADCALL |b| (|getShellEntry| $ 16))
(|error| "discreteLog: logarithm of zero"))
('T
- (SEQ (LETT |faclist| (SPADCALL (|getShellEntry| $ 46))
+ (SEQ (LETT |faclist| (SPADCALL (|getShellEntry| $ 56))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |a| |b| |FFIELDC-;discreteLog;SNni;11|)
- (LETT |gen| (SPADCALL (|getShellEntry| $ 52))
+ (LETT |gen| (SPADCALL (|getShellEntry| $ 67))
|FFIELDC-;discreteLog;SNni;11|)
(EXIT (COND
- ((SPADCALL |b| |gen| (|getShellEntry| $ 50))
+ ((SPADCALL |b| |gen| (|getShellEntry| $ 63))
1)
('T
(SEQ (LETT |disclog| 0
@@ -277,15 +277,15 @@
|FFIELDC-;discreteLog;SNni;11|)
(LETT |exptable|
(SPADCALL |fac|
- (|getShellEntry| $ 54))
+ (|getShellEntry| $ 69))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |n|
(SPADCALL |exptable|
- (|getShellEntry| $ 55))
+ (|getShellEntry| $ 70))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |c|
(SPADCALL |a| |exp|
- (|getShellEntry| $ 47))
+ (|getShellEntry| $ 58))
|FFIELDC-;discreteLog;SNni;11|)
(LETT |end|
(QUOTIENT2 (- |fac| 1) |n|)
@@ -309,7 +309,7 @@
(SPADCALL |c|
(|getShellEntry| $ 11))
|exptable|
- (|getShellEntry| $ 57))
+ (|getShellEntry| $ 73))
|FFIELDC-;discreteLog;SNni;11|)
(EXIT
(COND
@@ -333,9 +333,9 @@
|groupord| |fac|)
(- |n|))
(|getShellEntry| $
- 47))
+ 58))
(|getShellEntry| $
- 58))
+ 79))
|FFIELDC-;discreteLog;SNni;11|)))))
(LETT |i| (QSADD1 |i|)
|FFIELDC-;discreteLog;SNni;11|)
@@ -356,9 +356,9 @@
(SPADCALL |gen|
(- |disc1|)
(|getShellEntry| $
- 47))
+ 58))
(|getShellEntry| $
- 58))
+ 79))
|FFIELDC-;discreteLog;SNni;11|))))
('T
(|error|
@@ -377,36 +377,36 @@
|mult| |a|)
(RETURN
(SEQ (EXIT (COND
- ((SPADCALL |b| (|getShellEntry| $ 14))
+ ((SPADCALL |b| (|getShellEntry| $ 16))
(SEQ (SPADCALL "discreteLog: logarithm of zero"
- (|getShellEntry| $ 63))
+ (|getShellEntry| $ 85))
(EXIT (CONS 1 "failed"))))
- ((SPADCALL |logbase| (|getShellEntry| $ 14))
+ ((SPADCALL |logbase| (|getShellEntry| $ 16))
(SEQ (SPADCALL
"discreteLog: logarithm to base zero"
- (|getShellEntry| $ 63))
+ (|getShellEntry| $ 85))
(EXIT (CONS 1 "failed"))))
- ((SPADCALL |b| |logbase| (|getShellEntry| $ 50))
+ ((SPADCALL |b| |logbase| (|getShellEntry| $ 63))
(CONS 0 1))
('T
(COND
((NULL (ZEROP (REMAINDER2
(LETT |groupord|
(SPADCALL |logbase|
- (|getShellEntry| $ 17))
+ (|getShellEntry| $ 19))
|FFIELDC-;discreteLog;2SU;12|)
(SPADCALL |b|
- (|getShellEntry| $ 17)))))
+ (|getShellEntry| $ 19)))))
(SEQ (SPADCALL
"discreteLog: second argument not in cyclic group generated by first argument"
- (|getShellEntry| $ 63))
+ (|getShellEntry| $ 85))
(EXIT (CONS 1 "failed"))))
('T
(SEQ (LETT |faclist|
(SPADCALL
(SPADCALL |groupord|
- (|getShellEntry| $ 65))
- (|getShellEntry| $ 67))
+ (|getShellEntry| $ 89))
+ (|getShellEntry| $ 91))
|FFIELDC-;discreteLog;2SU;12|)
(LETT |a| |b|
|FFIELDC-;discreteLog;2SU;12|)
@@ -433,7 +433,7 @@
(LETT |primroot|
(SPADCALL |logbase|
(QUOTIENT2 |groupord| |fac|)
- (|getShellEntry| $ 47))
+ (|getShellEntry| $ 58))
|FFIELDC-;discreteLog;2SU;12|)
(EXIT
(SEQ
@@ -452,9 +452,9 @@
(LETT |rhoHelp|
(SPADCALL |primroot|
(SPADCALL |a| |exp|
- (|getShellEntry| $ 47))
+ (|getShellEntry| $ 58))
|fac|
- (|getShellEntry| $ 69))
+ (|getShellEntry| $ 93))
|FFIELDC-;discreteLog;2SU;12|)
(EXIT
(COND
@@ -482,8 +482,8 @@
(SPADCALL |logbase|
(- |rho|)
(|getShellEntry| $
- 47))
- (|getShellEntry| $ 58))
+ 58))
+ (|getShellEntry| $ 79))
|FFIELDC-;discreteLog;2SU;12|)))))))
(LETT |t| (QSADD1 |t|)
|FFIELDC-;discreteLog;2SU;12|)
@@ -495,25 +495,25 @@
#2# (EXIT #2#)))))
(DEFUN |FFIELDC-;squareFreePolynomial| (|f| $)
- (SPADCALL |f| (|getShellEntry| $ 74)))
+ (SPADCALL |f| (|getShellEntry| $ 98)))
(DEFUN |FFIELDC-;factorPolynomial| (|f| $)
- (SPADCALL |f| (|getShellEntry| $ 76)))
+ (SPADCALL |f| (|getShellEntry| $ 100)))
(DEFUN |FFIELDC-;factorSquareFreePolynomial| (|f| $)
(PROG (|flist| |u| #0=#:G1521 #1=#:G1510 #2=#:G1508 #3=#:G1509)
(RETURN
(SEQ (COND
- ((SPADCALL |f| (|spadConstant| $ 77)
- (|getShellEntry| $ 78))
- (|spadConstant| $ 79))
+ ((SPADCALL |f| (|spadConstant| $ 101)
+ (|getShellEntry| $ 102))
+ (|spadConstant| $ 103))
('T
(SEQ (LETT |flist|
- (SPADCALL |f| 'T (|getShellEntry| $ 83))
+ (SPADCALL |f| 'T (|getShellEntry| $ 107))
|FFIELDC-;factorSquareFreePolynomial|)
(EXIT (SPADCALL
(SPADCALL (QCAR |flist|)
- (|getShellEntry| $ 84))
+ (|getShellEntry| $ 108))
(PROGN
(LETT #3# NIL
|FFIELDC-;factorSquareFreePolynomial|)
@@ -535,13 +535,13 @@
(LETT #1#
(SPADCALL (QCAR |u|)
(QCDR |u|)
- (|getShellEntry| $ 85))
+ (|getShellEntry| $ 109))
|FFIELDC-;factorSquareFreePolynomial|)
(COND
(#3#
(LETT #2#
(SPADCALL #2# #1#
- (|getShellEntry| $ 86))
+ (|getShellEntry| $ 110))
|FFIELDC-;factorSquareFreePolynomial|))
('T
(PROGN
@@ -554,11 +554,11 @@
(GO G190) G191 (EXIT NIL))
(COND
(#3# #2#)
- ('T (|spadConstant| $ 87))))
- (|getShellEntry| $ 88))))))))))
+ ('T (|spadConstant| $ 111))))
+ (|getShellEntry| $ 112))))))))))
(DEFUN |FFIELDC-;gcdPolynomial;3Sup;16| (|f| |g| $)
- (SPADCALL |f| |g| (|getShellEntry| $ 90)))
+ (SPADCALL |f| |g| (|getShellEntry| $ 114)))
(DEFUN |FiniteFieldCategory&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -566,7 +566,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|FiniteFieldCategory&|))
(LETT |dv$| (LIST '|FiniteFieldCategory&| |dv$1|) . #0#)
- (LETT $ (|newShell| 93) . #0#)
+ (LETT $ (|newShell| 117) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -577,68 +577,83 @@
(MAKEPROP '|FiniteFieldCategory&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (0 . |Zero|)
|FFIELDC-;differentiate;2S;1| |FFIELDC-;init;S;2|
- (|PositiveInteger|) (4 . |lookup|) (9 . |index|)
- (|Boolean|) (14 . |zero?|) (|Union| $ '"failed")
- |FFIELDC-;nextItem;SU;3| (19 . |order|) (|Integer|)
- (|OnePointCompletion| 10) (24 . |coerce|)
- |FFIELDC-;order;SOpc;4| (|Vector| 6) (|List| 22)
- (|Matrix| 6) (29 . |nullSpace|) (|Mapping| 13 6)
- (34 . |every?|) (40 . |charthRoot|) (|Mapping| 6 6)
- (45 . |map|) (|Vector| $) (|Union| 31 '"failed")
+ (|PositiveInteger|) (4 . |lookup|) (9 . |One|) (13 . +)
+ (19 . |index|) (|Boolean|) (24 . |zero?|)
+ (|Union| $ '"failed") |FFIELDC-;nextItem;SU;3|
+ (29 . |order|) (|Integer|) (|OnePointCompletion| 10)
+ (34 . |coerce|) |FFIELDC-;order;SOpc;4| (|Vector| 6)
+ (|List| 24) (|Matrix| 6) (39 . |nullSpace|)
+ (44 . |empty?|) (49 . |first|) (|Mapping| 15 6)
+ (54 . |every?|) (60 . |charthRoot|) (|Mapping| 6 6)
+ (65 . |map|) (|Vector| $) (|Union| 35 '"failed")
(|Matrix| $) |FFIELDC-;conditionP;MU;5|
- (|NonNegativeInteger|) (51 . **)
+ (|NonNegativeInteger|) (71 . |size|)
+ (75 . |characteristic|) (79 . |quo|) (85 . **)
|FFIELDC-;charthRoot;2S;6| |FFIELDC-;charthRoot;SU;7|
- (57 . |size|)
+ (91 . |size|) (95 . -)
(|Union| '"prime" '"polynomial" '"normal" '"cyclic")
- (61 . |representationType|) (65 . =)
- |FFIELDC-;createPrimitiveElement;S;8|
- (|Record| (|:| |factor| 18) (|:| |exponent| 18))
- (|List| 44) (71 . |factorsOfCyclicGroupSize|) (75 . **)
- (81 . |one?|) |FFIELDC-;primitive?;SB;9| (86 . =)
- |FFIELDC-;order;SPi;10| (92 . |primitiveElement|)
- (|Table| 10 35) (96 . |tableForDiscreteLogarithm|)
- (101 . |#|) (|Union| 35 '"failed") (106 . |search|)
- (112 . *) |FFIELDC-;discreteLog;SNni;11| (|Void|)
- (|String|) (|OutputForm|) (118 . |messagePrint|)
- (|Factored| $) (123 . |factor|) (|Factored| 18)
- (128 . |factors|) (|DiscreteLogarithmPackage| 6)
- (133 . |shanksDiscLogAlgorithm|)
+ (101 . |representationType|) (105 . =) (111 . |false|)
+ (115 . =) |FFIELDC-;createPrimitiveElement;S;8|
+ (|Record| (|:| |factor| 20) (|:| |exponent| 20))
+ (|List| 54) (121 . |factorsOfCyclicGroupSize|)
+ (125 . |quo|) (131 . **) (137 . |one?|)
+ |FFIELDC-;primitive?;SB;9| (142 . |Zero|) (146 . |Zero|)
+ (150 . =) (|SingleInteger|) (156 . |Zero|)
+ |FFIELDC-;order;SPi;10| (160 . |primitiveElement|)
+ (|Table| 10 39) (164 . |tableForDiscreteLogarithm|)
+ (169 . |#|) (174 . |One|) (|Union| 39 '"failed")
+ (178 . |search|) (184 . |true|) (188 . *) (194 . +)
+ (200 . *) (206 . -) (211 . *) (217 . +)
+ |FFIELDC-;discreteLog;SNni;11| (|Void|) (|String|)
+ (|OutputForm|) (223 . |messagePrint|) (228 . |rem|)
+ (234 . |zero?|) (|Factored| $) (239 . |factor|)
+ (|Factored| 20) (244 . |factors|)
+ (|DiscreteLogarithmPackage| 6)
+ (249 . |shanksDiscLogAlgorithm|)
|FFIELDC-;discreteLog;2SU;12|
- (|SparseUnivariatePolynomial| 6) (|Factored| 71)
- (|UnivariatePolynomialSquareFree| 6 71)
- (140 . |squareFree|) (|DistinctDegreeFactorize| 6 71)
- (145 . |factor|) (150 . |Zero|) (154 . =) (160 . |Zero|)
- (|Record| (|:| |irr| 71) (|:| |pow| 18)) (|List| 80)
- (|Record| (|:| |cont| 6) (|:| |factors| 81))
- (164 . |distdfact|) (170 . |coerce|) (175 . |primeFactor|)
- (181 . *) (187 . |One|) (191 . *) (|EuclideanDomain&| 71)
- (197 . |gcd|) (|SparseUnivariatePolynomial| $)
+ (|SparseUnivariatePolynomial| 6) (|Factored| 95)
+ (|UnivariatePolynomialSquareFree| 6 95)
+ (256 . |squareFree|) (|DistinctDegreeFactorize| 6 95)
+ (261 . |factor|) (266 . |Zero|) (270 . =) (276 . |Zero|)
+ (|Record| (|:| |irr| 95) (|:| |pow| 20)) (|List| 104)
+ (|Record| (|:| |cont| 6) (|:| |factors| 105))
+ (280 . |distdfact|) (286 . |coerce|) (291 . |primeFactor|)
+ (297 . *) (303 . |One|) (307 . *) (|EuclideanDomain&| 95)
+ (313 . |gcd|) (|SparseUnivariatePolynomial| $)
|FFIELDC-;gcdPolynomial;3Sup;16|)
- '#(|primitive?| 203 |order| 208 |nextItem| 218 |init| 223
- |gcdPolynomial| 227 |discreteLog| 233 |differentiate| 244
- |createPrimitiveElement| 249 |conditionP| 253 |charthRoot|
- 258)
+ '#(|primitive?| 319 |order| 324 |nextItem| 334 |init| 339
+ |gcdPolynomial| 343 |discreteLog| 349 |differentiate| 360
+ |createPrimitiveElement| 365 |conditionP| 369 |charthRoot|
+ 374)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 92
- '(0 6 0 7 1 6 10 0 11 1 6 0 10 12 1 6
- 13 0 14 1 6 10 0 17 1 19 0 18 20 1 24
- 23 0 25 2 22 13 26 0 27 1 6 0 0 28 2
- 22 0 29 0 30 2 6 0 0 35 36 0 6 35 39
- 0 6 40 41 2 40 13 0 0 42 0 6 45 46 2
- 6 0 0 18 47 1 6 13 0 48 2 6 13 0 0 50
- 0 6 0 52 1 6 53 18 54 1 53 35 0 55 2
- 53 56 10 0 57 2 6 0 0 0 58 1 62 60 61
- 63 1 18 64 0 65 1 66 45 0 67 3 68 56
- 6 6 35 69 1 73 72 71 74 1 75 72 71 76
- 0 71 0 77 2 71 13 0 0 78 0 72 0 79 2
- 75 82 71 13 83 1 71 0 6 84 2 72 0 71
- 18 85 2 72 0 0 0 86 0 72 0 87 2 72 0
- 71 0 88 2 89 0 0 0 90 1 0 13 0 49 1 0
- 10 0 51 1 0 19 0 21 1 0 15 0 16 0 0 0
- 9 2 0 91 91 91 92 1 0 35 0 59 2 0 56
- 0 0 70 1 0 0 0 8 0 0 0 43 1 0 32 33
- 34 1 0 0 0 37 1 0 15 0 38)))))
+ (|makeByteWordVec2| 116
+ '(0 6 0 7 1 6 10 0 11 0 10 0 12 2 10 0
+ 0 0 13 1 6 0 10 14 1 6 15 0 16 1 6 10
+ 0 19 1 21 0 20 22 1 26 25 0 27 1 25
+ 15 0 28 1 25 24 0 29 2 24 15 30 0 31
+ 1 6 0 0 32 2 24 0 33 0 34 0 15 39 40
+ 0 20 39 41 2 39 0 0 0 42 2 6 0 0 39
+ 43 0 6 39 46 2 20 0 0 0 47 0 6 48 49
+ 2 48 15 0 0 50 0 15 0 51 2 10 15 0 0
+ 52 0 6 55 56 2 20 0 0 0 57 2 6 0 0 20
+ 58 1 6 15 0 59 0 39 0 61 0 20 0 62 2
+ 6 15 0 0 63 0 64 0 65 0 6 0 67 1 6 68
+ 20 69 1 68 39 0 70 0 39 0 71 2 68 72
+ 10 0 73 0 15 0 74 2 39 0 39 0 75 2 39
+ 0 0 0 76 2 20 0 20 0 77 1 20 0 0 78 2
+ 6 0 0 0 79 2 20 0 0 0 80 1 84 82 83
+ 85 2 39 0 0 0 86 1 39 15 0 87 1 20 88
+ 0 89 1 90 55 0 91 3 92 72 6 6 39 93 1
+ 97 96 95 98 1 99 96 95 100 0 95 0 101
+ 2 95 15 0 0 102 0 96 0 103 2 99 106
+ 95 15 107 1 95 0 6 108 2 96 0 95 20
+ 109 2 96 0 0 0 110 0 96 0 111 2 96 0
+ 95 0 112 2 113 0 0 0 114 1 0 15 0 60
+ 1 0 10 0 66 1 0 21 0 23 1 0 17 0 18 0
+ 0 0 9 2 0 115 115 115 116 1 0 39 0 81
+ 2 0 72 0 0 94 1 0 0 0 8 0 0 0 53 1 0
+ 36 37 38 1 0 0 0 44 1 0 17 0 45)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/FPS-.lsp b/src/algebra/strap/FPS-.lsp
index d9a74d7e..c85e10be 100644
--- a/src/algebra/strap/FPS-.lsp
+++ b/src/algebra/strap/FPS-.lsp
@@ -18,8 +18,8 @@
(MAX 1
(QUOTIENT2
(SPADCALL 4004
- (- (SPADCALL (|getShellEntry| $ 13)) 1)
- (|getShellEntry| $ 14))
+ (- (SPADCALL (|getShellEntry| $ 14)) 1)
+ (|getShellEntry| $ 16))
13301))
|FPS-;digits;Pi;2|)
(|check-subtype|
@@ -32,7 +32,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|FloatingPointSystem&|))
(LETT |dv$| (LIST '|FloatingPointSystem&| |dv$1|) . #0#)
- (LETT $ (|newShell| 17) . #0#)
+ (LETT $ (|newShell| 21) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -46,14 +46,15 @@
(MAKEPROP '|FloatingPointSystem&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|PositiveInteger|)
(0 . |base|) (|Integer|) (4 . |float|) |FPS-;float;2IS;1|
- (11 . |One|) (15 . |bits|) (19 . *) (25 . |max|)
- |FPS-;digits;Pi;2|)
- '#(|float| 29 |digits| 35) 'NIL
+ (11 . |One|) (15 . |One|) (19 . |bits|) (23 . -) (29 . *)
+ (35 . |max|) (39 . |quo|) (45 . |max|) |FPS-;digits;Pi;2|)
+ '#(|float| 51 |digits| 57) 'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 16
- '(0 6 7 8 3 6 0 9 9 7 10 0 6 0 12 0 6 7
- 13 2 9 0 7 0 14 0 6 0 15 2 0 0 9 9 11
- 0 0 7 16)))))
+ (|makeByteWordVec2| 20
+ '(0 6 7 8 3 6 0 9 9 7 10 0 6 0 12 0 7 0
+ 13 0 6 7 14 2 9 0 0 0 15 2 9 0 7 0 16
+ 0 6 0 17 2 9 0 0 0 18 2 9 0 0 0 19 2
+ 0 0 9 9 11 0 0 7 20)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/GCDDOM-.lsp b/src/algebra/strap/GCDDOM-.lsp
index e128bbb7..37c12aba 100644
--- a/src/algebra/strap/GCDDOM-.lsp
+++ b/src/algebra/strap/GCDDOM-.lsp
@@ -88,8 +88,8 @@
(SPADCALL |p1|
(SPADCALL
(|spadConstant| $ 16) |e1|
- (|getShellEntry| $ 32))
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 36))
+ (|getShellEntry| $ 37))
|GCDDOM-;gcdPolynomial;3Sup;4|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
@@ -108,8 +108,8 @@
(SPADCALL |p2|
(SPADCALL
(|spadConstant| $ 16) |e2|
- (|getShellEntry| $ 32))
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 36))
+ (|getShellEntry| $ 37))
|GCDDOM-;gcdPolynomial;3Sup;4|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
@@ -125,32 +125,32 @@
(LETT |p1|
(COND
((OR (EQL (SPADCALL |p1|
- (|getShellEntry| $ 34))
+ (|getShellEntry| $ 39))
0)
(EQL (SPADCALL |p2|
- (|getShellEntry| $ 34))
+ (|getShellEntry| $ 39))
0))
- (SPADCALL |c1| 0 (|getShellEntry| $ 32)))
+ (SPADCALL |c1| 0 (|getShellEntry| $ 36)))
('T
(SEQ (LETT |p|
(SPADCALL |p1| |p2|
- (|getShellEntry| $ 35))
+ (|getShellEntry| $ 41))
|GCDDOM-;gcdPolynomial;3Sup;4|)
(EXIT (COND
((EQL
(SPADCALL |p|
- (|getShellEntry| $ 34))
+ (|getShellEntry| $ 39))
0)
(SPADCALL |c1| 0
- (|getShellEntry| $ 32)))
+ (|getShellEntry| $ 36)))
('T
(SEQ
(LETT |c2|
(SPADCALL
(SPADCALL |p1|
- (|getShellEntry| $ 36))
+ (|getShellEntry| $ 42))
(SPADCALL |p2|
- (|getShellEntry| $ 36))
+ (|getShellEntry| $ 42))
(|getShellEntry| $ 10))
|GCDDOM-;gcdPolynomial;3Sup;4|)
(EXIT
@@ -162,10 +162,10 @@
(SPADCALL
(SPADCALL |c2| |p|
(|getShellEntry| $
- 37))
+ 43))
(SPADCALL |p|
(|getShellEntry| $
- 36))
+ 42))
(|getShellEntry| $
27))
|GCDDOM-;gcdPolynomial;3Sup;4|)
@@ -176,8 +176,8 @@
(|getShellEntry| $
6))
#0#))
- (|getShellEntry| $ 38))
- (|getShellEntry| $ 37))
+ (|getShellEntry| $ 44))
+ (|getShellEntry| $ 43))
(|getShellEntry| $ 25))))))))))
|GCDDOM-;gcdPolynomial;3Sup;4|)
(EXIT (COND
@@ -185,8 +185,8 @@
('T
(SPADCALL
(SPADCALL (|spadConstant| $ 16) |e1|
- (|getShellEntry| $ 32))
- |p1| (|getShellEntry| $ 39))))))))))))
+ (|getShellEntry| $ 36))
+ |p1| (|getShellEntry| $ 46))))))))))))
(DEFUN |GcdDomain&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -194,7 +194,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|GcdDomain&|))
(LETT |dv$| (LIST '|GcdDomain&| |dv$1|) . #0#)
- (LETT $ (|newShell| 42) . #0#)
+ (LETT $ (|newShell| 49) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -211,25 +211,28 @@
(|SparseUnivariatePolynomial| 6) (46 . |zero?|)
(51 . |unitCanonical|) (56 . |content|) (61 . |exquo|)
(|NonNegativeInteger|) (67 . |minimumDegree|)
- (72 . |Zero|) (76 . |One|) (80 . |monomial|)
- (86 . |exquo|) (92 . |degree|) (97 . |subResultantGcd|)
- (103 . |leadingCoefficient|) (108 . *)
- (114 . |primitivePart|) (119 . *)
- (|SparseUnivariatePolynomial| $)
+ (72 . |Zero|) (76 . |Zero|) (|Integer|) (80 . |Zero|)
+ (84 . <) (90 . |One|) (94 . |monomial|) (100 . |exquo|)
+ (106 . |min|) (112 . |degree|) (117 . =)
+ (123 . |subResultantGcd|) (129 . |leadingCoefficient|)
+ (134 . *) (140 . |primitivePart|) (145 . |zero?|)
+ (150 . *) (|SparseUnivariatePolynomial| $)
|GCDDOM-;gcdPolynomial;3Sup;4|)
- '#(|lcm| 125 |gcdPolynomial| 136 |gcd| 142) 'NIL
+ '#(|lcm| 156 |gcdPolynomial| 167 |gcd| 173) 'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 41
+ (|makeByteWordVec2| 48
'(0 6 0 7 2 6 8 0 0 9 2 6 0 0 0 10 2 6
11 0 0 12 2 6 0 0 0 13 2 6 0 0 0 15 0
6 0 16 4 18 6 17 0 6 6 19 1 23 8 0 24
1 23 0 0 25 1 23 6 0 26 2 23 11 0 6
- 27 1 23 28 0 29 0 23 0 30 0 23 0 31 2
- 23 0 6 28 32 2 23 11 0 0 33 1 23 28 0
- 34 2 23 0 0 0 35 1 23 6 0 36 2 23 0 6
- 0 37 1 23 0 0 38 2 23 0 0 0 39 1 0 0
- 20 21 2 0 0 0 0 14 2 0 40 40 40 41 1
- 0 0 20 22)))))
+ 27 1 23 28 0 29 0 23 0 30 0 28 0 31 0
+ 32 0 33 2 28 8 0 0 34 0 23 0 35 2 23
+ 0 6 28 36 2 23 11 0 0 37 2 28 0 0 0
+ 38 1 23 28 0 39 2 28 8 0 0 40 2 23 0
+ 0 0 41 1 23 6 0 42 2 23 0 6 0 43 1 23
+ 0 0 44 1 28 8 0 45 2 23 0 0 0 46 1 0
+ 0 20 21 2 0 0 0 0 14 2 0 47 47 47 48
+ 1 0 0 20 22)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/HOAGG-.lsp b/src/algebra/strap/HOAGG-.lsp
index 5a895dee..713e069d 100644
--- a/src/algebra/strap/HOAGG-.lsp
+++ b/src/algebra/strap/HOAGG-.lsp
@@ -143,27 +143,27 @@
(DEFUN |HOAGG-;count;SANni;7| (|s| |x| $)
(SPADCALL (CONS #'|HOAGG-;count;SANni;7!0| (VECTOR $ |s|)) |x|
- (|getShellEntry| $ 25)))
+ (|getShellEntry| $ 31)))
(DEFUN |HOAGG-;count;SANni;7!0| (|#1| $$)
(SPADCALL (|getShellEntry| $$ 1) |#1|
- (|getShellEntry| (|getShellEntry| $$ 0) 24)))
+ (|getShellEntry| (|getShellEntry| $$ 0) 30)))
(DEFUN |HOAGG-;member?;SAB;8| (|e| |c| $)
(SPADCALL (CONS #'|HOAGG-;member?;SAB;8!0| (VECTOR $ |e|)) |c|
- (|getShellEntry| $ 27)))
+ (|getShellEntry| $ 33)))
(DEFUN |HOAGG-;member?;SAB;8!0| (|#1| $$)
(SPADCALL (|getShellEntry| $$ 1) |#1|
- (|getShellEntry| (|getShellEntry| $$ 0) 24)))
+ (|getShellEntry| (|getShellEntry| $$ 0) 30)))
(DEFUN |HOAGG-;=;2AB;9| (|x| |y| $)
(PROG (|b| #0=#:G1433 |a| #1=#:G1432 #2=#:G1423 #3=#:G1421
#4=#:G1422)
(RETURN
(SEQ (COND
- ((SPADCALL |x| (SPADCALL |y| (|getShellEntry| $ 29))
- (|getShellEntry| $ 30))
+ ((SPADCALL |x| (SPADCALL |y| (|getShellEntry| $ 35))
+ (|getShellEntry| $ 36))
(PROGN
(LETT #4# NIL |HOAGG-;=;2AB;9|)
(SEQ (LETT |b| NIL |HOAGG-;=;2AB;9|)
@@ -186,7 +186,7 @@
(SEQ (EXIT (PROGN
(LETT #2#
(SPADCALL |a| |b|
- (|getShellEntry| $ 24))
+ (|getShellEntry| $ 30))
|HOAGG-;=;2AB;9|)
(COND
(#4#
@@ -227,13 +227,13 @@
(SEQ (EXIT (LETT #0#
(CONS
(SPADCALL |a|
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 39))
#0#)
|HOAGG-;coerce;AOf;10|)))
(LETT #1# (CDR #1#) |HOAGG-;coerce;AOf;10|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 35))
- (|getShellEntry| $ 36))))))
+ (|getShellEntry| $ 41))
+ (|getShellEntry| $ 42))))))
(DEFUN |HomogeneousAggregate&| (|#1| |#2|)
(PROG (|dv$1| |dv$2| |dv$| $ |pv$|)
@@ -243,7 +243,7 @@
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$|
(LIST '|HomogeneousAggregate&| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 38) . #0#)
+ (LETT $ (|newShell| 44) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -265,30 +265,30 @@
(COND
((|testBitVector| |pv$| 1)
(PROGN
- (|setShellEntry| $ 17
+ (|setShellEntry| $ 18
(CONS (|dispatchFunction| |HOAGG-;#;ANni;2|) $))
- (|setShellEntry| $ 20
+ (|setShellEntry| $ 23
(CONS (|dispatchFunction| |HOAGG-;any?;MAB;3|) $))
- (|setShellEntry| $ 21
+ (|setShellEntry| $ 24
(CONS (|dispatchFunction| |HOAGG-;every?;MAB;4|) $))
- (|setShellEntry| $ 22
+ (|setShellEntry| $ 28
(CONS (|dispatchFunction| |HOAGG-;count;MANni;5|) $))
- (|setShellEntry| $ 23
+ (|setShellEntry| $ 29
(CONS (|dispatchFunction| |HOAGG-;members;AL;6|) $))
(COND
((|testBitVector| |pv$| 4)
(PROGN
- (|setShellEntry| $ 26
+ (|setShellEntry| $ 32
(CONS (|dispatchFunction| |HOAGG-;count;SANni;7|)
$))
- (|setShellEntry| $ 28
+ (|setShellEntry| $ 34
(CONS (|dispatchFunction| |HOAGG-;member?;SAB;8|)
$))
- (|setShellEntry| $ 31
+ (|setShellEntry| $ 37
(CONS (|dispatchFunction| |HOAGG-;=;2AB;9|) $)))))
(COND
((|testBitVector| |pv$| 5)
- (|setShellEntry| $ 37
+ (|setShellEntry| $ 43
(CONS (|dispatchFunction| |HOAGG-;coerce;AOf;10|)
$)))))))
$))))
@@ -297,30 +297,34 @@
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|)
(|Equation| 7) (|List| 8) (0 . |eval|) (|Mapping| 7 7)
(6 . |map|) (12 . |eval|) (|List| 7) (18 . |parts|)
- (|NonNegativeInteger|) (23 . |#|) (|Boolean|)
- (|Mapping| 18 7) (28 . |any?|) (34 . |every?|)
- (40 . |count|) (46 . |members|) (51 . =) (57 . |count|)
- (63 . |count|) (69 . |any?|) (75 . |member?|) (81 . |#|)
- (86 . |size?|) (92 . =) (|OutputForm|) (98 . |coerce|)
- (|List| $) (103 . |commaSeparate|) (108 . |bracket|)
- (113 . |coerce|))
- '#(|members| 118 |member?| 123 |every?| 129 |eval| 135
- |count| 141 |coerce| 153 |any?| 158 = 164 |#| 170)
+ (|NonNegativeInteger|) (23 . |#|) (28 . |#|) (|Boolean|)
+ (33 . |true|) (37 . |false|) (|Mapping| 19 7)
+ (41 . |any?|) (47 . |every?|) (53 . |One|) (57 . +)
+ (63 . |Zero|) (67 . |count|) (73 . |members|) (78 . =)
+ (84 . |count|) (90 . |count|) (96 . |any?|)
+ (102 . |member?|) (108 . |#|) (113 . |size?|) (119 . =)
+ (|OutputForm|) (125 . |coerce|) (|List| $)
+ (130 . |commaSeparate|) (135 . |bracket|)
+ (140 . |coerce|))
+ '#(|members| 145 |member?| 150 |every?| 156 |eval| 162
+ |count| 168 |coerce| 180 |any?| 185 = 191 |#| 197)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 37
+ (|makeByteWordVec2| 43
'(2 7 0 0 9 10 2 6 0 11 0 12 2 0 0 0 9
- 13 1 6 14 0 15 1 0 16 0 17 2 0 18 19
- 0 20 2 0 18 19 0 21 2 0 16 19 0 22 1
- 0 14 0 23 2 7 18 0 0 24 2 6 16 19 0
- 25 2 0 16 7 0 26 2 6 18 19 0 27 2 0
- 18 7 0 28 1 6 16 0 29 2 6 18 0 16 30
- 2 0 18 0 0 31 1 7 32 0 33 1 32 0 34
- 35 1 32 0 0 36 1 0 32 0 37 1 0 14 0
- 23 2 0 18 7 0 28 2 0 18 19 0 21 2 0 0
- 0 9 13 2 0 16 7 0 26 2 0 16 19 0 22 1
- 0 32 0 37 2 0 18 19 0 20 2 0 18 0 0
- 31 1 0 16 0 17)))))
+ 13 1 6 14 0 15 1 14 16 0 17 1 0 16 0
+ 18 0 19 0 20 0 19 0 21 2 0 19 22 0 23
+ 2 0 19 22 0 24 0 16 0 25 2 16 0 0 0
+ 26 0 16 0 27 2 0 16 22 0 28 1 0 14 0
+ 29 2 7 19 0 0 30 2 6 16 22 0 31 2 0
+ 16 7 0 32 2 6 19 22 0 33 2 0 19 7 0
+ 34 1 6 16 0 35 2 6 19 0 16 36 2 0 19
+ 0 0 37 1 7 38 0 39 1 38 0 40 41 1 38
+ 0 0 42 1 0 38 0 43 1 0 14 0 29 2 0 19
+ 7 0 34 2 0 19 22 0 24 2 0 0 0 9 13 2
+ 0 16 7 0 32 2 0 16 22 0 28 1 0 38 0
+ 43 2 0 19 22 0 23 2 0 19 0 0 37 1 0
+ 16 0 18)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp
index ee2b5370..2a1dfcbc 100644
--- a/src/algebra/strap/ILIST.lsp
+++ b/src/algebra/strap/ILIST.lsp
@@ -202,7 +202,7 @@
(SEQ (COND
((EQ |i| 1000)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 33))
+ ((SPADCALL |x| (|getShellEntry| $ 39))
(|error| "cyclic list")))))
(LETT |y| (CONS (QCAR |x|) |y|)
|ILIST;copy;2$;20|)
@@ -215,25 +215,25 @@
(PROG (|s| |y| |z|)
(RETURN
(SEQ (LETT |y| NIL |ILIST;coerce;$Of;21|)
- (LETT |s| (SPADCALL |x| (|getShellEntry| $ 35))
+ (LETT |s| (SPADCALL |x| (|getShellEntry| $ 44))
|ILIST;coerce;$Of;21|)
(SEQ G190 (COND ((NULL (NEQ |x| |s|)) (GO G191)))
(SEQ (LETT |y|
(CONS (SPADCALL (|SPADfirst| |x|)
- (|getShellEntry| $ 37))
+ (|getShellEntry| $ 45))
|y|)
|ILIST;coerce;$Of;21|)
(EXIT (LETT |x| (CDR |x|) |ILIST;coerce;$Of;21|)))
NIL (GO G190) G191 (EXIT NIL))
(LETT |y| (NREVERSE |y|) |ILIST;coerce;$Of;21|)
(EXIT (COND
- ((NULL |s|) (SPADCALL |y| (|getShellEntry| $ 39)))
+ ((NULL |s|) (SPADCALL |y| (|getShellEntry| $ 49)))
('T
(SEQ (LETT |z|
(SPADCALL
(SPADCALL (|SPADfirst| |x|)
- (|getShellEntry| $ 37))
- (|getShellEntry| $ 41))
+ (|getShellEntry| $ 45))
+ (|getShellEntry| $ 50))
|ILIST;coerce;$Of;21|)
(SEQ G190
(COND
@@ -244,7 +244,7 @@
(LETT |z|
(CONS
(SPADCALL (|SPADfirst| |x|)
- (|getShellEntry| $ 37))
+ (|getShellEntry| $ 45))
|z|)
|ILIST;coerce;$Of;21|)))
NIL (GO G190) G191 (EXIT NIL))
@@ -252,10 +252,10 @@
(SPADCALL |y|
(SPADCALL
(SPADCALL (NREVERSE |z|)
- (|getShellEntry| $ 42))
- (|getShellEntry| $ 43))
- (|getShellEntry| $ 44))
- (|getShellEntry| $ 39)))))))))))
+ (|getShellEntry| $ 51))
+ (|getShellEntry| $ 52))
+ (|getShellEntry| $ 53))
+ (|getShellEntry| $ 49)))))))))))
(DEFUN |ILIST;=;2$B;22| (|x| |y| $)
(PROG (#0=#:G1470)
@@ -272,7 +272,7 @@
(SEQ (EXIT
(COND
((SPADCALL (QCAR |x|) (QCAR |y|)
- (|getShellEntry| $ 46))
+ (|getShellEntry| $ 57))
(PROGN
(LETT #0# 'NIL
|ILIST;=;2$B;22|)
@@ -298,7 +298,7 @@
(SEQ (LETT |s|
(STRCONC |s|
(SPADCALL (QCAR |x|)
- (|getShellEntry| $ 49)))
+ (|getShellEntry| $ 60)))
|ILIST;latex;$S;23|)
(LETT |x| (QCDR |x|) |ILIST;latex;$S;23|)
(EXIT (COND
@@ -315,7 +315,7 @@
(COND ((NULL (NOT (NULL |x|))) (GO G191)))
(SEQ (EXIT (COND
((SPADCALL |s| (QCAR |x|)
- (|getShellEntry| $ 51))
+ (|getShellEntry| $ 63))
(PROGN
(LETT #0# 'T
|ILIST;member?;S$B;24|)
@@ -368,7 +368,7 @@
(SEQ (EXIT
(COND
((SPADCALL (QCAR |pr|) |f|
- (|getShellEntry| $ 51))
+ (|getShellEntry| $ 63))
(QRPLACD |pp| (QCDR |pr|)))
('T
(LETT |pp| |pr|
@@ -501,7 +501,7 @@
(LETT |dv$1| (|devaluate| |#1|) . #0=(|IndexedList|))
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$| (LIST '|IndexedList| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 72) . #0#)
+ (LETT $ (|newShell| 88) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -543,20 +543,20 @@
(|setShellEntry| $ 7 |#2|)
(COND
((|testBitVector| |pv$| 8)
- (|setShellEntry| $ 45
+ (|setShellEntry| $ 54
(CONS (|dispatchFunction| |ILIST;coerce;$Of;21|) $))))
(COND
((|testBitVector| |pv$| 7)
(PROGN
- (|setShellEntry| $ 47
+ (|setShellEntry| $ 58
(CONS (|dispatchFunction| |ILIST;=;2$B;22|) $))
- (|setShellEntry| $ 50
+ (|setShellEntry| $ 62
(CONS (|dispatchFunction| |ILIST;latex;$S;23|) $))
- (|setShellEntry| $ 52
+ (|setShellEntry| $ 64
(CONS (|dispatchFunction| |ILIST;member?;S$B;24|) $)))))
(COND
((|testBitVector| |pv$| 7)
- (|setShellEntry| $ 54
+ (|setShellEntry| $ 66
(CONS (|dispatchFunction|
|ILIST;removeDuplicates!;2$;26|)
$))))
@@ -573,43 +573,47 @@
|ILIST;setelt;$rest2$;13| (|List| 6)
|ILIST;construct;L$;14| |ILIST;parts;$L;15|
|ILIST;reverse!;2$;16| |ILIST;reverse;2$;17| (|Integer|)
- |ILIST;minIndex;$I;18| |ILIST;rest;$Nni$;19|
- (0 . |cyclic?|) |ILIST;copy;2$;20| (5 . |cycleEntry|)
- (|OutputForm|) (10 . |coerce|) (|List| $) (15 . |bracket|)
- (|List| 36) (20 . |list|) (25 . |commaSeparate|)
- (30 . |overbar|) (35 . |concat!|) (41 . |coerce|)
- (46 . ~=) (52 . =) (|String|) (58 . |latex|)
- (63 . |latex|) (68 . =) (74 . |member?|)
- |ILIST;concat!;3$;25| (80 . |removeDuplicates!|)
- (|Mapping| 11 6 6) |ILIST;sort!;M2$;27|
- |ILIST;merge!;M3$;28| |ILIST;split!;$I$;29|
- (|Mapping| 6 6 6) (|Equation| 6) (|List| 60)
+ |ILIST;minIndex;$I;18| (|SingleInteger|) (0 . |One|)
+ (4 . |One|) |ILIST;rest;$Nni$;19| (8 . |Zero|)
+ (12 . |Zero|) (16 . |not|) (21 . |cyclic?|)
+ |ILIST;copy;2$;20| (|OutputForm|) (|List| 41)
+ (26 . |empty|) (30 . |cycleEntry|) (35 . |coerce|)
+ (40 . |concat|) (46 . |reverse!|) (|List| $)
+ (51 . |bracket|) (56 . |list|) (61 . |commaSeparate|)
+ (66 . |overbar|) (71 . |concat!|) (77 . |coerce|)
+ (82 . |true|) (86 . |false|) (90 . ~=) (96 . =) (|String|)
+ (102 . |latex|) (107 . |concat|) (113 . |latex|) (118 . =)
+ (124 . |member?|) |ILIST;concat!;3$;25|
+ (130 . |removeDuplicates!|) (|Mapping| 11 6 6)
+ |ILIST;sort!;M2$;27| |ILIST;merge!;M3$;28| (135 . |One|)
+ (139 . <) (145 . -) |ILIST;split!;$I$;29| (151 . =)
+ (157 . |quo|) (|Mapping| 6 6 6) (|Equation| 6) (|List| 77)
(|Mapping| 11 6) (|Void|) (|UniversalSegment| 30) '"last"
- '"value" (|Mapping| 6 6) (|InputForm|) (|SingleInteger|)
- (|List| 30) (|Union| 6 '"failed"))
- '#(~= 85 |value| 91 |third| 96 |tail| 101 |swap!| 106
- |split!| 113 |sorted?| 119 |sort!| 130 |sort| 141 |size?|
- 152 |setvalue!| 158 |setrest!| 164 |setlast!| 170
- |setfirst!| 176 |setelt| 182 |setchildren!| 224 |select!|
- 230 |select| 236 |second| 242 |sample| 247 |reverse!| 251
- |reverse| 256 |rest| 261 |removeDuplicates!| 272
- |removeDuplicates| 277 |remove!| 282 |remove| 294 |reduce|
- 306 |qsetelt!| 327 |qelt| 334 |possiblyInfinite?| 340
- |position| 345 |parts| 364 |nodes| 369 |node?| 374 |new|
- 380 |more?| 386 |minIndex| 392 |min| 397 |merge!| 403
- |merge| 416 |members| 429 |member?| 434 |maxIndex| 440
- |max| 445 |map!| 451 |map| 457 |list| 470 |less?| 475
- |leaves| 481 |leaf?| 486 |latex| 491 |last| 496 |insert!|
- 507 |insert| 521 |indices| 535 |index?| 540 |hash| 546
- |first| 551 |find| 562 |fill!| 568 |explicitlyFinite?| 574
- |every?| 579 |eval| 585 |eq?| 611 |entry?| 617 |entries|
- 623 |empty?| 628 |empty| 633 |elt| 637 |distance| 680
- |delete!| 686 |delete| 698 |cyclic?| 710 |cycleTail| 715
- |cycleSplit!| 720 |cycleLength| 725 |cycleEntry| 730
- |count| 735 |copyInto!| 747 |copy| 754 |convert| 759
- |construct| 764 |concat!| 769 |concat| 781 |coerce| 804
- |children| 809 |child?| 814 |any?| 820 >= 826 > 832 = 838
- <= 844 < 850 |#| 856)
+ '"value" (|Mapping| 6 6) (|InputForm|) (|List| 30)
+ (|Union| 6 '"failed"))
+ '#(~= 163 |value| 169 |third| 174 |tail| 179 |swap!| 184
+ |split!| 191 |sorted?| 197 |sort!| 208 |sort| 219 |size?|
+ 230 |setvalue!| 236 |setrest!| 242 |setlast!| 248
+ |setfirst!| 254 |setelt| 260 |setchildren!| 302 |select!|
+ 308 |select| 314 |second| 320 |sample| 325 |reverse!| 329
+ |reverse| 334 |rest| 339 |removeDuplicates!| 350
+ |removeDuplicates| 355 |remove!| 360 |remove| 372 |reduce|
+ 384 |qsetelt!| 405 |qelt| 412 |possiblyInfinite?| 418
+ |position| 423 |parts| 442 |nodes| 447 |node?| 452 |new|
+ 458 |more?| 464 |minIndex| 470 |min| 475 |merge!| 481
+ |merge| 494 |members| 507 |member?| 512 |maxIndex| 518
+ |max| 523 |map!| 529 |map| 535 |list| 548 |less?| 553
+ |leaves| 559 |leaf?| 564 |latex| 569 |last| 574 |insert!|
+ 585 |insert| 599 |indices| 613 |index?| 618 |hash| 624
+ |first| 629 |find| 640 |fill!| 646 |explicitlyFinite?| 652
+ |every?| 657 |eval| 663 |eq?| 689 |entry?| 695 |entries|
+ 701 |empty?| 706 |empty| 711 |elt| 715 |distance| 758
+ |delete!| 764 |delete| 776 |cyclic?| 788 |cycleTail| 793
+ |cycleSplit!| 798 |cycleLength| 803 |cycleEntry| 808
+ |count| 813 |copyInto!| 825 |copy| 832 |convert| 837
+ |construct| 842 |concat!| 847 |concat| 859 |coerce| 882
+ |children| 887 |child?| 892 |any?| 898 >= 904 > 910 = 916
+ <= 922 < 928 |#| 934)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
(CONS (|makeByteWordVec2| 5
'(0 0 0 0 0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4))
@@ -636,58 +640,63 @@
(|EltableAggregate| 30 6) (|Evalable| 6)
(|SetCategory|) (|Type|)
(|Eltable| 30 6) (|InnerEvalable| 6 6)
- (|CoercibleTo| 36) (|ConvertibleTo| 68)
+ (|CoercibleTo| 41) (|ConvertibleTo| 85)
(|BasicType|))
- (|makeByteWordVec2| 71
- '(1 0 11 0 33 1 0 0 0 35 1 6 36 0 37 1
- 36 0 38 39 1 40 0 36 41 1 36 0 38 42
- 1 36 0 0 43 2 40 0 0 36 44 1 0 36 0
- 45 2 6 11 0 0 46 2 0 11 0 0 47 1 6 48
- 0 49 1 0 48 0 50 2 6 11 0 0 51 2 0 11
- 6 0 52 1 0 0 0 54 2 7 11 0 0 1 1 0 6
- 0 1 1 0 6 0 1 1 0 0 0 1 3 0 63 0 30
- 30 1 2 0 0 0 30 58 1 5 11 0 1 2 0 11
- 55 0 1 1 5 0 0 1 2 0 0 55 0 56 1 5 0
- 0 1 2 0 0 55 0 1 2 0 11 0 8 1 2 0 6 0
+ (|makeByteWordVec2| 87
+ '(0 32 0 33 0 8 0 34 0 32 0 36 0 8 0 37
+ 1 11 0 0 38 1 0 11 0 39 0 42 0 43 1 0
+ 0 0 44 1 6 41 0 45 2 42 0 41 0 46 1
+ 42 0 0 47 1 41 0 48 49 1 42 0 41 50 1
+ 41 0 48 51 1 41 0 0 52 2 42 0 0 41 53
+ 1 0 41 0 54 0 11 0 55 0 11 0 56 2 6
+ 11 0 0 57 2 0 11 0 0 58 1 6 59 0 60 2
+ 59 0 0 0 61 1 0 59 0 62 2 6 11 0 0 63
+ 2 0 11 6 0 64 1 0 0 0 66 0 30 0 70 2
+ 30 11 0 0 71 2 30 0 0 0 72 2 30 11 0
+ 0 74 2 30 0 0 0 75 2 7 11 0 0 1 1 0 6
+ 0 1 1 0 6 0 1 1 0 0 0 1 3 0 80 0 30
+ 30 1 2 0 0 0 30 73 1 5 11 0 1 2 0 11
+ 67 0 1 1 5 0 0 1 2 0 0 67 0 68 1 5 0
+ 0 1 2 0 0 67 0 1 2 0 11 0 8 1 2 0 6 0
6 1 2 0 0 0 0 23 2 0 6 0 6 1 2 0 6 0
- 6 21 3 0 6 0 30 6 1 3 0 6 0 64 6 1 3
- 0 6 0 65 6 1 3 0 0 0 19 0 24 3 0 6 0
- 14 6 22 3 0 6 0 66 6 1 2 0 0 0 38 1 2
- 0 0 62 0 1 2 0 0 62 0 1 1 0 6 0 1 0 0
+ 6 21 3 0 6 0 30 6 1 3 0 6 0 81 6 1 3
+ 0 6 0 82 6 1 3 0 0 0 19 0 24 3 0 6 0
+ 14 6 22 3 0 6 0 83 6 1 2 0 0 0 48 1 2
+ 0 0 79 0 1 2 0 0 79 0 1 1 0 6 0 1 0 0
0 1 1 0 0 0 28 1 0 0 0 29 2 0 0 0 8
- 32 1 0 0 0 18 1 7 0 0 54 1 7 0 0 1 2
- 7 0 6 0 1 2 0 0 62 0 1 2 7 0 6 0 1 2
- 0 0 62 0 1 4 7 6 59 0 6 6 1 2 0 6 59
- 0 1 3 0 6 59 0 6 1 3 0 6 0 30 6 1 2 0
+ 35 1 0 0 0 18 1 7 0 0 66 1 7 0 0 1 2
+ 7 0 6 0 1 2 0 0 79 0 1 2 7 0 6 0 1 2
+ 0 0 79 0 1 4 7 6 76 0 6 6 1 2 0 6 76
+ 0 1 3 0 6 76 0 6 1 3 0 6 0 30 6 1 2 0
6 0 30 1 1 0 11 0 1 2 7 30 6 0 1 3 7
- 30 6 0 30 1 2 0 30 62 0 1 1 0 25 0 27
- 1 0 38 0 1 2 7 11 0 0 1 2 0 0 8 6 1 2
+ 30 6 0 30 1 2 0 30 79 0 1 1 0 25 0 27
+ 1 0 48 0 1 2 7 11 0 0 1 2 0 0 8 6 1 2
0 11 0 8 1 1 6 30 0 31 2 5 0 0 0 1 2
- 5 0 0 0 1 3 0 0 55 0 0 57 2 5 0 0 0 1
- 3 0 0 55 0 0 1 1 0 25 0 1 2 7 11 6 0
- 52 1 6 30 0 1 2 5 0 0 0 1 2 0 0 67 0
- 1 3 0 0 59 0 0 1 2 0 0 67 0 1 1 0 0 6
+ 5 0 0 0 1 3 0 0 67 0 0 69 2 5 0 0 0 1
+ 3 0 0 67 0 0 1 1 0 25 0 1 2 7 11 6 0
+ 64 1 6 30 0 1 2 5 0 0 0 1 2 0 0 84 0
+ 1 3 0 0 76 0 0 1 2 0 0 84 0 1 1 0 0 6
1 2 0 11 0 8 1 1 0 25 0 1 1 0 11 0 1
- 1 7 48 0 50 2 0 0 0 8 1 1 0 6 0 1 3 0
+ 1 7 59 0 62 2 0 0 0 8 1 1 0 6 0 1 3 0
0 6 0 30 1 3 0 0 0 0 30 1 3 0 0 0 0
- 30 1 3 0 0 6 0 30 1 1 0 70 0 1 2 0 11
- 30 0 1 1 7 69 0 1 2 0 0 0 8 1 1 0 6 0
- 13 2 0 71 62 0 1 2 0 0 0 6 1 1 0 11 0
- 1 2 0 11 62 0 1 3 9 0 0 6 6 1 3 9 0 0
- 25 25 1 2 9 0 0 60 1 2 9 0 0 61 1 2 0
+ 30 1 3 0 0 6 0 30 1 1 0 86 0 1 2 0 11
+ 30 0 1 1 7 32 0 1 2 0 0 0 8 1 1 0 6 0
+ 13 2 0 87 79 0 1 2 0 0 0 6 1 1 0 11 0
+ 1 2 0 11 79 0 1 3 9 0 0 6 6 1 3 9 0 0
+ 25 25 1 2 9 0 0 77 1 2 9 0 0 78 1 2 0
11 0 0 12 2 7 11 6 0 1 1 0 25 0 1 1 0
11 0 17 0 0 0 16 2 0 6 0 30 1 3 0 6 0
- 30 6 1 2 0 0 0 64 1 2 0 6 0 65 1 2 0
- 0 0 19 20 2 0 6 0 14 15 2 0 6 0 66 1
- 2 0 30 0 0 1 2 0 0 0 64 1 2 0 0 0 30
- 1 2 0 0 0 64 1 2 0 0 0 30 1 1 0 11 0
- 33 1 0 0 0 1 1 0 0 0 1 1 0 8 0 1 1 0
- 0 0 35 2 7 8 6 0 1 2 0 8 62 0 1 3 0 0
- 0 0 30 1 1 0 0 0 34 1 3 68 0 1 1 0 0
- 25 26 2 0 0 0 0 53 2 0 0 0 6 1 1 0 0
- 38 1 2 0 0 0 6 1 2 0 0 6 0 10 2 0 0 0
- 0 1 1 8 36 0 45 1 0 38 0 1 2 7 11 0 0
- 1 2 0 11 62 0 1 2 5 11 0 0 1 2 5 11 0
- 0 1 2 7 11 0 0 47 2 5 11 0 0 1 2 5 11
+ 30 6 1 2 0 0 0 81 1 2 0 6 0 82 1 2 0
+ 0 0 19 20 2 0 6 0 14 15 2 0 6 0 83 1
+ 2 0 30 0 0 1 2 0 0 0 81 1 2 0 0 0 30
+ 1 2 0 0 0 81 1 2 0 0 0 30 1 1 0 11 0
+ 39 1 0 0 0 1 1 0 0 0 1 1 0 8 0 1 1 0
+ 0 0 44 2 7 8 6 0 1 2 0 8 79 0 1 3 0 0
+ 0 0 30 1 1 0 0 0 40 1 3 85 0 1 1 0 0
+ 25 26 2 0 0 0 0 65 2 0 0 0 6 1 1 0 0
+ 48 1 2 0 0 0 6 1 2 0 0 6 0 10 2 0 0 0
+ 0 1 1 8 41 0 54 1 0 48 0 1 2 7 11 0 0
+ 1 2 0 11 79 0 1 2 5 11 0 0 1 2 5 11 0
+ 0 1 2 7 11 0 0 58 2 5 11 0 0 1 2 5 11
0 0 1 1 0 8 0 9)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/INS-.lsp b/src/algebra/strap/INS-.lsp
index 234dfc24..da1d5f67 100644
--- a/src/algebra/strap/INS-.lsp
+++ b/src/algebra/strap/INS-.lsp
@@ -97,25 +97,25 @@
(DEFUN |INS-;characteristic;Nni;1| ($) (DECLARE (IGNORE $)) 0)
-(DEFUN |INS-;differentiate;2S;2| (|x| $) (|spadConstant| $ 9))
+(DEFUN |INS-;differentiate;2S;2| (|x| $) (|spadConstant| $ 10))
(DEFUN |INS-;even?;SB;3| (|x| $)
- (NOT (SPADCALL |x| (|getShellEntry| $ 12))))
+ (NOT (SPADCALL |x| (|getShellEntry| $ 13))))
(DEFUN |INS-;positive?;SB;4| (|x| $)
- (SPADCALL (|spadConstant| $ 9) |x| (|getShellEntry| $ 14)))
+ (SPADCALL (|spadConstant| $ 10) |x| (|getShellEntry| $ 15)))
(DEFUN |INS-;copy;2S;5| (|x| $) (DECLARE (IGNORE $)) |x|)
(DEFUN |INS-;bit?;2SB;6| (|x| |i| $)
(SPADCALL
- (SPADCALL |x| (SPADCALL |i| (|getShellEntry| $ 17))
- (|getShellEntry| $ 18))
- (|getShellEntry| $ 12)))
+ (SPADCALL |x| (SPADCALL |i| (|getShellEntry| $ 18))
+ (|getShellEntry| $ 19))
+ (|getShellEntry| $ 13)))
(DEFUN |INS-;mask;2S;7| (|n| $)
- (SPADCALL (SPADCALL (|spadConstant| $ 20) |n| (|getShellEntry| $ 18))
- (|getShellEntry| $ 21)))
+ (SPADCALL (SPADCALL (|spadConstant| $ 21) |n| (|getShellEntry| $ 19))
+ (|getShellEntry| $ 22)))
(DEFUN |INS-;rational?;SB;8| (|x| $) (DECLARE (IGNORE $)) 'T)
@@ -123,148 +123,148 @@
(PROG (#0=#:G1426 #1=#:G1427)
(RETURN
(COND
- ((SPADCALL |x| (|spadConstant| $ 9) (|getShellEntry| $ 24))
+ ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 26))
(|error| "euclideanSize called on zero"))
- ((SPADCALL |x| (|spadConstant| $ 9) (|getShellEntry| $ 14))
- (PROG1 (LETT #0# (- (SPADCALL |x| (|getShellEntry| $ 26)))
+ ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 15))
+ (PROG1 (LETT #0# (- (SPADCALL |x| (|getShellEntry| $ 28)))
|INS-;euclideanSize;SNni;9|)
(|check-subtype| (COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#)))
('T
- (PROG1 (LETT #1# (SPADCALL |x| (|getShellEntry| $ 26))
+ (PROG1 (LETT #1# (SPADCALL |x| (|getShellEntry| $ 28))
|INS-;euclideanSize;SNni;9|)
(|check-subtype| (COND ((< #1# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #1#)))))))
(DEFUN |INS-;convert;SF;10| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 26))
- (|getShellEntry| $ 29)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 28))
+ (|getShellEntry| $ 32)))
(DEFUN |INS-;convert;SDf;11| (|x| $)
- (FLOAT (SPADCALL |x| (|getShellEntry| $ 26)) |$DoubleFloatMaximum|))
+ (FLOAT (SPADCALL |x| (|getShellEntry| $ 28)) |$DoubleFloatMaximum|))
(DEFUN |INS-;convert;SIf;12| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 26))
- (|getShellEntry| $ 34)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 28))
+ (|getShellEntry| $ 38)))
(DEFUN |INS-;retract;SI;13| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 26)))
+ (SPADCALL |x| (|getShellEntry| $ 28)))
(DEFUN |INS-;convert;SP;14| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 26))
- (|getShellEntry| $ 38)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 28))
+ (|getShellEntry| $ 42)))
(DEFUN |INS-;factor;SF;15| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 42)))
+ (SPADCALL |x| (|getShellEntry| $ 46)))
(DEFUN |INS-;squareFree;SF;16| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 45)))
+ (SPADCALL |x| (|getShellEntry| $ 49)))
(DEFUN |INS-;prime?;SB;17| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 48)))
+ (SPADCALL |x| (|getShellEntry| $ 52)))
(DEFUN |INS-;factorial;2S;18| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 51)))
+ (SPADCALL |x| (|getShellEntry| $ 55)))
(DEFUN |INS-;binomial;3S;19| (|n| |m| $)
- (SPADCALL |n| |m| (|getShellEntry| $ 53)))
+ (SPADCALL |n| |m| (|getShellEntry| $ 57)))
(DEFUN |INS-;permutation;3S;20| (|n| |m| $)
- (SPADCALL |n| |m| (|getShellEntry| $ 55)))
+ (SPADCALL |n| |m| (|getShellEntry| $ 59)))
(DEFUN |INS-;retractIfCan;SU;21| (|x| $)
- (CONS 0 (SPADCALL |x| (|getShellEntry| $ 26))))
+ (CONS 0 (SPADCALL |x| (|getShellEntry| $ 28))))
-(DEFUN |INS-;init;S;22| ($) (|spadConstant| $ 9))
+(DEFUN |INS-;init;S;22| ($) (|spadConstant| $ 10))
(DEFUN |INS-;nextItem;SU;23| (|n| $)
(COND
- ((SPADCALL |n| (|getShellEntry| $ 60))
- (CONS 0 (|spadConstant| $ 20)))
- ((SPADCALL (|spadConstant| $ 9) |n| (|getShellEntry| $ 14))
- (CONS 0 (SPADCALL |n| (|getShellEntry| $ 17))))
+ ((SPADCALL |n| (|getShellEntry| $ 64))
+ (CONS 0 (|spadConstant| $ 21)))
+ ((SPADCALL (|spadConstant| $ 10) |n| (|getShellEntry| $ 15))
+ (CONS 0 (SPADCALL |n| (|getShellEntry| $ 18))))
('T
(CONS 0
- (SPADCALL (|spadConstant| $ 20) |n| (|getShellEntry| $ 61))))))
+ (SPADCALL (|spadConstant| $ 21) |n| (|getShellEntry| $ 65))))))
(DEFUN |INS-;patternMatch;SP2Pmr;24| (|x| |p| |l| $)
- (SPADCALL |x| |p| |l| (|getShellEntry| $ 66)))
+ (SPADCALL |x| |p| |l| (|getShellEntry| $ 70)))
(DEFUN |INS-;rational;SF;25| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 26))
- (|getShellEntry| $ 70)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 28))
+ (|getShellEntry| $ 74)))
(DEFUN |INS-;rationalIfCan;SU;26| (|x| $)
(CONS 0
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 26))
- (|getShellEntry| $ 70))))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 28))
+ (|getShellEntry| $ 74))))
(DEFUN |INS-;symmetricRemainder;3S;27| (|x| |n| $)
(PROG (|r|)
(RETURN
- (SEQ (LETT |r| (SPADCALL |x| |n| (|getShellEntry| $ 74))
+ (SEQ (LETT |r| (SPADCALL |x| |n| (|getShellEntry| $ 78))
|INS-;symmetricRemainder;3S;27|)
(EXIT (COND
- ((SPADCALL |r| (|spadConstant| $ 9)
- (|getShellEntry| $ 24))
+ ((SPADCALL |r| (|spadConstant| $ 10)
+ (|getShellEntry| $ 26))
|r|)
('T
(SEQ (COND
- ((SPADCALL |n| (|spadConstant| $ 9)
- (|getShellEntry| $ 14))
+ ((SPADCALL |n| (|spadConstant| $ 10)
+ (|getShellEntry| $ 15))
(LETT |n|
- (SPADCALL |n| (|getShellEntry| $ 17))
+ (SPADCALL |n| (|getShellEntry| $ 18))
|INS-;symmetricRemainder;3S;27|)))
(EXIT (COND
- ((SPADCALL (|spadConstant| $ 9) |r|
- (|getShellEntry| $ 14))
+ ((SPADCALL (|spadConstant| $ 10) |r|
+ (|getShellEntry| $ 15))
(COND
((SPADCALL |n|
(SPADCALL 2 |r|
- (|getShellEntry| $ 76))
- (|getShellEntry| $ 14))
+ (|getShellEntry| $ 80))
+ (|getShellEntry| $ 15))
(SPADCALL |r| |n|
- (|getShellEntry| $ 61)))
+ (|getShellEntry| $ 65)))
('T |r|)))
- ((NULL (SPADCALL (|spadConstant| $ 9)
+ ((NULL (SPADCALL (|spadConstant| $ 10)
(SPADCALL
(SPADCALL 2 |r|
- (|getShellEntry| $ 76))
- |n| (|getShellEntry| $ 77))
- (|getShellEntry| $ 14)))
+ (|getShellEntry| $ 80))
+ |n| (|getShellEntry| $ 81))
+ (|getShellEntry| $ 15)))
(SPADCALL |r| |n|
- (|getShellEntry| $ 77)))
+ (|getShellEntry| $ 81)))
('T |r|)))))))))))
(DEFUN |INS-;invmod;3S;28| (|a| |b| $)
(PROG (|q| |r| |r1| |c| |c1| |d| |d1|)
(RETURN
(SEQ (COND
- ((SPADCALL |a| (|getShellEntry| $ 79))
- (LETT |a| (SPADCALL |a| |b| (|getShellEntry| $ 80))
+ ((SPADCALL |a| (|getShellEntry| $ 83))
+ (LETT |a| (SPADCALL |a| |b| (|getShellEntry| $ 84))
|INS-;invmod;3S;28|)))
(LETT |c| |a| |INS-;invmod;3S;28|)
- (LETT |c1| (|spadConstant| $ 20) |INS-;invmod;3S;28|)
+ (LETT |c1| (|spadConstant| $ 21) |INS-;invmod;3S;28|)
(LETT |d| |b| |INS-;invmod;3S;28|)
- (LETT |d1| (|spadConstant| $ 9) |INS-;invmod;3S;28|)
+ (LETT |d1| (|spadConstant| $ 10) |INS-;invmod;3S;28|)
(SEQ G190
(COND
- ((NULL (NOT (SPADCALL |d| (|getShellEntry| $ 60))))
+ ((NULL (NOT (SPADCALL |d| (|getShellEntry| $ 64))))
(GO G191)))
(SEQ (LETT |q|
- (SPADCALL |c| |d| (|getShellEntry| $ 81))
+ (SPADCALL |c| |d| (|getShellEntry| $ 85))
|INS-;invmod;3S;28|)
(LETT |r|
(SPADCALL |c|
(SPADCALL |q| |d|
- (|getShellEntry| $ 82))
- (|getShellEntry| $ 61))
+ (|getShellEntry| $ 86))
+ (|getShellEntry| $ 65))
|INS-;invmod;3S;28|)
(LETT |r1|
(SPADCALL |c1|
(SPADCALL |q| |d1|
- (|getShellEntry| $ 82))
- (|getShellEntry| $ 61))
+ (|getShellEntry| $ 86))
+ (|getShellEntry| $ 65))
|INS-;invmod;3S;28|)
(LETT |c| |d| |INS-;invmod;3S;28|)
(LETT |c1| |d1| |INS-;invmod;3S;28|)
@@ -272,29 +272,29 @@
(EXIT (LETT |d1| |r1| |INS-;invmod;3S;28|)))
NIL (GO G190) G191 (EXIT NIL))
(COND
- ((NULL (SPADCALL |c| (|getShellEntry| $ 83)))
+ ((NULL (SPADCALL |c| (|getShellEntry| $ 87)))
(EXIT (|error| "inverse does not exist"))))
(EXIT (COND
- ((SPADCALL |c1| (|getShellEntry| $ 79))
- (SPADCALL |c1| |b| (|getShellEntry| $ 77)))
+ ((SPADCALL |c1| (|getShellEntry| $ 83))
+ (SPADCALL |c1| |b| (|getShellEntry| $ 81)))
('T |c1|)))))))
(DEFUN |INS-;powmod;4S;29| (|x| |n| |p| $)
(PROG (|y| #0=#:G1484 |z|)
(RETURN
(SEQ (EXIT (SEQ (COND
- ((SPADCALL |x| (|getShellEntry| $ 79))
+ ((SPADCALL |x| (|getShellEntry| $ 83))
(LETT |x|
(SPADCALL |x| |p|
- (|getShellEntry| $ 80))
+ (|getShellEntry| $ 84))
|INS-;powmod;4S;29|)))
(EXIT (COND
- ((SPADCALL |x| (|getShellEntry| $ 60))
- (|spadConstant| $ 9))
- ((SPADCALL |n| (|getShellEntry| $ 60))
- (|spadConstant| $ 20))
+ ((SPADCALL |x| (|getShellEntry| $ 64))
+ (|spadConstant| $ 10))
+ ((SPADCALL |n| (|getShellEntry| $ 64))
+ (|spadConstant| $ 21))
('T
- (SEQ (LETT |y| (|spadConstant| $ 20)
+ (SEQ (LETT |y| (|spadConstant| $ 21)
|INS-;powmod;4S;29|)
(LETT |z| |x| |INS-;powmod;4S;29|)
(EXIT
@@ -302,10 +302,10 @@
(SEQ
(COND
((SPADCALL |n|
- (|getShellEntry| $ 12))
+ (|getShellEntry| $ 13))
(LETT |y|
(SPADCALL |y| |z| |p|
- (|getShellEntry| $ 85))
+ (|getShellEntry| $ 89))
|INS-;powmod;4S;29|)))
(EXIT
(COND
@@ -313,11 +313,11 @@
(LETT |n|
(SPADCALL |n|
(SPADCALL
- (|spadConstant| $ 20)
- (|getShellEntry| $ 17))
- (|getShellEntry| $ 18))
+ (|spadConstant| $ 21)
+ (|getShellEntry| $ 18))
+ (|getShellEntry| $ 19))
|INS-;powmod;4S;29|)
- (|getShellEntry| $ 60))
+ (|getShellEntry| $ 64))
(PROGN
(LETT #0# |y|
|INS-;powmod;4S;29|)
@@ -325,7 +325,7 @@
('T
(LETT |z|
(SPADCALL |z| |z| |p|
- (|getShellEntry| $ 85))
+ (|getShellEntry| $ 89))
|INS-;powmod;4S;29|)))))
NIL (GO G190) G191 (EXIT NIL)))))))))
#0# (EXIT #0#)))))
@@ -336,7 +336,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|IntegerNumberSystem&|))
(LETT |dv$| (LIST '|IntegerNumberSystem&| |dv$1|) . #0#)
- (LETT $ (|newShell| 87) . #0#)
+ (LETT $ (|newShell| 91) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -346,71 +346,73 @@
(MAKEPROP '|IntegerNumberSystem&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|)
- (|NonNegativeInteger|) |INS-;characteristic;Nni;1|
- (0 . |Zero|) |INS-;differentiate;2S;2| (|Boolean|)
- (4 . |odd?|) |INS-;even?;SB;3| (9 . <)
- |INS-;positive?;SB;4| |INS-;copy;2S;5| (15 . -)
- (20 . |shift|) |INS-;bit?;2SB;6| (26 . |One|) (30 . |dec|)
- |INS-;mask;2S;7| |INS-;rational?;SB;8| (35 . =)
- (|Integer|) (41 . |convert|) |INS-;euclideanSize;SNni;9|
- (|Float|) (46 . |coerce|) |INS-;convert;SF;10|
- (|DoubleFloat|) |INS-;convert;SDf;11| (|InputForm|)
- (51 . |convert|) |INS-;convert;SIf;12|
- |INS-;retract;SI;13| (|Pattern| 25) (56 . |coerce|)
+ (|NonNegativeInteger|) (0 . |Zero|)
+ |INS-;characteristic;Nni;1| (4 . |Zero|)
+ |INS-;differentiate;2S;2| (|Boolean|) (8 . |odd?|)
+ |INS-;even?;SB;3| (13 . <) |INS-;positive?;SB;4|
+ |INS-;copy;2S;5| (19 . -) (24 . |shift|) |INS-;bit?;2SB;6|
+ (30 . |One|) (34 . |dec|) |INS-;mask;2S;7| (39 . |true|)
+ |INS-;rational?;SB;8| (43 . =) (|Integer|)
+ (49 . |convert|) (54 . -) |INS-;euclideanSize;SNni;9|
+ (|Float|) (59 . |coerce|) |INS-;convert;SF;10|
+ (|DoubleFloat|) (64 . |coerce|) |INS-;convert;SDf;11|
+ (|InputForm|) (69 . |convert|) |INS-;convert;SIf;12|
+ |INS-;retract;SI;13| (|Pattern| 27) (74 . |coerce|)
|INS-;convert;SP;14| (|Factored| 6)
- (|IntegerFactorizationPackage| 6) (61 . |factor|)
- (|Factored| $) |INS-;factor;SF;15| (66 . |squareFree|)
+ (|IntegerFactorizationPackage| 6) (79 . |factor|)
+ (|Factored| $) |INS-;factor;SF;15| (84 . |squareFree|)
|INS-;squareFree;SF;16| (|IntegerPrimesPackage| 6)
- (71 . |prime?|) |INS-;prime?;SB;17|
- (|IntegerCombinatoricFunctions| 6) (76 . |factorial|)
- |INS-;factorial;2S;18| (81 . |binomial|)
- |INS-;binomial;3S;19| (87 . |permutation|)
- |INS-;permutation;3S;20| (|Union| 25 '"failed")
- |INS-;retractIfCan;SU;21| |INS-;init;S;22| (93 . |zero?|)
- (98 . -) (|Union| $ '"failed") |INS-;nextItem;SU;23|
- (|PatternMatchResult| 25 6)
+ (89 . |prime?|) |INS-;prime?;SB;17|
+ (|IntegerCombinatoricFunctions| 6) (94 . |factorial|)
+ |INS-;factorial;2S;18| (99 . |binomial|)
+ |INS-;binomial;3S;19| (105 . |permutation|)
+ |INS-;permutation;3S;20| (|Union| 27 '"failed")
+ |INS-;retractIfCan;SU;21| |INS-;init;S;22| (111 . |zero?|)
+ (116 . -) (|Union| $ '"failed") |INS-;nextItem;SU;23|
+ (|PatternMatchResult| 27 6)
(|PatternMatchIntegerNumberSystem| 6)
- (104 . |patternMatch|) (|PatternMatchResult| 25 $)
- |INS-;patternMatch;SP2Pmr;24| (|Fraction| 25)
- (111 . |coerce|) |INS-;rational;SF;25|
- (|Union| 69 '"failed") |INS-;rationalIfCan;SU;26|
- (116 . |rem|) (|PositiveInteger|) (122 . *) (128 . +)
- |INS-;symmetricRemainder;3S;27| (134 . |negative?|)
- (139 . |positiveRemainder|) (145 . |quo|) (151 . *)
- (157 . |one?|) |INS-;invmod;3S;28| (162 . |mulmod|)
+ (122 . |patternMatch|) (|PatternMatchResult| 27 $)
+ |INS-;patternMatch;SP2Pmr;24| (|Fraction| 27)
+ (129 . |coerce|) |INS-;rational;SF;25|
+ (|Union| 73 '"failed") |INS-;rationalIfCan;SU;26|
+ (134 . |rem|) (|PositiveInteger|) (140 . *) (146 . +)
+ |INS-;symmetricRemainder;3S;27| (152 . |negative?|)
+ (157 . |positiveRemainder|) (163 . |quo|) (169 . *)
+ (175 . |one?|) |INS-;invmod;3S;28| (180 . |mulmod|)
|INS-;powmod;4S;29|)
- '#(|symmetricRemainder| 169 |squareFree| 175 |retractIfCan|
- 180 |retract| 185 |rationalIfCan| 190 |rational?| 195
- |rational| 200 |prime?| 205 |powmod| 210 |positive?| 217
- |permutation| 222 |patternMatch| 228 |nextItem| 235 |mask|
- 240 |invmod| 245 |init| 251 |factorial| 255 |factor| 260
- |even?| 265 |euclideanSize| 270 |differentiate| 275 |copy|
- 280 |convert| 285 |characteristic| 305 |bit?| 309
- |binomial| 315)
+ '#(|symmetricRemainder| 187 |squareFree| 193 |retractIfCan|
+ 198 |retract| 203 |rationalIfCan| 208 |rational?| 213
+ |rational| 218 |prime?| 223 |powmod| 228 |positive?| 235
+ |permutation| 240 |patternMatch| 246 |nextItem| 253 |mask|
+ 258 |invmod| 263 |init| 269 |factorial| 273 |factor| 278
+ |even?| 283 |euclideanSize| 288 |differentiate| 293 |copy|
+ 298 |convert| 303 |characteristic| 323 |bit?| 327
+ |binomial| 333)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 86
- '(0 6 0 9 1 6 11 0 12 2 6 11 0 0 14 1 6
- 0 0 17 2 6 0 0 0 18 0 6 0 20 1 6 0 0
- 21 2 6 11 0 0 24 1 6 25 0 26 1 28 0
- 25 29 1 33 0 25 34 1 37 0 25 38 1 41
- 40 6 42 1 41 40 6 45 1 47 11 6 48 1
- 50 6 6 51 2 50 6 6 6 53 2 50 6 6 6 55
- 1 6 11 0 60 2 6 0 0 0 61 3 65 64 6 37
- 64 66 1 69 0 25 70 2 6 0 0 0 74 2 6 0
- 75 0 76 2 6 0 0 0 77 1 6 11 0 79 2 6
- 0 0 0 80 2 6 0 0 0 81 2 6 0 0 0 82 1
- 6 11 0 83 3 6 0 0 0 0 85 2 0 0 0 0 78
- 1 0 43 0 46 1 0 57 0 58 1 0 25 0 36 1
- 0 72 0 73 1 0 11 0 23 1 0 69 0 71 1 0
- 11 0 49 3 0 0 0 0 0 86 1 0 11 0 15 2
- 0 0 0 0 56 3 0 67 0 37 67 68 1 0 62 0
- 63 1 0 0 0 22 2 0 0 0 0 84 0 0 0 59 1
- 0 0 0 52 1 0 43 0 44 1 0 11 0 13 1 0
- 7 0 27 1 0 0 0 10 1 0 0 0 16 1 0 31 0
- 32 1 0 28 0 30 1 0 37 0 39 1 0 33 0
- 35 0 0 7 8 2 0 11 0 0 19 2 0 0 0 0
- 54)))))
+ (|makeByteWordVec2| 90
+ '(0 7 0 8 0 6 0 10 1 6 12 0 13 2 6 12 0
+ 0 15 1 6 0 0 18 2 6 0 0 0 19 0 6 0 21
+ 1 6 0 0 22 0 12 0 24 2 6 12 0 0 26 1
+ 6 27 0 28 1 27 0 0 29 1 31 0 27 32 1
+ 34 0 27 35 1 37 0 27 38 1 41 0 27 42
+ 1 45 44 6 46 1 45 44 6 49 1 51 12 6
+ 52 1 54 6 6 55 2 54 6 6 6 57 2 54 6 6
+ 6 59 1 6 12 0 64 2 6 0 0 0 65 3 69 68
+ 6 41 68 70 1 73 0 27 74 2 6 0 0 0 78
+ 2 6 0 79 0 80 2 6 0 0 0 81 1 6 12 0
+ 83 2 6 0 0 0 84 2 6 0 0 0 85 2 6 0 0
+ 0 86 1 6 12 0 87 3 6 0 0 0 0 89 2 0 0
+ 0 0 82 1 0 47 0 50 1 0 61 0 62 1 0 27
+ 0 40 1 0 76 0 77 1 0 12 0 25 1 0 73 0
+ 75 1 0 12 0 53 3 0 0 0 0 0 90 1 0 12
+ 0 16 2 0 0 0 0 60 3 0 71 0 41 71 72 1
+ 0 66 0 67 1 0 0 0 23 2 0 0 0 0 88 0 0
+ 0 63 1 0 0 0 56 1 0 47 0 48 1 0 12 0
+ 14 1 0 7 0 30 1 0 0 0 11 1 0 0 0 17 1
+ 0 34 0 36 1 0 31 0 33 1 0 41 0 43 1 0
+ 37 0 39 0 0 7 9 2 0 12 0 0 20 2 0 0 0
+ 0 58)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp
index fd48fd1a..c7ad0701 100644
--- a/src/algebra/strap/INT.lsp
+++ b/src/algebra/strap/INT.lsp
@@ -249,12 +249,12 @@
(DEFUN |INT;writeOMInt| (|dev| |x| $)
(SEQ (COND
((< |x| 0)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 8))
+ (SEQ (SPADCALL |dev| (|getShellEntry| $ 13))
(SPADCALL |dev| "arith1" "unary_minus"
- (|getShellEntry| $ 10))
- (SPADCALL |dev| (- |x|) (|getShellEntry| $ 12))
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 13)))))
- ('T (SPADCALL |dev| |x| (|getShellEntry| $ 12))))))
+ (|getShellEntry| $ 15))
+ (SPADCALL |dev| (- |x|) (|getShellEntry| $ 18))
+ (EXIT (SPADCALL |dev| (|getShellEntry| $ 19)))))
+ ('T (SPADCALL |dev| |x| (|getShellEntry| $ 18))))))
(DEFUN |INT;OMwrite;$S;2| (|x| $)
(PROG (|sp| |dev| |s|)
@@ -262,13 +262,13 @@
(SEQ (LETT |s| "" |INT;OMwrite;$S;2|)
(LETT |sp| (OM-STRINGTOSTRINGPTR |s|) |INT;OMwrite;$S;2|)
(LETT |dev|
- (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 15))
- (|getShellEntry| $ 16))
+ (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 21))
+ (|getShellEntry| $ 22))
|INT;OMwrite;$S;2|)
- (SPADCALL |dev| (|getShellEntry| $ 17))
+ (SPADCALL |dev| (|getShellEntry| $ 23))
(|INT;writeOMInt| |dev| |x| $)
- (SPADCALL |dev| (|getShellEntry| $ 18))
- (SPADCALL |dev| (|getShellEntry| $ 19))
+ (SPADCALL |dev| (|getShellEntry| $ 24))
+ (SPADCALL |dev| (|getShellEntry| $ 25))
(LETT |s| (OM-STRINGPTRTOSTRING |sp|) |INT;OMwrite;$S;2|)
(EXIT |s|)))))
@@ -278,26 +278,26 @@
(SEQ (LETT |s| "" |INT;OMwrite;$BS;3|)
(LETT |sp| (OM-STRINGTOSTRINGPTR |s|) |INT;OMwrite;$BS;3|)
(LETT |dev|
- (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 15))
- (|getShellEntry| $ 16))
+ (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 21))
+ (|getShellEntry| $ 22))
|INT;OMwrite;$BS;3|)
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 17))))
+ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23))))
(|INT;writeOMInt| |dev| |x| $)
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 18))))
- (SPADCALL |dev| (|getShellEntry| $ 19))
+ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 24))))
+ (SPADCALL |dev| (|getShellEntry| $ 25))
(LETT |s| (OM-STRINGPTRTOSTRING |sp|) |INT;OMwrite;$BS;3|)
(EXIT |s|)))))
(DEFUN |INT;OMwrite;Omd$V;4| (|dev| |x| $)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 17))
+ (SEQ (SPADCALL |dev| (|getShellEntry| $ 23))
(|INT;writeOMInt| |dev| |x| $)
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 18)))))
+ (EXIT (SPADCALL |dev| (|getShellEntry| $ 24)))))
(DEFUN |INT;OMwrite;Omd$BV;5| (|dev| |x| |wholeObj| $)
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 17))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23))))
(|INT;writeOMInt| |dev| |x| $)
(EXIT (COND
- (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 18)))))))
+ (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 24)))))))
(DEFUN |INT;zero?;$B;6| (|x| $) (DECLARE (IGNORE $)) (ZEROP |x|))
@@ -322,7 +322,7 @@
(MINUSP |x|))
(DEFUN |INT;coerce;$Of;16| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 37)))
+ (SPADCALL |x| (|getShellEntry| $ 45)))
(DEFUN |INT;coerce;2$;17| (|m| $) (DECLARE (IGNORE $)) |m|)
@@ -355,14 +355,14 @@
(REMAINDER2 (* |a| |b|) |p|))
(DEFUN |INT;convert;$F;23| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 46)))
+ (SPADCALL |x| (|getShellEntry| $ 56)))
(DEFUN |INT;convert;$Df;24| (|x| $)
(DECLARE (IGNORE $))
(FLOAT |x| |$DoubleFloatMaximum|))
(DEFUN |INT;convert;$If;25| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 51)))
+ (SPADCALL |x| (|getShellEntry| $ 62)))
(DEFUN |INT;convert;$S;26| (|x| $)
(DECLARE (IGNORE $))
@@ -449,51 +449,51 @@
(ABS |x|))
(DEFUN |INT;solveLinearPolynomialEquation| (|lp| |p| $)
- (SPADCALL |lp| |p| (|getShellEntry| $ 93)))
+ (SPADCALL |lp| |p| (|getShellEntry| $ 99)))
(DEFUN |INT;squareFreePolynomial| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 97)))
+ (SPADCALL |p| (|getShellEntry| $ 103)))
(DEFUN |INT;factorPolynomial| (|p| $)
(PROG (|pp| #0=#:G1498)
(RETURN
- (SEQ (LETT |pp| (SPADCALL |p| (|getShellEntry| $ 98))
+ (SEQ (LETT |pp| (SPADCALL |p| (|getShellEntry| $ 104))
|INT;factorPolynomial|)
(EXIT (COND
- ((EQL (SPADCALL |pp| (|getShellEntry| $ 99))
- (SPADCALL |p| (|getShellEntry| $ 99)))
- (SPADCALL |p| (|getShellEntry| $ 101)))
+ ((EQL (SPADCALL |pp| (|getShellEntry| $ 105))
+ (SPADCALL |p| (|getShellEntry| $ 105)))
+ (SPADCALL |p| (|getShellEntry| $ 107)))
('T
- (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 101))
+ (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 107))
(SPADCALL (CONS #'|INT;factorPolynomial!0| $)
(SPADCALL
(PROG2 (LETT #0#
(SPADCALL
(SPADCALL |p|
- (|getShellEntry| $ 99))
+ (|getShellEntry| $ 105))
(SPADCALL |pp|
- (|getShellEntry| $ 99))
- (|getShellEntry| $ 103))
+ (|getShellEntry| $ 105))
+ (|getShellEntry| $ 109))
|INT;factorPolynomial|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) $ #0#))
- (|getShellEntry| $ 105))
- (|getShellEntry| $ 109))
- (|getShellEntry| $ 111)))))))))
+ (|getShellEntry| $ 111))
+ (|getShellEntry| $ 115))
+ (|getShellEntry| $ 117)))))))))
(DEFUN |INT;factorPolynomial!0| (|#1| $)
- (SPADCALL |#1| (|getShellEntry| $ 102)))
+ (SPADCALL |#1| (|getShellEntry| $ 108)))
(DEFUN |INT;factorSquareFreePolynomial| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 112)))
+ (SPADCALL |p| (|getShellEntry| $ 118)))
(DEFUN |INT;gcdPolynomial;3Sup;57| (|p| |q| $)
(COND
- ((SPADCALL |p| (|getShellEntry| $ 113))
- (SPADCALL |q| (|getShellEntry| $ 114)))
- ((SPADCALL |q| (|getShellEntry| $ 113))
- (SPADCALL |p| (|getShellEntry| $ 114)))
- ('T (SPADCALL (LIST |p| |q|) (|getShellEntry| $ 117)))))
+ ((SPADCALL |p| (|getShellEntry| $ 119))
+ (SPADCALL |q| (|getShellEntry| $ 120)))
+ ((SPADCALL |q| (|getShellEntry| $ 119))
+ (SPADCALL |p| (|getShellEntry| $ 120)))
+ ('T (SPADCALL (LIST |p| |q|) (|getShellEntry| $ 123)))))
(DEFUN |Integer| ()
(PROG ()
@@ -517,100 +517,103 @@
(RETURN
(PROGN
(LETT |dv$| '(|Integer|) . #0=(|Integer|))
- (LETT $ (|newShell| 132) . #0#)
+ (LETT $ (|newShell| 138) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
(|haddProp| |$ConstructorCache| '|Integer| NIL (CONS 1 $))
(|stuffDomainSlots| $)
- (|setShellEntry| $ 72
- (|setShellEntry| $ 71
+ (|setShellEntry| $ 80
+ (|setShellEntry| $ 52
(CONS (|dispatchFunction| |INT;*;3$;40|) $)))
$))))
(MAKEPROP '|Integer| '|infovec|
- (LIST '#(NIL NIL NIL NIL NIL NIL (|Void|) (|OpenMathDevice|)
- (0 . |OMputApp|) (|String|) (5 . |OMputSymbol|)
- (|Integer|) (12 . |OMputInteger|) (18 . |OMputEndApp|)
- (|OpenMathEncoding|) (23 . |OMencodingXML|)
- (27 . |OMopenString|) (33 . |OMputObject|)
- (38 . |OMputEndObject|) (43 . |OMclose|)
- |INT;OMwrite;$S;2| (|Boolean|) |INT;OMwrite;$BS;3|
- |INT;OMwrite;Omd$V;4| |INT;OMwrite;Omd$BV;5|
- |INT;zero?;$B;6| |INT;one?;$B;7|
+ (LIST '#(NIL NIL NIL NIL NIL NIL
(CONS IDENTITY
(FUNCALL (|dispatchFunction| |INT;Zero;$;8|) $))
+ (|NonNegativeInteger|) (0 . |Zero|) (|Boolean|)
+ |INT;<;2$B;35| (|Void|) (|OpenMathDevice|)
+ (4 . |OMputApp|) (|String|) (9 . |OMputSymbol|)
+ |INT;-;2$;36| (|Integer|) (16 . |OMputInteger|)
+ (22 . |OMputEndApp|) (|OpenMathEncoding|)
+ (27 . |OMencodingXML|) (31 . |OMopenString|)
+ (37 . |OMputObject|) (42 . |OMputEndObject|)
+ (47 . |OMclose|) |INT;OMwrite;$S;2| |INT;OMwrite;$BS;3|
+ |INT;OMwrite;Omd$V;4| |INT;OMwrite;Omd$BV;5|
+ |INT;zero?;$B;6|
(CONS IDENTITY
(FUNCALL (|dispatchFunction| |INT;One;$;9|) $))
- |INT;base;$;10| |INT;copy;2$;11| |INT;inc;2$;12|
- |INT;dec;2$;13| (|SingleInteger|) |INT;hash;$Si;14|
- |INT;negative?;$B;15| (|OutputForm|) (48 . |outputForm|)
- |INT;coerce;$Of;16| |INT;coerce;2$;17| |INT;convert;2$;18|
- |INT;length;2$;19| |INT;addmod;4$;20| |INT;submod;4$;21|
- |INT;mulmod;4$;22| (|Float|) (53 . |coerce|)
- |INT;convert;$F;23| (|DoubleFloat|) |INT;convert;$Df;24|
- (|InputForm|) (58 . |convert|) |INT;convert;$If;25|
- |INT;convert;$S;26| |INT;latex;$S;27|
- |INT;positiveRemainder;3$;28| (|Matrix| 11) (|Matrix| $)
- |INT;reducedSystem;2M;29| (|Vector| 11)
- (|Record| (|:| |mat| 56) (|:| |vec| 59)) (|Vector| $)
+ (52 . |One|) |INT;=;2$B;34| |INT;one?;$B;7|
+ |INT;base;$;10| |INT;copy;2$;11| |INT;+;3$;37|
+ |INT;inc;2$;12| |INT;-;3$;38| |INT;dec;2$;13|
+ (|SingleInteger|) |INT;hash;$Si;14| |INT;negative?;$B;15|
+ (|OutputForm|) (56 . |outputForm|) |INT;coerce;$Of;16|
+ |INT;coerce;2$;17| |INT;convert;2$;18| |INT;length;2$;19|
+ |INT;addmod;4$;20| |INT;submod;4$;21| NIL |INT;rem;3$;47|
+ |INT;mulmod;4$;22| (|Float|) (61 . |coerce|)
+ |INT;convert;$F;23| (|DoubleFloat|) (66 . |coerce|)
+ |INT;convert;$Df;24| (|InputForm|) (71 . |convert|)
+ |INT;convert;$If;25| (76 . |string|) |INT;convert;$S;26|
+ (81 . <) (87 . |concat|) |INT;latex;$S;27|
+ |INT;positiveRemainder;3$;28| (|Matrix| 17) (|Matrix| $)
+ |INT;reducedSystem;2M;29| (|Vector| 17)
+ (|Record| (|:| |mat| 70) (|:| |vec| 73)) (|Vector| $)
|INT;reducedSystem;MVR;30| |INT;abs;2$;31|
- |INT;random;$;32| |INT;random;2$;33| |INT;=;2$B;34|
- |INT;<;2$B;35| |INT;-;2$;36| |INT;+;3$;37| |INT;-;3$;38|
- NIL NIL (|NonNegativeInteger|) |INT;**;$Nni$;41|
+ |INT;random;$;32| |INT;random;2$;33| NIL |INT;**;$Nni$;41|
|INT;odd?;$B;42| |INT;max;3$;43| |INT;min;3$;44|
(|Record| (|:| |quotient| $) (|:| |remainder| $))
- |INT;divide;2$R;45| |INT;quo;3$;46| |INT;rem;3$;47|
- |INT;shift;3$;48| (|Union| $ '"failed") |INT;recip;$U;49|
- |INT;gcd;3$;50|
+ |INT;divide;2$R;45| |INT;quo;3$;46| |INT;shift;3$;48|
+ (|Union| $ '"failed") |INT;recip;$U;49| |INT;gcd;3$;50|
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $))
|INT;unitNormal;$R;51| |INT;unitCanonical;2$;52|
- (|SparseUnivariatePolynomial| 11) (|List| 89)
- (|Union| 90 '"failed")
+ (|SparseUnivariatePolynomial| 17) (|List| 95)
+ (|Union| 96 '"failed")
(|IntegerSolveLinearPolynomialEquation|)
- (63 . |solveLinearPolynomialEquation|)
- (|SparseUnivariatePolynomial| $$) (|Factored| 94)
- (|UnivariatePolynomialSquareFree| $$ 94)
- (69 . |squareFree|) (74 . |primitivePart|)
- (79 . |leadingCoefficient|) (|GaloisGroupFactorizer| 94)
- (84 . |factor|) (89 . |coerce|) (94 . |exquo|)
- (|Factored| $) (100 . |factor|) (|Mapping| 94 $$)
- (|Factored| $$) (|FactoredFunctions2| $$ 94) (105 . |map|)
- (|FactoredFunctionUtilities| 94) (111 . |mergeFactors|)
- (117 . |factorSquareFree|) (122 . |zero?|)
- (127 . |unitCanonical|) (|List| 94) (|HeuGcd| 94)
- (132 . |gcd|) (|SparseUnivariatePolynomial| $)
- |INT;gcdPolynomial;3Sup;57| (|Fraction| 11)
- (|Union| 120 '"failed") (|PatternMatchResult| 11 $)
- (|Pattern| 11) (|Union| 11 '"failed") (|List| $)
- (|Record| (|:| |coef| 125) (|:| |generator| $))
- (|Union| 125 '"failed")
+ (93 . |solveLinearPolynomialEquation|)
+ (|SparseUnivariatePolynomial| $$) (|Factored| 100)
+ (|UnivariatePolynomialSquareFree| $$ 100)
+ (99 . |squareFree|) (104 . |primitivePart|)
+ (109 . |leadingCoefficient|) (|GaloisGroupFactorizer| 100)
+ (114 . |factor|) (119 . |coerce|) (124 . |exquo|)
+ (|Factored| $) (130 . |factor|) (|Mapping| 100 $$)
+ (|Factored| $$) (|FactoredFunctions2| $$ 100)
+ (135 . |map|) (|FactoredFunctionUtilities| 100)
+ (141 . |mergeFactors|) (147 . |factorSquareFree|)
+ (152 . |zero?|) (157 . |unitCanonical|) (|List| 100)
+ (|HeuGcd| 100) (162 . |gcd|)
+ (|SparseUnivariatePolynomial| $)
+ |INT;gcdPolynomial;3Sup;57| (|Fraction| 17)
+ (|Union| 126 '"failed") (|PatternMatchResult| 17 $)
+ (|Pattern| 17) (|Union| 17 '"failed") (|List| $)
+ (|Record| (|:| |coef| 131) (|:| |generator| $))
+ (|Union| 131 '"failed")
(|Record| (|:| |coef1| $) (|:| |coef2| $)
(|:| |generator| $))
(|Record| (|:| |coef1| $) (|:| |coef2| $))
- (|Union| 129 '"failed") (|PositiveInteger|))
- '#(~= 137 |zero?| 143 |unitNormal| 148 |unitCanonical| 153
- |unit?| 158 |symmetricRemainder| 163 |subtractIfCan| 169
- |submod| 175 |squareFreePart| 182 |squareFree| 187
- |sizeLess?| 192 |sign| 198 |shift| 203 |sample| 209
- |retractIfCan| 213 |retract| 218 |rem| 223 |reducedSystem|
- 229 |recip| 240 |rationalIfCan| 245 |rational?| 250
- |rational| 255 |random| 260 |quo| 269 |principalIdeal| 275
- |prime?| 280 |powmod| 285 |positiveRemainder| 292
- |positive?| 298 |permutation| 303 |patternMatch| 309
- |one?| 316 |odd?| 321 |nextItem| 326 |negative?| 331
- |multiEuclidean| 336 |mulmod| 342 |min| 349 |max| 355
- |mask| 361 |length| 366 |lcm| 371 |latex| 382 |invmod| 387
- |init| 393 |inc| 397 |hash| 402 |gcdPolynomial| 407 |gcd|
- 413 |factorial| 424 |factor| 429 |extendedEuclidean| 434
- |exquo| 447 |expressIdealMember| 453 |even?| 459
- |euclideanSize| 464 |divide| 469 |differentiate| 475 |dec|
- 486 |copy| 491 |convert| 496 |coerce| 526 |characteristic|
- 546 |bit?| 550 |binomial| 556 |base| 562 |associates?| 566
- |addmod| 572 |abs| 579 |Zero| 584 |One| 588 |OMwrite| 592
- D 616 >= 627 > 633 = 639 <= 645 < 651 - 657 + 668 ** 674 *
- 686)
+ (|Union| 135 '"failed") (|PositiveInteger|))
+ '#(~= 167 |zero?| 173 |unitNormal| 178 |unitCanonical| 183
+ |unit?| 188 |symmetricRemainder| 193 |subtractIfCan| 199
+ |submod| 205 |squareFreePart| 212 |squareFree| 217
+ |sizeLess?| 222 |sign| 228 |shift| 233 |sample| 239
+ |retractIfCan| 243 |retract| 248 |rem| 253 |reducedSystem|
+ 259 |recip| 270 |rationalIfCan| 275 |rational?| 280
+ |rational| 285 |random| 290 |quo| 299 |principalIdeal| 305
+ |prime?| 310 |powmod| 315 |positiveRemainder| 322
+ |positive?| 328 |permutation| 333 |patternMatch| 339
+ |one?| 346 |odd?| 351 |nextItem| 356 |negative?| 361
+ |multiEuclidean| 366 |mulmod| 372 |min| 379 |max| 385
+ |mask| 391 |length| 396 |lcm| 401 |latex| 412 |invmod| 417
+ |init| 423 |inc| 427 |hash| 432 |gcdPolynomial| 437 |gcd|
+ 443 |factorial| 454 |factor| 459 |extendedEuclidean| 464
+ |exquo| 477 |expressIdealMember| 483 |even?| 489
+ |euclideanSize| 494 |divide| 499 |differentiate| 505 |dec|
+ 516 |copy| 521 |convert| 526 |coerce| 556 |characteristic|
+ 576 |bit?| 580 |binomial| 586 |base| 592 |associates?| 596
+ |addmod| 602 |abs| 609 |Zero| 614 |One| 618 |OMwrite| 622
+ D 646 >= 657 > 663 = 669 <= 675 < 681 - 687 + 698 ** 704 *
+ 716)
'((|infinite| . 0) (|noetherian| . 0)
(|canonicalsClosed| . 0) (|canonical| . 0)
(|canonicalUnitNormal| . 0) (|multiplicativeValuation| . 0)
@@ -637,7 +640,7 @@
(|OrderedIntegralDomain|) (|GcdDomain|)
(|IntegralDomain|) (|Algebra| $$)
(|CharacteristicZero|)
- (|LinearlyExplicitRingOver| 11)
+ (|LinearlyExplicitRingOver| 17)
(|DifferentialRing|) (|OrderedRing|)
(|CommutativeRing|) (|EntireRing|)
(|Module| $$) (|BiModule| $$ $$)
@@ -650,66 +653,68 @@
(|CancellationAbelianMonoid|)
(|OrderedAbelianSemiGroup|)
(|AbelianMonoid|) (|Monoid|)
- (|StepThrough|) (|PatternMatchable| 11)
+ (|StepThrough|) (|PatternMatchable| 17)
(|OrderedSet|) (|AbelianSemiGroup|)
(|SemiGroup|) (|RealConstant|)
- (|RetractableTo| 11) (|SetCategory|)
- (|OpenMath|) (|ConvertibleTo| 9)
- (|ConvertibleTo| 45)
- (|ConvertibleTo| 48)
+ (|RetractableTo| 17) (|SetCategory|)
+ (|OpenMath|) (|ConvertibleTo| 14)
+ (|ConvertibleTo| 55)
+ (|ConvertibleTo| 58)
(|CombinatorialFunctionCategory|)
- (|ConvertibleTo| 123)
- (|ConvertibleTo| 50)
- (|ConvertibleTo| 11)
+ (|ConvertibleTo| 129)
+ (|ConvertibleTo| 61)
+ (|ConvertibleTo| 17)
(|CoercibleFrom| $$)
- (|CoercibleFrom| 11) (|BasicType|)
- (|CoercibleTo| 36))
- (|makeByteWordVec2| 131
- '(1 7 6 0 8 3 7 6 0 9 9 10 2 7 6 0 11
- 12 1 7 6 0 13 0 14 0 15 2 7 0 9 14 16
- 1 7 6 0 17 1 7 6 0 18 1 7 6 0 19 1 36
- 0 11 37 1 45 0 11 46 1 50 0 11 51 2
- 92 91 90 89 93 1 96 95 94 97 1 94 0 0
- 98 1 94 2 0 99 1 100 95 94 101 1 94 0
- 2 102 2 0 83 0 0 103 1 0 104 0 105 2
- 108 95 106 107 109 2 110 95 95 95 111
- 1 100 95 94 112 1 94 21 0 113 1 94 0
- 0 114 1 116 94 115 117 2 0 21 0 0 1 1
- 0 21 0 25 1 0 86 0 87 1 0 0 0 88 1 0
- 21 0 1 2 0 0 0 0 1 2 0 83 0 0 1 3 0 0
- 0 0 0 43 1 0 0 0 1 1 0 104 0 1 2 0 21
- 0 0 1 1 0 11 0 1 2 0 0 0 0 82 0 0 0 1
- 1 0 124 0 1 1 0 11 0 1 2 0 0 0 0 81 2
- 0 60 57 61 62 1 0 56 57 58 1 0 83 0
- 84 1 0 121 0 1 1 0 21 0 1 1 0 120 0 1
- 0 0 0 64 1 0 0 0 65 2 0 0 0 0 80 1 0
- 126 125 1 1 0 21 0 1 3 0 0 0 0 0 1 2
- 0 0 0 0 55 1 0 21 0 1 2 0 0 0 0 1 3 0
- 122 0 123 122 1 1 0 21 0 26 1 0 21 0
- 75 1 0 83 0 1 1 0 21 0 35 2 0 127 125
- 0 1 3 0 0 0 0 0 44 2 0 0 0 0 77 2 0 0
- 0 0 76 1 0 0 0 1 1 0 0 0 41 2 0 0 0 0
- 1 1 0 0 125 1 1 0 9 0 54 2 0 0 0 0 1
- 0 0 0 1 1 0 0 0 31 1 0 33 0 34 2 0
- 118 118 118 119 2 0 0 0 0 85 1 0 0
- 125 1 1 0 0 0 1 1 0 104 0 105 2 0 128
- 0 0 1 3 0 130 0 0 0 1 2 0 83 0 0 103
- 2 0 127 125 0 1 1 0 21 0 1 1 0 73 0 1
- 2 0 78 0 0 79 1 0 0 0 1 2 0 0 0 73 1
- 1 0 0 0 32 1 0 0 0 30 1 0 9 0 53 1 0
- 48 0 49 1 0 45 0 47 1 0 50 0 52 1 0
- 123 0 1 1 0 11 0 40 1 0 0 11 39 1 0 0
- 0 1 1 0 0 11 39 1 0 36 0 38 0 0 73 1
- 2 0 21 0 0 1 2 0 0 0 0 1 0 0 0 29 2 0
- 21 0 0 1 3 0 0 0 0 0 42 1 0 0 0 63 0
- 0 0 27 0 0 0 28 3 0 6 7 0 21 24 2 0 9
- 0 21 22 2 0 6 7 0 23 1 0 9 0 20 1 0 0
- 0 1 2 0 0 0 73 1 2 0 21 0 0 1 2 0 21
- 0 0 1 2 0 21 0 0 66 2 0 21 0 0 1 2 0
- 21 0 0 67 2 0 0 0 0 70 1 0 0 0 68 2 0
- 0 0 0 69 2 0 0 0 73 74 2 0 0 0 131 1
- 2 0 0 0 0 71 2 0 0 11 0 72 2 0 0 73 0
- 1 2 0 0 131 0 1)))))
+ (|CoercibleFrom| 17) (|BasicType|)
+ (|CoercibleTo| 44))
+ (|makeByteWordVec2| 137
+ '(0 7 0 8 1 12 11 0 13 3 12 11 0 14 14
+ 15 2 12 11 0 17 18 1 12 11 0 19 0 20
+ 0 21 2 12 0 14 20 22 1 12 11 0 23 1
+ 12 11 0 24 1 12 11 0 25 0 7 0 32 1 44
+ 0 17 45 1 55 0 17 56 1 58 0 17 59 1
+ 61 0 17 62 1 14 0 17 64 2 17 9 0 0 66
+ 2 14 0 0 0 67 2 98 97 96 95 99 1 102
+ 101 100 103 1 100 0 0 104 1 100 2 0
+ 105 1 106 101 100 107 1 100 0 2 108 2
+ 0 89 0 0 109 1 0 110 0 111 2 114 101
+ 112 113 115 2 116 101 101 101 117 1
+ 106 101 100 118 1 100 9 0 119 1 100 0
+ 0 120 1 122 100 121 123 2 0 9 0 0 1 1
+ 0 9 0 30 1 0 92 0 93 1 0 0 0 94 1 0 9
+ 0 1 2 0 0 0 0 1 2 0 89 0 0 1 3 0 0 0
+ 0 0 51 1 0 0 0 1 1 0 110 0 1 2 0 9 0
+ 0 1 1 0 17 0 1 2 0 0 0 0 88 0 0 0 1 1
+ 0 130 0 1 1 0 17 0 1 2 0 0 0 0 53 2 0
+ 74 71 75 76 1 0 70 71 72 1 0 89 0 90
+ 1 0 127 0 1 1 0 9 0 1 1 0 126 0 1 0 0
+ 0 78 1 0 0 0 79 2 0 0 0 0 87 1 0 132
+ 131 1 1 0 9 0 1 3 0 0 0 0 0 1 2 0 0 0
+ 0 69 1 0 9 0 1 2 0 0 0 0 1 3 0 128 0
+ 129 128 1 1 0 9 0 34 1 0 9 0 82 1 0
+ 89 0 1 1 0 9 0 43 2 0 133 131 0 1 3 0
+ 0 0 0 0 54 2 0 0 0 0 84 2 0 0 0 0 83
+ 1 0 0 0 1 1 0 0 0 49 2 0 0 0 0 1 1 0
+ 0 131 1 1 0 14 0 68 2 0 0 0 0 1 0 0 0
+ 1 1 0 0 0 38 1 0 41 0 42 2 0 124 124
+ 124 125 2 0 0 0 0 91 1 0 0 131 1 1 0
+ 0 0 1 1 0 110 0 111 2 0 134 0 0 1 3 0
+ 136 0 0 0 1 2 0 89 0 0 109 2 0 133
+ 131 0 1 1 0 9 0 1 1 0 7 0 1 2 0 85 0
+ 0 86 1 0 0 0 1 2 0 0 0 7 1 1 0 0 0 40
+ 1 0 0 0 36 1 0 14 0 65 1 0 58 0 60 1
+ 0 55 0 57 1 0 61 0 63 1 0 129 0 1 1 0
+ 17 0 48 1 0 0 17 47 1 0 0 0 1 1 0 0
+ 17 47 1 0 44 0 46 0 0 7 1 2 0 9 0 0 1
+ 2 0 0 0 0 1 0 0 0 35 2 0 9 0 0 1 3 0
+ 0 0 0 0 50 1 0 0 0 77 0 0 0 6 0 0 0
+ 31 3 0 11 12 0 9 29 2 0 14 0 9 27 2 0
+ 11 12 0 28 1 0 14 0 26 1 0 0 0 1 2 0
+ 0 0 7 1 2 0 9 0 0 1 2 0 9 0 0 1 2 0 9
+ 0 0 33 2 0 9 0 0 1 2 0 9 0 0 10 2 0 0
+ 0 0 39 1 0 0 0 16 2 0 0 0 0 37 2 0 0
+ 0 7 81 2 0 0 0 137 1 2 0 0 0 0 52 2 0
+ 0 17 0 80 2 0 0 7 0 1 2 0 0 137 0 1)))))
'|lookupComplete|))
(MAKEPROP '|Integer| 'NILADIC T)
diff --git a/src/algebra/strap/INTDOM-.lsp b/src/algebra/strap/INTDOM-.lsp
index b44a7d0d..9cdf7fb7 100644
--- a/src/algebra/strap/INTDOM-.lsp
+++ b/src/algebra/strap/INTDOM-.lsp
@@ -38,7 +38,7 @@
(DEFUN |INTDOM-;associates?;2SB;5| (|x| |y| $)
(SPADCALL (QVELT (SPADCALL |x| (|getShellEntry| $ 10)) 1)
(QVELT (SPADCALL |y| (|getShellEntry| $ 10)) 1)
- (|getShellEntry| $ 19)))
+ (|getShellEntry| $ 21)))
(DEFUN |INTDOM-;associates?;2SB;6| (|x| |y| $)
(COND
@@ -56,7 +56,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|IntegralDomain&|))
(LETT |dv$| (LIST '|IntegralDomain&| |dv$1|) . #0#)
- (LETT $ (|newShell| 21) . #0#)
+ (LETT $ (|newShell| 23) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -69,11 +69,11 @@
(CONS (|dispatchFunction| |INTDOM-;unitNormal;SR;1|) $))))
(COND
((|HasAttribute| |#1| '|canonicalUnitNormal|)
- (|setShellEntry| $ 20
+ (|setShellEntry| $ 22
(CONS (|dispatchFunction| |INTDOM-;associates?;2SB;5|)
$)))
('T
- (|setShellEntry| $ 20
+ (|setShellEntry| $ 22
(CONS (|dispatchFunction| |INTDOM-;associates?;2SB;6|)
$))))
$))))
@@ -85,18 +85,18 @@
(4 . |unitNormal|) (9 . |unitNormal|)
|INTDOM-;unitCanonical;2S;2| (|Boolean|) (14 . |zero?|)
(|Union| $ '"failed") (19 . |exquo|) |INTDOM-;recip;SU;3|
- (25 . |recip|) |INTDOM-;unit?;SB;4| (30 . =)
- (36 . |associates?|))
- '#(|unitNormal| 42 |unitCanonical| 47 |unit?| 52 |recip| 57
- |associates?| 62)
+ (25 . |recip|) (30 . |false|) (34 . |true|)
+ |INTDOM-;unit?;SB;4| (38 . =) (44 . |associates?|))
+ '#(|unitNormal| 50 |unitCanonical| 55 |unit?| 60 |recip| 65
+ |associates?| 70)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 20
+ (|makeByteWordVec2| 22
'(0 6 0 7 1 0 8 0 9 1 6 8 0 10 1 6 12 0
- 13 2 6 14 0 0 15 1 6 14 0 17 2 6 12 0
- 0 19 2 0 12 0 0 20 1 0 8 0 9 1 0 0 0
- 11 1 0 12 0 18 1 0 14 0 16 2 0 12 0 0
- 20)))))
+ 13 2 6 14 0 0 15 1 6 14 0 17 0 12 0
+ 18 0 12 0 19 2 6 12 0 0 21 2 0 12 0 0
+ 22 1 0 8 0 9 1 0 0 0 11 1 0 12 0 20 1
+ 0 14 0 16 2 0 12 0 0 22)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index a7ba5fa0..33d4cd6d 100644
--- a/src/algebra/strap/ISTRING.lsp
+++ b/src/algebra/strap/ISTRING.lsp
@@ -160,22 +160,22 @@
(DEFUN |ISTRING;insert;2$I$;9| (|s| |t| |i| $)
(STRCONC (STRCONC (|ISTRING;elt;$Us$;31| |s|
(SPADCALL (|getShellEntry| $ 6) (- |i| 1)
- (|getShellEntry| $ 20))
+ (|getShellEntry| $ 24))
$)
|t|)
(|ISTRING;elt;$Us$;31| |s|
- (SPADCALL |i| (|getShellEntry| $ 22)) $)))
+ (SPADCALL |i| (|getShellEntry| $ 26)) $)))
(DEFUN |ISTRING;coerce;$Of;10| (|s| $)
- (SPADCALL |s| (|getShellEntry| $ 26)))
+ (SPADCALL |s| (|getShellEntry| $ 30)))
(DEFUN |ISTRING;minIndex;$I;11| (|s| $) (|getShellEntry| $ 6))
(DEFUN |ISTRING;upperCase!;2$;12| (|s| $)
- (SPADCALL (ELT $ 31) |s| (|getShellEntry| $ 33)))
+ (SPADCALL (ELT $ 35) |s| (|getShellEntry| $ 37)))
(DEFUN |ISTRING;lowerCase!;2$;13| (|s| $)
- (SPADCALL (ELT $ 36) |s| (|getShellEntry| $ 33)))
+ (SPADCALL (ELT $ 40) |s| (|getShellEntry| $ 37)))
(DEFUN |ISTRING;latex;$S;14| (|s| $)
(STRCONC "\\mbox{``" (STRCONC |s| "''}")))
@@ -185,18 +185,18 @@
#3=#:G1539 |k|)
(RETURN
(SEQ (LETT |l|
- (- (SPADCALL |sg| (|getShellEntry| $ 39))
+ (- (SPADCALL |sg| (|getShellEntry| $ 44))
(|getShellEntry| $ 6))
|ISTRING;replace;$Us2$;15|)
(LETT |m| (QCSIZE |s|) |ISTRING;replace;$Us2$;15|)
(LETT |n| (QCSIZE |t|) |ISTRING;replace;$Us2$;15|)
(LETT |h|
(COND
- ((SPADCALL |sg| (|getShellEntry| $ 40))
- (- (SPADCALL |sg| (|getShellEntry| $ 41))
+ ((SPADCALL |sg| (|getShellEntry| $ 45))
+ (- (SPADCALL |sg| (|getShellEntry| $ 46))
(|getShellEntry| $ 6)))
('T
- (- (SPADCALL |s| (|getShellEntry| $ 42))
+ (- (SPADCALL |s| (|getShellEntry| $ 47))
(|getShellEntry| $ 6))))
|ISTRING;replace;$Us2$;15|)
(COND
@@ -208,7 +208,7 @@
|ISTRING;replace;$Us2$;15|)
(|check-subtype| (COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (SPADCALL (|getShellEntry| $ 43)))
+ (SPADCALL (|getShellEntry| $ 52)))
|ISTRING;replace;$Us2$;15|)
(SEQ (LETT |i| 0 |ISTRING;replace;$Us2$;15|)
(LETT #1# (- |l| 1) |ISTRING;replace;$Us2$;15|)
@@ -247,7 +247,7 @@
(DEFUN |ISTRING;setelt;$I2C;16| (|s| |i| |c| $)
(SEQ (COND
((OR (< |i| (|getShellEntry| $ 6))
- (< (SPADCALL |s| (|getShellEntry| $ 42)) |i|))
+ (< (SPADCALL |s| (|getShellEntry| $ 47)) |i|))
(|error| "index out of range"))
('T
(SEQ (QESET |s| (- |i| (|getShellEntry| $ 6)) |c|)
@@ -382,7 +382,7 @@
(EXIT
(COND
((SPADCALL (CHAR |t| |r|) |cc|
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 64))
(PROGN
(LETT #1#
(+ |r|
@@ -398,9 +398,9 @@
(DEFUN |ISTRING;suffix?;2$B;21| (|s| |t| $)
(PROG (|n| |m|)
(RETURN
- (SEQ (LETT |n| (SPADCALL |t| (|getShellEntry| $ 42))
+ (SEQ (LETT |n| (SPADCALL |t| (|getShellEntry| $ 47))
|ISTRING;suffix?;2$B;21|)
- (LETT |m| (SPADCALL |s| (|getShellEntry| $ 42))
+ (LETT |m| (SPADCALL |s| (|getShellEntry| $ 47))
|ISTRING;suffix?;2$B;21|)
(EXIT (COND
((< |n| |m|) 'NIL)
@@ -411,19 +411,19 @@
(DEFUN |ISTRING;split;$CL;22| (|s| |c| $)
(PROG (|n| |j| |i| |l|)
(RETURN
- (SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 42))
+ (SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 47))
|ISTRING;split;$CL;22|)
(SEQ (LETT |i| (|getShellEntry| $ 6) |ISTRING;split;$CL;22|)
G190
(COND
((OR (> |i| |n|)
(NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
- |c| (|getShellEntry| $ 53))))
+ |c| (|getShellEntry| $ 68))))
(GO G191)))
(SEQ (EXIT 0))
(LETT |i| (+ |i| 1) |ISTRING;split;$CL;22|) (GO G190)
G191 (EXIT NIL))
- (LETT |l| (SPADCALL (|getShellEntry| $ 55))
+ (LETT |l| (SPADCALL (|getShellEntry| $ 70))
|ISTRING;split;$CL;22|)
(SEQ G190
(COND
@@ -440,9 +440,9 @@
(SPADCALL
(|ISTRING;elt;$Us$;31| |s|
(SPADCALL |i| (- |j| 1)
- (|getShellEntry| $ 20))
+ (|getShellEntry| $ 24))
$)
- |l| (|getShellEntry| $ 56))
+ |l| (|getShellEntry| $ 71))
|ISTRING;split;$CL;22|)
(EXIT (SEQ (LETT |i| |j| |ISTRING;split;$CL;22|)
G190
@@ -451,7 +451,7 @@
(NULL
(SPADCALL
(|ISTRING;elt;$IC;30| |s| |i| $)
- |c| (|getShellEntry| $ 53))))
+ |c| (|getShellEntry| $ 68))))
(GO G191)))
(SEQ (EXIT 0))
(LETT |i| (+ |i| 1)
@@ -463,16 +463,16 @@
(LETT |l|
(SPADCALL
(|ISTRING;elt;$Us$;31| |s|
- (SPADCALL |i| |n| (|getShellEntry| $ 20))
+ (SPADCALL |i| |n| (|getShellEntry| $ 24))
$)
- |l| (|getShellEntry| $ 56))
+ |l| (|getShellEntry| $ 71))
|ISTRING;split;$CL;22|)))
- (EXIT (SPADCALL |l| (|getShellEntry| $ 57)))))))
+ (EXIT (SPADCALL |l| (|getShellEntry| $ 72)))))))
(DEFUN |ISTRING;split;$CcL;23| (|s| |cc| $)
(PROG (|n| |j| |i| |l|)
(RETURN
- (SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 42))
+ (SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 47))
|ISTRING;split;$CcL;23|)
(SEQ (LETT |i| (|getShellEntry| $ 6)
|ISTRING;split;$CcL;23|)
@@ -480,12 +480,12 @@
(COND
((OR (> |i| |n|)
(NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
- |cc| (|getShellEntry| $ 49))))
+ |cc| (|getShellEntry| $ 64))))
(GO G191)))
(SEQ (EXIT 0))
(LETT |i| (+ |i| 1) |ISTRING;split;$CcL;23|) (GO G190)
G191 (EXIT NIL))
- (LETT |l| (SPADCALL (|getShellEntry| $ 55))
+ (LETT |l| (SPADCALL (|getShellEntry| $ 70))
|ISTRING;split;$CcL;23|)
(SEQ G190
(COND
@@ -502,9 +502,9 @@
(SPADCALL
(|ISTRING;elt;$Us$;31| |s|
(SPADCALL |i| (- |j| 1)
- (|getShellEntry| $ 20))
+ (|getShellEntry| $ 24))
$)
- |l| (|getShellEntry| $ 56))
+ |l| (|getShellEntry| $ 71))
|ISTRING;split;$CcL;23|)
(EXIT (SEQ (LETT |i| |j| |ISTRING;split;$CcL;23|)
G190
@@ -513,7 +513,7 @@
(NULL
(SPADCALL
(|ISTRING;elt;$IC;30| |s| |i| $)
- |cc| (|getShellEntry| $ 49))))
+ |cc| (|getShellEntry| $ 64))))
(GO G191)))
(SEQ (EXIT 0))
(LETT |i| (+ |i| 1)
@@ -525,16 +525,16 @@
(LETT |l|
(SPADCALL
(|ISTRING;elt;$Us$;31| |s|
- (SPADCALL |i| |n| (|getShellEntry| $ 20))
+ (SPADCALL |i| |n| (|getShellEntry| $ 24))
$)
- |l| (|getShellEntry| $ 56))
+ |l| (|getShellEntry| $ 71))
|ISTRING;split;$CcL;23|)))
- (EXIT (SPADCALL |l| (|getShellEntry| $ 57)))))))
+ (EXIT (SPADCALL |l| (|getShellEntry| $ 72)))))))
(DEFUN |ISTRING;leftTrim;$C$;24| (|s| |c| $)
(PROG (|n| |i|)
(RETURN
- (SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 42))
+ (SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 47))
|ISTRING;leftTrim;$C$;24|)
(SEQ (LETT |i| (|getShellEntry| $ 6)
|ISTRING;leftTrim;$C$;24|)
@@ -542,18 +542,18 @@
(COND
((OR (> |i| |n|)
(NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
- |c| (|getShellEntry| $ 53))))
+ |c| (|getShellEntry| $ 68))))
(GO G191)))
(SEQ (EXIT 0))
(LETT |i| (+ |i| 1) |ISTRING;leftTrim;$C$;24|)
(GO G190) G191 (EXIT NIL))
(EXIT (|ISTRING;elt;$Us$;31| |s|
- (SPADCALL |i| |n| (|getShellEntry| $ 20)) $))))))
+ (SPADCALL |i| |n| (|getShellEntry| $ 24)) $))))))
(DEFUN |ISTRING;leftTrim;$Cc$;25| (|s| |cc| $)
(PROG (|n| |i|)
(RETURN
- (SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 42))
+ (SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 47))
|ISTRING;leftTrim;$Cc$;25|)
(SEQ (LETT |i| (|getShellEntry| $ 6)
|ISTRING;leftTrim;$Cc$;25|)
@@ -561,18 +561,18 @@
(COND
((OR (> |i| |n|)
(NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
- |cc| (|getShellEntry| $ 49))))
+ |cc| (|getShellEntry| $ 64))))
(GO G191)))
(SEQ (EXIT 0))
(LETT |i| (+ |i| 1) |ISTRING;leftTrim;$Cc$;25|)
(GO G190) G191 (EXIT NIL))
(EXIT (|ISTRING;elt;$Us$;31| |s|
- (SPADCALL |i| |n| (|getShellEntry| $ 20)) $))))))
+ (SPADCALL |i| |n| (|getShellEntry| $ 24)) $))))))
(DEFUN |ISTRING;rightTrim;$C$;26| (|s| |c| $)
(PROG (|j| #0=#:G1543)
(RETURN
- (SEQ (SEQ (LETT |j| (SPADCALL |s| (|getShellEntry| $ 42))
+ (SEQ (SEQ (LETT |j| (SPADCALL |s| (|getShellEntry| $ 47))
|ISTRING;rightTrim;$C$;26|)
(LETT #0# (|getShellEntry| $ 6)
|ISTRING;rightTrim;$C$;26|)
@@ -580,20 +580,20 @@
(COND
((OR (< |j| #0#)
(NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $)
- |c| (|getShellEntry| $ 53))))
+ |c| (|getShellEntry| $ 68))))
(GO G191)))
(SEQ (EXIT 0))
(LETT |j| (+ |j| -1) |ISTRING;rightTrim;$C$;26|)
(GO G190) G191 (EXIT NIL))
(EXIT (|ISTRING;elt;$Us$;31| |s|
(SPADCALL (|ISTRING;minIndex;$I;11| |s| $) |j|
- (|getShellEntry| $ 20))
+ (|getShellEntry| $ 24))
$))))))
(DEFUN |ISTRING;rightTrim;$Cc$;27| (|s| |cc| $)
(PROG (|j| #0=#:G1544)
(RETURN
- (SEQ (SEQ (LETT |j| (SPADCALL |s| (|getShellEntry| $ 42))
+ (SEQ (SEQ (LETT |j| (SPADCALL |s| (|getShellEntry| $ 47))
|ISTRING;rightTrim;$Cc$;27|)
(LETT #0# (|getShellEntry| $ 6)
|ISTRING;rightTrim;$Cc$;27|)
@@ -601,14 +601,14 @@
(COND
((OR (< |j| #0#)
(NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $)
- |cc| (|getShellEntry| $ 49))))
+ |cc| (|getShellEntry| $ 64))))
(GO G191)))
(SEQ (EXIT 0))
(LETT |j| (+ |j| -1) |ISTRING;rightTrim;$Cc$;27|)
(GO G190) G191 (EXIT NIL))
(EXIT (|ISTRING;elt;$Us$;31| |s|
(SPADCALL (|ISTRING;minIndex;$I;11| |s| $) |j|
- (|getShellEntry| $ 20))
+ (|getShellEntry| $ 24))
$))))))
(DEFUN |ISTRING;concat;L$;28| (|l| $)
@@ -644,7 +644,7 @@
(LETT #0# (CDR #0#) |ISTRING;concat;L$;28|)
(GO G190) G191 (EXIT NIL))
(COND (#3# #2#) ('T 0)))
- (SPADCALL (|getShellEntry| $ 43)))
+ (SPADCALL (|getShellEntry| $ 52)))
|ISTRING;concat;L$;28|)
(LETT |i| (|getShellEntry| $ 6) |ISTRING;concat;L$;28|)
(SEQ (LETT |s| NIL |ISTRING;concat;L$;28|)
@@ -677,7 +677,7 @@
(DEFUN |ISTRING;elt;$IC;30| (|s| |i| $)
(COND
((OR (< |i| (|getShellEntry| $ 6))
- (< (SPADCALL |s| (|getShellEntry| $ 42)) |i|))
+ (< (SPADCALL |s| (|getShellEntry| $ 47)) |i|))
(|error| "index out of range"))
('T (CHAR |s| (- |i| (|getShellEntry| $ 6))))))
@@ -685,16 +685,16 @@
(PROG (|l| |h|)
(RETURN
(SEQ (LETT |l|
- (- (SPADCALL |sg| (|getShellEntry| $ 39))
+ (- (SPADCALL |sg| (|getShellEntry| $ 44))
(|getShellEntry| $ 6))
|ISTRING;elt;$Us$;31|)
(LETT |h|
(COND
- ((SPADCALL |sg| (|getShellEntry| $ 40))
- (- (SPADCALL |sg| (|getShellEntry| $ 41))
+ ((SPADCALL |sg| (|getShellEntry| $ 45))
+ (- (SPADCALL |sg| (|getShellEntry| $ 46))
(|getShellEntry| $ 6)))
('T
- (- (SPADCALL |s| (|getShellEntry| $ 42))
+ (- (SPADCALL |s| (|getShellEntry| $ 47))
(|getShellEntry| $ 6))))
|ISTRING;elt;$Us$;31|)
(COND
@@ -712,23 +712,23 @@
(SPADCALL
(|ISTRING;elt;$IC;30| |s| (|getShellEntry| $ 6)
$)
- (|getShellEntry| $ 67)))
+ (|getShellEntry| $ 87)))
('T
(* (* (SPADCALL
(|ISTRING;elt;$IC;30| |s|
(|getShellEntry| $ 6) $)
- (|getShellEntry| $ 67))
+ (|getShellEntry| $ 87))
(SPADCALL
(|ISTRING;elt;$IC;30| |s|
(- (+ (|getShellEntry| $ 6) |n|) 1)
$)
- (|getShellEntry| $ 67)))
+ (|getShellEntry| $ 87)))
(SPADCALL
(|ISTRING;elt;$IC;30| |s|
(+ (|getShellEntry| $ 6)
(QUOTIENT2 |n| 2))
$)
- (|getShellEntry| $ 67))))))))))
+ (|getShellEntry| $ 87))))))))))
(DEFUN |ISTRING;match;2$CNni;33| (|pattern| |target| |wildcard| $)
(|stringMatch| |pattern| |target| (CHARACTER |wildcard|)))
@@ -738,7 +738,7 @@
|p| #4=#:G1522 |q|)
(RETURN
(SEQ (EXIT (SEQ (LETT |n|
- (SPADCALL |pattern| (|getShellEntry| $ 42))
+ (SPADCALL |pattern| (|getShellEntry| $ 47))
|ISTRING;match?;2$CB;34|)
(LETT |p|
(PROG1 (LETT #0#
@@ -760,17 +760,17 @@
('T
(SEQ (COND
((SPADCALL |p| |m|
- (|getShellEntry| $ 70))
+ (|getShellEntry| $ 92))
(COND
((NULL
(SPADCALL
(|ISTRING;elt;$Us$;31|
|pattern|
(SPADCALL |m| (- |p| 1)
- (|getShellEntry| $ 20))
+ (|getShellEntry| $ 24))
$)
|target|
- (|getShellEntry| $ 71)))
+ (|getShellEntry| $ 93)))
(EXIT 'NIL)))))
(LETT |i| |p|
|ISTRING;match?;2$CB;34|)
@@ -791,13 +791,13 @@
(COND
((NULL
(SPADCALL |q| (- |m| 1)
- (|getShellEntry| $ 70)))
+ (|getShellEntry| $ 92)))
(GO G191)))
(SEQ
(LETT |s|
(|ISTRING;elt;$Us$;31| |pattern|
(SPADCALL (+ |p| 1) (- |q| 1)
- (|getShellEntry| $ 20))
+ (|getShellEntry| $ 24))
$)
|ISTRING;match?;2$CB;34|)
(LETT |i|
@@ -844,14 +844,14 @@
NIL (GO G190) G191 (EXIT NIL))
(COND
((SPADCALL |p| |n|
- (|getShellEntry| $ 70))
+ (|getShellEntry| $ 92))
(COND
((NULL
(|ISTRING;suffix?;2$B;21|
(|ISTRING;elt;$Us$;31|
|pattern|
(SPADCALL (+ |p| 1) |n|
- (|getShellEntry| $ 20))
+ (|getShellEntry| $ 24))
$)
|target| $))
(EXIT 'NIL)))))
@@ -884,7 +884,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|IndexedString|))
(LETT |dv$| (LIST '|IndexedString| |dv$1|) . #0#)
- (LETT $ (|newShell| 84) . #0#)
+ (LETT $ (|newShell| 105) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -929,52 +929,58 @@
(MAKEPROP '|IndexedString| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|)
(|NonNegativeInteger|) (|Character|) |ISTRING;new;NniC$;1|
- |ISTRING;empty;$;2| (|Boolean|) |ISTRING;empty?;$B;3|
- |ISTRING;#;$Nni;4| |ISTRING;=;2$B;5| |ISTRING;<;2$B;6|
- |ISTRING;concat;3$;7| |ISTRING;copy;2$;8| (|Integer|)
- (|UniversalSegment| 18) (0 . SEGMENT)
- |ISTRING;elt;$Us$;31| (6 . SEGMENT)
+ |ISTRING;empty;$;2| (|Integer|) (0 . |Zero|) (|Boolean|)
+ (4 . =) |ISTRING;empty?;$B;3| |ISTRING;#;$Nni;4|
+ |ISTRING;=;2$B;5| |ISTRING;<;2$B;6| |ISTRING;concat;3$;7|
+ |ISTRING;copy;2$;8| (10 . |One|) (14 . -)
+ (|UniversalSegment| 11) (20 . SEGMENT)
+ |ISTRING;elt;$Us$;31| (26 . SEGMENT)
|ISTRING;insert;2$I$;9| (|String|) (|OutputForm|)
- (11 . |outputForm|) |ISTRING;coerce;$Of;10|
+ (31 . |outputForm|) |ISTRING;coerce;$Of;10|
|ISTRING;minIndex;$I;11| (|CharacterClass|)
- (16 . |upperCase|) (20 . |upperCase|) (|Mapping| 8 8)
- (25 . |map!|) |ISTRING;upperCase!;2$;12|
- (31 . |lowerCase|) (35 . |lowerCase|)
- |ISTRING;lowerCase!;2$;13| |ISTRING;latex;$S;14|
- (40 . |lo|) (45 . |hasHi|) (50 . |hi|) (55 . |maxIndex|)
- (60 . |space|) |ISTRING;replace;$Us2$;15|
- |ISTRING;setelt;$I2C;16| |ISTRING;substring?;2$IB;17|
- |ISTRING;position;2$2I;18| |ISTRING;position;C$2I;19|
- (64 . |member?|) |ISTRING;position;Cc$2I;20|
- |ISTRING;suffix?;2$B;21| |ISTRING;elt;$IC;30| (70 . =)
- (|List| $$) (76 . |empty|) (80 . |concat|)
- (86 . |reverse!|) (|List| $) |ISTRING;split;$CL;22|
- |ISTRING;split;$CcL;23| |ISTRING;leftTrim;$C$;24|
- |ISTRING;leftTrim;$Cc$;25| |ISTRING;rightTrim;$C$;26|
- |ISTRING;rightTrim;$Cc$;27| |ISTRING;copyInto!;2$I$;29|
- |ISTRING;concat;L$;28| (91 . |ord|) |ISTRING;hash;$I;32|
- |ISTRING;match;2$CNni;33| (96 . ~=) (102 . |prefix?|)
+ (36 . |upperCase|) (40 . |upperCase|) (|Mapping| 8 8)
+ (45 . |map!|) |ISTRING;upperCase!;2$;12|
+ (51 . |lowerCase|) (55 . |lowerCase|)
+ |ISTRING;lowerCase!;2$;13| (60 . |concat|)
+ |ISTRING;latex;$S;14| (66 . |lo|) (71 . |hasHi|)
+ (76 . |hi|) (81 . |maxIndex|) (86 . |Zero|) (90 . <)
+ (96 . |One|) (100 . +) (106 . |space|) (|SingleInteger|)
+ (110 . |Zero|) (114 . |One|) |ISTRING;replace;$Us2$;15|
+ |ISTRING;setelt;$I2C;16| (118 . |false|) (122 . |true|)
+ |ISTRING;substring?;2$IB;17| |ISTRING;position;2$2I;18|
+ (126 . -) |ISTRING;position;C$2I;19| (132 . |member?|)
+ |ISTRING;position;Cc$2I;20| |ISTRING;suffix?;2$B;21|
+ |ISTRING;elt;$IC;30| (138 . =) (|List| $$) (144 . |empty|)
+ (148 . |concat|) (154 . |reverse!|) (|List| $)
+ |ISTRING;split;$CL;22| |ISTRING;split;$CcL;23|
+ |ISTRING;leftTrim;$C$;24| |ISTRING;leftTrim;$Cc$;25|
+ (159 . -) |ISTRING;rightTrim;$C$;26|
+ |ISTRING;rightTrim;$Cc$;27| (164 . +)
+ |ISTRING;copyInto!;2$I$;29| |ISTRING;concat;L$;28|
+ (170 . |max|) (176 . |zero?|) (181 . |one?|) (186 . |ord|)
+ (191 . *) (197 . |quo|) |ISTRING;hash;$I;32|
+ |ISTRING;match;2$CNni;33| (203 . ~=) (209 . |prefix?|)
|ISTRING;match?;2$CB;34| (|List| 8) (|Equation| 8)
- (|List| 74) (|Mapping| 8 8 8) (|InputForm|)
- (|SingleInteger|) (|Mapping| 11 8) (|Mapping| 11 8 8)
- (|Void|) (|Union| 8 '"failed") (|List| 18))
- '#(~= 108 |upperCase!| 114 |upperCase| 119 |trim| 124 |swap!|
- 136 |suffix?| 143 |substring?| 149 |split| 156 |sorted?|
- 168 |sort!| 179 |sort| 190 |size?| 201 |setelt| 207
- |select| 221 |sample| 227 |rightTrim| 231 |reverse!| 243
- |reverse| 248 |replace| 253 |removeDuplicates| 260
- |remove| 265 |reduce| 277 |qsetelt!| 298 |qelt| 305
- |prefix?| 311 |position| 317 |parts| 350 |new| 355 |more?|
- 361 |minIndex| 367 |min| 372 |merge| 378 |members| 391
- |member?| 396 |maxIndex| 402 |max| 407 |match?| 413
- |match| 420 |map!| 427 |map| 433 |lowerCase!| 446
- |lowerCase| 451 |less?| 456 |leftTrim| 462 |latex| 474
- |insert| 479 |indices| 493 |index?| 498 |hash| 504 |first|
- 514 |find| 519 |fill!| 525 |every?| 531 |eval| 537 |eq?|
- 563 |entry?| 569 |entries| 575 |empty?| 580 |empty| 585
- |elt| 589 |delete| 614 |count| 626 |copyInto!| 638 |copy|
- 645 |convert| 650 |construct| 655 |concat| 660 |coerce|
- 683 |any?| 693 >= 699 > 705 = 711 <= 717 < 723 |#| 729)
+ (|List| 96) (|Mapping| 8 8 8) (|InputForm|)
+ (|Mapping| 13 8) (|Mapping| 13 8 8) (|Void|)
+ (|Union| 8 '"failed") (|List| 11))
+ '#(~= 215 |upperCase!| 221 |upperCase| 226 |trim| 231 |swap!|
+ 243 |suffix?| 250 |substring?| 256 |split| 263 |sorted?|
+ 275 |sort!| 286 |sort| 297 |size?| 308 |setelt| 314
+ |select| 328 |sample| 334 |rightTrim| 338 |reverse!| 350
+ |reverse| 355 |replace| 360 |removeDuplicates| 367
+ |remove| 372 |reduce| 384 |qsetelt!| 405 |qelt| 412
+ |prefix?| 418 |position| 424 |parts| 457 |new| 462 |more?|
+ 468 |minIndex| 474 |min| 479 |merge| 485 |members| 498
+ |member?| 503 |maxIndex| 509 |max| 514 |match?| 520
+ |match| 527 |map!| 534 |map| 540 |lowerCase!| 553
+ |lowerCase| 558 |less?| 563 |leftTrim| 569 |latex| 581
+ |insert| 586 |indices| 600 |index?| 605 |hash| 611 |first|
+ 621 |find| 626 |fill!| 632 |every?| 638 |eval| 644 |eq?|
+ 670 |entry?| 676 |entries| 682 |empty?| 687 |empty| 692
+ |elt| 696 |delete| 721 |count| 733 |copyInto!| 745 |copy|
+ 752 |convert| 757 |construct| 762 |concat| 767 |coerce|
+ 790 |any?| 800 >= 806 > 812 = 818 <= 824 < 830 |#| 836)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
(CONS (|makeByteWordVec2| 5
'(0 0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4))
@@ -990,58 +996,66 @@
(|OneDimensionalArrayAggregate| 8)
(|FiniteLinearAggregate| 8)
(|LinearAggregate| 8)
- (|IndexedAggregate| 18 8)
+ (|IndexedAggregate| 11 8)
(|Collection| 8)
(|HomogeneousAggregate| 8)
(|OrderedSet|) (|Aggregate|)
- (|EltableAggregate| 18 8) (|Evalable| 8)
+ (|EltableAggregate| 11 8) (|Evalable| 8)
(|SetCategory|) (|Type|)
- (|Eltable| 18 8) (|InnerEvalable| 8 8)
- (|CoercibleTo| 25) (|ConvertibleTo| 77)
+ (|Eltable| 11 8) (|InnerEvalable| 8 8)
+ (|CoercibleTo| 29) (|ConvertibleTo| 99)
(|BasicType|))
- (|makeByteWordVec2| 83
- '(2 19 0 18 18 20 1 19 0 18 22 1 25 0
- 24 26 0 29 0 30 1 8 0 0 31 2 0 0 32 0
- 33 0 29 0 35 1 8 0 0 36 1 19 18 0 39
- 1 19 11 0 40 1 19 18 0 41 1 0 18 0 42
- 0 8 0 43 2 29 11 8 0 49 2 8 11 0 0 53
- 0 54 0 55 2 54 0 2 0 56 1 54 0 0 57 1
- 8 7 0 67 2 18 11 0 0 70 2 0 11 0 0 71
- 2 7 11 0 0 1 1 0 0 0 34 1 0 0 0 1 2 0
- 0 0 8 1 2 0 0 0 29 1 3 0 81 0 18 18 1
- 2 0 11 0 0 51 3 0 11 0 0 18 46 2 0 58
- 0 29 60 2 0 58 0 8 59 1 5 11 0 1 2 0
- 11 80 0 1 1 5 0 0 1 2 0 0 80 0 1 1 5
- 0 0 1 2 0 0 80 0 1 2 0 11 0 7 1 3 0 8
- 0 19 8 1 3 0 8 0 18 8 45 2 0 0 79 0 1
- 0 0 0 1 2 0 0 0 8 63 2 0 0 0 29 64 1
- 0 0 0 1 1 0 0 0 1 3 0 0 0 19 0 44 1 7
- 0 0 1 2 7 0 8 0 1 2 0 0 79 0 1 4 7 8
- 76 0 8 8 1 3 0 8 76 0 8 1 2 0 8 76 0
- 1 3 0 8 0 18 8 1 2 0 8 0 18 1 2 0 11
- 0 0 71 3 7 18 8 0 18 48 2 7 18 8 0 1
- 3 0 18 29 0 18 50 3 0 18 0 0 18 47 2
- 0 18 79 0 1 1 0 73 0 1 2 0 0 7 8 9 2
- 0 11 0 7 1 1 6 18 0 28 2 5 0 0 0 1 2
- 5 0 0 0 1 3 0 0 80 0 0 1 1 0 73 0 1 2
- 7 11 8 0 1 1 6 18 0 42 2 5 0 0 0 1 3
- 0 11 0 0 8 72 3 0 7 0 0 8 69 2 0 0 32
- 0 33 3 0 0 76 0 0 1 2 0 0 32 0 1 1 0
- 0 0 37 1 0 0 0 1 2 0 11 0 7 1 2 0 0 0
- 8 61 2 0 0 0 29 62 1 7 24 0 38 3 0 0
- 8 0 18 1 3 0 0 0 0 18 23 1 0 83 0 1 2
- 0 11 18 0 1 1 7 78 0 1 1 0 18 0 68 1
- 6 8 0 1 2 0 82 79 0 1 2 0 0 0 8 1 2 0
- 11 79 0 1 3 9 0 0 73 73 1 3 9 0 0 8 8
- 1 2 9 0 0 75 1 2 9 0 0 74 1 2 0 11 0
- 0 1 2 7 11 8 0 1 1 0 73 0 1 1 0 11 0
- 12 0 0 0 10 2 0 0 0 0 1 2 0 0 0 19 21
- 2 0 8 0 18 52 3 0 8 0 18 8 1 2 0 0 0
- 18 1 2 0 0 0 19 1 2 7 7 8 0 1 2 0 7
- 79 0 1 3 0 0 0 0 18 65 1 0 0 0 17 1 3
- 77 0 1 1 0 0 73 1 1 0 0 58 66 2 0 0 0
- 0 16 2 0 0 0 8 1 2 0 0 8 0 1 1 8 25 0
- 27 1 0 0 8 1 2 0 11 79 0 1 2 5 11 0 0
- 1 2 5 11 0 0 1 2 7 11 0 0 14 2 5 11 0
- 0 1 2 5 11 0 0 15 1 0 7 0 13)))))
+ (|makeByteWordVec2| 104
+ '(0 11 0 12 2 11 13 0 0 14 0 11 0 21 2
+ 11 0 0 0 22 2 23 0 11 11 24 1 23 0 11
+ 26 1 29 0 28 30 0 33 0 34 1 8 0 0 35
+ 2 0 0 36 0 37 0 33 0 39 1 8 0 0 40 2
+ 28 0 0 0 42 1 23 11 0 44 1 23 13 0 45
+ 1 23 11 0 46 1 0 11 0 47 0 7 0 48 2
+ 11 13 0 0 49 0 7 0 50 2 11 0 0 0 51 0
+ 8 0 52 0 53 0 54 0 53 0 55 0 13 0 58
+ 0 13 0 59 2 53 0 0 0 62 2 33 13 8 0
+ 64 2 8 13 0 0 68 0 69 0 70 2 69 0 2 0
+ 71 1 69 0 0 72 1 53 0 0 78 2 7 0 0 0
+ 81 2 11 0 0 0 84 1 11 13 0 85 1 11 13
+ 0 86 1 8 7 0 87 2 11 0 11 0 88 2 11 0
+ 0 0 89 2 11 13 0 0 92 2 0 13 0 0 93 2
+ 7 13 0 0 1 1 0 0 0 38 1 0 0 0 1 2 0 0
+ 0 8 1 2 0 0 0 33 1 3 0 102 0 11 11 1
+ 2 0 13 0 0 66 3 0 13 0 0 11 60 2 0 73
+ 0 33 75 2 0 73 0 8 74 1 5 13 0 1 2 0
+ 13 101 0 1 1 5 0 0 1 2 0 0 101 0 1 1
+ 5 0 0 1 2 0 0 101 0 1 2 0 13 0 7 1 3
+ 0 8 0 23 8 1 3 0 8 0 11 8 57 2 0 0
+ 100 0 1 0 0 0 1 2 0 0 0 8 79 2 0 0 0
+ 33 80 1 0 0 0 1 1 0 0 0 1 3 0 0 0 23
+ 0 56 1 7 0 0 1 2 7 0 8 0 1 2 0 0 100
+ 0 1 4 7 8 98 0 8 8 1 3 0 8 98 0 8 1 2
+ 0 8 98 0 1 3 0 8 0 11 8 1 2 0 8 0 11
+ 1 2 0 13 0 0 93 3 7 11 8 0 11 63 2 7
+ 11 8 0 1 3 0 11 33 0 11 65 3 0 11 0 0
+ 11 61 2 0 11 100 0 1 1 0 95 0 1 2 0 0
+ 7 8 9 2 0 13 0 7 1 1 6 11 0 32 2 5 0
+ 0 0 1 2 5 0 0 0 1 3 0 0 101 0 0 1 1 0
+ 95 0 1 2 7 13 8 0 1 1 6 11 0 47 2 5 0
+ 0 0 1 3 0 13 0 0 8 94 3 0 7 0 0 8 91
+ 2 0 0 36 0 37 3 0 0 98 0 0 1 2 0 0 36
+ 0 1 1 0 0 0 41 1 0 0 0 1 2 0 13 0 7 1
+ 2 0 0 0 8 76 2 0 0 0 33 77 1 7 28 0
+ 43 3 0 0 8 0 11 1 3 0 0 0 0 11 27 1 0
+ 104 0 1 2 0 13 11 0 1 1 7 53 0 1 1 0
+ 11 0 90 1 6 8 0 1 2 0 103 100 0 1 2 0
+ 0 0 8 1 2 0 13 100 0 1 3 9 0 0 95 95
+ 1 3 9 0 0 8 8 1 2 9 0 0 97 1 2 9 0 0
+ 96 1 2 0 13 0 0 1 2 7 13 8 0 1 1 0 95
+ 0 1 1 0 13 0 15 0 0 0 10 2 0 0 0 0 1
+ 2 0 0 0 23 25 2 0 8 0 11 67 3 0 8 0
+ 11 8 1 2 0 0 0 11 1 2 0 0 0 23 1 2 7
+ 7 8 0 1 2 0 7 100 0 1 3 0 0 0 0 11 82
+ 1 0 0 0 20 1 3 99 0 1 1 0 0 95 1 1 0
+ 0 73 83 2 0 0 0 0 19 2 0 0 0 8 1 2 0
+ 0 8 0 1 1 8 29 0 31 1 0 0 8 1 2 0 13
+ 100 0 1 2 5 13 0 0 1 2 5 13 0 0 1 2 7
+ 13 0 0 17 2 5 13 0 0 1 2 5 13 0 0 18
+ 1 0 7 0 16)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp
index d4c195af..f49808e5 100644
--- a/src/algebra/strap/LIST.lsp
+++ b/src/algebra/strap/LIST.lsp
@@ -61,14 +61,14 @@
(APPEND |l| |t|))
(DEFUN |LIST;writeOMList| (|dev| |x| $)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 14))
- (SPADCALL |dev| "list1" "list" (|getShellEntry| $ 16))
+ (SEQ (SPADCALL |dev| (|getShellEntry| $ 16))
+ (SPADCALL |dev| "list1" "list" (|getShellEntry| $ 18))
(SEQ G190 (COND ((NULL (NOT (NULL |x|))) (GO G191)))
(SEQ (SPADCALL |dev| (|SPADfirst| |x|) 'NIL
- (|getShellEntry| $ 17))
+ (|getShellEntry| $ 21))
(EXIT (LETT |x| (CDR |x|) |LIST;writeOMList|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 18)))))
+ (EXIT (SPADCALL |dev| (|getShellEntry| $ 23)))))
(DEFUN |LIST;OMwrite;$S;6| (|x| $)
(PROG (|sp| |dev| |s|)
@@ -76,13 +76,13 @@
(SEQ (LETT |s| "" |LIST;OMwrite;$S;6|)
(LETT |sp| (OM-STRINGTOSTRINGPTR |s|) |LIST;OMwrite;$S;6|)
(LETT |dev|
- (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 20))
- (|getShellEntry| $ 21))
+ (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 25))
+ (|getShellEntry| $ 26))
|LIST;OMwrite;$S;6|)
- (SPADCALL |dev| (|getShellEntry| $ 22))
+ (SPADCALL |dev| (|getShellEntry| $ 27))
(|LIST;writeOMList| |dev| |x| $)
- (SPADCALL |dev| (|getShellEntry| $ 23))
- (SPADCALL |dev| (|getShellEntry| $ 24))
+ (SPADCALL |dev| (|getShellEntry| $ 28))
+ (SPADCALL |dev| (|getShellEntry| $ 29))
(LETT |s| (OM-STRINGPTRTOSTRING |sp|) |LIST;OMwrite;$S;6|)
(EXIT |s|)))))
@@ -92,41 +92,41 @@
(SEQ (LETT |s| "" |LIST;OMwrite;$BS;7|)
(LETT |sp| (OM-STRINGTOSTRINGPTR |s|) |LIST;OMwrite;$BS;7|)
(LETT |dev|
- (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 20))
- (|getShellEntry| $ 21))
+ (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 25))
+ (|getShellEntry| $ 26))
|LIST;OMwrite;$BS;7|)
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 22))))
+ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 27))))
(|LIST;writeOMList| |dev| |x| $)
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23))))
- (SPADCALL |dev| (|getShellEntry| $ 24))
+ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 28))))
+ (SPADCALL |dev| (|getShellEntry| $ 29))
(LETT |s| (OM-STRINGPTRTOSTRING |sp|) |LIST;OMwrite;$BS;7|)
(EXIT |s|)))))
(DEFUN |LIST;OMwrite;Omd$V;8| (|dev| |x| $)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 22))
+ (SEQ (SPADCALL |dev| (|getShellEntry| $ 27))
(|LIST;writeOMList| |dev| |x| $)
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 23)))))
+ (EXIT (SPADCALL |dev| (|getShellEntry| $ 28)))))
(DEFUN |LIST;OMwrite;Omd$BV;9| (|dev| |x| |wholeObj| $)
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 22))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 27))))
(|LIST;writeOMList| |dev| |x| $)
(EXIT (COND
- (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23)))))))
+ (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 28)))))))
(DEFUN |LIST;setUnion;3$;10| (|l1| |l2| $)
- (SPADCALL (SPADCALL |l1| |l2| (|getShellEntry| $ 29))
- (|getShellEntry| $ 30)))
+ (SPADCALL (SPADCALL |l1| |l2| (|getShellEntry| $ 34))
+ (|getShellEntry| $ 35)))
(DEFUN |LIST;setIntersection;3$;11| (|l1| |l2| $)
(PROG (|u|)
(RETURN
(SEQ (LETT |u| NIL |LIST;setIntersection;3$;11|)
- (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 30))
+ (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 35))
|LIST;setIntersection;3$;11|)
(SEQ G190 (COND ((NULL (NOT (NULL |l1|))) (GO G191)))
(SEQ (COND
((SPADCALL (|SPADfirst| |l1|) |l2|
- (|getShellEntry| $ 32))
+ (|getShellEntry| $ 39))
(LETT |u| (CONS (|SPADfirst| |l1|) |u|)
|LIST;setIntersection;3$;11|)))
(EXIT (LETT |l1| (CDR |l1|)
@@ -137,16 +137,16 @@
(DEFUN |LIST;setDifference;3$;12| (|l1| |l2| $)
(PROG (|l11| |lu|)
(RETURN
- (SEQ (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 30))
+ (SEQ (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 35))
|LIST;setDifference;3$;12|)
(LETT |lu| NIL |LIST;setDifference;3$;12|)
(SEQ G190 (COND ((NULL (NOT (NULL |l1|))) (GO G191)))
(SEQ (LETT |l11|
- (SPADCALL |l1| 1 (|getShellEntry| $ 35))
+ (SPADCALL |l1| 1 (|getShellEntry| $ 41))
|LIST;setDifference;3$;12|)
(COND
((NULL (SPADCALL |l11| |l2|
- (|getShellEntry| $ 32)))
+ (|getShellEntry| $ 39)))
(LETT |lu| (CONS |l11| |lu|)
|LIST;setDifference;3$;12|)))
(EXIT (LETT |l1| (CDR |l1|)
@@ -158,7 +158,7 @@
(PROG (#0=#:G1444 |a| #1=#:G1445)
(RETURN
(SEQ (SPADCALL
- (CONS (SPADCALL '|construct| (|getShellEntry| $ 39))
+ (CONS (SPADCALL '|construct| (|getShellEntry| $ 46))
(PROGN
(LETT #0# NIL |LIST;convert;$If;13|)
(SEQ (LETT |a| NIL |LIST;convert;$If;13|)
@@ -173,12 +173,12 @@
(SEQ (EXIT (LETT #0#
(CONS
(SPADCALL |a|
- (|getShellEntry| $ 40))
+ (|getShellEntry| $ 47))
#0#)
|LIST;convert;$If;13|)))
(LETT #1# (CDR #1#) |LIST;convert;$If;13|)
(GO G190) G191 (EXIT (NREVERSE0 #0#)))))
- (|getShellEntry| $ 42))))))
+ (|getShellEntry| $ 51))))))
(DEFUN |List| (#0=#:G1446)
(PROG ()
@@ -203,7 +203,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|List|))
(LETT |dv$| (LIST '|List| |dv$1|) . #0#)
- (LETT $ (|newShell| 61) . #0#)
+ (LETT $ (|newShell| 70) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -246,57 +246,60 @@
(COND
((|testBitVector| |pv$| 6)
(PROGN
- (|setShellEntry| $ 25
+ (|setShellEntry| $ 30
(CONS (|dispatchFunction| |LIST;OMwrite;$S;6|) $))
- (|setShellEntry| $ 26
+ (|setShellEntry| $ 31
(CONS (|dispatchFunction| |LIST;OMwrite;$BS;7|) $))
- (|setShellEntry| $ 27
+ (|setShellEntry| $ 32
(CONS (|dispatchFunction| |LIST;OMwrite;Omd$V;8|) $))
- (|setShellEntry| $ 28
+ (|setShellEntry| $ 33
(CONS (|dispatchFunction| |LIST;OMwrite;Omd$BV;9|) $)))))
(COND
((|testBitVector| |pv$| 8)
(PROGN
- (|setShellEntry| $ 31
+ (|setShellEntry| $ 36
(CONS (|dispatchFunction| |LIST;setUnion;3$;10|) $))
- (|setShellEntry| $ 33
+ (|setShellEntry| $ 40
(CONS (|dispatchFunction|
|LIST;setIntersection;3$;11|)
$))
- (|setShellEntry| $ 36
+ (|setShellEntry| $ 43
(CONS (|dispatchFunction| |LIST;setDifference;3$;12|)
$)))))
(COND
((|testBitVector| |pv$| 3)
- (|setShellEntry| $ 43
+ (|setShellEntry| $ 52
(CONS (|dispatchFunction| |LIST;convert;$If;13|) $))))
$))))
(MAKEPROP '|List| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL (|IndexedList| 6 (NRTEVAL 1))
- (|local| |#1|) |LIST;nil;$;1| (|Boolean|) |LIST;null;$B;2|
- |LIST;cons;S2$;3| |LIST;append;3$;4| (|Void|)
- (|OpenMathDevice|) (0 . |OMputApp|) (|String|)
- (5 . |OMputSymbol|) (12 . |OMwrite|) (19 . |OMputEndApp|)
- (|OpenMathEncoding|) (24 . |OMencodingXML|)
- (28 . |OMopenString|) (34 . |OMputObject|)
- (39 . |OMputEndObject|) (44 . |OMclose|) (49 . |OMwrite|)
- (54 . |OMwrite|) (60 . |OMwrite|) (66 . |OMwrite|)
- (73 . |concat|) (79 . |removeDuplicates|)
- (84 . |setUnion|) (90 . |member?|)
- (96 . |setIntersection|) (|Integer|) (102 . |elt|)
- (108 . |setDifference|) (|Symbol|) (|InputForm|)
- (114 . |convert|) (119 . |convert|) (|List| $)
- (124 . |convert|) (129 . |convert|) (|Mapping| 6 6 6)
- (|NonNegativeInteger|) (|List| 6) (|Equation| 6)
- (|List| 47) (|Mapping| 8 6) (|Mapping| 8 6 6)
- (|UniversalSegment| 34) '"last" '"rest" '"first" '"value"
- (|Mapping| 6 6) (|OutputForm|) (|SingleInteger|)
- (|List| 34) (|Union| 6 '"failed"))
- '#(|setUnion| 134 |setIntersection| 140 |setDifference| 146
- |removeDuplicates| 152 |null| 157 |nil| 162 |member?| 166
- |elt| 172 |convert| 178 |cons| 183 |concat| 189 |append|
- 195 |OMwrite| 201)
+ (|local| |#1|) (|Integer|) (0 . |One|) |LIST;nil;$;1|
+ (|Boolean|) |LIST;null;$B;2| |LIST;cons;S2$;3|
+ |LIST;append;3$;4| (|Void|) (|OpenMathDevice|)
+ (4 . |OMputApp|) (|String|) (9 . |OMputSymbol|)
+ (16 . |first|) (21 . |false|) (25 . |OMwrite|)
+ (32 . |rest|) (37 . |OMputEndApp|) (|OpenMathEncoding|)
+ (42 . |OMencodingXML|) (46 . |OMopenString|)
+ (52 . |OMputObject|) (57 . |OMputEndObject|)
+ (62 . |OMclose|) (67 . |OMwrite|) (72 . |OMwrite|)
+ (78 . |OMwrite|) (84 . |OMwrite|) (91 . |concat|)
+ (97 . |removeDuplicates|) (102 . |setUnion|)
+ (108 . |empty|) (112 . |empty?|) (117 . |member?|)
+ (123 . |setIntersection|) (129 . |elt|) (135 . |concat|)
+ (141 . |setDifference|) (|Symbol|) (|InputForm|)
+ (147 . |convert|) (152 . |convert|) (|List| 45)
+ (157 . |concat|) (|List| $) (163 . |convert|)
+ (168 . |convert|) (|Mapping| 6 6 6) (|NonNegativeInteger|)
+ (|List| 6) (|Equation| 6) (|List| 56) (|Mapping| 10 6)
+ (|Mapping| 10 6 6) (|UniversalSegment| 7) '"last" '"rest"
+ '"first" '"value" (|Mapping| 6 6) (|OutputForm|)
+ (|SingleInteger|) (|List| 7) (|Union| 6 '"failed"))
+ '#(|setUnion| 173 |setIntersection| 179 |setDifference| 185
+ |rest| 191 |removeDuplicates| 196 |null| 201 |nil| 206
+ |member?| 210 |first| 216 |empty?| 221 |empty| 226 |elt|
+ 230 |convert| 236 |cons| 241 |concat| 247 |append| 259
+ |OMwrite| 265)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
(CONS (|makeByteWordVec2| 6
'(0 0 0 0 0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4 6))
@@ -316,29 +319,33 @@
(|UnaryRecursiveAggregate| 6)
(|LinearAggregate| 6)
(|RecursiveAggregate| 6)
- (|IndexedAggregate| 34 6)
+ (|IndexedAggregate| 7 6)
(|Collection| 6)
(|HomogeneousAggregate| 6)
(|OrderedSet|) (|Aggregate|)
- (|EltableAggregate| 34 6) (|Evalable| 6)
- (|SetCategory|) (|Type|)
- (|Eltable| 34 6) (|InnerEvalable| 6 6)
- (|CoercibleTo| 57) (|ConvertibleTo| 38)
- (|BasicType|) (|OpenMath|))
- (|makeByteWordVec2| 43
- '(1 13 12 0 14 3 13 12 0 15 15 16 3 6
- 12 13 0 8 17 1 13 12 0 18 0 19 0 20 2
- 13 0 15 19 21 1 13 12 0 22 1 13 12 0
- 23 1 13 12 0 24 1 0 15 0 25 2 0 15 0
- 8 26 2 0 12 13 0 27 3 0 12 13 0 8 28
- 2 0 0 0 0 29 1 0 0 0 30 2 0 0 0 0 31
- 2 0 8 6 0 32 2 0 0 0 0 33 2 0 6 0 34
- 35 2 0 0 0 0 36 1 38 0 37 39 1 6 38 0
- 40 1 38 0 41 42 1 0 38 0 43 2 8 0 0 0
- 31 2 8 0 0 0 33 2 8 0 0 0 36 1 8 0 0
- 30 1 0 8 0 9 0 0 0 7 2 8 8 6 0 32 2 0
- 6 0 34 35 1 3 38 0 43 2 0 0 6 0 10 2
- 0 0 0 0 29 2 0 0 0 0 11 3 6 12 13 0 8
- 28 2 6 12 13 0 27 1 6 15 0 25 2 6 15
- 0 8 26)))))
+ (|EltableAggregate| 7 6) (|Evalable| 6)
+ (|SetCategory|) (|Type|) (|Eltable| 7 6)
+ (|InnerEvalable| 6 6) (|CoercibleTo| 66)
+ (|ConvertibleTo| 45) (|BasicType|)
+ (|OpenMath|))
+ (|makeByteWordVec2| 52
+ '(0 7 0 8 1 15 14 0 16 3 15 14 0 17 17
+ 18 1 0 6 0 19 0 10 0 20 3 6 14 15 0
+ 10 21 1 0 0 0 22 1 15 14 0 23 0 24 0
+ 25 2 15 0 17 24 26 1 15 14 0 27 1 15
+ 14 0 28 1 15 14 0 29 1 0 17 0 30 2 0
+ 17 0 10 31 2 0 14 15 0 32 3 0 14 15 0
+ 10 33 2 0 0 0 0 34 1 0 0 0 35 2 0 0 0
+ 0 36 0 0 0 37 1 0 10 0 38 2 0 10 6 0
+ 39 2 0 0 0 0 40 2 0 6 0 7 41 2 0 0 6
+ 0 42 2 0 0 0 0 43 1 45 0 44 46 1 6 45
+ 0 47 2 48 0 45 0 49 1 45 0 50 51 1 0
+ 45 0 52 2 8 0 0 0 36 2 8 0 0 0 40 2 8
+ 0 0 0 43 1 0 0 0 22 1 8 0 0 35 1 0 10
+ 0 11 0 0 0 9 2 8 10 6 0 39 1 0 6 0 19
+ 1 0 10 0 38 0 0 0 37 2 0 6 0 7 41 1 3
+ 45 0 52 2 0 0 6 0 12 2 0 0 6 0 42 2 0
+ 0 0 0 34 2 0 0 0 0 13 3 6 14 15 0 10
+ 33 2 6 14 15 0 32 1 6 17 0 30 2 6 17
+ 0 10 31)))))
'|lookupIncomplete|))
diff --git a/src/algebra/strap/LNAGG-.lsp b/src/algebra/strap/LNAGG-.lsp
index 6f6d374f..d140a5dc 100644
--- a/src/algebra/strap/LNAGG-.lsp
+++ b/src/algebra/strap/LNAGG-.lsp
@@ -41,19 +41,19 @@
('T (NOT (< (SPADCALL |a| (|getShellEntry| $ 10)) |i|)))))
(DEFUN |LNAGG-;concat;ASA;3| (|a| |x| $)
- (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 16))
- (|getShellEntry| $ 17)))
+ (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 20))
+ (|getShellEntry| $ 21)))
(DEFUN |LNAGG-;concat;S2A;4| (|x| |y| $)
- (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 16)) |y|
- (|getShellEntry| $ 17)))
+ (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 20)) |y|
+ (|getShellEntry| $ 21)))
(DEFUN |LNAGG-;insert;SAIA;5| (|x| |a| |i| $)
- (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 16)) |a| |i|
- (|getShellEntry| $ 20)))
+ (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 20)) |a| |i|
+ (|getShellEntry| $ 24)))
(DEFUN |LNAGG-;maxIndex;AI;6| (|l| $)
- (+ (- (SPADCALL |l| (|getShellEntry| $ 22)) 1)
+ (+ (- (SPADCALL |l| (|getShellEntry| $ 26)) 1)
(SPADCALL |l| (|getShellEntry| $ 9))))
(DEFUN |LinearAggregate&| (|#1| |#2|)
@@ -63,7 +63,7 @@
(LETT |dv$1| (|devaluate| |#1|) . #0=(|LinearAggregate&|))
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$| (LIST '|LinearAggregate&| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 25) . #0#)
+ (LETT $ (|newShell| 31) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -74,28 +74,31 @@
(|setShellEntry| $ 7 |#2|)
(COND
((|HasAttribute| |#1| '|finiteAggregate|)
- (|setShellEntry| $ 23
+ (|setShellEntry| $ 29
(CONS (|dispatchFunction| |LNAGG-;maxIndex;AI;6|) $))))
$))))
(MAKEPROP '|LinearAggregate&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|)
(|Integer|) (0 . |minIndex|) (5 . |maxIndex|) (|List| 8)
- |LNAGG-;indices;AL;1| (|Boolean|) |LNAGG-;index?;IAB;2|
- (|NonNegativeInteger|) (10 . |new|) (16 . |concat|)
+ |LNAGG-;indices;AL;1| (|Boolean|) (10 . <) (16 . |false|)
+ |LNAGG-;index?;IAB;2| (|NonNegativeInteger|) (20 . |One|)
+ (24 . |One|) (28 . |new|) (34 . |concat|)
|LNAGG-;concat;ASA;3| |LNAGG-;concat;S2A;4|
- (22 . |insert|) |LNAGG-;insert;SAIA;5| (29 . |#|)
- (34 . |maxIndex|) (|List| $))
- '#(|maxIndex| 39 |insert| 44 |indices| 51 |index?| 56
- |concat| 62)
+ (40 . |insert|) |LNAGG-;insert;SAIA;5| (47 . |#|) (52 . -)
+ (58 . +) (64 . |maxIndex|) (|List| $))
+ '#(|maxIndex| 69 |insert| 74 |indices| 81 |index?| 86
+ |concat| 92)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 23
- '(1 6 8 0 9 1 6 8 0 10 2 6 0 15 7 16 2
- 6 0 0 0 17 3 6 0 0 0 8 20 1 6 15 0 22
- 1 0 8 0 23 1 0 8 0 23 3 0 0 7 0 8 21
- 1 0 11 0 12 2 0 13 8 0 14 2 0 0 0 7
- 18 2 0 0 7 0 19)))))
+ (|makeByteWordVec2| 29
+ '(1 6 8 0 9 1 6 8 0 10 2 8 13 0 0 14 0
+ 13 0 15 0 17 0 18 0 8 0 19 2 6 0 17 7
+ 20 2 6 0 0 0 21 3 6 0 0 0 8 24 1 6 17
+ 0 26 2 8 0 0 0 27 2 8 0 0 0 28 1 0 8
+ 0 29 1 0 8 0 29 3 0 0 7 0 8 25 1 0 11
+ 0 12 2 0 13 8 0 16 2 0 0 0 7 22 2 0 0
+ 7 0 23)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp
index 380c9292..a1ad4e13 100644
--- a/src/algebra/strap/LSAGG-.lsp
+++ b/src/algebra/strap/LSAGG-.lsp
@@ -159,7 +159,7 @@
|LSAGG-;select!;M2A;5|)
(EXIT
(SPADCALL |y| |z|
- (|getShellEntry| $ 25))))))))
+ (|getShellEntry| $ 26))))))))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |x|)))))))))
@@ -169,7 +169,7 @@
(SEQ (COND
((SPADCALL |p| (|getShellEntry| $ 16)) |q|)
((SPADCALL |q| (|getShellEntry| $ 16)) |p|)
- ((SPADCALL |p| |q| (|getShellEntry| $ 28))
+ ((SPADCALL |p| |q| (|getShellEntry| $ 29))
(|error| "cannot merge a list into itself"))
('T
(SEQ (COND
@@ -210,7 +210,7 @@
|f|)
(SEQ
(SPADCALL |t| |p|
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 26))
(LETT |t| |p|
|LSAGG-;merge!;M3A;6|)
(EXIT
@@ -221,7 +221,7 @@
('T
(SEQ
(SPADCALL |t| |q|
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 26))
(LETT |t| |q|
|LSAGG-;merge!;M3A;6|)
(EXIT
@@ -234,13 +234,13 @@
(COND
((SPADCALL |p| (|getShellEntry| $ 16)) |q|)
('T |p|))
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 26))
(EXIT |r|))))))))
(DEFUN |LSAGG-;insert!;SAIA;7| (|s| |x| |i| $)
(PROG (|m| #0=#:G1465 |y| |z|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 31))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
|LSAGG-;insert!;SAIA;7|)
(EXIT (COND
((< |i| |m|) (|error| "index out of range"))
@@ -255,25 +255,25 @@
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 32))
+ (|getShellEntry| $ 38))
|LSAGG-;insert!;SAIA;7|)
(LETT |z|
(SPADCALL |y| (|getShellEntry| $ 17))
|LSAGG-;insert!;SAIA;7|)
(SPADCALL |y|
(SPADCALL |s| |z| (|getShellEntry| $ 14))
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 26))
(EXIT |x|)))))))))
(DEFUN |LSAGG-;insert!;2AIA;8| (|w| |x| |i| $)
(PROG (|m| #0=#:G1469 |y| |z|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 31))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
|LSAGG-;insert!;2AIA;8|)
(EXIT (COND
((< |i| |m|) (|error| "index out of range"))
((EQL |i| |m|)
- (SPADCALL |w| |x| (|getShellEntry| $ 34)))
+ (SPADCALL |w| |x| (|getShellEntry| $ 40)))
('T
(SEQ (LETT |y|
(SPADCALL |x|
@@ -283,13 +283,13 @@
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 32))
+ (|getShellEntry| $ 38))
|LSAGG-;insert!;2AIA;8|)
(LETT |z|
(SPADCALL |y| (|getShellEntry| $ 17))
|LSAGG-;insert!;2AIA;8|)
- (SPADCALL |y| |w| (|getShellEntry| $ 25))
- (SPADCALL |y| |z| (|getShellEntry| $ 34))
+ (SPADCALL |y| |w| (|getShellEntry| $ 26))
+ (SPADCALL |y| |z| (|getShellEntry| $ 40))
(EXIT |x|)))))))))
(DEFUN |LSAGG-;remove!;M2A;9| (|f| |x| $)
@@ -331,7 +331,7 @@
(SPADCALL |p|
(SPADCALL |q|
(|getShellEntry| $ 17))
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 26))
|LSAGG-;remove!;M2A;9|))
('T
(SEQ
@@ -348,7 +348,7 @@
(DEFUN |LSAGG-;delete!;AIA;10| (|x| |i| $)
(PROG (|m| #0=#:G1481 |y|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 31))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
|LSAGG-;delete!;AIA;10|)
(EXIT (COND
((< |i| |m|) (|error| "index out of range"))
@@ -363,29 +363,29 @@
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 32))
+ (|getShellEntry| $ 38))
|LSAGG-;delete!;AIA;10|)
(SPADCALL |y|
- (SPADCALL |y| 2 (|getShellEntry| $ 32))
- (|getShellEntry| $ 25))
+ (SPADCALL |y| 2 (|getShellEntry| $ 38))
+ (|getShellEntry| $ 26))
(EXIT |x|)))))))))
(DEFUN |LSAGG-;delete!;AUsA;11| (|x| |i| $)
(PROG (|l| |m| |h| #0=#:G1486 #1=#:G1487 |t| #2=#:G1488)
(RETURN
- (SEQ (LETT |l| (SPADCALL |i| (|getShellEntry| $ 39))
+ (SEQ (LETT |l| (SPADCALL |i| (|getShellEntry| $ 45))
|LSAGG-;delete!;AUsA;11|)
- (LETT |m| (SPADCALL |x| (|getShellEntry| $ 31))
+ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
|LSAGG-;delete!;AUsA;11|)
(EXIT (COND
((< |l| |m|) (|error| "index out of range"))
('T
(SEQ (LETT |h|
(COND
- ((SPADCALL |i| (|getShellEntry| $ 40))
- (SPADCALL |i| (|getShellEntry| $ 41)))
+ ((SPADCALL |i| (|getShellEntry| $ 46))
+ (SPADCALL |i| (|getShellEntry| $ 47)))
('T
- (SPADCALL |x| (|getShellEntry| $ 42))))
+ (SPADCALL |x| (|getShellEntry| $ 48))))
|LSAGG-;delete!;AUsA;11|)
(EXIT (COND
((< |h| |l|) |x|)
@@ -399,7 +399,7 @@
((< #0# 0) 'NIL)
('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 32)))
+ (|getShellEntry| $ 38)))
('T
(SEQ (LETT |t|
(SPADCALL |x|
@@ -412,7 +412,7 @@
('T 'T))
'(|NonNegativeInteger|)
#1#))
- (|getShellEntry| $ 32))
+ (|getShellEntry| $ 38))
|LSAGG-;delete!;AUsA;11|)
(SPADCALL |t|
(SPADCALL |t|
@@ -425,8 +425,8 @@
('T 'T))
'(|NonNegativeInteger|)
#2#))
- (|getShellEntry| $ 32))
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 38))
+ (|getShellEntry| $ 26))
(EXIT |x|)))))))))))))
(DEFUN |LSAGG-;find;MAU;12| (|f| |x| $)
@@ -450,7 +450,7 @@
(DEFUN |LSAGG-;position;MAI;13| (|f| |x| $)
(PROG (|k|)
(RETURN
- (SEQ (SEQ (LETT |k| (SPADCALL |x| (|getShellEntry| $ 31))
+ (SEQ (SEQ (LETT |k| (SPADCALL |x| (|getShellEntry| $ 32))
|LSAGG-;position;MAI;13|)
G190
(COND
@@ -469,7 +469,7 @@
G191 (EXIT NIL))
(EXIT (COND
((SPADCALL |x| (|getShellEntry| $ 16))
- (- (SPADCALL |x| (|getShellEntry| $ 31)) 1))
+ (- (SPADCALL |x| (|getShellEntry| $ 32)) 1))
('T |k|)))))))
(DEFUN |LSAGG-;mergeSort| (|f| |p| |n| $)
@@ -482,7 +482,7 @@
(SPADCALL (SPADCALL |p| (|getShellEntry| $ 17))
(|getShellEntry| $ 18))
(SPADCALL |p| (|getShellEntry| $ 18)) |f|)
- (LETT |p| (SPADCALL |p| (|getShellEntry| $ 47))
+ (LETT |p| (SPADCALL |p| (|getShellEntry| $ 56))
|LSAGG-;mergeSort|)))))
(EXIT (COND
((< |n| 3) |p|)
@@ -496,7 +496,7 @@
|LSAGG-;mergeSort|)
(LETT |q|
(SPADCALL |p| |l|
- (|getShellEntry| $ 48))
+ (|getShellEntry| $ 58))
|LSAGG-;mergeSort|)
(LETT |p| (|LSAGG-;mergeSort| |f| |p| |l| $)
|LSAGG-;mergeSort|)
@@ -574,7 +574,7 @@
((NULL (COND
((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL)
('T
- (SPADCALL |r| |a| (|getShellEntry| $ 51)))))
+ (SPADCALL |r| |a| (|getShellEntry| $ 62)))))
(GO G191)))
(SEQ (LETT |r|
(SPADCALL |r|
@@ -630,7 +630,7 @@
(SPADCALL |y| (|getShellEntry| $ 17))
|LSAGG-;map;M3A;19|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |z| (|getShellEntry| $ 47)))))))
+ (EXIT (SPADCALL |z| (|getShellEntry| $ 56)))))))
(DEFUN |LSAGG-;reverse!;2A;20| (|x| $)
(PROG (|z| |y|)
@@ -644,7 +644,7 @@
|x|)
('T
(SEQ (SPADCALL |x| (SPADCALL (|getShellEntry| $ 13))
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 26))
(SEQ G190
(COND
((NULL (NOT (SPADCALL |y|
@@ -654,7 +654,7 @@
(SPADCALL |y|
(|getShellEntry| $ 17))
|LSAGG-;reverse!;2A;20|)
- (SPADCALL |y| |x| (|getShellEntry| $ 25))
+ (SPADCALL |y| |x| (|getShellEntry| $ 26))
(LETT |x| |y| |LSAGG-;reverse!;2A;20|)
(EXIT (LETT |y| |z|
|LSAGG-;reverse!;2A;20|)))
@@ -673,7 +673,7 @@
(SEQ (COND
((EQL |k| 1000)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 56))
+ ((SPADCALL |x| (|getShellEntry| $ 70))
(EXIT (|error| "cyclic list"))))))
(LETT |y|
(SPADCALL
@@ -685,12 +685,12 @@
|LSAGG-;copy;2A;21|)))
(LETT |k| (QSADD1 |k|) |LSAGG-;copy;2A;21|) (GO G190)
G191 (EXIT NIL))
- (EXIT (SPADCALL |y| (|getShellEntry| $ 47)))))))
+ (EXIT (SPADCALL |y| (|getShellEntry| $ 56)))))))
(DEFUN |LSAGG-;copyInto!;2AIA;22| (|y| |x| |s| $)
(PROG (|m| #0=#:G1546 |z|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |y| (|getShellEntry| $ 31))
+ (SEQ (LETT |m| (SPADCALL |y| (|getShellEntry| $ 32))
|LSAGG-;copyInto!;2AIA;22|)
(EXIT (COND
((< |s| |m|) (|error| "index out of range"))
@@ -703,7 +703,7 @@
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 32))
+ (|getShellEntry| $ 38))
|LSAGG-;copyInto!;2AIA;22|)
(SEQ G190
(COND
@@ -719,7 +719,7 @@
(SEQ (SPADCALL |z|
(SPADCALL |x|
(|getShellEntry| $ 18))
- (|getShellEntry| $ 58))
+ (|getShellEntry| $ 72))
(LETT |x|
(SPADCALL |x|
(|getShellEntry| $ 17))
@@ -735,7 +735,7 @@
(DEFUN |LSAGG-;position;SA2I;23| (|w| |x| |s| $)
(PROG (|m| #0=#:G1553 |k|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 31))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
|LSAGG-;position;SA2I;23|)
(EXIT (COND
((< |s| |m|) (|error| "index out of range"))
@@ -748,7 +748,7 @@
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 32))
+ (|getShellEntry| $ 38))
|LSAGG-;position;SA2I;23|)
(SEQ (LETT |k| |s| |LSAGG-;position;SA2I;23|)
G190
@@ -761,7 +761,7 @@
(SPADCALL |w|
(SPADCALL |x|
(|getShellEntry| $ 18))
- (|getShellEntry| $ 51)))))
+ (|getShellEntry| $ 62)))))
(GO G191)))
(SEQ (EXIT
(LETT |x|
@@ -774,7 +774,7 @@
(EXIT (COND
((SPADCALL |x| (|getShellEntry| $ 16))
(- (SPADCALL |x|
- (|getShellEntry| $ 31))
+ (|getShellEntry| $ 32))
1))
('T |k|)))))))))))
@@ -794,8 +794,8 @@
(VECTOR $ |p|))
(SPADCALL |p|
(|getShellEntry| $ 17))
- (|getShellEntry| $ 62))
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 76))
+ (|getShellEntry| $ 26))
|LSAGG-;removeDuplicates!;2A;24|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |l|)))))
@@ -807,7 +807,7 @@
(PROGN
(SPADCALL |#1|
(SPADCALL (|getShellEntry| $$ 1) (|getShellEntry| $ 18))
- (|getShellEntry| $ 61))))))
+ (|getShellEntry| $ 75))))))
(DEFUN |LSAGG-;<;2AB;25| (|x| |y| $)
(PROG (#0=#:G1567)
@@ -829,7 +829,7 @@
(|getShellEntry| $ 18))
(SPADCALL |y|
(|getShellEntry| $ 18))
- (|getShellEntry| $ 51))
+ (|getShellEntry| $ 62))
(PROGN
(LETT #0#
(SPADCALL
@@ -837,7 +837,7 @@
(|getShellEntry| $ 18))
(SPADCALL |y|
(|getShellEntry| $ 18))
- (|getShellEntry| $ 64))
+ (|getShellEntry| $ 78))
|LSAGG-;<;2AB;25|)
(GO #0#)))
('T
@@ -866,7 +866,7 @@
(LETT |dv$1| (|devaluate| |#1|) . #0=(|ListAggregate&|))
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$| (LIST '|ListAggregate&| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 67) . #0#)
+ (LETT $ (|newShell| 81) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -875,21 +875,21 @@
(|setShellEntry| $ 7 |#2|)
(COND
((|HasCategory| |#2| '(|SetCategory|))
- (|setShellEntry| $ 52
+ (|setShellEntry| $ 63
(CONS (|dispatchFunction| |LSAGG-;reduce;MA3S;17|) $))))
(COND
((|HasCategory| |#2| '(|SetCategory|))
(PROGN
- (|setShellEntry| $ 60
+ (|setShellEntry| $ 74
(CONS (|dispatchFunction| |LSAGG-;position;SA2I;23|)
$))
- (|setShellEntry| $ 63
+ (|setShellEntry| $ 77
(CONS (|dispatchFunction|
|LSAGG-;removeDuplicates!;2A;24|)
$)))))
(COND
((|HasCategory| |#2| '(|OrderedSet|))
- (|setShellEntry| $ 65
+ (|setShellEntry| $ 79
(CONS (|dispatchFunction| |LSAGG-;<;2AB;25|) $))))
$))))
@@ -900,51 +900,60 @@
(9 . |concat|) |LSAGG-;list;SA;2| (15 . |empty?|)
(20 . |rest|) (25 . |first|) (|Mapping| 7 7 7)
(30 . |reduce|) |LSAGG-;reduce;MAS;3| (37 . |copy|)
- (42 . |merge!|) |LSAGG-;merge;M3A;4| (49 . |setrest!|)
- (|Mapping| 10 7) |LSAGG-;select!;M2A;5| (55 . |eq?|)
- |LSAGG-;merge!;M3A;6| (|Integer|) (61 . |minIndex|)
- (66 . |rest|) |LSAGG-;insert!;SAIA;7| (72 . |concat!|)
+ (42 . |merge!|) |LSAGG-;merge;M3A;4| (49 . |false|)
+ (53 . |setrest!|) (|Mapping| 10 7) |LSAGG-;select!;M2A;5|
+ (59 . |eq?|) |LSAGG-;merge!;M3A;6| (|Integer|)
+ (65 . |minIndex|) (70 . <) (76 . =) (82 . |One|)
+ (86 . |One|) (90 . -) (96 . |rest|)
+ |LSAGG-;insert!;SAIA;7| (102 . |concat!|)
|LSAGG-;insert!;2AIA;8| |LSAGG-;remove!;M2A;9|
- |LSAGG-;delete!;AIA;10| (|UniversalSegment| 30)
- (78 . |lo|) (83 . |hasHi|) (88 . |hi|) (93 . |maxIndex|)
- |LSAGG-;delete!;AUsA;11| (|Union| 7 '"failed")
- |LSAGG-;find;MAU;12| |LSAGG-;position;MAI;13|
- (98 . |reverse!|) (103 . |split!|) |LSAGG-;sorted?;MAB;15|
- |LSAGG-;reduce;MA2S;16| (109 . ~=) (115 . |reduce|)
+ |LSAGG-;delete!;AIA;10| (|UniversalSegment| 31)
+ (108 . |lo|) (113 . |hasHi|) (118 . |hi|)
+ (123 . |maxIndex|) (128 . +) |LSAGG-;delete!;AUsA;11|
+ (|Union| 7 '"failed") |LSAGG-;find;MAU;12|
+ (|SingleInteger|) (134 . |One|) |LSAGG-;position;MAI;13|
+ (138 . |reverse!|) (143 . |quo|) (149 . |split!|)
+ (155 . |true|) |LSAGG-;sorted?;MAB;15|
+ |LSAGG-;reduce;MA2S;16| (159 . ~=) (165 . |reduce|)
|LSAGG-;new;NniSA;18| |LSAGG-;map;M3A;19|
- |LSAGG-;reverse!;2A;20| (123 . |cyclic?|)
- |LSAGG-;copy;2A;21| (128 . |setfirst!|)
- |LSAGG-;copyInto!;2AIA;22| (134 . |position|) (141 . =)
- (147 . |remove!|) (153 . |removeDuplicates!|) (158 . <)
- (164 . <) (|Mapping| 7 7))
- '#(|sorted?| 170 |sort!| 176 |select!| 182 |reverse!| 188
- |removeDuplicates!| 193 |remove!| 198 |reduce| 204
- |position| 225 |new| 238 |merge!| 244 |merge| 251 |map|
- 258 |list| 265 |insert!| 270 |find| 284 |delete!| 290
- |copyInto!| 302 |copy| 309 < 314)
+ |LSAGG-;reverse!;2A;20| (173 . |Zero|) (177 . |Zero|)
+ (181 . =) (187 . |cyclic?|) |LSAGG-;copy;2A;21|
+ (192 . |setfirst!|) |LSAGG-;copyInto!;2AIA;22|
+ (198 . |position|) (205 . =) (211 . |remove!|)
+ (217 . |removeDuplicates!|) (222 . <) (228 . <)
+ (|Mapping| 7 7))
+ '#(|sorted?| 234 |sort!| 240 |select!| 246 |reverse!| 252
+ |removeDuplicates!| 257 |remove!| 262 |reduce| 268
+ |position| 289 |new| 302 |merge!| 308 |merge| 315 |map|
+ 322 |list| 329 |insert!| 334 |find| 348 |delete!| 354
+ |copyInto!| 366 |copy| 373 < 378)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 65
+ (|makeByteWordVec2| 79
'(1 6 8 0 9 0 6 0 13 2 6 0 7 0 14 1 6
10 0 16 1 6 0 0 17 1 6 7 0 18 3 6 7
19 0 7 20 1 6 0 0 22 3 6 0 11 0 0 23
- 2 6 0 0 0 25 2 6 10 0 0 28 1 6 30 0
- 31 2 6 0 0 8 32 2 6 0 0 0 34 1 38 30
- 0 39 1 38 10 0 40 1 38 30 0 41 1 6 30
- 0 42 1 6 0 0 47 2 6 0 0 30 48 2 7 10
- 0 0 51 4 0 7 19 0 7 7 52 1 6 10 0 56
- 2 6 7 0 7 58 3 0 30 7 0 30 60 2 7 10
- 0 0 61 2 6 0 26 0 62 1 0 0 0 63 2 7
- 10 0 0 64 2 0 10 0 0 65 2 0 10 11 0
- 49 2 0 0 11 0 12 2 0 0 26 0 27 1 0 0
- 0 55 1 0 0 0 63 2 0 0 26 0 36 3 0 7
- 19 0 7 50 4 0 7 19 0 7 7 52 2 0 7 19
- 0 21 2 0 30 26 0 46 3 0 30 7 0 30 60
- 2 0 0 8 7 53 3 0 0 11 0 0 29 3 0 0 11
- 0 0 24 3 0 0 19 0 0 54 1 0 0 7 15 3 0
- 0 7 0 30 33 3 0 0 0 0 30 35 2 0 44 26
- 0 45 2 0 0 0 38 43 2 0 0 0 30 37 3 0
- 0 0 0 30 59 1 0 0 0 57 2 0 10 0 0 65)))))
+ 0 10 0 25 2 6 0 0 0 26 2 6 10 0 0 29
+ 1 6 31 0 32 2 31 10 0 0 33 2 31 10 0
+ 0 34 0 8 0 35 0 31 0 36 2 31 0 0 0 37
+ 2 6 0 0 8 38 2 6 0 0 0 40 1 44 31 0
+ 45 1 44 10 0 46 1 44 31 0 47 1 6 31 0
+ 48 2 31 0 0 0 49 0 53 0 54 1 6 0 0 56
+ 2 31 0 0 0 57 2 6 0 0 31 58 0 10 0 59
+ 2 7 10 0 0 62 4 0 7 19 0 7 7 63 0 53
+ 0 67 0 8 0 68 2 8 10 0 0 69 1 6 10 0
+ 70 2 6 7 0 7 72 3 0 31 7 0 31 74 2 7
+ 10 0 0 75 2 6 0 27 0 76 1 0 0 0 77 2
+ 7 10 0 0 78 2 0 10 0 0 79 2 0 10 11 0
+ 60 2 0 0 11 0 12 2 0 0 27 0 28 1 0 0
+ 0 66 1 0 0 0 77 2 0 0 27 0 42 3 0 7
+ 19 0 7 61 4 0 7 19 0 7 7 63 2 0 7 19
+ 0 21 2 0 31 27 0 55 3 0 31 7 0 31 74
+ 2 0 0 8 7 64 3 0 0 11 0 0 30 3 0 0 11
+ 0 0 24 3 0 0 19 0 0 65 1 0 0 7 15 3 0
+ 0 7 0 31 39 3 0 0 0 0 31 41 2 0 51 27
+ 0 52 2 0 0 0 44 50 2 0 0 0 31 43 3 0
+ 0 0 0 31 73 1 0 0 0 71 2 0 10 0 0 79)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/MONOID-.lsp b/src/algebra/strap/MONOID-.lsp
index b4c3de53..3e5853ed 100644
--- a/src/algebra/strap/MONOID-.lsp
+++ b/src/algebra/strap/MONOID-.lsp
@@ -26,7 +26,7 @@
(DEFUN |MONOID-;**;SNniS;4| (|x| |n| $)
(COND
((ZEROP |n|) (|spadConstant| $ 7))
- ('T (SPADCALL |x| |n| (|getShellEntry| $ 17)))))
+ ('T (SPADCALL |x| |n| (|getShellEntry| $ 19)))))
(DEFUN |Monoid&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -34,7 +34,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|Monoid&|))
(LETT |dv$| (LIST '|Monoid&| |dv$1|) . #0#)
- (LETT $ (|newShell| 20) . #0#)
+ (LETT $ (|newShell| 21) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -46,15 +46,15 @@
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (0 . |One|)
(|Boolean|) (4 . =) |MONOID-;one?;SB;1|
|MONOID-;sample;S;2| (10 . |one?|) (|Union| $ '"failed")
- |MONOID-;recip;SU;3| (|PositiveInteger|)
- (|RepeatedSquaring| 6) (15 . |expt|)
- (|NonNegativeInteger|) |MONOID-;**;SNniS;4|)
- '#(|sample| 21 |recip| 25 |one?| 30 ** 35) 'NIL
+ |MONOID-;recip;SU;3| (|NonNegativeInteger|) (15 . |zero?|)
+ (|PositiveInteger|) (|RepeatedSquaring| 6) (20 . |expt|)
+ |MONOID-;**;SNniS;4|)
+ '#(|sample| 26 |recip| 30 |one?| 35 ** 40) 'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 19
- '(0 6 0 7 2 6 8 0 0 9 1 6 8 0 12 2 16 6
- 6 15 17 0 0 0 11 1 0 13 0 14 1 0 8 0
- 10 2 0 0 0 18 19)))))
+ (|makeByteWordVec2| 20
+ '(0 6 0 7 2 6 8 0 0 9 1 6 8 0 12 1 15 8
+ 0 16 2 18 6 6 17 19 0 0 0 11 1 0 13 0
+ 14 1 0 8 0 10 2 0 0 0 15 20)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp
index 34ec379e..bd82e49c 100644
--- a/src/algebra/strap/NNI.lsp
+++ b/src/algebra/strap/NNI.lsp
@@ -70,7 +70,7 @@
(PROGN
(LETT |dv$| '(|NonNegativeInteger|)
. #0=(|NonNegativeInteger|))
- (LETT $ (|newShell| 17) . #0#)
+ (LETT $ (|newShell| 23) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -80,17 +80,18 @@
$))))
(MAKEPROP '|NonNegativeInteger| '|infovec|
- (LIST '#(NIL NIL NIL NIL NIL (|Integer|) |NNI;sup;3$;1|
- |NNI;shift;$I$;2| (|Union| $ '"failed")
- |NNI;subtractIfCan;2$U;3|
+ (LIST '#(NIL NIL NIL NIL NIL (|Integer|) (0 . |Zero|) (4 . |Zero|)
+ (|Boolean|) (8 . <) (14 . |false|) (18 . |true|)
+ |NNI;sup;3$;1| |NNI;shift;$I$;2| (22 . -)
+ (|Union| $ '"failed") |NNI;subtractIfCan;2$U;3|
(|Record| (|:| |quotient| $) (|:| |remainder| $))
- (|PositiveInteger|) (|NonNegativeInteger|) (|Boolean|)
- (|String|) (|OutputForm|) (|SingleInteger|))
- '#(~= 0 |zero?| 6 |sup| 11 |subtractIfCan| 17 |shift| 23
- |sample| 29 |rem| 33 |recip| 39 |random| 44 |quo| 49
- |one?| 55 |min| 60 |max| 66 |latex| 72 |hash| 77 |gcd| 82
- |exquo| 88 |divide| 94 |coerce| 100 |Zero| 105 |One| 109
- >= 113 > 119 = 125 <= 131 < 137 + 143 ** 149 * 161)
+ (|PositiveInteger|) (|NonNegativeInteger|) (|String|)
+ (|OutputForm|) (|SingleInteger|))
+ '#(~= 28 |zero?| 34 |sup| 39 |subtractIfCan| 45 |shift| 51
+ |sample| 57 |rem| 61 |recip| 67 |random| 72 |quo| 77
+ |one?| 83 |min| 88 |max| 94 |latex| 100 |hash| 105 |gcd|
+ 110 |exquo| 116 |divide| 122 |coerce| 128 |Zero| 133 |One|
+ 137 >= 141 > 147 = 153 <= 159 < 165 + 171 ** 177 * 189)
'(((|commutative| "*") . 0))
(CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0))
(CONS '#(NIL NIL NIL NIL NIL |Monoid&| |AbelianMonoid&|
@@ -104,18 +105,20 @@
(|AbelianMonoid|) (|OrderedSet|)
(|SemiGroup|) (|AbelianSemiGroup|)
(|SetCategory|) (|BasicType|)
- (|CoercibleTo| 15))
- (|makeByteWordVec2| 16
- '(2 0 13 0 0 1 1 0 13 0 1 2 0 0 0 0 6 2
- 0 8 0 0 9 2 0 0 0 5 7 0 0 0 1 2 0 0 0
- 0 1 1 0 8 0 1 1 0 0 0 1 2 0 0 0 0 1 1
- 0 13 0 1 2 0 0 0 0 1 2 0 0 0 0 1 1 0
- 14 0 1 1 0 16 0 1 2 0 0 0 0 1 2 0 8 0
- 0 1 2 0 10 0 0 1 1 0 15 0 1 0 0 0 1 0
- 0 0 1 2 0 13 0 0 1 2 0 13 0 0 1 2 0
- 13 0 0 1 2 0 13 0 0 1 2 0 13 0 0 1 2
- 0 0 0 0 1 2 0 0 0 11 1 2 0 0 0 12 1 2
- 0 0 0 0 1 2 0 0 12 0 1 2 0 0 11 0 1)))))
+ (|CoercibleTo| 21))
+ (|makeByteWordVec2| 22
+ '(0 0 0 6 0 5 0 7 2 5 8 0 0 9 0 8 0 10
+ 0 8 0 11 2 5 0 0 0 14 2 0 8 0 0 1 1 0
+ 8 0 1 2 0 0 0 0 12 2 0 15 0 0 16 2 0
+ 0 0 5 13 0 0 0 1 2 0 0 0 0 1 1 0 15 0
+ 1 1 0 0 0 1 2 0 0 0 0 1 1 0 8 0 1 2 0
+ 0 0 0 1 2 0 0 0 0 1 1 0 20 0 1 1 0 22
+ 0 1 2 0 0 0 0 1 2 0 15 0 0 1 2 0 17 0
+ 0 1 1 0 21 0 1 0 0 0 6 0 0 0 1 2 0 8
+ 0 0 1 2 0 8 0 0 1 2 0 8 0 0 1 2 0 8 0
+ 0 1 2 0 8 0 0 1 2 0 0 0 0 1 2 0 0 0
+ 18 1 2 0 0 0 19 1 2 0 0 0 0 1 2 0 0
+ 19 0 1 2 0 0 18 0 1)))))
'|lookupComplete|))
(MAKEPROP '|NonNegativeInteger| 'NILADIC T)
diff --git a/src/algebra/strap/ORDRING-.lsp b/src/algebra/strap/ORDRING-.lsp
index c5eb9558..5a7d725e 100644
--- a/src/algebra/strap/ORDRING-.lsp
+++ b/src/algebra/strap/ORDRING-.lsp
@@ -22,16 +22,16 @@
(DEFUN |ORDRING-;sign;SI;3| (|x| $)
(COND
((SPADCALL |x| (|getShellEntry| $ 12)) 1)
- ((SPADCALL |x| (|getShellEntry| $ 13)) -1)
- ((SPADCALL |x| (|getShellEntry| $ 15)) 0)
+ ((SPADCALL |x| (|getShellEntry| $ 15)) -1)
+ ((SPADCALL |x| (|getShellEntry| $ 18)) 0)
('T (|error| "x satisfies neither positive?, negative? or zero?"))))
(DEFUN |ORDRING-;abs;2S;4| (|x| $)
(COND
((SPADCALL |x| (|getShellEntry| $ 12)) |x|)
- ((SPADCALL |x| (|getShellEntry| $ 13))
- (SPADCALL |x| (|getShellEntry| $ 18)))
- ((SPADCALL |x| (|getShellEntry| $ 15)) (|spadConstant| $ 7))
+ ((SPADCALL |x| (|getShellEntry| $ 15))
+ (SPADCALL |x| (|getShellEntry| $ 21)))
+ ((SPADCALL |x| (|getShellEntry| $ 18)) (|spadConstant| $ 7))
('T (|error| "x satisfies neither positive?, negative? or zero?"))))
(DEFUN |OrderedRing&| (|#1|)
@@ -40,7 +40,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|OrderedRing&|))
(LETT |dv$| (LIST '|OrderedRing&| |dv$1|) . #0#)
- (LETT $ (|newShell| 20) . #0#)
+ (LETT $ (|newShell| 23) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -51,16 +51,18 @@
(MAKEPROP '|OrderedRing&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (0 . |Zero|)
(|Boolean|) (4 . <) |ORDRING-;positive?;SB;1|
- |ORDRING-;negative?;SB;2| (10 . |positive?|)
- (15 . |negative?|) (20 . |One|) (24 . |zero?|) (|Integer|)
- |ORDRING-;sign;SI;3| (29 . -) |ORDRING-;abs;2S;4|)
- '#(|sign| 34 |positive?| 39 |negative?| 44 |abs| 49) 'NIL
+ |ORDRING-;negative?;SB;2| (10 . |positive?|) (|Integer|)
+ (15 . |One|) (19 . |negative?|) (24 . |One|) (28 . -)
+ (33 . |zero?|) (38 . |Zero|) |ORDRING-;sign;SI;3| (42 . -)
+ |ORDRING-;abs;2S;4|)
+ '#(|sign| 47 |positive?| 52 |negative?| 57 |abs| 62) 'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 19
- '(0 6 0 7 2 6 8 0 0 9 1 6 8 0 12 1 6 8
- 0 13 0 6 0 14 1 6 8 0 15 1 6 0 0 18 1
- 0 16 0 17 1 0 8 0 10 1 0 8 0 11 1 0 0
- 0 19)))))
+ (|makeByteWordVec2| 22
+ '(0 6 0 7 2 6 8 0 0 9 1 6 8 0 12 0 13 0
+ 14 1 6 8 0 15 0 6 0 16 1 13 0 0 17 1
+ 6 8 0 18 0 13 0 19 1 6 0 0 21 1 0 13
+ 0 20 1 0 8 0 10 1 0 8 0 11 1 0 0 0
+ 22)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp
index 964b4b9a..33f67b44 100644
--- a/src/algebra/strap/OUTFORM.lsp
+++ b/src/algebra/strap/OUTFORM.lsp
@@ -556,7 +556,7 @@
(SEQ (LETT |c| 'CONCATB |OUTFORM;blankSeparate;L$;35|)
(LETT |l1| NIL |OUTFORM;blankSeparate;L$;35|)
(SEQ (LETT |u| NIL |OUTFORM;blankSeparate;L$;35|)
- (LETT #0# (SPADCALL |l| (|getShellEntry| $ 55))
+ (LETT #0# (SPADCALL |l| (|getShellEntry| $ 64))
|OUTFORM;blankSeparate;L$;35|)
G190
(COND
@@ -570,7 +570,7 @@
((EQCAR |u| |c|)
(LETT |l1|
(SPADCALL (CDR |u|) |l1|
- (|getShellEntry| $ 56))
+ (|getShellEntry| $ 65))
|OUTFORM;blankSeparate;L$;35|))
('T
(LETT |l1| (CONS |u| |l1|)
@@ -606,18 +606,18 @@
(DEFUN |OUTFORM;scripts;$L$;46| (|a| |l| $)
(COND
- ((SPADCALL |l| (|getShellEntry| $ 68)) |a|)
- ((SPADCALL (SPADCALL |l| (|getShellEntry| $ 69))
- (|getShellEntry| $ 68))
- (|OUTFORM;sub;3$;42| |a| (SPADCALL |l| (|getShellEntry| $ 70)) $))
+ ((SPADCALL |l| (|getShellEntry| $ 77)) |a|)
+ ((SPADCALL (SPADCALL |l| (|getShellEntry| $ 78))
+ (|getShellEntry| $ 77))
+ (|OUTFORM;sub;3$;42| |a| (SPADCALL |l| (|getShellEntry| $ 79)) $))
('T (CONS 'SUPERSUB (CONS |a| |l|)))))
(DEFUN |OUTFORM;supersub;$L$;47| (|a| |l| $)
(SEQ (COND
- ((ODDP (SPADCALL |l| (|getShellEntry| $ 73)))
+ ((ODDP (SPADCALL |l| (|getShellEntry| $ 81)))
(LETT |l|
(SPADCALL |l| (LIST (|OUTFORM;empty;$;73| $))
- (|getShellEntry| $ 56))
+ (|getShellEntry| $ 65))
|OUTFORM;supersub;$L$;47|)))
(EXIT (CONS 'ALTSUPERSUB (CONS |a| |l|)))))
@@ -737,16 +737,16 @@
(DEFUN |OUTFORM;infix;$L$;77| (|a| |l| $)
(COND
- ((SPADCALL |l| (|getShellEntry| $ 68)) (|OUTFORM;empty;$;73| $))
- ((SPADCALL (SPADCALL |l| (|getShellEntry| $ 69))
- (|getShellEntry| $ 68))
- (SPADCALL |l| (|getShellEntry| $ 70)))
+ ((SPADCALL |l| (|getShellEntry| $ 77)) (|OUTFORM;empty;$;73| $))
+ ((SPADCALL (SPADCALL |l| (|getShellEntry| $ 78))
+ (|getShellEntry| $ 77))
+ (SPADCALL |l| (|getShellEntry| $ 79)))
((|OUTFORM;infix?;$B;74| |a| $) (CONS |a| |l|))
('T
(|OUTFORM;hconcat;L$;49|
- (LIST (SPADCALL |l| (|getShellEntry| $ 70)) |a|
+ (LIST (SPADCALL |l| (|getShellEntry| $ 79)) |a|
(|OUTFORM;infix;$L$;77| |a|
- (SPADCALL |l| (|getShellEntry| $ 69)) $))
+ (SPADCALL |l| (|getShellEntry| $ 78)) $))
$))))
(DEFUN |OUTFORM;infix;4$;78| (|a| |b| |c| $)
@@ -773,7 +773,7 @@
(RETURN
(SEQ (LETT |s|
(MAKE-FULL-CVEC |nn|
- (SPADCALL "." (|getShellEntry| $ 109)))
+ (SPADCALL "." (|getShellEntry| $ 120)))
|OUTFORM;dot;$Nni$;85|)
(EXIT (|OUTFORM;super;3$;43| |a| |s| $))))))
@@ -782,7 +782,7 @@
(RETURN
(SEQ (LETT |s|
(MAKE-FULL-CVEC |nn|
- (SPADCALL "," (|getShellEntry| $ 109)))
+ (SPADCALL "," (|getShellEntry| $ 120)))
|OUTFORM;prime;$Nni$;86|)
(EXIT (|OUTFORM;super;3$;43| |a| |s| $))))))
@@ -819,9 +819,9 @@
(PROG1 |nn|
(|check-subtype| (< 0 |nn|)
'(|PositiveInteger|) |nn|))
- (|getShellEntry| $ 124))
+ (|getShellEntry| $ 138))
|OUTFORM;differentiate;$Nni$;97|)
- (LETT |s| (SPADCALL |r| (|getShellEntry| $ 125))
+ (LETT |s| (SPADCALL |r| (|getShellEntry| $ 139))
|OUTFORM;differentiate;$Nni$;97|)
(EXIT (|OUTFORM;super;3$;43| |a|
(|OUTFORM;paren;2$;40| |s| $) $)))))))))
@@ -873,7 +873,7 @@
(RETURN
(PROGN
(LETT |dv$| '(|OutputForm|) . #0=(|OutputForm|))
- (LETT $ (|newShell| 137) . #0#)
+ (LETT $ (|newShell| 151) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -895,118 +895,127 @@
(9 . |concat|) (15 . |concat|) |OUTFORM;outputForm;S$;15|
|OUTFORM;width;$I;16| |OUTFORM;height;$I;17|
|OUTFORM;subHeight;$I;18| |OUTFORM;superHeight;$I;19|
- |OUTFORM;height;I;20| |OUTFORM;width;I;21|
- |OUTFORM;hspace;I$;29| |OUTFORM;hconcat;3$;48|
- |OUTFORM;center;$I$;22| |OUTFORM;left;$I$;23|
- |OUTFORM;right;$I$;24| |OUTFORM;center;2$;25|
- |OUTFORM;left;2$;26| |OUTFORM;right;2$;27|
- |OUTFORM;vspace;I$;28| |OUTFORM;vconcat;3$;50|
- |OUTFORM;rspace;2I$;30| (|List| $) (|List| 48)
- |OUTFORM;matrix;L$;31| |OUTFORM;pile;L$;32|
+ |OUTFORM;height;I;20| |OUTFORM;width;I;21| (21 . -)
+ (27 . |quo|) |OUTFORM;hspace;I$;29|
+ |OUTFORM;hconcat;3$;48| |OUTFORM;center;$I$;22|
+ |OUTFORM;left;$I$;23| |OUTFORM;right;$I$;24|
+ |OUTFORM;center;2$;25| |OUTFORM;left;2$;26|
+ |OUTFORM;right;2$;27| (|NonNegativeInteger|) (33 . |Zero|)
+ (37 . |Zero|) (41 . |Zero|) (45 . <) (51 . |One|)
+ (55 . |One|) |OUTFORM;vspace;I$;28|
+ |OUTFORM;vconcat;3$;50| |OUTFORM;rspace;2I$;30| (|List| $)
+ (|List| 57) |OUTFORM;matrix;L$;31| |OUTFORM;pile;L$;32|
|OUTFORM;commaSeparate;L$;33|
|OUTFORM;semicolonSeparate;L$;34| (|List| $$)
- (21 . |reverse|) (26 . |append|)
+ (59 . |reverse|) (64 . |append|)
|OUTFORM;blankSeparate;L$;35| |OUTFORM;brace;2$;36|
|OUTFORM;brace;L$;37| |OUTFORM;bracket;2$;38|
|OUTFORM;bracket;L$;39| |OUTFORM;paren;2$;40|
|OUTFORM;paren;L$;41| |OUTFORM;sub;3$;42|
|OUTFORM;super;3$;43| |OUTFORM;presub;3$;44|
- |OUTFORM;presuper;3$;45| (32 . |null|) (37 . |rest|)
- (42 . |first|) |OUTFORM;scripts;$L$;46|
- (|NonNegativeInteger|) (47 . |#|)
- |OUTFORM;supersub;$L$;47| |OUTFORM;hconcat;L$;49|
- |OUTFORM;vconcat;L$;51| |OUTFORM;~=;3$;52|
- |OUTFORM;<;3$;53| |OUTFORM;>;3$;54| |OUTFORM;<=;3$;55|
- |OUTFORM;>=;3$;56| |OUTFORM;+;3$;57| |OUTFORM;-;3$;58|
- |OUTFORM;-;2$;59| |OUTFORM;*;3$;60| |OUTFORM;/;3$;61|
- |OUTFORM;**;3$;62| |OUTFORM;div;3$;63| |OUTFORM;rem;3$;64|
- |OUTFORM;quo;3$;65| |OUTFORM;exquo;3$;66|
- |OUTFORM;and;3$;67| |OUTFORM;or;3$;68| |OUTFORM;not;2$;69|
+ |OUTFORM;presuper;3$;45| (70 . |null|) (75 . |rest|)
+ (80 . |first|) |OUTFORM;scripts;$L$;46| (85 . |#|)
+ (90 . |odd?|) |OUTFORM;supersub;$L$;47|
+ |OUTFORM;hconcat;L$;49| |OUTFORM;vconcat;L$;51|
+ |OUTFORM;~=;3$;52| |OUTFORM;<;3$;53| |OUTFORM;>;3$;54|
+ |OUTFORM;<=;3$;55| |OUTFORM;>=;3$;56| |OUTFORM;+;3$;57|
+ |OUTFORM;-;3$;58| |OUTFORM;-;2$;59| |OUTFORM;*;3$;60|
+ |OUTFORM;/;3$;61| |OUTFORM;**;3$;62| |OUTFORM;div;3$;63|
+ |OUTFORM;rem;3$;64| |OUTFORM;quo;3$;65|
+ |OUTFORM;exquo;3$;66| |OUTFORM;and;3$;67|
+ |OUTFORM;or;3$;68| |OUTFORM;not;2$;69|
|OUTFORM;SEGMENT;3$;70| |OUTFORM;SEGMENT;2$;71|
- |OUTFORM;binomial;3$;72| |OUTFORM;infix?;$B;74|
- |OUTFORM;elt;$L$;75| |OUTFORM;prefix;$L$;76|
- |OUTFORM;infix;$L$;77| |OUTFORM;infix;4$;78|
- |OUTFORM;postfix;3$;79| |OUTFORM;string;2$;80|
- |OUTFORM;quote;2$;81| |OUTFORM;overbar;2$;82|
- |OUTFORM;dot;2$;83| |OUTFORM;prime;2$;84| (52 . |char|)
+ |OUTFORM;binomial;3$;72| (95 . |false|) (99 . |true|)
+ |OUTFORM;infix?;$B;74| |OUTFORM;elt;$L$;75|
+ |OUTFORM;prefix;$L$;76| |OUTFORM;infix;$L$;77|
+ |OUTFORM;infix;4$;78| |OUTFORM;postfix;3$;79|
+ |OUTFORM;string;2$;80| |OUTFORM;quote;2$;81|
+ |OUTFORM;overbar;2$;82| |OUTFORM;dot;2$;83|
+ |OUTFORM;prime;2$;84| (103 . |char|) (108 . |new|)
|OUTFORM;dot;$Nni$;85| |OUTFORM;prime;$Nni$;86|
|OUTFORM;overlabel;3$;87| |OUTFORM;box;2$;88|
|OUTFORM;zag;3$;89| |OUTFORM;root;2$;90|
|OUTFORM;root;3$;91| |OUTFORM;over;3$;92|
|OUTFORM;slash;3$;93| |OUTFORM;assign;3$;94|
|OUTFORM;label;3$;95| |OUTFORM;rarrow;3$;96|
- (|PositiveInteger|) (|NumberFormats|) (57 . |FormatRoman|)
- (62 . |lowerCase|) |OUTFORM;differentiate;$Nni$;97|
+ (114 . |zero?|) (119 . <) (|PositiveInteger|)
+ (|NumberFormats|) (125 . |FormatRoman|)
+ (130 . |lowerCase|) |OUTFORM;differentiate;$Nni$;97|
|OUTFORM;sum;2$;98| |OUTFORM;sum;3$;99|
|OUTFORM;sum;4$;100| |OUTFORM;prod;2$;101|
|OUTFORM;prod;3$;102| |OUTFORM;prod;4$;103|
|OUTFORM;int;2$;104| |OUTFORM;int;3$;105|
|OUTFORM;int;4$;106| (|SingleInteger|))
- '#(~= 67 |zag| 79 |width| 85 |vspace| 94 |vconcat| 99
- |supersub| 110 |superHeight| 116 |super| 121 |sum| 127
- |subHeight| 145 |sub| 150 |string| 156 |slash| 161
- |semicolonSeparate| 167 |scripts| 172 |rspace| 178 |root|
- 184 |right| 195 |rem| 206 |rarrow| 212 |quote| 218 |quo|
- 223 |prod| 229 |print| 247 |prime| 252 |presuper| 263
- |presub| 269 |prefix| 275 |postfix| 281 |pile| 287 |paren|
- 292 |overlabel| 302 |overbar| 308 |over| 313 |outputForm|
- 319 |or| 339 |not| 345 |messagePrint| 350 |message| 355
- |matrix| 360 |left| 365 |latex| 376 |label| 381 |int| 387
- |infix?| 405 |infix| 410 |hspace| 423 |height| 428
- |hconcat| 437 |hash| 448 |exquo| 453 |empty| 459 |elt| 463
- |doubleFloatFormat| 469 |dot| 474 |div| 485
- |differentiate| 491 |commaSeparate| 497 |coerce| 502
- |center| 507 |bracket| 518 |brace| 528 |box| 538
- |blankSeparate| 543 |binomial| 548 |assign| 554 |and| 560
- SEGMENT 566 >= 577 > 583 = 589 <= 601 < 607 / 613 - 619 +
- 630 ** 636 * 642)
+ '#(~= 135 |zag| 147 |width| 153 |vspace| 162 |vconcat| 167
+ |supersub| 178 |superHeight| 184 |super| 189 |sum| 195
+ |subHeight| 213 |sub| 218 |string| 224 |slash| 229
+ |semicolonSeparate| 235 |scripts| 240 |rspace| 246 |root|
+ 252 |right| 263 |rem| 274 |rarrow| 280 |quote| 286 |quo|
+ 291 |prod| 297 |print| 315 |prime| 320 |presuper| 331
+ |presub| 337 |prefix| 343 |postfix| 349 |pile| 355 |paren|
+ 360 |overlabel| 370 |overbar| 376 |over| 381 |outputForm|
+ 387 |or| 407 |not| 413 |messagePrint| 418 |message| 423
+ |matrix| 428 |left| 433 |latex| 444 |label| 449 |int| 455
+ |infix?| 473 |infix| 478 |hspace| 491 |height| 496
+ |hconcat| 505 |hash| 516 |exquo| 521 |empty| 527 |elt| 531
+ |doubleFloatFormat| 537 |dot| 542 |div| 553
+ |differentiate| 559 |commaSeparate| 565 |coerce| 570
+ |center| 575 |bracket| 586 |brace| 596 |box| 606
+ |blankSeparate| 611 |binomial| 616 |assign| 622 |and| 628
+ SEGMENT 634 >= 645 > 651 = 657 <= 669 < 675 / 681 - 687 +
+ 698 ** 704 * 710)
'NIL
(CONS (|makeByteWordVec2| 1 '(0 0 0))
(CONS '#(|SetCategory&| |BasicType&| NIL)
(CONS '#((|SetCategory|) (|BasicType|)
(|CoercibleTo| 18))
- (|makeByteWordVec2| 136
+ (|makeByteWordVec2| 150
'(1 7 11 0 12 0 26 0 27 2 7 0 0 26 28 2
- 7 0 26 0 29 1 54 0 0 55 2 54 0 0 0 56
- 1 54 11 0 68 1 54 0 0 69 1 54 2 0 70
- 1 54 72 0 73 1 26 0 7 109 1 123 7 122
- 124 1 7 0 0 125 2 0 0 0 0 77 2 0 11 0
- 0 1 2 0 0 0 0 114 0 0 20 36 1 0 20 0
- 31 1 0 0 20 45 1 0 0 48 76 2 0 0 0 0
- 46 2 0 0 0 48 74 1 0 20 0 34 2 0 0 0
- 0 65 2 0 0 0 0 128 3 0 0 0 0 0 129 1
- 0 0 0 127 1 0 20 0 33 2 0 0 0 0 64 1
- 0 0 0 104 2 0 0 0 0 118 1 0 0 48 53 2
- 0 0 0 48 71 2 0 0 20 20 47 1 0 0 0
- 115 2 0 0 0 0 116 1 0 0 0 44 2 0 0 0
- 20 41 2 0 0 0 0 89 2 0 0 0 0 121 1 0
- 0 0 105 2 0 0 0 0 90 3 0 0 0 0 0 132
- 1 0 0 0 130 2 0 0 0 0 131 1 0 9 0 10
- 2 0 0 0 72 111 1 0 0 0 108 2 0 0 0 0
- 67 2 0 0 0 0 66 2 0 0 0 48 100 2 0 0
- 0 0 103 1 0 0 48 51 1 0 0 48 63 1 0 0
- 0 62 2 0 0 0 0 112 1 0 0 0 106 2 0 0
- 0 0 117 1 0 0 24 25 1 0 0 22 23 1 0 0
- 7 30 1 0 0 20 21 2 0 0 0 0 93 1 0 0 0
- 94 1 0 9 7 15 1 0 0 7 14 1 0 0 49 50
- 1 0 0 0 43 2 0 0 0 20 40 1 0 7 0 1 2
- 0 0 0 0 120 3 0 0 0 0 0 135 2 0 0 0 0
- 134 1 0 0 0 133 1 0 11 0 98 2 0 0 0
- 48 101 3 0 0 0 0 0 102 1 0 0 20 37 0
- 0 20 35 1 0 20 0 32 1 0 0 48 75 2 0 0
- 0 0 38 1 0 136 0 1 2 0 0 0 0 91 0 0 0
- 13 2 0 0 0 48 99 1 0 7 7 8 2 0 0 0 72
- 110 1 0 0 0 107 2 0 0 0 0 88 2 0 0 0
- 72 126 1 0 0 48 52 1 0 18 0 19 1 0 0
- 0 42 2 0 0 0 20 39 1 0 0 0 60 1 0 0
- 48 61 1 0 0 48 59 1 0 0 0 58 1 0 0 0
- 113 1 0 0 48 57 2 0 0 0 0 97 2 0 0 0
- 0 119 2 0 0 0 0 92 1 0 0 0 96 2 0 0 0
- 0 95 2 0 0 0 0 81 2 0 0 0 0 79 2 0 0
- 0 0 17 2 0 11 0 0 16 2 0 0 0 0 80 2 0
- 0 0 0 78 2 0 0 0 0 86 1 0 0 0 84 2 0
- 0 0 0 83 2 0 0 0 0 82 2 0 0 0 0 87 2
- 0 0 0 0 85)))))
+ 7 0 26 0 29 2 20 0 0 0 37 2 20 0 0 0
+ 38 0 47 0 48 0 20 0 49 0 24 0 50 2 20
+ 11 0 0 51 0 47 0 52 0 20 0 53 1 63 0
+ 0 64 2 63 0 0 0 65 1 63 11 0 77 1 63
+ 0 0 78 1 63 2 0 79 1 63 47 0 81 1 20
+ 11 0 82 0 11 0 107 0 11 0 108 1 26 0
+ 7 120 2 7 0 47 26 121 1 47 11 0 134 2
+ 47 11 0 0 135 1 137 7 136 138 1 7 0 0
+ 139 2 0 0 0 0 86 2 0 11 0 0 1 2 0 0 0
+ 0 126 0 0 20 36 1 0 20 0 31 1 0 0 20
+ 54 1 0 0 57 85 2 0 0 0 0 55 2 0 0 0
+ 57 83 1 0 20 0 34 2 0 0 0 0 74 2 0 0
+ 0 0 142 3 0 0 0 0 0 143 1 0 0 0 141 1
+ 0 20 0 33 2 0 0 0 0 73 1 0 0 0 115 2
+ 0 0 0 0 130 1 0 0 57 62 2 0 0 0 57 80
+ 2 0 0 20 20 56 1 0 0 0 127 2 0 0 0 0
+ 128 1 0 0 0 46 2 0 0 0 20 43 2 0 0 0
+ 0 98 2 0 0 0 0 133 1 0 0 0 116 2 0 0
+ 0 0 99 3 0 0 0 0 0 146 1 0 0 0 144 2
+ 0 0 0 0 145 1 0 9 0 10 2 0 0 0 47 123
+ 1 0 0 0 119 2 0 0 0 0 76 2 0 0 0 0 75
+ 2 0 0 0 57 111 2 0 0 0 0 114 1 0 0 57
+ 60 1 0 0 57 72 1 0 0 0 71 2 0 0 0 0
+ 124 1 0 0 0 117 2 0 0 0 0 129 1 0 0
+ 24 25 1 0 0 22 23 1 0 0 7 30 1 0 0 20
+ 21 2 0 0 0 0 102 1 0 0 0 103 1 0 9 7
+ 15 1 0 0 7 14 1 0 0 58 59 1 0 0 0 45
+ 2 0 0 0 20 42 1 0 7 0 1 2 0 0 0 0 132
+ 3 0 0 0 0 0 149 2 0 0 0 0 148 1 0 0 0
+ 147 1 0 11 0 109 2 0 0 0 57 112 3 0 0
+ 0 0 0 113 1 0 0 20 39 0 0 20 35 1 0
+ 20 0 32 1 0 0 57 84 2 0 0 0 0 40 1 0
+ 150 0 1 2 0 0 0 0 100 0 0 0 13 2 0 0
+ 0 57 110 1 0 7 7 8 2 0 0 0 47 122 1 0
+ 0 0 118 2 0 0 0 0 97 2 0 0 0 47 140 1
+ 0 0 57 61 1 0 18 0 19 1 0 0 0 44 2 0
+ 0 0 20 41 1 0 0 0 69 1 0 0 57 70 1 0
+ 0 57 68 1 0 0 0 67 1 0 0 0 125 1 0 0
+ 57 66 2 0 0 0 0 106 2 0 0 0 0 131 2 0
+ 0 0 0 101 1 0 0 0 105 2 0 0 0 0 104 2
+ 0 0 0 0 90 2 0 0 0 0 88 2 0 0 0 0 17
+ 2 0 11 0 0 16 2 0 0 0 0 89 2 0 0 0 0
+ 87 2 0 0 0 0 95 1 0 0 0 93 2 0 0 0 0
+ 92 2 0 0 0 0 91 2 0 0 0 0 96 2 0 0 0
+ 0 94)))))
'|lookupComplete|))
(MAKEPROP '|OutputForm| 'NILADIC T)
diff --git a/src/algebra/strap/PI.lsp b/src/algebra/strap/PI.lsp
index 6845dd67..4dc3184c 100644
--- a/src/algebra/strap/PI.lsp
+++ b/src/algebra/strap/PI.lsp
@@ -30,7 +30,7 @@
(RETURN
(PROGN
(LETT |dv$| '(|PositiveInteger|) . #0=(|PositiveInteger|))
- (LETT $ (|newShell| 12) . #0#)
+ (LETT $ (|newShell| 16) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -40,12 +40,13 @@
$))))
(MAKEPROP '|PositiveInteger| '|infovec|
- (LIST '#(NIL NIL NIL NIL NIL (|NonNegativeInteger|)
- (|PositiveInteger|) (|Boolean|) (|Union| $ '"failed")
+ (LIST '#(NIL NIL NIL NIL NIL (|NonNegativeInteger|) (0 . |Zero|)
+ (|Integer|) (4 . |Zero|) (|Boolean|) (8 . <)
+ (|PositiveInteger|) (|Union| $ '"failed")
(|SingleInteger|) (|String|) (|OutputForm|))
- '#(~= 0 |sample| 6 |recip| 10 |one?| 15 |min| 20 |max| 26
- |latex| 32 |hash| 37 |gcd| 42 |coerce| 48 |One| 53 >= 57 >
- 63 = 69 <= 75 < 81 + 87 ** 93 * 105)
+ '#(~= 14 |sample| 20 |recip| 24 |one?| 29 |min| 34 |max| 40
+ |latex| 46 |hash| 51 |gcd| 56 |coerce| 62 |One| 67 >= 71 >
+ 77 = 83 <= 89 < 95 + 101 ** 107 * 119)
'(((|commutative| "*") . 0))
(CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0))
(CONS '#(NIL |Monoid&| |OrderedSet&| |SemiGroup&|
@@ -54,15 +55,16 @@
(CONS '#((|OrderedAbelianSemiGroup|) (|Monoid|)
(|OrderedSet|) (|SemiGroup|)
(|AbelianSemiGroup|) (|SetCategory|)
- (|BasicType|) (|CoercibleTo| 11))
- (|makeByteWordVec2| 11
- '(2 0 7 0 0 1 0 0 0 1 1 0 8 0 1 1 0 7 0
- 1 2 0 0 0 0 1 2 0 0 0 0 1 1 0 10 0 1
- 1 0 9 0 1 2 0 0 0 0 1 1 0 11 0 1 0 0
- 0 1 2 0 7 0 0 1 2 0 7 0 0 1 2 0 7 0 0
- 1 2 0 7 0 0 1 2 0 7 0 0 1 2 0 0 0 0 1
- 2 0 0 0 6 1 2 0 0 0 5 1 2 0 0 0 0 1 2
- 0 0 6 0 1)))))
+ (|BasicType|) (|CoercibleTo| 15))
+ (|makeByteWordVec2| 15
+ '(0 5 0 6 0 7 0 8 2 5 9 0 0 10 2 0 9 0
+ 0 1 0 0 0 1 1 0 12 0 1 1 0 9 0 1 2 0
+ 0 0 0 1 2 0 0 0 0 1 1 0 14 0 1 1 0 13
+ 0 1 2 0 0 0 0 1 1 0 15 0 1 0 0 0 1 2
+ 0 9 0 0 1 2 0 9 0 0 1 2 0 9 0 0 1 2 0
+ 9 0 0 1 2 0 9 0 0 1 2 0 0 0 0 1 2 0 0
+ 0 11 1 2 0 0 0 5 1 2 0 0 0 0 1 2 0 0
+ 11 0 1)))))
'|lookupComplete|))
(MAKEPROP '|PositiveInteger| 'NILADIC T)
diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp
index d196bca2..c8d88782 100644
--- a/src/algebra/strap/POLYCAT-.lsp
+++ b/src/algebra/strap/POLYCAT-.lsp
@@ -164,8 +164,8 @@
((QEQCAR
(SPADCALL
(SPADCALL |e|
- (|getShellEntry| $ 11))
- (|getShellEntry| $ 13))
+ (|getShellEntry| $ 14))
+ (|getShellEntry| $ 16))
1)
(PROGN
(LETT #1#
@@ -195,8 +195,8 @@
(CONS
(SPADCALL
(SPADCALL |e|
- (|getShellEntry| $ 11))
- (|getShellEntry| $ 14))
+ (|getShellEntry| $ 14))
+ (|getShellEntry| $ 17))
#2#)
|POLYCAT-;eval;SLS;1|)))
(LETT #3# (CDR #3#)
@@ -223,14 +223,14 @@
(LETT #4#
(CONS
(SPADCALL |e|
- (|getShellEntry| $ 15))
+ (|getShellEntry| $ 18))
#4#)
|POLYCAT-;eval;SLS;1|)))
(LETT #5# (CDR #5#)
|POLYCAT-;eval;SLS;1|)
(GO G190) G191
(EXIT (NREVERSE0 #4#))))
- (|getShellEntry| $ 18))))))))))
+ (|getShellEntry| $ 21))))))))))
(DEFUN |POLYCAT-;monomials;SL;2| (|p| $)
(PROG (|ml|)
@@ -238,15 +238,15 @@
(SEQ (LETT |ml| NIL |POLYCAT-;monomials;SL;2|)
(SEQ G190
(COND
- ((NULL (SPADCALL |p| (|spadConstant| $ 22)
- (|getShellEntry| $ 25)))
+ ((NULL (SPADCALL |p| (|spadConstant| $ 27)
+ (|getShellEntry| $ 29)))
(GO G191)))
(SEQ (LETT |ml|
- (CONS (SPADCALL |p| (|getShellEntry| $ 26))
+ (CONS (SPADCALL |p| (|getShellEntry| $ 30))
|ml|)
|POLYCAT-;monomials;SL;2|)
(EXIT (LETT |p|
- (SPADCALL |p| (|getShellEntry| $ 27))
+ (SPADCALL |p| (|getShellEntry| $ 32))
|POLYCAT-;monomials;SL;2|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT (REVERSE |ml|))))))
@@ -255,7 +255,7 @@
(PROG (|l|)
(RETURN
(COND
- ((NULL (CDR (LETT |l| (SPADCALL |p| (|getShellEntry| $ 29))
+ ((NULL (CDR (LETT |l| (SPADCALL |p| (|getShellEntry| $ 35))
|POLYCAT-;isPlus;SU;3|)))
(CONS 1 "failed"))
('T (CONS 0 |l|))))))
@@ -265,9 +265,9 @@
(RETURN
(SEQ (COND
((OR (NULL (LETT |lv|
- (SPADCALL |p| (|getShellEntry| $ 32))
+ (SPADCALL |p| (|getShellEntry| $ 40))
|POLYCAT-;isTimes;SU;4|))
- (NULL (SPADCALL |p| (|getShellEntry| $ 33))))
+ (NULL (SPADCALL |p| (|getShellEntry| $ 42))))
(CONS 1 "failed"))
('T
(SEQ (LETT |l|
@@ -286,11 +286,11 @@
(SEQ (EXIT
(LETT #0#
(CONS
- (SPADCALL (|spadConstant| $ 34)
+ (SPADCALL (|spadConstant| $ 43)
|v|
(SPADCALL |p| |v|
- (|getShellEntry| $ 37))
- (|getShellEntry| $ 38))
+ (|getShellEntry| $ 46))
+ (|getShellEntry| $ 47))
#0#)
|POLYCAT-;isTimes;SU;4|)))
(LETT #1# (CDR #1#)
@@ -301,40 +301,40 @@
((SPADCALL
(LETT |r|
(SPADCALL |p|
- (|getShellEntry| $ 39))
+ (|getShellEntry| $ 48))
|POLYCAT-;isTimes;SU;4|)
- (|getShellEntry| $ 40))
+ (|getShellEntry| $ 49))
(COND
((NULL (CDR |lv|)) (CONS 1 "failed"))
('T (CONS 0 |l|))))
('T
(CONS 0
(CONS (SPADCALL |r|
- (|getShellEntry| $ 41))
+ (|getShellEntry| $ 51))
|l|))))))))))))
(DEFUN |POLYCAT-;isExpt;SU;5| (|p| $)
(PROG (|u| |d|)
(RETURN
- (SEQ (LETT |u| (SPADCALL |p| (|getShellEntry| $ 43))
+ (SEQ (LETT |u| (SPADCALL |p| (|getShellEntry| $ 53))
|POLYCAT-;isExpt;SU;5|)
(EXIT (COND
((OR (QEQCAR |u| 1)
(NULL (SPADCALL |p|
- (SPADCALL (|spadConstant| $ 34)
+ (SPADCALL (|spadConstant| $ 43)
(QCDR |u|)
(LETT |d|
(SPADCALL |p| (QCDR |u|)
- (|getShellEntry| $ 37))
+ (|getShellEntry| $ 46))
|POLYCAT-;isExpt;SU;5|)
- (|getShellEntry| $ 38))
- (|getShellEntry| $ 44))))
+ (|getShellEntry| $ 47))
+ (|getShellEntry| $ 54))))
(CONS 1 "failed"))
('T (CONS 0 (CONS (QCDR |u|) |d|)))))))))
(DEFUN |POLYCAT-;coefficient;SVarSetNniS;6| (|p| |v| |n| $)
- (SPADCALL (SPADCALL |p| |v| (|getShellEntry| $ 49)) |n|
- (|getShellEntry| $ 51)))
+ (SPADCALL (SPADCALL |p| |v| (|getShellEntry| $ 59)) |n|
+ (|getShellEntry| $ 61)))
(DEFUN |POLYCAT-;coefficient;SLLS;7| (|p| |lv| |ln| $)
(COND
@@ -346,9 +346,9 @@
('T
(SPADCALL
(SPADCALL
- (SPADCALL |p| (|SPADfirst| |lv|) (|getShellEntry| $ 49))
- (|SPADfirst| |ln|) (|getShellEntry| $ 51))
- (CDR |lv|) (CDR |ln|) (|getShellEntry| $ 54)))))
+ (SPADCALL |p| (|SPADfirst| |lv|) (|getShellEntry| $ 59))
+ (|SPADfirst| |ln|) (|getShellEntry| $ 61))
+ (CDR |lv|) (CDR |ln|) (|getShellEntry| $ 68)))))
(DEFUN |POLYCAT-;monomial;SLLS;8| (|p| |lv| |ln| $)
(COND
@@ -360,22 +360,22 @@
('T
(SPADCALL
(SPADCALL |p| (|SPADfirst| |lv|) (|SPADfirst| |ln|)
- (|getShellEntry| $ 38))
- (CDR |lv|) (CDR |ln|) (|getShellEntry| $ 56)))))
+ (|getShellEntry| $ 47))
+ (CDR |lv|) (CDR |ln|) (|getShellEntry| $ 70)))))
(DEFUN |POLYCAT-;retract;SVarSet;9| (|p| $)
(PROG (#0=#:G1479 |q|)
(RETURN
(SEQ (LETT |q|
- (PROG2 (LETT #0# (SPADCALL |p| (|getShellEntry| $ 43))
+ (PROG2 (LETT #0# (SPADCALL |p| (|getShellEntry| $ 53))
|POLYCAT-;retract;SVarSet;9|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) (|getShellEntry| $ 9)
#0#))
|POLYCAT-;retract;SVarSet;9|)
(EXIT (COND
- ((SPADCALL (SPADCALL |q| (|getShellEntry| $ 58)) |p|
- (|getShellEntry| $ 44))
+ ((SPADCALL (SPADCALL |q| (|getShellEntry| $ 72)) |p|
+ (|getShellEntry| $ 54))
|q|)
('T (|error| "Polynomial is not a single variable"))))))))
@@ -383,15 +383,15 @@
(PROG (|q| #0=#:G1487)
(RETURN
(SEQ (EXIT (SEQ (SEQ (LETT |q|
- (SPADCALL |p| (|getShellEntry| $ 43))
+ (SPADCALL |p| (|getShellEntry| $ 53))
|POLYCAT-;retractIfCan;SU;10|)
(EXIT (COND
((QEQCAR |q| 0)
(COND
((SPADCALL
(SPADCALL (QCDR |q|)
- (|getShellEntry| $ 58))
- |p| (|getShellEntry| $ 44))
+ (|getShellEntry| $ 72))
+ |p| (|getShellEntry| $ 54))
(PROGN
(LETT #0# |q|
|POLYCAT-;retractIfCan;SU;10|)
@@ -400,8 +400,8 @@
#0# (EXIT #0#)))))
(DEFUN |POLYCAT-;mkPrim| (|p| $)
- (SPADCALL (|spadConstant| $ 35) (SPADCALL |p| (|getShellEntry| $ 61))
- (|getShellEntry| $ 62)))
+ (SPADCALL (|spadConstant| $ 44) (SPADCALL |p| (|getShellEntry| $ 75))
+ (|getShellEntry| $ 76)))
(DEFUN |POLYCAT-;primitiveMonomials;SL;12| (|p| $)
(PROG (#0=#:G1697 |q| #1=#:G1698)
@@ -409,7 +409,7 @@
(SEQ (PROGN
(LETT #0# NIL |POLYCAT-;primitiveMonomials;SL;12|)
(SEQ (LETT |q| NIL |POLYCAT-;primitiveMonomials;SL;12|)
- (LETT #1# (SPADCALL |p| (|getShellEntry| $ 29))
+ (LETT #1# (SPADCALL |p| (|getShellEntry| $ 35))
|POLYCAT-;primitiveMonomials;SL;12|)
G190
(COND
@@ -430,38 +430,38 @@
(PROG (#0=#:G1493 |d| |u|)
(RETURN
(SEQ (COND
- ((SPADCALL |p| (|getShellEntry| $ 64)) 0)
+ ((SPADCALL |p| (|getShellEntry| $ 78)) 0)
('T
(SEQ (LETT |u|
(SPADCALL |p|
(PROG2 (LETT #0#
(SPADCALL |p|
- (|getShellEntry| $ 43))
+ (|getShellEntry| $ 53))
|POLYCAT-;totalDegree;SNni;13|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
(|getShellEntry| $ 9) #0#))
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 59))
|POLYCAT-;totalDegree;SNni;13|)
(LETT |d| 0 |POLYCAT-;totalDegree;SNni;13|)
(SEQ G190
(COND
- ((NULL (SPADCALL |u| (|spadConstant| $ 65)
- (|getShellEntry| $ 66)))
+ ((NULL (SPADCALL |u| (|spadConstant| $ 80)
+ (|getShellEntry| $ 81)))
(GO G191)))
(SEQ (LETT |d|
(MAX |d|
(+
(SPADCALL |u|
- (|getShellEntry| $ 67))
+ (|getShellEntry| $ 82))
(SPADCALL
(SPADCALL |u|
- (|getShellEntry| $ 68))
- (|getShellEntry| $ 69))))
+ (|getShellEntry| $ 83))
+ (|getShellEntry| $ 84))))
|POLYCAT-;totalDegree;SNni;13|)
(EXIT (LETT |u|
(SPADCALL |u|
- (|getShellEntry| $ 70))
+ (|getShellEntry| $ 87))
|POLYCAT-;totalDegree;SNni;13|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |d|))))))))
@@ -470,7 +470,7 @@
(PROG (#0=#:G1501 |v| |w| |d| |u|)
(RETURN
(SEQ (COND
- ((SPADCALL |p| (|getShellEntry| $ 64)) 0)
+ ((SPADCALL |p| (|getShellEntry| $ 78)) 0)
('T
(SEQ (LETT |u|
(SPADCALL |p|
@@ -478,50 +478,50 @@
(PROG2
(LETT #0#
(SPADCALL |p|
- (|getShellEntry| $ 43))
+ (|getShellEntry| $ 53))
|POLYCAT-;totalDegree;SLNni;14|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
(|getShellEntry| $ 9) #0#))
|POLYCAT-;totalDegree;SLNni;14|)
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 59))
|POLYCAT-;totalDegree;SLNni;14|)
(LETT |d| 0 |POLYCAT-;totalDegree;SLNni;14|)
(LETT |w| 0 |POLYCAT-;totalDegree;SLNni;14|)
(COND
- ((SPADCALL |v| |lv| (|getShellEntry| $ 72))
+ ((SPADCALL |v| |lv| (|getShellEntry| $ 89))
(LETT |w| 1 |POLYCAT-;totalDegree;SLNni;14|)))
(SEQ G190
(COND
- ((NULL (SPADCALL |u| (|spadConstant| $ 65)
- (|getShellEntry| $ 66)))
+ ((NULL (SPADCALL |u| (|spadConstant| $ 80)
+ (|getShellEntry| $ 81)))
(GO G191)))
(SEQ (LETT |d|
(MAX |d|
(+
(* |w|
(SPADCALL |u|
- (|getShellEntry| $ 67)))
+ (|getShellEntry| $ 82)))
(SPADCALL
(SPADCALL |u|
- (|getShellEntry| $ 68))
- |lv| (|getShellEntry| $ 73))))
+ (|getShellEntry| $ 83))
+ |lv| (|getShellEntry| $ 92))))
|POLYCAT-;totalDegree;SLNni;14|)
(EXIT (LETT |u|
(SPADCALL |u|
- (|getShellEntry| $ 70))
+ (|getShellEntry| $ 87))
|POLYCAT-;totalDegree;SLNni;14|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |d|))))))))
(DEFUN |POLYCAT-;resultant;2SVarSetS;15| (|p1| |p2| |mvar| $)
- (SPADCALL (SPADCALL |p1| |mvar| (|getShellEntry| $ 49))
- (SPADCALL |p2| |mvar| (|getShellEntry| $ 49))
- (|getShellEntry| $ 75)))
+ (SPADCALL (SPADCALL |p1| |mvar| (|getShellEntry| $ 59))
+ (SPADCALL |p2| |mvar| (|getShellEntry| $ 59))
+ (|getShellEntry| $ 94)))
(DEFUN |POLYCAT-;discriminant;SVarSetS;16| (|p| |var| $)
- (SPADCALL (SPADCALL |p| |var| (|getShellEntry| $ 49))
- (|getShellEntry| $ 77)))
+ (SPADCALL (SPADCALL |p| |var| (|getShellEntry| $ 59))
+ (|getShellEntry| $ 96)))
(DEFUN |POLYCAT-;allMonoms| (|l| $)
(PROG (#0=#:G1699 |p| #1=#:G1700)
@@ -542,24 +542,24 @@
(SEQ (EXIT (LETT #0#
(CONS
(SPADCALL |p|
- (|getShellEntry| $ 79))
+ (|getShellEntry| $ 98))
#0#)
|POLYCAT-;allMonoms|)))
(LETT #1# (CDR #1#) |POLYCAT-;allMonoms|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 81))
- (|getShellEntry| $ 82))))))
+ (|getShellEntry| $ 99))
+ (|getShellEntry| $ 100))))))
(DEFUN |POLYCAT-;P2R| (|p| |b| |n| $)
(PROG (|w| |bj| #0=#:G1702 |i| #1=#:G1701)
(RETURN
(SEQ (LETT |w|
- (SPADCALL |n| (|spadConstant| $ 23)
- (|getShellEntry| $ 84))
+ (SPADCALL |n| (|spadConstant| $ 28)
+ (|getShellEntry| $ 102))
|POLYCAT-;P2R|)
(SEQ (LETT |bj| NIL |POLYCAT-;P2R|)
(LETT #0# |b| |POLYCAT-;P2R|)
- (LETT |i| (SPADCALL |w| (|getShellEntry| $ 86))
+ (LETT |i| (SPADCALL |w| (|getShellEntry| $ 104))
|POLYCAT-;P2R|)
(LETT #1# (QVSIZE |w|) |POLYCAT-;P2R|) G190
(COND
@@ -570,8 +570,8 @@
(GO G191)))
(SEQ (EXIT (SPADCALL |w| |i|
(SPADCALL |p| |bj|
- (|getShellEntry| $ 87))
- (|getShellEntry| $ 88))))
+ (|getShellEntry| $ 106))
+ (|getShellEntry| $ 107))))
(LETT |i|
(PROG1 (+ |i| 1)
(LETT #0# (CDR #0#) |POLYCAT-;P2R|))
@@ -616,7 +616,7 @@
(LETT #2#
(CONS
(SPADCALL |p| |bj|
- (|getShellEntry| $ 87))
+ (|getShellEntry| $ 106))
#2#)
|POLYCAT-;eq2R|)))
(LETT #3# (CDR #3#)
@@ -627,13 +627,13 @@
|POLYCAT-;eq2R|)))
(LETT #1# (CDR #1#) |POLYCAT-;eq2R|) (GO G190)
G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 92))))))
+ (|getShellEntry| $ 111))))))
(DEFUN |POLYCAT-;reducedSystem;MM;20| (|m| $)
(PROG (#0=#:G1707 |r| #1=#:G1708 |b| #2=#:G1709 |bj| #3=#:G1710 |d|
|mm| |l|)
(RETURN
- (SEQ (LETT |l| (SPADCALL |m| (|getShellEntry| $ 95))
+ (SEQ (LETT |l| (SPADCALL |m| (|getShellEntry| $ 114))
|POLYCAT-;reducedSystem;MM;20|)
(LETT |b|
(SPADCALL
@@ -662,8 +662,8 @@
(LETT #1# (CDR #1#)
|POLYCAT-;reducedSystem;MM;20|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 81))
- (|getShellEntry| $ 82))
+ (|getShellEntry| $ 99))
+ (|getShellEntry| $ 100))
|POLYCAT-;reducedSystem;MM;20|)
(LETT |d|
(PROGN
@@ -681,7 +681,7 @@
(SEQ (EXIT (LETT #2#
(CONS
(SPADCALL |bj|
- (|getShellEntry| $ 61))
+ (|getShellEntry| $ 75))
#2#)
|POLYCAT-;reducedSystem;MM;20|)))
(LETT #3# (CDR #3#)
@@ -696,7 +696,7 @@
(SPADCALL |mm|
(|POLYCAT-;eq2R| (|SPADfirst| |l|) |d|
$)
- (|getShellEntry| $ 96))
+ (|getShellEntry| $ 118))
|POLYCAT-;reducedSystem;MM;20|)
(EXIT (LETT |l| (CDR |l|)
|POLYCAT-;reducedSystem;MM;20|)))
@@ -707,9 +707,9 @@
(PROG (#0=#:G1711 |s| #1=#:G1712 |b| #2=#:G1713 |bj| #3=#:G1714 |d|
|n| |mm| |w| |l| |r|)
(RETURN
- (SEQ (LETT |l| (SPADCALL |m| (|getShellEntry| $ 95))
+ (SEQ (LETT |l| (SPADCALL |m| (|getShellEntry| $ 114))
|POLYCAT-;reducedSystem;MVR;21|)
- (LETT |r| (SPADCALL |v| (|getShellEntry| $ 100))
+ (LETT |r| (SPADCALL |v| (|getShellEntry| $ 122))
|POLYCAT-;reducedSystem;MVR;21|)
(LETT |b|
(SPADCALL
@@ -741,9 +741,9 @@
|POLYCAT-;reducedSystem;MVR;21|)
(GO G190) G191
(EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 81))
- (|getShellEntry| $ 101))
- (|getShellEntry| $ 82))
+ (|getShellEntry| $ 99))
+ (|getShellEntry| $ 123))
+ (|getShellEntry| $ 100))
|POLYCAT-;reducedSystem;MVR;21|)
(LETT |d|
(PROGN
@@ -761,7 +761,7 @@
(SEQ (EXIT (LETT #2#
(CONS
(SPADCALL |bj|
- (|getShellEntry| $ 61))
+ (|getShellEntry| $ 75))
#2#)
|POLYCAT-;reducedSystem;MVR;21|)))
(LETT #3# (CDR #3#)
@@ -780,13 +780,13 @@
(SPADCALL |mm|
(|POLYCAT-;eq2R| (|SPADfirst| |l|) |d|
$)
- (|getShellEntry| $ 96))
+ (|getShellEntry| $ 118))
|POLYCAT-;reducedSystem;MVR;21|)
(LETT |w|
(SPADCALL |w|
(|POLYCAT-;P2R| (|SPADfirst| |r|) |d|
|n| $)
- (|getShellEntry| $ 102))
+ (|getShellEntry| $ 127))
|POLYCAT-;reducedSystem;MVR;21|)
(LETT |l| (CDR |l|)
|POLYCAT-;reducedSystem;MVR;21|)
@@ -796,36 +796,36 @@
(EXIT (CONS |mm| |w|))))))
(DEFUN |POLYCAT-;gcdPolynomial;3Sup;22| (|pp| |qq| $)
- (SPADCALL |pp| |qq| (|getShellEntry| $ 107)))
+ (SPADCALL |pp| |qq| (|getShellEntry| $ 132)))
(DEFUN |POLYCAT-;solveLinearPolynomialEquation;LSupU;23| (|lpp| |pp| $)
- (SPADCALL |lpp| |pp| (|getShellEntry| $ 112)))
+ (SPADCALL |lpp| |pp| (|getShellEntry| $ 137)))
(DEFUN |POLYCAT-;factorPolynomial;SupF;24| (|pp| $)
- (SPADCALL |pp| (|getShellEntry| $ 117)))
+ (SPADCALL |pp| (|getShellEntry| $ 142)))
(DEFUN |POLYCAT-;factorSquareFreePolynomial;SupF;25| (|pp| $)
- (SPADCALL |pp| (|getShellEntry| $ 120)))
+ (SPADCALL |pp| (|getShellEntry| $ 145)))
(DEFUN |POLYCAT-;factor;SF;26| (|p| $)
(PROG (|v| |ansR| #0=#:G1715 |w| #1=#:G1716 |up| |ansSUP| #2=#:G1717
|ww| #3=#:G1718)
(RETURN
- (SEQ (LETT |v| (SPADCALL |p| (|getShellEntry| $ 43))
+ (SEQ (LETT |v| (SPADCALL |p| (|getShellEntry| $ 53))
|POLYCAT-;factor;SF;26|)
(EXIT (COND
((QEQCAR |v| 1)
(SEQ (LETT |ansR|
(SPADCALL
(SPADCALL |p|
- (|getShellEntry| $ 39))
- (|getShellEntry| $ 123))
+ (|getShellEntry| $ 48))
+ (|getShellEntry| $ 148))
|POLYCAT-;factor;SF;26|)
(EXIT (SPADCALL
(SPADCALL
(SPADCALL |ansR|
- (|getShellEntry| $ 125))
- (|getShellEntry| $ 41))
+ (|getShellEntry| $ 150))
+ (|getShellEntry| $ 51))
(PROGN
(LETT #0# NIL
|POLYCAT-;factor;SF;26|)
@@ -834,7 +834,7 @@
|POLYCAT-;factor;SF;26|)
(LETT #1#
(SPADCALL |ansR|
- (|getShellEntry| $ 129))
+ (|getShellEntry| $ 154))
|POLYCAT-;factor;SF;26|)
G190
(COND
@@ -850,7 +850,7 @@
(CONS
(VECTOR (QVELT |w| 0)
(SPADCALL (QVELT |w| 1)
- (|getShellEntry| $ 41))
+ (|getShellEntry| $ 51))
(QVELT |w| 2))
#0#)
|POLYCAT-;factor;SF;26|)))
@@ -858,20 +858,20 @@
|POLYCAT-;factor;SF;26|)
(GO G190) G191
(EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 133)))))
+ (|getShellEntry| $ 158)))))
('T
(SEQ (LETT |up|
(SPADCALL |p| (QCDR |v|)
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 59))
|POLYCAT-;factor;SF;26|)
(LETT |ansSUP|
- (SPADCALL |up| (|getShellEntry| $ 117))
+ (SPADCALL |up| (|getShellEntry| $ 142))
|POLYCAT-;factor;SF;26|)
(EXIT (SPADCALL
(SPADCALL
(SPADCALL |ansSUP|
- (|getShellEntry| $ 134))
- (QCDR |v|) (|getShellEntry| $ 135))
+ (|getShellEntry| $ 159))
+ (QCDR |v|) (|getShellEntry| $ 160))
(PROGN
(LETT #2# NIL
|POLYCAT-;factor;SF;26|)
@@ -880,7 +880,7 @@
|POLYCAT-;factor;SF;26|)
(LETT #3#
(SPADCALL |ansSUP|
- (|getShellEntry| $ 138))
+ (|getShellEntry| $ 163))
|POLYCAT-;factor;SF;26|)
G190
(COND
@@ -897,7 +897,7 @@
(VECTOR (QVELT |ww| 0)
(SPADCALL (QVELT |ww| 1)
(QCDR |v|)
- (|getShellEntry| $ 135))
+ (|getShellEntry| $ 160))
(QVELT |ww| 2))
#2#)
|POLYCAT-;factor;SF;26|)))
@@ -905,7 +905,7 @@
|POLYCAT-;factor;SF;26|)
(GO G190) G191
(EXIT (NREVERSE0 #2#))))
- (|getShellEntry| $ 133)))))))))))
+ (|getShellEntry| $ 158)))))))))))
(DEFUN |POLYCAT-;conditionP;MU;27| (|mat| $)
(PROG (|ll| #0=#:G1719 |z| #1=#:G1720 |ch| |l| #2=#:G1721 #3=#:G1722
@@ -919,8 +919,8 @@
(SEQ (EXIT (SEQ (LETT |ll|
(SPADCALL
(SPADCALL |mat|
- (|getShellEntry| $ 140))
- (|getShellEntry| $ 95))
+ (|getShellEntry| $ 165))
+ (|getShellEntry| $ 114))
|POLYCAT-;conditionP;MU;27|)
(LETT |llR|
(PROGN
@@ -948,7 +948,7 @@
(EXIT (NREVERSE0 #0#))))
|POLYCAT-;conditionP;MU;27|)
(LETT |monslist| NIL |POLYCAT-;conditionP;MU;27|)
- (LETT |ch| (SPADCALL (|getShellEntry| $ 141))
+ (LETT |ch| (|spadConstant| $ 168)
|POLYCAT-;conditionP;MU;27|)
(SEQ (LETT |l| NIL |POLYCAT-;conditionP;MU;27|)
(LETT #2# |ll| |POLYCAT-;conditionP;MU;27|)
@@ -982,14 +982,14 @@
(PROGN
(LETT #4#
(SPADCALL |u|
- (|getShellEntry| $ 79))
+ (|getShellEntry| $ 98))
|POLYCAT-;conditionP;MU;27|)
(COND
(#6#
(LETT #5#
(SPADCALL #5# #4#
(|getShellEntry| $
- 142))
+ 169))
|POLYCAT-;conditionP;MU;27|))
('T
(PROGN
@@ -1023,11 +1023,11 @@
(SEQ
(LETT |vars|
(SPADCALL |m|
- (|getShellEntry| $ 32))
+ (|getShellEntry| $ 40))
|POLYCAT-;conditionP;MU;27|)
(LETT |degs|
(SPADCALL |m| |vars|
- (|getShellEntry| $ 143))
+ (|getShellEntry| $ 170))
|POLYCAT-;conditionP;MU;27|)
(LETT |deg1|
(PROGN
@@ -1054,7 +1054,7 @@
(LETT |nd|
(SPADCALL |d| |ch|
(|getShellEntry| $
- 145))
+ 172))
|POLYCAT-;conditionP;MU;27|)
(EXIT
(COND
@@ -1085,9 +1085,9 @@
|POLYCAT-;conditionP;MU;27|)
(LETT |redmons|
(CONS
- (SPADCALL (|spadConstant| $ 34)
+ (SPADCALL (|spadConstant| $ 43)
|vars| |deg1|
- (|getShellEntry| $ 56))
+ (|getShellEntry| $ 70))
|redmons|)
|POLYCAT-;conditionP;MU;27|)
(EXIT
@@ -1126,9 +1126,9 @@
(SPADCALL |u| |vars|
|degs|
(|getShellEntry| $
- 54))
+ 68))
(|getShellEntry| $
- 146))
+ 174))
|v|)
#12#)
|POLYCAT-;conditionP;MU;27|)))
@@ -1153,9 +1153,9 @@
(SPADCALL
(SPADCALL
(SPADCALL |llR|
- (|getShellEntry| $ 92))
- (|getShellEntry| $ 147))
- (|getShellEntry| $ 149))
+ (|getShellEntry| $ 111))
+ (|getShellEntry| $ 177))
+ (|getShellEntry| $ 179))
|POLYCAT-;conditionP;MU;27|)
(EXIT (COND
((QEQCAR |ans| 1) (CONS 1 "failed"))
@@ -1216,11 +1216,11 @@
(+ |i| 1)
|POLYCAT-;conditionP;MU;27|)
(|getShellEntry|
- $ 150))
+ $ 180))
(|getShellEntry|
- $ 41))
+ $ 51))
(|getShellEntry|
- $ 151))
+ $ 181))
|POLYCAT-;conditionP;MU;27|)
(COND
(#21#
@@ -1228,7 +1228,7 @@
(SPADCALL #20#
#19#
(|getShellEntry|
- $ 152))
+ $ 182))
|POLYCAT-;conditionP;MU;27|))
('T
(PROGN
@@ -1244,7 +1244,7 @@
(COND
(#21# #20#)
('T
- (|spadConstant| $ 22)))))))
+ (|spadConstant| $ 27)))))))
(LETT #17#
(PROG1 (CDR #17#)
(LETT #16# (QSADD1 #16#)
@@ -1257,24 +1257,24 @@
(DEFUN |POLYCAT-;charthRoot;SU;28| (|p| $)
(PROG (|vars| |ans| |ch|)
(RETURN
- (SEQ (LETT |vars| (SPADCALL |p| (|getShellEntry| $ 32))
+ (SEQ (LETT |vars| (SPADCALL |p| (|getShellEntry| $ 40))
|POLYCAT-;charthRoot;SU;28|)
(EXIT (COND
((NULL |vars|)
(SEQ (LETT |ans|
(SPADCALL
(SPADCALL |p|
- (|getShellEntry| $ 146))
- (|getShellEntry| $ 154))
+ (|getShellEntry| $ 174))
+ (|getShellEntry| $ 184))
|POLYCAT-;charthRoot;SU;28|)
(EXIT (COND
((QEQCAR |ans| 1) (CONS 1 "failed"))
('T
(CONS 0
(SPADCALL (QCDR |ans|)
- (|getShellEntry| $ 41))))))))
+ (|getShellEntry| $ 51))))))))
('T
- (SEQ (LETT |ch| (SPADCALL (|getShellEntry| $ 141))
+ (SEQ (LETT |ch| (|spadConstant| $ 168)
|POLYCAT-;charthRoot;SU;28|)
(EXIT (|POLYCAT-;charthRootlv| |p| |vars| |ch|
$))))))))))
@@ -1287,15 +1287,15 @@
(SEQ (LETT |ans|
(SPADCALL
(SPADCALL |p|
- (|getShellEntry| $ 146))
- (|getShellEntry| $ 154))
+ (|getShellEntry| $ 174))
+ (|getShellEntry| $ 184))
|POLYCAT-;charthRootlv|)
(EXIT (COND
((QEQCAR |ans| 1) (CONS 1 "failed"))
('T
(CONS 0
(SPADCALL (QCDR |ans|)
- (|getShellEntry| $ 41))))))))
+ (|getShellEntry| $ 51))))))))
('T
(SEQ (LETT |v| (|SPADfirst| |vars|)
|POLYCAT-;charthRootlv|)
@@ -1303,14 +1303,14 @@
|POLYCAT-;charthRootlv|)
(LETT |d|
(SPADCALL |p| |v|
- (|getShellEntry| $ 37))
+ (|getShellEntry| $ 46))
|POLYCAT-;charthRootlv|)
- (LETT |ans| (|spadConstant| $ 22)
+ (LETT |ans| (|spadConstant| $ 27)
|POLYCAT-;charthRootlv|)
(SEQ G190 (COND ((NULL (< 0 |d|)) (GO G191)))
(SEQ (LETT |dd|
(SPADCALL |d| |ch|
- (|getShellEntry| $ 145))
+ (|getShellEntry| $ 172))
|POLYCAT-;charthRootlv|)
(EXIT
(COND
@@ -1323,13 +1323,13 @@
(SEQ
(LETT |cp|
(SPADCALL |p| |v| |d|
- (|getShellEntry| $ 157))
+ (|getShellEntry| $ 189))
|POLYCAT-;charthRootlv|)
(LETT |p|
(SPADCALL |p|
(SPADCALL |cp| |v| |d|
- (|getShellEntry| $ 38))
- (|getShellEntry| $ 158))
+ (|getShellEntry| $ 47))
+ (|getShellEntry| $ 190))
|POLYCAT-;charthRootlv|)
(LETT |ansx|
(|POLYCAT-;charthRootlv| |cp|
@@ -1347,7 +1347,7 @@
(SEQ
(LETT |d|
(SPADCALL |p| |v|
- (|getShellEntry| $ 37))
+ (|getShellEntry| $ 46))
|POLYCAT-;charthRootlv|)
(EXIT
(LETT |ans|
@@ -1363,8 +1363,8 @@
('T 'T))
'(|NonNegativeInteger|)
#0#))
- (|getShellEntry| $ 38))
- (|getShellEntry| $ 152))
+ (|getShellEntry| $ 47))
+ (|getShellEntry| $ 182))
|POLYCAT-;charthRootlv|)))))))))))
NIL (GO G190) G191 (EXIT NIL))
(LETT |ansx|
@@ -1382,7 +1382,7 @@
(LETT #1#
(CONS 0
(SPADCALL |ans| (QCDR |ansx|)
- (|getShellEntry| $ 152)))
+ (|getShellEntry| $ 182)))
|POLYCAT-;charthRootlv|)
(GO #1#)))))))))
#1# (EXIT #1#)))))
@@ -1392,36 +1392,36 @@
(RETURN
(SEQ (LETT |result|
(SPADCALL
- (SPADCALL |p1| |mvar| (|getShellEntry| $ 49))
- (SPADCALL |p2| |mvar| (|getShellEntry| $ 49))
- (|getShellEntry| $ 160))
+ (SPADCALL |p1| |mvar| (|getShellEntry| $ 59))
+ (SPADCALL |p2| |mvar| (|getShellEntry| $ 59))
+ (|getShellEntry| $ 192))
|POLYCAT-;monicDivide;2SVarSetR;30|)
(EXIT (CONS (SPADCALL (QCAR |result|) |mvar|
- (|getShellEntry| $ 135))
+ (|getShellEntry| $ 160))
(SPADCALL (QCDR |result|) |mvar|
- (|getShellEntry| $ 135))))))))
+ (|getShellEntry| $ 160))))))))
(DEFUN |POLYCAT-;squareFree;SF;31| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 163)))
+ (SPADCALL |p| (|getShellEntry| $ 195)))
(DEFUN |POLYCAT-;squareFree;SF;32| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 166)))
+ (SPADCALL |p| (|getShellEntry| $ 198)))
(DEFUN |POLYCAT-;squareFree;SF;33| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 166)))
+ (SPADCALL |p| (|getShellEntry| $ 198)))
(DEFUN |POLYCAT-;squareFreePart;2S;34| (|p| $)
(PROG (|s| |f| #0=#:G1733 #1=#:G1653 #2=#:G1651 #3=#:G1652)
(RETURN
(SEQ (SPADCALL
(SPADCALL
- (LETT |s| (SPADCALL |p| (|getShellEntry| $ 167))
+ (LETT |s| (SPADCALL |p| (|getShellEntry| $ 199))
|POLYCAT-;squareFreePart;2S;34|)
- (|getShellEntry| $ 168))
+ (|getShellEntry| $ 200))
(PROGN
(LETT #3# NIL |POLYCAT-;squareFreePart;2S;34|)
(SEQ (LETT |f| NIL |POLYCAT-;squareFreePart;2S;34|)
- (LETT #0# (SPADCALL |s| (|getShellEntry| $ 171))
+ (LETT #0# (SPADCALL |s| (|getShellEntry| $ 203))
|POLYCAT-;squareFreePart;2S;34|)
G190
(COND
@@ -1438,7 +1438,7 @@
(#3#
(LETT #2#
(SPADCALL #2# #1#
- (|getShellEntry| $ 151))
+ (|getShellEntry| $ 181))
|POLYCAT-;squareFreePart;2S;34|))
('T
(PROGN
@@ -1449,12 +1449,12 @@
(LETT #0# (CDR #0#)
|POLYCAT-;squareFreePart;2S;34|)
(GO G190) G191 (EXIT NIL))
- (COND (#3# #2#) ('T (|spadConstant| $ 34))))
- (|getShellEntry| $ 151))))))
+ (COND (#3# #2#) ('T (|spadConstant| $ 43))))
+ (|getShellEntry| $ 181))))))
(DEFUN |POLYCAT-;content;SVarSetS;35| (|p| |v| $)
- (SPADCALL (SPADCALL |p| |v| (|getShellEntry| $ 49))
- (|getShellEntry| $ 173)))
+ (SPADCALL (SPADCALL |p| |v| (|getShellEntry| $ 59))
+ (|getShellEntry| $ 205)))
(DEFUN |POLYCAT-;primitivePart;2S;36| (|p| $)
(PROG (#0=#:G1657)
@@ -1463,13 +1463,13 @@
(PROG2 (LETT #0#
(SPADCALL |p|
(SPADCALL |p|
- (|getShellEntry| $ 175))
- (|getShellEntry| $ 176))
+ (|getShellEntry| $ 207))
+ (|getShellEntry| $ 208))
|POLYCAT-;primitivePart;2S;36|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) (|getShellEntry| $ 6)
#0#))
- (|getShellEntry| $ 178))
+ (|getShellEntry| $ 210))
1))))
(DEFUN |POLYCAT-;primitivePart;SVarSetS;37| (|p| |v| $)
@@ -1479,51 +1479,51 @@
(PROG2 (LETT #0#
(SPADCALL |p|
(SPADCALL |p| |v|
- (|getShellEntry| $ 180))
- (|getShellEntry| $ 181))
+ (|getShellEntry| $ 212))
+ (|getShellEntry| $ 213))
|POLYCAT-;primitivePart;SVarSetS;37|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) (|getShellEntry| $ 6)
#0#))
- (|getShellEntry| $ 178))
+ (|getShellEntry| $ 210))
1))))
(DEFUN |POLYCAT-;<;2SB;38| (|p| |q| $)
(PROG (|dp| |dq|)
(RETURN
- (SEQ (LETT |dp| (SPADCALL |p| (|getShellEntry| $ 61))
+ (SEQ (LETT |dp| (SPADCALL |p| (|getShellEntry| $ 75))
|POLYCAT-;<;2SB;38|)
- (LETT |dq| (SPADCALL |q| (|getShellEntry| $ 61))
+ (LETT |dq| (SPADCALL |q| (|getShellEntry| $ 75))
|POLYCAT-;<;2SB;38|)
(EXIT (COND
- ((SPADCALL |dp| |dq| (|getShellEntry| $ 183))
- (SPADCALL (|spadConstant| $ 23)
- (SPADCALL |q| (|getShellEntry| $ 39))
- (|getShellEntry| $ 184)))
- ((SPADCALL |dq| |dp| (|getShellEntry| $ 183))
- (SPADCALL (SPADCALL |p| (|getShellEntry| $ 39))
- (|spadConstant| $ 23) (|getShellEntry| $ 184)))
+ ((SPADCALL |dp| |dq| (|getShellEntry| $ 215))
+ (SPADCALL (|spadConstant| $ 28)
+ (SPADCALL |q| (|getShellEntry| $ 48))
+ (|getShellEntry| $ 216)))
+ ((SPADCALL |dq| |dp| (|getShellEntry| $ 215))
+ (SPADCALL (SPADCALL |p| (|getShellEntry| $ 48))
+ (|spadConstant| $ 28) (|getShellEntry| $ 216)))
('T
(SPADCALL
(SPADCALL (SPADCALL |p| |q|
- (|getShellEntry| $ 158))
- (|getShellEntry| $ 39))
- (|spadConstant| $ 23) (|getShellEntry| $ 184)))))))))
+ (|getShellEntry| $ 190))
+ (|getShellEntry| $ 48))
+ (|spadConstant| $ 28) (|getShellEntry| $ 216)))))))))
(DEFUN |POLYCAT-;patternMatch;SP2Pmr;39| (|p| |pat| |l| $)
- (SPADCALL |p| |pat| |l| (|getShellEntry| $ 189)))
+ (SPADCALL |p| |pat| |l| (|getShellEntry| $ 221)))
(DEFUN |POLYCAT-;patternMatch;SP2Pmr;40| (|p| |pat| |l| $)
- (SPADCALL |p| |pat| |l| (|getShellEntry| $ 196)))
+ (SPADCALL |p| |pat| |l| (|getShellEntry| $ 228)))
(DEFUN |POLYCAT-;convert;SP;41| (|x| $)
- (SPADCALL (ELT $ 199) (ELT $ 200) |x| (|getShellEntry| $ 204)))
+ (SPADCALL (ELT $ 231) (ELT $ 232) |x| (|getShellEntry| $ 236)))
(DEFUN |POLYCAT-;convert;SP;42| (|x| $)
- (SPADCALL (ELT $ 206) (ELT $ 207) |x| (|getShellEntry| $ 211)))
+ (SPADCALL (ELT $ 238) (ELT $ 239) |x| (|getShellEntry| $ 243)))
(DEFUN |POLYCAT-;convert;SIf;43| (|p| $)
- (SPADCALL (ELT $ 214) (ELT $ 215) |p| (|getShellEntry| $ 219)))
+ (SPADCALL (ELT $ 246) (ELT $ 247) |p| (|getShellEntry| $ 251)))
(DEFUN |PolynomialCategory&| (|#1| |#2| |#3| |#4|)
(PROG (|dv$1| |dv$2| |dv$3| |dv$4| |dv$| $ |pv$|)
@@ -1535,7 +1535,7 @@
(LETT |dv$4| (|devaluate| |#4|) . #0#)
(LETT |dv$|
(LIST '|PolynomialCategory&| |dv$1| |dv$2| |dv$3| |dv$4|) . #0#)
- (LETT $ (|newShell| 228) . #0#)
+ (LETT $ (|newShell| 260) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -1579,57 +1579,57 @@
(COND
((|testBitVector| |pv$| 4)
(PROGN
- (|setShellEntry| $ 76
+ (|setShellEntry| $ 95
(CONS (|dispatchFunction|
|POLYCAT-;resultant;2SVarSetS;15|)
$))
- (|setShellEntry| $ 78
+ (|setShellEntry| $ 97
(CONS (|dispatchFunction|
|POLYCAT-;discriminant;SVarSetS;16|)
$)))))
(COND
((|HasCategory| |#2| '(|IntegralDomain|))
(PROGN
- (|setShellEntry| $ 98
+ (|setShellEntry| $ 120
(CONS (|dispatchFunction|
|POLYCAT-;reducedSystem;MM;20|)
$))
- (|setShellEntry| $ 105
+ (|setShellEntry| $ 130
(CONS (|dispatchFunction|
|POLYCAT-;reducedSystem;MVR;21|)
$)))))
(COND
((|testBitVector| |pv$| 1)
(PROGN
- (|setShellEntry| $ 108
+ (|setShellEntry| $ 133
(CONS (|dispatchFunction|
|POLYCAT-;gcdPolynomial;3Sup;22|)
$))
- (|setShellEntry| $ 115
+ (|setShellEntry| $ 140
(CONS (|dispatchFunction|
|POLYCAT-;solveLinearPolynomialEquation;LSupU;23|)
$))
- (|setShellEntry| $ 119
+ (|setShellEntry| $ 144
(CONS (|dispatchFunction|
|POLYCAT-;factorPolynomial;SupF;24|)
$))
- (|setShellEntry| $ 121
+ (|setShellEntry| $ 146
(CONS (|dispatchFunction|
|POLYCAT-;factorSquareFreePolynomial;SupF;25|)
$))
- (|setShellEntry| $ 139
+ (|setShellEntry| $ 164
(CONS (|dispatchFunction| |POLYCAT-;factor;SF;26|) $))
(COND
((|HasCategory| |#2| '(|CharacteristicNonZero|))
(PROGN
- (|setShellEntry| $ 153
+ (|setShellEntry| $ 183
(CONS (|dispatchFunction|
|POLYCAT-;conditionP;MU;27|)
$))))))))
(COND
((|HasCategory| |#2| '(|CharacteristicNonZero|))
(PROGN
- (|setShellEntry| $ 155
+ (|setShellEntry| $ 185
(CONS (|dispatchFunction| |POLYCAT-;charthRoot;SU;28|)
$)))))
(COND
@@ -1639,46 +1639,46 @@
((|HasCategory| |#2| '(|EuclideanDomain|))
(COND
((|HasCategory| |#2| '(|CharacteristicZero|))
- (|setShellEntry| $ 164
+ (|setShellEntry| $ 196
(CONS (|dispatchFunction|
|POLYCAT-;squareFree;SF;31|)
$)))
('T
- (|setShellEntry| $ 164
+ (|setShellEntry| $ 196
(CONS (|dispatchFunction|
|POLYCAT-;squareFree;SF;32|)
$)))))
('T
- (|setShellEntry| $ 164
+ (|setShellEntry| $ 196
(CONS (|dispatchFunction|
|POLYCAT-;squareFree;SF;33|)
$))))
- (|setShellEntry| $ 172
+ (|setShellEntry| $ 204
(CONS (|dispatchFunction|
|POLYCAT-;squareFreePart;2S;34|)
$))
- (|setShellEntry| $ 174
+ (|setShellEntry| $ 206
(CONS (|dispatchFunction|
|POLYCAT-;content;SVarSetS;35|)
$))
- (|setShellEntry| $ 179
+ (|setShellEntry| $ 211
(CONS (|dispatchFunction|
|POLYCAT-;primitivePart;2S;36|)
$))
- (|setShellEntry| $ 182
+ (|setShellEntry| $ 214
(CONS (|dispatchFunction|
|POLYCAT-;primitivePart;SVarSetS;37|)
$)))))
(COND
((|testBitVector| |pv$| 15)
(PROGN
- (|setShellEntry| $ 185
+ (|setShellEntry| $ 217
(CONS (|dispatchFunction| |POLYCAT-;<;2SB;38|) $))
(COND
((|testBitVector| |pv$| 8)
(COND
((|testBitVector| |pv$| 7)
- (|setShellEntry| $ 191
+ (|setShellEntry| $ 223
(CONS (|dispatchFunction|
|POLYCAT-;patternMatch;SP2Pmr;39|)
$))))))
@@ -1686,7 +1686,7 @@
((|testBitVector| |pv$| 6)
(COND
((|testBitVector| |pv$| 5)
- (|setShellEntry| $ 198
+ (|setShellEntry| $ 230
(CONS (|dispatchFunction|
|POLYCAT-;patternMatch;SP2Pmr;40|)
$)))))))))
@@ -1694,205 +1694,229 @@
((|testBitVector| |pv$| 12)
(COND
((|testBitVector| |pv$| 11)
- (|setShellEntry| $ 205
+ (|setShellEntry| $ 237
(CONS (|dispatchFunction| |POLYCAT-;convert;SP;41|)
$))))))
(COND
((|testBitVector| |pv$| 10)
(COND
((|testBitVector| |pv$| 9)
- (|setShellEntry| $ 212
+ (|setShellEntry| $ 244
(CONS (|dispatchFunction| |POLYCAT-;convert;SP;42|)
$))))))
(COND
((|testBitVector| |pv$| 14)
(COND
((|testBitVector| |pv$| 13)
- (|setShellEntry| $ 220
+ (|setShellEntry| $ 252
(CONS (|dispatchFunction| |POLYCAT-;convert;SIf;43|)
$))))))
$))))
(MAKEPROP '|PolynomialCategory&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|)
- (|local| |#3|) (|local| |#4|) (|Equation| 6) (0 . |lhs|)
- (|Union| 9 '"failed") (5 . |retractIfCan|)
- (10 . |retract|) (15 . |rhs|) (|List| 9) (|List| $)
- (20 . |eval|) (|Equation| $) (|List| 19)
- |POLYCAT-;eval;SLS;1| (27 . |Zero|) (31 . |Zero|)
- (|Boolean|) (35 . ~=) (41 . |leadingMonomial|)
- (46 . |reductum|) |POLYCAT-;monomials;SL;2|
- (51 . |monomials|) (|Union| 17 '"failed")
- |POLYCAT-;isPlus;SU;3| (56 . |variables|)
- (61 . |monomial?|) (66 . |One|) (70 . |One|)
- (|NonNegativeInteger|) (74 . |degree|) (80 . |monomial|)
- (87 . |leadingCoefficient|) (92 . |one?|) (97 . |coerce|)
- |POLYCAT-;isTimes;SU;4| (102 . |mainVariable|) (107 . =)
- (|Record| (|:| |var| 9) (|:| |exponent| 36))
- (|Union| 45 '"failed") |POLYCAT-;isExpt;SU;5|
- (|SparseUnivariatePolynomial| $) (113 . |univariate|)
- (|SparseUnivariatePolynomial| 6) (119 . |coefficient|)
- |POLYCAT-;coefficient;SVarSetNniS;6| (|List| 36)
- (125 . |coefficient|) |POLYCAT-;coefficient;SLLS;7|
- (132 . |monomial|) |POLYCAT-;monomial;SLLS;8|
- (139 . |coerce|) |POLYCAT-;retract;SVarSet;9|
- |POLYCAT-;retractIfCan;SU;10| (144 . |degree|)
- (149 . |monomial|) |POLYCAT-;primitiveMonomials;SL;12|
- (155 . |ground?|) (160 . |Zero|) (164 . ~=)
- (170 . |degree|) (175 . |leadingCoefficient|)
- (180 . |totalDegree|) (185 . |reductum|)
- |POLYCAT-;totalDegree;SNni;13| (190 . |member?|)
- (196 . |totalDegree|) |POLYCAT-;totalDegree;SLNni;14|
- (202 . |resultant|) (208 . |resultant|)
- (215 . |discriminant|) (220 . |discriminant|)
- (226 . |primitiveMonomials|) (|List| 6) (231 . |concat|)
- (236 . |removeDuplicates!|) (|Vector| 7) (241 . |new|)
- (|Integer|) (247 . |minIndex|) (252 . |coefficient|)
- (258 . |qsetelt!|) (|List| 7) (|List| 89) (|Matrix| 7)
- (265 . |matrix|) (|List| 80) (|Matrix| 6)
- (270 . |listOfLists|) (275 . |vertConcat|) (|Matrix| $)
- (281 . |reducedSystem|) (|Vector| 6) (286 . |entries|)
- (291 . |concat|) (297 . |concat|)
- (|Record| (|:| |mat| 91) (|:| |vec| 83)) (|Vector| $)
- (303 . |reducedSystem|)
+ (|local| |#3|) (|local| |#4|) (|Boolean|) (|Equation| 6)
+ (|List| 11) (0 . |empty?|) (5 . |lhs|)
+ (|Union| 9 '"failed") (10 . |retractIfCan|)
+ (15 . |retract|) (20 . |rhs|) (|List| 9) (|List| $)
+ (25 . |eval|) (|Equation| $) (|List| 22)
+ |POLYCAT-;eval;SLS;1| (|List| 6) (32 . |empty|)
+ (36 . |Zero|) (40 . |Zero|) (44 . ~=)
+ (50 . |leadingMonomial|) (55 . |concat|) (61 . |reductum|)
+ (66 . |reverse|) |POLYCAT-;monomials;SL;2|
+ (71 . |monomials|) (76 . |rest|) (81 . |empty?|)
+ (|Union| 20 '"failed") |POLYCAT-;isPlus;SU;3|
+ (86 . |variables|) (91 . |empty?|) (96 . |monomial?|)
+ (101 . |One|) (105 . |One|) (|NonNegativeInteger|)
+ (109 . |degree|) (115 . |monomial|)
+ (122 . |leadingCoefficient|) (127 . |one?|) (132 . |rest|)
+ (137 . |coerce|) |POLYCAT-;isTimes;SU;4|
+ (142 . |mainVariable|) (147 . =)
+ (|Record| (|:| |var| 9) (|:| |exponent| 45))
+ (|Union| 55 '"failed") |POLYCAT-;isExpt;SU;5|
+ (|SparseUnivariatePolynomial| $) (153 . |univariate|)
+ (|SparseUnivariatePolynomial| 6) (159 . |coefficient|)
+ |POLYCAT-;coefficient;SVarSetNniS;6| (|List| 45)
+ (165 . |empty?|) (170 . |first|) (175 . |first|)
+ (180 . |rest|) (185 . |coefficient|)
+ |POLYCAT-;coefficient;SLLS;7| (192 . |monomial|)
+ |POLYCAT-;monomial;SLLS;8| (199 . |coerce|)
+ |POLYCAT-;retract;SVarSet;9| |POLYCAT-;retractIfCan;SU;10|
+ (204 . |degree|) (209 . |monomial|)
+ |POLYCAT-;primitiveMonomials;SL;12| (215 . |ground?|)
+ (220 . |Zero|) (224 . |Zero|) (228 . ~=) (234 . |degree|)
+ (239 . |leadingCoefficient|) (244 . |totalDegree|)
+ (249 . +) (255 . |max|) (261 . |reductum|)
+ |POLYCAT-;totalDegree;SNni;13| (266 . |member?|)
+ (272 . |One|) (276 . *) (282 . |totalDegree|)
+ |POLYCAT-;totalDegree;SLNni;14| (288 . |resultant|)
+ (294 . |resultant|) (301 . |discriminant|)
+ (306 . |discriminant|) (312 . |primitiveMonomials|)
+ (317 . |concat|) (322 . |removeDuplicates!|) (|Vector| 7)
+ (327 . |new|) (|Integer|) (333 . |minIndex|)
+ (338 . |maxIndex|) (343 . |coefficient|)
+ (349 . |qsetelt!|) (|List| 7) (|List| 108) (|Matrix| 7)
+ (356 . |matrix|) (|List| 25) (|Matrix| 6)
+ (361 . |listOfLists|) (366 . |first|) (371 . |rest|)
+ (376 . |empty?|) (381 . |vertConcat|) (|Matrix| $)
+ (387 . |reducedSystem|) (|Vector| 6) (392 . |entries|)
+ (397 . |concat|) (|List| 8) (403 . |#|) (408 . |first|)
+ (413 . |concat|)
+ (|Record| (|:| |mat| 110) (|:| |vec| 101)) (|Vector| $)
+ (419 . |reducedSystem|)
(|GeneralPolynomialGcdPackage| 8 9 7 6)
- (309 . |gcdPolynomial|) (315 . |gcdPolynomial|)
- (|List| 50) (|Union| 109 '"failed")
+ (425 . |gcdPolynomial|) (431 . |gcdPolynomial|)
+ (|List| 60) (|Union| 134 '"failed")
(|PolynomialFactorizationByRecursion| 7 8 9 6)
- (321 . |solveLinearPolynomialEquationByRecursion|)
- (|List| 48) (|Union| 113 '"failed")
- (327 . |solveLinearPolynomialEquation|) (|Factored| 50)
- (333 . |factorByRecursion|) (|Factored| 48)
- (338 . |factorPolynomial|)
- (343 . |factorSquareFreeByRecursion|)
- (348 . |factorSquareFreePolynomial|) (|Factored| $)
- (353 . |factor|) (|Factored| 7) (358 . |unit|)
+ (437 . |solveLinearPolynomialEquationByRecursion|)
+ (|List| 58) (|Union| 138 '"failed")
+ (443 . |solveLinearPolynomialEquation|) (|Factored| 60)
+ (449 . |factorByRecursion|) (|Factored| 58)
+ (454 . |factorPolynomial|)
+ (459 . |factorSquareFreeByRecursion|)
+ (464 . |factorSquareFreePolynomial|) (|Factored| $)
+ (469 . |factor|) (|Factored| 7) (474 . |unit|)
(|Union| '"nil" '"sqfr" '"irred" '"prime")
- (|Record| (|:| |flg| 126) (|:| |fctr| 7) (|:| |xpnt| 85))
- (|List| 127) (363 . |factorList|)
- (|Record| (|:| |flg| 126) (|:| |fctr| 6) (|:| |xpnt| 85))
- (|List| 130) (|Factored| 6) (368 . |makeFR|)
- (374 . |unit|) (379 . |multivariate|)
- (|Record| (|:| |flg| 126) (|:| |fctr| 50) (|:| |xpnt| 85))
- (|List| 136) (385 . |factorList|) (390 . |factor|)
- (395 . |transpose|) (400 . |characteristic|)
- (404 . |setUnion|) (410 . |degree|) (|Union| $ '"failed")
- (416 . |exquo|) (422 . |ground|) (427 . |transpose|)
- (|Union| 104 '"failed") (432 . |conditionP|) (437 . |elt|)
- (443 . *) (449 . +) (455 . |conditionP|)
- (460 . |charthRoot|) (465 . |charthRoot|) (470 . |Zero|)
- (474 . |coefficient|) (481 . -)
+ (|Record| (|:| |flg| 151) (|:| |fctr| 7) (|:| |xpnt| 103))
+ (|List| 152) (479 . |factorList|)
+ (|Record| (|:| |flg| 151) (|:| |fctr| 6) (|:| |xpnt| 103))
+ (|List| 155) (|Factored| 6) (484 . |makeFR|)
+ (490 . |unit|) (495 . |multivariate|)
+ (|Record| (|:| |flg| 151) (|:| |fctr| 60)
+ (|:| |xpnt| 103))
+ (|List| 161) (501 . |factorList|) (506 . |factor|)
+ (511 . |transpose|) (516 . |empty|) (520 . |empty|)
+ (524 . |characteristic|) (528 . |setUnion|)
+ (534 . |degree|) (|Union| $ '"failed") (540 . |exquo|)
+ (546 . |cons|) (552 . |ground|) (557 . |cons|)
+ (563 . |cons|) (569 . |transpose|) (|Union| 129 '"failed")
+ (574 . |conditionP|) (579 . |elt|) (585 . *) (591 . +)
+ (597 . |conditionP|) (602 . |charthRoot|)
+ (607 . |charthRoot|) (612 . |Zero|) (616 . |Zero|)
+ (620 . <) (626 . |coefficient|) (633 . -)
(|Record| (|:| |quotient| $) (|:| |remainder| $))
- (487 . |monicDivide|) |POLYCAT-;monicDivide;2SVarSetR;30|
- (|MultivariateSquareFree| 8 9 7 6) (493 . |squareFree|)
- (498 . |squareFree|) (|PolynomialSquareFree| 9 8 7 6)
- (503 . |squareFree|) (508 . |squareFree|) (513 . |unit|)
- (|Record| (|:| |factor| 6) (|:| |exponent| 85))
- (|List| 169) (518 . |factors|) (523 . |squareFreePart|)
- (528 . |content|) (533 . |content|) (539 . |content|)
- (544 . |exquo|)
+ (639 . |monicDivide|) |POLYCAT-;monicDivide;2SVarSetR;30|
+ (|MultivariateSquareFree| 8 9 7 6) (645 . |squareFree|)
+ (650 . |squareFree|) (|PolynomialSquareFree| 9 8 7 6)
+ (655 . |squareFree|) (660 . |squareFree|) (665 . |unit|)
+ (|Record| (|:| |factor| 6) (|:| |exponent| 103))
+ (|List| 201) (670 . |factors|) (675 . |squareFreePart|)
+ (680 . |content|) (685 . |content|) (691 . |content|)
+ (696 . |exquo|)
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $))
- (550 . |unitNormal|) (555 . |primitivePart|)
- (560 . |content|) (566 . |exquo|) (572 . |primitivePart|)
- (578 . <) (584 . <) (590 . <) (|PatternMatchResult| 85 6)
- (|Pattern| 85)
- (|PatternMatchPolynomialCategory| 85 8 9 7 6)
- (596 . |patternMatch|) (|PatternMatchResult| 85 $)
- (603 . |patternMatch|) (|Float|)
- (|PatternMatchResult| 192 6) (|Pattern| 192)
- (|PatternMatchPolynomialCategory| 192 8 9 7 6)
- (610 . |patternMatch|) (|PatternMatchResult| 192 $)
- (617 . |patternMatch|) (624 . |convert|) (629 . |convert|)
- (|Mapping| 187 9) (|Mapping| 187 7)
- (|PolynomialCategoryLifting| 8 9 7 6 187) (634 . |map|)
- (641 . |convert|) (646 . |convert|) (651 . |convert|)
- (|Mapping| 194 9) (|Mapping| 194 7)
- (|PolynomialCategoryLifting| 8 9 7 6 194) (656 . |map|)
- (663 . |convert|) (|InputForm|) (668 . |convert|)
- (673 . |convert|) (|Mapping| 213 9) (|Mapping| 213 7)
- (|PolynomialCategoryLifting| 8 9 7 6 213) (678 . |map|)
- (685 . |convert|) (|Matrix| 85) (|Vector| 85)
- (|Record| (|:| |mat| 221) (|:| |vec| 222))
- (|Union| 85 '"failed") (|Fraction| 85)
- (|Union| 225 '"failed") (|Union| 7 '"failed"))
- '#(|totalDegree| 690 |squareFreePart| 701 |squareFree| 706
- |solveLinearPolynomialEquation| 711 |retractIfCan| 717
- |retract| 722 |resultant| 727 |reducedSystem| 734
- |primitivePart| 745 |primitiveMonomials| 756
- |patternMatch| 761 |monomials| 775 |monomial| 780
- |monicDivide| 787 |isTimes| 794 |isPlus| 799 |isExpt| 804
- |gcdPolynomial| 809 |factorSquareFreePolynomial| 815
- |factorPolynomial| 820 |factor| 825 |eval| 830
- |discriminant| 836 |convert| 842 |content| 857
- |conditionP| 863 |coefficient| 868 |charthRoot| 882 < 887)
+ (702 . |unitNormal|) (707 . |primitivePart|)
+ (712 . |content|) (718 . |exquo|) (724 . |primitivePart|)
+ (730 . <) (736 . <) (742 . <) (|PatternMatchResult| 103 6)
+ (|Pattern| 103)
+ (|PatternMatchPolynomialCategory| 103 8 9 7 6)
+ (748 . |patternMatch|) (|PatternMatchResult| 103 $)
+ (755 . |patternMatch|) (|Float|)
+ (|PatternMatchResult| 224 6) (|Pattern| 224)
+ (|PatternMatchPolynomialCategory| 224 8 9 7 6)
+ (762 . |patternMatch|) (|PatternMatchResult| 224 $)
+ (769 . |patternMatch|) (776 . |convert|) (781 . |convert|)
+ (|Mapping| 219 9) (|Mapping| 219 7)
+ (|PolynomialCategoryLifting| 8 9 7 6 219) (786 . |map|)
+ (793 . |convert|) (798 . |convert|) (803 . |convert|)
+ (|Mapping| 226 9) (|Mapping| 226 7)
+ (|PolynomialCategoryLifting| 8 9 7 6 226) (808 . |map|)
+ (815 . |convert|) (|InputForm|) (820 . |convert|)
+ (825 . |convert|) (|Mapping| 245 9) (|Mapping| 245 7)
+ (|PolynomialCategoryLifting| 8 9 7 6 245) (830 . |map|)
+ (837 . |convert|) (|Matrix| 103) (|Vector| 103)
+ (|Record| (|:| |mat| 253) (|:| |vec| 254))
+ (|Union| 103 '"failed") (|Fraction| 103)
+ (|Union| 257 '"failed") (|Union| 7 '"failed"))
+ '#(|totalDegree| 842 |squareFreePart| 853 |squareFree| 858
+ |solveLinearPolynomialEquation| 863 |retractIfCan| 869
+ |retract| 874 |resultant| 879 |reducedSystem| 886
+ |primitivePart| 897 |primitiveMonomials| 908
+ |patternMatch| 913 |monomials| 927 |monomial| 932
+ |monicDivide| 939 |isTimes| 946 |isPlus| 951 |isExpt| 956
+ |gcdPolynomial| 961 |factorSquareFreePolynomial| 967
+ |factorPolynomial| 972 |factor| 977 |eval| 982
+ |discriminant| 988 |convert| 994 |content| 1009
+ |conditionP| 1015 |coefficient| 1020 |charthRoot| 1034 <
+ 1039)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 220
- '(1 10 6 0 11 1 6 12 0 13 1 6 9 0 14 1
- 10 6 0 15 3 6 0 0 16 17 18 0 6 0 22 0
- 7 0 23 2 6 24 0 0 25 1 6 0 0 26 1 6 0
- 0 27 1 6 17 0 29 1 6 16 0 32 1 6 24 0
- 33 0 6 0 34 0 7 0 35 2 6 36 0 9 37 3
- 6 0 0 9 36 38 1 6 7 0 39 1 7 24 0 40
- 1 6 0 7 41 1 6 12 0 43 2 6 24 0 0 44
- 2 6 48 0 9 49 2 50 6 0 36 51 3 6 0 0
- 16 53 54 3 6 0 0 16 53 56 1 6 0 9 58
- 1 6 8 0 61 2 6 0 7 8 62 1 6 24 0 64 0
- 50 0 65 2 50 24 0 0 66 1 50 36 0 67 1
- 50 6 0 68 1 6 36 0 69 1 50 0 0 70 2
- 16 24 9 0 72 2 6 36 0 16 73 2 50 6 0
- 0 75 3 0 0 0 0 9 76 1 50 6 0 77 2 0 0
- 0 9 78 1 6 17 0 79 1 80 0 17 81 1 80
- 0 0 82 2 83 0 36 7 84 1 83 85 0 86 2
- 6 7 0 8 87 3 83 7 0 85 7 88 1 91 0 90
- 92 1 94 93 0 95 2 91 0 0 0 96 1 0 91
- 97 98 1 99 80 0 100 2 80 0 0 0 101 2
- 83 0 0 0 102 2 0 103 97 104 105 2 106
- 50 50 50 107 2 0 48 48 48 108 2 111
- 110 109 50 112 2 0 114 113 48 115 1
- 111 116 50 117 1 0 118 48 119 1 111
- 116 50 120 1 0 118 48 121 1 7 122 0
- 123 1 124 7 0 125 1 124 128 0 129 2
- 132 0 6 131 133 1 116 50 0 134 2 6 0
- 48 9 135 1 116 137 0 138 1 0 122 0
- 139 1 94 0 0 140 0 6 36 141 2 80 0 0
- 0 142 2 6 53 0 16 143 2 85 144 0 0
- 145 1 6 7 0 146 1 91 0 0 147 1 7 148
- 97 149 2 83 7 0 85 150 2 6 0 0 0 151
- 2 6 0 0 0 152 1 0 148 97 153 1 7 144
- 0 154 1 0 144 0 155 0 8 0 156 3 6 0 0
- 9 36 157 2 6 0 0 0 158 2 50 159 0 0
- 160 1 162 132 6 163 1 0 122 0 164 1
- 165 132 6 166 1 6 122 0 167 1 132 6 0
- 168 1 132 170 0 171 1 0 0 0 172 1 50
- 6 0 173 2 0 0 0 9 174 1 6 7 0 175 2 6
- 144 0 7 176 1 6 177 0 178 1 0 0 0 179
- 2 6 0 0 9 180 2 6 144 0 0 181 2 0 0 0
- 9 182 2 8 24 0 0 183 2 7 24 0 0 184 2
- 0 24 0 0 185 3 188 186 6 187 186 189
- 3 0 190 0 187 190 191 3 195 193 6 194
- 193 196 3 0 197 0 194 197 198 1 9 187
- 0 199 1 7 187 0 200 3 203 187 201 202
- 6 204 1 0 187 0 205 1 9 194 0 206 1 7
- 194 0 207 3 210 194 208 209 6 211 1 0
- 194 0 212 1 9 213 0 214 1 7 213 0 215
- 3 218 213 216 217 6 219 1 0 213 0 220
- 2 0 36 0 16 74 1 0 36 0 71 1 0 0 0
- 172 1 0 122 0 164 2 0 114 113 48 115
- 1 0 12 0 60 1 0 9 0 59 3 0 0 0 0 9 76
- 1 0 91 97 98 2 0 103 97 104 105 2 0 0
- 0 9 182 1 0 0 0 179 1 0 17 0 63 3 0
- 190 0 187 190 191 3 0 197 0 194 197
- 198 1 0 17 0 28 3 0 0 0 16 53 57 3 0
- 159 0 0 9 161 1 0 30 0 42 1 0 30 0 31
- 1 0 46 0 47 2 0 48 48 48 108 1 0 118
- 48 121 1 0 118 48 119 1 0 122 0 139 2
- 0 0 0 20 21 2 0 0 0 9 78 1 0 213 0
- 220 1 0 187 0 205 1 0 194 0 212 2 0 0
- 0 9 174 1 0 148 97 153 3 0 0 0 16 53
- 55 3 0 0 0 9 36 52 1 0 144 0 155 2 0
- 24 0 0 185)))))
+ (|makeByteWordVec2| 252
+ '(1 12 10 0 13 1 11 6 0 14 1 6 15 0 16
+ 1 6 9 0 17 1 11 6 0 18 3 6 0 0 19 20
+ 21 0 25 0 26 0 6 0 27 0 7 0 28 2 6 10
+ 0 0 29 1 6 0 0 30 2 25 0 6 0 31 1 6 0
+ 0 32 1 25 0 0 33 1 6 20 0 35 1 25 0 0
+ 36 1 25 10 0 37 1 6 19 0 40 1 19 10 0
+ 41 1 6 10 0 42 0 6 0 43 0 7 0 44 2 6
+ 45 0 9 46 3 6 0 0 9 45 47 1 6 7 0 48
+ 1 7 10 0 49 1 19 0 0 50 1 6 0 7 51 1
+ 6 15 0 53 2 6 10 0 0 54 2 6 58 0 9 59
+ 2 60 6 0 45 61 1 63 10 0 64 1 19 9 0
+ 65 1 63 45 0 66 1 63 0 0 67 3 6 0 0
+ 19 63 68 3 6 0 0 19 63 70 1 6 0 9 72
+ 1 6 8 0 75 2 6 0 7 8 76 1 6 10 0 78 0
+ 45 0 79 0 60 0 80 2 60 10 0 0 81 1 60
+ 45 0 82 1 60 6 0 83 1 6 45 0 84 2 45
+ 0 0 0 85 2 45 0 0 0 86 1 60 0 0 87 2
+ 19 10 9 0 89 0 45 0 90 2 45 0 45 0 91
+ 2 6 45 0 19 92 2 60 6 0 0 94 3 0 0 0
+ 0 9 95 1 60 6 0 96 2 0 0 0 9 97 1 6
+ 20 0 98 1 25 0 20 99 1 25 0 0 100 2
+ 101 0 45 7 102 1 101 103 0 104 1 101
+ 103 0 105 2 6 7 0 8 106 3 101 7 0 103
+ 7 107 1 110 0 109 111 1 113 112 0 114
+ 1 112 25 0 115 1 112 0 0 116 1 112 10
+ 0 117 2 110 0 0 0 118 1 0 110 119 120
+ 1 121 25 0 122 2 25 0 0 0 123 1 124
+ 45 0 125 1 25 6 0 126 2 101 0 0 0 127
+ 2 0 128 119 129 130 2 131 60 60 60
+ 132 2 0 58 58 58 133 2 136 135 134 60
+ 137 2 0 139 138 58 140 1 136 141 60
+ 142 1 0 143 58 144 1 136 141 60 145 1
+ 0 143 58 146 1 7 147 0 148 1 149 7 0
+ 150 1 149 153 0 154 2 157 0 6 156 158
+ 1 141 60 0 159 2 6 0 58 9 160 1 141
+ 162 0 163 1 0 147 0 164 1 113 0 0 165
+ 0 108 0 166 0 112 0 167 0 6 45 168 2
+ 25 0 0 0 169 2 6 63 0 19 170 2 103
+ 171 0 0 172 2 25 0 6 0 173 1 6 7 0
+ 174 2 108 0 7 0 175 2 112 0 25 0 176
+ 1 110 0 0 177 1 7 178 119 179 2 101 7
+ 0 103 180 2 6 0 0 0 181 2 6 0 0 0 182
+ 1 0 178 119 183 1 7 171 0 184 1 0 171
+ 0 185 0 8 0 186 0 103 0 187 2 45 10 0
+ 0 188 3 6 0 0 9 45 189 2 6 0 0 0 190
+ 2 60 191 0 0 192 1 194 157 6 195 1 0
+ 147 0 196 1 197 157 6 198 1 6 147 0
+ 199 1 157 6 0 200 1 157 202 0 203 1 0
+ 0 0 204 1 60 6 0 205 2 0 0 0 9 206 1
+ 6 7 0 207 2 6 171 0 7 208 1 6 209 0
+ 210 1 0 0 0 211 2 6 0 0 9 212 2 6 171
+ 0 0 213 2 0 0 0 9 214 2 8 10 0 0 215
+ 2 7 10 0 0 216 2 0 10 0 0 217 3 220
+ 218 6 219 218 221 3 0 222 0 219 222
+ 223 3 227 225 6 226 225 228 3 0 229 0
+ 226 229 230 1 9 219 0 231 1 7 219 0
+ 232 3 235 219 233 234 6 236 1 0 219 0
+ 237 1 9 226 0 238 1 7 226 0 239 3 242
+ 226 240 241 6 243 1 0 226 0 244 1 9
+ 245 0 246 1 7 245 0 247 3 250 245 248
+ 249 6 251 1 0 245 0 252 2 0 45 0 19
+ 93 1 0 45 0 88 1 0 0 0 204 1 0 147 0
+ 196 2 0 139 138 58 140 1 0 15 0 74 1
+ 0 9 0 73 3 0 0 0 0 9 95 1 0 110 119
+ 120 2 0 128 119 129 130 2 0 0 0 9 214
+ 1 0 0 0 211 1 0 20 0 77 3 0 222 0 219
+ 222 223 3 0 229 0 226 229 230 1 0 20
+ 0 34 3 0 0 0 19 63 71 3 0 191 0 0 9
+ 193 1 0 38 0 52 1 0 38 0 39 1 0 56 0
+ 57 2 0 58 58 58 133 1 0 143 58 146 1
+ 0 143 58 144 1 0 147 0 164 2 0 0 0 23
+ 24 2 0 0 0 9 97 1 0 245 0 252 1 0 219
+ 0 237 1 0 226 0 244 2 0 0 0 9 206 1 0
+ 178 119 183 3 0 0 0 19 63 69 3 0 0 0
+ 9 45 62 1 0 171 0 185 2 0 10 0 0 217)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/PRIMARR.lsp b/src/algebra/strap/PRIMARR.lsp
index d27b7682..6c5d17a6 100644
--- a/src/algebra/strap/PRIMARR.lsp
+++ b/src/algebra/strap/PRIMARR.lsp
@@ -115,7 +115,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|PrimitiveArray|))
(LETT |dv$| (LIST '|PrimitiveArray| |dv$1|) . #0#)
- (LETT $ (|newShell| 35) . #0#)
+ (LETT $ (|newShell| 38) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -159,28 +159,28 @@
(MAKEPROP '|PrimitiveArray| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|)
(|NonNegativeInteger|) |PRIMARR;#;$Nni;1| (|Integer|)
- |PRIMARR;minIndex;$I;2| |PRIMARR;empty;$;3|
+ (0 . |Zero|) |PRIMARR;minIndex;$I;2| |PRIMARR;empty;$;3|
|PRIMARR;new;NniS$;4| |PRIMARR;qelt;$IS;5|
|PRIMARR;elt;$IS;6| |PRIMARR;qsetelt!;$I2S;7|
- |PRIMARR;setelt;$I2S;8| |PRIMARR;fill!;$S$;9|
- (|Mapping| 6 6 6) (|Boolean|) (|List| 6) (|Equation| 6)
- (|List| 21) (|Mapping| 19 6) (|Mapping| 19 6 6)
- (|UniversalSegment| 9) (|Void|) (|Mapping| 6 6)
- (|OutputForm|) (|InputForm|) (|String|) (|SingleInteger|)
- (|List| $) (|Union| 6 '"failed") (|List| 9))
- '#(~= 0 |swap!| 6 |sorted?| 13 |sort!| 24 |sort| 35 |size?|
- 46 |setelt| 52 |select| 66 |sample| 72 |reverse!| 76
- |reverse| 81 |removeDuplicates| 86 |remove| 91 |reduce|
- 103 |qsetelt!| 124 |qelt| 131 |position| 137 |parts| 156
- |new| 161 |more?| 167 |minIndex| 173 |min| 178 |merge| 184
- |members| 197 |member?| 202 |maxIndex| 208 |max| 213
- |map!| 219 |map| 225 |less?| 238 |latex| 244 |insert| 249
- |indices| 263 |index?| 268 |hash| 274 |first| 279 |find|
- 284 |fill!| 290 |every?| 296 |eval| 302 |eq?| 328 |entry?|
- 334 |entries| 340 |empty?| 345 |empty| 350 |elt| 354
- |delete| 373 |count| 385 |copyInto!| 397 |copy| 404
- |convert| 409 |construct| 414 |concat| 419 |coerce| 442
- |any?| 447 >= 453 > 459 = 465 <= 471 < 477 |#| 483)
+ |PRIMARR;setelt;$I2S;8| (|SingleInteger|) (4 . |Zero|)
+ (8 . |Zero|) |PRIMARR;fill!;$S$;9| (|Mapping| 6 6 6)
+ (|Boolean|) (|List| 6) (|Equation| 6) (|List| 25)
+ (|Mapping| 23 6) (|Mapping| 23 6 6) (|UniversalSegment| 9)
+ (|Void|) (|Mapping| 6 6) (|OutputForm|) (|InputForm|)
+ (|String|) (|List| $) (|Union| 6 '"failed") (|List| 9))
+ '#(~= 12 |swap!| 18 |sorted?| 25 |sort!| 36 |sort| 47 |size?|
+ 58 |setelt| 64 |select| 78 |sample| 84 |reverse!| 88
+ |reverse| 93 |removeDuplicates| 98 |remove| 103 |reduce|
+ 115 |qsetelt!| 136 |qelt| 143 |position| 149 |parts| 168
+ |new| 173 |more?| 179 |minIndex| 185 |min| 190 |merge| 196
+ |members| 209 |member?| 214 |maxIndex| 220 |max| 225
+ |map!| 231 |map| 237 |less?| 250 |latex| 256 |insert| 261
+ |indices| 275 |index?| 280 |hash| 286 |first| 291 |find|
+ 296 |fill!| 302 |every?| 308 |eval| 314 |eq?| 340 |entry?|
+ 346 |entries| 352 |empty?| 357 |empty| 362 |elt| 366
+ |delete| 385 |count| 397 |copyInto!| 409 |copy| 416
+ |convert| 421 |construct| 426 |concat| 431 |coerce| 454
+ |any?| 459 >= 465 > 471 = 477 <= 483 < 489 |#| 495)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
(CONS (|makeByteWordVec2| 5
'(0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4))
@@ -200,36 +200,36 @@
(|OrderedSet|) (|Aggregate|)
(|EltableAggregate| 9 6) (|Evalable| 6)
(|SetCategory|) (|Type|) (|Eltable| 9 6)
- (|InnerEvalable| 6 6) (|CoercibleTo| 28)
- (|ConvertibleTo| 29) (|BasicType|))
- (|makeByteWordVec2| 34
- '(2 7 19 0 0 1 3 0 26 0 9 9 1 1 5 19 0
- 1 2 0 19 24 0 1 1 5 0 0 1 2 0 0 24 0
- 1 1 5 0 0 1 2 0 0 24 0 1 2 0 19 0 7 1
- 3 0 6 0 25 6 1 3 0 6 0 9 6 16 2 0 0
- 23 0 1 0 0 0 1 1 0 0 0 1 1 0 0 0 1 1
- 7 0 0 1 2 7 0 6 0 1 2 0 0 23 0 1 4 7
- 6 18 0 6 6 1 3 0 6 18 0 6 1 2 0 6 18
- 0 1 3 0 6 0 9 6 15 2 0 6 0 9 13 2 7 9
- 6 0 1 3 7 9 6 0 9 1 2 0 9 23 0 1 1 0
- 20 0 1 2 0 0 7 6 12 2 0 19 0 7 1 1 6
- 9 0 10 2 5 0 0 0 1 2 5 0 0 0 1 3 0 0
- 24 0 0 1 1 0 20 0 1 2 7 19 6 0 1 1 6
- 9 0 1 2 5 0 0 0 1 2 0 0 27 0 1 3 0 0
- 18 0 0 1 2 0 0 27 0 1 2 0 19 0 7 1 1
- 7 30 0 1 3 0 0 0 0 9 1 3 0 0 6 0 9 1
- 1 0 34 0 1 2 0 19 9 0 1 1 7 31 0 1 1
- 6 6 0 1 2 0 33 23 0 1 2 0 0 0 6 17 2
- 0 19 23 0 1 3 9 0 0 20 20 1 2 9 0 0
- 21 1 3 9 0 0 6 6 1 2 9 0 0 22 1 2 0
- 19 0 0 1 2 7 19 6 0 1 1 0 20 0 1 1 0
- 19 0 1 0 0 0 11 2 0 0 0 25 1 2 0 6 0
- 9 14 3 0 6 0 9 6 1 2 0 0 0 9 1 2 0 0
- 0 25 1 2 7 7 6 0 1 2 0 7 23 0 1 3 0 0
- 0 0 9 1 1 0 0 0 1 1 3 29 0 1 1 0 0 20
- 1 1 0 0 32 1 2 0 0 6 0 1 2 0 0 0 0 1
- 2 0 0 0 6 1 1 8 28 0 1 2 0 19 23 0 1
- 2 5 19 0 0 1 2 5 19 0 0 1 2 7 19 0 0
- 1 2 5 19 0 0 1 2 5 19 0 0 1 1 0 7 0
- 8)))))
+ (|InnerEvalable| 6 6) (|CoercibleTo| 32)
+ (|ConvertibleTo| 33) (|BasicType|))
+ (|makeByteWordVec2| 37
+ '(0 9 0 10 0 18 0 19 0 7 0 20 2 7 23 0
+ 0 1 3 0 30 0 9 9 1 1 5 23 0 1 2 0 23
+ 28 0 1 1 5 0 0 1 2 0 0 28 0 1 1 5 0 0
+ 1 2 0 0 28 0 1 2 0 23 0 7 1 3 0 6 0
+ 29 6 1 3 0 6 0 9 6 17 2 0 0 27 0 1 0
+ 0 0 1 1 0 0 0 1 1 0 0 0 1 1 7 0 0 1 2
+ 7 0 6 0 1 2 0 0 27 0 1 4 7 6 22 0 6 6
+ 1 3 0 6 22 0 6 1 2 0 6 22 0 1 3 0 6 0
+ 9 6 16 2 0 6 0 9 14 2 7 9 6 0 1 3 7 9
+ 6 0 9 1 2 0 9 27 0 1 1 0 24 0 1 2 0 0
+ 7 6 13 2 0 23 0 7 1 1 6 9 0 11 2 5 0
+ 0 0 1 2 5 0 0 0 1 3 0 0 28 0 0 1 1 0
+ 24 0 1 2 7 23 6 0 1 1 6 9 0 1 2 5 0 0
+ 0 1 2 0 0 31 0 1 3 0 0 22 0 0 1 2 0 0
+ 31 0 1 2 0 23 0 7 1 1 7 34 0 1 3 0 0
+ 0 0 9 1 3 0 0 6 0 9 1 1 0 37 0 1 2 0
+ 23 9 0 1 1 7 18 0 1 1 6 6 0 1 2 0 36
+ 27 0 1 2 0 0 0 6 21 2 0 23 27 0 1 3 9
+ 0 0 24 24 1 2 9 0 0 25 1 3 9 0 0 6 6
+ 1 2 9 0 0 26 1 2 0 23 0 0 1 2 7 23 6
+ 0 1 1 0 24 0 1 1 0 23 0 1 0 0 0 12 2
+ 0 0 0 29 1 2 0 6 0 9 15 3 0 6 0 9 6 1
+ 2 0 0 0 9 1 2 0 0 0 29 1 2 7 7 6 0 1
+ 2 0 7 27 0 1 3 0 0 0 0 9 1 1 0 0 0 1
+ 1 3 33 0 1 1 0 0 24 1 1 0 0 35 1 2 0
+ 0 6 0 1 2 0 0 0 0 1 2 0 0 0 6 1 1 8
+ 32 0 1 2 0 23 27 0 1 2 5 23 0 0 1 2 5
+ 23 0 0 1 2 7 23 0 0 1 2 5 23 0 0 1 2
+ 5 23 0 0 1 1 0 7 0 8)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/PSETCAT-.lsp b/src/algebra/strap/PSETCAT-.lsp
index 63efb140..0168ae69 100644
--- a/src/algebra/strap/PSETCAT-.lsp
+++ b/src/algebra/strap/PSETCAT-.lsp
@@ -173,7 +173,7 @@
(NOT (SPADCALL
(SPADCALL (|SPADfirst| |lp|)
(|getShellEntry| $ 22))
- |v| (|getShellEntry| $ 28))))))
+ |v| (|getShellEntry| $ 31))))))
(GO G191)))
(SEQ (EXIT (LETT |lp| (CDR |lp|)
|PSETCAT-;mainVariable?;VarSetSB;6|)))
@@ -200,7 +200,7 @@
(LETT |lq| (CONS |p| |lq|)
|PSETCAT-;collectUnder;SVarSetS;7|)))))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |lq| (|getShellEntry| $ 30)))))))
+ (EXIT (SPADCALL |lq| (|getShellEntry| $ 35)))))))
(DEFUN |PSETCAT-;collectUpper;SVarSetS;8| (|ps| |v| $)
(PROG (|p| |lp| |lq|)
@@ -224,7 +224,7 @@
(LETT |lq| (CONS |p| |lq|)
|PSETCAT-;collectUpper;SVarSetS;8|)))))))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |lq| (|getShellEntry| $ 30)))))))
+ (EXIT (SPADCALL |lq| (|getShellEntry| $ 35)))))))
(DEFUN |PSETCAT-;collect;SVarSetS;9| (|ps| |v| $)
(PROG (|p| |lp| |lq|)
@@ -244,11 +244,11 @@
((SPADCALL
(SPADCALL |p|
(|getShellEntry| $ 22))
- |v| (|getShellEntry| $ 28))
+ |v| (|getShellEntry| $ 31))
(LETT |lq| (CONS |p| |lq|)
|PSETCAT-;collect;SVarSetS;9|)))))))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |lq| (|getShellEntry| $ 30)))))))
+ (EXIT (SPADCALL |lq| (|getShellEntry| $ 35)))))))
(DEFUN |PSETCAT-;sort;SVarSetR;10| (|ps| |v| $)
(PROG (|p| |lp| |us| |vs| |ws|)
@@ -272,16 +272,16 @@
|PSETCAT-;sort;SVarSetR;10|))
((SPADCALL
(SPADCALL |p| (|getShellEntry| $ 22))
- |v| (|getShellEntry| $ 28))
+ |v| (|getShellEntry| $ 31))
(LETT |vs| (CONS |p| |vs|)
|PSETCAT-;sort;SVarSetR;10|))
('T
(LETT |ws| (CONS |p| |ws|)
|PSETCAT-;sort;SVarSetR;10|)))))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (VECTOR (SPADCALL |us| (|getShellEntry| $ 30))
- (SPADCALL |vs| (|getShellEntry| $ 30))
- (SPADCALL |ws| (|getShellEntry| $ 30))))))))
+ (EXIT (VECTOR (SPADCALL |us| (|getShellEntry| $ 35))
+ (SPADCALL |vs| (|getShellEntry| $ 35))
+ (SPADCALL |ws| (|getShellEntry| $ 35))))))))
(DEFUN |PSETCAT-;=;2SB;11| (|ps1| |ps2| $)
(PROG (#0=#:G1564 #1=#:G1565 #2=#:G1566 |p| #3=#:G1567)
@@ -305,7 +305,7 @@
|PSETCAT-;=;2SB;11|)))
(LETT #1# (CDR #1#) |PSETCAT-;=;2SB;11|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 37))
+ (|getShellEntry| $ 42))
(SPADCALL
(PROGN
(LETT #2# NIL |PSETCAT-;=;2SB;11|)
@@ -324,28 +324,28 @@
|PSETCAT-;=;2SB;11|)))
(LETT #3# (CDR #3#) |PSETCAT-;=;2SB;11|)
(GO G190) G191 (EXIT (NREVERSE0 #2#))))
- (|getShellEntry| $ 37))
- (|getShellEntry| $ 38))))))
+ (|getShellEntry| $ 42))
+ (|getShellEntry| $ 43))))))
(DEFUN |PSETCAT-;localInf?| (|p| |q| $)
- (SPADCALL (SPADCALL |p| (|getShellEntry| $ 40))
- (SPADCALL |q| (|getShellEntry| $ 40)) (|getShellEntry| $ 41)))
+ (SPADCALL (SPADCALL |p| (|getShellEntry| $ 45))
+ (SPADCALL |q| (|getShellEntry| $ 45)) (|getShellEntry| $ 46)))
(DEFUN |PSETCAT-;localTriangular?| (|lp| $)
(PROG (|q| |p|)
(RETURN
- (SEQ (LETT |lp| (SPADCALL (ELT $ 42) |lp| (|getShellEntry| $ 26))
+ (SEQ (LETT |lp| (SPADCALL (ELT $ 47) |lp| (|getShellEntry| $ 26))
|PSETCAT-;localTriangular?|)
(EXIT (COND
((NULL |lp|) 'T)
- ((SPADCALL (ELT $ 24) |lp| (|getShellEntry| $ 43))
+ ((SPADCALL (ELT $ 24) |lp| (|getShellEntry| $ 49))
'NIL)
('T
(SEQ (LETT |lp|
(SPADCALL
(CONS
#'|PSETCAT-;localTriangular?!0| $)
- |lp| (|getShellEntry| $ 45))
+ |lp| (|getShellEntry| $ 51))
|PSETCAT-;localTriangular?|)
(LETT |p| (|SPADfirst| |lp|)
|PSETCAT-;localTriangular?|)
@@ -382,31 +382,31 @@
(|PSETCAT-;localTriangular?| (|PSETCAT-;elements| |ps| $) $))
(DEFUN |PSETCAT-;trivialIdeal?;SB;15| (|ps| $)
- (NULL (SPADCALL (ELT $ 42) (|PSETCAT-;elements| |ps| $)
+ (NULL (SPADCALL (ELT $ 47) (|PSETCAT-;elements| |ps| $)
(|getShellEntry| $ 26))))
(DEFUN |PSETCAT-;roughUnitIdeal?;SB;16| (|ps| $)
(SPADCALL (ELT $ 24)
- (SPADCALL (ELT $ 42) (|PSETCAT-;elements| |ps| $)
+ (SPADCALL (ELT $ 47) (|PSETCAT-;elements| |ps| $)
(|getShellEntry| $ 26))
- (|getShellEntry| $ 43)))
+ (|getShellEntry| $ 49)))
(DEFUN |PSETCAT-;relativelyPrimeLeadingMonomials?| (|p| |q| $)
(PROG (|dp| |dq|)
(RETURN
- (SEQ (LETT |dp| (SPADCALL |p| (|getShellEntry| $ 40))
+ (SEQ (LETT |dp| (SPADCALL |p| (|getShellEntry| $ 45))
|PSETCAT-;relativelyPrimeLeadingMonomials?|)
- (LETT |dq| (SPADCALL |q| (|getShellEntry| $ 40))
+ (LETT |dq| (SPADCALL |q| (|getShellEntry| $ 45))
|PSETCAT-;relativelyPrimeLeadingMonomials?|)
- (EXIT (SPADCALL (SPADCALL |dp| |dq| (|getShellEntry| $ 49))
- (SPADCALL |dp| |dq| (|getShellEntry| $ 50))
- (|getShellEntry| $ 51)))))))
+ (EXIT (SPADCALL (SPADCALL |dp| |dq| (|getShellEntry| $ 55))
+ (SPADCALL |dp| |dq| (|getShellEntry| $ 56))
+ (|getShellEntry| $ 57)))))))
(DEFUN |PSETCAT-;roughBase?;SB;18| (|ps| $)
(PROG (|p| |lp| |rB?| |copylp|)
(RETURN
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 42) (|PSETCAT-;elements| |ps| $)
+ (SPADCALL (ELT $ 47) (|PSETCAT-;elements| |ps| $)
(|getShellEntry| $ 26))
|PSETCAT-;roughBase?;SB;18|)
(EXIT (COND
@@ -450,16 +450,16 @@
(RETURN
(SEQ (LETT |lp|
(SPADCALL (|PSETCAT-;elements| |ps1| $) |ps2|
- (|getShellEntry| $ 53))
+ (|getShellEntry| $ 59))
|PSETCAT-;roughSubIdeal?;2SB;19|)
- (EXIT (NULL (SPADCALL (ELT $ 42) |lp|
+ (EXIT (NULL (SPADCALL (ELT $ 47) |lp|
(|getShellEntry| $ 26))))))))
(DEFUN |PSETCAT-;roughEqualIdeals?;2SB;20| (|ps1| |ps2| $)
(COND
- ((SPADCALL |ps1| |ps2| (|getShellEntry| $ 55)) 'T)
- ((SPADCALL |ps1| |ps2| (|getShellEntry| $ 56))
- (SPADCALL |ps2| |ps1| (|getShellEntry| $ 56)))
+ ((SPADCALL |ps1| |ps2| (|getShellEntry| $ 61)) 'T)
+ ((SPADCALL |ps1| |ps2| (|getShellEntry| $ 62))
+ (SPADCALL |ps2| |ps1| (|getShellEntry| $ 62)))
('T 'NIL)))
(DEFUN |PSETCAT-;exactQuo| (|r| |s| $)
@@ -467,9 +467,9 @@
(RETURN
(COND
((|HasCategory| (|getShellEntry| $ 7) '(|EuclideanDomain|))
- (SPADCALL |r| |s| (|getShellEntry| $ 58)))
+ (SPADCALL |r| |s| (|getShellEntry| $ 64)))
('T
- (PROG2 (LETT #0# (SPADCALL |r| |s| (|getShellEntry| $ 60))
+ (PROG2 (LETT #0# (SPADCALL |r| |s| (|getShellEntry| $ 66))
|PSETCAT-;exactQuo|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) (|getShellEntry| $ 7) #0#)))))))
@@ -478,16 +478,16 @@
(PROG (|lp1| |p| |e| |g| |#G45| |#G46| |lca| |lcp| |r| |lp2|)
(RETURN
(SEQ (LETT |lp1|
- (SPADCALL (ELT $ 42) (|PSETCAT-;elements| |ps| $)
+ (SPADCALL (ELT $ 47) (|PSETCAT-;elements| |ps| $)
(|getShellEntry| $ 26))
|PSETCAT-;headRemainder;PSR;22|)
(EXIT (COND
- ((NULL |lp1|) (CONS |a| (|spadConstant| $ 61)))
- ((SPADCALL (ELT $ 24) |lp1| (|getShellEntry| $ 43))
- (CONS (SPADCALL |a| (|getShellEntry| $ 62))
- (|spadConstant| $ 61)))
+ ((NULL |lp1|) (CONS |a| (|spadConstant| $ 67)))
+ ((SPADCALL (ELT $ 24) |lp1| (|getShellEntry| $ 49))
+ (CONS (SPADCALL |a| (|getShellEntry| $ 68))
+ (|spadConstant| $ 67)))
('T
- (SEQ (LETT |r| (|spadConstant| $ 61)
+ (SEQ (LETT |r| (|spadConstant| $ 67)
|PSETCAT-;headRemainder;PSR;22|)
(LETT |lp1|
(SPADCALL
@@ -496,7 +496,7 @@
$)
(REVERSE
(|PSETCAT-;elements| |ps| $))
- (|getShellEntry| $ 45))
+ (|getShellEntry| $ 51))
|PSETCAT-;headRemainder;PSR;22|)
(LETT |lp2| |lp1|
|PSETCAT-;headRemainder;PSR;22|)
@@ -504,7 +504,7 @@
(COND
((NULL (COND
((SPADCALL |a|
- (|getShellEntry| $ 42))
+ (|getShellEntry| $ 47))
'NIL)
('T (NOT (NULL |lp2|)))))
(GO G191)))
@@ -513,10 +513,10 @@
(LETT |e|
(SPADCALL
(SPADCALL |a|
- (|getShellEntry| $ 40))
+ (|getShellEntry| $ 45))
(SPADCALL |p|
- (|getShellEntry| $ 40))
- (|getShellEntry| $ 63))
+ (|getShellEntry| $ 45))
+ (|getShellEntry| $ 70))
|PSETCAT-;headRemainder;PSR;22|)
(EXIT
(COND
@@ -526,13 +526,13 @@
(SPADCALL
(LETT |lca|
(SPADCALL |a|
- (|getShellEntry| $ 64))
+ (|getShellEntry| $ 71))
|PSETCAT-;headRemainder;PSR;22|)
(LETT |lcp|
(SPADCALL |p|
- (|getShellEntry| $ 64))
+ (|getShellEntry| $ 71))
|PSETCAT-;headRemainder;PSR;22|)
- (|getShellEntry| $ 65))
+ (|getShellEntry| $ 72))
|PSETCAT-;headRemainder;PSR;22|)
(PROGN
(LETT |#G45|
@@ -551,19 +551,19 @@
(SPADCALL
(SPADCALL |lcp|
(SPADCALL |a|
- (|getShellEntry| $ 62))
- (|getShellEntry| $ 66))
+ (|getShellEntry| $ 68))
+ (|getShellEntry| $ 73))
(SPADCALL
(SPADCALL |lca| (QCDR |e|)
- (|getShellEntry| $ 67))
+ (|getShellEntry| $ 74))
(SPADCALL |p|
- (|getShellEntry| $ 62))
- (|getShellEntry| $ 68))
- (|getShellEntry| $ 69))
+ (|getShellEntry| $ 68))
+ (|getShellEntry| $ 75))
+ (|getShellEntry| $ 76))
|PSETCAT-;headRemainder;PSR;22|)
(LETT |r|
(SPADCALL |r| |lcp|
- (|getShellEntry| $ 70))
+ (|getShellEntry| $ 77))
|PSETCAT-;headRemainder;PSR;22|)
(EXIT
(LETT |lp2| |lp1|
@@ -579,15 +579,15 @@
(RETURN
(SEQ (LETT |g|
(SPADCALL (QCDR |frac|) (QCAR |frac|)
- (|getShellEntry| $ 73))
+ (|getShellEntry| $ 80))
|PSETCAT-;makeIrreducible!|)
(EXIT (COND
- ((SPADCALL |g| (|getShellEntry| $ 74)) |frac|)
+ ((SPADCALL |g| (|getShellEntry| $ 81)) |frac|)
('T
(SEQ (PROGN
(RPLACA |frac|
(SPADCALL (QCAR |frac|) |g|
- (|getShellEntry| $ 75)))
+ (|getShellEntry| $ 82)))
(QCAR |frac|))
(PROGN
(RPLACD |frac|
@@ -601,22 +601,22 @@
(RETURN
(SEQ (LETT |hRa|
(|PSETCAT-;makeIrreducible!|
- (SPADCALL |a| |ps| (|getShellEntry| $ 76)) $)
+ (SPADCALL |a| |ps| (|getShellEntry| $ 83)) $)
|PSETCAT-;remainder;PSR;24|)
(LETT |a| (QCAR |hRa|) |PSETCAT-;remainder;PSR;24|)
(LETT |r| (QCDR |hRa|) |PSETCAT-;remainder;PSR;24|)
(EXIT (COND
- ((SPADCALL |a| (|getShellEntry| $ 42))
- (VECTOR (|spadConstant| $ 61) |a| |r|))
+ ((SPADCALL |a| (|getShellEntry| $ 47))
+ (VECTOR (|spadConstant| $ 67) |a| |r|))
('T
(SEQ (LETT |b|
- (SPADCALL (|spadConstant| $ 61)
+ (SPADCALL (|spadConstant| $ 67)
(SPADCALL |a|
- (|getShellEntry| $ 40))
- (|getShellEntry| $ 67))
+ (|getShellEntry| $ 45))
+ (|getShellEntry| $ 74))
|PSETCAT-;remainder;PSR;24|)
(LETT |c|
- (SPADCALL |a| (|getShellEntry| $ 64))
+ (SPADCALL |a| (|getShellEntry| $ 71))
|PSETCAT-;remainder;PSR;24|)
(SEQ G190
(COND
@@ -624,43 +624,43 @@
(SPADCALL
(LETT |a|
(SPADCALL |a|
- (|getShellEntry| $ 62))
+ (|getShellEntry| $ 68))
|PSETCAT-;remainder;PSR;24|)
- (|getShellEntry| $ 42))))
+ (|getShellEntry| $ 47))))
(GO G191)))
(SEQ (LETT |hRa|
(|PSETCAT-;makeIrreducible!|
(SPADCALL |a| |ps|
- (|getShellEntry| $ 76))
+ (|getShellEntry| $ 83))
$)
|PSETCAT-;remainder;PSR;24|)
(LETT |a| (QCAR |hRa|)
|PSETCAT-;remainder;PSR;24|)
(LETT |r|
(SPADCALL |r| (QCDR |hRa|)
- (|getShellEntry| $ 70))
+ (|getShellEntry| $ 77))
|PSETCAT-;remainder;PSR;24|)
(LETT |g|
(SPADCALL |c|
(LETT |lca|
(SPADCALL |a|
- (|getShellEntry| $ 64))
+ (|getShellEntry| $ 71))
|PSETCAT-;remainder;PSR;24|)
- (|getShellEntry| $ 65))
+ (|getShellEntry| $ 72))
|PSETCAT-;remainder;PSR;24|)
(LETT |b|
(SPADCALL
(SPADCALL
(SPADCALL (QCDR |hRa|)
(|PSETCAT-;exactQuo| |c| |g| $)
- (|getShellEntry| $ 70))
- |b| (|getShellEntry| $ 66))
+ (|getShellEntry| $ 77))
+ |b| (|getShellEntry| $ 73))
(SPADCALL
(|PSETCAT-;exactQuo| |lca| |g| $)
(SPADCALL |a|
- (|getShellEntry| $ 40))
- (|getShellEntry| $ 67))
- (|getShellEntry| $ 77))
+ (|getShellEntry| $ 45))
+ (|getShellEntry| $ 74))
+ (|getShellEntry| $ 84))
|PSETCAT-;remainder;PSR;24|)
(EXIT
(LETT |c| |g|
@@ -672,19 +672,19 @@
(PROG (|p| |rs|)
(RETURN
(SEQ (COND
- ((SPADCALL |cs| (|getShellEntry| $ 80)) |ps|)
- ((SPADCALL |cs| (|getShellEntry| $ 81))
- (LIST (|spadConstant| $ 82)))
+ ((SPADCALL |cs| (|getShellEntry| $ 87)) |ps|)
+ ((SPADCALL |cs| (|getShellEntry| $ 88))
+ (LIST (|spadConstant| $ 89)))
('T
(SEQ (LETT |ps|
- (SPADCALL (ELT $ 42) |ps|
+ (SPADCALL (ELT $ 47) |ps|
(|getShellEntry| $ 26))
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|)
(EXIT (COND
((NULL |ps|) |ps|)
((SPADCALL (ELT $ 24) |ps|
- (|getShellEntry| $ 43))
- (LIST (|spadConstant| $ 83)))
+ (|getShellEntry| $ 49))
+ (LIST (|spadConstant| $ 90)))
('T
(SEQ (LETT |rs| NIL
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|)
@@ -700,13 +700,13 @@
(LETT |p|
(QCAR
(SPADCALL |p| |cs|
- (|getShellEntry| $ 76)))
+ (|getShellEntry| $ 83)))
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|)
(EXIT
(COND
((NULL
(SPADCALL |p|
- (|getShellEntry| $ 42)))
+ (|getShellEntry| $ 47)))
(COND
((SPADCALL |p|
(|getShellEntry| $ 24))
@@ -716,37 +716,37 @@
(EXIT
(LETT |rs|
(LIST
- (|spadConstant| $ 83))
+ (|spadConstant| $ 90))
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|))))
('T
(SEQ
(SPADCALL |p|
- (|getShellEntry| $ 84))
+ (|getShellEntry| $ 91))
(EXIT
(LETT |rs|
(CONS |p| |rs|)
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|)))))))))
NIL (GO G190) G191 (EXIT NIL))
(EXIT (SPADCALL |rs|
- (|getShellEntry| $ 85))))))))))))))
+ (|getShellEntry| $ 92))))))))))))))
(DEFUN |PSETCAT-;rewriteIdealWithRemainder;LSL;26| (|ps| |cs| $)
(PROG (|p| |rs|)
(RETURN
(SEQ (COND
- ((SPADCALL |cs| (|getShellEntry| $ 80)) |ps|)
- ((SPADCALL |cs| (|getShellEntry| $ 81))
- (LIST (|spadConstant| $ 82)))
+ ((SPADCALL |cs| (|getShellEntry| $ 87)) |ps|)
+ ((SPADCALL |cs| (|getShellEntry| $ 88))
+ (LIST (|spadConstant| $ 89)))
('T
(SEQ (LETT |ps|
- (SPADCALL (ELT $ 42) |ps|
+ (SPADCALL (ELT $ 47) |ps|
(|getShellEntry| $ 26))
|PSETCAT-;rewriteIdealWithRemainder;LSL;26|)
(EXIT (COND
((NULL |ps|) |ps|)
((SPADCALL (ELT $ 24) |ps|
- (|getShellEntry| $ 43))
- (LIST (|spadConstant| $ 83)))
+ (|getShellEntry| $ 49))
+ (LIST (|spadConstant| $ 90)))
('T
(SEQ (LETT |rs| NIL
|PSETCAT-;rewriteIdealWithRemainder;LSL;26|)
@@ -762,14 +762,14 @@
(LETT |p|
(QVELT
(SPADCALL |p| |cs|
- (|getShellEntry| $ 87))
+ (|getShellEntry| $ 94))
1)
|PSETCAT-;rewriteIdealWithRemainder;LSL;26|)
(EXIT
(COND
((NULL
(SPADCALL |p|
- (|getShellEntry| $ 42)))
+ (|getShellEntry| $ 47)))
(COND
((SPADCALL |p|
(|getShellEntry| $ 24))
@@ -779,18 +779,18 @@
(EXIT
(LETT |rs|
(LIST
- (|spadConstant| $ 83))
+ (|spadConstant| $ 90))
|PSETCAT-;rewriteIdealWithRemainder;LSL;26|))))
('T
(LETT |rs|
(CONS
(SPADCALL |p|
- (|getShellEntry| $ 88))
+ (|getShellEntry| $ 95))
|rs|)
|PSETCAT-;rewriteIdealWithRemainder;LSL;26|)))))))
NIL (GO G190) G191 (EXIT NIL))
(EXIT (SPADCALL |rs|
- (|getShellEntry| $ 85))))))))))))))
+ (|getShellEntry| $ 92))))))))))))))
(DEFUN |PolynomialSetCategory&| (|#1| |#2| |#3| |#4| |#5|)
(PROG (|dv$1| |dv$2| |dv$3| |dv$4| |dv$5| |dv$| $ |pv$|)
@@ -805,7 +805,7 @@
(LETT |dv$|
(LIST '|PolynomialSetCategory&| |dv$1| |dv$2| |dv$3|
|dv$4| |dv$5|) . #0#)
- (LETT $ (|newShell| 90) . #0#)
+ (LETT $ (|newShell| 97) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -820,18 +820,18 @@
(COND
((|testBitVector| |pv$| 1)
(PROGN
- (|setShellEntry| $ 48
+ (|setShellEntry| $ 54
(CONS (|dispatchFunction|
|PSETCAT-;roughUnitIdeal?;SB;16|)
$))
- (|setShellEntry| $ 52
+ (|setShellEntry| $ 58
(CONS (|dispatchFunction| |PSETCAT-;roughBase?;SB;18|)
$))
- (|setShellEntry| $ 54
+ (|setShellEntry| $ 60
(CONS (|dispatchFunction|
|PSETCAT-;roughSubIdeal?;2SB;19|)
$))
- (|setShellEntry| $ 57
+ (|setShellEntry| $ 63
(CONS (|dispatchFunction|
|PSETCAT-;roughEqualIdeals?;2SB;20|)
$)))))
@@ -840,19 +840,19 @@
(COND
((|HasCategory| |#4| '(|ConvertibleTo| (|Symbol|)))
(PROGN
- (|setShellEntry| $ 72
+ (|setShellEntry| $ 79
(CONS (|dispatchFunction|
|PSETCAT-;headRemainder;PSR;22|)
$))
- (|setShellEntry| $ 79
+ (|setShellEntry| $ 86
(CONS (|dispatchFunction|
|PSETCAT-;remainder;PSR;24|)
$))
- (|setShellEntry| $ 86
+ (|setShellEntry| $ 93
(CONS (|dispatchFunction|
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|)
$))
- (|setShellEntry| $ 89
+ (|setShellEntry| $ 96
(CONS (|dispatchFunction|
|PSETCAT-;rewriteIdealWithRemainder;LSL;26|)
$)))))))
@@ -866,73 +866,79 @@
(21 . |removeDuplicates|) (|Mapping| 15 9 9) (26 . |sort|)
(32 . |mvar|) |PSETCAT-;variables;SL;4| (37 . |ground?|)
(|Mapping| 15 10) (42 . |remove|)
- |PSETCAT-;mainVariables;SL;5| (48 . =)
- |PSETCAT-;mainVariable?;VarSetSB;6| (54 . |construct|)
- |PSETCAT-;collectUnder;SVarSetS;7|
+ |PSETCAT-;mainVariables;SL;5| (48 . |empty?|)
+ (53 . |false|) (57 . |first|) (62 . =) (68 . |rest|)
+ |PSETCAT-;mainVariable?;VarSetSB;6| (73 . |cons|)
+ (79 . |construct|) |PSETCAT-;collectUnder;SVarSetS;7|
|PSETCAT-;collectUpper;SVarSetS;8|
|PSETCAT-;collect;SVarSetS;9|
(|Record| (|:| |under| $) (|:| |floor| $) (|:| |upper| $))
- |PSETCAT-;sort;SVarSetR;10| (|Set| 10) (59 . |brace|)
- (64 . =) |PSETCAT-;=;2SB;11| (70 . |degree|) (75 . <)
- (81 . |zero?|) (86 . |any?|) (|Mapping| 15 10 10)
- (92 . |sort|) |PSETCAT-;triangular?;SB;14|
- |PSETCAT-;trivialIdeal?;SB;15| (98 . |roughUnitIdeal?|)
- (103 . |sup|) (109 . +) (115 . =) (121 . |roughBase?|)
- (126 . |rewriteIdealWithRemainder|)
- (132 . |roughSubIdeal?|) (138 . =)
- (144 . |roughSubIdeal?|) (150 . |roughEqualIdeals?|)
- (156 . |quo|) (|Union| $ '"failed") (162 . |exquo|)
- (168 . |One|) (172 . |reductum|) (177 . |subtractIfCan|)
- (183 . |leadingCoefficient|) (188 . |gcd|) (194 . *)
- (200 . |monomial|) (206 . *) (212 . -) (218 . *)
+ |PSETCAT-;sort;SVarSetR;10| (|Set| 10) (84 . |brace|)
+ (89 . =) |PSETCAT-;=;2SB;11| (95 . |degree|) (100 . <)
+ (106 . |zero?|) (111 . |true|) (115 . |any?|)
+ (|Mapping| 15 10 10) (121 . |sort|)
+ |PSETCAT-;triangular?;SB;14|
+ |PSETCAT-;trivialIdeal?;SB;15| (127 . |roughUnitIdeal?|)
+ (132 . |sup|) (138 . +) (144 . =) (150 . |roughBase?|)
+ (155 . |rewriteIdealWithRemainder|)
+ (161 . |roughSubIdeal?|) (167 . =)
+ (173 . |roughSubIdeal?|) (179 . |roughEqualIdeals?|)
+ (185 . |quo|) (|Union| $ '"failed") (191 . |exquo|)
+ (197 . |One|) (201 . |reductum|) (206 . |reverse|)
+ (211 . |subtractIfCan|) (217 . |leadingCoefficient|)
+ (222 . |gcd|) (228 . *) (234 . |monomial|) (240 . *)
+ (246 . -) (252 . *)
(|Record| (|:| |num| 10) (|:| |den| 7))
- (224 . |headRemainder|) (230 . |gcd|) (236 . |one?|)
- (241 . |exactQuotient!|) (247 . |headRemainder|) (253 . +)
+ (258 . |headRemainder|) (264 . |gcd|) (270 . |one?|)
+ (275 . |exactQuotient!|) (281 . |headRemainder|) (287 . +)
(|Record| (|:| |rnum| 7) (|:| |polnum| 10) (|:| |den| 7))
- (259 . |remainder|) (265 . |trivialIdeal?|)
- (270 . |roughUnitIdeal?|) (275 . |Zero|) (279 . |One|)
- (283 . |primitivePart!|) (288 . |removeDuplicates|)
- (293 . |rewriteIdealWithHeadRemainder|)
- (299 . |remainder|) (305 . |unitCanonical|)
- (310 . |rewriteIdealWithRemainder|))
- '#(|variables| 316 |trivialIdeal?| 321 |triangular?| 326
- |sort| 331 |roughUnitIdeal?| 337 |roughSubIdeal?| 342
- |roughEqualIdeals?| 348 |roughBase?| 354
- |rewriteIdealWithRemainder| 359
- |rewriteIdealWithHeadRemainder| 365 |remainder| 371
- |mainVariables| 377 |mainVariable?| 382 |headRemainder|
- 388 |collectUpper| 394 |collectUnder| 400 |collect| 406 =
- 412)
+ (293 . |remainder|) (299 . |trivialIdeal?|)
+ (304 . |roughUnitIdeal?|) (309 . |Zero|) (313 . |One|)
+ (317 . |primitivePart!|) (322 . |removeDuplicates|)
+ (327 . |rewriteIdealWithHeadRemainder|)
+ (333 . |remainder|) (339 . |unitCanonical|)
+ (344 . |rewriteIdealWithRemainder|))
+ '#(|variables| 350 |trivialIdeal?| 355 |triangular?| 360
+ |sort| 365 |roughUnitIdeal?| 371 |roughSubIdeal?| 376
+ |roughEqualIdeals?| 382 |roughBase?| 388
+ |rewriteIdealWithRemainder| 393
+ |rewriteIdealWithHeadRemainder| 399 |remainder| 405
+ |mainVariables| 411 |mainVariable?| 416 |headRemainder|
+ 422 |collectUpper| 428 |collectUnder| 434 |collect| 440 =
+ 446)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 89
+ (|makeByteWordVec2| 96
'(1 6 11 0 12 1 10 13 0 14 2 9 15 0 0
16 1 13 0 17 18 1 13 0 0 19 2 13 0 20
0 21 1 10 9 0 22 1 10 15 0 24 2 11 0
- 25 0 26 2 9 15 0 0 28 1 6 0 11 30 1
- 36 0 11 37 2 36 15 0 0 38 1 10 8 0 40
- 2 8 15 0 0 41 1 10 15 0 42 2 11 15 25
- 0 43 2 11 0 44 0 45 1 0 15 0 48 2 8 0
- 0 0 49 2 8 0 0 0 50 2 8 15 0 0 51 1 0
- 15 0 52 2 6 11 11 0 53 2 0 15 0 0 54
- 2 6 15 0 0 55 2 6 15 0 0 56 2 0 15 0
- 0 57 2 7 0 0 0 58 2 7 59 0 0 60 0 7 0
- 61 1 10 0 0 62 2 8 59 0 0 63 1 10 7 0
- 64 2 7 0 0 0 65 2 10 0 7 0 66 2 10 0
- 7 8 67 2 10 0 0 0 68 2 10 0 0 0 69 2
- 7 0 0 0 70 2 0 71 10 0 72 2 10 7 7 0
- 73 1 7 15 0 74 2 10 0 0 7 75 2 6 71
- 10 0 76 2 10 0 0 0 77 2 0 78 10 0 79
- 1 6 15 0 80 1 6 15 0 81 0 10 0 82 0
- 10 0 83 1 10 0 0 84 1 11 0 0 85 2 0
- 11 11 0 86 2 6 78 10 0 87 1 10 0 0 88
- 2 0 11 11 0 89 1 0 13 0 23 1 0 15 0
- 47 1 0 15 0 46 2 0 34 0 9 35 1 0 15 0
- 48 2 0 15 0 0 54 2 0 15 0 0 57 1 0 15
- 0 52 2 0 11 11 0 89 2 0 11 11 0 86 2
- 0 78 10 0 79 1 0 13 0 27 2 0 15 9 0
- 29 2 0 71 10 0 72 2 0 0 0 9 32 2 0 0
- 0 9 31 2 0 0 0 9 33 2 0 15 0 0 39)))))
+ 25 0 26 1 11 15 0 28 0 15 0 29 1 11
+ 10 0 30 2 9 15 0 0 31 1 11 0 0 32 2
+ 11 0 10 0 34 1 6 0 11 35 1 41 0 11 42
+ 2 41 15 0 0 43 1 10 8 0 45 2 8 15 0 0
+ 46 1 10 15 0 47 0 15 0 48 2 11 15 25
+ 0 49 2 11 0 50 0 51 1 0 15 0 54 2 8 0
+ 0 0 55 2 8 0 0 0 56 2 8 15 0 0 57 1 0
+ 15 0 58 2 6 11 11 0 59 2 0 15 0 0 60
+ 2 6 15 0 0 61 2 6 15 0 0 62 2 0 15 0
+ 0 63 2 7 0 0 0 64 2 7 65 0 0 66 0 7 0
+ 67 1 10 0 0 68 1 11 0 0 69 2 8 65 0 0
+ 70 1 10 7 0 71 2 7 0 0 0 72 2 10 0 7
+ 0 73 2 10 0 7 8 74 2 10 0 0 0 75 2 10
+ 0 0 0 76 2 7 0 0 0 77 2 0 78 10 0 79
+ 2 10 7 7 0 80 1 7 15 0 81 2 10 0 0 7
+ 82 2 6 78 10 0 83 2 10 0 0 0 84 2 0
+ 85 10 0 86 1 6 15 0 87 1 6 15 0 88 0
+ 10 0 89 0 10 0 90 1 10 0 0 91 1 11 0
+ 0 92 2 0 11 11 0 93 2 6 85 10 0 94 1
+ 10 0 0 95 2 0 11 11 0 96 1 0 13 0 23
+ 1 0 15 0 53 1 0 15 0 52 2 0 39 0 9 40
+ 1 0 15 0 54 2 0 15 0 0 60 2 0 15 0 0
+ 63 1 0 15 0 58 2 0 11 11 0 96 2 0 11
+ 11 0 93 2 0 85 10 0 86 1 0 13 0 27 2
+ 0 15 9 0 33 2 0 78 10 0 79 2 0 0 0 9
+ 37 2 0 0 0 9 36 2 0 0 0 9 38 2 0 15 0
+ 0 44)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/QFCAT-.lsp b/src/algebra/strap/QFCAT-.lsp
index 78512ea8..3d8412d1 100644
--- a/src/algebra/strap/QFCAT-.lsp
+++ b/src/algebra/strap/QFCAT-.lsp
@@ -116,8 +116,7 @@
(DEFUN |QFCAT-;reducedSystem;MM;6| (|m| $)
(SPADCALL |m| (|getShellEntry| $ 26)))
-(DEFUN |QFCAT-;characteristic;Nni;7| ($)
- (SPADCALL (|getShellEntry| $ 30)))
+(DEFUN |QFCAT-;characteristic;Nni;7| ($) (|spadConstant| $ 30))
(DEFUN |QFCAT-;differentiate;AMA;8| (|x| |deriv| $)
(PROG (|n| |d|)
@@ -164,14 +163,14 @@
(SPADCALL |y| (|getShellEntry| $ 11)) (|getShellEntry| $ 32))
(SPADCALL (SPADCALL |y| (|getShellEntry| $ 8))
(SPADCALL |x| (|getShellEntry| $ 11)) (|getShellEntry| $ 32))
- (|getShellEntry| $ 49)))
+ (|getShellEntry| $ 50)))
(DEFUN |QFCAT-;<;2AB;13| (|x| |y| $)
(PROG (|#G19| |#G20| |#G21| |#G22|)
(RETURN
(SEQ (COND
((SPADCALL (SPADCALL |x| (|getShellEntry| $ 11))
- (|spadConstant| $ 51) (|getShellEntry| $ 49))
+ (|spadConstant| $ 52) (|getShellEntry| $ 50))
(PROGN
(LETT |#G19| |y| |QFCAT-;<;2AB;13|)
(LETT |#G20| |x| |QFCAT-;<;2AB;13|)
@@ -179,7 +178,7 @@
(LETT |y| |#G20| |QFCAT-;<;2AB;13|))))
(COND
((SPADCALL (SPADCALL |y| (|getShellEntry| $ 11))
- (|spadConstant| $ 51) (|getShellEntry| $ 49))
+ (|spadConstant| $ 52) (|getShellEntry| $ 50))
(PROGN
(LETT |#G21| |y| |QFCAT-;<;2AB;13|)
(LETT |#G22| |x| |QFCAT-;<;2AB;13|)
@@ -192,7 +191,7 @@
(SPADCALL (SPADCALL |y| (|getShellEntry| $ 8))
(SPADCALL |x| (|getShellEntry| $ 11))
(|getShellEntry| $ 32))
- (|getShellEntry| $ 49)))))))
+ (|getShellEntry| $ 50)))))))
(DEFUN |QFCAT-;<;2AB;14| (|x| |y| $)
(SPADCALL
@@ -200,73 +199,73 @@
(SPADCALL |y| (|getShellEntry| $ 11)) (|getShellEntry| $ 32))
(SPADCALL (SPADCALL |y| (|getShellEntry| $ 8))
(SPADCALL |x| (|getShellEntry| $ 11)) (|getShellEntry| $ 32))
- (|getShellEntry| $ 49)))
+ (|getShellEntry| $ 50)))
(DEFUN |QFCAT-;fractionPart;2A;15| (|x| $)
(SPADCALL |x|
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 52))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 53))
(|getShellEntry| $ 9))
- (|getShellEntry| $ 53)))
+ (|getShellEntry| $ 54)))
(DEFUN |QFCAT-;coerce;SA;16| (|s| $)
- (SPADCALL (SPADCALL |s| (|getShellEntry| $ 56))
+ (SPADCALL (SPADCALL |s| (|getShellEntry| $ 57))
(|getShellEntry| $ 9)))
(DEFUN |QFCAT-;retract;AS;17| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 58))
- (|getShellEntry| $ 59)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 59))
+ (|getShellEntry| $ 60)))
(DEFUN |QFCAT-;retractIfCan;AU;18| (|x| $)
(PROG (|r|)
(RETURN
- (SEQ (LETT |r| (SPADCALL |x| (|getShellEntry| $ 62))
+ (SEQ (LETT |r| (SPADCALL |x| (|getShellEntry| $ 63))
|QFCAT-;retractIfCan;AU;18|)
(EXIT (COND
((QEQCAR |r| 1) (CONS 1 "failed"))
- ('T (SPADCALL (QCDR |r|) (|getShellEntry| $ 64)))))))))
+ ('T (SPADCALL (QCDR |r|) (|getShellEntry| $ 65)))))))))
(DEFUN |QFCAT-;convert;AP;19| (|x| $)
(SPADCALL
(SPADCALL (SPADCALL |x| (|getShellEntry| $ 8))
- (|getShellEntry| $ 68))
+ (|getShellEntry| $ 69))
(SPADCALL (SPADCALL |x| (|getShellEntry| $ 11))
- (|getShellEntry| $ 68))
- (|getShellEntry| $ 69)))
+ (|getShellEntry| $ 69))
+ (|getShellEntry| $ 70)))
(DEFUN |QFCAT-;patternMatch;AP2Pmr;20| (|x| |p| |l| $)
- (SPADCALL |x| |p| |l| (|getShellEntry| $ 73)))
+ (SPADCALL |x| |p| |l| (|getShellEntry| $ 74)))
(DEFUN |QFCAT-;convert;AP;21| (|x| $)
(SPADCALL
(SPADCALL (SPADCALL |x| (|getShellEntry| $ 8))
- (|getShellEntry| $ 77))
+ (|getShellEntry| $ 78))
(SPADCALL (SPADCALL |x| (|getShellEntry| $ 11))
- (|getShellEntry| $ 77))
- (|getShellEntry| $ 78)))
+ (|getShellEntry| $ 78))
+ (|getShellEntry| $ 79)))
(DEFUN |QFCAT-;patternMatch;AP2Pmr;22| (|x| |p| |l| $)
- (SPADCALL |x| |p| |l| (|getShellEntry| $ 82)))
+ (SPADCALL |x| |p| |l| (|getShellEntry| $ 83)))
(DEFUN |QFCAT-;coerce;FA;23| (|x| $)
(SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 86))
- (|getShellEntry| $ 87))
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 88))
- (|getShellEntry| $ 87))
- (|getShellEntry| $ 89)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 87))
+ (|getShellEntry| $ 88))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 89))
+ (|getShellEntry| $ 88))
+ (|getShellEntry| $ 90)))
(DEFUN |QFCAT-;retract;AI;24| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 58))
- (|getShellEntry| $ 91)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 59))
+ (|getShellEntry| $ 92)))
(DEFUN |QFCAT-;retractIfCan;AU;25| (|x| $)
(PROG (|u|)
(RETURN
- (SEQ (LETT |u| (SPADCALL |x| (|getShellEntry| $ 62))
+ (SEQ (LETT |u| (SPADCALL |x| (|getShellEntry| $ 63))
|QFCAT-;retractIfCan;AU;25|)
(EXIT (COND
((QEQCAR |u| 1) (CONS 1 "failed"))
- ('T (SPADCALL (QCDR |u|) (|getShellEntry| $ 94)))))))))
+ ('T (SPADCALL (QCDR |u|) (|getShellEntry| $ 95)))))))))
(DEFUN |QFCAT-;random;A;26| ($)
(PROG (|d|)
@@ -275,12 +274,12 @@
(COND
((NULL (SPADCALL
(LETT |d|
- (SPADCALL (|getShellEntry| $ 96))
+ (SPADCALL (|getShellEntry| $ 97))
|QFCAT-;random;A;26|)
- (|getShellEntry| $ 97)))
+ (|getShellEntry| $ 98)))
(GO G191)))
(SEQ (EXIT |d|)) NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL (SPADCALL (|getShellEntry| $ 96)) |d|
+ (EXIT (SPADCALL (SPADCALL (|getShellEntry| $ 97)) |d|
(|getShellEntry| $ 15)))))))
(DEFUN |QFCAT-;reducedSystem;MVR;27| (|m| |v| $)
@@ -288,19 +287,19 @@
(RETURN
(SEQ (LETT |n|
(SPADCALL
- (SPADCALL (SPADCALL |v| (|getShellEntry| $ 100))
- |m| (|getShellEntry| $ 101))
- (|getShellEntry| $ 102))
+ (SPADCALL (SPADCALL |v| (|getShellEntry| $ 101))
+ |m| (|getShellEntry| $ 102))
+ (|getShellEntry| $ 103))
|QFCAT-;reducedSystem;MVR;27|)
(EXIT (CONS (SPADCALL |n|
- (SPADCALL |n| (|getShellEntry| $ 103))
(SPADCALL |n| (|getShellEntry| $ 104))
- (+ 1 (SPADCALL |n| (|getShellEntry| $ 105)))
- (SPADCALL |n| (|getShellEntry| $ 106))
- (|getShellEntry| $ 107))
- (SPADCALL |n|
(SPADCALL |n| (|getShellEntry| $ 105))
- (|getShellEntry| $ 109))))))))
+ (+ 1 (SPADCALL |n| (|getShellEntry| $ 107)))
+ (SPADCALL |n| (|getShellEntry| $ 109))
+ (|getShellEntry| $ 110))
+ (SPADCALL |n|
+ (SPADCALL |n| (|getShellEntry| $ 107))
+ (|getShellEntry| $ 112))))))))
(DEFUN |QuotientFieldCategory&| (|#1| |#2|)
(PROG (|dv$1| |dv$2| |dv$| $ |pv$|)
@@ -311,7 +310,7 @@
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$|
(LIST '|QuotientFieldCategory&| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 120) . #0#)
+ (LETT $ (|newShell| 123) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -355,44 +354,44 @@
(PROGN
(|setShellEntry| $ 44
(CONS (|dispatchFunction| |QFCAT-;convert;AF;10|) $))
- (|setShellEntry| $ 47
+ (|setShellEntry| $ 48
(CONS (|dispatchFunction| |QFCAT-;convert;ADf;11|) $)))))
(COND
((|testBitVector| |pv$| 9)
(COND
((|HasAttribute| |#2| '|canonicalUnitNormal|)
- (|setShellEntry| $ 50
+ (|setShellEntry| $ 51
(CONS (|dispatchFunction| |QFCAT-;<;2AB;12|) $)))
('T
- (|setShellEntry| $ 50
+ (|setShellEntry| $ 51
(CONS (|dispatchFunction| |QFCAT-;<;2AB;13|) $)))))
((|testBitVector| |pv$| 10)
- (|setShellEntry| $ 50
+ (|setShellEntry| $ 51
(CONS (|dispatchFunction| |QFCAT-;<;2AB;14|) $))))
(COND
((|testBitVector| |pv$| 3)
- (|setShellEntry| $ 54
+ (|setShellEntry| $ 55
(CONS (|dispatchFunction| |QFCAT-;fractionPart;2A;15|)
$))))
(COND
((|testBitVector| |pv$| 4)
(PROGN
- (|setShellEntry| $ 57
+ (|setShellEntry| $ 58
(CONS (|dispatchFunction| |QFCAT-;coerce;SA;16|) $))
- (|setShellEntry| $ 60
+ (|setShellEntry| $ 61
(CONS (|dispatchFunction| |QFCAT-;retract;AS;17|) $))
- (|setShellEntry| $ 65
+ (|setShellEntry| $ 66
(CONS (|dispatchFunction| |QFCAT-;retractIfCan;AU;18|)
$)))))
(COND
((|HasCategory| |#2|
'(|ConvertibleTo| (|Pattern| (|Integer|))))
(PROGN
- (|setShellEntry| $ 70
+ (|setShellEntry| $ 71
(CONS (|dispatchFunction| |QFCAT-;convert;AP;19|) $))
(COND
((|HasCategory| |#2| '(|PatternMatchable| (|Integer|)))
- (|setShellEntry| $ 75
+ (|setShellEntry| $ 76
(CONS (|dispatchFunction|
|QFCAT-;patternMatch;AP2Pmr;20|)
$)))))))
@@ -400,33 +399,33 @@
((|HasCategory| |#2|
'(|ConvertibleTo| (|Pattern| (|Float|))))
(PROGN
- (|setShellEntry| $ 79
+ (|setShellEntry| $ 80
(CONS (|dispatchFunction| |QFCAT-;convert;AP;21|) $))
(COND
((|HasCategory| |#2| '(|PatternMatchable| (|Float|)))
- (|setShellEntry| $ 84
+ (|setShellEntry| $ 85
(CONS (|dispatchFunction|
|QFCAT-;patternMatch;AP2Pmr;22|)
$)))))))
(COND
((|testBitVector| |pv$| 11)
(PROGN
- (|setShellEntry| $ 90
+ (|setShellEntry| $ 91
(CONS (|dispatchFunction| |QFCAT-;coerce;FA;23|) $))
(COND
((|domainEqual| |#2| (|Integer|)))
('T
(PROGN
- (|setShellEntry| $ 92
+ (|setShellEntry| $ 93
(CONS (|dispatchFunction| |QFCAT-;retract;AI;24|)
$))
- (|setShellEntry| $ 95
+ (|setShellEntry| $ 96
(CONS (|dispatchFunction|
|QFCAT-;retractIfCan;AU;25|)
$))))))))
(COND
((|testBitVector| |pv$| 2)
- (|setShellEntry| $ 98
+ (|setShellEntry| $ 99
(CONS (|dispatchFunction| |QFCAT-;random;A;26|) $))))
$))))
@@ -445,77 +444,78 @@
|QFCAT-;differentiate;AMA;8| (|InputForm|)
(74 . |convert|) (79 . /) (85 . |convert|) (|Float|)
(90 . |convert|) (95 . /) (101 . |convert|)
- (|DoubleFloat|) (106 . |convert|) (111 . |convert|)
- (|Boolean|) (116 . <) (122 . <) (128 . |Zero|)
- (132 . |wholePart|) (137 . -) (143 . |fractionPart|)
- (|Symbol|) (148 . |coerce|) (153 . |coerce|)
- (158 . |retract|) (163 . |retract|) (168 . |retract|)
- (|Union| 7 '"failed") (173 . |retractIfCan|)
- (|Union| 55 '"failed") (178 . |retractIfCan|)
- (183 . |retractIfCan|) (|Integer|) (|Pattern| 66)
- (188 . |convert|) (193 . /) (199 . |convert|)
- (|PatternMatchResult| 66 6)
- (|PatternMatchQuotientFieldCategory| 66 7 6)
- (204 . |patternMatch|) (|PatternMatchResult| 66 $)
- (211 . |patternMatch|) (|Pattern| 41) (218 . |convert|)
- (223 . /) (229 . |convert|) (|PatternMatchResult| 41 6)
+ (|DoubleFloat|) (106 . |convert|) (111 . /)
+ (117 . |convert|) (|Boolean|) (122 . <) (128 . <)
+ (134 . |Zero|) (138 . |wholePart|) (143 . -)
+ (149 . |fractionPart|) (|Symbol|) (154 . |coerce|)
+ (159 . |coerce|) (164 . |retract|) (169 . |retract|)
+ (174 . |retract|) (|Union| 7 '"failed")
+ (179 . |retractIfCan|) (|Union| 56 '"failed")
+ (184 . |retractIfCan|) (189 . |retractIfCan|) (|Integer|)
+ (|Pattern| 67) (194 . |convert|) (199 . /)
+ (205 . |convert|) (|PatternMatchResult| 67 6)
+ (|PatternMatchQuotientFieldCategory| 67 7 6)
+ (210 . |patternMatch|) (|PatternMatchResult| 67 $)
+ (217 . |patternMatch|) (|Pattern| 41) (224 . |convert|)
+ (229 . /) (235 . |convert|) (|PatternMatchResult| 41 6)
(|PatternMatchQuotientFieldCategory| 41 7 6)
- (234 . |patternMatch|) (|PatternMatchResult| 41 $)
- (241 . |patternMatch|) (|Fraction| 66) (248 . |numer|)
- (253 . |coerce|) (258 . |denom|) (263 . /)
- (269 . |coerce|) (274 . |retract|) (279 . |retract|)
- (|Union| 66 '"failed") (284 . |retractIfCan|)
- (289 . |retractIfCan|) (294 . |random|) (298 . |zero?|)
- (303 . |random|) (|Vector| 6) (307 . |coerce|)
- (312 . |horizConcat|) (318 . |reducedSystem|)
- (323 . |minRowIndex|) (328 . |maxRowIndex|)
- (333 . |minColIndex|) (338 . |maxColIndex|)
- (343 . |subMatrix|) (|Vector| 7) (352 . |column|)
- (|Record| (|:| |mat| 23) (|:| |vec| 108)) (|Vector| $)
- |QFCAT-;reducedSystem;MVR;27| (|Union| 85 '"failed")
- (|Matrix| 66) (|Vector| 66)
- (|Record| (|:| |mat| 114) (|:| |vec| 115)) (|List| 55)
+ (240 . |patternMatch|) (|PatternMatchResult| 41 $)
+ (247 . |patternMatch|) (|Fraction| 67) (254 . |numer|)
+ (259 . |coerce|) (264 . |denom|) (269 . /)
+ (275 . |coerce|) (280 . |retract|) (285 . |retract|)
+ (|Union| 67 '"failed") (290 . |retractIfCan|)
+ (295 . |retractIfCan|) (300 . |random|) (304 . |zero?|)
+ (309 . |random|) (|Vector| 6) (313 . |coerce|)
+ (318 . |horizConcat|) (324 . |reducedSystem|)
+ (329 . |minRowIndex|) (334 . |maxRowIndex|) (339 . |One|)
+ (343 . |minColIndex|) (348 . +) (354 . |maxColIndex|)
+ (359 . |subMatrix|) (|Vector| 7) (368 . |column|)
+ (|Record| (|:| |mat| 23) (|:| |vec| 111)) (|Vector| $)
+ |QFCAT-;reducedSystem;MVR;27| (|Union| 86 '"failed")
+ (|Matrix| 67) (|Vector| 67)
+ (|Record| (|:| |mat| 117) (|:| |vec| 118)) (|List| 56)
(|List| 29) (|OutputForm|))
- '#(|retractIfCan| 358 |retract| 368 |reducedSystem| 378
- |random| 389 |patternMatch| 393 |numerator| 407 |nextItem|
- 412 |map| 417 |init| 423 |fractionPart| 427
- |differentiate| 432 |denominator| 438 |convert| 443
- |coerce| 468 |characteristic| 478 < 482)
+ '#(|retractIfCan| 374 |retract| 384 |reducedSystem| 394
+ |random| 405 |patternMatch| 409 |numerator| 423 |nextItem|
+ 428 |map| 433 |init| 439 |fractionPart| 443
+ |differentiate| 448 |denominator| 454 |convert| 459
+ |coerce| 484 |characteristic| 494 < 498)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 112
+ (|makeByteWordVec2| 115
'(1 6 7 0 8 1 6 0 7 9 1 6 7 0 11 0 7 0
13 0 7 0 14 2 6 0 7 7 15 0 0 0 16 1 7
17 0 18 0 6 0 19 1 0 17 0 20 1 25 23
24 26 0 7 29 30 2 7 0 0 0 32 2 7 0 0
0 33 2 7 0 0 34 35 1 7 37 0 38 2 37 0
0 0 39 1 0 37 0 40 1 7 41 0 42 2 41 0
- 0 0 43 1 0 41 0 44 1 7 45 0 46 1 0 45
- 0 47 2 7 48 0 0 49 2 0 48 0 0 50 0 7
- 0 51 1 6 7 0 52 2 6 0 0 0 53 1 0 0 0
- 54 1 7 0 55 56 1 0 0 55 57 1 6 7 0 58
- 1 7 55 0 59 1 0 55 0 60 1 6 61 0 62 1
- 7 63 0 64 1 0 63 0 65 1 7 67 0 68 2
- 67 0 0 0 69 1 0 67 0 70 3 72 71 6 67
- 71 73 3 0 74 0 67 74 75 1 7 76 0 77 2
- 76 0 0 0 78 1 0 76 0 79 3 81 80 6 76
- 80 82 3 0 83 0 76 83 84 1 85 66 0 86
- 1 6 0 66 87 1 85 66 0 88 2 6 0 0 0 89
- 1 0 0 85 90 1 7 66 0 91 1 0 66 0 92 1
- 7 93 0 94 1 0 93 0 95 0 7 0 96 1 7 48
- 0 97 0 0 0 98 1 24 0 99 100 2 24 0 0
- 0 101 1 6 23 27 102 1 23 66 0 103 1
- 23 66 0 104 1 23 66 0 105 1 23 66 0
- 106 5 23 0 0 66 66 66 66 107 2 23 108
- 0 66 109 1 0 93 0 95 1 0 63 0 65 1 0
- 66 0 92 1 0 55 0 60 2 0 110 27 111
- 112 1 0 23 27 28 0 0 0 98 3 0 83 0 76
- 83 84 3 0 74 0 67 74 75 1 0 0 0 10 1
+ 0 0 43 1 0 41 0 44 1 7 45 0 46 2 45 0
+ 0 0 47 1 0 45 0 48 2 7 49 0 0 50 2 0
+ 49 0 0 51 0 7 0 52 1 6 7 0 53 2 6 0 0
+ 0 54 1 0 0 0 55 1 7 0 56 57 1 0 0 56
+ 58 1 6 7 0 59 1 7 56 0 60 1 0 56 0 61
+ 1 6 62 0 63 1 7 64 0 65 1 0 64 0 66 1
+ 7 68 0 69 2 68 0 0 0 70 1 0 68 0 71 3
+ 73 72 6 68 72 74 3 0 75 0 68 75 76 1
+ 7 77 0 78 2 77 0 0 0 79 1 0 77 0 80 3
+ 82 81 6 77 81 83 3 0 84 0 77 84 85 1
+ 86 67 0 87 1 6 0 67 88 1 86 67 0 89 2
+ 6 0 0 0 90 1 0 0 86 91 1 7 67 0 92 1
+ 0 67 0 93 1 7 94 0 95 1 0 94 0 96 0 7
+ 0 97 1 7 49 0 98 0 0 0 99 1 24 0 100
+ 101 2 24 0 0 0 102 1 6 23 27 103 1 23
+ 67 0 104 1 23 67 0 105 0 67 0 106 1
+ 23 67 0 107 2 67 0 0 0 108 1 23 67 0
+ 109 5 23 0 0 67 67 67 67 110 2 23 111
+ 0 67 112 1 0 94 0 96 1 0 64 0 66 1 0
+ 67 0 93 1 0 56 0 61 2 0 113 27 114
+ 115 1 0 23 27 28 0 0 0 99 3 0 84 0 77
+ 84 85 3 0 75 0 68 75 76 1 0 0 0 10 1
0 17 0 20 2 0 0 21 0 22 0 0 0 16 1 0
- 0 0 54 2 0 0 0 21 36 1 0 0 0 12 1 0
- 45 0 47 1 0 37 0 40 1 0 41 0 44 1 0
- 67 0 70 1 0 76 0 79 1 0 0 55 57 1 0 0
- 85 90 0 0 29 31 2 0 48 0 0 50)))))
+ 0 0 55 2 0 0 0 21 36 1 0 0 0 12 1 0
+ 45 0 48 1 0 37 0 40 1 0 41 0 44 1 0
+ 68 0 71 1 0 77 0 80 1 0 0 56 58 1 0 0
+ 86 91 0 0 29 31 2 0 49 0 0 51)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/RNS-.lsp b/src/algebra/strap/RNS-.lsp
index 042d128b..04fe9f0d 100644
--- a/src/algebra/strap/RNS-.lsp
+++ b/src/algebra/strap/RNS-.lsp
@@ -37,102 +37,102 @@
(DEFUN |RNS-;characteristic;Nni;1| ($) (DECLARE (IGNORE $)) 0)
(DEFUN |RNS-;fractionPart;2S;2| (|x| $)
- (SPADCALL |x| (SPADCALL |x| (|getShellEntry| $ 9))
- (|getShellEntry| $ 10)))
+ (SPADCALL |x| (SPADCALL |x| (|getShellEntry| $ 10))
+ (|getShellEntry| $ 11)))
(DEFUN |RNS-;truncate;2S;3| (|x| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 13))
+ ((SPADCALL |x| (|getShellEntry| $ 14))
(SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 14))
- (|getShellEntry| $ 15))
- (|getShellEntry| $ 14)))
- ('T (SPADCALL |x| (|getShellEntry| $ 15)))))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 15))
+ (|getShellEntry| $ 16))
+ (|getShellEntry| $ 15)))
+ ('T (SPADCALL |x| (|getShellEntry| $ 16)))))
(DEFUN |RNS-;round;2S;4| (|x| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 13))
+ ((SPADCALL |x| (|getShellEntry| $ 14))
(SPADCALL
(SPADCALL |x|
- (SPADCALL (|spadConstant| $ 17)
- (SPADCALL 2 (|getShellEntry| $ 19))
- (|getShellEntry| $ 20))
- (|getShellEntry| $ 10))
- (|getShellEntry| $ 9)))
+ (SPADCALL (|spadConstant| $ 18)
+ (SPADCALL 2 (|getShellEntry| $ 20))
+ (|getShellEntry| $ 21))
+ (|getShellEntry| $ 11))
+ (|getShellEntry| $ 10)))
('T
(SPADCALL
(SPADCALL |x|
- (SPADCALL (|spadConstant| $ 17)
- (SPADCALL 2 (|getShellEntry| $ 19))
- (|getShellEntry| $ 20))
- (|getShellEntry| $ 21))
- (|getShellEntry| $ 9)))))
+ (SPADCALL (|spadConstant| $ 18)
+ (SPADCALL 2 (|getShellEntry| $ 20))
+ (|getShellEntry| $ 21))
+ (|getShellEntry| $ 24))
+ (|getShellEntry| $ 10)))))
-(DEFUN |RNS-;norm;2S;5| (|x| $) (SPADCALL |x| (|getShellEntry| $ 23)))
+(DEFUN |RNS-;norm;2S;5| (|x| $) (SPADCALL |x| (|getShellEntry| $ 26)))
(DEFUN |RNS-;coerce;FS;6| (|x| $)
(SPADCALL
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 26))
- (|getShellEntry| $ 19))
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 27))
- (|getShellEntry| $ 19))
- (|getShellEntry| $ 20)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 29))
+ (|getShellEntry| $ 20))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30))
+ (|getShellEntry| $ 20))
+ (|getShellEntry| $ 21)))
(DEFUN |RNS-;convert;SP;7| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30))
- (|getShellEntry| $ 32)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 33))
+ (|getShellEntry| $ 35)))
(DEFUN |RNS-;floor;2S;8| (|x| $)
(PROG (|x1|)
(RETURN
(SEQ (LETT |x1|
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 34))
- (|getShellEntry| $ 19))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 37))
+ (|getShellEntry| $ 20))
|RNS-;floor;2S;8|)
(EXIT (COND
- ((SPADCALL |x| |x1| (|getShellEntry| $ 35)) |x|)
- ((SPADCALL |x| (|spadConstant| $ 36)
- (|getShellEntry| $ 37))
- (SPADCALL |x1| (|spadConstant| $ 17)
- (|getShellEntry| $ 10)))
+ ((SPADCALL |x| |x1| (|getShellEntry| $ 38)) |x|)
+ ((SPADCALL |x| (|spadConstant| $ 39)
+ (|getShellEntry| $ 41))
+ (SPADCALL |x1| (|spadConstant| $ 18)
+ (|getShellEntry| $ 11)))
('T |x1|)))))))
(DEFUN |RNS-;ceiling;2S;9| (|x| $)
(PROG (|x1|)
(RETURN
(SEQ (LETT |x1|
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 34))
- (|getShellEntry| $ 19))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 37))
+ (|getShellEntry| $ 20))
|RNS-;ceiling;2S;9|)
(EXIT (COND
- ((SPADCALL |x| |x1| (|getShellEntry| $ 35)) |x|)
- ((SPADCALL |x| (|spadConstant| $ 36)
- (|getShellEntry| $ 37))
+ ((SPADCALL |x| |x1| (|getShellEntry| $ 38)) |x|)
+ ((SPADCALL |x| (|spadConstant| $ 39)
+ (|getShellEntry| $ 41))
|x1|)
('T
- (SPADCALL |x1| (|spadConstant| $ 17)
- (|getShellEntry| $ 21)))))))))
+ (SPADCALL |x1| (|spadConstant| $ 18)
+ (|getShellEntry| $ 24)))))))))
(DEFUN |RNS-;patternMatch;SP2Pmr;10| (|x| |p| |l| $)
(PROG (|r|)
(RETURN
(SEQ (COND
- ((SPADCALL |p| (|getShellEntry| $ 40))
- (SPADCALL |p| |x| |l| (|getShellEntry| $ 42)))
- ((SPADCALL |p| (|getShellEntry| $ 43))
- (SEQ (LETT |r| (SPADCALL |p| (|getShellEntry| $ 45))
+ ((SPADCALL |p| (|getShellEntry| $ 45))
+ (SPADCALL |p| |x| |l| (|getShellEntry| $ 47)))
+ ((SPADCALL |p| (|getShellEntry| $ 48))
+ (SEQ (LETT |r| (SPADCALL |p| (|getShellEntry| $ 50))
|RNS-;patternMatch;SP2Pmr;10|)
(EXIT (COND
((QEQCAR |r| 0)
(COND
((SPADCALL
(SPADCALL |x|
- (|getShellEntry| $ 30))
- (QCDR |r|) (|getShellEntry| $ 46))
+ (|getShellEntry| $ 33))
+ (QCDR |r|) (|getShellEntry| $ 51))
|l|)
- ('T (SPADCALL (|getShellEntry| $ 47)))))
- ('T (SPADCALL (|getShellEntry| $ 47)))))))
- ('T (SPADCALL (|getShellEntry| $ 47))))))))
+ ('T (SPADCALL (|getShellEntry| $ 52)))))
+ ('T (SPADCALL (|getShellEntry| $ 52)))))))
+ ('T (SPADCALL (|getShellEntry| $ 52))))))))
(DEFUN |RealNumberSystem&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -140,7 +140,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|RealNumberSystem&|))
(LETT |dv$| (LIST '|RealNumberSystem&| |dv$1|) . #0#)
- (LETT $ (|newShell| 52) . #0#)
+ (LETT $ (|newShell| 57) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -150,40 +150,42 @@
(MAKEPROP '|RealNumberSystem&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|)
- (|NonNegativeInteger|) |RNS-;characteristic;Nni;1|
- (0 . |truncate|) (5 . -) |RNS-;fractionPart;2S;2|
- (|Boolean|) (11 . |negative?|) (16 . -) (21 . |floor|)
- |RNS-;truncate;2S;3| (26 . |One|) (|Integer|)
- (30 . |coerce|) (35 . /) (41 . +) |RNS-;round;2S;4|
- (47 . |abs|) |RNS-;norm;2S;5| (|Fraction| 18)
- (52 . |numer|) (57 . |denom|) |RNS-;coerce;FS;6| (|Float|)
- (62 . |convert|) (|Pattern| 29) (67 . |coerce|)
- |RNS-;convert;SP;7| (72 . |wholePart|) (77 . =)
- (83 . |Zero|) (87 . <) |RNS-;floor;2S;8|
- |RNS-;ceiling;2S;9| (93 . |generic?|)
- (|PatternMatchResult| 29 6) (98 . |addMatch|)
- (105 . |constant?|) (|Union| 29 '"failed")
- (110 . |retractIfCan|) (115 . =) (121 . |failed|)
- (|PatternMatchResult| 29 $) |RNS-;patternMatch;SP2Pmr;10|
+ (|NonNegativeInteger|) (0 . |Zero|)
+ |RNS-;characteristic;Nni;1| (4 . |truncate|) (9 . -)
+ |RNS-;fractionPart;2S;2| (|Boolean|) (15 . |negative?|)
+ (20 . -) (25 . |floor|) |RNS-;truncate;2S;3| (30 . |One|)
+ (|Integer|) (34 . |coerce|) (39 . /) (|PositiveInteger|)
+ (45 . |One|) (49 . +) |RNS-;round;2S;4| (55 . |abs|)
+ |RNS-;norm;2S;5| (|Fraction| 19) (60 . |numer|)
+ (65 . |denom|) |RNS-;coerce;FS;6| (|Float|)
+ (70 . |convert|) (|Pattern| 32) (75 . |coerce|)
+ |RNS-;convert;SP;7| (80 . |wholePart|) (85 . =)
+ (91 . |Zero|) (95 . |Zero|) (99 . <) (105 . |One|)
+ |RNS-;floor;2S;8| |RNS-;ceiling;2S;9| (109 . |generic?|)
+ (|PatternMatchResult| 32 6) (114 . |addMatch|)
+ (121 . |constant?|) (|Union| 32 '"failed")
+ (126 . |retractIfCan|) (131 . =) (137 . |failed|)
+ (|PatternMatchResult| 32 $) |RNS-;patternMatch;SP2Pmr;10|
(|DoubleFloat|) (|OutputForm|))
- '#(|truncate| 125 |round| 130 |patternMatch| 135 |norm| 142
- |fractionPart| 147 |floor| 152 |convert| 157 |coerce| 162
- |characteristic| 172 |ceiling| 176)
+ '#(|truncate| 141 |round| 146 |patternMatch| 151 |norm| 158
+ |fractionPart| 163 |floor| 168 |convert| 173 |coerce| 178
+ |characteristic| 188 |ceiling| 192)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 49
- '(1 6 0 0 9 2 6 0 0 0 10 1 6 12 0 13 1
- 6 0 0 14 1 6 0 0 15 0 6 0 17 1 6 0 18
- 19 2 6 0 0 0 20 2 6 0 0 0 21 1 6 0 0
- 23 1 25 18 0 26 1 25 18 0 27 1 6 29 0
- 30 1 31 0 29 32 1 6 18 0 34 2 6 12 0
- 0 35 0 6 0 36 2 6 12 0 0 37 1 31 12 0
- 40 3 41 0 31 6 0 42 1 31 12 0 43 1 31
- 44 0 45 2 29 12 0 0 46 0 41 0 47 1 0
- 0 0 16 1 0 0 0 22 3 0 48 0 31 48 49 1
- 0 0 0 24 1 0 0 0 11 1 0 0 0 38 1 0 31
- 0 33 1 0 0 25 28 1 0 0 25 28 0 0 7 8
- 1 0 0 0 39)))))
+ (|makeByteWordVec2| 54
+ '(0 7 0 8 1 6 0 0 10 2 6 0 0 0 11 1 6
+ 13 0 14 1 6 0 0 15 1 6 0 0 16 0 6 0
+ 18 1 6 0 19 20 2 6 0 0 0 21 0 22 0 23
+ 2 6 0 0 0 24 1 6 0 0 26 1 28 19 0 29
+ 1 28 19 0 30 1 6 32 0 33 1 34 0 32 35
+ 1 6 19 0 37 2 6 13 0 0 38 0 6 0 39 0
+ 19 0 40 2 6 13 0 0 41 0 19 0 42 1 34
+ 13 0 45 3 46 0 34 6 0 47 1 34 13 0 48
+ 1 34 49 0 50 2 32 13 0 0 51 0 46 0 52
+ 1 0 0 0 17 1 0 0 0 25 3 0 53 0 34 53
+ 54 1 0 0 0 27 1 0 0 0 12 1 0 0 0 43 1
+ 0 34 0 36 1 0 0 28 31 1 0 0 28 31 0 0
+ 7 9 1 0 0 0 44)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp
index f656b3f8..a3d38ee1 100644
--- a/src/algebra/strap/SINT.lsp
+++ b/src/algebra/strap/SINT.lsp
@@ -256,12 +256,12 @@
(DEFUN |SINT;writeOMSingleInt| (|dev| |x| $)
(SEQ (COND
((QSLESSP |x| 0)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 9))
+ (SEQ (SPADCALL |dev| (|getShellEntry| $ 13))
(SPADCALL |dev| "arith1" "unaryminus"
- (|getShellEntry| $ 11))
- (SPADCALL |dev| (QSMINUS |x|) (|getShellEntry| $ 12))
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 13)))))
- ('T (SPADCALL |dev| |x| (|getShellEntry| $ 12))))))
+ (|getShellEntry| $ 15))
+ (SPADCALL |dev| (QSMINUS |x|) (|getShellEntry| $ 18))
+ (EXIT (SPADCALL |dev| (|getShellEntry| $ 19)))))
+ ('T (SPADCALL |dev| |x| (|getShellEntry| $ 18))))))
(DEFUN |SINT;OMwrite;$S;2| (|x| $)
(PROG (|sp| |dev| |s|)
@@ -269,13 +269,13 @@
(SEQ (LETT |s| "" |SINT;OMwrite;$S;2|)
(LETT |sp| (OM-STRINGTOSTRINGPTR |s|) |SINT;OMwrite;$S;2|)
(LETT |dev|
- (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 15))
- (|getShellEntry| $ 16))
+ (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 21))
+ (|getShellEntry| $ 22))
|SINT;OMwrite;$S;2|)
- (SPADCALL |dev| (|getShellEntry| $ 17))
+ (SPADCALL |dev| (|getShellEntry| $ 23))
(|SINT;writeOMSingleInt| |dev| |x| $)
- (SPADCALL |dev| (|getShellEntry| $ 18))
- (SPADCALL |dev| (|getShellEntry| $ 19))
+ (SPADCALL |dev| (|getShellEntry| $ 24))
+ (SPADCALL |dev| (|getShellEntry| $ 25))
(LETT |s| (OM-STRINGPTRTOSTRING |sp|) |SINT;OMwrite;$S;2|)
(EXIT |s|)))))
@@ -285,36 +285,36 @@
(SEQ (LETT |s| "" |SINT;OMwrite;$BS;3|)
(LETT |sp| (OM-STRINGTOSTRINGPTR |s|) |SINT;OMwrite;$BS;3|)
(LETT |dev|
- (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 15))
- (|getShellEntry| $ 16))
+ (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 21))
+ (|getShellEntry| $ 22))
|SINT;OMwrite;$BS;3|)
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 17))))
+ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23))))
(|SINT;writeOMSingleInt| |dev| |x| $)
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 18))))
- (SPADCALL |dev| (|getShellEntry| $ 19))
+ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 24))))
+ (SPADCALL |dev| (|getShellEntry| $ 25))
(LETT |s| (OM-STRINGPTRTOSTRING |sp|) |SINT;OMwrite;$BS;3|)
(EXIT |s|)))))
(DEFUN |SINT;OMwrite;Omd$V;4| (|dev| |x| $)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 17))
+ (SEQ (SPADCALL |dev| (|getShellEntry| $ 23))
(|SINT;writeOMSingleInt| |dev| |x| $)
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 18)))))
+ (EXIT (SPADCALL |dev| (|getShellEntry| $ 24)))))
(DEFUN |SINT;OMwrite;Omd$BV;5| (|dev| |x| |wholeObj| $)
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 17))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23))))
(|SINT;writeOMSingleInt| |dev| |x| $)
(EXIT (COND
- (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 18)))))))
+ (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 24)))))))
(DEFUN |SINT;reducedSystem;MM;6| (|m| $) (DECLARE (IGNORE $)) |m|)
(DEFUN |SINT;coerce;$Of;7| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 29)))
+ (SPADCALL |x| (|getShellEntry| $ 34)))
(DEFUN |SINT;convert;$I;8| (|x| $) (DECLARE (IGNORE $)) |x|)
(DEFUN |SINT;*;I2$;9| (|i| |y| $)
- (QSTIMES (SPADCALL |i| (|getShellEntry| $ 32)) |y|))
+ (QSTIMES (SPADCALL |i| (|getShellEntry| $ 36)) |y|))
(DEFUN |SINT;Zero;$;10| ($) (DECLARE (IGNORE $)) 0)
@@ -377,7 +377,7 @@
(QSTIMES |x| |y|))
(DEFUN |SINT;**;$Nni$;31| (|x| |n| $)
- (SPADCALL (EXPT |x| |n|) (|getShellEntry| $ 32)))
+ (SPADCALL (EXPT |x| |n|) (|getShellEntry| $ 36)))
(DEFUN |SINT;quo;3$;32| (|x| |y| $)
(DECLARE (IGNORE $))
@@ -505,7 +505,7 @@
(RETURN
(PROGN
(LETT |dv$| '(|SingleInteger|) . #0=(|SingleInteger|))
- (LETT $ (|newShell| 107) . #0#)
+ (LETT $ (|newShell| 111) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -516,20 +516,21 @@
$))))
(MAKEPROP '|SingleInteger| '|infovec|
- (LIST '#(NIL NIL NIL NIL NIL (|Integer|) '|seed| (|Void|)
- (|OpenMathDevice|) (0 . |OMputApp|) (|String|)
- (5 . |OMputSymbol|) (12 . |OMputInteger|)
- (18 . |OMputEndApp|) (|OpenMathEncoding|)
- (23 . |OMencodingXML|) (27 . |OMopenString|)
- (33 . |OMputObject|) (38 . |OMputEndObject|)
- (43 . |OMclose|) |SINT;OMwrite;$S;2| (|Boolean|)
- |SINT;OMwrite;$BS;3| |SINT;OMwrite;Omd$V;4|
- |SINT;OMwrite;Omd$BV;5| (|Matrix| 5) (|Matrix| $)
- |SINT;reducedSystem;MM;6| (|OutputForm|) (48 . |coerce|)
- |SINT;coerce;$Of;7| |SINT;convert;$I;8| (53 . |coerce|)
- |SINT;*;I2$;9|
+ (LIST '#(NIL NIL NIL NIL NIL (|Integer|) '|seed|
(CONS IDENTITY
(FUNCALL (|dispatchFunction| |SINT;Zero;$;10|) $))
+ (0 . |Zero|) (|Boolean|) |SINT;<;2$B;24| (|Void|)
+ (|OpenMathDevice|) (4 . |OMputApp|) (|String|)
+ (9 . |OMputSymbol|) |SINT;-;2$;27| |SINT;convert;$I;8|
+ (16 . |OMputInteger|) (22 . |OMputEndApp|)
+ (|OpenMathEncoding|) (27 . |OMencodingXML|)
+ (31 . |OMopenString|) (37 . |OMputObject|)
+ (42 . |OMputEndObject|) (47 . |OMclose|)
+ |SINT;OMwrite;$S;2| |SINT;OMwrite;$BS;3|
+ |SINT;OMwrite;Omd$V;4| |SINT;OMwrite;Omd$BV;5|
+ (|Matrix| 5) (|Matrix| $) |SINT;reducedSystem;MM;6|
+ (|OutputForm|) (52 . |coerce|) |SINT;coerce;$Of;7|
+ (57 . |coerce|) |SINT;*;3$;30| |SINT;*;I2$;9|
(CONS IDENTITY
(FUNCALL (|dispatchFunction| |SINT;One;$;11|) $))
|SINT;base;$;12|
@@ -540,57 +541,56 @@
|SINT;=;2$B;15| |SINT;~;2$;16| |SINT;not;2$;17|
|SINT;/\\;3$;18| |SINT;\\/;3$;19| |SINT;Not;2$;20|
|SINT;And;3$;21| |SINT;Or;3$;22| |SINT;xor;3$;23|
- |SINT;<;2$B;24| |SINT;inc;2$;25| |SINT;dec;2$;26|
- |SINT;-;2$;27| |SINT;+;3$;28| |SINT;-;3$;29|
- |SINT;*;3$;30| (|NonNegativeInteger|) |SINT;**;$Nni$;31|
+ |SINT;inc;2$;25| |SINT;dec;2$;26| |SINT;+;3$;28|
+ |SINT;-;3$;29| (|NonNegativeInteger|) |SINT;**;$Nni$;31|
|SINT;quo;3$;32| |SINT;rem;3$;33|
(|Record| (|:| |quotient| $) (|:| |remainder| $))
|SINT;divide;2$R;34| |SINT;gcd;3$;35| |SINT;abs;2$;36|
- |SINT;odd?;$B;37| |SINT;zero?;$B;38| |SINT;one?;$B;39|
- |SINT;max;3$;40| |SINT;min;3$;41| (|SingleInteger|)
- |SINT;hash;2$;42| |SINT;length;2$;43| |SINT;shift;3$;44|
- |SINT;mulmod;4$;45| |SINT;addmod;4$;46|
+ |SINT;odd?;$B;37| |SINT;zero?;$B;38| (62 . |One|)
+ |SINT;one?;$B;39| |SINT;max;3$;40| |SINT;min;3$;41|
+ (|SingleInteger|) |SINT;hash;2$;42| |SINT;length;2$;43|
+ |SINT;shift;3$;44| |SINT;mulmod;4$;45| |SINT;addmod;4$;46|
|SINT;submod;4$;47| |SINT;negative?;$B;48|
- |SINT;size;Nni;49| (|PositiveInteger|) |SINT;index;Pi$;50|
- |SINT;lookup;$Pi;51| (|Vector| 5)
- (|Record| (|:| |mat| 25) (|:| |vec| 80)) (|Vector| $)
+ |SINT;size;Nni;49| (|PositiveInteger|) (66 . +) (72 . -)
+ |SINT;index;Pi$;50| |SINT;lookup;$Pi;51| (|Vector| 5)
+ (|Record| (|:| |mat| 30) (|:| |vec| 84)) (|Vector| $)
|SINT;reducedSystem;MVR;52| |SINT;positiveRemainder;3$;53|
|SINT;coerce;I$;54| |SINT;random;$;55| |SINT;random;2$;56|
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $))
|SINT;unitNormal;$R;57| (|Fraction| 5)
- (|Union| 90 '"failed") (|Union| $ '"failed") (|Float|)
+ (|Union| 94 '"failed") (|Union| $ '"failed") (|Float|)
(|DoubleFloat|) (|Pattern| 5) (|PatternMatchResult| 5 $)
(|InputForm|) (|Union| 5 '"failed") (|List| $)
- (|Record| (|:| |coef| 99) (|:| |generator| $))
- (|Union| 99 '"failed")
+ (|Record| (|:| |coef| 103) (|:| |generator| $))
+ (|Union| 103 '"failed")
(|Record| (|:| |coef1| $) (|:| |coef2| $)
(|:| |generator| $))
(|Record| (|:| |coef1| $) (|:| |coef2| $))
- (|Union| 103 '"failed") (|Factored| $)
+ (|Union| 107 '"failed") (|Factored| $)
(|SparseUnivariatePolynomial| $))
- '#(~= 58 ~ 64 |zero?| 69 |xor| 74 |unitNormal| 80
- |unitCanonical| 85 |unit?| 90 |symmetricRemainder| 95
- |subtractIfCan| 101 |submod| 107 |squareFreePart| 114
- |squareFree| 119 |sizeLess?| 124 |size| 130 |sign| 134
- |shift| 139 |sample| 145 |retractIfCan| 149 |retract| 154
- |rem| 159 |reducedSystem| 165 |recip| 176 |rationalIfCan|
- 181 |rational?| 186 |rational| 191 |random| 196 |quo| 205
- |principalIdeal| 211 |prime?| 216 |powmod| 221
- |positiveRemainder| 228 |positive?| 234 |permutation| 239
- |patternMatch| 245 |one?| 252 |odd?| 257 |not| 262
- |nextItem| 267 |negative?| 272 |multiEuclidean| 277
- |mulmod| 283 |min| 290 |max| 300 |mask| 310 |lookup| 315
- |length| 320 |lcm| 325 |latex| 336 |invmod| 341 |init| 347
- |index| 351 |inc| 356 |hash| 361 |gcdPolynomial| 366 |gcd|
- 372 |factorial| 383 |factor| 388 |extendedEuclidean| 393
- |exquo| 406 |expressIdealMember| 412 |even?| 418
- |euclideanSize| 423 |divide| 428 |differentiate| 434 |dec|
- 445 |copy| 450 |convert| 455 |coerce| 480 |characteristic|
- 500 |bit?| 504 |binomial| 510 |base| 516 |associates?| 520
- |addmod| 526 |abs| 533 |\\/| 538 |Zero| 544 |Or| 548 |One|
- 554 |OMwrite| 558 |Not| 582 D 587 |And| 598 >= 604 > 610 =
- 616 <= 622 < 628 |/\\| 634 - 640 + 651 ** 657 * 669)
+ '#(~= 78 ~ 84 |zero?| 89 |xor| 94 |unitNormal| 100
+ |unitCanonical| 105 |unit?| 110 |symmetricRemainder| 115
+ |subtractIfCan| 121 |submod| 127 |squareFreePart| 134
+ |squareFree| 139 |sizeLess?| 144 |size| 150 |sign| 154
+ |shift| 159 |sample| 165 |retractIfCan| 169 |retract| 174
+ |rem| 179 |reducedSystem| 185 |recip| 196 |rationalIfCan|
+ 201 |rational?| 206 |rational| 211 |random| 216 |quo| 225
+ |principalIdeal| 231 |prime?| 236 |powmod| 241
+ |positiveRemainder| 248 |positive?| 254 |permutation| 259
+ |patternMatch| 265 |one?| 272 |odd?| 277 |not| 282
+ |nextItem| 287 |negative?| 292 |multiEuclidean| 297
+ |mulmod| 303 |min| 310 |max| 320 |mask| 330 |lookup| 335
+ |length| 340 |lcm| 345 |latex| 356 |invmod| 361 |init| 367
+ |index| 371 |inc| 376 |hash| 381 |gcdPolynomial| 386 |gcd|
+ 392 |factorial| 403 |factor| 408 |extendedEuclidean| 413
+ |exquo| 426 |expressIdealMember| 432 |even?| 438
+ |euclideanSize| 443 |divide| 448 |differentiate| 454 |dec|
+ 465 |copy| 470 |convert| 475 |coerce| 500 |characteristic|
+ 520 |bit?| 524 |binomial| 530 |base| 536 |associates?| 540
+ |addmod| 546 |abs| 553 |\\/| 558 |Zero| 564 |Or| 568 |One|
+ 574 |OMwrite| 578 |Not| 602 D 607 |And| 618 >= 624 > 630 =
+ 636 <= 642 < 648 |/\\| 654 - 660 + 671 ** 677 * 689)
'((|noetherian| . 0) (|canonicalsClosed| . 0)
(|canonical| . 0) (|canonicalUnitNormal| . 0)
(|multiplicativeValuation| . 0) (|noZeroDivisors| . 0)
@@ -636,56 +636,58 @@
(|OrderedSet|) (|AbelianSemiGroup|)
(|SemiGroup|) (|Logic|) (|RealConstant|)
(|RetractableTo| 5) (|SetCategory|)
- (|OpenMath|) (|ConvertibleTo| 93)
- (|ConvertibleTo| 94)
+ (|OpenMath|) (|ConvertibleTo| 97)
+ (|ConvertibleTo| 98)
(|CombinatorialFunctionCategory|)
- (|ConvertibleTo| 95)
- (|ConvertibleTo| 97) (|ConvertibleTo| 5)
- (|CoercibleFrom| $$) (|CoercibleFrom| 5)
- (|BasicType|) (|CoercibleTo| 28))
- (|makeByteWordVec2| 106
- '(1 8 7 0 9 3 8 7 0 10 10 11 2 8 7 0 5
- 12 1 8 7 0 13 0 14 0 15 2 8 0 10 14
- 16 1 8 7 0 17 1 8 7 0 18 1 8 7 0 19 1
- 5 28 0 29 1 0 0 5 32 2 0 21 0 0 1 1 0
- 0 0 40 1 0 21 0 64 2 0 0 0 0 47 1 0
- 88 0 89 1 0 0 0 1 1 0 21 0 1 2 0 0 0
- 0 1 2 0 92 0 0 1 3 0 0 0 0 0 74 1 0 0
- 0 1 1 0 105 0 1 2 0 21 0 0 1 0 0 55
- 76 1 0 5 0 1 2 0 0 0 0 71 0 0 0 1 1 0
- 98 0 1 1 0 5 0 1 2 0 0 0 0 58 1 0 25
- 26 27 2 0 81 26 82 83 1 0 92 0 1 1 0
- 91 0 1 1 0 21 0 1 1 0 90 0 1 1 0 0 0
- 87 0 0 0 86 2 0 0 0 0 57 1 0 100 99 1
- 1 0 21 0 1 3 0 0 0 0 0 1 2 0 0 0 0 84
- 1 0 21 0 1 2 0 0 0 0 1 3 0 96 0 95 96
- 1 1 0 21 0 65 1 0 21 0 63 1 0 0 0 41
- 1 0 92 0 1 1 0 21 0 75 2 0 101 99 0 1
- 3 0 0 0 0 0 72 0 0 0 38 2 0 0 0 0 67
- 0 0 0 37 2 0 0 0 0 66 1 0 0 0 1 1 0
- 77 0 79 1 0 0 0 70 1 0 0 99 1 2 0 0 0
- 0 1 1 0 10 0 1 2 0 0 0 0 1 0 0 0 1 1
- 0 0 77 78 1 0 0 0 49 1 0 68 0 69 2 0
- 106 106 106 1 1 0 0 99 1 2 0 0 0 0 61
- 1 0 0 0 1 1 0 105 0 1 2 0 102 0 0 1 3
- 0 104 0 0 0 1 2 0 92 0 0 1 2 0 101 99
- 0 1 1 0 21 0 1 1 0 55 0 1 2 0 59 0 0
- 60 1 0 0 0 1 2 0 0 0 55 1 1 0 0 0 50
- 1 0 0 0 1 1 0 93 0 1 1 0 94 0 1 1 0
- 95 0 1 1 0 97 0 1 1 0 5 0 31 1 0 0 5
- 85 1 0 0 0 1 1 0 0 5 85 1 0 28 0 30 0
- 0 55 1 2 0 21 0 0 1 2 0 0 0 0 1 0 0 0
- 36 2 0 21 0 0 1 3 0 0 0 0 0 73 1 0 0
- 0 62 2 0 0 0 0 43 0 0 0 34 2 0 0 0 0
- 46 0 0 0 35 2 0 7 8 0 23 3 0 7 8 0 21
- 24 2 0 10 0 21 22 1 0 10 0 20 1 0 0 0
- 44 1 0 0 0 1 2 0 0 0 55 1 2 0 0 0 0
- 45 2 0 21 0 0 1 2 0 21 0 0 1 2 0 21 0
- 0 39 2 0 21 0 0 1 2 0 21 0 0 48 2 0 0
- 0 0 42 1 0 0 0 51 2 0 0 0 0 53 2 0 0
- 0 0 52 2 0 0 0 55 56 2 0 0 0 77 1 2 0
- 0 0 0 54 2 0 0 5 0 33 2 0 0 55 0 1 2
- 0 0 77 0 1)))))
+ (|ConvertibleTo| 99)
+ (|ConvertibleTo| 101)
+ (|ConvertibleTo| 5) (|CoercibleFrom| $$)
+ (|CoercibleFrom| 5) (|BasicType|)
+ (|CoercibleTo| 33))
+ (|makeByteWordVec2| 110
+ '(0 5 0 8 1 12 11 0 13 3 12 11 0 14 14
+ 15 2 12 11 0 5 18 1 12 11 0 19 0 20 0
+ 21 2 12 0 14 20 22 1 12 11 0 23 1 12
+ 11 0 24 1 12 11 0 25 1 5 33 0 34 1 0
+ 0 5 36 0 5 0 66 2 79 0 0 0 80 2 5 0 0
+ 0 81 2 0 9 0 0 1 1 0 0 0 44 1 0 9 0
+ 65 2 0 0 0 0 51 1 0 92 0 93 1 0 0 0 1
+ 1 0 9 0 1 2 0 0 0 0 1 2 0 96 0 0 1 3
+ 0 0 0 0 0 76 1 0 0 0 1 1 0 109 0 1 2
+ 0 9 0 0 1 0 0 56 78 1 0 5 0 1 2 0 0 0
+ 0 73 0 0 0 1 1 0 102 0 1 1 0 5 0 1 2
+ 0 0 0 0 59 1 0 30 31 32 2 0 85 31 86
+ 87 1 0 96 0 1 1 0 95 0 1 1 0 9 0 1 1
+ 0 94 0 1 1 0 0 0 91 0 0 0 90 2 0 0 0
+ 0 58 1 0 104 103 1 1 0 9 0 1 3 0 0 0
+ 0 0 1 2 0 0 0 0 88 1 0 9 0 1 2 0 0 0
+ 0 1 3 0 100 0 99 100 1 1 0 9 0 67 1 0
+ 9 0 64 1 0 0 0 45 1 0 96 0 1 1 0 9 0
+ 77 2 0 105 103 0 1 3 0 0 0 0 0 74 0 0
+ 0 42 2 0 0 0 0 69 0 0 0 41 2 0 0 0 0
+ 68 1 0 0 0 1 1 0 79 0 83 1 0 0 0 72 1
+ 0 0 103 1 2 0 0 0 0 1 1 0 14 0 1 2 0
+ 0 0 0 1 0 0 0 1 1 0 0 79 82 1 0 0 0
+ 52 1 0 70 0 71 2 0 110 110 110 1 1 0
+ 0 103 1 2 0 0 0 0 62 1 0 0 0 1 1 0
+ 109 0 1 2 0 106 0 0 1 3 0 108 0 0 0 1
+ 2 0 96 0 0 1 2 0 105 103 0 1 1 0 9 0
+ 1 1 0 56 0 1 2 0 60 0 0 61 1 0 0 0 1
+ 2 0 0 0 56 1 1 0 0 0 53 1 0 0 0 1 1 0
+ 97 0 1 1 0 98 0 1 1 0 99 0 1 1 0 101
+ 0 1 1 0 5 0 17 1 0 0 5 89 1 0 0 0 1 1
+ 0 0 5 89 1 0 33 0 35 0 0 56 1 2 0 9 0
+ 0 1 2 0 0 0 0 1 0 0 0 40 2 0 9 0 0 1
+ 3 0 0 0 0 0 75 1 0 0 0 63 2 0 0 0 0
+ 47 0 0 0 7 2 0 0 0 0 50 0 0 0 39 2 0
+ 11 12 0 28 3 0 11 12 0 9 29 2 0 14 0
+ 9 27 1 0 14 0 26 1 0 0 0 48 1 0 0 0 1
+ 2 0 0 0 56 1 2 0 0 0 0 49 2 0 9 0 0 1
+ 2 0 9 0 0 1 2 0 9 0 0 43 2 0 9 0 0 1
+ 2 0 9 0 0 10 2 0 0 0 0 46 1 0 0 0 16
+ 2 0 0 0 0 55 2 0 0 0 0 54 2 0 0 0 56
+ 57 2 0 0 0 79 1 2 0 0 0 0 37 2 0 0 5
+ 0 38 2 0 0 56 0 1 2 0 0 79 0 1)))))
'|lookupComplete|))
(MAKEPROP '|SingleInteger| 'NILADIC T)
diff --git a/src/algebra/strap/STAGG-.lsp b/src/algebra/strap/STAGG-.lsp
index ab9ad2bc..0048a3c3 100644
--- a/src/algebra/strap/STAGG-.lsp
+++ b/src/algebra/strap/STAGG-.lsp
@@ -62,23 +62,23 @@
(|STAGG-;c2| |x|
(LETT |x|
(SPADCALL |x|
- (|getShellEntry| $ 12))
+ (|getShellEntry| $ 16))
|STAGG-;first;ANniA;3|)
$)
#0#)
|STAGG-;first;ANniA;3|)))
(LETT |i| (QSADD1 |i|) |STAGG-;first;ANniA;3|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 14))))))
+ (|getShellEntry| $ 18))))))
(DEFUN |STAGG-;c2| (|x| |r| $)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 17))
+ ((SPADCALL |x| (|getShellEntry| $ 20))
(|error| "Index out of range"))
- ('T (SPADCALL |x| (|getShellEntry| $ 18)))))
+ ('T (SPADCALL |x| (|getShellEntry| $ 21)))))
(DEFUN |STAGG-;elt;AIS;5| (|x| |i| $)
- (SEQ (LETT |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 20)))
+ (SEQ (LETT |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 23)))
|STAGG-;elt;AIS;5|)
(COND
((OR (< |i| 0)
@@ -89,38 +89,38 @@
(|check-subtype|
(COND ((< |i| 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) |i|))
- (|getShellEntry| $ 21))
+ (|getShellEntry| $ 27))
|STAGG-;elt;AIS;5|)
- (|getShellEntry| $ 17)))
+ (|getShellEntry| $ 20)))
(EXIT (|error| "index out of range"))))
- (EXIT (SPADCALL |x| (|getShellEntry| $ 18)))))
+ (EXIT (SPADCALL |x| (|getShellEntry| $ 21)))))
(DEFUN |STAGG-;elt;AUsA;6| (|x| |i| $)
(PROG (|l| |h| #0=#:G1418)
(RETURN
(SEQ (LETT |l|
- (- (SPADCALL |i| (|getShellEntry| $ 24))
- (SPADCALL |x| (|getShellEntry| $ 20)))
+ (- (SPADCALL |i| (|getShellEntry| $ 30))
+ (SPADCALL |x| (|getShellEntry| $ 23)))
|STAGG-;elt;AUsA;6|)
(EXIT (COND
((< |l| 0) (|error| "index out of range"))
- ((NULL (SPADCALL |i| (|getShellEntry| $ 25)))
+ ((NULL (SPADCALL |i| (|getShellEntry| $ 31)))
(SPADCALL
(SPADCALL |x|
(PROG1 |l|
(|check-subtype|
(COND ((< |l| 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) |l|))
- (|getShellEntry| $ 21))
- (|getShellEntry| $ 26)))
+ (|getShellEntry| $ 27))
+ (|getShellEntry| $ 32)))
('T
(SEQ (LETT |h|
- (- (SPADCALL |i| (|getShellEntry| $ 27))
- (SPADCALL |x| (|getShellEntry| $ 20)))
+ (- (SPADCALL |i| (|getShellEntry| $ 33))
+ (SPADCALL |x| (|getShellEntry| $ 23)))
|STAGG-;elt;AUsA;6|)
(EXIT (COND
((< |h| |l|)
- (SPADCALL (|getShellEntry| $ 28)))
+ (SPADCALL (|getShellEntry| $ 34)))
('T
(SPADCALL
(SPADCALL |x|
@@ -130,7 +130,7 @@
((< |l| 0) 'NIL)
('T 'T))
'(|NonNegativeInteger|) |l|))
- (|getShellEntry| $ 21))
+ (|getShellEntry| $ 27))
(PROG1
(LETT #0# (+ (- |h| |l|) 1)
|STAGG-;elt;AUsA;6|)
@@ -139,19 +139,19 @@
((< #0# 0) 'NIL)
('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 29)))))))))))))
+ (|getShellEntry| $ 36)))))))))))))
(DEFUN |STAGG-;concat;3A;7| (|x| |y| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 26)) |y|
- (|getShellEntry| $ 31)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 32)) |y|
+ (|getShellEntry| $ 38)))
(DEFUN |STAGG-;concat;LA;8| (|l| $)
(COND
- ((NULL |l|) (SPADCALL (|getShellEntry| $ 28)))
+ ((NULL |l|) (SPADCALL (|getShellEntry| $ 34)))
('T
- (SPADCALL (SPADCALL (|SPADfirst| |l|) (|getShellEntry| $ 26))
- (SPADCALL (CDR |l|) (|getShellEntry| $ 34))
- (|getShellEntry| $ 31)))))
+ (SPADCALL (SPADCALL (|SPADfirst| |l|) (|getShellEntry| $ 32))
+ (SPADCALL (CDR |l|) (|getShellEntry| $ 45))
+ (|getShellEntry| $ 38)))))
(DEFUN |STAGG-;map!;M2A;9| (|f| |l| $)
(PROG (|y|)
@@ -159,14 +159,14 @@
(SEQ (LETT |y| |l| |STAGG-;map!;M2A;9|)
(SEQ G190
(COND
- ((NULL (NOT (SPADCALL |l| (|getShellEntry| $ 17))))
+ ((NULL (NOT (SPADCALL |l| (|getShellEntry| $ 20))))
(GO G191)))
(SEQ (SPADCALL |l|
(SPADCALL
- (SPADCALL |l| (|getShellEntry| $ 18)) |f|)
- (|getShellEntry| $ 36))
+ (SPADCALL |l| (|getShellEntry| $ 21)) |f|)
+ (|getShellEntry| $ 47))
(EXIT (LETT |l|
- (SPADCALL |l| (|getShellEntry| $ 12))
+ (SPADCALL |l| (|getShellEntry| $ 16))
|STAGG-;map!;M2A;9|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |y|)))))
@@ -177,17 +177,17 @@
(SEQ (LETT |y| |x| |STAGG-;fill!;ASA;10|)
(SEQ G190
(COND
- ((NULL (NOT (SPADCALL |y| (|getShellEntry| $ 17))))
+ ((NULL (NOT (SPADCALL |y| (|getShellEntry| $ 20))))
(GO G191)))
- (SEQ (SPADCALL |y| |s| (|getShellEntry| $ 36))
+ (SEQ (SPADCALL |y| |s| (|getShellEntry| $ 47))
(EXIT (LETT |y|
- (SPADCALL |y| (|getShellEntry| $ 12))
+ (SPADCALL |y| (|getShellEntry| $ 16))
|STAGG-;fill!;ASA;10|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |x|)))))
(DEFUN |STAGG-;setelt;AI2S;11| (|x| |i| |s| $)
- (SEQ (LETT |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 20)))
+ (SEQ (LETT |i| (- |i| (SPADCALL |x| (|getShellEntry| $ 23)))
|STAGG-;setelt;AI2S;11|)
(COND
((OR (< |i| 0)
@@ -198,31 +198,31 @@
(|check-subtype|
(COND ((< |i| 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) |i|))
- (|getShellEntry| $ 21))
+ (|getShellEntry| $ 27))
|STAGG-;setelt;AI2S;11|)
- (|getShellEntry| $ 17)))
+ (|getShellEntry| $ 20)))
(EXIT (|error| "index out of range"))))
- (EXIT (SPADCALL |x| |s| (|getShellEntry| $ 36)))))
+ (EXIT (SPADCALL |x| |s| (|getShellEntry| $ 47)))))
(DEFUN |STAGG-;setelt;AUs2S;12| (|x| |i| |s| $)
(PROG (|l| |h| #0=#:G1438 |z| |y|)
(RETURN
(SEQ (LETT |l|
- (- (SPADCALL |i| (|getShellEntry| $ 24))
- (SPADCALL |x| (|getShellEntry| $ 20)))
+ (- (SPADCALL |i| (|getShellEntry| $ 30))
+ (SPADCALL |x| (|getShellEntry| $ 23)))
|STAGG-;setelt;AUs2S;12|)
(EXIT (COND
((< |l| 0) (|error| "index out of range"))
('T
(SEQ (LETT |h|
(COND
- ((SPADCALL |i| (|getShellEntry| $ 25))
+ ((SPADCALL |i| (|getShellEntry| $ 31))
(- (SPADCALL |i|
- (|getShellEntry| $ 27))
+ (|getShellEntry| $ 33))
(SPADCALL |x|
- (|getShellEntry| $ 20))))
+ (|getShellEntry| $ 23))))
('T
- (SPADCALL |x| (|getShellEntry| $ 41))))
+ (SPADCALL |x| (|getShellEntry| $ 52))))
|STAGG-;setelt;AUs2S;12|)
(EXIT (COND
((< |h| |l|) |s|)
@@ -236,7 +236,7 @@
('T 'T))
'(|NonNegativeInteger|)
|l|))
- (|getShellEntry| $ 21))
+ (|getShellEntry| $ 27))
|STAGG-;setelt;AUs2S;12|)
(LETT |z|
(SPADCALL |y|
@@ -249,32 +249,32 @@
('T 'T))
'(|NonNegativeInteger|)
#0#))
- (|getShellEntry| $ 21))
+ (|getShellEntry| $ 27))
|STAGG-;setelt;AUs2S;12|)
(SEQ G190
(COND
((NULL
(NOT
(SPADCALL |y| |z|
- (|getShellEntry| $ 42))))
+ (|getShellEntry| $ 53))))
(GO G191)))
(SEQ
(SPADCALL |y| |s|
- (|getShellEntry| $ 36))
+ (|getShellEntry| $ 47))
(EXIT
(LETT |y|
(SPADCALL |y|
- (|getShellEntry| $ 12))
+ (|getShellEntry| $ 16))
|STAGG-;setelt;AUs2S;12|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |s|)))))))))))))
(DEFUN |STAGG-;concat!;3A;13| (|x| |y| $)
(SEQ (COND
- ((SPADCALL |x| (|getShellEntry| $ 17)) |y|)
+ ((SPADCALL |x| (|getShellEntry| $ 20)) |y|)
('T
- (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 44)) |y|
- (|getShellEntry| $ 45))
+ (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 55)) |y|
+ (|getShellEntry| $ 56))
(EXIT |x|))))))
(DEFUN |StreamAggregate&| (|#1| |#2|)
@@ -284,7 +284,7 @@
(LETT |dv$1| (|devaluate| |#1|) . #0=(|StreamAggregate&|))
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$| (LIST '|StreamAggregate&| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 51) . #0#)
+ (LETT $ (|newShell| 62) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -294,19 +294,19 @@
(COND
((|HasAttribute| |#1| '|shallowlyMutable|)
(PROGN
- (|setShellEntry| $ 32
+ (|setShellEntry| $ 39
(CONS (|dispatchFunction| |STAGG-;concat;3A;7|) $))
- (|setShellEntry| $ 35
+ (|setShellEntry| $ 46
(CONS (|dispatchFunction| |STAGG-;concat;LA;8|) $))
- (|setShellEntry| $ 38
+ (|setShellEntry| $ 49
(CONS (|dispatchFunction| |STAGG-;map!;M2A;9|) $))
- (|setShellEntry| $ 39
+ (|setShellEntry| $ 50
(CONS (|dispatchFunction| |STAGG-;fill!;ASA;10|) $))
- (|setShellEntry| $ 40
+ (|setShellEntry| $ 51
(CONS (|dispatchFunction| |STAGG-;setelt;AI2S;11|) $))
- (|setShellEntry| $ 43
+ (|setShellEntry| $ 54
(CONS (|dispatchFunction| |STAGG-;setelt;AUs2S;12|) $))
- (|setShellEntry| $ 46
+ (|setShellEntry| $ 57
(CONS (|dispatchFunction| |STAGG-;concat!;3A;13|) $)))))
$))))
@@ -314,39 +314,45 @@
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|)
(|Boolean|) (0 . |cyclic?|)
|STAGG-;explicitlyFinite?;AB;1|
- |STAGG-;possiblyInfinite?;AB;2| (5 . |rest|) (|List| 7)
- (10 . |construct|) (|NonNegativeInteger|)
- |STAGG-;first;ANniA;3| (15 . |empty?|) (20 . |first|)
- (|Integer|) (25 . |minIndex|) (30 . |rest|)
- |STAGG-;elt;AIS;5| (|UniversalSegment| 19) (36 . |lo|)
- (41 . |hasHi|) (46 . |copy|) (51 . |hi|) (56 . |empty|)
- (60 . |first|) |STAGG-;elt;AUsA;6| (66 . |concat!|)
- (72 . |concat|) (|List| $) (78 . |concat|) (83 . |concat|)
- (88 . |setfirst!|) (|Mapping| 7 7) (94 . |map!|)
- (100 . |fill!|) (106 . |setelt|) (113 . |maxIndex|)
- (118 . |eq?|) (124 . |setelt|) (131 . |tail|)
- (136 . |setrest!|) (142 . |concat!|) '"rest" '"last"
- '"first" '"value")
- '#(|setelt| 148 |possiblyInfinite?| 162 |map!| 167 |first|
- 173 |fill!| 179 |explicitlyFinite?| 185 |elt| 190
- |concat!| 202 |concat| 208)
+ |STAGG-;possiblyInfinite?;AB;2| (|SingleInteger|)
+ (5 . |One|) (|NonNegativeInteger|) (9 . |One|)
+ (13 . |rest|) (|List| 7) (18 . |construct|)
+ |STAGG-;first;ANniA;3| (23 . |empty?|) (28 . |first|)
+ (|Integer|) (33 . |minIndex|) (38 . -) (44 . |Zero|)
+ (48 . <) (54 . |rest|) |STAGG-;elt;AIS;5|
+ (|UniversalSegment| 22) (60 . |lo|) (65 . |hasHi|)
+ (70 . |copy|) (75 . |hi|) (80 . |empty|) (84 . +)
+ (90 . |first|) |STAGG-;elt;AUsA;6| (96 . |concat!|)
+ (102 . |concat|) (|List| 6) (108 . |empty?|)
+ (113 . |first|) (118 . |rest|) (|List| $) (123 . |concat|)
+ (128 . |concat|) (133 . |setfirst!|) (|Mapping| 7 7)
+ (139 . |map!|) (145 . |fill!|) (151 . |setelt|)
+ (158 . |maxIndex|) (163 . |eq?|) (169 . |setelt|)
+ (176 . |tail|) (181 . |setrest!|) (187 . |concat!|)
+ '"rest" '"last" '"first" '"value")
+ '#(|setelt| 193 |possiblyInfinite?| 207 |map!| 212 |first|
+ 218 |fill!| 224 |explicitlyFinite?| 230 |elt| 235
+ |concat!| 247 |concat| 253)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 46
- '(1 6 8 0 9 1 6 0 0 12 1 6 0 13 14 1 6
- 8 0 17 1 6 7 0 18 1 6 19 0 20 2 6 0 0
- 15 21 1 23 19 0 24 1 23 8 0 25 1 6 0
- 0 26 1 23 19 0 27 0 6 0 28 2 6 0 0 15
- 29 2 6 0 0 0 31 2 0 0 0 0 32 1 6 0 33
- 34 1 0 0 33 35 2 6 7 0 7 36 2 0 0 37
- 0 38 2 0 0 0 7 39 3 0 7 0 19 7 40 1 6
- 19 0 41 2 6 8 0 0 42 3 0 7 0 23 7 43
- 1 6 0 0 44 2 6 0 0 0 45 2 0 0 0 0 46
- 3 0 7 0 19 7 40 3 0 7 0 23 7 43 1 0 8
- 0 11 2 0 0 37 0 38 2 0 0 0 15 16 2 0
- 0 0 7 39 1 0 8 0 10 2 0 7 0 19 22 2 0
- 0 0 23 30 2 0 0 0 0 46 1 0 0 33 35 2
- 0 0 0 0 32)))))
+ (|makeByteWordVec2| 57
+ '(1 6 8 0 9 0 12 0 13 0 14 0 15 1 6 0 0
+ 16 1 6 0 17 18 1 6 8 0 20 1 6 7 0 21
+ 1 6 22 0 23 2 22 0 0 0 24 0 22 0 25 2
+ 22 8 0 0 26 2 6 0 0 14 27 1 29 22 0
+ 30 1 29 8 0 31 1 6 0 0 32 1 29 22 0
+ 33 0 6 0 34 2 22 0 0 0 35 2 6 0 0 14
+ 36 2 6 0 0 0 38 2 0 0 0 0 39 1 40 8 0
+ 41 1 40 6 0 42 1 40 0 0 43 1 6 0 44
+ 45 1 0 0 44 46 2 6 7 0 7 47 2 0 0 48
+ 0 49 2 0 0 0 7 50 3 0 7 0 22 7 51 1 6
+ 22 0 52 2 6 8 0 0 53 3 0 7 0 29 7 54
+ 1 6 0 0 55 2 6 0 0 0 56 2 0 0 0 0 57
+ 3 0 7 0 22 7 51 3 0 7 0 29 7 54 1 0 8
+ 0 11 2 0 0 48 0 49 2 0 0 0 14 19 2 0
+ 0 0 7 50 1 0 8 0 10 2 0 7 0 22 28 2 0
+ 0 0 29 37 2 0 0 0 0 57 1 0 0 44 46 2
+ 0 0 0 0 39)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp
index 6529e944..933198cc 100644
--- a/src/algebra/strap/SYMBOL.lsp
+++ b/src/algebra/strap/SYMBOL.lsp
@@ -117,7 +117,7 @@
(COND
((|SYMBOL;scripted?;$B;30| |x| $)
(|error| "Cannot convert a scripted symbol to OpenMath"))
- ('T (SPADCALL |dev| |x| (|getShellEntry| $ 26)))))
+ ('T (SPADCALL |dev| |x| (|getShellEntry| $ 27)))))
(DEFUN |SYMBOL;OMwrite;$S;2| (|x| $)
(PROG (|sp| |dev| |s|)
@@ -125,13 +125,13 @@
(SEQ (LETT |s| "" |SYMBOL;OMwrite;$S;2|)
(LETT |sp| (OM-STRINGTOSTRINGPTR |s|) |SYMBOL;OMwrite;$S;2|)
(LETT |dev|
- (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 28))
- (|getShellEntry| $ 29))
+ (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 29))
+ (|getShellEntry| $ 30))
|SYMBOL;OMwrite;$S;2|)
- (SPADCALL |dev| (|getShellEntry| $ 30))
- (|SYMBOL;writeOMSym| |dev| |x| $)
(SPADCALL |dev| (|getShellEntry| $ 31))
+ (|SYMBOL;writeOMSym| |dev| |x| $)
(SPADCALL |dev| (|getShellEntry| $ 32))
+ (SPADCALL |dev| (|getShellEntry| $ 33))
(LETT |s| (OM-STRINGPTRTOSTRING |sp|) |SYMBOL;OMwrite;$S;2|)
(EXIT |s|)))))
@@ -142,30 +142,30 @@
(LETT |sp| (OM-STRINGTOSTRINGPTR |s|)
|SYMBOL;OMwrite;$BS;3|)
(LETT |dev|
- (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 28))
- (|getShellEntry| $ 29))
+ (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 29))
+ (|getShellEntry| $ 30))
|SYMBOL;OMwrite;$BS;3|)
- (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 30))))
- (|SYMBOL;writeOMSym| |dev| |x| $)
(COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 31))))
- (SPADCALL |dev| (|getShellEntry| $ 32))
+ (|SYMBOL;writeOMSym| |dev| |x| $)
+ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 32))))
+ (SPADCALL |dev| (|getShellEntry| $ 33))
(LETT |s| (OM-STRINGPTRTOSTRING |sp|)
|SYMBOL;OMwrite;$BS;3|)
(EXIT |s|)))))
(DEFUN |SYMBOL;OMwrite;Omd$V;4| (|dev| |x| $)
- (SEQ (SPADCALL |dev| (|getShellEntry| $ 30))
+ (SEQ (SPADCALL |dev| (|getShellEntry| $ 31))
(|SYMBOL;writeOMSym| |dev| |x| $)
- (EXIT (SPADCALL |dev| (|getShellEntry| $ 31)))))
+ (EXIT (SPADCALL |dev| (|getShellEntry| $ 32)))))
(DEFUN |SYMBOL;OMwrite;Omd$BV;5| (|dev| |x| |wholeObj| $)
- (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 30))))
+ (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 31))))
(|SYMBOL;writeOMSym| |dev| |x| $)
(EXIT (COND
- (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 31)))))))
+ (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 32)))))))
(DEFUN |SYMBOL;convert;$If;6| (|s| $)
- (SPADCALL |s| (|getShellEntry| $ 45)))
+ (SPADCALL |s| (|getShellEntry| $ 47)))
(DEFUN |SYMBOL;convert;2$;7| (|s| $) (DECLARE (IGNORE $)) |s|)
@@ -180,7 +180,7 @@
(GGREATERP |y| |x|))
(DEFUN |SYMBOL;coerce;$Of;11| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 52)))
+ (SPADCALL |x| (|getShellEntry| $ 54)))
(DEFUN |SYMBOL;subscript;$L$;12| (|sy| |lx| $)
(|SYMBOL;script;$L$;22| |sy| (LIST |lx| NIL NIL NIL NIL) $))
@@ -195,19 +195,19 @@
(|SYMBOL;script;$L$;22| |sy| (LIST NIL NIL NIL NIL |lx|) $))
(DEFUN |SYMBOL;patternMatch;$P2Pmr;16| (|x| |p| |l| $)
- (SPADCALL |x| |p| |l| (|getShellEntry| $ 64)))
+ (SPADCALL |x| |p| |l| (|getShellEntry| $ 69)))
(DEFUN |SYMBOL;patternMatch;$P2Pmr;17| (|x| |p| |l| $)
- (SPADCALL |x| |p| |l| (|getShellEntry| $ 71)))
+ (SPADCALL |x| |p| |l| (|getShellEntry| $ 76)))
(DEFUN |SYMBOL;convert;$P;18| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 74)))
+ (SPADCALL |x| (|getShellEntry| $ 79)))
(DEFUN |SYMBOL;convert;$P;19| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 76)))
+ (SPADCALL |x| (|getShellEntry| $ 81)))
(DEFUN |SYMBOL;syprefix| (|sc| $)
- (PROG (|ns| #0=#:G1549 |n| #1=#:G1550)
+ (PROG (|ns| #0=#:G1550 |n| #1=#:G1551)
(RETURN
(SEQ (LETT |ns|
(LIST (LENGTH (QVELT |sc| 3)) (LENGTH (QVELT |sc| 2))
@@ -222,7 +222,7 @@
(SEQ (EXIT (LETT |ns| (CDR |ns|) |SYMBOL;syprefix|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT (SPADCALL
- (CONS (STRCONC (|getShellEntry| $ 37)
+ (CONS (STRCONC (|getShellEntry| $ 38)
(|SYMBOL;istring|
(LENGTH (QVELT |sc| 4)) $))
(PROGN
@@ -247,22 +247,22 @@
|SYMBOL;syprefix|)
(GO G190) G191
(EXIT (NREVERSE0 #0#)))))
- (|getShellEntry| $ 79)))))))
+ (|getShellEntry| $ 95)))))))
(DEFUN |SYMBOL;syscripts| (|sc| $)
(PROG (|all|)
(RETURN
(SEQ (LETT |all| (QVELT |sc| 3) |SYMBOL;syscripts|)
(LETT |all|
- (SPADCALL (QVELT |sc| 2) |all| (|getShellEntry| $ 80))
+ (SPADCALL (QVELT |sc| 2) |all| (|getShellEntry| $ 96))
|SYMBOL;syscripts|)
(LETT |all|
- (SPADCALL (QVELT |sc| 1) |all| (|getShellEntry| $ 80))
+ (SPADCALL (QVELT |sc| 1) |all| (|getShellEntry| $ 96))
|SYMBOL;syscripts|)
(LETT |all|
- (SPADCALL (QVELT |sc| 0) |all| (|getShellEntry| $ 80))
+ (SPADCALL (QVELT |sc| 0) |all| (|getShellEntry| $ 96))
|SYMBOL;syscripts|)
- (EXIT (SPADCALL |all| (QVELT |sc| 4) (|getShellEntry| $ 80)))))))
+ (EXIT (SPADCALL |all| (QVELT |sc| 4) (|getShellEntry| $ 96)))))))
(DEFUN |SYMBOL;script;$L$;22| (|sy| |ls| $)
(PROG (|sc|)
@@ -318,9 +318,9 @@
(COND
((< 1 (QCSIZE |s|))
(COND
- ((SPADCALL (SPADCALL |s| 1 (|getShellEntry| $ 85))
- (SPADCALL "\\" (|getShellEntry| $ 40))
- (|getShellEntry| $ 86))
+ ((SPADCALL (SPADCALL |s| 1 (|getShellEntry| $ 107))
+ (SPADCALL "\\" (|getShellEntry| $ 43))
+ (|getShellEntry| $ 108))
(LETT |s| (STRCONC "\\mbox{\\it " (STRCONC |s| "}"))
|SYMBOL;latex;$S;25|)))))
(COND ((NULL (|SYMBOL;scripted?;$B;30| |e| $)) (EXIT |s|)))
@@ -335,7 +335,7 @@
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 88)))
+ (|getShellEntry| $ 112)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -356,7 +356,7 @@
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 88)))
+ (|getShellEntry| $ 112)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -377,7 +377,7 @@
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 88)))
+ (|getShellEntry| $ 112)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -398,7 +398,7 @@
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 88)))
+ (|getShellEntry| $ 112)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -419,7 +419,7 @@
(SEQ (LETT |sc|
(STRCONC |sc|
(SPADCALL (|SPADfirst| |lo|)
- (|getShellEntry| $ 88)))
+ (|getShellEntry| $ 112)))
|SYMBOL;latex;$S;25|)
(LETT |lo| (CDR |lo|)
|SYMBOL;latex;$S;25|)
@@ -435,7 +435,7 @@
(EXIT |s|)))))
(DEFUN |SYMBOL;anyRadix| (|n| |s| $)
- (PROG (|qr| |ns| #0=#:G1504)
+ (PROG (|qr| |ns| #0=#:G1505)
(RETURN
(SEQ (EXIT (SEQ (LETT |ns| "" |SYMBOL;anyRadix|)
(EXIT (SEQ G190 NIL
@@ -449,9 +449,9 @@
(SPADCALL |s|
(+ (QCDR |qr|)
(SPADCALL |s|
- (|getShellEntry| $ 90)))
- (|getShellEntry| $ 85))
- |ns| (|getShellEntry| $ 91))
+ (|getShellEntry| $ 117)))
+ (|getShellEntry| $ 107))
+ |ns| (|getShellEntry| $ 119))
|SYMBOL;anyRadix|)
(EXIT
(COND
@@ -468,15 +468,15 @@
(RETURN
(SEQ (LETT |sym|
(|SYMBOL;anyRadix|
- (SPADCALL (|getShellEntry| $ 9)
- (|getShellEntry| $ 92))
- (|getShellEntry| $ 19) $)
+ (SPADCALL (|getShellEntry| $ 10)
+ (|getShellEntry| $ 120))
+ (|getShellEntry| $ 20) $)
|SYMBOL;new;$;27|)
- (SPADCALL (|getShellEntry| $ 9)
- (+ (SPADCALL (|getShellEntry| $ 9)
- (|getShellEntry| $ 92))
+ (SPADCALL (|getShellEntry| $ 10)
+ (+ (SPADCALL (|getShellEntry| $ 10)
+ (|getShellEntry| $ 120))
1)
- (|getShellEntry| $ 93))
+ (|getShellEntry| $ 121))
(EXIT (|SYMBOL;coerce;S$;8| (STRCONC "%" |sym|) $))))))
(DEFUN |SYMBOL;new;2$;28| (|x| $)
@@ -484,15 +484,15 @@
(RETURN
(SEQ (LETT |n|
(SEQ (LETT |u|
- (SPADCALL |x| (|getShellEntry| $ 12)
- (|getShellEntry| $ 96))
+ (SPADCALL |x| (|getShellEntry| $ 13)
+ (|getShellEntry| $ 124))
|SYMBOL;new;2$;28|)
(EXIT (COND
((QEQCAR |u| 1) 0)
('T (+ (QCDR |u|) 1)))))
|SYMBOL;new;2$;28|)
- (SPADCALL (|getShellEntry| $ 12) |x| |n|
- (|getShellEntry| $ 97))
+ (SPADCALL (|getShellEntry| $ 13) |x| |n|
+ (|getShellEntry| $ 127))
(LETT |xx|
(COND
((NULL (|SYMBOL;scripted?;$B;30| |x| $))
@@ -507,19 +507,19 @@
((NULL (< (SPADCALL
(SPADCALL |xx|
(SPADCALL |xx|
- (|getShellEntry| $ 98))
- (|getShellEntry| $ 85))
- (|getShellEntry| $ 18)
- (|getShellEntry| $ 99))
- (SPADCALL (|getShellEntry| $ 18)
- (|getShellEntry| $ 90))))
+ (|getShellEntry| $ 128))
+ (|getShellEntry| $ 107))
+ (|getShellEntry| $ 19)
+ (|getShellEntry| $ 129))
+ (SPADCALL (|getShellEntry| $ 19)
+ (|getShellEntry| $ 117))))
(STRCONC |xx|
(|SYMBOL;anyRadix| |n|
- (|getShellEntry| $ 20) $)))
+ (|getShellEntry| $ 21) $)))
('T
(STRCONC |xx|
(|SYMBOL;anyRadix| |n|
- (|getShellEntry| $ 18) $))))
+ (|getShellEntry| $ 19) $))))
|SYMBOL;new;2$;28|)
(COND
((NULL (|SYMBOL;scripted?;$B;30| |x| $))
@@ -528,13 +528,13 @@
(|SYMBOL;scripts;$R;32| |x| $) $))))))
(DEFUN |SYMBOL;resetNew;V;29| ($)
- (PROG (|k| #0=#:G1551)
+ (PROG (|k| #0=#:G1552)
(RETURN
- (SEQ (SPADCALL (|getShellEntry| $ 9) 0 (|getShellEntry| $ 93))
+ (SEQ (SPADCALL (|getShellEntry| $ 10) 0 (|getShellEntry| $ 121))
(SEQ (LETT |k| NIL |SYMBOL;resetNew;V;29|)
(LETT #0#
- (SPADCALL (|getShellEntry| $ 12)
- (|getShellEntry| $ 102))
+ (SPADCALL (|getShellEntry| $ 13)
+ (|getShellEntry| $ 133))
|SYMBOL;resetNew;V;29|)
G190
(COND
@@ -543,16 +543,16 @@
(LETT |k| (CAR #0#) |SYMBOL;resetNew;V;29|)
NIL))
(GO G191)))
- (SEQ (EXIT (SPADCALL |k| (|getShellEntry| $ 12)
- (|getShellEntry| $ 103))))
+ (SEQ (EXIT (SPADCALL |k| (|getShellEntry| $ 13)
+ (|getShellEntry| $ 134))))
(LETT #0# (CDR #0#) |SYMBOL;resetNew;V;29|) (GO G190)
G191 (EXIT NIL))
- (EXIT (SPADCALL (|getShellEntry| $ 104)))))))
+ (EXIT (SPADCALL (|getShellEntry| $ 135)))))))
(DEFUN |SYMBOL;scripted?;$B;30| (|sy| $) (NOT (ATOM |sy|)))
(DEFUN |SYMBOL;name;2$;31| (|sy| $)
- (PROG (|str| |i| #0=#:G1552 #1=#:G1532 #2=#:G1530)
+ (PROG (|str| |i| #0=#:G1553 #1=#:G1533 #2=#:G1531)
(RETURN
(SEQ (EXIT (COND
((NULL (|SYMBOL;scripted?;$B;30| |sy| $)) |sy|)
@@ -561,12 +561,12 @@
(|SYMBOL;string;$S;24|
(SPADCALL
(|SYMBOL;list;$L;34| |sy| $)
- (|getShellEntry| $ 107))
+ (|getShellEntry| $ 139))
$)
|SYMBOL;name;2$;31|)
(SEQ (EXIT (SEQ
(LETT |i|
- (+ (|getShellEntry| $ 38) 1)
+ (+ (|getShellEntry| $ 41) 1)
|SYMBOL;name;2$;31|)
(LETT #0# (QCSIZE |str|)
|SYMBOL;name;2$;31|)
@@ -578,8 +578,8 @@
((NULL
(SPADCALL
(SPADCALL |str| |i|
- (|getShellEntry| $ 85))
- (|getShellEntry| $ 108)))
+ (|getShellEntry| $ 107))
+ (|getShellEntry| $ 143)))
(PROGN
(LETT #2#
(PROGN
@@ -589,9 +589,9 @@
(SPADCALL |i|
(QCSIZE |str|)
(|getShellEntry| $
- 110))
+ 145))
(|getShellEntry| $
- 111))
+ 146))
$)
|SYMBOL;name;2$;31|)
(GO #1#))
@@ -605,8 +605,8 @@
#1# (EXIT #1#)))))
(DEFUN |SYMBOL;scripts;$R;32| (|sy| $)
- (PROG (|lscripts| |str| |nstr| |j| #0=#:G1535 |nscripts| |m| |n|
- #1=#:G1553 |i| #2=#:G1554 |a| #3=#:G1555 |allscripts|)
+ (PROG (|lscripts| |str| |nstr| |j| #0=#:G1536 |nscripts| |m| |n|
+ #1=#:G1554 |i| #2=#:G1555 |a| #3=#:G1556 |allscripts|)
(RETURN
(SEQ (COND
((NULL (|SYMBOL;scripted?;$B;30| |sy| $))
@@ -619,22 +619,22 @@
(LETT |str|
(|SYMBOL;string;$S;24|
(SPADCALL (|SYMBOL;list;$L;34| |sy| $)
- (|getShellEntry| $ 107))
+ (|getShellEntry| $ 139))
$)
|SYMBOL;scripts;$R;32|)
(LETT |nstr| (QCSIZE |str|) |SYMBOL;scripts;$R;32|)
(LETT |m|
- (SPADCALL |nscripts| (|getShellEntry| $ 113))
+ (SPADCALL |nscripts| (|getShellEntry| $ 148))
|SYMBOL;scripts;$R;32|)
- (SEQ (LETT |j| (+ (|getShellEntry| $ 38) 1)
+ (SEQ (LETT |j| (+ (|getShellEntry| $ 41) 1)
|SYMBOL;scripts;$R;32|)
(LETT |i| |m| |SYMBOL;scripts;$R;32|) G190
(COND
((OR (> |j| |nstr|)
(NULL (SPADCALL
(SPADCALL |str| |j|
- (|getShellEntry| $ 85))
- (|getShellEntry| $ 108))))
+ (|getShellEntry| $ 107))
+ (|getShellEntry| $ 143))))
(GO G191)))
(SEQ (EXIT (SPADCALL |nscripts| |i|
(PROG1
@@ -642,14 +642,14 @@
(-
(SPADCALL
(SPADCALL |str| |j|
- (|getShellEntry| $ 85))
- (|getShellEntry| $ 42))
- (|getShellEntry| $ 43))
+ (|getShellEntry| $ 107))
+ (|getShellEntry| $ 44))
+ (|getShellEntry| $ 45))
|SYMBOL;scripts;$R;32|)
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 114))))
+ (|getShellEntry| $ 150))))
(LETT |i|
(PROG1 (+ |i| 1)
(LETT |j| (+ |j| 1)
@@ -659,14 +659,14 @@
(LETT |nscripts|
(SPADCALL (CDR |nscripts|)
(|SPADfirst| |nscripts|)
- (|getShellEntry| $ 115))
+ (|getShellEntry| $ 153))
|SYMBOL;scripts;$R;32|)
(LETT |allscripts|
(SPADCALL (|SYMBOL;list;$L;34| |sy| $)
- (|getShellEntry| $ 116))
+ (|getShellEntry| $ 154))
|SYMBOL;scripts;$R;32|)
(LETT |m|
- (SPADCALL |lscripts| (|getShellEntry| $ 117))
+ (SPADCALL |lscripts| (|getShellEntry| $ 155))
|SYMBOL;scripts;$R;32|)
(SEQ (LETT |n| NIL |SYMBOL;scripts;$R;32|)
(LETT #1# |nscripts| |SYMBOL;scripts;$R;32|)
@@ -681,7 +681,7 @@
(SEQ (EXIT (COND
((<
(SPADCALL |allscripts|
- (|getShellEntry| $ 118))
+ (|getShellEntry| $ 156))
|n|)
(|error|
"Improper script count in symbol"))
@@ -696,7 +696,7 @@
|SYMBOL;scripts;$R;32|)
(LETT #3#
(SPADCALL |allscripts| |n|
- (|getShellEntry| $ 119))
+ (|getShellEntry| $ 157))
|SYMBOL;scripts;$R;32|)
G190
(COND
@@ -718,11 +718,11 @@
|SYMBOL;scripts;$R;32|)
(GO G190) G191
(EXIT (NREVERSE0 #2#))))
- (|getShellEntry| $ 120))
+ (|getShellEntry| $ 158))
(EXIT
(LETT |allscripts|
(SPADCALL |allscripts| |n|
- (|getShellEntry| $ 121))
+ (|getShellEntry| $ 159))
|SYMBOL;scripts;$R;32|)))))))
(LETT |i|
(PROG1 (+ |i| 1)
@@ -731,20 +731,20 @@
|SYMBOL;scripts;$R;32|)
(GO G190) G191 (EXIT NIL))
(EXIT (VECTOR (SPADCALL |lscripts| |m|
- (|getShellEntry| $ 122))
+ (|getShellEntry| $ 160))
(SPADCALL |lscripts| (+ |m| 1)
- (|getShellEntry| $ 122))
+ (|getShellEntry| $ 160))
(SPADCALL |lscripts| (+ |m| 2)
- (|getShellEntry| $ 122))
+ (|getShellEntry| $ 160))
(SPADCALL |lscripts| (+ |m| 3)
- (|getShellEntry| $ 122))
+ (|getShellEntry| $ 160))
(SPADCALL |lscripts| (+ |m| 4)
- (|getShellEntry| $ 122)))))))))))
+ (|getShellEntry| $ 160)))))))))))
(DEFUN |SYMBOL;istring| (|n| $)
(COND
((< 9 |n|) (|error| "Can have at most 9 scripts of each kind"))
- ('T (|getSimpleArrayEntry| (|getShellEntry| $ 17) (+ |n| 0)))))
+ ('T (|getSimpleArrayEntry| (|getShellEntry| $ 18) (+ |n| 0)))))
(DEFUN |SYMBOL;list;$L;34| (|sy| $)
(COND
@@ -757,7 +757,7 @@
(DEFUN |Symbol| ()
(PROG ()
(RETURN
- (PROG (#0=#:G1557)
+ (PROG (#0=#:G1558)
(RETURN
(COND
((LETT #0# (HGET |$ConstructorCache| '|Symbol|) |Symbol|)
@@ -775,129 +775,153 @@
(RETURN
(PROGN
(LETT |dv$| '(|Symbol|) . #0=(|Symbol|))
- (LETT $ (|newShell| 125) . #0#)
+ (LETT $ (|newShell| 164) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
(|haddProp| |$ConstructorCache| '|Symbol| NIL (CONS 1 $))
(|stuffDomainSlots| $)
- (|setShellEntry| $ 9 (SPADCALL 0 (|getShellEntry| $ 8)))
- (|setShellEntry| $ 12 (SPADCALL (|getShellEntry| $ 11)))
- (|setShellEntry| $ 17
+ (|setShellEntry| $ 10 (SPADCALL 0 (|getShellEntry| $ 9)))
+ (|setShellEntry| $ 13 (SPADCALL (|getShellEntry| $ 12)))
+ (|setShellEntry| $ 18
(SPADCALL (LIST "0" "1" "2" "3" "4" "5" "6" "7" "8" "9")
- (|getShellEntry| $ 16)))
- (|setShellEntry| $ 18 "0123456789")
- (|setShellEntry| $ 19 "ABCDEFGHIJKLMNOPQRSTUVWXYZ")
- (|setShellEntry| $ 20 "abcdefghijklmnopqrstuvwxyz")
- (|setShellEntry| $ 37 "*")
- (|setShellEntry| $ 38 (QCSIZE (|getShellEntry| $ 37)))
- (|setShellEntry| $ 43
- (SPADCALL (SPADCALL "0" (|getShellEntry| $ 40))
- (|getShellEntry| $ 42)))
+ (|getShellEntry| $ 17)))
+ (|setShellEntry| $ 19 "0123456789")
+ (|setShellEntry| $ 20 "ABCDEFGHIJKLMNOPQRSTUVWXYZ")
+ (|setShellEntry| $ 21 "abcdefghijklmnopqrstuvwxyz")
+ (|setShellEntry| $ 38 "*")
+ (|setShellEntry| $ 41 (QCSIZE (|getShellEntry| $ 38)))
+ (|setShellEntry| $ 45
+ (SPADCALL (SPADCALL "0" (|getShellEntry| $ 43))
+ (|getShellEntry| $ 44)))
$))))
(MAKEPROP '|Symbol| '|infovec|
- (LIST '#(NIL NIL NIL NIL NIL NIL (|Integer|) (|Reference| 6)
- (0 . |ref|) '|count| (|AssociationList| $$ 6)
- (5 . |empty|) '|xcount| (|String|) (|List| 13)
- (|PrimitiveArray| 13) (9 . |construct|) '|istrings|
- '|nums| 'ALPHAS '|alphas| (|Boolean|)
- |SYMBOL;scripted?;$B;30| (|Void|) (|Symbol|)
- (|OpenMathDevice|) (14 . |OMputVariable|)
- (|OpenMathEncoding|) (20 . |OMencodingXML|)
- (24 . |OMopenString|) (30 . |OMputObject|)
- (35 . |OMputEndObject|) (40 . |OMclose|)
+ (LIST '#(NIL NIL NIL NIL NIL NIL (|Integer|) (0 . |Zero|)
+ (|Reference| 6) (4 . |ref|) '|count|
+ (|AssociationList| $$ 6) (9 . |empty|) '|xcount|
+ (|String|) (|List| 14) (|PrimitiveArray| 14)
+ (13 . |construct|) '|istrings| '|nums| 'ALPHAS '|alphas|
+ (|Boolean|) |SYMBOL;scripted?;$B;30| (|Void|) (|Symbol|)
+ (|OpenMathDevice|) (18 . |OMputVariable|)
+ (|OpenMathEncoding|) (24 . |OMencodingXML|)
+ (28 . |OMopenString|) (34 . |OMputObject|)
+ (39 . |OMputEndObject|) (44 . |OMclose|)
|SYMBOL;OMwrite;$S;2| |SYMBOL;OMwrite;$BS;3|
|SYMBOL;OMwrite;Omd$V;4| |SYMBOL;OMwrite;Omd$BV;5| '|hd|
- '|lhd| (|Character|) (45 . |char|) (|NonNegativeInteger|)
- (50 . |ord|) '|ord0| (|InputForm|) (55 . |convert|)
- |SYMBOL;convert;$If;6| |SYMBOL;convert;2$;7|
- |SYMBOL;coerce;S$;8| |SYMBOL;=;2$B;9| |SYMBOL;<;2$B;10|
- (|OutputForm|) (60 . |outputForm|) |SYMBOL;coerce;$Of;11|
- (|List| 51) (|List| 54) |SYMBOL;script;$L$;22|
- |SYMBOL;subscript;$L$;12| |SYMBOL;elt;$L$;13|
- |SYMBOL;superscript;$L$;14| |SYMBOL;argscript;$L$;15|
- (|PatternMatchResult| 6 24) (|Pattern| 6)
- (|PatternMatchSymbol| 6) (65 . |patternMatch|)
- (|PatternMatchResult| 6 $) |SYMBOL;patternMatch;$P2Pmr;16|
- (|Float|) (|PatternMatchResult| 67 24) (|Pattern| 67)
- (|PatternMatchSymbol| 67) (72 . |patternMatch|)
- (|PatternMatchResult| 67 $)
- |SYMBOL;patternMatch;$P2Pmr;17| (79 . |coerce|)
- |SYMBOL;convert;$P;18| (84 . |coerce|)
- |SYMBOL;convert;$P;19| (|List| $) (89 . |concat|)
- (94 . |concat|)
- (|Record| (|:| |sub| 54) (|:| |sup| 54) (|:| |presup| 54)
- (|:| |presub| 54) (|:| |args| 54))
+ (|NonNegativeInteger|) (49 . |#|) '|lhd| (|Character|)
+ (54 . |char|) (59 . |ord|) '|ord0| (|InputForm|)
+ (64 . |convert|) |SYMBOL;convert;$If;6|
+ |SYMBOL;convert;2$;7| |SYMBOL;coerce;S$;8|
+ |SYMBOL;=;2$B;9| |SYMBOL;<;2$B;10| (|OutputForm|)
+ (69 . |outputForm|) |SYMBOL;coerce;$Of;11| (74 . |nil|)
+ (|List| 53) (78 . |nil|) (|List| 57) (82 . |nil|)
+ |SYMBOL;script;$L$;22| |SYMBOL;subscript;$L$;12|
+ |SYMBOL;elt;$L$;13| |SYMBOL;superscript;$L$;14|
+ |SYMBOL;argscript;$L$;15| (|PatternMatchResult| 6 25)
+ (|Pattern| 6) (|PatternMatchSymbol| 6)
+ (86 . |patternMatch|) (|PatternMatchResult| 6 $)
+ |SYMBOL;patternMatch;$P2Pmr;16| (|Float|)
+ (|PatternMatchResult| 72 25) (|Pattern| 72)
+ (|PatternMatchSymbol| 72) (93 . |patternMatch|)
+ (|PatternMatchResult| 72 $)
+ |SYMBOL;patternMatch;$P2Pmr;17| (100 . |coerce|)
+ |SYMBOL;convert;$P;18| (105 . |coerce|)
+ |SYMBOL;convert;$P;19| (110 . |#|) (|List| 6) (115 . |#|)
+ (120 . <) (126 . |false|) (130 . |first|) (135 . |zero?|)
+ (140 . |rest|) (145 . |concat|) (151 . |reverse!|)
+ (156 . |concat|) (|List| $) (162 . |concat|)
+ (167 . |concat|) (173 . |null|) (178 . |first|)
+ (183 . |rest|)
+ (|Record| (|:| |sub| 57) (|:| |sup| 57) (|:| |presup| 57)
+ (|:| |presub| 57) (|:| |args| 57))
|SYMBOL;script;$R$;23| |SYMBOL;name;2$;31|
- |SYMBOL;string;$S;24| (100 . |elt|) (106 . ~=)
- |SYMBOL;scripts;$R;32| (112 . |latex|)
- |SYMBOL;latex;$S;25| (117 . |minIndex|) (122 . |concat|)
- (128 . |elt|) (133 . |setelt|) |SYMBOL;new;$;27|
- (|Union| 6 '"failed") (139 . |search|) (145 . |setelt|)
- (152 . |maxIndex|) (157 . |position|) |SYMBOL;new;2$;28|
- (|List| $$) (163 . |keys|) (168 . |remove!|)
- (174 . |void|) |SYMBOL;resetNew;V;29| |SYMBOL;list;$L;34|
- (178 . |first|) (183 . |digit?|) (|UniversalSegment| 6)
- (188 . SEGMENT) (194 . |elt|) (|List| 41)
- (200 . |minIndex|) (205 . |setelt|) (212 . |concat|)
- (218 . |rest|) (223 . |minIndex|) (228 . |#|)
- (233 . |first|) (239 . |setelt|) (246 . |rest|)
- (252 . |elt|)
+ |SYMBOL;string;$S;24| (188 . |concat|) (194 . |One|)
+ (198 . |One|) (202 . |elt|) (208 . ~=)
+ |SYMBOL;scripts;$R;32| (214 . |empty?|) (219 . |first|)
+ (224 . |latex|) (229 . |rest|) |SYMBOL;latex;$S;25|
+ (|Record| (|:| |quotient| $) (|:| |remainder| $))
+ (234 . |divide|) (240 . |minIndex|) (245 . +)
+ (251 . |concat|) (257 . |elt|) (262 . |setelt|)
+ |SYMBOL;new;$;27| (|Union| 6 '"failed") (268 . |search|)
+ (274 . |Zero|) (278 . |inc|) (283 . |setelt|)
+ (290 . |maxIndex|) (295 . |position|) (301 . <)
+ |SYMBOL;new;2$;28| (|List| $$) (307 . |keys|)
+ (312 . |remove!|) (318 . |void|) |SYMBOL;resetNew;V;29|
+ (322 . |not|) |SYMBOL;list;$L;34| (327 . |first|)
+ (|SingleInteger|) (332 . |One|) (336 . +) (342 . |digit?|)
+ (|UniversalSegment| 6) (347 . SEGMENT) (353 . |elt|)
+ (|List| 39) (359 . |minIndex|) (364 . -) (370 . |setelt|)
+ (377 . |rest|) (382 . |first|) (387 . |concat|)
+ (393 . |rest|) (398 . |minIndex|) (403 . |#|)
+ (408 . |first|) (414 . |setelt|) (421 . |rest|)
+ (427 . |elt|) (433 . |minIndex|) (438 . |elt|)
(CONS IDENTITY
(FUNCALL (|dispatchFunction| |SYMBOL;sample;$;35|)
- $))
- (|SingleInteger|))
- '#(~= 258 |superscript| 264 |subscript| 270 |string| 276
- |scripts| 281 |scripted?| 286 |script| 291 |sample| 303
- |resetNew| 307 |patternMatch| 311 |new| 325 |name| 334
- |min| 339 |max| 345 |list| 351 |latex| 356 |hash| 361
- |elt| 366 |convert| 372 |coerce| 392 |argscript| 402
- |OMwrite| 408 >= 432 > 438 = 444 <= 450 < 456)
+ $)))
+ '#(~= 444 |superscript| 450 |subscript| 456 |string| 462
+ |scripts| 467 |scripted?| 472 |script| 477 |sample| 489
+ |resetNew| 493 |patternMatch| 497 |new| 511 |name| 520
+ |min| 525 |max| 531 |list| 537 |latex| 542 |hash| 547
+ |elt| 552 |convert| 558 |coerce| 578 |argscript| 588
+ |OMwrite| 594 >= 618 > 624 = 630 <= 636 < 642)
'NIL
(CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0))
(CONS '#(|OrderedSet&| NIL NIL |SetCategory&|
|BasicType&| NIL NIL NIL NIL NIL NIL NIL)
- (CONS '#((|OrderedSet|) (|PatternMatchable| 67)
+ (CONS '#((|OrderedSet|) (|PatternMatchable| 72)
(|PatternMatchable| 6) (|SetCategory|)
- (|BasicType|) (|ConvertibleTo| 69)
- (|ConvertibleTo| 62)
- (|CoercibleFrom| 13)
- (|ConvertibleTo| 24) (|OpenMath|)
- (|ConvertibleTo| 44) (|CoercibleTo| 51))
- (|makeByteWordVec2| 124
- '(1 7 0 6 8 0 10 0 11 1 15 0 14 16 2 25
- 23 0 24 26 0 27 0 28 2 25 0 13 27 29
- 1 25 23 0 30 1 25 23 0 31 1 25 23 0
- 32 1 39 0 13 40 1 39 41 0 42 1 44 0
- 24 45 1 51 0 24 52 3 63 61 24 62 61
- 64 3 70 68 24 69 68 71 1 69 0 24 74 1
- 62 0 24 76 1 13 0 78 79 2 54 0 0 0 80
- 2 13 39 0 6 85 2 39 21 0 0 86 1 51 13
- 0 88 1 13 6 0 90 2 13 0 39 0 91 1 7 6
- 0 92 2 7 6 0 6 93 2 10 95 2 0 96 3 10
- 6 0 2 6 97 1 13 6 0 98 2 13 6 39 0 99
- 1 10 101 0 102 2 10 95 2 0 103 0 23 0
- 104 1 101 2 0 107 1 39 21 0 108 2 109
- 0 6 6 110 2 13 0 0 109 111 1 112 6 0
- 113 3 112 41 0 6 41 114 2 112 0 0 41
- 115 1 101 0 0 116 1 55 6 0 117 1 101
- 41 0 118 2 101 0 0 41 119 3 55 54 0 6
- 54 120 2 101 0 0 41 121 2 55 54 0 6
- 122 2 0 21 0 0 1 2 0 0 0 54 59 2 0 0
- 0 54 57 1 0 13 0 84 1 0 81 0 87 1 0
- 21 0 22 2 0 0 0 55 56 2 0 0 0 81 82 0
- 0 0 123 0 0 23 105 3 0 72 0 69 72 73
- 3 0 65 0 62 65 66 0 0 0 94 1 0 0 0
- 100 1 0 0 0 83 2 0 0 0 0 1 2 0 0 0 0
- 1 1 0 78 0 106 1 0 13 0 89 1 0 124 0
- 1 2 0 0 0 54 58 1 0 69 0 75 1 0 62 0
- 77 1 0 24 0 47 1 0 44 0 46 1 0 0 13
- 48 1 0 51 0 53 2 0 0 0 54 60 3 0 23
- 25 0 21 36 2 0 13 0 21 34 2 0 23 25 0
- 35 1 0 13 0 33 2 0 21 0 0 1 2 0 21 0
- 0 1 2 0 21 0 0 49 2 0 21 0 0 1 2 0 21
- 0 0 50)))))
+ (|BasicType|) (|ConvertibleTo| 74)
+ (|ConvertibleTo| 67)
+ (|CoercibleFrom| 14)
+ (|ConvertibleTo| 25) (|OpenMath|)
+ (|ConvertibleTo| 46) (|CoercibleTo| 53))
+ (|makeByteWordVec2| 163
+ '(0 6 0 7 1 8 0 6 9 0 11 0 12 1 16 0 15
+ 17 2 26 24 0 25 27 0 28 0 29 2 26 0
+ 14 28 30 1 26 24 0 31 1 26 24 0 32 1
+ 26 24 0 33 1 14 39 0 40 1 42 0 14 43
+ 1 42 39 0 44 1 46 0 25 47 1 53 0 25
+ 54 0 15 0 56 0 57 0 58 0 59 0 60 3 68
+ 66 25 67 66 69 3 75 73 25 74 73 76 1
+ 74 0 25 79 1 67 0 25 81 1 57 39 0 83
+ 1 84 39 0 85 2 39 22 0 0 86 0 22 0 87
+ 1 84 6 0 88 1 6 22 0 89 1 84 0 0 90 2
+ 14 0 0 0 91 1 84 0 0 92 2 15 0 14 0
+ 93 1 14 0 94 95 2 57 0 0 0 96 1 59 22
+ 0 97 1 59 57 0 98 1 59 0 0 99 2 57 0
+ 53 0 104 0 39 0 105 0 6 0 106 2 14 42
+ 0 6 107 2 42 22 0 0 108 1 57 22 0 110
+ 1 57 53 0 111 1 53 14 0 112 1 57 0 0
+ 113 2 6 115 0 0 116 1 14 6 0 117 2 6
+ 0 0 0 118 2 14 0 42 0 119 1 8 6 0 120
+ 2 8 6 0 6 121 2 11 123 2 0 124 0 39 0
+ 125 1 6 0 0 126 3 11 6 0 2 6 127 1 14
+ 6 0 128 2 14 6 42 0 129 2 6 22 0 0
+ 130 1 11 132 0 133 2 11 123 2 0 134 0
+ 24 0 135 1 22 0 0 137 1 132 2 0 139 0
+ 140 0 141 2 39 0 0 0 142 1 42 22 0
+ 143 2 144 0 6 6 145 2 14 0 0 144 146
+ 1 147 6 0 148 2 6 0 0 0 149 3 147 39
+ 0 6 39 150 1 147 0 0 151 1 147 39 0
+ 152 2 147 0 0 39 153 1 132 0 0 154 1
+ 59 6 0 155 1 132 39 0 156 2 132 0 0
+ 39 157 3 59 57 0 6 57 158 2 132 0 0
+ 39 159 2 59 57 0 6 160 1 16 6 0 161 2
+ 16 14 0 6 162 2 0 22 0 0 1 2 0 0 0 57
+ 64 2 0 0 0 57 62 1 0 14 0 103 1 0 100
+ 0 109 1 0 22 0 23 2 0 0 0 59 61 2 0 0
+ 0 100 101 0 0 0 163 0 0 24 136 3 0 77
+ 0 74 77 78 3 0 70 0 67 70 71 0 0 0
+ 122 1 0 0 0 131 1 0 0 0 102 2 0 0 0 0
+ 1 2 0 0 0 0 1 1 0 94 0 138 1 0 14 0
+ 114 1 0 140 0 1 2 0 0 0 57 63 1 0 74
+ 0 80 1 0 67 0 82 1 0 25 0 49 1 0 46 0
+ 48 1 0 0 14 50 1 0 53 0 55 2 0 0 0 57
+ 65 3 0 24 26 0 22 37 2 0 14 0 22 35 2
+ 0 24 26 0 36 1 0 14 0 34 2 0 22 0 0 1
+ 2 0 22 0 0 1 2 0 22 0 0 51 2 0 22 0 0
+ 1 2 0 22 0 0 52)))))
'|lookupComplete|))
(MAKEPROP '|Symbol| 'NILADIC T)
diff --git a/src/algebra/strap/TSETCAT-.lsp b/src/algebra/strap/TSETCAT-.lsp
index 847746a2..c54146fb 100644
--- a/src/algebra/strap/TSETCAT-.lsp
+++ b/src/algebra/strap/TSETCAT-.lsp
@@ -132,31 +132,31 @@
(NULL (SPADCALL
(PROG2 (LETT #0#
(SPADCALL |ts|
- (|getShellEntry| $ 14))
+ (|getShellEntry| $ 15))
|TSETCAT-;=;2SB;1|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
(|getShellEntry| $ 10) #0#))
(PROG2 (LETT #0#
(SPADCALL |us|
- (|getShellEntry| $ 14))
+ (|getShellEntry| $ 15))
|TSETCAT-;=;2SB;1|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
(|getShellEntry| $ 10) #0#))
- (|getShellEntry| $ 15))))
+ (|getShellEntry| $ 16))))
'NIL)
('T
(SPADCALL
- (PROG2 (LETT #1# (SPADCALL |ts| (|getShellEntry| $ 17))
+ (PROG2 (LETT #1# (SPADCALL |ts| (|getShellEntry| $ 18))
|TSETCAT-;=;2SB;1|)
(QCDR #1#)
(|check-union| (QEQCAR #1# 0) (|getShellEntry| $ 6) #1#))
- (PROG2 (LETT #1# (SPADCALL |us| (|getShellEntry| $ 17))
+ (PROG2 (LETT #1# (SPADCALL |us| (|getShellEntry| $ 18))
|TSETCAT-;=;2SB;1|)
(QCDR #1#)
(|check-union| (QEQCAR #1# 0) (|getShellEntry| $ 6) #1#))
- (|getShellEntry| $ 18)))))))
+ (|getShellEntry| $ 19)))))))
(DEFUN |TSETCAT-;infRittWu?;2SB;2| (|ts| |us| $)
(PROG (|p| #0=#:G1470 |q| |v|)
@@ -169,7 +169,7 @@
(SEQ (LETT |p|
(PROG2 (LETT #0#
(SPADCALL |ts|
- (|getShellEntry| $ 20))
+ (|getShellEntry| $ 21))
|TSETCAT-;infRittWu?;2SB;2|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
@@ -178,33 +178,33 @@
(LETT |q|
(PROG2 (LETT #0#
(SPADCALL |us|
- (|getShellEntry| $ 20))
+ (|getShellEntry| $ 21))
|TSETCAT-;infRittWu?;2SB;2|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
(|getShellEntry| $ 10) #0#))
|TSETCAT-;infRittWu?;2SB;2|)
(EXIT (COND
- ((SPADCALL |p| |q| (|getShellEntry| $ 21))
- 'T)
((SPADCALL |p| |q| (|getShellEntry| $ 22))
+ 'T)
+ ((SPADCALL |p| |q| (|getShellEntry| $ 24))
'NIL)
('T
(SEQ (LETT |v|
(SPADCALL |p|
- (|getShellEntry| $ 23))
+ (|getShellEntry| $ 25))
|TSETCAT-;infRittWu?;2SB;2|)
(EXIT (SPADCALL
(SPADCALL |ts| |v|
- (|getShellEntry| $ 24))
+ (|getShellEntry| $ 26))
(SPADCALL |us| |v|
- (|getShellEntry| $ 24))
- (|getShellEntry| $ 25))))))))))))))
+ (|getShellEntry| $ 26))
+ (|getShellEntry| $ 27))))))))))))))
(DEFUN |TSETCAT-;reduced?;PSMB;3| (|p| |ts| |redOp?| $)
(PROG (|lp|)
(RETURN
- (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 28))
+ (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 30))
|TSETCAT-;reduced?;PSMB;3|)
(SEQ G190
(COND
@@ -221,17 +221,17 @@
(DEFUN |TSETCAT-;basicSet;LMU;4| (|ps| |redOp?| $)
(PROG (|b| |bs| |p| |ts|)
(RETURN
- (SEQ (LETT |ps| (SPADCALL (ELT $ 31) |ps| (|getShellEntry| $ 33))
+ (SEQ (LETT |ps| (SPADCALL (ELT $ 36) |ps| (|getShellEntry| $ 38))
|TSETCAT-;basicSet;LMU;4|)
(EXIT (COND
- ((SPADCALL (ELT $ 34) |ps| (|getShellEntry| $ 35))
+ ((SPADCALL (ELT $ 39) |ps| (|getShellEntry| $ 40))
(CONS 1 "failed"))
('T
(SEQ (LETT |ps|
- (SPADCALL (ELT $ 21) |ps|
- (|getShellEntry| $ 36))
+ (SPADCALL (ELT $ 22) |ps|
+ (|getShellEntry| $ 41))
|TSETCAT-;basicSet;LMU;4|)
- (LETT |bs| (SPADCALL (|getShellEntry| $ 37))
+ (LETT |bs| (SPADCALL (|getShellEntry| $ 42))
|TSETCAT-;basicSet;LMU;4|)
(LETT |ts| NIL |TSETCAT-;basicSet;LMU;4|)
(SEQ G190
@@ -241,7 +241,7 @@
|TSETCAT-;basicSet;LMU;4|)
(LETT |bs|
(SPADCALL |bs| |b|
- (|getShellEntry| $ 38))
+ (|getShellEntry| $ 43))
|TSETCAT-;basicSet;LMU;4|)
(LETT |ps| (CDR |ps|)
|TSETCAT-;basicSet;LMU;4|)
@@ -258,7 +258,7 @@
(|SPADfirst| |ps|)
|TSETCAT-;basicSet;LMU;4|)
|bs| |redOp?|
- (|getShellEntry| $ 39))))))
+ (|getShellEntry| $ 44))))))
(GO G191)))
(SEQ
(LETT |ts| (CONS |p| |ts|)
@@ -273,10 +273,10 @@
(DEFUN |TSETCAT-;basicSet;LMMU;5| (|ps| |pred?| |redOp?| $)
(PROG (|bps| |b| |bs| |p| |gps| |ts|)
(RETURN
- (SEQ (LETT |ps| (SPADCALL (ELT $ 31) |ps| (|getShellEntry| $ 33))
+ (SEQ (LETT |ps| (SPADCALL (ELT $ 36) |ps| (|getShellEntry| $ 38))
|TSETCAT-;basicSet;LMMU;5|)
(EXIT (COND
- ((SPADCALL (ELT $ 34) |ps| (|getShellEntry| $ 35))
+ ((SPADCALL (ELT $ 39) |ps| (|getShellEntry| $ 40))
(CONS 1 "failed"))
('T
(SEQ (LETT |gps| NIL |TSETCAT-;basicSet;LMMU;5|)
@@ -298,10 +298,10 @@
|TSETCAT-;basicSet;LMMU;5|)))))
NIL (GO G190) G191 (EXIT NIL))
(LETT |gps|
- (SPADCALL (ELT $ 21) |gps|
- (|getShellEntry| $ 36))
+ (SPADCALL (ELT $ 22) |gps|
+ (|getShellEntry| $ 41))
|TSETCAT-;basicSet;LMMU;5|)
- (LETT |bs| (SPADCALL (|getShellEntry| $ 37))
+ (LETT |bs| (SPADCALL (|getShellEntry| $ 42))
|TSETCAT-;basicSet;LMMU;5|)
(LETT |ts| NIL |TSETCAT-;basicSet;LMMU;5|)
(SEQ G190
@@ -311,7 +311,7 @@
|TSETCAT-;basicSet;LMMU;5|)
(LETT |bs|
(SPADCALL |bs| |b|
- (|getShellEntry| $ 38))
+ (|getShellEntry| $ 43))
|TSETCAT-;basicSet;LMMU;5|)
(LETT |gps| (CDR |gps|)
|TSETCAT-;basicSet;LMMU;5|)
@@ -328,7 +328,7 @@
(|SPADfirst| |gps|)
|TSETCAT-;basicSet;LMMU;5|)
|bs| |redOp?|
- (|getShellEntry| $ 39))))))
+ (|getShellEntry| $ 44))))))
(GO G191)))
(SEQ
(LETT |ts| (CONS |p| |ts|)
@@ -339,10 +339,10 @@
NIL (GO G190) G191 (EXIT NIL))))
NIL (GO G190) G191 (EXIT NIL))
(LETT |ts|
- (SPADCALL (ELT $ 21)
+ (SPADCALL (ELT $ 22)
(SPADCALL |ts| |bps|
- (|getShellEntry| $ 43))
- (|getShellEntry| $ 36))
+ (|getShellEntry| $ 49))
+ (|getShellEntry| $ 41))
|TSETCAT-;basicSet;LMMU;5|)
(EXIT (CONS 0 (CONS |bs| |ts|)))))))))))
@@ -354,7 +354,7 @@
((SPADCALL |ts| (|getShellEntry| $ 12)) |lip|)
('T
(SEQ (LETT |lp|
- (SPADCALL |ts| (|getShellEntry| $ 28))
+ (SPADCALL |ts| (|getShellEntry| $ 30))
|TSETCAT-;initials;SL;6|)
(SEQ G190
(COND
@@ -366,20 +366,20 @@
(SPADCALL
(LETT |ip|
(SPADCALL |p|
- (|getShellEntry| $ 45))
+ (|getShellEntry| $ 51))
|TSETCAT-;initials;SL;6|)
- (|getShellEntry| $ 34)))
+ (|getShellEntry| $ 39)))
(LETT |lip|
(CONS
(SPADCALL |ip|
- (|getShellEntry| $ 46))
+ (|getShellEntry| $ 52))
|lip|)
|TSETCAT-;initials;SL;6|)))
(EXIT
(LETT |lp| (CDR |lp|)
|TSETCAT-;initials;SL;6|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |lip| (|getShellEntry| $ 47)))))))))))
+ (EXIT (SPADCALL |lip| (|getShellEntry| $ 53)))))))))))
(DEFUN |TSETCAT-;degree;SNni;7| (|ts| $)
(PROG (|lp| |d|)
@@ -387,11 +387,11 @@
(SEQ (COND
((SPADCALL |ts| (|getShellEntry| $ 12)) 0)
('T
- (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 28))
+ (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 30))
|TSETCAT-;degree;SNni;7|)
(LETT |d|
(SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 50))
+ (|getShellEntry| $ 57))
|TSETCAT-;degree;SNni;7|)
(SEQ G190
(COND
@@ -402,38 +402,38 @@
(SEQ (EXIT (LETT |d|
(* |d|
(SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 50)))
+ (|getShellEntry| $ 57)))
|TSETCAT-;degree;SNni;7|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |d|))))))))
(DEFUN |TSETCAT-;quasiComponent;SR;8| (|ts| $)
- (CONS (SPADCALL |ts| (|getShellEntry| $ 28))
- (SPADCALL |ts| (|getShellEntry| $ 52))))
+ (CONS (SPADCALL |ts| (|getShellEntry| $ 30))
+ (SPADCALL |ts| (|getShellEntry| $ 60))))
(DEFUN |TSETCAT-;normalized?;PSB;9| (|p| |ts| $)
- (SPADCALL |p| (SPADCALL |ts| (|getShellEntry| $ 28))
- (|getShellEntry| $ 56)))
+ (SPADCALL |p| (SPADCALL |ts| (|getShellEntry| $ 30))
+ (|getShellEntry| $ 64)))
(DEFUN |TSETCAT-;stronglyReduced?;PSB;10| (|p| |ts| $)
- (SPADCALL |p| (SPADCALL |ts| (|getShellEntry| $ 28))
- (|getShellEntry| $ 58)))
+ (SPADCALL |p| (SPADCALL |ts| (|getShellEntry| $ 30))
+ (|getShellEntry| $ 66)))
(DEFUN |TSETCAT-;headReduced?;PSB;11| (|p| |ts| $)
- (SPADCALL (SPADCALL |p| (|getShellEntry| $ 60)) |ts|
- (|getShellEntry| $ 61)))
+ (SPADCALL (SPADCALL |p| (|getShellEntry| $ 68)) |ts|
+ (|getShellEntry| $ 69)))
(DEFUN |TSETCAT-;initiallyReduced?;PSB;12| (|p| |ts| $)
(PROG (|lp| |red|)
(RETURN
- (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 28))
+ (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 30))
|TSETCAT-;initiallyReduced?;PSB;12|)
(LETT |red| 'T |TSETCAT-;initiallyReduced?;PSB;12|)
(SEQ G190
(COND
((NULL (COND
((OR (NULL |lp|)
- (SPADCALL |p| (|getShellEntry| $ 34)))
+ (SPADCALL |p| (|getShellEntry| $ 39)))
'NIL)
('T |red|)))
(GO G191)))
@@ -444,10 +444,10 @@
('T
(SPADCALL
(SPADCALL |p|
- (|getShellEntry| $ 23))
+ (|getShellEntry| $ 25))
(SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 23))
- (|getShellEntry| $ 63)))))
+ (|getShellEntry| $ 25))
+ (|getShellEntry| $ 71)))))
(GO G191)))
(SEQ (EXIT (LETT |lp| (CDR |lp|)
|TSETCAT-;initiallyReduced?;PSB;12|)))
@@ -457,20 +457,20 @@
(COND
((SPADCALL
(SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 23))
+ (|getShellEntry| $ 25))
(SPADCALL |p|
- (|getShellEntry| $ 23))
- (|getShellEntry| $ 64))
+ (|getShellEntry| $ 25))
+ (|getShellEntry| $ 72))
(COND
((SPADCALL |p| (|SPADfirst| |lp|)
- (|getShellEntry| $ 65))
+ (|getShellEntry| $ 73))
(SEQ
(LETT |lp| (CDR |lp|)
|TSETCAT-;initiallyReduced?;PSB;12|)
(EXIT
(LETT |p|
(SPADCALL |p|
- (|getShellEntry| $ 45))
+ (|getShellEntry| $ 51))
|TSETCAT-;initiallyReduced?;PSB;12|))))
('T
(LETT |red| 'NIL
@@ -478,7 +478,7 @@
('T
(LETT |p|
(SPADCALL |p|
- (|getShellEntry| $ 45))
+ (|getShellEntry| $ 51))
|TSETCAT-;initiallyReduced?;PSB;12|)))))))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |red|)))))
@@ -488,7 +488,7 @@
(RETURN
(SEQ (COND
((OR (SPADCALL |ts| (|getShellEntry| $ 12))
- (SPADCALL |p| (|getShellEntry| $ 34)))
+ (SPADCALL |p| (|getShellEntry| $ 39)))
|p|)
('T
(SEQ (LETT |ts0| |ts| |TSETCAT-;reduce;PSMMP;13|)
@@ -501,13 +501,13 @@
('T
(NOT
(SPADCALL |p|
- (|getShellEntry| $ 34))))))
+ (|getShellEntry| $ 39))))))
(GO G191)))
(SEQ (LETT |reductor|
(PROG2
(LETT #0#
(SPADCALL |ts|
- (|getShellEntry| $ 14))
+ (|getShellEntry| $ 15))
|TSETCAT-;reduce;PSMMP;13|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
@@ -517,7 +517,7 @@
(PROG2
(LETT #1#
(SPADCALL |ts|
- (|getShellEntry| $ 17))
+ (|getShellEntry| $ 18))
|TSETCAT-;reduce;PSMMP;13|)
(QCDR #1#)
(|check-union| (QEQCAR #1# 0)
@@ -543,17 +543,17 @@
(PROG (|p| |rs|)
(RETURN
(SEQ (COND
- ((SPADCALL |ts| (|getShellEntry| $ 69)) |lp|)
+ ((SPADCALL |ts| (|getShellEntry| $ 77)) |lp|)
('T
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 31) |lp|
- (|getShellEntry| $ 33))
+ (SPADCALL (ELT $ 36) |lp|
+ (|getShellEntry| $ 38))
|TSETCAT-;rewriteSetWithReduction;LSMML;14|)
(EXIT (COND
((NULL |lp|) |lp|)
- ((SPADCALL (ELT $ 34) |lp|
- (|getShellEntry| $ 35))
- (LIST (|spadConstant| $ 70)))
+ ((SPADCALL (ELT $ 39) |lp|
+ (|getShellEntry| $ 40))
+ (LIST (|spadConstant| $ 78)))
('T
(SEQ (LETT |rs| NIL
|TSETCAT-;rewriteSetWithReduction;LSMML;14|)
@@ -570,24 +570,24 @@
(SPADCALL
(SPADCALL |p| |ts| |redOp|
|redOp?|
- (|getShellEntry| $ 71))
- (|getShellEntry| $ 46))
+ (|getShellEntry| $ 79))
+ (|getShellEntry| $ 52))
|TSETCAT-;rewriteSetWithReduction;LSMML;14|)
(EXIT
(COND
((NULL
(SPADCALL |p|
- (|getShellEntry| $ 31)))
+ (|getShellEntry| $ 36)))
(COND
((SPADCALL |p|
- (|getShellEntry| $ 34))
+ (|getShellEntry| $ 39))
(SEQ
(LETT |lp| NIL
|TSETCAT-;rewriteSetWithReduction;LSMML;14|)
(EXIT
(LETT |rs|
(LIST
- (|spadConstant| $ 70))
+ (|spadConstant| $ 78))
|TSETCAT-;rewriteSetWithReduction;LSMML;14|))))
('T
(LETT |rs|
@@ -595,60 +595,60 @@
|TSETCAT-;rewriteSetWithReduction;LSMML;14|)))))))
NIL (GO G190) G191 (EXIT NIL))
(EXIT (SPADCALL |rs|
- (|getShellEntry| $ 47))))))))))))))
+ (|getShellEntry| $ 53))))))))))))))
(DEFUN |TSETCAT-;stronglyReduce;PSP;15| (|p| |ts| $)
- (SPADCALL |p| |ts| (ELT $ 73) (ELT $ 65) (|getShellEntry| $ 71)))
+ (SPADCALL |p| |ts| (ELT $ 81) (ELT $ 73) (|getShellEntry| $ 79)))
(DEFUN |TSETCAT-;headReduce;PSP;16| (|p| |ts| $)
- (SPADCALL |p| |ts| (ELT $ 75) (ELT $ 76) (|getShellEntry| $ 71)))
+ (SPADCALL |p| |ts| (ELT $ 83) (ELT $ 84) (|getShellEntry| $ 79)))
(DEFUN |TSETCAT-;initiallyReduce;PSP;17| (|p| |ts| $)
- (SPADCALL |p| |ts| (ELT $ 78) (ELT $ 79) (|getShellEntry| $ 71)))
+ (SPADCALL |p| |ts| (ELT $ 86) (ELT $ 87) (|getShellEntry| $ 79)))
(DEFUN |TSETCAT-;removeZero;PSP;18| (|p| |ts| $)
(PROG (|v| |tsv-| #0=#:G1571 #1=#:G1580 |q|)
(RETURN
(SEQ (EXIT (COND
- ((OR (SPADCALL |p| (|getShellEntry| $ 34))
+ ((OR (SPADCALL |p| (|getShellEntry| $ 39))
(SPADCALL |ts| (|getShellEntry| $ 12)))
|p|)
('T
(SEQ (LETT |v|
- (SPADCALL |p| (|getShellEntry| $ 23))
+ (SPADCALL |p| (|getShellEntry| $ 25))
|TSETCAT-;removeZero;PSP;18|)
(LETT |tsv-|
(SPADCALL |ts| |v|
- (|getShellEntry| $ 81))
+ (|getShellEntry| $ 89))
|TSETCAT-;removeZero;PSP;18|)
(COND
- ((SPADCALL |v| |ts| (|getShellEntry| $ 82))
+ ((SPADCALL |v| |ts| (|getShellEntry| $ 90))
(SEQ (LETT |q|
(SPADCALL |p|
(PROG2
(LETT #0#
(SPADCALL |ts| |v|
- (|getShellEntry| $ 83))
+ (|getShellEntry| $ 91))
|TSETCAT-;removeZero;PSP;18|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
(|getShellEntry| $ 10) #0#))
- (|getShellEntry| $ 73))
+ (|getShellEntry| $ 81))
|TSETCAT-;removeZero;PSP;18|)
(EXIT (COND
((SPADCALL |q|
- (|getShellEntry| $ 31))
+ (|getShellEntry| $ 36))
(PROGN
(LETT #1# |q|
|TSETCAT-;removeZero;PSP;18|)
(GO #1#)))
((SPADCALL
(SPADCALL |q| |tsv-|
- (|getShellEntry| $ 84))
- (|getShellEntry| $ 31))
+ (|getShellEntry| $ 92))
+ (|getShellEntry| $ 36))
(PROGN
(LETT #1#
- (|spadConstant| $ 85)
+ (|spadConstant| $ 93)
|TSETCAT-;removeZero;PSP;18|)
(GO #1#))))))))
(EXIT (COND
@@ -656,15 +656,15 @@
(|getShellEntry| $ 12))
|p|)
('T
- (SEQ (LETT |q| (|spadConstant| $ 85)
+ (SEQ (LETT |q| (|spadConstant| $ 93)
|TSETCAT-;removeZero;PSP;18|)
(SEQ G190
(COND
((NULL
(SPADCALL
(SPADCALL |p| |v|
- (|getShellEntry| $ 86))
- (|getShellEntry| $ 88)))
+ (|getShellEntry| $ 94))
+ (|getShellEntry| $ 96)))
(GO G191)))
(SEQ
(LETT |q|
@@ -672,35 +672,35 @@
(SPADCALL
(SPADCALL
(SPADCALL |p|
- (|getShellEntry| $ 45))
+ (|getShellEntry| $ 51))
|tsv-|
- (|getShellEntry| $ 84))
+ (|getShellEntry| $ 92))
(SPADCALL |p|
- (|getShellEntry| $ 89))
- (|getShellEntry| $ 90))
- |q| (|getShellEntry| $ 91))
+ (|getShellEntry| $ 97))
+ (|getShellEntry| $ 98))
+ |q| (|getShellEntry| $ 99))
|TSETCAT-;removeZero;PSP;18|)
(EXIT
(LETT |p|
(SPADCALL |p|
- (|getShellEntry| $ 92))
+ (|getShellEntry| $ 100))
|TSETCAT-;removeZero;PSP;18|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT
(SPADCALL |q|
(SPADCALL |p| |tsv-|
- (|getShellEntry| $ 84))
- (|getShellEntry| $ 91)))))))))))
+ (|getShellEntry| $ 92))
+ (|getShellEntry| $ 99)))))))))))
#1# (EXIT #1#)))))
(DEFUN |TSETCAT-;reduceByQuasiMonic;PSP;19| (|p| |ts| $)
(COND
- ((OR (SPADCALL |p| (|getShellEntry| $ 34))
+ ((OR (SPADCALL |p| (|getShellEntry| $ 39))
(SPADCALL |ts| (|getShellEntry| $ 12)))
|p|)
('T
- (QVELT (SPADCALL |p| (SPADCALL |ts| (|getShellEntry| $ 94))
- (|getShellEntry| $ 96))
+ (QVELT (SPADCALL |p| (SPADCALL |ts| (|getShellEntry| $ 102))
+ (|getShellEntry| $ 104))
1))))
(DEFUN |TSETCAT-;autoReduced?;SMB;20| (|ts| |redOp?| $)
@@ -709,7 +709,7 @@
(SEQ (COND
((SPADCALL |ts| (|getShellEntry| $ 12)) 'T)
('T
- (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 28))
+ (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 30))
|TSETCAT-;autoReduced?;SMB;20|)
(LETT |p| (|SPADfirst| |lp|)
|TSETCAT-;autoReduced?;SMB;20|)
@@ -729,16 +729,16 @@
(EXIT (NULL |lp|)))))))))
(DEFUN |TSETCAT-;stronglyReduced?;SB;21| (|ts| $)
- (SPADCALL |ts| (ELT $ 58) (|getShellEntry| $ 100)))
+ (SPADCALL |ts| (ELT $ 66) (|getShellEntry| $ 108)))
(DEFUN |TSETCAT-;normalized?;SB;22| (|ts| $)
- (SPADCALL |ts| (ELT $ 56) (|getShellEntry| $ 100)))
+ (SPADCALL |ts| (ELT $ 64) (|getShellEntry| $ 108)))
(DEFUN |TSETCAT-;headReduced?;SB;23| (|ts| $)
- (SPADCALL |ts| (ELT $ 103) (|getShellEntry| $ 100)))
+ (SPADCALL |ts| (ELT $ 111) (|getShellEntry| $ 108)))
(DEFUN |TSETCAT-;initiallyReduced?;SB;24| (|ts| $)
- (SPADCALL |ts| (ELT $ 105) (|getShellEntry| $ 100)))
+ (SPADCALL |ts| (ELT $ 113) (|getShellEntry| $ 108)))
(DEFUN |TSETCAT-;mvar;SV;25| (|ts| $)
(PROG (#0=#:G1599)
@@ -748,12 +748,12 @@
(|error| "Error from TSETCAT in mvar : #1 is empty"))
('T
(SPADCALL
- (PROG2 (LETT #0# (SPADCALL |ts| (|getShellEntry| $ 14))
+ (PROG2 (LETT #0# (SPADCALL |ts| (|getShellEntry| $ 15))
|TSETCAT-;mvar;SV;25|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) (|getShellEntry| $ 10)
#0#))
- (|getShellEntry| $ 23)))))))
+ (|getShellEntry| $ 25)))))))
(DEFUN |TSETCAT-;first;SU;26| (|ts| $)
(PROG (|lp|)
@@ -762,9 +762,9 @@
((SPADCALL |ts| (|getShellEntry| $ 12)) (CONS 1 "failed"))
('T
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 22)
- (SPADCALL |ts| (|getShellEntry| $ 28))
- (|getShellEntry| $ 36))
+ (SPADCALL (ELT $ 24)
+ (SPADCALL |ts| (|getShellEntry| $ 30))
+ (|getShellEntry| $ 41))
|TSETCAT-;first;SU;26|)
(EXIT (CONS 0 (|SPADfirst| |lp|))))))))))
@@ -775,9 +775,9 @@
((SPADCALL |ts| (|getShellEntry| $ 12)) (CONS 1 "failed"))
('T
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 21)
- (SPADCALL |ts| (|getShellEntry| $ 28))
- (|getShellEntry| $ 36))
+ (SPADCALL (ELT $ 22)
+ (SPADCALL |ts| (|getShellEntry| $ 30))
+ (|getShellEntry| $ 41))
|TSETCAT-;last;SU;27|)
(EXIT (CONS 0 (|SPADfirst| |lp|))))))))))
@@ -788,17 +788,17 @@
((SPADCALL |ts| (|getShellEntry| $ 12)) (CONS 1 "failed"))
('T
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 22)
- (SPADCALL |ts| (|getShellEntry| $ 28))
- (|getShellEntry| $ 36))
+ (SPADCALL (ELT $ 24)
+ (SPADCALL |ts| (|getShellEntry| $ 30))
+ (|getShellEntry| $ 41))
|TSETCAT-;rest;SU;28|)
(EXIT (CONS 0
(SPADCALL (CDR |lp|)
- (|getShellEntry| $ 110)))))))))))
+ (|getShellEntry| $ 118)))))))))))
(DEFUN |TSETCAT-;coerce;SL;29| (|ts| $)
- (SPADCALL (ELT $ 22) (SPADCALL |ts| (|getShellEntry| $ 28))
- (|getShellEntry| $ 36)))
+ (SPADCALL (ELT $ 24) (SPADCALL |ts| (|getShellEntry| $ 30))
+ (|getShellEntry| $ 41)))
(DEFUN |TSETCAT-;algebraicVariables;SL;30| (|ts| $)
(PROG (#0=#:G1667 |p| #1=#:G1668)
@@ -806,7 +806,7 @@
(SEQ (PROGN
(LETT #0# NIL |TSETCAT-;algebraicVariables;SL;30|)
(SEQ (LETT |p| NIL |TSETCAT-;algebraicVariables;SL;30|)
- (LETT #1# (SPADCALL |ts| (|getShellEntry| $ 28))
+ (LETT #1# (SPADCALL |ts| (|getShellEntry| $ 30))
|TSETCAT-;algebraicVariables;SL;30|)
G190
(COND
@@ -819,7 +819,7 @@
(SEQ (EXIT (LETT #0#
(CONS
(SPADCALL |p|
- (|getShellEntry| $ 23))
+ (|getShellEntry| $ 25))
#0#)
|TSETCAT-;algebraicVariables;SL;30|)))
(LETT #1# (CDR #1#)
@@ -827,16 +827,16 @@
(GO G190) G191 (EXIT (NREVERSE0 #0#))))))))
(DEFUN |TSETCAT-;algebraic?;VSB;31| (|v| |ts| $)
- (SPADCALL |v| (SPADCALL |ts| (|getShellEntry| $ 115))
- (|getShellEntry| $ 116)))
+ (SPADCALL |v| (SPADCALL |ts| (|getShellEntry| $ 123))
+ (|getShellEntry| $ 124)))
(DEFUN |TSETCAT-;select;SVU;32| (|ts| |v| $)
(PROG (|lp|)
(RETURN
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 22)
- (SPADCALL |ts| (|getShellEntry| $ 28))
- (|getShellEntry| $ 36))
+ (SPADCALL (ELT $ 24)
+ (SPADCALL |ts| (|getShellEntry| $ 30))
+ (|getShellEntry| $ 41))
|TSETCAT-;select;SVU;32|)
(SEQ G190
(COND
@@ -845,8 +845,8 @@
('T
(NOT (SPADCALL |v|
(SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 23))
- (|getShellEntry| $ 64))))))
+ (|getShellEntry| $ 25))
+ (|getShellEntry| $ 72))))))
(GO G191)))
(SEQ (EXIT (LETT |lp| (CDR |lp|)
|TSETCAT-;select;SVU;32|)))
@@ -858,29 +858,29 @@
(DEFUN |TSETCAT-;collectQuasiMonic;2S;33| (|ts| $)
(PROG (|newlp| |lp|)
(RETURN
- (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 28))
+ (SEQ (LETT |lp| (SPADCALL |ts| (|getShellEntry| $ 30))
|TSETCAT-;collectQuasiMonic;2S;33|)
(LETT |newlp| NIL |TSETCAT-;collectQuasiMonic;2S;33|)
(SEQ G190 (COND ((NULL (NOT (NULL |lp|))) (GO G191)))
(SEQ (COND
((SPADCALL
(SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 45))
- (|getShellEntry| $ 34))
+ (|getShellEntry| $ 51))
+ (|getShellEntry| $ 39))
(LETT |newlp| (CONS (|SPADfirst| |lp|) |newlp|)
|TSETCAT-;collectQuasiMonic;2S;33|)))
(EXIT (LETT |lp| (CDR |lp|)
|TSETCAT-;collectQuasiMonic;2S;33|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |newlp| (|getShellEntry| $ 110)))))))
+ (EXIT (SPADCALL |newlp| (|getShellEntry| $ 118)))))))
(DEFUN |TSETCAT-;collectUnder;SVS;34| (|ts| |v| $)
(PROG (|lp|)
(RETURN
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 22)
- (SPADCALL |ts| (|getShellEntry| $ 28))
- (|getShellEntry| $ 36))
+ (SPADCALL (ELT $ 24)
+ (SPADCALL |ts| (|getShellEntry| $ 30))
+ (|getShellEntry| $ 41))
|TSETCAT-;collectUnder;SVS;34|)
(SEQ G190
(COND
@@ -889,21 +889,21 @@
('T
(NOT (SPADCALL
(SPADCALL (|SPADfirst| |lp|)
- (|getShellEntry| $ 23))
- |v| (|getShellEntry| $ 63))))))
+ (|getShellEntry| $ 25))
+ |v| (|getShellEntry| $ 71))))))
(GO G191)))
(SEQ (EXIT (LETT |lp| (CDR |lp|)
|TSETCAT-;collectUnder;SVS;34|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |lp| (|getShellEntry| $ 110)))))))
+ (EXIT (SPADCALL |lp| (|getShellEntry| $ 118)))))))
(DEFUN |TSETCAT-;collectUpper;SVS;35| (|ts| |v| $)
(PROG (|lp2| |lp1|)
(RETURN
(SEQ (LETT |lp1|
- (SPADCALL (ELT $ 22)
- (SPADCALL |ts| (|getShellEntry| $ 28))
- (|getShellEntry| $ 36))
+ (SPADCALL (ELT $ 24)
+ (SPADCALL |ts| (|getShellEntry| $ 30))
+ (|getShellEntry| $ 41))
|TSETCAT-;collectUpper;SVS;35|)
(LETT |lp2| NIL |TSETCAT-;collectUpper;SVS;35|)
(SEQ G190
@@ -913,20 +913,20 @@
('T
(SPADCALL |v|
(SPADCALL (|SPADfirst| |lp1|)
- (|getShellEntry| $ 23))
- (|getShellEntry| $ 63)))))
+ (|getShellEntry| $ 25))
+ (|getShellEntry| $ 71)))))
(GO G191)))
(SEQ (LETT |lp2| (CONS (|SPADfirst| |lp1|) |lp2|)
|TSETCAT-;collectUpper;SVS;35|)
(EXIT (LETT |lp1| (CDR |lp1|)
|TSETCAT-;collectUpper;SVS;35|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL (REVERSE |lp2|) (|getShellEntry| $ 110)))))))
+ (EXIT (SPADCALL (REVERSE |lp2|) (|getShellEntry| $ 118)))))))
(DEFUN |TSETCAT-;construct;LS;36| (|lp| $)
(PROG (|rif|)
(RETURN
- (SEQ (LETT |rif| (SPADCALL |lp| (|getShellEntry| $ 122))
+ (SEQ (LETT |rif| (SPADCALL |lp| (|getShellEntry| $ 131))
|TSETCAT-;construct;LS;36|)
(EXIT (COND
((QEQCAR |rif| 0) (QCDR |rif|))
@@ -937,26 +937,26 @@
(PROG (|rif|)
(RETURN
(SEQ (COND
- ((NULL |lp|) (CONS 0 (SPADCALL (|getShellEntry| $ 37))))
+ ((NULL |lp|) (CONS 0 (SPADCALL (|getShellEntry| $ 42))))
('T
(SEQ (LETT |lp|
- (SPADCALL (ELT $ 22) |lp|
- (|getShellEntry| $ 36))
+ (SPADCALL (ELT $ 24) |lp|
+ (|getShellEntry| $ 41))
|TSETCAT-;retractIfCan;LU;37|)
(LETT |rif|
- (SPADCALL (CDR |lp|) (|getShellEntry| $ 122))
+ (SPADCALL (CDR |lp|) (|getShellEntry| $ 131))
|TSETCAT-;retractIfCan;LU;37|)
(EXIT (COND
((QEQCAR |rif| 0)
(SPADCALL (QCDR |rif|) (|SPADfirst| |lp|)
- (|getShellEntry| $ 124)))
+ (|getShellEntry| $ 133)))
('T
(|error| "in retractIfCan : LP -> ... from TSETCAT : bad arg")))))))))))
(DEFUN |TSETCAT-;extend;SPS;38| (|ts| |p| $)
(PROG (|eif|)
(RETURN
- (SEQ (LETT |eif| (SPADCALL |ts| |p| (|getShellEntry| $ 124))
+ (SEQ (LETT |eif| (SPADCALL |ts| |p| (|getShellEntry| $ 133))
|TSETCAT-;extend;SPS;38|)
(EXIT (COND
((QEQCAR |eif| 0) (QCDR |eif|))
@@ -966,13 +966,13 @@
(DEFUN |TSETCAT-;coHeight;SNni;39| (|ts| $)
(PROG (|n| |m| #0=#:G1663)
(RETURN
- (SEQ (LETT |n| (SPADCALL (|getShellEntry| $ 127))
+ (SEQ (LETT |n| (SPADCALL (|getShellEntry| $ 136))
|TSETCAT-;coHeight;SNni;39|)
- (LETT |m| (LENGTH (SPADCALL |ts| (|getShellEntry| $ 28)))
+ (LETT |m| (LENGTH (SPADCALL |ts| (|getShellEntry| $ 30)))
|TSETCAT-;coHeight;SNni;39|)
(EXIT (PROG2 (LETT #0#
(SPADCALL |n| |m|
- (|getShellEntry| $ 128))
+ (|getShellEntry| $ 138))
|TSETCAT-;coHeight;SNni;39|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) (|NonNegativeInteger|)
@@ -991,7 +991,7 @@
(LETT |dv$|
(LIST '|TriangularSetCategory&| |dv$1| |dv$2| |dv$3|
|dv$4| |dv$5|) . #0#)
- (LETT $ (|newShell| 131) . #0#)
+ (LETT $ (|newShell| 141) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -1005,7 +1005,7 @@
(|setShellEntry| $ 10 |#5|)
(COND
((|testBitVector| |pv$| 1)
- (|setShellEntry| $ 129
+ (|setShellEntry| $ 139
(CONS (|dispatchFunction| |TSETCAT-;coHeight;SNni;39|)
$))))
$))))
@@ -1013,116 +1013,121 @@
(MAKEPROP '|TriangularSetCategory&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|)
(|local| |#3|) (|local| |#4|) (|local| |#5|) (|Boolean|)
- (0 . |empty?|) (|Union| 10 '"failed") (5 . |first|)
- (10 . =) (|Union| $ '"failed") (16 . |rest|) (21 . =)
- |TSETCAT-;=;2SB;1| (27 . |last|) (32 . |infRittWu?|)
- (38 . |supRittWu?|) (44 . |mvar|) (49 . |collectUpper|)
- (55 . |infRittWu?|) |TSETCAT-;infRittWu?;2SB;2|
- (|List| 10) (61 . |members|) (|Mapping| 11 10 10)
- |TSETCAT-;reduced?;PSMB;3| (66 . |zero?|)
- (|Mapping| 11 10) (71 . |remove|) (77 . |ground?|)
- (82 . |any?|) (88 . |sort|) (94 . |empty|) (98 . |extend|)
- (104 . |reduced?|) (|Record| (|:| |bas| $) (|:| |top| 27))
- (|Union| 40 '"failed") |TSETCAT-;basicSet;LMU;4|
- (111 . |concat|) |TSETCAT-;basicSet;LMMU;5| (117 . |init|)
- (122 . |primPartElseUnitCanonical|)
- (127 . |removeDuplicates|) |TSETCAT-;initials;SL;6|
- (|NonNegativeInteger|) (132 . |mdeg|)
- |TSETCAT-;degree;SNni;7| (137 . |initials|)
- (|Record| (|:| |close| 27) (|:| |open| 27))
+ (0 . |empty?|) (5 . |false|) (|Union| 10 '"failed")
+ (9 . |first|) (14 . =) (|Union| $ '"failed") (20 . |rest|)
+ (25 . =) |TSETCAT-;=;2SB;1| (31 . |last|)
+ (36 . |infRittWu?|) (42 . |true|) (46 . |supRittWu?|)
+ (52 . |mvar|) (57 . |collectUpper|) (63 . |infRittWu?|)
+ |TSETCAT-;infRittWu?;2SB;2| (|List| 10) (69 . |members|)
+ (74 . |empty?|) (79 . |first|) (84 . |rest|)
+ (|Mapping| 11 10 10) |TSETCAT-;reduced?;PSMB;3|
+ (89 . |zero?|) (|Mapping| 11 10) (94 . |remove|)
+ (100 . |ground?|) (105 . |any?|) (111 . |sort|)
+ (117 . |empty|) (121 . |extend|) (127 . |reduced?|)
+ (134 . |cons|) (|Record| (|:| |bas| $) (|:| |top| 29))
+ (|Union| 46 '"failed") |TSETCAT-;basicSet;LMU;4|
+ (140 . |concat|) |TSETCAT-;basicSet;LMMU;5| (146 . |init|)
+ (151 . |primPartElseUnitCanonical|)
+ (156 . |removeDuplicates|) |TSETCAT-;initials;SL;6|
+ (|NonNegativeInteger|) (161 . |Zero|) (165 . |mdeg|)
+ (170 . *) |TSETCAT-;degree;SNni;7| (176 . |initials|)
+ (|Record| (|:| |close| 29) (|:| |open| 29))
|TSETCAT-;quasiComponent;SR;8| (|List| $)
- (142 . |normalized?|) |TSETCAT-;normalized?;PSB;9|
- (148 . |reduced?|) |TSETCAT-;stronglyReduced?;PSB;10|
- (154 . |head|) (159 . |stronglyReduced?|)
- |TSETCAT-;headReduced?;PSB;11| (165 . <) (171 . =)
- (177 . |reduced?|) |TSETCAT-;initiallyReduced?;PSB;12|
+ (181 . |normalized?|) |TSETCAT-;normalized?;PSB;9|
+ (187 . |reduced?|) |TSETCAT-;stronglyReduced?;PSB;10|
+ (193 . |head|) (198 . |stronglyReduced?|)
+ |TSETCAT-;headReduced?;PSB;11| (204 . <) (210 . =)
+ (216 . |reduced?|) |TSETCAT-;initiallyReduced?;PSB;12|
(|Mapping| 10 10 10) |TSETCAT-;reduce;PSMMP;13|
- (183 . |trivialIdeal?|) (188 . |One|) (192 . |reduce|)
+ (222 . |trivialIdeal?|) (227 . |One|) (231 . |reduce|)
|TSETCAT-;rewriteSetWithReduction;LSMML;14|
- (200 . |lazyPrem|) |TSETCAT-;stronglyReduce;PSP;15|
- (206 . |headReduce|) (212 . |headReduced?|)
- |TSETCAT-;headReduce;PSP;16| (218 . |initiallyReduce|)
- (224 . |initiallyReduced?|)
- |TSETCAT-;initiallyReduce;PSP;17| (230 . |collectUnder|)
- (236 . |algebraic?|) (242 . |select|) (248 . |removeZero|)
- (254 . |Zero|) (258 . |degree|) (|Integer|)
- (264 . |positive?|) (269 . |mainMonomial|) (274 . *)
- (280 . +) (286 . |tail|) |TSETCAT-;removeZero;PSP;18|
- (291 . |collectQuasiMonic|)
+ (239 . |lazyPrem|) |TSETCAT-;stronglyReduce;PSP;15|
+ (245 . |headReduce|) (251 . |headReduced?|)
+ |TSETCAT-;headReduce;PSP;16| (257 . |initiallyReduce|)
+ (263 . |initiallyReduced?|)
+ |TSETCAT-;initiallyReduce;PSP;17| (269 . |collectUnder|)
+ (275 . |algebraic?|) (281 . |select|) (287 . |removeZero|)
+ (293 . |Zero|) (297 . |degree|) (|Integer|)
+ (303 . |positive?|) (308 . |mainMonomial|) (313 . *)
+ (319 . +) (325 . |tail|) |TSETCAT-;removeZero;PSP;18|
+ (330 . |collectQuasiMonic|)
(|Record| (|:| |rnum| 7) (|:| |polnum| 10) (|:| |den| 7))
- (296 . |remainder|) |TSETCAT-;reduceByQuasiMonic;PSP;19|
- (|Mapping| 11 10 27) |TSETCAT-;autoReduced?;SMB;20|
- (302 . |autoReduced?|) |TSETCAT-;stronglyReduced?;SB;21|
- |TSETCAT-;normalized?;SB;22| (308 . |headReduced?|)
- |TSETCAT-;headReduced?;SB;23| (314 . |initiallyReduced?|)
+ (335 . |remainder|) |TSETCAT-;reduceByQuasiMonic;PSP;19|
+ (|Mapping| 11 10 29) |TSETCAT-;autoReduced?;SMB;20|
+ (341 . |autoReduced?|) |TSETCAT-;stronglyReduced?;SB;21|
+ |TSETCAT-;normalized?;SB;22| (347 . |headReduced?|)
+ |TSETCAT-;headReduced?;SB;23| (353 . |initiallyReduced?|)
|TSETCAT-;initiallyReduced?;SB;24| |TSETCAT-;mvar;SV;25|
|TSETCAT-;first;SU;26| |TSETCAT-;last;SU;27|
- (320 . |construct|) |TSETCAT-;rest;SU;28|
+ (359 . |construct|) |TSETCAT-;rest;SU;28|
|TSETCAT-;coerce;SL;29| (|List| 9)
|TSETCAT-;algebraicVariables;SL;30|
- (325 . |algebraicVariables|) (330 . |member?|)
+ (364 . |algebraicVariables|) (369 . |member?|)
|TSETCAT-;algebraic?;VSB;31| |TSETCAT-;select;SVU;32|
|TSETCAT-;collectQuasiMonic;2S;33|
- |TSETCAT-;collectUnder;SVS;34|
- |TSETCAT-;collectUpper;SVS;35| (336 . |retractIfCan|)
- |TSETCAT-;construct;LS;36| (341 . |extendIfCan|)
+ |TSETCAT-;collectUnder;SVS;34| (375 . |reverse|)
+ |TSETCAT-;collectUpper;SVS;35| (380 . |retractIfCan|)
+ |TSETCAT-;construct;LS;36| (385 . |extendIfCan|)
|TSETCAT-;retractIfCan;LU;37| |TSETCAT-;extend;SPS;38|
- (347 . |size|) (351 . |subtractIfCan|) (357 . |coHeight|)
- (|OutputForm|))
- '#(|stronglyReduced?| 362 |stronglyReduce| 373 |select| 379
- |rewriteSetWithReduction| 385 |retractIfCan| 393 |rest|
- 398 |removeZero| 403 |reduced?| 409 |reduceByQuasiMonic|
- 416 |reduce| 422 |quasiComponent| 430 |normalized?| 435
- |mvar| 446 |last| 451 |initials| 456 |initiallyReduced?|
- 461 |initiallyReduce| 472 |infRittWu?| 478 |headReduced?|
- 484 |headReduce| 495 |first| 501 |extend| 506 |degree| 512
- |construct| 517 |collectUpper| 522 |collectUnder| 528
- |collectQuasiMonic| 534 |coerce| 539 |coHeight| 544
- |basicSet| 549 |autoReduced?| 562 |algebraicVariables| 568
- |algebraic?| 573 = 579)
+ (391 . |size|) (395 . |#|) (400 . |subtractIfCan|)
+ (406 . |coHeight|) (|OutputForm|))
+ '#(|stronglyReduced?| 411 |stronglyReduce| 422 |select| 428
+ |rewriteSetWithReduction| 434 |retractIfCan| 442 |rest|
+ 447 |removeZero| 452 |reduced?| 458 |reduceByQuasiMonic|
+ 465 |reduce| 471 |quasiComponent| 479 |normalized?| 484
+ |mvar| 495 |last| 500 |initials| 505 |initiallyReduced?|
+ 510 |initiallyReduce| 521 |infRittWu?| 527 |headReduced?|
+ 533 |headReduce| 544 |first| 550 |extend| 555 |degree| 561
+ |construct| 566 |collectUpper| 571 |collectUnder| 577
+ |collectQuasiMonic| 583 |coerce| 588 |coHeight| 593
+ |basicSet| 598 |autoReduced?| 611 |algebraicVariables| 617
+ |algebraic?| 622 = 628)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 129
- '(1 6 11 0 12 1 6 13 0 14 2 10 11 0 0
- 15 1 6 16 0 17 2 6 11 0 0 18 1 6 13 0
- 20 2 10 11 0 0 21 2 10 11 0 0 22 1 10
- 9 0 23 2 6 0 0 9 24 2 6 11 0 0 25 1 6
- 27 0 28 1 10 11 0 31 2 27 0 32 0 33 1
- 10 11 0 34 2 27 11 32 0 35 2 27 0 29
- 0 36 0 6 0 37 2 6 0 0 10 38 3 6 11 10
- 0 29 39 2 27 0 0 0 43 1 10 0 0 45 1
- 10 0 0 46 1 27 0 0 47 1 10 49 0 50 1
- 6 27 0 52 2 10 11 0 55 56 2 10 11 0
- 55 58 1 10 0 0 60 2 6 11 10 0 61 2 9
- 11 0 0 63 2 9 11 0 0 64 2 10 11 0 0
- 65 1 6 11 0 69 0 10 0 70 4 6 10 10 0
- 67 29 71 2 10 0 0 0 73 2 10 0 0 0 75
- 2 10 11 0 0 76 2 10 0 0 0 78 2 10 11
- 0 0 79 2 6 0 0 9 81 2 6 11 9 0 82 2 6
- 13 0 9 83 2 6 10 10 0 84 0 10 0 85 2
- 10 49 0 9 86 1 87 11 0 88 1 10 0 0 89
- 2 10 0 0 0 90 2 10 0 0 0 91 1 10 0 0
- 92 1 6 0 0 94 2 6 95 10 0 96 2 6 11 0
- 98 100 2 10 11 0 55 103 2 10 11 0 55
- 105 1 6 0 27 110 1 6 113 0 115 2 113
- 11 9 0 116 1 6 16 27 122 2 6 16 0 10
- 124 0 9 49 127 2 49 16 0 0 128 1 0 49
- 0 129 1 0 11 0 101 2 0 11 10 0 59 2 0
- 10 10 0 74 2 0 13 0 9 118 4 0 27 27 0
- 67 29 72 1 0 16 27 125 1 0 16 0 111 2
- 0 10 10 0 93 3 0 11 10 0 29 30 2 0 10
- 10 0 97 4 0 10 10 0 67 29 68 1 0 53 0
- 54 1 0 11 0 102 2 0 11 10 0 57 1 0 9
- 0 107 1 0 13 0 109 1 0 27 0 48 1 0 11
- 0 106 2 0 11 10 0 66 2 0 10 10 0 80 2
- 0 11 0 0 26 1 0 11 0 104 2 0 11 10 0
- 62 2 0 10 10 0 77 1 0 13 0 108 2 0 0
- 0 10 126 1 0 49 0 51 1 0 0 27 123 2 0
- 0 0 9 121 2 0 0 0 9 120 1 0 0 0 119 1
- 0 27 0 112 1 0 49 0 129 3 0 41 27 32
- 29 44 2 0 41 27 29 42 2 0 11 0 98 99
- 1 0 113 0 114 2 0 11 9 0 117 2 0 11 0
- 0 19)))))
+ (|makeByteWordVec2| 139
+ '(1 6 11 0 12 0 11 0 13 1 6 14 0 15 2
+ 10 11 0 0 16 1 6 17 0 18 2 6 11 0 0
+ 19 1 6 14 0 21 2 10 11 0 0 22 0 11 0
+ 23 2 10 11 0 0 24 1 10 9 0 25 2 6 0 0
+ 9 26 2 6 11 0 0 27 1 6 29 0 30 1 29
+ 11 0 31 1 29 10 0 32 1 29 0 0 33 1 10
+ 11 0 36 2 29 0 37 0 38 1 10 11 0 39 2
+ 29 11 37 0 40 2 29 0 34 0 41 0 6 0 42
+ 2 6 0 0 10 43 3 6 11 10 0 34 44 2 29
+ 0 10 0 45 2 29 0 0 0 49 1 10 0 0 51 1
+ 10 0 0 52 1 29 0 0 53 0 55 0 56 1 10
+ 55 0 57 2 55 0 55 0 58 1 6 29 0 60 2
+ 10 11 0 63 64 2 10 11 0 63 66 1 10 0
+ 0 68 2 6 11 10 0 69 2 9 11 0 0 71 2 9
+ 11 0 0 72 2 10 11 0 0 73 1 6 11 0 77
+ 0 10 0 78 4 6 10 10 0 75 34 79 2 10 0
+ 0 0 81 2 10 0 0 0 83 2 10 11 0 0 84 2
+ 10 0 0 0 86 2 10 11 0 0 87 2 6 0 0 9
+ 89 2 6 11 9 0 90 2 6 14 0 9 91 2 6 10
+ 10 0 92 0 10 0 93 2 10 55 0 9 94 1 95
+ 11 0 96 1 10 0 0 97 2 10 0 0 0 98 2
+ 10 0 0 0 99 1 10 0 0 100 1 6 0 0 102
+ 2 6 103 10 0 104 2 6 11 0 106 108 2
+ 10 11 0 63 111 2 10 11 0 63 113 1 6 0
+ 29 118 1 6 121 0 123 2 121 11 9 0 124
+ 1 29 0 0 129 1 6 17 29 131 2 6 17 0
+ 10 133 0 9 55 136 1 29 55 0 137 2 55
+ 17 0 0 138 1 0 55 0 139 1 0 11 0 109
+ 2 0 11 10 0 67 2 0 10 10 0 82 2 0 14
+ 0 9 126 4 0 29 29 0 75 34 80 1 0 17
+ 29 134 1 0 17 0 119 2 0 10 10 0 101 3
+ 0 11 10 0 34 35 2 0 10 10 0 105 4 0
+ 10 10 0 75 34 76 1 0 61 0 62 1 0 11 0
+ 110 2 0 11 10 0 65 1 0 9 0 115 1 0 14
+ 0 117 1 0 29 0 54 1 0 11 0 114 2 0 11
+ 10 0 74 2 0 10 10 0 88 2 0 11 0 0 28
+ 1 0 11 0 112 2 0 11 10 0 70 2 0 10 10
+ 0 85 1 0 14 0 116 2 0 0 0 10 135 1 0
+ 55 0 59 1 0 0 29 132 2 0 0 0 9 130 2
+ 0 0 0 9 128 1 0 0 0 127 1 0 29 0 120
+ 1 0 55 0 139 3 0 47 29 37 34 50 2 0
+ 47 29 34 48 2 0 11 0 106 107 1 0 121
+ 0 122 2 0 11 9 0 125 2 0 11 0 0 20)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/UFD-.lsp b/src/algebra/strap/UFD-.lsp
index dee1d804..786f9f7f 100644
--- a/src/algebra/strap/UFD-.lsp
+++ b/src/algebra/strap/UFD-.lsp
@@ -60,7 +60,7 @@
(LETT |dv$1| (|devaluate| |#1|)
. #0=(|UniqueFactorizationDomain&|))
(LETT |dv$| (LIST '|UniqueFactorizationDomain&| |dv$1|) . #0#)
- (LETT $ (|newShell| 25) . #0#)
+ (LETT $ (|newShell| 29) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -76,14 +76,16 @@
|UFD-;squareFreePart;2S;1| (25 . |factor|)
(|Union| '"nil" '"sqfr" '"irred" '"prime")
(|Record| (|:| |flg| 19) (|:| |fctr| 6) (|:| |xpnt| 11))
- (|List| 20) (30 . |factorList|) (|Boolean|)
+ (|List| 20) (30 . |factorList|) (|NonNegativeInteger|)
+ (35 . |#|) (40 . |One|) (|Boolean|) (44 . =)
|UFD-;prime?;SB;2|)
- '#(|squareFreePart| 35 |prime?| 40) 'NIL
+ '#(|squareFreePart| 50 |prime?| 55) 'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 24
+ (|makeByteWordVec2| 28
'(1 6 7 0 8 1 9 6 0 10 1 9 13 0 14 2 6
0 0 0 15 0 6 0 16 1 6 7 0 18 1 9 21 0
- 22 1 0 0 0 17 1 0 23 0 24)))))
+ 22 1 21 23 0 24 0 23 0 25 2 23 26 0 0
+ 27 1 0 0 0 17 1 0 26 0 28)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/UPOLYC-.lsp b/src/algebra/strap/UPOLYC-.lsp
index 87756379..49994497 100644
--- a/src/algebra/strap/UPOLYC-.lsp
+++ b/src/algebra/strap/UPOLYC-.lsp
@@ -179,13 +179,13 @@
((OR (SPADCALL |p| (|getShellEntry| $ 9))
(ZEROP (SPADCALL |p| (|getShellEntry| $ 11))))
NIL)
- ('T (LIST (SPADCALL (|getShellEntry| $ 13))))))
+ ('T (LIST (SPADCALL (|getShellEntry| $ 14))))))
(DEFUN |UPOLYC-;degree;SSaosNni;2| (|p| |v| $)
(SPADCALL |p| (|getShellEntry| $ 11)))
(DEFUN |UPOLYC-;totalDegree;SLNni;3| (|p| |lv| $)
- (COND ((NULL |lv|) 0) ('T (SPADCALL |p| (|getShellEntry| $ 17)))))
+ (COND ((NULL |lv|) 0) ('T (SPADCALL |p| (|getShellEntry| $ 20)))))
(DEFUN |UPOLYC-;degree;SLL;4| (|p| |lv| $)
(COND
@@ -199,10 +199,10 @@
(|error| "can only eval a univariate polynomial once"))
('T
(SPADCALL |p| (|SPADfirst| |lv|) (|SPADfirst| |lq|)
- (|getShellEntry| $ 21)))))
+ (|getShellEntry| $ 28)))))
(DEFUN |UPOLYC-;eval;SSaos2S;6| (|p| |v| |q| $)
- (SPADCALL |p| |q| (|getShellEntry| $ 24)))
+ (SPADCALL |p| |q| (|getShellEntry| $ 31)))
(DEFUN |UPOLYC-;eval;SLLS;7| (|p| |lv| |lr| $)
(COND
@@ -211,11 +211,11 @@
(|error| "can only eval a univariate polynomial once"))
('T
(SPADCALL |p| (|SPADfirst| |lv|) (|SPADfirst| |lr|)
- (|getShellEntry| $ 26)))))
+ (|getShellEntry| $ 35)))))
(DEFUN |UPOLYC-;eval;SSaosRS;8| (|p| |v| |r| $)
- (SPADCALL (SPADCALL |p| |r| (|getShellEntry| $ 29))
- (|getShellEntry| $ 30)))
+ (SPADCALL (SPADCALL |p| |r| (|getShellEntry| $ 37))
+ (|getShellEntry| $ 38)))
(DEFUN |UPOLYC-;eval;SLS;9| (|p| |le| $)
(COND
@@ -226,86 +226,86 @@
(COND
((QEQCAR (SPADCALL
(SPADCALL (|SPADfirst| |le|)
- (|getShellEntry| $ 33))
- (|getShellEntry| $ 35))
+ (|getShellEntry| $ 45))
+ (|getShellEntry| $ 47))
1)
|p|)
('T
(SPADCALL |p|
- (SPADCALL (|SPADfirst| |le|) (|getShellEntry| $ 36))
- (|getShellEntry| $ 24)))))))
+ (SPADCALL (|SPADfirst| |le|) (|getShellEntry| $ 48))
+ (|getShellEntry| $ 31)))))))
(DEFUN |UPOLYC-;mainVariable;SU;10| (|p| $)
(COND
((ZEROP (SPADCALL |p| (|getShellEntry| $ 11))) (CONS 1 "failed"))
- ('T (CONS 0 (SPADCALL (|getShellEntry| $ 13))))))
+ ('T (CONS 0 (SPADCALL (|getShellEntry| $ 14))))))
(DEFUN |UPOLYC-;minimumDegree;SSaosNni;11| (|p| |v| $)
- (SPADCALL |p| (|getShellEntry| $ 41)))
+ (SPADCALL |p| (|getShellEntry| $ 53)))
(DEFUN |UPOLYC-;minimumDegree;SLL;12| (|p| |lv| $)
(COND
((NULL |lv|) NIL)
- ('T (LIST (SPADCALL |p| (|getShellEntry| $ 41))))))
+ ('T (LIST (SPADCALL |p| (|getShellEntry| $ 53))))))
(DEFUN |UPOLYC-;monomial;SSaosNniS;13| (|p| |v| |n| $)
(SPADCALL (CONS #'|UPOLYC-;monomial;SSaosNniS;13!0| (VECTOR $ |n|))
- |p| (|getShellEntry| $ 46)))
+ |p| (|getShellEntry| $ 58)))
(DEFUN |UPOLYC-;monomial;SSaosNniS;13!0| (|#1| $$)
(SPADCALL |#1| (|getShellEntry| $$ 1)
- (|getShellEntry| (|getShellEntry| $$ 0) 44)))
+ (|getShellEntry| (|getShellEntry| $$ 0) 56)))
(DEFUN |UPOLYC-;coerce;SaosS;14| (|v| $)
- (SPADCALL (|spadConstant| $ 49) 1 (|getShellEntry| $ 50)))
+ (SPADCALL (|spadConstant| $ 61) 1 (|getShellEntry| $ 63)))
(DEFUN |UPOLYC-;makeSUP;SSup;15| (|p| $)
(COND
- ((SPADCALL |p| (|getShellEntry| $ 9)) (|spadConstant| $ 53))
+ ((SPADCALL |p| (|getShellEntry| $ 9)) (|spadConstant| $ 66))
('T
(SPADCALL
- (SPADCALL (SPADCALL |p| (|getShellEntry| $ 54))
+ (SPADCALL (SPADCALL |p| (|getShellEntry| $ 67))
(SPADCALL |p| (|getShellEntry| $ 11))
- (|getShellEntry| $ 55))
- (SPADCALL (SPADCALL |p| (|getShellEntry| $ 56))
- (|getShellEntry| $ 57))
- (|getShellEntry| $ 58)))))
+ (|getShellEntry| $ 68))
+ (SPADCALL (SPADCALL |p| (|getShellEntry| $ 69))
+ (|getShellEntry| $ 70))
+ (|getShellEntry| $ 71)))))
(DEFUN |UPOLYC-;unmakeSUP;SupS;16| (|sp| $)
(COND
- ((SPADCALL |sp| (|getShellEntry| $ 60)) (|spadConstant| $ 61))
+ ((SPADCALL |sp| (|getShellEntry| $ 73)) (|spadConstant| $ 74))
('T
(SPADCALL
- (SPADCALL (SPADCALL |sp| (|getShellEntry| $ 62))
- (SPADCALL |sp| (|getShellEntry| $ 63))
- (|getShellEntry| $ 50))
- (SPADCALL (SPADCALL |sp| (|getShellEntry| $ 64))
- (|getShellEntry| $ 65))
- (|getShellEntry| $ 66)))))
+ (SPADCALL (SPADCALL |sp| (|getShellEntry| $ 75))
+ (SPADCALL |sp| (|getShellEntry| $ 76))
+ (|getShellEntry| $ 63))
+ (SPADCALL (SPADCALL |sp| (|getShellEntry| $ 77))
+ (|getShellEntry| $ 78))
+ (|getShellEntry| $ 79)))))
(DEFUN |UPOLYC-;karatsubaDivide;SNniR;17| (|p| |n| $)
(SPADCALL |p|
- (SPADCALL (|spadConstant| $ 49) |n| (|getShellEntry| $ 50))
- (|getShellEntry| $ 69)))
+ (SPADCALL (|spadConstant| $ 61) |n| (|getShellEntry| $ 63))
+ (|getShellEntry| $ 82)))
(DEFUN |UPOLYC-;shiftRight;SNniS;18| (|p| |n| $)
(QCAR (SPADCALL |p|
- (SPADCALL (|spadConstant| $ 49) |n| (|getShellEntry| $ 50))
- (|getShellEntry| $ 69))))
+ (SPADCALL (|spadConstant| $ 61) |n| (|getShellEntry| $ 63))
+ (|getShellEntry| $ 82))))
(DEFUN |UPOLYC-;shiftLeft;SNniS;19| (|p| |n| $)
(SPADCALL |p|
- (SPADCALL (|spadConstant| $ 49) |n| (|getShellEntry| $ 50))
- (|getShellEntry| $ 72)))
+ (SPADCALL (|spadConstant| $ 61) |n| (|getShellEntry| $ 63))
+ (|getShellEntry| $ 85)))
(DEFUN |UPOLYC-;solveLinearPolynomialEquation;LSupU;20| (|lpp| |pp| $)
- (SPADCALL |lpp| |pp| (|getShellEntry| $ 78)))
+ (SPADCALL |lpp| |pp| (|getShellEntry| $ 91)))
(DEFUN |UPOLYC-;factorPolynomial;SupF;21| (|pp| $)
- (SPADCALL |pp| (|getShellEntry| $ 84)))
+ (SPADCALL |pp| (|getShellEntry| $ 97)))
(DEFUN |UPOLYC-;factorSquareFreePolynomial;SupF;22| (|pp| $)
- (SPADCALL |pp| (|getShellEntry| $ 87)))
+ (SPADCALL |pp| (|getShellEntry| $ 100)))
(DEFUN |UPOLYC-;factor;SF;23| (|p| $)
(PROG (|ansR| #0=#:G1691 |w| #1=#:G1692)
@@ -314,21 +314,21 @@
((ZEROP (SPADCALL |p| (|getShellEntry| $ 11)))
(SEQ (LETT |ansR|
(SPADCALL
- (SPADCALL |p| (|getShellEntry| $ 54))
- (|getShellEntry| $ 90))
+ (SPADCALL |p| (|getShellEntry| $ 67))
+ (|getShellEntry| $ 103))
|UPOLYC-;factor;SF;23|)
(EXIT (SPADCALL
(SPADCALL
(SPADCALL |ansR|
- (|getShellEntry| $ 92))
- (|getShellEntry| $ 30))
+ (|getShellEntry| $ 105))
+ (|getShellEntry| $ 38))
(PROGN
(LETT #0# NIL |UPOLYC-;factor;SF;23|)
(SEQ (LETT |w| NIL
|UPOLYC-;factor;SF;23|)
(LETT #1#
(SPADCALL |ansR|
- (|getShellEntry| $ 97))
+ (|getShellEntry| $ 110))
|UPOLYC-;factor;SF;23|)
G190
(COND
@@ -344,7 +344,7 @@
(CONS
(VECTOR (QVELT |w| 0)
(SPADCALL (QVELT |w| 1)
- (|getShellEntry| $ 30))
+ (|getShellEntry| $ 38))
(QVELT |w| 2))
#0#)
|UPOLYC-;factor;SF;23|)))
@@ -352,12 +352,12 @@
|UPOLYC-;factor;SF;23|)
(GO G190) G191
(EXIT (NREVERSE0 #0#))))
- (|getShellEntry| $ 101)))))
+ (|getShellEntry| $ 114)))))
('T
- (SPADCALL (ELT $ 65)
- (SPADCALL (SPADCALL |p| (|getShellEntry| $ 57))
- (|getShellEntry| $ 102))
- (|getShellEntry| $ 106))))))))
+ (SPADCALL (ELT $ 78)
+ (SPADCALL (SPADCALL |p| (|getShellEntry| $ 70))
+ (|getShellEntry| $ 115))
+ (|getShellEntry| $ 119))))))))
(DEFUN |UPOLYC-;vectorise;SNniV;24| (|p| |n| $)
(PROG (|v| |m| |i| #0=#:G1693 #1=#:G1522)
@@ -365,12 +365,12 @@
(SEQ (LETT |m|
(SPADCALL
(LETT |v|
- (SPADCALL |n| (|spadConstant| $ 108)
- (|getShellEntry| $ 110))
+ (SPADCALL |n| (|spadConstant| $ 121)
+ (|getShellEntry| $ 123))
|UPOLYC-;vectorise;SNniV;24|)
- (|getShellEntry| $ 111))
+ (|getShellEntry| $ 124))
|UPOLYC-;vectorise;SNniV;24|)
- (SEQ (LETT |i| (SPADCALL |v| (|getShellEntry| $ 111))
+ (SEQ (LETT |i| (SPADCALL |v| (|getShellEntry| $ 124))
|UPOLYC-;vectorise;SNniV;24|)
(LETT #0# (QVSIZE |v|) |UPOLYC-;vectorise;SNniV;24|)
G190 (COND ((> |i| #0#) (GO G191)))
@@ -385,29 +385,29 @@
('T 'T))
'(|NonNegativeInteger|)
#1#))
- (|getShellEntry| $ 112))
- (|getShellEntry| $ 113))))
+ (|getShellEntry| $ 127))
+ (|getShellEntry| $ 128))))
(LETT |i| (+ |i| 1) |UPOLYC-;vectorise;SNniV;24|)
(GO G190) G191 (EXIT NIL))
(EXIT |v|)))))
(DEFUN |UPOLYC-;retract;SR;25| (|p| $)
(COND
- ((SPADCALL |p| (|getShellEntry| $ 9)) (|spadConstant| $ 108))
+ ((SPADCALL |p| (|getShellEntry| $ 9)) (|spadConstant| $ 121))
((ZEROP (SPADCALL |p| (|getShellEntry| $ 11)))
- (SPADCALL |p| (|getShellEntry| $ 54)))
+ (SPADCALL |p| (|getShellEntry| $ 67)))
('T (|error| "Polynomial is not of degree 0"))))
(DEFUN |UPOLYC-;retractIfCan;SU;26| (|p| $)
(COND
((SPADCALL |p| (|getShellEntry| $ 9))
- (CONS 0 (|spadConstant| $ 108)))
+ (CONS 0 (|spadConstant| $ 121)))
((ZEROP (SPADCALL |p| (|getShellEntry| $ 11)))
- (CONS 0 (SPADCALL |p| (|getShellEntry| $ 54))))
+ (CONS 0 (SPADCALL |p| (|getShellEntry| $ 67))))
('T (CONS 1 "failed"))))
(DEFUN |UPOLYC-;init;S;27| ($)
- (SPADCALL (|spadConstant| $ 118) (|getShellEntry| $ 30)))
+ (SPADCALL (|spadConstant| $ 133) (|getShellEntry| $ 38)))
(DEFUN |UPOLYC-;nextItemInner| (|n| $)
(PROG (|nn| |n1| |n2| #0=#:G1546 |n3|)
@@ -417,27 +417,27 @@
(CONS 0
(SPADCALL
(PROG2 (LETT #0#
- (SPADCALL (|spadConstant| $ 108)
- (|getShellEntry| $ 121))
+ (SPADCALL (|spadConstant| $ 121)
+ (|getShellEntry| $ 136))
|UPOLYC-;nextItemInner|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
(|getShellEntry| $ 7) #0#))
- (|getShellEntry| $ 30))))
+ (|getShellEntry| $ 38))))
((ZEROP (SPADCALL |n| (|getShellEntry| $ 11)))
(SEQ (LETT |nn|
(SPADCALL
- (SPADCALL |n| (|getShellEntry| $ 54))
- (|getShellEntry| $ 121))
+ (SPADCALL |n| (|getShellEntry| $ 67))
+ (|getShellEntry| $ 136))
|UPOLYC-;nextItemInner|)
(EXIT (COND
((QEQCAR |nn| 1) (CONS 1 "failed"))
('T
(CONS 0
(SPADCALL (QCDR |nn|)
- (|getShellEntry| $ 30))))))))
+ (|getShellEntry| $ 38))))))))
('T
- (SEQ (LETT |n1| (SPADCALL |n| (|getShellEntry| $ 56))
+ (SEQ (LETT |n1| (SPADCALL |n| (|getShellEntry| $ 69))
|UPOLYC-;nextItemInner|)
(LETT |n2| (|UPOLYC-;nextItemInner| |n1| $)
|UPOLYC-;nextItemInner|)
@@ -447,12 +447,12 @@
(SPADCALL
(SPADCALL
(SPADCALL |n|
- (|getShellEntry| $ 54))
+ (|getShellEntry| $ 67))
(SPADCALL |n|
(|getShellEntry| $ 11))
- (|getShellEntry| $ 50))
+ (|getShellEntry| $ 63))
(QCDR |n2|)
- (|getShellEntry| $ 66))))
+ (|getShellEntry| $ 79))))
((< (+ 1
(SPADCALL |n1|
(|getShellEntry| $ 11)))
@@ -461,16 +461,16 @@
(SPADCALL
(SPADCALL
(SPADCALL |n|
- (|getShellEntry| $ 54))
+ (|getShellEntry| $ 67))
(SPADCALL |n|
(|getShellEntry| $ 11))
- (|getShellEntry| $ 50))
+ (|getShellEntry| $ 63))
(SPADCALL
(PROG2
(LETT #0#
(SPADCALL
- (|spadConstant| $ 118)
- (|getShellEntry| $ 121))
+ (|spadConstant| $ 133)
+ (|getShellEntry| $ 136))
|UPOLYC-;nextItemInner|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
@@ -478,14 +478,14 @@
(+ 1
(SPADCALL |n1|
(|getShellEntry| $ 11)))
- (|getShellEntry| $ 50))
- (|getShellEntry| $ 66))))
+ (|getShellEntry| $ 63))
+ (|getShellEntry| $ 79))))
('T
(SEQ (LETT |n3|
(SPADCALL
(SPADCALL |n|
- (|getShellEntry| $ 54))
- (|getShellEntry| $ 121))
+ (|getShellEntry| $ 67))
+ (|getShellEntry| $ 136))
|UPOLYC-;nextItemInner|)
(EXIT (COND
((QEQCAR |n3| 1)
@@ -495,7 +495,7 @@
(SPADCALL (QCDR |n3|)
(SPADCALL |n|
(|getShellEntry| $ 11))
- (|getShellEntry| $ 50)))))))))))))))))
+ (|getShellEntry| $ 63)))))))))))))))))
(DEFUN |UPOLYC-;nextItem;SU;29| (|n| $)
(PROG (|n1| #0=#:G1559)
@@ -507,20 +507,20 @@
(CONS 0
(SPADCALL
(PROG2 (LETT #0#
- (SPADCALL (|spadConstant| $ 118)
- (|getShellEntry| $ 121))
+ (SPADCALL (|spadConstant| $ 133)
+ (|getShellEntry| $ 136))
|UPOLYC-;nextItem;SU;29|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
(|getShellEntry| $ 7) #0#))
(+ 1
(SPADCALL |n| (|getShellEntry| $ 11)))
- (|getShellEntry| $ 50))))
+ (|getShellEntry| $ 63))))
('T |n1|)))))))
(DEFUN |UPOLYC-;content;SSaosS;30| (|p| |v| $)
- (SPADCALL (SPADCALL |p| (|getShellEntry| $ 124))
- (|getShellEntry| $ 30)))
+ (SPADCALL (SPADCALL |p| (|getShellEntry| $ 140))
+ (|getShellEntry| $ 38)))
(DEFUN |UPOLYC-;primeFactor| (|p| |q| $)
(PROG (#0=#:G1565 |p1|)
@@ -529,15 +529,15 @@
(PROG2 (LETT #0#
(SPADCALL |p|
(SPADCALL |p| |q|
- (|getShellEntry| $ 126))
- (|getShellEntry| $ 127))
+ (|getShellEntry| $ 142))
+ (|getShellEntry| $ 143))
|UPOLYC-;primeFactor|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) (|getShellEntry| $ 6)
#0#))
|UPOLYC-;primeFactor|)
(EXIT (COND
- ((SPADCALL |p1| |p| (|getShellEntry| $ 128)) |p|)
+ ((SPADCALL |p1| |p| (|getShellEntry| $ 144)) |p|)
('T (|UPOLYC-;primeFactor| |p1| |q| $))))))))
(DEFUN |UPOLYC-;separate;2SR;32| (|p| |q| $)
@@ -548,7 +548,7 @@
(EXIT (CONS |a|
(PROG2 (LETT #0#
(SPADCALL |p| |a|
- (|getShellEntry| $ 127))
+ (|getShellEntry| $ 143))
|UPOLYC-;separate;2SR;32|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
@@ -557,7 +557,7 @@
(DEFUN |UPOLYC-;differentiate;SM2S;33| (|x| |deriv| |x'| $)
(PROG (|dg| |lc| #0=#:G1576 |d|)
(RETURN
- (SEQ (LETT |d| (|spadConstant| $ 61)
+ (SEQ (LETT |d| (|spadConstant| $ 74)
|UPOLYC-;differentiate;SM2S;33|)
(SEQ G190
(COND
@@ -566,7 +566,7 @@
(SPADCALL |x| (|getShellEntry| $ 11))
|UPOLYC-;differentiate;SM2S;33|)))
(GO G191)))
- (SEQ (LETT |lc| (SPADCALL |x| (|getShellEntry| $ 54))
+ (SEQ (LETT |lc| (SPADCALL |x| (|getShellEntry| $ 67))
|UPOLYC-;differentiate;SM2S;33|)
(LETT |d|
(SPADCALL
@@ -574,7 +574,7 @@
(SPADCALL |x'|
(SPADCALL
(SPADCALL |dg| |lc|
- (|getShellEntry| $ 132))
+ (|getShellEntry| $ 149))
(PROG1
(LETT #0# (- |dg| 1)
|UPOLYC-;differentiate;SM2S;33|)
@@ -583,30 +583,30 @@
((< #0# 0) 'NIL)
('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 50))
- (|getShellEntry| $ 72))
- (|getShellEntry| $ 66))
+ (|getShellEntry| $ 63))
+ (|getShellEntry| $ 85))
+ (|getShellEntry| $ 79))
(SPADCALL (SPADCALL |lc| |deriv|) |dg|
- (|getShellEntry| $ 50))
- (|getShellEntry| $ 66))
+ (|getShellEntry| $ 63))
+ (|getShellEntry| $ 79))
|UPOLYC-;differentiate;SM2S;33|)
(EXIT (LETT |x|
- (SPADCALL |x| (|getShellEntry| $ 56))
+ (SPADCALL |x| (|getShellEntry| $ 69))
|UPOLYC-;differentiate;SM2S;33|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT (SPADCALL |d|
(SPADCALL
(SPADCALL
- (SPADCALL |x| (|getShellEntry| $ 54))
+ (SPADCALL |x| (|getShellEntry| $ 67))
|deriv|)
- (|getShellEntry| $ 30))
- (|getShellEntry| $ 66)))))))
+ (|getShellEntry| $ 38))
+ (|getShellEntry| $ 79)))))))
(DEFUN |UPOLYC-;ncdiff| (|n| |x'| $)
(PROG (#0=#:G1594 |n1|)
(RETURN
(COND
- ((ZEROP |n|) (|spadConstant| $ 61))
+ ((ZEROP |n|) (|spadConstant| $ 74))
((ZEROP (LETT |n1|
(PROG1 (LETT #0# (- |n| 1) |UPOLYC-;ncdiff|)
(|check-subtype|
@@ -617,19 +617,19 @@
('T
(SPADCALL
(SPADCALL |x'|
- (SPADCALL (|spadConstant| $ 49) |n1|
- (|getShellEntry| $ 50))
- (|getShellEntry| $ 72))
+ (SPADCALL (|spadConstant| $ 61) |n1|
+ (|getShellEntry| $ 63))
+ (|getShellEntry| $ 85))
(SPADCALL
- (SPADCALL (|spadConstant| $ 49) 1
- (|getShellEntry| $ 50))
- (|UPOLYC-;ncdiff| |n1| |x'| $) (|getShellEntry| $ 72))
- (|getShellEntry| $ 66)))))))
+ (SPADCALL (|spadConstant| $ 61) 1
+ (|getShellEntry| $ 63))
+ (|UPOLYC-;ncdiff| |n1| |x'| $) (|getShellEntry| $ 85))
+ (|getShellEntry| $ 79)))))))
(DEFUN |UPOLYC-;differentiate;SM2S;35| (|x| |deriv| |x'| $)
(PROG (|dg| |lc| |d|)
(RETURN
- (SEQ (LETT |d| (|spadConstant| $ 61)
+ (SEQ (LETT |d| (|spadConstant| $ 74)
|UPOLYC-;differentiate;SM2S;35|)
(SEQ G190
(COND
@@ -638,38 +638,38 @@
(SPADCALL |x| (|getShellEntry| $ 11))
|UPOLYC-;differentiate;SM2S;35|)))
(GO G191)))
- (SEQ (LETT |lc| (SPADCALL |x| (|getShellEntry| $ 54))
+ (SEQ (LETT |lc| (SPADCALL |x| (|getShellEntry| $ 67))
|UPOLYC-;differentiate;SM2S;35|)
(LETT |d|
(SPADCALL
(SPADCALL |d|
(SPADCALL (SPADCALL |lc| |deriv|)
- |dg| (|getShellEntry| $ 50))
- (|getShellEntry| $ 66))
+ |dg| (|getShellEntry| $ 63))
+ (|getShellEntry| $ 79))
(SPADCALL |lc|
(|UPOLYC-;ncdiff| |dg| |x'| $)
- (|getShellEntry| $ 135))
- (|getShellEntry| $ 66))
+ (|getShellEntry| $ 154))
+ (|getShellEntry| $ 79))
|UPOLYC-;differentiate;SM2S;35|)
(EXIT (LETT |x|
- (SPADCALL |x| (|getShellEntry| $ 56))
+ (SPADCALL |x| (|getShellEntry| $ 69))
|UPOLYC-;differentiate;SM2S;35|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT (SPADCALL |d|
(SPADCALL
(SPADCALL
- (SPADCALL |x| (|getShellEntry| $ 54))
+ (SPADCALL |x| (|getShellEntry| $ 67))
|deriv|)
- (|getShellEntry| $ 30))
- (|getShellEntry| $ 66)))))))
+ (|getShellEntry| $ 38))
+ (|getShellEntry| $ 79)))))))
(DEFUN |UPOLYC-;differentiate;SMS;36| (|x| |deriv| $)
- (SPADCALL |x| |deriv| (|spadConstant| $ 48) (|getShellEntry| $ 136)))
+ (SPADCALL |x| |deriv| (|spadConstant| $ 60) (|getShellEntry| $ 155)))
(DEFUN |UPOLYC-;differentiate;2S;37| (|x| $)
(PROG (|dg| #0=#:G1603 |d|)
(RETURN
- (SEQ (LETT |d| (|spadConstant| $ 61)
+ (SEQ (LETT |d| (|spadConstant| $ 74)
|UPOLYC-;differentiate;2S;37|)
(SEQ G190
(COND
@@ -683,33 +683,33 @@
(SPADCALL
(SPADCALL |dg|
(SPADCALL |x|
- (|getShellEntry| $ 54))
- (|getShellEntry| $ 132))
+ (|getShellEntry| $ 67))
+ (|getShellEntry| $ 149))
(PROG1
(LETT #0# (- |dg| 1)
|UPOLYC-;differentiate;2S;37|)
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 50))
- (|getShellEntry| $ 66))
+ (|getShellEntry| $ 63))
+ (|getShellEntry| $ 79))
|UPOLYC-;differentiate;2S;37|)
(EXIT (LETT |x|
- (SPADCALL |x| (|getShellEntry| $ 56))
+ (SPADCALL |x| (|getShellEntry| $ 69))
|UPOLYC-;differentiate;2S;37|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |d|)))))
(DEFUN |UPOLYC-;differentiate;SSaosS;38| (|x| |v| $)
- (SPADCALL |x| (|getShellEntry| $ 139)))
+ (SPADCALL |x| (|getShellEntry| $ 158)))
(DEFUN |UPOLYC-;elt;3F;39| (|g| |f| $)
(SPADCALL
- (SPADCALL (SPADCALL |g| (|getShellEntry| $ 142)) |f|
- (|getShellEntry| $ 144))
- (SPADCALL (SPADCALL |g| (|getShellEntry| $ 145)) |f|
- (|getShellEntry| $ 144))
- (|getShellEntry| $ 146)))
+ (SPADCALL (SPADCALL |g| (|getShellEntry| $ 161)) |f|
+ (|getShellEntry| $ 163))
+ (SPADCALL (SPADCALL |g| (|getShellEntry| $ 164)) |f|
+ (|getShellEntry| $ 163))
+ (|getShellEntry| $ 165)))
(DEFUN |UPOLYC-;pseudoQuotient;3S;40| (|p| |q| $)
(PROG (|n| #0=#:G1611)
@@ -720,7 +720,7 @@
1)
|UPOLYC-;pseudoQuotient;3S;40|)
(EXIT (COND
- ((< |n| 1) (|spadConstant| $ 61))
+ ((< |n| 1) (|spadConstant| $ 74))
('T
(PROG2 (LETT #0#
(SPADCALL
@@ -728,19 +728,19 @@
(SPADCALL
(SPADCALL
(SPADCALL |q|
- (|getShellEntry| $ 54))
+ (|getShellEntry| $ 67))
(PROG1 |n|
(|check-subtype|
(COND
((< |n| 0) 'NIL)
('T 'T))
'(|NonNegativeInteger|) |n|))
- (|getShellEntry| $ 148))
- |p| (|getShellEntry| $ 135))
+ (|getShellEntry| $ 169))
+ |p| (|getShellEntry| $ 154))
(SPADCALL |p| |q|
- (|getShellEntry| $ 149))
- (|getShellEntry| $ 150))
- |q| (|getShellEntry| $ 127))
+ (|getShellEntry| $ 170))
+ (|getShellEntry| $ 171))
+ |q| (|getShellEntry| $ 143))
|UPOLYC-;pseudoQuotient;3S;40|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
@@ -756,22 +756,22 @@
|UPOLYC-;pseudoDivide;2SR;41|)
(EXIT (COND
((< |n| 1)
- (VECTOR (|spadConstant| $ 49) (|spadConstant| $ 61)
+ (VECTOR (|spadConstant| $ 61) (|spadConstant| $ 74)
|p|))
('T
(SEQ (LETT |prem|
(SPADCALL |p| |q|
- (|getShellEntry| $ 149))
+ (|getShellEntry| $ 170))
|UPOLYC-;pseudoDivide;2SR;41|)
(LETT |lc|
(SPADCALL
(SPADCALL |q|
- (|getShellEntry| $ 54))
+ (|getShellEntry| $ 67))
(PROG1 |n|
(|check-subtype|
(COND ((< |n| 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) |n|))
- (|getShellEntry| $ 148))
+ (|getShellEntry| $ 169))
|UPOLYC-;pseudoDivide;2SR;41|)
(EXIT (VECTOR |lc|
(PROG2
@@ -779,10 +779,10 @@
(SPADCALL
(SPADCALL
(SPADCALL |lc| |p|
- (|getShellEntry| $ 135))
+ (|getShellEntry| $ 154))
|prem|
- (|getShellEntry| $ 150))
- |q| (|getShellEntry| $ 127))
+ (|getShellEntry| $ 171))
+ |q| (|getShellEntry| $ 143))
|UPOLYC-;pseudoDivide;2SR;41|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0)
@@ -793,8 +793,8 @@
(PROG (|n| |d|)
(RETURN
(SEQ (LETT |n|
- (SPADCALL (SPADCALL |f| (|getShellEntry| $ 142)) |q|
- (|getShellEntry| $ 154))
+ (SPADCALL (SPADCALL |f| (|getShellEntry| $ 161)) |q|
+ (|getShellEntry| $ 175))
|UPOLYC-;composite;FSU;42|)
(EXIT (COND
((QEQCAR |n| 1) (CONS 1 "failed"))
@@ -802,33 +802,33 @@
(SEQ (LETT |d|
(SPADCALL
(SPADCALL |f|
- (|getShellEntry| $ 145))
- |q| (|getShellEntry| $ 154))
+ (|getShellEntry| $ 164))
+ |q| (|getShellEntry| $ 175))
|UPOLYC-;composite;FSU;42|)
(EXIT (COND
((QEQCAR |d| 1) (CONS 1 "failed"))
('T
(CONS 0
(SPADCALL (QCDR |n|) (QCDR |d|)
- (|getShellEntry| $ 155))))))))))))))
+ (|getShellEntry| $ 176))))))))))))))
(DEFUN |UPOLYC-;composite;2SU;43| (|p| |q| $)
(PROG (|cqr| |v| |u| |w| #0=#:G1643)
(RETURN
(SEQ (COND
- ((SPADCALL |p| (|getShellEntry| $ 158)) (CONS 0 |p|))
+ ((SPADCALL |p| (|getShellEntry| $ 179)) (CONS 0 |p|))
('T
(SEQ (EXIT (SEQ (LETT |cqr|
(SPADCALL |p| |q|
- (|getShellEntry| $ 159))
+ (|getShellEntry| $ 180))
|UPOLYC-;composite;2SU;43|)
(COND
((SPADCALL (QVELT |cqr| 2)
- (|getShellEntry| $ 158))
+ (|getShellEntry| $ 179))
(SEQ (LETT |v|
(SPADCALL (QVELT |cqr| 2)
(QVELT |cqr| 0)
- (|getShellEntry| $ 160))
+ (|getShellEntry| $ 181))
|UPOLYC-;composite;2SU;43|)
(EXIT
(COND
@@ -837,7 +837,7 @@
(LETT |u|
(SPADCALL (QVELT |cqr| 1)
|q|
- (|getShellEntry| $ 154))
+ (|getShellEntry| $ 175))
|UPOLYC-;composite;2SU;43|)
(EXIT
(COND
@@ -847,7 +847,7 @@
(SPADCALL (QCDR |u|)
(QVELT |cqr| 0)
(|getShellEntry| $
- 160))
+ 181))
|UPOLYC-;composite;2SU;43|)
(EXIT
(COND
@@ -860,15 +860,15 @@
(SPADCALL
(SPADCALL
(|spadConstant|
- $ 49)
+ $ 61)
1
(|getShellEntry|
- $ 50))
+ $ 63))
(QCDR |w|)
(|getShellEntry|
- $ 72))
+ $ 85))
(|getShellEntry|
- $ 66)))
+ $ 79)))
|UPOLYC-;composite;2SU;43|)
(GO #0#))))))))))))))))
(EXIT (CONS 1 "failed"))))
@@ -879,14 +879,14 @@
(RETURN
(SEQ (COND
((SPADCALL |p| (|getShellEntry| $ 9))
- (|spadConstant| $ 162))
+ (|spadConstant| $ 183))
('T
(SEQ (LETT |ans|
(SPADCALL
(SPADCALL
- (SPADCALL |p| (|getShellEntry| $ 54))
- (|getShellEntry| $ 30))
- (|getShellEntry| $ 163))
+ (SPADCALL |p| (|getShellEntry| $ 67))
+ (|getShellEntry| $ 38))
+ (|getShellEntry| $ 184))
|UPOLYC-;elt;S2F;44|)
(LETT |n| (SPADCALL |p| (|getShellEntry| $ 11))
|UPOLYC-;elt;S2F;44|)
@@ -895,7 +895,7 @@
((NULL (NOT (SPADCALL
(LETT |p|
(SPADCALL |p|
- (|getShellEntry| $ 56))
+ (|getShellEntry| $ 69))
|UPOLYC-;elt;S2F;44|)
(|getShellEntry| $ 9))))
(GO G191)))
@@ -916,15 +916,15 @@
((< #0# 0) 'NIL)
('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 164))
- (|getShellEntry| $ 165))
+ (|getShellEntry| $ 185))
+ (|getShellEntry| $ 186))
(SPADCALL
(SPADCALL
(SPADCALL |p|
- (|getShellEntry| $ 54))
- (|getShellEntry| $ 30))
- (|getShellEntry| $ 163))
- (|getShellEntry| $ 166))
+ (|getShellEntry| $ 67))
+ (|getShellEntry| $ 38))
+ (|getShellEntry| $ 184))
+ (|getShellEntry| $ 187))
|UPOLYC-;elt;S2F;44|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT (COND
@@ -932,8 +932,8 @@
('T
(SPADCALL |ans|
(SPADCALL |f| |n|
- (|getShellEntry| $ 167))
- (|getShellEntry| $ 165))))))))))))
+ (|getShellEntry| $ 188))
+ (|getShellEntry| $ 186))))))))))))
(DEFUN |UPOLYC-;order;2SNni;45| (|p| |q| $)
(PROG (|u| #0=#:G1663 |ans|)
@@ -949,7 +949,7 @@
(SEQ
(LETT |u|
(SPADCALL |p| |q|
- (|getShellEntry| $ 127))
+ (|getShellEntry| $ 143))
|UPOLYC-;order;2SNni;45|)
(EXIT
(COND
@@ -969,41 +969,41 @@
#0# (EXIT #0#)))))
(DEFUN |UPOLYC-;squareFree;SF;46| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 171)))
+ (SPADCALL |p| (|getShellEntry| $ 192)))
(DEFUN |UPOLYC-;squareFreePart;2S;47| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 173)))
+ (SPADCALL |p| (|getShellEntry| $ 194)))
(DEFUN |UPOLYC-;gcdPolynomial;3Sup;48| (|pp| |qq| $)
(COND
- ((SPADCALL |pp| (|getShellEntry| $ 175))
- (SPADCALL |qq| (|getShellEntry| $ 176)))
- ((SPADCALL |qq| (|getShellEntry| $ 175))
- (SPADCALL |pp| (|getShellEntry| $ 176)))
+ ((SPADCALL |pp| (|getShellEntry| $ 196))
+ (SPADCALL |qq| (|getShellEntry| $ 197)))
+ ((SPADCALL |qq| (|getShellEntry| $ 196))
+ (SPADCALL |pp| (|getShellEntry| $ 197)))
('T
(SPADCALL
(SPADCALL
- (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 177))
- (SPADCALL |qq| (|getShellEntry| $ 177))
- (|getShellEntry| $ 126))
+ (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 198))
+ (SPADCALL |qq| (|getShellEntry| $ 198))
+ (|getShellEntry| $ 142))
(SPADCALL
- (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 178))
- (SPADCALL |qq| (|getShellEntry| $ 178))
- (|getShellEntry| $ 179))
- (|getShellEntry| $ 178))
- (|getShellEntry| $ 180))
- (|getShellEntry| $ 176)))))
+ (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 199))
+ (SPADCALL |qq| (|getShellEntry| $ 199))
+ (|getShellEntry| $ 200))
+ (|getShellEntry| $ 199))
+ (|getShellEntry| $ 201))
+ (|getShellEntry| $ 197)))))
(DEFUN |UPOLYC-;squareFreePolynomial;SupF;49| (|pp| $)
- (SPADCALL |pp| (|getShellEntry| $ 183)))
+ (SPADCALL |pp| (|getShellEntry| $ 204)))
(DEFUN |UPOLYC-;elt;F2R;50| (|f| |r| $)
(SPADCALL
- (SPADCALL (SPADCALL |f| (|getShellEntry| $ 142)) |r|
- (|getShellEntry| $ 29))
- (SPADCALL (SPADCALL |f| (|getShellEntry| $ 145)) |r|
- (|getShellEntry| $ 29))
- (|getShellEntry| $ 185)))
+ (SPADCALL (SPADCALL |f| (|getShellEntry| $ 161)) |r|
+ (|getShellEntry| $ 37))
+ (SPADCALL (SPADCALL |f| (|getShellEntry| $ 164)) |r|
+ (|getShellEntry| $ 37))
+ (|getShellEntry| $ 206)))
(DEFUN |UPOLYC-;euclideanSize;SNni;51| (|x| $)
(COND
@@ -1018,12 +1018,12 @@
((SPADCALL |y| (|getShellEntry| $ 9))
(|error| "division by 0 in Univariate Polynomials"))
('T
- (SEQ (LETT |quot| (|spadConstant| $ 61)
+ (SEQ (LETT |quot| (|spadConstant| $ 74)
|UPOLYC-;divide;2SR;52|)
(LETT |lc|
(SPADCALL
- (SPADCALL |y| (|getShellEntry| $ 54))
- (|getShellEntry| $ 188))
+ (SPADCALL |y| (|getShellEntry| $ 67))
+ (|getShellEntry| $ 209))
|UPOLYC-;divide;2SR;52|)
(SEQ G190
(COND
@@ -1042,8 +1042,8 @@
(SEQ (LETT |f|
(SPADCALL |lc|
(SPADCALL |x|
- (|getShellEntry| $ 54))
- (|getShellEntry| $ 189))
+ (|getShellEntry| $ 67))
+ (|getShellEntry| $ 211))
|UPOLYC-;divide;2SR;52|)
(LETT |n|
(PROG1
@@ -1061,16 +1061,16 @@
(LETT |quot|
(SPADCALL |quot|
(SPADCALL |f| |n|
- (|getShellEntry| $ 50))
- (|getShellEntry| $ 66))
+ (|getShellEntry| $ 63))
+ (|getShellEntry| $ 79))
|UPOLYC-;divide;2SR;52|)
(EXIT (LETT |x|
(SPADCALL |x|
(SPADCALL
(SPADCALL |f| |n|
- (|getShellEntry| $ 50))
- |y| (|getShellEntry| $ 72))
- (|getShellEntry| $ 150))
+ (|getShellEntry| $ 63))
+ |y| (|getShellEntry| $ 85))
+ (|getShellEntry| $ 171))
|UPOLYC-;divide;2SR;52|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT (CONS |quot| |x|)))))))))
@@ -1078,13 +1078,13 @@
(DEFUN |UPOLYC-;integrate;2S;53| (|p| $)
(PROG (|l| |d| |ans|)
(RETURN
- (SEQ (LETT |ans| (|spadConstant| $ 61) |UPOLYC-;integrate;2S;53|)
+ (SEQ (LETT |ans| (|spadConstant| $ 74) |UPOLYC-;integrate;2S;53|)
(SEQ G190
(COND
- ((NULL (SPADCALL |p| (|spadConstant| $ 61)
- (|getShellEntry| $ 191)))
+ ((NULL (SPADCALL |p| (|spadConstant| $ 74)
+ (|getShellEntry| $ 213)))
(GO G191)))
- (SEQ (LETT |l| (SPADCALL |p| (|getShellEntry| $ 54))
+ (SEQ (LETT |l| (SPADCALL |p| (|getShellEntry| $ 67))
|UPOLYC-;integrate;2S;53|)
(LETT |d|
(+ 1 (SPADCALL |p| (|getShellEntry| $ 11)))
@@ -1094,15 +1094,15 @@
(SPADCALL
(SPADCALL
(SPADCALL |d|
- (|getShellEntry| $ 193))
- (|getShellEntry| $ 194))
+ (|getShellEntry| $ 215))
+ (|getShellEntry| $ 216))
(SPADCALL |l| |d|
- (|getShellEntry| $ 50))
- (|getShellEntry| $ 195))
- (|getShellEntry| $ 66))
+ (|getShellEntry| $ 63))
+ (|getShellEntry| $ 217))
+ (|getShellEntry| $ 79))
|UPOLYC-;integrate;2S;53|)
(EXIT (LETT |p|
- (SPADCALL |p| (|getShellEntry| $ 56))
+ (SPADCALL |p| (|getShellEntry| $ 69))
|UPOLYC-;integrate;2S;53|)))
NIL (GO G190) G191 (EXIT NIL))
(EXIT |ans|)))))
@@ -1116,7 +1116,7 @@
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$|
(LIST '|UnivariatePolynomialCategory&| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 202) . #0#)
+ (LETT $ (|newShell| 224) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -1134,279 +1134,292 @@
(COND
((|HasCategory| |#2| '(|PolynomialFactorizationExplicit|))
(PROGN
- (|setShellEntry| $ 82
+ (|setShellEntry| $ 95
(CONS (|dispatchFunction|
|UPOLYC-;solveLinearPolynomialEquation;LSupU;20|)
$))
- (|setShellEntry| $ 86
+ (|setShellEntry| $ 99
(CONS (|dispatchFunction|
|UPOLYC-;factorPolynomial;SupF;21|)
$))
- (|setShellEntry| $ 88
+ (|setShellEntry| $ 101
(CONS (|dispatchFunction|
|UPOLYC-;factorSquareFreePolynomial;SupF;22|)
$))
- (|setShellEntry| $ 107
+ (|setShellEntry| $ 120
(CONS (|dispatchFunction| |UPOLYC-;factor;SF;23|) $)))))
(COND
((|testBitVector| |pv$| 6)
(PROGN
- (|setShellEntry| $ 119
+ (|setShellEntry| $ 134
(CONS (|dispatchFunction| |UPOLYC-;init;S;27|) $))
NIL
- (|setShellEntry| $ 123
+ (|setShellEntry| $ 139
(CONS (|dispatchFunction| |UPOLYC-;nextItem;SU;29|) $)))))
(COND
((|testBitVector| |pv$| 3)
(PROGN
- (|setShellEntry| $ 125
+ (|setShellEntry| $ 141
(CONS (|dispatchFunction| |UPOLYC-;content;SSaosS;30|)
$))
NIL
- (|setShellEntry| $ 130
+ (|setShellEntry| $ 146
(CONS (|dispatchFunction| |UPOLYC-;separate;2SR;32|)
$)))))
(COND
((|testBitVector| |pv$| 5)
- (|setShellEntry| $ 134
+ (|setShellEntry| $ 151
(CONS (|dispatchFunction|
|UPOLYC-;differentiate;SM2S;33|)
$)))
('T
(PROGN
- (|setShellEntry| $ 134
+ (|setShellEntry| $ 151
(CONS (|dispatchFunction|
|UPOLYC-;differentiate;SM2S;35|)
$)))))
(COND
((|testBitVector| |pv$| 4)
(PROGN
- (|setShellEntry| $ 147
+ (|setShellEntry| $ 166
(CONS (|dispatchFunction| |UPOLYC-;elt;3F;39|) $))
- (|setShellEntry| $ 151
+ (|setShellEntry| $ 172
(CONS (|dispatchFunction|
|UPOLYC-;pseudoQuotient;3S;40|)
$))
- (|setShellEntry| $ 153
+ (|setShellEntry| $ 174
(CONS (|dispatchFunction|
|UPOLYC-;pseudoDivide;2SR;41|)
$))
- (|setShellEntry| $ 157
+ (|setShellEntry| $ 178
(CONS (|dispatchFunction| |UPOLYC-;composite;FSU;42|)
$))
- (|setShellEntry| $ 161
+ (|setShellEntry| $ 182
(CONS (|dispatchFunction| |UPOLYC-;composite;2SU;43|)
$))
- (|setShellEntry| $ 168
+ (|setShellEntry| $ 189
(CONS (|dispatchFunction| |UPOLYC-;elt;S2F;44|) $))
- (|setShellEntry| $ 169
+ (|setShellEntry| $ 190
(CONS (|dispatchFunction| |UPOLYC-;order;2SNni;45|) $)))))
(COND
((|testBitVector| |pv$| 3)
(PROGN
- (|setShellEntry| $ 172
+ (|setShellEntry| $ 193
(CONS (|dispatchFunction| |UPOLYC-;squareFree;SF;46|)
$))
- (|setShellEntry| $ 174
+ (|setShellEntry| $ 195
(CONS (|dispatchFunction|
|UPOLYC-;squareFreePart;2S;47|)
$)))))
(COND
((|HasCategory| |#2| '(|PolynomialFactorizationExplicit|))
(PROGN
- (|setShellEntry| $ 181
+ (|setShellEntry| $ 202
(CONS (|dispatchFunction|
|UPOLYC-;gcdPolynomial;3Sup;48|)
$))
- (|setShellEntry| $ 184
+ (|setShellEntry| $ 205
(CONS (|dispatchFunction|
|UPOLYC-;squareFreePolynomial;SupF;49|)
$)))))
(COND
((|testBitVector| |pv$| 2)
(PROGN
- (|setShellEntry| $ 186
+ (|setShellEntry| $ 207
(CONS (|dispatchFunction| |UPOLYC-;elt;F2R;50|) $))
- (|setShellEntry| $ 187
+ (|setShellEntry| $ 208
(CONS (|dispatchFunction|
|UPOLYC-;euclideanSize;SNni;51|)
$))
- (|setShellEntry| $ 190
+ (|setShellEntry| $ 212
(CONS (|dispatchFunction| |UPOLYC-;divide;2SR;52|) $)))))
(COND
((|testBitVector| |pv$| 1)
- (|setShellEntry| $ 196
+ (|setShellEntry| $ 218
(CONS (|dispatchFunction| |UPOLYC-;integrate;2S;53|) $))))
$))))
(MAKEPROP '|UnivariatePolynomialCategory&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|)
(|Boolean|) (0 . |zero?|) (|NonNegativeInteger|)
- (5 . |degree|) (|SingletonAsOrderedSet|) (10 . |create|)
- (|List| 12) |UPOLYC-;variables;SL;1|
- |UPOLYC-;degree;SSaosNni;2| (14 . |totalDegree|)
- |UPOLYC-;totalDegree;SLNni;3| (|List| 10)
- |UPOLYC-;degree;SLL;4| (19 . |eval|) (|List| $)
- |UPOLYC-;eval;SLLS;5| (26 . |elt|)
- |UPOLYC-;eval;SSaos2S;6| (32 . |eval|) (|List| 7)
- |UPOLYC-;eval;SLLS;7| (39 . |elt|) (45 . |coerce|)
- |UPOLYC-;eval;SSaosRS;8| (|Equation| 6) (50 . |lhs|)
- (|Union| 12 '"failed") (55 . |mainVariable|) (60 . |rhs|)
- (|Equation| $) (|List| 37) |UPOLYC-;eval;SLS;9|
- |UPOLYC-;mainVariable;SU;10| (65 . |minimumDegree|)
+ (5 . |degree|) (10 . |zero?|) (|SingletonAsOrderedSet|)
+ (15 . |create|) (|List| 13) |UPOLYC-;variables;SL;1|
+ |UPOLYC-;degree;SSaosNni;2| (19 . |empty?|) (24 . |Zero|)
+ (28 . |totalDegree|) |UPOLYC-;totalDegree;SLNni;3|
+ (|List| 10) |UPOLYC-;degree;SLL;4| (33 . |rest|)
+ (38 . |first|) (|List| 6) (43 . |first|) (48 . |eval|)
+ (|List| $) |UPOLYC-;eval;SLLS;5| (55 . |elt|)
+ |UPOLYC-;eval;SSaos2S;6| (|List| 7) (61 . |first|)
+ (66 . |eval|) |UPOLYC-;eval;SLLS;7| (73 . |elt|)
+ (79 . |coerce|) |UPOLYC-;eval;SSaosRS;8| (|Equation| 6)
+ (|List| 40) (84 . |empty?|) (89 . |rest|) (94 . |first|)
+ (99 . |lhs|) (|Union| 13 '"failed") (104 . |mainVariable|)
+ (109 . |rhs|) (|Equation| $) (|List| 49)
+ |UPOLYC-;eval;SLS;9| |UPOLYC-;mainVariable;SU;10|
+ (114 . |minimumDegree|)
|UPOLYC-;minimumDegree;SSaosNni;11|
- |UPOLYC-;minimumDegree;SLL;12| (70 . +) (|Mapping| 10 10)
- (76 . |mapExponents|) |UPOLYC-;monomial;SSaosNniS;13|
- (82 . |One|) (86 . |One|) (90 . |monomial|)
- |UPOLYC-;coerce;SaosS;14| (|SparseUnivariatePolynomial| 7)
- (96 . |Zero|) (100 . |leadingCoefficient|)
- (105 . |monomial|) (111 . |reductum|) (116 . |makeSUP|)
- (121 . +) |UPOLYC-;makeSUP;SSup;15| (127 . |zero?|)
- (132 . |Zero|) (136 . |leadingCoefficient|)
- (141 . |degree|) (146 . |reductum|) (151 . |unmakeSUP|)
- (156 . +) |UPOLYC-;unmakeSUP;SupS;16|
+ |UPOLYC-;minimumDegree;SLL;12| (119 . +) (|Mapping| 10 10)
+ (125 . |mapExponents|) |UPOLYC-;monomial;SSaosNniS;13|
+ (131 . |One|) (135 . |One|) (139 . |One|)
+ (143 . |monomial|) |UPOLYC-;coerce;SaosS;14|
+ (|SparseUnivariatePolynomial| 7) (149 . |Zero|)
+ (153 . |leadingCoefficient|) (158 . |monomial|)
+ (164 . |reductum|) (169 . |makeSUP|) (174 . +)
+ |UPOLYC-;makeSUP;SSup;15| (180 . |zero?|) (185 . |Zero|)
+ (189 . |leadingCoefficient|) (194 . |degree|)
+ (199 . |reductum|) (204 . |unmakeSUP|) (209 . +)
+ |UPOLYC-;unmakeSUP;SupS;16|
(|Record| (|:| |quotient| $) (|:| |remainder| $))
- (162 . |monicDivide|) |UPOLYC-;karatsubaDivide;SNniR;17|
- |UPOLYC-;shiftRight;SNniS;18| (168 . *)
+ (215 . |monicDivide|) |UPOLYC-;karatsubaDivide;SNniR;17|
+ |UPOLYC-;shiftRight;SNniS;18| (221 . *)
|UPOLYC-;shiftLeft;SNniS;19|
- (|SparseUnivariatePolynomial| 6) (|List| 74)
- (|Union| 75 '"failed")
+ (|SparseUnivariatePolynomial| 6) (|List| 87)
+ (|Union| 88 '"failed")
(|PolynomialFactorizationByRecursionUnivariate| 7 6)
- (174 . |solveLinearPolynomialEquationByRecursion|)
- (|SparseUnivariatePolynomial| $) (|List| 79)
- (|Union| 80 '"failed")
- (180 . |solveLinearPolynomialEquation|) (|Factored| 74)
- (186 . |factorByRecursion|) (|Factored| 79)
- (191 . |factorPolynomial|)
- (196 . |factorSquareFreeByRecursion|)
- (201 . |factorSquareFreePolynomial|) (|Factored| $)
- (206 . |factor|) (|Factored| 7) (211 . |unit|)
+ (227 . |solveLinearPolynomialEquationByRecursion|)
+ (|SparseUnivariatePolynomial| $) (|List| 92)
+ (|Union| 93 '"failed")
+ (233 . |solveLinearPolynomialEquation|) (|Factored| 87)
+ (239 . |factorByRecursion|) (|Factored| 92)
+ (244 . |factorPolynomial|)
+ (249 . |factorSquareFreeByRecursion|)
+ (254 . |factorSquareFreePolynomial|) (|Factored| $)
+ (259 . |factor|) (|Factored| 7) (264 . |unit|)
(|Union| '"nil" '"sqfr" '"irred" '"prime") (|Integer|)
- (|Record| (|:| |flg| 93) (|:| |fctr| 7) (|:| |xpnt| 94))
- (|List| 95) (216 . |factorList|)
- (|Record| (|:| |flg| 93) (|:| |fctr| 6) (|:| |xpnt| 94))
- (|List| 98) (|Factored| 6) (221 . |makeFR|)
- (227 . |factorPolynomial|) (|Mapping| 6 52)
- (|Factored| 52) (|FactoredFunctions2| 52 6) (232 . |map|)
- (238 . |factor|) (243 . |Zero|) (|Vector| 7) (247 . |new|)
- (253 . |minIndex|) (258 . |coefficient|)
- (264 . |qsetelt!|) |UPOLYC-;vectorise;SNniV;24|
- |UPOLYC-;retract;SR;25| (|Union| 7 '"failed")
- |UPOLYC-;retractIfCan;SU;26| (271 . |init|) (275 . |init|)
- (|Union| $ '"failed") (279 . |nextItem|) (284 . |One|)
- (288 . |nextItem|) (293 . |content|) (298 . |content|)
- (304 . |gcd|) (310 . |exquo|) (316 . =)
+ (|Record| (|:| |flg| 106) (|:| |fctr| 7) (|:| |xpnt| 107))
+ (|List| 108) (269 . |factorList|)
+ (|Record| (|:| |flg| 106) (|:| |fctr| 6) (|:| |xpnt| 107))
+ (|List| 111) (|Factored| 6) (274 . |makeFR|)
+ (280 . |factorPolynomial|) (|Mapping| 6 65)
+ (|Factored| 65) (|FactoredFunctions2| 65 6) (285 . |map|)
+ (291 . |factor|) (296 . |Zero|) (|Vector| 7) (300 . |new|)
+ (306 . |minIndex|) (311 . |maxIndex|) (316 . -)
+ (322 . |coefficient|) (328 . |qsetelt!|)
+ |UPOLYC-;vectorise;SNniV;24| |UPOLYC-;retract;SR;25|
+ (|Union| 7 '"failed") |UPOLYC-;retractIfCan;SU;26|
+ (335 . |init|) (339 . |init|) (|Union| $ '"failed")
+ (343 . |nextItem|) (348 . |One|) (352 . <)
+ (358 . |nextItem|) (363 . |content|) (368 . |content|)
+ (374 . |gcd|) (380 . |exquo|) (386 . =)
(|Record| (|:| |primePart| $) (|:| |commonPart| $))
- (322 . |separate|) (328 . |Zero|) (332 . *)
- (|Mapping| 7 7) (338 . |differentiate|) (345 . *)
- (351 . |differentiate|) |UPOLYC-;differentiate;SMS;36|
- |UPOLYC-;differentiate;2S;37| (358 . |differentiate|)
+ (392 . |separate|) (398 . |Zero|) (402 . |Zero|) (406 . *)
+ (|Mapping| 7 7) (412 . |differentiate|)
+ (|PositiveInteger|) (419 . |One|) (423 . *)
+ (429 . |differentiate|) |UPOLYC-;differentiate;SMS;36|
+ |UPOLYC-;differentiate;2S;37| (436 . |differentiate|)
|UPOLYC-;differentiate;SSaosS;38| (|Fraction| 6)
- (363 . |numer|) (|Fraction| $) (368 . |elt|)
- (374 . |denom|) (379 . /) (385 . |elt|) (391 . **)
- (397 . |pseudoRemainder|) (403 . -)
- (409 . |pseudoQuotient|)
+ (441 . |numer|) (|Fraction| $) (446 . |elt|)
+ (452 . |denom|) (457 . /) (463 . |elt|) (469 . +)
+ (475 . <) (481 . **) (487 . |pseudoRemainder|) (493 . -)
+ (499 . |pseudoQuotient|)
(|Record| (|:| |coef| 7) (|:| |quotient| $)
(|:| |remainder| $))
- (415 . |pseudoDivide|) (421 . |composite|) (427 . /)
- (|Union| 143 '"failed") (433 . |composite|)
- (439 . |ground?|) (444 . |pseudoDivide|) (450 . |exquo|)
- (456 . |composite|) (462 . |Zero|) (466 . |coerce|)
- (471 . **) (477 . *) (483 . +) (489 . **) (495 . |elt|)
- (501 . |order|) (|UnivariatePolynomialSquareFree| 7 6)
- (507 . |squareFree|) (512 . |squareFree|)
- (517 . |squareFreePart|) (522 . |squareFreePart|)
- (527 . |zero?|) (532 . |unitCanonical|) (537 . |content|)
- (542 . |primitivePart|) (547 . |subResultantGcd|)
- (553 . *) (559 . |gcdPolynomial|)
- (|UnivariatePolynomialSquareFree| 6 74)
- (565 . |squareFree|) (570 . |squareFreePolynomial|)
- (575 . /) (581 . |elt|) (587 . |euclideanSize|)
- (592 . |inv|) (597 . *) (603 . |divide|) (609 . ~=)
- (|Fraction| 94) (615 . |coerce|) (620 . |inv|) (625 . *)
- (631 . |integrate|) (|Symbol|) (|List| 197)
- (|Union| 94 '"failed") (|Union| 192 '"failed")
+ (505 . |pseudoDivide|) (511 . |composite|) (517 . /)
+ (|Union| 162 '"failed") (523 . |composite|)
+ (529 . |ground?|) (534 . |pseudoDivide|) (540 . |exquo|)
+ (546 . |composite|) (552 . |Zero|) (556 . |coerce|)
+ (561 . **) (567 . *) (573 . +) (579 . **) (585 . |elt|)
+ (591 . |order|) (|UnivariatePolynomialSquareFree| 7 6)
+ (597 . |squareFree|) (602 . |squareFree|)
+ (607 . |squareFreePart|) (612 . |squareFreePart|)
+ (617 . |zero?|) (622 . |unitCanonical|) (627 . |content|)
+ (632 . |primitivePart|) (637 . |subResultantGcd|)
+ (643 . *) (649 . |gcdPolynomial|)
+ (|UnivariatePolynomialSquareFree| 6 87)
+ (655 . |squareFree|) (660 . |squareFreePolynomial|)
+ (665 . /) (671 . |elt|) (677 . |euclideanSize|)
+ (682 . |inv|) (687 . |false|) (691 . *) (697 . |divide|)
+ (703 . ~=) (|Fraction| 107) (709 . |coerce|) (714 . |inv|)
+ (719 . *) (725 . |integrate|) (|Symbol|) (|List| 219)
+ (|Union| 107 '"failed") (|Union| 214 '"failed")
(|OutputForm|))
- '#(|vectorise| 636 |variables| 642 |unmakeSUP| 647
- |totalDegree| 652 |squareFreePolynomial| 658
- |squareFreePart| 663 |squareFree| 668
- |solveLinearPolynomialEquation| 673 |shiftRight| 679
- |shiftLeft| 685 |separate| 691 |retractIfCan| 697
- |retract| 702 |pseudoQuotient| 707 |pseudoDivide| 713
- |order| 719 |nextItem| 725 |monomial| 730 |minimumDegree|
- 737 |makeSUP| 749 |mainVariable| 754 |karatsubaDivide| 759
- |integrate| 765 |init| 770 |gcdPolynomial| 774
- |factorSquareFreePolynomial| 780 |factorPolynomial| 785
- |factor| 790 |eval| 795 |euclideanSize| 829 |elt| 834
- |divide| 852 |differentiate| 858 |degree| 882 |content|
- 894 |composite| 900 |coerce| 912)
+ '#(|vectorise| 730 |variables| 736 |unmakeSUP| 741
+ |totalDegree| 746 |squareFreePolynomial| 752
+ |squareFreePart| 757 |squareFree| 762
+ |solveLinearPolynomialEquation| 767 |shiftRight| 773
+ |shiftLeft| 779 |separate| 785 |retractIfCan| 791
+ |retract| 796 |pseudoQuotient| 801 |pseudoDivide| 807
+ |order| 813 |nextItem| 819 |monomial| 824 |minimumDegree|
+ 831 |makeSUP| 843 |mainVariable| 848 |karatsubaDivide| 853
+ |integrate| 859 |init| 864 |gcdPolynomial| 868
+ |factorSquareFreePolynomial| 874 |factorPolynomial| 879
+ |factor| 884 |eval| 889 |euclideanSize| 923 |elt| 928
+ |divide| 946 |differentiate| 952 |degree| 976 |content|
+ 988 |composite| 994 |coerce| 1006)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 196
- '(1 6 8 0 9 1 6 10 0 11 0 12 0 13 1 6
- 10 0 17 3 6 0 0 12 0 21 2 6 0 0 0 24
- 3 6 0 0 12 7 26 2 6 7 0 7 29 1 6 0 7
- 30 1 32 6 0 33 1 6 34 0 35 1 32 6 0
- 36 1 6 10 0 41 2 10 0 0 0 44 2 6 0 45
- 0 46 0 6 0 48 0 7 0 49 2 6 0 7 10 50
- 0 52 0 53 1 6 7 0 54 2 52 0 7 10 55 1
- 6 0 0 56 1 6 52 0 57 2 52 0 0 0 58 1
- 52 8 0 60 0 6 0 61 1 52 7 0 62 1 52
- 10 0 63 1 52 0 0 64 1 6 0 52 65 2 6 0
- 0 0 66 2 6 68 0 0 69 2 6 0 0 0 72 2
- 77 76 75 74 78 2 0 81 80 79 82 1 77
- 83 74 84 1 0 85 79 86 1 77 83 74 87 1
- 0 85 79 88 1 7 89 0 90 1 91 7 0 92 1
- 91 96 0 97 2 100 0 6 99 101 1 7 85 79
- 102 2 105 100 103 104 106 1 0 89 0
- 107 0 7 0 108 2 109 0 10 7 110 1 109
- 94 0 111 2 6 7 0 10 112 3 109 7 0 94
- 7 113 0 7 0 118 0 0 0 119 1 7 120 0
- 121 0 74 0 122 1 0 120 0 123 1 6 7 0
- 124 2 0 0 0 12 125 2 6 0 0 0 126 2 6
- 120 0 0 127 2 6 8 0 0 128 2 0 129 0 0
- 130 0 74 0 131 2 7 0 10 0 132 3 0 0 0
- 133 0 134 2 6 0 7 0 135 3 6 0 0 133 0
- 136 1 6 0 0 139 1 141 6 0 142 2 6 143
- 0 143 144 1 141 6 0 145 2 141 0 0 0
- 146 2 0 143 143 143 147 2 7 0 0 10
- 148 2 6 0 0 0 149 2 6 0 0 0 150 2 0 0
- 0 0 151 2 0 152 0 0 153 2 6 120 0 0
- 154 2 141 0 6 6 155 2 0 156 143 0 157
- 1 6 8 0 158 2 6 152 0 0 159 2 6 120 0
- 7 160 2 0 120 0 0 161 0 141 0 162 1
- 141 0 6 163 2 141 0 0 94 164 2 141 0
- 0 0 165 2 141 0 0 0 166 2 141 0 0 10
- 167 2 0 143 0 143 168 2 0 10 0 0 169
- 1 170 100 6 171 1 0 89 0 172 1 170 6
- 6 173 1 0 0 0 174 1 74 8 0 175 1 74 0
- 0 176 1 74 6 0 177 1 74 0 0 178 2 74
- 0 0 0 179 2 74 0 6 0 180 2 0 79 79 79
- 181 1 182 83 74 183 1 0 85 79 184 2 7
- 0 0 0 185 2 0 7 143 7 186 1 0 10 0
- 187 1 7 0 0 188 2 7 0 0 0 189 2 0 68
- 0 0 190 2 6 8 0 0 191 1 192 0 94 193
- 1 192 0 0 194 2 6 0 192 0 195 1 0 0 0
- 196 2 0 109 0 10 114 1 0 14 0 15 1 0
- 0 52 67 2 0 10 0 14 18 1 0 85 79 184
- 1 0 0 0 174 1 0 89 0 172 2 0 81 80 79
- 82 2 0 0 0 10 71 2 0 0 0 10 73 2 0
- 129 0 0 130 1 0 116 0 117 1 0 7 0 115
- 2 0 0 0 0 151 2 0 152 0 0 153 2 0 10
- 0 0 169 1 0 120 0 123 3 0 0 0 12 10
- 47 2 0 19 0 14 43 2 0 10 0 12 42 1 0
- 52 0 59 1 0 34 0 40 2 0 68 0 10 70 1
- 0 0 0 196 0 0 0 119 2 0 79 79 79 181
- 1 0 85 79 88 1 0 85 79 86 1 0 89 0
- 107 3 0 0 0 12 0 25 3 0 0 0 14 22 23
- 3 0 0 0 14 27 28 3 0 0 0 12 7 31 2 0
- 0 0 38 39 1 0 10 0 187 2 0 143 0 143
- 168 2 0 7 143 7 186 2 0 143 143 143
- 147 2 0 68 0 0 190 3 0 0 0 133 0 134
- 2 0 0 0 133 137 1 0 0 0 138 2 0 0 0
- 12 140 2 0 10 0 12 16 2 0 19 0 14 20
- 2 0 0 0 12 125 2 0 120 0 0 161 2 0
- 156 143 0 157 1 0 0 12 51)))))
+ (|makeByteWordVec2| 218
+ '(1 6 8 0 9 1 6 10 0 11 1 10 8 0 12 0
+ 13 0 14 1 15 8 0 18 0 10 0 19 1 6 10
+ 0 20 1 15 0 0 24 1 15 13 0 25 1 26 6
+ 0 27 3 6 0 0 13 0 28 2 6 0 0 0 31 1
+ 33 7 0 34 3 6 0 0 13 7 35 2 6 7 0 7
+ 37 1 6 0 7 38 1 41 8 0 42 1 41 0 0 43
+ 1 41 40 0 44 1 40 6 0 45 1 6 46 0 47
+ 1 40 6 0 48 1 6 10 0 53 2 10 0 0 0 56
+ 2 6 0 57 0 58 0 6 0 60 0 7 0 61 0 10
+ 0 62 2 6 0 7 10 63 0 65 0 66 1 6 7 0
+ 67 2 65 0 7 10 68 1 6 0 0 69 1 6 65 0
+ 70 2 65 0 0 0 71 1 65 8 0 73 0 6 0 74
+ 1 65 7 0 75 1 65 10 0 76 1 65 0 0 77
+ 1 6 0 65 78 2 6 0 0 0 79 2 6 81 0 0
+ 82 2 6 0 0 0 85 2 90 89 88 87 91 2 0
+ 94 93 92 95 1 90 96 87 97 1 0 98 92
+ 99 1 90 96 87 100 1 0 98 92 101 1 7
+ 102 0 103 1 104 7 0 105 1 104 109 0
+ 110 2 113 0 6 112 114 1 7 98 92 115 2
+ 118 113 116 117 119 1 0 102 0 120 0 7
+ 0 121 2 122 0 10 7 123 1 122 107 0
+ 124 1 122 107 0 125 2 107 0 0 0 126 2
+ 6 7 0 10 127 3 122 7 0 107 7 128 0 7
+ 0 133 0 0 0 134 1 7 135 0 136 0 87 0
+ 137 2 10 8 0 0 138 1 0 135 0 139 1 6
+ 7 0 140 2 0 0 0 13 141 2 6 0 0 0 142
+ 2 6 135 0 0 143 2 6 8 0 0 144 2 0 145
+ 0 0 146 0 87 0 147 0 107 0 148 2 7 0
+ 10 0 149 3 0 0 0 150 0 151 0 152 0
+ 153 2 6 0 7 0 154 3 6 0 0 150 0 155 1
+ 6 0 0 158 1 160 6 0 161 2 6 162 0 162
+ 163 1 160 6 0 164 2 160 0 0 0 165 2 0
+ 162 162 162 166 2 107 0 0 0 167 2 107
+ 8 0 0 168 2 7 0 0 10 169 2 6 0 0 0
+ 170 2 6 0 0 0 171 2 0 0 0 0 172 2 0
+ 173 0 0 174 2 6 135 0 0 175 2 160 0 6
+ 6 176 2 0 177 162 0 178 1 6 8 0 179 2
+ 6 173 0 0 180 2 6 135 0 7 181 2 0 135
+ 0 0 182 0 160 0 183 1 160 0 6 184 2
+ 160 0 0 107 185 2 160 0 0 0 186 2 160
+ 0 0 0 187 2 160 0 0 10 188 2 0 162 0
+ 162 189 2 0 10 0 0 190 1 191 113 6
+ 192 1 0 102 0 193 1 191 6 6 194 1 0 0
+ 0 195 1 87 8 0 196 1 87 0 0 197 1 87
+ 6 0 198 1 87 0 0 199 2 87 0 0 0 200 2
+ 87 0 6 0 201 2 0 92 92 92 202 1 203
+ 96 87 204 1 0 98 92 205 2 7 0 0 0 206
+ 2 0 7 162 7 207 1 0 10 0 208 1 7 0 0
+ 209 0 8 0 210 2 7 0 0 0 211 2 0 81 0
+ 0 212 2 6 8 0 0 213 1 214 0 107 215 1
+ 214 0 0 216 2 6 0 214 0 217 1 0 0 0
+ 218 2 0 122 0 10 129 1 0 15 0 16 1 0
+ 0 65 80 2 0 10 0 15 21 1 0 98 92 205
+ 1 0 0 0 195 1 0 102 0 193 2 0 94 93
+ 92 95 2 0 0 0 10 84 2 0 0 0 10 86 2 0
+ 145 0 0 146 1 0 131 0 132 1 0 7 0 130
+ 2 0 0 0 0 172 2 0 173 0 0 174 2 0 10
+ 0 0 190 1 0 135 0 139 3 0 0 0 13 10
+ 59 2 0 22 0 15 55 2 0 10 0 13 54 1 0
+ 65 0 72 1 0 46 0 52 2 0 81 0 10 83 1
+ 0 0 0 218 0 0 0 134 2 0 92 92 92 202
+ 1 0 98 92 101 1 0 98 92 99 1 0 102 0
+ 120 3 0 0 0 13 0 32 3 0 0 0 15 29 30
+ 3 0 0 0 15 33 36 3 0 0 0 13 7 39 2 0
+ 0 0 50 51 1 0 10 0 208 2 0 162 0 162
+ 189 2 0 7 162 7 207 2 0 162 162 162
+ 166 2 0 81 0 0 212 3 0 0 0 150 0 151
+ 2 0 0 0 150 156 1 0 0 0 157 2 0 0 0
+ 13 159 2 0 10 0 13 17 2 0 22 0 15 23
+ 2 0 0 0 13 141 2 0 135 0 0 182 2 0
+ 177 162 0 178 1 0 0 13 64)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/URAGG-.lsp b/src/algebra/strap/URAGG-.lsp
index 023dd8a0..50039169 100644
--- a/src/algebra/strap/URAGG-.lsp
+++ b/src/algebra/strap/URAGG-.lsp
@@ -134,7 +134,7 @@
(NOT (SPADCALL (|URAGG-;findCycle| |x| $) (|getShellEntry| $ 20))))))
(DEFUN |URAGG-;last;AS;7| (|x| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 22))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 23))
(|getShellEntry| $ 8)))
(DEFUN |URAGG-;nodes;AL;8| (|x| $)
@@ -235,7 +235,7 @@
(SEQ (COND
((EQL |k| 1000)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 33))
+ ((SPADCALL |x| (|getShellEntry| $ 49))
(EXIT (|error| "cyclic list"))))))
(EXIT (LETT |x|
(SPADCALL |x| (|getShellEntry| $ 14))
@@ -262,7 +262,7 @@
((EQL |k| 1000)
(COND
((SPADCALL |x|
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 49))
(EXIT (|error| "cyclic list"))))))
(EXIT (LETT |y|
(SPADCALL
@@ -286,7 +286,7 @@
(GO G191)))
(SEQ (COND
((SPADCALL |x| |y|
- (|getShellEntry| $ 36))
+ (|getShellEntry| $ 52))
(PROGN
(LETT #0# |x| |URAGG-;findCycle|)
(GO #0#))))
@@ -306,7 +306,7 @@
(GO #0#))))
(COND
((SPADCALL |x| |y|
- (|getShellEntry| $ 36))
+ (|getShellEntry| $ 52))
(PROGN
(LETT #0# |y| |URAGG-;findCycle|)
(GO #0#))))
@@ -324,7 +324,7 @@
(SEQ (COND
((SPADCALL
(LETT |y|
- (LETT |x| (SPADCALL |x| (|getShellEntry| $ 37))
+ (LETT |x| (SPADCALL |x| (|getShellEntry| $ 53))
|URAGG-;cycleTail;2A;18|)
|URAGG-;cycleTail;2A;18|)
(|getShellEntry| $ 20))
@@ -335,7 +335,7 @@
(SEQ G190
(COND
((NULL (NOT (SPADCALL |x| |z|
- (|getShellEntry| $ 36))))
+ (|getShellEntry| $ 52))))
(GO G191)))
(SEQ (LETT |y| |z| |URAGG-;cycleTail;2A;18|)
(EXIT (LETT |z|
@@ -361,7 +361,7 @@
(SEQ (LETT |l| 1 |URAGG-;cycleEntry;2A;19|) G190
(COND
((NULL (NOT (SPADCALL |y| |z|
- (|getShellEntry| $ 36))))
+ (|getShellEntry| $ 52))))
(GO G191)))
(SEQ (EXIT (LETT |z|
(SPADCALL |z|
@@ -383,7 +383,7 @@
(SEQ G190
(COND
((NULL (NOT (SPADCALL |x| |y|
- (|getShellEntry| $ 36))))
+ (|getShellEntry| $ 52))))
(GO G191)))
(SEQ (LETT |x|
(SPADCALL |x|
@@ -412,7 +412,7 @@
(SEQ (LETT |k| 1 |URAGG-;cycleLength;ANni;20|) G190
(COND
((NULL (NOT (SPADCALL |x| |y|
- (|getShellEntry| $ 36))))
+ (|getShellEntry| $ 52))))
(GO G191)))
(SEQ (EXIT (LETT |y|
(SPADCALL |y|
@@ -443,7 +443,7 @@
(DEFUN |URAGG-;last;ANniA;22| (|x| |n| $)
(PROG (|m| #0=#:G1499)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 42))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 59))
|URAGG-;last;ANniA;22|)
(EXIT (COND
((< |m| |n|) (|error| "index out of range"))
@@ -455,14 +455,14 @@
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 43))
- (|getShellEntry| $ 44)))))))))
+ (|getShellEntry| $ 61))
+ (|getShellEntry| $ 62)))))))))
(DEFUN |URAGG-;=;2AB;23| (|x| |y| $)
(PROG (|k| #0=#:G1509)
(RETURN
(SEQ (EXIT (COND
- ((SPADCALL |x| |y| (|getShellEntry| $ 36)) 'T)
+ ((SPADCALL |x| |y| (|getShellEntry| $ 52)) 'T)
('T
(SEQ (SEQ (LETT |k| 0 |URAGG-;=;2AB;23|) G190
(COND
@@ -479,7 +479,7 @@
((EQL |k| 1000)
(COND
((SPADCALL |x|
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 49))
(EXIT (|error| "cyclic list"))))))
(EXIT
(COND
@@ -488,7 +488,7 @@
(|getShellEntry| $ 8))
(SPADCALL |y|
(|getShellEntry| $ 8))
- (|getShellEntry| $ 46))
+ (|getShellEntry| $ 65))
(PROGN
(LETT #0# 'NIL
|URAGG-;=;2AB;23|)
@@ -523,7 +523,7 @@
(GO G191)))
(SEQ (EXIT (COND
((SPADCALL |u| |v|
- (|getShellEntry| $ 48))
+ (|getShellEntry| $ 67))
(PROGN
(LETT #0# 'T
|URAGG-;node?;2AB;24|)
@@ -534,7 +534,7 @@
((EQL |k| 1000)
(COND
((SPADCALL |v|
- (|getShellEntry| $ 33))
+ (|getShellEntry| $ 49))
(EXIT
(|error|
"cyclic list"))))))
@@ -546,39 +546,39 @@
(LETT |k| (QSADD1 |k|)
|URAGG-;node?;2AB;24|)
(GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |u| |v| (|getShellEntry| $ 48)))))
+ (EXIT (SPADCALL |u| |v| (|getShellEntry| $ 67)))))
#0# (EXIT #0#)))))
(DEFUN |URAGG-;setelt;Afirst2S;25| (|x| T3 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 50)))
+ (SPADCALL |x| |a| (|getShellEntry| $ 69)))
(DEFUN |URAGG-;setelt;Alast2S;26| (|x| T4 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 52)))
+ (SPADCALL |x| |a| (|getShellEntry| $ 71)))
(DEFUN |URAGG-;setelt;Arest2A;27| (|x| T5 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 54)))
+ (SPADCALL |x| |a| (|getShellEntry| $ 73)))
(DEFUN |URAGG-;concat;3A;28| (|x| |y| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 44)) |y|
- (|getShellEntry| $ 56)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 62)) |y|
+ (|getShellEntry| $ 75)))
(DEFUN |URAGG-;setlast!;A2S;29| (|x| |s| $)
(SEQ (COND
((SPADCALL |x| (|getShellEntry| $ 20))
(|error| "setlast: empty list"))
('T
- (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 22)) |s|
- (|getShellEntry| $ 50))
+ (SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 23)) |s|
+ (|getShellEntry| $ 69))
(EXIT |s|))))))
(DEFUN |URAGG-;setchildren!;ALA;30| (|u| |lv| $)
(COND
((EQL (LENGTH |lv|) 1)
- (SPADCALL |u| (|SPADfirst| |lv|) (|getShellEntry| $ 54)))
+ (SPADCALL |u| (|SPADfirst| |lv|) (|getShellEntry| $ 73)))
('T (|error| "wrong number of children specified"))))
(DEFUN |URAGG-;setvalue!;A2S;31| (|u| |s| $)
- (SPADCALL |u| |s| (|getShellEntry| $ 50)))
+ (SPADCALL |u| |s| (|getShellEntry| $ 69)))
(DEFUN |URAGG-;split!;AIA;32| (|p| |n| $)
(PROG (#0=#:G1525 |q|)
@@ -593,12 +593,12 @@
(|check-subtype|
(COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 43))
+ (|getShellEntry| $ 61))
|URAGG-;split!;AIA;32|)
(LETT |q| (SPADCALL |p| (|getShellEntry| $ 14))
|URAGG-;split!;AIA;32|)
- (SPADCALL |p| (SPADCALL (|getShellEntry| $ 61))
- (|getShellEntry| $ 54))
+ (SPADCALL |p| (SPADCALL (|getShellEntry| $ 82))
+ (|getShellEntry| $ 73))
(EXIT |q|))))))))
(DEFUN |URAGG-;cycleSplit!;2A;33| (|x| $)
@@ -606,10 +606,10 @@
(RETURN
(SEQ (COND
((OR (SPADCALL
- (LETT |y| (SPADCALL |x| (|getShellEntry| $ 37))
+ (LETT |y| (SPADCALL |x| (|getShellEntry| $ 53))
|URAGG-;cycleSplit!;2A;33|)
(|getShellEntry| $ 20))
- (SPADCALL |x| |y| (|getShellEntry| $ 36)))
+ (SPADCALL |x| |y| (|getShellEntry| $ 52)))
|y|)
('T
(SEQ (LETT |z| (SPADCALL |x| (|getShellEntry| $ 14))
@@ -617,7 +617,7 @@
(SEQ G190
(COND
((NULL (NOT (SPADCALL |z| |y|
- (|getShellEntry| $ 36))))
+ (|getShellEntry| $ 52))))
(GO G191)))
(SEQ (LETT |x| |z| |URAGG-;cycleSplit!;2A;33|)
(EXIT (LETT |z|
@@ -625,8 +625,8 @@
(|getShellEntry| $ 14))
|URAGG-;cycleSplit!;2A;33|)))
NIL (GO G190) G191 (EXIT NIL))
- (SPADCALL |x| (SPADCALL (|getShellEntry| $ 61))
- (|getShellEntry| $ 54))
+ (SPADCALL |x| (SPADCALL (|getShellEntry| $ 82))
+ (|getShellEntry| $ 73))
(EXIT |y|))))))))
(DEFUN |UnaryRecursiveAggregate&| (|#1| |#2|)
@@ -638,7 +638,7 @@
(LETT |dv$2| (|devaluate| |#2|) . #0#)
(LETT |dv$|
(LIST '|UnaryRecursiveAggregate&| |dv$1| |dv$2|) . #0#)
- (LETT $ (|newShell| 66) . #0#)
+ (LETT $ (|newShell| 86) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -649,41 +649,41 @@
(|setShellEntry| $ 7 |#2|)
(COND
((|HasAttribute| |#1| '|finiteAggregate|)
- (|setShellEntry| $ 45
+ (|setShellEntry| $ 63
(CONS (|dispatchFunction| |URAGG-;last;ANniA;22|) $))))
(COND
((|HasCategory| |#2| '(|SetCategory|))
(PROGN
- (|setShellEntry| $ 47
+ (|setShellEntry| $ 66
(CONS (|dispatchFunction| |URAGG-;=;2AB;23|) $))
- (|setShellEntry| $ 49
+ (|setShellEntry| $ 68
(CONS (|dispatchFunction| |URAGG-;node?;2AB;24|) $)))))
(COND
((|testBitVector| |pv$| 1)
(PROGN
- (|setShellEntry| $ 51
+ (|setShellEntry| $ 70
(CONS (|dispatchFunction| |URAGG-;setelt;Afirst2S;25|)
$))
- (|setShellEntry| $ 53
+ (|setShellEntry| $ 72
(CONS (|dispatchFunction| |URAGG-;setelt;Alast2S;26|)
$))
- (|setShellEntry| $ 55
+ (|setShellEntry| $ 74
(CONS (|dispatchFunction| |URAGG-;setelt;Arest2A;27|)
$))
- (|setShellEntry| $ 57
+ (|setShellEntry| $ 76
(CONS (|dispatchFunction| |URAGG-;concat;3A;28|) $))
- (|setShellEntry| $ 58
+ (|setShellEntry| $ 77
(CONS (|dispatchFunction| |URAGG-;setlast!;A2S;29|) $))
- (|setShellEntry| $ 59
+ (|setShellEntry| $ 80
(CONS (|dispatchFunction|
|URAGG-;setchildren!;ALA;30|)
$))
- (|setShellEntry| $ 60
+ (|setShellEntry| $ 81
(CONS (|dispatchFunction| |URAGG-;setvalue!;A2S;31|)
$))
- (|setShellEntry| $ 63
+ (|setShellEntry| $ 83
(CONS (|dispatchFunction| |URAGG-;split!;AIA;32|) $))
- (|setShellEntry| $ 64
+ (|setShellEntry| $ 84
(CONS (|dispatchFunction| |URAGG-;cycleSplit!;2A;33|)
$)))))
$))))
@@ -694,54 +694,66 @@
'"last" |URAGG-;elt;AlastS;2| (10 . |rest|) '"rest"
|URAGG-;elt;ArestA;3| |URAGG-;second;AS;4|
|URAGG-;third;AS;5| (|Boolean|) (15 . |empty?|)
- |URAGG-;cyclic?;AB;6| (20 . |tail|) |URAGG-;last;AS;7|
- (|List| $) |URAGG-;nodes;AL;8| |URAGG-;children;AL;9|
+ (20 . |false|) |URAGG-;cyclic?;AB;6| (24 . |tail|)
+ |URAGG-;last;AS;7| (|List| 6) (29 . |empty|)
+ (33 . |concat|) (39 . |reverse!|) (|List| $)
+ |URAGG-;nodes;AL;8| |URAGG-;children;AL;9|
|URAGG-;leaf?;AB;10| |URAGG-;value;AS;11|
- (|NonNegativeInteger|) |URAGG-;less?;ANniB;12|
+ (|NonNegativeInteger|) (44 . |Zero|) (|Integer|)
+ (48 . |Zero|) (52 . <) (58 . |One|) (62 . |One|) (66 . -)
+ |URAGG-;less?;ANniB;12| (72 . |zero?|)
|URAGG-;more?;ANniB;13| |URAGG-;size?;ANniB;14|
- (25 . |cyclic?|) |URAGG-;#;ANni;15| |URAGG-;tail;2A;16|
- (30 . |eq?|) (36 . |cycleEntry|) |URAGG-;cycleTail;2A;18|
+ (|SingleInteger|) (77 . |Zero|) (81 . =) (87 . |cyclic?|)
+ |URAGG-;#;ANni;15| |URAGG-;tail;2A;16| (92 . |eq?|)
+ (98 . |cycleEntry|) |URAGG-;cycleTail;2A;18| (103 . |One|)
|URAGG-;cycleEntry;2A;19| |URAGG-;cycleLength;ANni;20|
- |URAGG-;rest;ANniA;21| (41 . |#|) (46 . |rest|)
- (52 . |copy|) (57 . |last|) (63 . ~=) (69 . =) (75 . =)
- (81 . |node?|) (87 . |setfirst!|) (93 . |setelt|)
- (100 . |setlast!|) (106 . |setelt|) (113 . |setrest!|)
- (119 . |setelt|) (126 . |concat!|) (132 . |concat|)
- (138 . |setlast!|) (144 . |setchildren!|)
- (150 . |setvalue!|) (156 . |empty|) (|Integer|)
- (160 . |split!|) (166 . |cycleSplit!|) '"value")
- '#(|value| 171 |third| 176 |tail| 181 |split!| 186 |size?|
- 192 |setvalue!| 198 |setlast!| 204 |setelt| 210
- |setchildren!| 231 |second| 237 |rest| 242 |nodes| 248
- |node?| 253 |more?| 259 |less?| 265 |leaf?| 271 |last| 276
- |elt| 287 |cyclic?| 305 |cycleTail| 310 |cycleSplit!| 315
- |cycleLength| 320 |cycleEntry| 325 |concat| 330 |children|
- 336 = 341 |#| 347)
+ |URAGG-;rest;ANniA;21| (107 . |#|) (112 . <)
+ (118 . |rest|) (124 . |copy|) (129 . |last|)
+ (135 . |true|) (139 . ~=) (145 . =) (151 . =)
+ (157 . |node?|) (163 . |setfirst!|) (169 . |setelt|)
+ (176 . |setlast!|) (182 . |setelt|) (189 . |setrest!|)
+ (195 . |setelt|) (202 . |concat!|) (208 . |concat|)
+ (214 . |setlast!|) (220 . |#|) (225 . |first|)
+ (230 . |setchildren!|) (236 . |setvalue!|) (242 . |empty|)
+ (246 . |split!|) (252 . |cycleSplit!|) '"value")
+ '#(|value| 257 |third| 262 |tail| 267 |split!| 272 |size?|
+ 278 |setvalue!| 284 |setlast!| 290 |setelt| 296
+ |setchildren!| 317 |second| 323 |rest| 328 |nodes| 334
+ |node?| 339 |more?| 345 |less?| 351 |leaf?| 357 |last| 362
+ |elt| 373 |cyclic?| 391 |cycleTail| 396 |cycleSplit!| 401
+ |cycleLength| 406 |cycleEntry| 411 |concat| 416 |children|
+ 422 = 427 |#| 433)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 64
+ (|makeByteWordVec2| 84
'(1 6 7 0 8 1 6 7 0 11 1 6 0 0 14 1 6
- 19 0 20 1 6 0 0 22 1 6 19 0 33 2 6 19
- 0 0 36 1 6 0 0 37 1 6 29 0 42 2 6 0 0
- 29 43 1 6 0 0 44 2 0 0 0 29 45 2 7 19
- 0 0 46 2 0 19 0 0 47 2 6 19 0 0 48 2
- 0 19 0 0 49 2 6 7 0 7 50 3 0 7 0 9 7
- 51 2 6 7 0 7 52 3 0 7 0 12 7 53 2 6 0
- 0 0 54 3 0 0 0 15 0 55 2 6 0 0 0 56 2
- 0 0 0 0 57 2 0 7 0 7 58 2 0 0 0 24 59
- 2 0 7 0 7 60 0 6 0 61 2 0 0 0 62 63 1
- 0 0 0 64 1 0 7 0 28 1 0 7 0 18 1 0 0
- 0 35 2 0 0 0 62 63 2 0 19 0 29 32 2 0
- 7 0 7 60 2 0 7 0 7 58 3 0 7 0 12 7 53
- 3 0 0 0 15 0 55 3 0 7 0 9 7 51 2 0 0
- 0 24 59 1 0 7 0 17 2 0 0 0 29 41 1 0
- 24 0 25 2 0 19 0 0 49 2 0 19 0 29 31
- 2 0 19 0 29 30 1 0 19 0 27 2 0 0 0 29
- 45 1 0 7 0 23 2 0 7 0 12 13 2 0 0 0
- 15 16 2 0 7 0 9 10 1 0 19 0 21 1 0 0
- 0 38 1 0 0 0 64 1 0 29 0 40 1 0 0 0
- 39 2 0 0 0 0 57 1 0 24 0 26 2 0 19 0
- 0 47 1 0 29 0 34)))))
+ 19 0 20 0 19 0 21 1 6 0 0 23 0 25 0
+ 26 2 25 0 6 0 27 1 25 0 0 28 0 34 0
+ 35 0 36 0 37 2 36 19 0 0 38 0 34 0 39
+ 0 36 0 40 2 36 0 0 0 41 1 36 19 0 43
+ 0 46 0 47 2 34 19 0 0 48 1 6 19 0 49
+ 2 6 19 0 0 52 1 6 0 0 53 0 46 0 55 1
+ 6 34 0 59 2 34 19 0 0 60 2 6 0 0 34
+ 61 1 6 0 0 62 2 0 0 0 34 63 0 19 0 64
+ 2 7 19 0 0 65 2 0 19 0 0 66 2 6 19 0
+ 0 67 2 0 19 0 0 68 2 6 7 0 7 69 3 0 7
+ 0 9 7 70 2 6 7 0 7 71 3 0 7 0 12 7 72
+ 2 6 0 0 0 73 3 0 0 0 15 0 74 2 6 0 0
+ 0 75 2 0 0 0 0 76 2 0 7 0 7 77 1 25
+ 34 0 78 1 25 6 0 79 2 0 0 0 29 80 2 0
+ 7 0 7 81 0 6 0 82 2 0 0 0 36 83 1 0 0
+ 0 84 1 0 7 0 33 1 0 7 0 18 1 0 0 0 51
+ 2 0 0 0 36 83 2 0 19 0 34 45 2 0 7 0
+ 7 81 2 0 7 0 7 77 3 0 7 0 12 7 72 3 0
+ 0 0 15 0 74 3 0 7 0 9 7 70 2 0 0 0 29
+ 80 1 0 7 0 17 2 0 0 0 34 58 1 0 29 0
+ 30 2 0 19 0 0 68 2 0 19 0 34 44 2 0
+ 19 0 34 42 1 0 19 0 32 2 0 0 0 34 63
+ 1 0 7 0 24 2 0 7 0 12 13 2 0 0 0 15
+ 16 2 0 7 0 9 10 1 0 19 0 22 1 0 0 0
+ 54 1 0 0 0 84 1 0 34 0 57 1 0 0 0 56
+ 2 0 0 0 0 76 1 0 29 0 31 2 0 19 0 0
+ 66 1 0 34 0 50)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/VECTOR.lsp b/src/algebra/strap/VECTOR.lsp
index f7ad2d7f..50609410 100644
--- a/src/algebra/strap/VECTOR.lsp
+++ b/src/algebra/strap/VECTOR.lsp
@@ -8,14 +8,14 @@
|VECTOR;convert;$If;2|))
(DEFUN |VECTOR;vector;L$;1| (|l| $)
- (SPADCALL |l| (|getShellEntry| $ 8)))
+ (SPADCALL |l| (|getShellEntry| $ 10)))
(DEFUN |VECTOR;convert;$If;2| (|x| $)
(SPADCALL
- (LIST (SPADCALL '|vector| (|getShellEntry| $ 12))
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 13))
- (|getShellEntry| $ 14)))
- (|getShellEntry| $ 16)))
+ (LIST (SPADCALL '|vector| (|getShellEntry| $ 14))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 15))
+ (|getShellEntry| $ 16)))
+ (|getShellEntry| $ 18)))
(DEFUN |Vector| (#0=#:G1408)
(PROG ()
@@ -40,7 +40,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|Vector|))
(LETT |dv$| (LIST '|Vector| |dv$1|) . #0#)
- (LETT $ (|newShell| 35) . #0#)
+ (LETT $ (|newShell| 36) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -89,23 +89,23 @@
(|setShellEntry| $ 6 |#1|)
(COND
((|testBitVector| |pv$| 3)
- (|setShellEntry| $ 17
+ (|setShellEntry| $ 19
(CONS (|dispatchFunction| |VECTOR;convert;$If;2|) $))))
$))))
(MAKEPROP '|Vector| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL (|IndexedVector| 6 (NRTEVAL 1))
- (|local| |#1|) (|List| 6) (0 . |construct|)
- |VECTOR;vector;L$;1| (|Symbol|) (|InputForm|)
- (5 . |convert|) (10 . |parts|) (15 . |convert|) (|List| $)
- (20 . |convert|) (25 . |convert|) (|Mapping| 6 6 6)
- (|Boolean|) (|NonNegativeInteger|) (|Equation| 6)
- (|List| 21) (|Integer|) (|Mapping| 19 6)
- (|Mapping| 19 6 6) (|UniversalSegment| 23) (|Void|)
- (|Mapping| 6 6) (|OutputForm|) (|Matrix| 6)
+ (|local| |#1|) (|Integer|) (0 . |One|) (|List| 6)
+ (4 . |construct|) |VECTOR;vector;L$;1| (|Symbol|)
+ (|InputForm|) (9 . |convert|) (14 . |parts|)
+ (19 . |convert|) (|List| $) (24 . |convert|)
+ (29 . |convert|) (|Mapping| 6 6 6) (|Boolean|)
+ (|NonNegativeInteger|) (|Equation| 6) (|List| 23)
+ (|Mapping| 21 6) (|Mapping| 21 6 6) (|UniversalSegment| 7)
+ (|Void|) (|Mapping| 6 6) (|OutputForm|) (|Matrix| 6)
(|SingleInteger|) (|String|) (|Union| 6 '"failed")
- (|List| 23))
- '#(|vector| 30 |parts| 35 |convert| 40 |construct| 45)
+ (|List| 7))
+ '#(|vector| 34 |parts| 39 |convert| 44 |construct| 49)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
(CONS (|makeByteWordVec2| 5
'(0 0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4))
@@ -121,18 +121,17 @@
(|OneDimensionalArrayAggregate| 6)
(|FiniteLinearAggregate| 6)
(|LinearAggregate| 6)
- (|IndexedAggregate| 23 6)
+ (|IndexedAggregate| 7 6)
(|Collection| 6)
(|HomogeneousAggregate| 6)
(|OrderedSet|) (|Aggregate|)
- (|EltableAggregate| 23 6) (|Evalable| 6)
- (|SetCategory|) (|Type|)
- (|Eltable| 23 6) (|InnerEvalable| 6 6)
- (|CoercibleTo| 29) (|ConvertibleTo| 11)
- (|BasicType|))
- (|makeByteWordVec2| 17
- '(1 0 0 7 8 1 11 0 10 12 1 0 7 0 13 1 7
- 11 0 14 1 11 0 15 16 1 0 11 0 17 1 0
- 0 7 9 1 0 7 0 13 1 3 11 0 17 1 0 0 7
- 8)))))
+ (|EltableAggregate| 7 6) (|Evalable| 6)
+ (|SetCategory|) (|Type|) (|Eltable| 7 6)
+ (|InnerEvalable| 6 6) (|CoercibleTo| 30)
+ (|ConvertibleTo| 13) (|BasicType|))
+ (|makeByteWordVec2| 19
+ '(0 7 0 8 1 0 0 9 10 1 13 0 12 14 1 0 9
+ 0 15 1 9 13 0 16 1 13 0 17 18 1 0 13
+ 0 19 1 0 0 9 11 1 0 9 0 15 1 3 13 0
+ 19 1 0 0 9 10)))))
'|lookupIncomplete|))