aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/strap
diff options
context:
space:
mode:
Diffstat (limited to 'src/algebra/strap')
-rw-r--r--src/algebra/strap/EUCDOM-.lsp7
-rw-r--r--src/algebra/strap/GCDDOM-.lsp5
-rw-r--r--src/algebra/strap/ILIST.lsp2
-rw-r--r--src/algebra/strap/INT.lsp2
-rw-r--r--src/algebra/strap/LIST.lsp2
-rw-r--r--src/algebra/strap/LSAGG-.lsp6
-rw-r--r--src/algebra/strap/OUTFORM.lsp165
-rw-r--r--src/algebra/strap/SINT.lsp2
-rw-r--r--src/algebra/strap/URAGG-.lsp8
9 files changed, 88 insertions, 111 deletions
diff --git a/src/algebra/strap/EUCDOM-.lsp b/src/algebra/strap/EUCDOM-.lsp
index 33f3078c..2e47e3d4 100644
--- a/src/algebra/strap/EUCDOM-.lsp
+++ b/src/algebra/strap/EUCDOM-.lsp
@@ -92,7 +92,7 @@
|c|)))))))
(DEFUN |EUCDOM-;extendedEuclidean;2SR;7| (|x| |y| $)
- (PROG (|s3| |qr|)
+ (PROG (|qr| |s3|)
(RETURN
(LET ((|s1| (|EUCDOM-;unitNormalizeIdealElt|
(VECTOR (|spadConstant| $ 30)
@@ -139,10 +139,9 @@
(COND
((NOT (SPADCALL (SVREF |s1| 0) |y|
(|getShellEntry| $ 32)))
- (SEQ (LETT |qr|
+ (SEQ (SETQ |qr|
(SPADCALL (SVREF |s1| 0) |y|
- (|getShellEntry| $ 16))
- |EUCDOM-;extendedEuclidean;2SR;7|)
+ (|getShellEntry| $ 16)))
(SETF (SVREF |s1| 0) (CDR |qr|))
(SETF (SVREF |s1| 1)
(SPADCALL (SVREF |s1| 1)
diff --git a/src/algebra/strap/GCDDOM-.lsp b/src/algebra/strap/GCDDOM-.lsp
index a2e1e688..da18be94 100644
--- a/src/algebra/strap/GCDDOM-.lsp
+++ b/src/algebra/strap/GCDDOM-.lsp
@@ -35,7 +35,7 @@
(|getShellEntry| $ 19)))
(DEFUN |GCDDOM-;gcdPolynomial;3Sup;4| (|p1| |p2| $)
- (PROG (|e2| |e1| |p|)
+ (PROG (|e1| |e2| |p|)
(RETURN
(COND
((SPADCALL |p1| (|getShellEntry| $ 24))
@@ -99,8 +99,7 @@
(SVREF $ 6))
#0#)
(CDR #0#)))))))
- (LETT |e1| (MIN |e1| |e2|)
- |GCDDOM-;gcdPolynomial;3Sup;4|)
+ (SETQ |e1| (MIN |e1| |e2|))
(SETQ |c1|
(SPADCALL |c1| |c2| (|getShellEntry| $ 10)))
(SETQ |p1|
diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp
index 16862cb2..ccff6c9a 100644
--- a/src/algebra/strap/ILIST.lsp
+++ b/src/algebra/strap/ILIST.lsp
@@ -9,7 +9,7 @@
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%List| |%Shell|) |%List|)
|ILIST;concat;S2$;2|))
-(PUT '|ILIST;concat;S2$;2| '|SPADreplace| '|%makepair|)
+(PUT '|ILIST;concat;S2$;2| '|SPADreplace| '|%pair|)
(DECLAIM (FTYPE (FUNCTION (|%List| |%List| |%Shell|) |%Boolean|)
|ILIST;eq?;2$B;3|))
diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp
index eac82f8a..b1b53d3e 100644
--- a/src/algebra/strap/INT.lsp
+++ b/src/algebra/strap/INT.lsp
@@ -115,7 +115,7 @@
|INT;reducedSystem;MVR;30|))
(PUT '|INT;reducedSystem;MVR;30| '|SPADreplace|
- '(XLAM (|m| |v|) (|%makepair| |m| '|vec|)))
+ '(XLAM (|m| |v|) (|%pair| |m| '|vec|)))
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Integer|)
|INT;abs;2$;31|))
diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp
index ddf8b5f5..ff8f2e2d 100644
--- a/src/algebra/strap/LIST.lsp
+++ b/src/algebra/strap/LIST.lsp
@@ -14,7 +14,7 @@
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%List| |%Shell|) |%List|)
|LIST;cons;S2$;3|))
-(PUT '|LIST;cons;S2$;3| '|SPADreplace| '|%makepair|)
+(PUT '|LIST;cons;S2$;3| '|SPADreplace| '|%pair|)
(DECLAIM (FTYPE (FUNCTION (|%List| |%List| |%Shell|) |%List|)
|LIST;append;3$;4|))
diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp
index 97fd89c1..0fdf21f2 100644
--- a/src/algebra/strap/LSAGG-.lsp
+++ b/src/algebra/strap/LSAGG-.lsp
@@ -494,7 +494,7 @@
(EXIT (SPADCALL |z| (|getShellEntry| $ 55))))))
(DEFUN |LSAGG-;reverse!;2A;20| (|x| $)
- (PROG (|z| |y|)
+ (PROG (|y| |z|)
(RETURN
(COND
((OR (SPADCALL |x| (|getShellEntry| $ 16))
@@ -513,9 +513,7 @@
(SPADCALL |y| (|getShellEntry| $ 17))
|LSAGG-;reverse!;2A;20|)
(SPADCALL |y| |x| (|getShellEntry| $ 27))
- (SETQ |x| |y|)
- (EXIT (LETT |y| |z|
- |LSAGG-;reverse!;2A;20|))))))
+ (SETQ |x| |y|) (EXIT (SETQ |y| |z|))))))
(EXIT |x|)))))))
(DEFUN |LSAGG-;copy;2A;21| (|x| $)
diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp
index 48fa6b0d..01476bd3 100644
--- a/src/algebra/strap/OUTFORM.lsp
+++ b/src/algebra/strap/OUTFORM.lsp
@@ -43,7 +43,7 @@
|OUTFORM;=;3$;10|))
(PUT '|OUTFORM;=;3$;10| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '= |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '= |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Thing|)
|OUTFORM;coerce;2$;11|))
@@ -131,19 +131,19 @@
|OUTFORM;pile;L$;32|))
(PUT '|OUTFORM;pile;L$;32| '|SPADreplace|
- '(XLAM (|l|) (|%makepair| 'SC |l|)))
+ '(XLAM (|l|) (|%pair| 'SC |l|)))
(DECLAIM (FTYPE (FUNCTION (|%List| |%Shell|) |%Thing|)
|OUTFORM;commaSeparate;L$;33|))
(PUT '|OUTFORM;commaSeparate;L$;33| '|SPADreplace|
- '(XLAM (|l|) (|%makepair| 'AGGLST |l|)))
+ '(XLAM (|l|) (|%pair| 'AGGLST |l|)))
(DECLAIM (FTYPE (FUNCTION (|%List| |%Shell|) |%Thing|)
|OUTFORM;semicolonSeparate;L$;34|))
(PUT '|OUTFORM;semicolonSeparate;L$;34| '|SPADreplace|
- '(XLAM (|l|) (|%makepair| 'AGGSET |l|)))
+ '(XLAM (|l|) (|%pair| 'AGGSET |l|)))
(DECLAIM (FTYPE (FUNCTION (|%List| |%Shell|) |%Thing|)
|OUTFORM;blankSeparate;L$;35|))
@@ -152,7 +152,7 @@
|OUTFORM;brace;2$;36|))
(PUT '|OUTFORM;brace;2$;36| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| 'BRACE |a|)))
+ '(XLAM (|a|) (|%list| 'BRACE |a|)))
(DECLAIM (FTYPE (FUNCTION (|%List| |%Shell|) |%Thing|)
|OUTFORM;brace;L$;37|))
@@ -161,7 +161,7 @@
|OUTFORM;bracket;2$;38|))
(PUT '|OUTFORM;bracket;2$;38| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| 'BRACKET |a|)))
+ '(XLAM (|a|) (|%list| 'BRACKET |a|)))
(DECLAIM (FTYPE (FUNCTION (|%List| |%Shell|) |%Thing|)
|OUTFORM;bracket;L$;39|))
@@ -170,7 +170,7 @@
|OUTFORM;paren;2$;40|))
(PUT '|OUTFORM;paren;2$;40| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| 'PAREN |a|)))
+ '(XLAM (|a|) (|%list| 'PAREN |a|)))
(DECLAIM (FTYPE (FUNCTION (|%List| |%Shell|) |%Thing|)
|OUTFORM;paren;L$;41|))
@@ -179,25 +179,25 @@
|OUTFORM;sub;3$;42|))
(PUT '|OUTFORM;sub;3$;42| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'SUB |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| 'SUB |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;super;3$;43|))
(PUT '|OUTFORM;super;3$;43| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'SUPERSUB |a| " " |b|)))
+ '(XLAM (|a| |b|) (|%list| 'SUPERSUB |a| " " |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;presub;3$;44|))
(PUT '|OUTFORM;presub;3$;44| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'SUPERSUB |a| " " " " " " |b|)))
+ '(XLAM (|a| |b|) (|%list| 'SUPERSUB |a| " " " " " " |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;presuper;3$;45|))
(PUT '|OUTFORM;presuper;3$;45| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'SUPERSUB |a| " " " " |b|)))
+ '(XLAM (|a| |b|) (|%list| 'SUPERSUB |a| " " " " |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%List| |%Shell|) |%Thing|)
|OUTFORM;scripts;$L$;46|))
@@ -209,164 +209,160 @@
|OUTFORM;hconcat;3$;48|))
(PUT '|OUTFORM;hconcat;3$;48| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'CONCAT |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| 'CONCAT |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%List| |%Shell|) |%Thing|)
|OUTFORM;hconcat;L$;49|))
(PUT '|OUTFORM;hconcat;L$;49| '|SPADreplace|
- '(XLAM (|l|) (|%makepair| 'CONCAT |l|)))
+ '(XLAM (|l|) (|%pair| 'CONCAT |l|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;vconcat;3$;50|))
(PUT '|OUTFORM;vconcat;3$;50| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'VCONCAT |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| 'VCONCAT |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%List| |%Shell|) |%Thing|)
|OUTFORM;vconcat;L$;51|))
(PUT '|OUTFORM;vconcat;L$;51| '|SPADreplace|
- '(XLAM (|l|) (|%makepair| 'VCONCAT |l|)))
+ '(XLAM (|l|) (|%pair| 'VCONCAT |l|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;~=;3$;52|))
(PUT '|OUTFORM;~=;3$;52| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '~= |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '~= |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;<;3$;53|))
(PUT '|OUTFORM;<;3$;53| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '< |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '< |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;>;3$;54|))
(PUT '|OUTFORM;>;3$;54| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '> |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '> |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;<=;3$;55|))
(PUT '|OUTFORM;<=;3$;55| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '<= |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '<= |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;>=;3$;56|))
(PUT '|OUTFORM;>=;3$;56| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '>= |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '>= |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;+;3$;57|))
(PUT '|OUTFORM;+;3$;57| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '+ |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '+ |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;-;3$;58|))
(PUT '|OUTFORM;-;3$;58| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '- |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '- |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Thing|)
|OUTFORM;-;2$;59|))
-(PUT '|OUTFORM;-;2$;59| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| '- |a|)))
+(PUT '|OUTFORM;-;2$;59| '|SPADreplace| '(XLAM (|a|) (|%list| '- |a|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;*;3$;60|))
(PUT '|OUTFORM;*;3$;60| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '* |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '* |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;/;3$;61|))
(PUT '|OUTFORM;/;3$;61| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '/ |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '/ |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;**;3$;62|))
(PUT '|OUTFORM;**;3$;62| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '** |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '** |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;div;3$;63|))
(PUT '|OUTFORM;div;3$;63| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '|div| |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '|div| |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;rem;3$;64|))
(PUT '|OUTFORM;rem;3$;64| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '|rem| |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '|rem| |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;quo;3$;65|))
(PUT '|OUTFORM;quo;3$;65| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '|quo| |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '|quo| |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;exquo;3$;66|))
(PUT '|OUTFORM;exquo;3$;66| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '|exquo| |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '|exquo| |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;and;3$;67|))
(PUT '|OUTFORM;and;3$;67| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '|and| |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '|and| |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;or;3$;68|))
(PUT '|OUTFORM;or;3$;68| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '|or| |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '|or| |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Thing|)
|OUTFORM;not;2$;69|))
(PUT '|OUTFORM;not;2$;69| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| '|not| |a|)))
+ '(XLAM (|a|) (|%list| '|not| |a|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;SEGMENT;3$;70|))
(PUT '|OUTFORM;SEGMENT;3$;70| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'SEGMENT |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| 'SEGMENT |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Thing|)
|OUTFORM;SEGMENT;2$;71|))
(PUT '|OUTFORM;SEGMENT;2$;71| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| 'SEGMENT |a|)))
+ '(XLAM (|a|) (|%list| 'SEGMENT |a|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;binomial;3$;72|))
(PUT '|OUTFORM;binomial;3$;72| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'BINOMIAL |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| 'BINOMIAL |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Thing|) |OUTFORM;empty;$;73|))
-(PUT '|OUTFORM;empty;$;73| '|SPADreplace|
- '(XLAM NIL (|%listlit| 'NOTHING)))
-
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Boolean|)
|OUTFORM;infix?;$B;74|))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%List| |%Shell|) |%Thing|)
|OUTFORM;elt;$L$;75|))
-(PUT '|OUTFORM;elt;$L$;75| '|SPADreplace| '|%makepair|)
+(PUT '|OUTFORM;elt;$L$;75| '|SPADreplace| '|%pair|)
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%List| |%Shell|) |%Thing|)
|OUTFORM;prefix;$L$;76|))
@@ -385,19 +381,19 @@
|OUTFORM;string;2$;80|))
(PUT '|OUTFORM;string;2$;80| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| 'STRING |a|)))
+ '(XLAM (|a|) (|%list| 'STRING |a|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Thing|)
|OUTFORM;quote;2$;81|))
(PUT '|OUTFORM;quote;2$;81| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| 'QUOTE |a|)))
+ '(XLAM (|a|) (|%list| 'QUOTE |a|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Thing|)
|OUTFORM;overbar;2$;82|))
(PUT '|OUTFORM;overbar;2$;82| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| 'OVERBAR |a|)))
+ '(XLAM (|a|) (|%list| 'OVERBAR |a|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Thing|)
|OUTFORM;dot;2$;83|))
@@ -417,61 +413,61 @@
|OUTFORM;overlabel;3$;87|))
(PUT '|OUTFORM;overlabel;3$;87| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'OVERLABEL |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| 'OVERLABEL |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Thing|)
|OUTFORM;box;2$;88|))
(PUT '|OUTFORM;box;2$;88| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| 'BOX |a|)))
+ '(XLAM (|a|) (|%list| 'BOX |a|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;zag;3$;89|))
(PUT '|OUTFORM;zag;3$;89| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'ZAG |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| 'ZAG |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Thing|)
|OUTFORM;root;2$;90|))
(PUT '|OUTFORM;root;2$;90| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| 'ROOT |a|)))
+ '(XLAM (|a|) (|%list| 'ROOT |a|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;root;3$;91|))
(PUT '|OUTFORM;root;3$;91| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'ROOT |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| 'ROOT |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;over;3$;92|))
(PUT '|OUTFORM;over;3$;92| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'OVER |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| 'OVER |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;slash;3$;93|))
(PUT '|OUTFORM;slash;3$;93| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'SLASH |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| 'SLASH |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;assign;3$;94|))
(PUT '|OUTFORM;assign;3$;94| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| '%LET |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| '%LET |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;label;3$;95|))
(PUT '|OUTFORM;label;3$;95| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'EQUATNUM |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| 'EQUATNUM |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;rarrow;3$;96|))
(PUT '|OUTFORM;rarrow;3$;96| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'RARROW |a| |b|)))
+ '(XLAM (|a| |b|) (|%list| 'RARROW |a| |b|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| (|%IntegerSection| 0) |%Shell|)
|%Thing|)
@@ -484,14 +480,14 @@
|OUTFORM;sum;3$;99|))
(PUT '|OUTFORM;sum;3$;99| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'SIGMA |b| |a|)))
+ '(XLAM (|a| |b|) (|%list| 'SIGMA |b| |a|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Thing| |%Shell|)
|%Thing|)
|OUTFORM;sum;4$;100|))
(PUT '|OUTFORM;sum;4$;100| '|SPADreplace|
- '(XLAM (|a| |b| |c|) (|%listlit| 'SIGMA2 |b| |c| |a|)))
+ '(XLAM (|a| |b| |c|) (|%list| 'SIGMA2 |b| |c| |a|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Thing|)
|OUTFORM;prod;2$;101|))
@@ -500,14 +496,14 @@
|OUTFORM;prod;3$;102|))
(PUT '|OUTFORM;prod;3$;102| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'PI |b| |a|)))
+ '(XLAM (|a| |b|) (|%list| 'PI |b| |a|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Thing| |%Shell|)
|%Thing|)
|OUTFORM;prod;4$;103|))
(PUT '|OUTFORM;prod;4$;103| '|SPADreplace|
- '(XLAM (|a| |b| |c|) (|%listlit| 'PI2 |b| |c| |a|)))
+ '(XLAM (|a| |b| |c|) (|%list| 'PI2 |b| |c| |a|)))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Thing|)
|OUTFORM;int;2$;104|))
@@ -520,30 +516,16 @@
|OUTFORM;int;4$;106|))
(PUT '|OUTFORM;int;4$;106| '|SPADreplace|
- '(XLAM (|a| |b| |c|) (|%listlit| 'INTSIGN |b| |c| |a|)))
+ '(XLAM (|a| |b| |c|) (|%list| 'INTSIGN |b| |c| |a|)))
(PUT '|OUTFORM;postfix;3$;79| '|SPADreplace|
- '(XLAM (|a| |b|) (|%listlit| 'CONCAT |b| |a|)))
+ '(XLAM (|a| |b|) (|%list| 'CONCAT |b| |a|)))
(PUT '|OUTFORM;dot;2$;83| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| 'SUPERSUB |a| " " '|.|)))
+ '(XLAM (|a|) (|%list| 'SUPERSUB |a| " " '|.|)))
(PUT '|OUTFORM;prime;2$;84| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| 'SUPERSUB |a| " " '|,|)))
-
-(PUT '|OUTFORM;sum;2$;98| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| 'SIGMA (|%listlit| 'NOTHING) |a|)))
-
-(PUT '|OUTFORM;prod;2$;101| '|SPADreplace|
- '(XLAM (|a|) (|%listlit| 'PI (|%listlit| 'NOTHING) |a|)))
-
-(PUT '|OUTFORM;int;2$;104| '|SPADreplace|
- '(XLAM (|a|)
- (|%listlit| 'INTSIGN #0=(|%listlit| 'NOTHING) #0# |a|)))
-
-(PUT '|OUTFORM;int;3$;105| '|SPADreplace|
- '(XLAM (|a| |b|)
- (|%listlit| 'INTSIGN |b| (|%listlit| 'NOTHING) |a|)))
+ '(XLAM (|a|) (|%list| 'SUPERSUB |a| " " '|,|)))
(DEFUN |OUTFORM;doubleFloatFormat;2S;1| (|s| $)
(LET ((|ss| (SVREF $ 6)))
@@ -562,7 +544,7 @@
(|mathprint| |x|))
(DEFUN |OUTFORM;message;S$;7| (|s| $)
- (COND ((ZEROP (LENGTH |s|)) '(NOTHING)) (T |s|)))
+ (COND ((ZEROP (LENGTH |s|)) (|OUTFORM;empty;$;73| $)) (T |s|)))
(DEFUN |OUTFORM;messagePrint;SV;8| (|s| $)
(|mathprint| (|OUTFORM;message;S$;7| |s| $)))
@@ -637,15 +619,18 @@
((PLUSP |n|)
(|OUTFORM;vconcat;3$;50| " " (|OUTFORM;vspace;I$;28| (- |n| 1) $)
$))
- (T '(NOTHING))))
+ (T (|OUTFORM;empty;$;73| $))))
(DEFUN |OUTFORM;hspace;I$;29| (|n| $)
- (COND ((PLUSP |n|) (|fillerSpaces| |n|)) (T '(NOTHING))))
+ (COND
+ ((PLUSP |n|) (|fillerSpaces| |n|))
+ (T (|OUTFORM;empty;$;73| $))))
(DEFUN |OUTFORM;rspace;2I$;30| (|n| |m| $)
(SEQ (COND
- ((PLUSP |n|) (COND ((NOT (PLUSP |m|)) (EXIT '(NOTHING)))))
- (T (EXIT '(NOTHING))))
+ ((PLUSP |n|)
+ (COND ((NOT (PLUSP |m|)) (EXIT (|OUTFORM;empty;$;73| $)))))
+ (T (EXIT (|OUTFORM;empty;$;73| $))))
(EXIT (|OUTFORM;vconcat;3$;50| (|OUTFORM;hspace;I$;29| |n| $)
(|OUTFORM;rspace;2I$;30| |n| (- |m| 1) $) $))))
@@ -732,7 +717,7 @@
(DEFUN |OUTFORM;supersub;$L$;47| (|a| |l| $)
(SEQ (COND
((ODDP (LIST-LENGTH |l|))
- (SETQ |l| (APPEND |l| '((NOTHING))))))
+ (SETQ |l| (APPEND |l| (LIST (|OUTFORM;empty;$;73| $))))))
(EXIT (CONS 'ALTSUPERSUB (CONS |a| |l|)))))
(DEFUN |OUTFORM;hconcat;3$;48| (|a| |b| $)
@@ -833,7 +818,7 @@
(DECLARE (IGNORE $))
(LIST 'BINOMIAL |a| |b|))
-(DEFUN |OUTFORM;empty;$;73| ($) (DECLARE (IGNORE $)) '(NOTHING))
+(DEFUN |OUTFORM;empty;$;73| ($) '(NOTHING))
(DEFUN |OUTFORM;infix?;$B;74| (|a| $)
(LET ((|e| (COND
@@ -854,7 +839,7 @@
(DEFUN |OUTFORM;infix;$L$;77| (|a| |l| $)
(COND
- ((NULL |l|) '(NOTHING))
+ ((NULL |l|) (|OUTFORM;empty;$;73| $))
((NULL (CDR |l|)) (SPADCALL |l| (|getShellEntry| $ 78)))
((|OUTFORM;infix?;$B;74| |a| $) (CONS |a| |l|))
(T (|OUTFORM;hconcat;L$;49|
@@ -953,8 +938,7 @@
(|OUTFORM;super;3$;43| |a| (LIST 'PAREN |s|) $)))))
(DEFUN |OUTFORM;sum;2$;98| (|a| $)
- (DECLARE (IGNORE $))
- (LIST 'SIGMA '(NOTHING) |a|))
+ (LIST 'SIGMA (|OUTFORM;empty;$;73| $) |a|))
(DEFUN |OUTFORM;sum;3$;99| (|a| |b| $)
(DECLARE (IGNORE $))
@@ -965,8 +949,7 @@
(LIST 'SIGMA2 |b| |c| |a|))
(DEFUN |OUTFORM;prod;2$;101| (|a| $)
- (DECLARE (IGNORE $))
- (LIST 'PI '(NOTHING) |a|))
+ (LIST 'PI (|OUTFORM;empty;$;73| $) |a|))
(DEFUN |OUTFORM;prod;3$;102| (|a| |b| $)
(DECLARE (IGNORE $))
@@ -977,12 +960,10 @@
(LIST 'PI2 |b| |c| |a|))
(DEFUN |OUTFORM;int;2$;104| (|a| $)
- (DECLARE (IGNORE $))
- (LIST 'INTSIGN '(NOTHING) '(NOTHING) |a|))
+ (LIST 'INTSIGN (|OUTFORM;empty;$;73| $) (|OUTFORM;empty;$;73| $) |a|))
(DEFUN |OUTFORM;int;3$;105| (|a| |b| $)
- (DECLARE (IGNORE $))
- (LIST 'INTSIGN |b| '(NOTHING) |a|))
+ (LIST 'INTSIGN |b| (|OUTFORM;empty;$;73| $) |a|))
(DEFUN |OUTFORM;int;4$;106| (|a| |b| |c| $)
(DECLARE (IGNORE $))
diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp
index 5dd91da0..505ca661 100644
--- a/src/algebra/strap/SINT.lsp
+++ b/src/algebra/strap/SINT.lsp
@@ -266,7 +266,7 @@
(DECLAIM (FTYPE (FUNCTION (|%Thing| (|%Vector| *) |%Shell|) |%Pair|)
|SINT;reducedSystem;MVR;57|))
-(PUT '|SINT;reducedSystem;MVR;57| '|SPADreplace| '|%makepair|)
+(PUT '|SINT;reducedSystem;MVR;57| '|SPADreplace| '|%pair|)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
|SINT;positiveRemainder;3$;58|))
diff --git a/src/algebra/strap/URAGG-.lsp b/src/algebra/strap/URAGG-.lsp
index c883d258..ab3ee05e 100644
--- a/src/algebra/strap/URAGG-.lsp
+++ b/src/algebra/strap/URAGG-.lsp
@@ -263,7 +263,7 @@
(EXIT |y|))))
(DEFUN |URAGG-;cycleTail;2A;18| (|x| $)
- (PROG (|z| |y|)
+ (PROG (|y| |z|)
(RETURN
(COND
((SPADCALL
@@ -278,14 +278,14 @@
((NOT (NOT (SPADCALL |x| |z|
(|getShellEntry| $ 54))))
(RETURN NIL))
- (T (SEQ (LETT |y| |z| |URAGG-;cycleTail;2A;18|)
+ (T (SEQ (SETQ |y| |z|)
(EXIT (SETQ |z|
(SPADCALL |z|
(|getShellEntry| $ 14))))))))
(EXIT |y|)))))))
(DEFUN |URAGG-;cycleEntry;2A;19| (|x| $)
- (PROG (|z| |l| |y|)
+ (PROG (|y| |z| |l|)
(RETURN
(COND
((SPADCALL |x| (|getShellEntry| $ 20)) |x|)
@@ -305,7 +305,7 @@
(T (SEQ (SETQ |z|
(SPADCALL |z| (|getShellEntry| $ 14)))
(EXIT (SETQ |l| (+ |l| 1)))))))
- (LETT |y| |x| |URAGG-;cycleEntry;2A;19|)
+ (SETQ |y| |x|)
(LET ((|k| 1))
(LOOP
(COND
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 23:32:50 +0000