diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-06-06 13:37:14 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-06-06 13:37:14 +0000 |
| commit | 7d0cd86fd5243dc6d350e3ae7b4201698a82b69d (patch) | |
| tree | b97fb43b5e1cd614dc21ead4d4dd1b19239eee59 | |
| parent | 4348e69c730e4e3faa7b993ac0dac5ec426a374c (diff) | |
| download | open-axiom-7d0cd86fd5243dc6d350e3ae7b4201698a82b69d.tar.gz | |
* interp/c-util.boot (mutateToBackendCode): Don't replace explicit
SETQ by LETT.
38 files changed, 261 insertions, 470 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index df9e3960..b0c37676 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2010-06-06 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/c-util.boot (mutateToBackendCode): Don't replace explicit + SETQ by LETT. + +2010-06-06 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/c-util.boot (needPROGS?): New. (transformToBackendCode): Use it. Don't add unneeded PROG/RETURN. diff --git a/src/algebra/strap/ALAGG.lsp b/src/algebra/strap/ALAGG.lsp index 662bc48d..e8aa377c 100644 --- a/src/algebra/strap/ALAGG.lsp +++ b/src/algebra/strap/ALAGG.lsp @@ -17,7 +17,7 @@ (COND (|AssociationListAggregate;CAT|) ('T - (LETT |AssociationListAggregate;CAT| + (SETQ |AssociationListAggregate;CAT| (|Join| (|TableAggregate| '|t#1| '|t#2|) (|ListAggregate| '#1#) (|mkCategory| '|domain| @@ -28,8 +28,7 @@ "failed") |t#1| $)) T)) - NIL 'NIL NIL)) - |AssociationListAggregate|))))))) + NIL 'NIL NIL))))))))) (|setShellEntry| #0# 0 (LIST '|AssociationListAggregate| (|devaluate| |t#1|) (|devaluate| |t#2|))) diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp index 19bdb581..bc1d5ef4 100644 --- a/src/algebra/strap/BOOLEAN.lsp +++ b/src/algebra/strap/BOOLEAN.lsp @@ -154,13 +154,13 @@ (PROG (#0=#:G1424) (RETURN (COND - ((LETT #0# (HGET |$ConstructorCache| '|Boolean|) |Boolean|) + ((SETQ #0# (HGET |$ConstructorCache| '|Boolean|)) (|CDRwithIncrement| (CDAR #0#))) ('T (UNWIND-PROTECT (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Boolean| (LIST (CONS NIL (CONS 1 (|Boolean;|)))))) - (LETT #0# T |Boolean|)) + (SETQ #0# T)) (COND ((NOT #0#) (HREM |$ConstructorCache| '|Boolean|))))))))) (DEFUN |Boolean;| () diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp index 9e25c452..bead7589 100644 --- a/src/algebra/strap/CHAR.lsp +++ b/src/algebra/strap/CHAR.lsp @@ -189,13 +189,13 @@ (PROG (#0=#:G1427) (RETURN (COND - ((LETT #0# (HGET |$ConstructorCache| '|Character|) |Character|) + ((SETQ #0# (HGET |$ConstructorCache| '|Character|)) (|CDRwithIncrement| (CDAR #0#))) ('T (UNWIND-PROTECT (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Character| (LIST (CONS NIL (CONS 1 (|Character;|)))))) - (LETT #0# T |Character|)) + (SETQ #0# T)) (COND ((NOT #0#) (HREM |$ConstructorCache| '|Character|))))))))) (DEFUN |Character;| () diff --git a/src/algebra/strap/CLAGG-.lsp b/src/algebra/strap/CLAGG-.lsp index b83cf1da..6d50e7cb 100644 --- a/src/algebra/strap/CLAGG-.lsp +++ b/src/algebra/strap/CLAGG-.lsp @@ -54,10 +54,7 @@ |CLAGG-;count;MANni;2|) G190 (COND - ((OR (ATOM #0#) - (PROGN - (LETT |x| (CAR #0#) |CLAGG-;count;MANni;2|) - NIL)) + ((OR (ATOM #0#) (PROGN (SETQ |x| (CAR #0#)) NIL)) (GO G191))) (COND ((SPADCALL |x| |f|) @@ -70,8 +67,7 @@ (PROGN (LETT #2# #1# |CLAGG-;count;MANni;2|) (LETT #3# 'T |CLAGG-;count;MANni;2|))))))) - (LETT #0# (CDR #0#) |CLAGG-;count;MANni;2|) (GO G190) - G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 (EXIT NIL)) (COND (#3# #2#) ('T 0))))))) (DEFUN |CLAGG-;any?;MAB;3| (|f| |c| $) @@ -84,10 +80,7 @@ |CLAGG-;any?;MAB;3|) G190 (COND - ((OR (ATOM #0#) - (PROGN - (LETT |x| (CAR #0#) |CLAGG-;any?;MAB;3|) - NIL)) + ((OR (ATOM #0#) (PROGN (SETQ |x| (CAR #0#)) NIL)) (GO G191))) (PROGN (LETT #1# (SPADCALL |x| |f|) |CLAGG-;any?;MAB;3|) @@ -98,8 +91,7 @@ (PROGN (LETT #2# #1# |CLAGG-;any?;MAB;3|) (LETT #3# 'T |CLAGG-;any?;MAB;3|))))) - (LETT #0# (CDR #0#) |CLAGG-;any?;MAB;3|) (GO G190) - G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 (EXIT NIL)) (COND (#3# #2#) ('T NIL))))))) (DEFUN |CLAGG-;every?;MAB;4| (|f| |c| $) @@ -112,10 +104,7 @@ |CLAGG-;every?;MAB;4|) G190 (COND - ((OR (ATOM #0#) - (PROGN - (LETT |x| (CAR #0#) |CLAGG-;every?;MAB;4|) - NIL)) + ((OR (ATOM #0#) (PROGN (SETQ |x| (CAR #0#)) NIL)) (GO G191))) (PROGN (LETT #1# (SPADCALL |x| |f|) |CLAGG-;every?;MAB;4|) @@ -126,8 +115,7 @@ (PROGN (LETT #2# #1# |CLAGG-;every?;MAB;4|) (LETT #3# 'T |CLAGG-;every?;MAB;4|))))) - (LETT #0# (CDR #0#) |CLAGG-;every?;MAB;4|) (GO G190) - G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 (EXIT NIL)) (COND (#3# #2#) ('T T))))))) (DEFUN |CLAGG-;find;MAU;5| (|f| |c| $) diff --git a/src/algebra/strap/CLAGG.lsp b/src/algebra/strap/CLAGG.lsp index 44c9ad25..b917ed26 100644 --- a/src/algebra/strap/CLAGG.lsp +++ b/src/algebra/strap/CLAGG.lsp @@ -11,7 +11,7 @@ (COND (|Collection;CAT|) ('T - (LETT |Collection;CAT| + (SETQ |Collection;CAT| (|Join| (|HomogeneousAggregate| '|t#1|) (|mkCategory| '|domain| '(((|construct| @@ -68,8 +68,7 @@ (|has| |t#1| (|ConvertibleTo| (|InputForm|))))) - '((|List| |t#1|)) NIL)) - |Collection|)))))) + '((|List| |t#1|)) NIL)))))))) (|setShellEntry| #0# 0 (LIST '|Collection| (|devaluate| |t#1|))) #0#)) diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index 5b2bd769..849d143a 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -915,15 +915,14 @@ (PROG (#0=#:G1562) (RETURN (COND - ((LETT #0# (HGET |$ConstructorCache| '|DoubleFloat|) - |DoubleFloat|) + ((SETQ #0# (HGET |$ConstructorCache| '|DoubleFloat|)) (|CDRwithIncrement| (CDAR #0#))) ('T (UNWIND-PROTECT (PROG1 (CDDAR (HPUT |$ConstructorCache| '|DoubleFloat| (LIST (CONS NIL (CONS 1 (|DoubleFloat;|)))))) - (LETT #0# T |DoubleFloat|)) + (SETQ #0# T)) (COND ((NOT #0#) (HREM |$ConstructorCache| '|DoubleFloat|))))))))) diff --git a/src/algebra/strap/DIFRING-.lsp b/src/algebra/strap/DIFRING-.lsp index db6d32d4..02ec25d9 100644 --- a/src/algebra/strap/DIFRING-.lsp +++ b/src/algebra/strap/DIFRING-.lsp @@ -22,9 +22,7 @@ (SEQ (EXIT (LETT |r| (SPADCALL |r| (|getShellEntry| $ 7)) |DIFRING-;differentiate;SNniS;2|))) - (LETT |i| (QSADD1 |i|) - |DIFRING-;differentiate;SNniS;2|) - (GO G190) G191 (EXIT NIL)) + (SETQ |i| (QSADD1 |i|)) (GO G190) G191 (EXIT NIL)) (EXIT |r|))))) (DEFUN |DIFRING-;D;SNniS;3| (|r| |n| $) diff --git a/src/algebra/strap/EUCDOM-.lsp b/src/algebra/strap/EUCDOM-.lsp index 36ac71c1..00c35bba 100644 --- a/src/algebra/strap/EUCDOM-.lsp +++ b/src/algebra/strap/EUCDOM-.lsp @@ -260,15 +260,13 @@ (RETURN (NREVERSE #1#))) (T (LET ((|vv| (CAR #0#))) - (LETT #1# + (SETQ #1# (CONS (SPADCALL (QVELT |u| 1) |vv| (|getShellEntry| $ 29)) - #1#) - |EUCDOM-;principalIdeal;LR;9|)))) - (LETT #0# (CDR #0#) - |EUCDOM-;principalIdeal;LR;9|)))) + #1#))))) + (SETQ #0# (CDR #0#))))) (QVELT |u| 2)))))))))) (DEFUN |EUCDOM-;expressIdealMember;LSU;10| (|l| |z| $) @@ -283,11 +281,9 @@ (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) (T (LET ((|v| (CAR #0#))) - (LETT #1# - (CONS (|spadConstant| $ 19) #1#) - |EUCDOM-;expressIdealMember;LSU;10|)))) - (LETT #0# (CDR #0#) - |EUCDOM-;expressIdealMember;LSU;10|))))) + (SETQ #1# + (CONS (|spadConstant| $ 19) #1#))))) + (SETQ #0# (CDR #0#)))))) ('T (SEQ (LETT |pid| (SPADCALL |l| (|getShellEntry| $ 48)) |EUCDOM-;expressIdealMember;LSU;10|) @@ -307,14 +303,12 @@ (RETURN (NREVERSE #3#))) (T (LET ((|v| (CAR #2#))) - (LETT #3# + (SETQ #3# (CONS (SPADCALL (CDR |q|) |v| (|getShellEntry| $ 29)) - #3#) - |EUCDOM-;expressIdealMember;LSU;10|)))) - (LETT #2# (CDR #2#) - |EUCDOM-;expressIdealMember;LSU;10|)))))))))))))) + #3#))))) + (SETQ #2# (CDR #2#))))))))))))))) (DEFUN |EUCDOM-;multiEuclidean;LSU;11| (|l| |z| $) (PROG (|n| |l1| |l2| #0=#:G1397 #1=#:G1524 #2=#:G1505 #3=#:G1503 @@ -348,8 +342,7 @@ (COND ((OR (ATOM #1#) (PROGN - (LETT #0# (CAR #1#) - |EUCDOM-;multiEuclidean;LSU;11|) + (SETQ #0# (CAR #1#)) NIL)) (GO G191))) (SEQ @@ -369,9 +362,8 @@ |EUCDOM-;multiEuclidean;LSU;11|) (LETT #4# 'T |EUCDOM-;multiEuclidean;LSU;11|))))))) - (LETT #1# (CDR #1#) - |EUCDOM-;multiEuclidean;LSU;11|) - (GO G190) G191 (EXIT NIL)) + (SETQ #1# (CDR #1#)) (GO G190) + G191 (EXIT NIL)) (COND (#4# #3#) ('T (|spadConstant| $ 30)))) @@ -387,8 +379,7 @@ (COND ((OR (ATOM #6#) (PROGN - (LETT #5# (CAR #6#) - |EUCDOM-;multiEuclidean;LSU;11|) + (SETQ #5# (CAR #6#)) NIL)) (GO G191))) (SEQ @@ -408,9 +399,8 @@ |EUCDOM-;multiEuclidean;LSU;11|) (LETT #9# 'T |EUCDOM-;multiEuclidean;LSU;11|))))))) - (LETT #6# (CDR #6#) - |EUCDOM-;multiEuclidean;LSU;11|) - (GO G190) G191 (EXIT NIL)) + (SETQ #6# (CDR #6#)) (GO G190) + G191 (EXIT NIL)) (COND (#9# #8#) ('T (|spadConstant| $ 30)))) diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp index 56792e88..a9339d57 100644 --- a/src/algebra/strap/FFIELDC-.lsp +++ b/src/algebra/strap/FFIELDC-.lsp @@ -118,9 +118,7 @@ (|getShellEntry| $ 19)) |sm1|) |FFIELDC-;createPrimitiveElement;S;8|))) - (LETT |i| (+ |i| 1) - |FFIELDC-;createPrimitiveElement;S;8|) - (GO G190) G191 (EXIT NIL)) + (SETQ |i| (+ |i| 1)) (GO G190) G191 (EXIT NIL)) (EXIT |e|))))) (DEFUN |FFIELDC-;primitive?;SB;9| (|a| $) @@ -139,10 +137,7 @@ G190 (COND ((OR (ATOM #0#) - (PROGN - (LETT |exp| (CAR #0#) - |FFIELDC-;primitive?;SB;9|) - NIL) + (PROGN (SETQ |exp| (CAR #0#)) NIL) (NULL (NOT |equalone|))) (GO G191))) (LETT |equalone| @@ -152,8 +147,7 @@ (|getShellEntry| $ 58)) (|getShellEntry| $ 59)) |FFIELDC-;primitive?;SB;9|) - (LETT #0# (CDR #0#) |FFIELDC-;primitive?;SB;9|) - (GO G190) G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 (EXIT NIL)) (EXIT (NOT |equalone|))))))))) (DEFUN |FFIELDC-;order;SPi;10| (|e| $) @@ -173,10 +167,7 @@ (LETT #0# |lof| |FFIELDC-;order;SPi;10|) G190 (COND ((OR (ATOM #0#) - (PROGN - (LETT |rec| (CAR #0#) - |FFIELDC-;order;SPi;10|) - NIL)) + (PROGN (SETQ |rec| (CAR #0#)) NIL)) (GO G191))) (SEQ (LETT |a| (QUOTIENT2 |ord| @@ -210,15 +201,13 @@ (|getShellEntry| $ 58)) (|getShellEntry| $ 59)) |FFIELDC-;order;SPi;10|))) - (LETT |j| (QSADD1 |j|) - |FFIELDC-;order;SPi;10|) - (GO G190) G191 (EXIT NIL)) + (SETQ |j| (QSADD1 |j|)) (GO G190) + G191 (EXIT NIL)) (EXIT (COND (|goon| (LETT |ord| |a| |FFIELDC-;order;SPi;10|))))) - (LETT #0# (CDR #0#) |FFIELDC-;order;SPi;10|) - (GO G190) G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 (EXIT NIL)) (EXIT |ord|)))))))) (DEFUN |FFIELDC-;discreteLog;SNni;11| (|b| $) @@ -259,8 +248,7 @@ (COND ((OR (ATOM #0#) (PROGN - (LETT |f| (CAR #0#) - |FFIELDC-;discreteLog;SNni;11|) + (SETQ |f| (CAR #0#)) NIL)) (GO G191))) (SEQ @@ -342,8 +330,7 @@ (|getShellEntry| $ 77)) |FFIELDC-;discreteLog;SNni;11|))))) - (LETT |i| (QSADD1 |i|) - |FFIELDC-;discreteLog;SNni;11|) + (SETQ |i| (QSADD1 |i|)) (GO G190) G191 (EXIT NIL)) (EXIT (COND @@ -368,12 +355,10 @@ ('T (|error| "discreteLog: ?? discrete logarithm"))))) - (LETT |t| (QSADD1 |t|) - |FFIELDC-;discreteLog;SNni;11|) + (SETQ |t| (QSADD1 |t|)) (GO G190) G191 (EXIT NIL)))) - (LETT #0# (CDR #0#) - |FFIELDC-;discreteLog;SNni;11|) - (GO G190) G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) + G191 (EXIT NIL)) (EXIT |disclog|)))))))))))) (DEFUN |FFIELDC-;discreteLog;2SU;12| (|logbase| |b| $) @@ -428,10 +413,7 @@ G190 (COND ((OR (ATOM #0#) - (PROGN - (LETT |f| (CAR #0#) - |FFIELDC-;discreteLog;2SU;12|) - NIL)) + (PROGN (SETQ |f| (CAR #0#)) NIL)) (GO G191))) (SEQ (LETT |fac| (CAR |f|) |FFIELDC-;discreteLog;2SU;12|) @@ -490,12 +472,10 @@ 58)) (|getShellEntry| $ 77)) |FFIELDC-;discreteLog;2SU;12|))))))) - (LETT |t| (QSADD1 |t|) - |FFIELDC-;discreteLog;2SU;12|) + (SETQ |t| (QSADD1 |t|)) (GO G190) G191 (EXIT NIL)))) - (LETT #0# (CDR #0#) - |FFIELDC-;discreteLog;2SU;12|) - (GO G190) G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 + (EXIT NIL)) (EXIT (CONS 0 |disclog|)))))))) #2# (EXIT #2#))))) @@ -530,8 +510,7 @@ (COND ((OR (ATOM #0#) (PROGN - (LETT |u| (CAR #0#) - |FFIELDC-;factorSquareFreePolynomial|) + (SETQ |u| (CAR #0#)) NIL)) (GO G191))) (PROGN @@ -551,9 +530,8 @@ |FFIELDC-;factorSquareFreePolynomial|) (LETT #3# 'T |FFIELDC-;factorSquareFreePolynomial|))))) - (LETT #0# (CDR #0#) - |FFIELDC-;factorSquareFreePolynomial|) - (GO G190) G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 + (EXIT NIL)) (COND (#3# #2#) ('T (|spadConstant| $ 109)))) diff --git a/src/algebra/strap/HOAGG-.lsp b/src/algebra/strap/HOAGG-.lsp index 71f89bfd..a3159838 100644 --- a/src/algebra/strap/HOAGG-.lsp +++ b/src/algebra/strap/HOAGG-.lsp @@ -54,10 +54,7 @@ |HOAGG-;any?;MAB;3|) G190 (COND - ((OR (ATOM #0#) - (PROGN - (LETT |x| (CAR #0#) |HOAGG-;any?;MAB;3|) - NIL)) + ((OR (ATOM #0#) (PROGN (SETQ |x| (CAR #0#)) NIL)) (GO G191))) (PROGN (LETT #1# (SPADCALL |x| |f|) |HOAGG-;any?;MAB;3|) @@ -68,8 +65,7 @@ (PROGN (LETT #2# #1# |HOAGG-;any?;MAB;3|) (LETT #3# 'T |HOAGG-;any?;MAB;3|))))) - (LETT #0# (CDR #0#) |HOAGG-;any?;MAB;3|) (GO G190) - G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 (EXIT NIL)) (COND (#3# #2#) ('T NIL))))))) (DEFUN |HOAGG-;every?;MAB;4| (|f| |c| $) @@ -82,10 +78,7 @@ |HOAGG-;every?;MAB;4|) G190 (COND - ((OR (ATOM #0#) - (PROGN - (LETT |x| (CAR #0#) |HOAGG-;every?;MAB;4|) - NIL)) + ((OR (ATOM #0#) (PROGN (SETQ |x| (CAR #0#)) NIL)) (GO G191))) (PROGN (LETT #1# (SPADCALL |x| |f|) |HOAGG-;every?;MAB;4|) @@ -96,8 +89,7 @@ (PROGN (LETT #2# #1# |HOAGG-;every?;MAB;4|) (LETT #3# 'T |HOAGG-;every?;MAB;4|))))) - (LETT #0# (CDR #0#) |HOAGG-;every?;MAB;4|) (GO G190) - G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 (EXIT NIL)) (COND (#3# #2#) ('T T))))))) (DEFUN |HOAGG-;count;MANni;5| (|f| |c| $) @@ -110,10 +102,7 @@ |HOAGG-;count;MANni;5|) G190 (COND - ((OR (ATOM #0#) - (PROGN - (LETT |x| (CAR #0#) |HOAGG-;count;MANni;5|) - NIL)) + ((OR (ATOM #0#) (PROGN (SETQ |x| (CAR #0#)) NIL)) (GO G191))) (COND ((SPADCALL |x| |f|) @@ -126,8 +115,7 @@ (PROGN (LETT #2# #1# |HOAGG-;count;MANni;5|) (LETT #3# 'T |HOAGG-;count;MANni;5|))))))) - (LETT #0# (CDR #0#) |HOAGG-;count;MANni;5|) (GO G190) - G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 (EXIT NIL)) (COND (#3# #2#) ('T 0))))))) (DEFUN |HOAGG-;members;AL;6| (|x| $) @@ -166,14 +154,9 @@ |HOAGG-;=;2AB;9|) G190 (COND - ((OR (ATOM #1#) - (PROGN - (LETT |a| (CAR #1#) |HOAGG-;=;2AB;9|) - NIL) + ((OR (ATOM #1#) (PROGN (SETQ |a| (CAR #1#)) NIL) (ATOM #0#) - (PROGN - (LETT |b| (CAR #0#) |HOAGG-;=;2AB;9|) - NIL)) + (PROGN (SETQ |b| (CAR #0#)) NIL)) (GO G191))) (PROGN (LETT #2# @@ -186,10 +169,7 @@ (PROGN (LETT #3# #2# |HOAGG-;=;2AB;9|) (LETT #4# 'T |HOAGG-;=;2AB;9|))))) - (LETT #1# - (PROG1 (CDR #1#) - (LETT #0# (CDR #0#) |HOAGG-;=;2AB;9|)) - |HOAGG-;=;2AB;9|) + (SETQ #1# (PROG1 (CDR #1#) (SETQ #0# (CDR #0#)))) (GO G190) G191 (EXIT NIL)) (COND (#4# #3#) ('T T)))) ('T NIL)))))) @@ -203,11 +183,10 @@ (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) (T (LET ((|a| (CAR #0#))) - (LETT #1# + (SETQ #1# (CONS (SPADCALL |a| (|getShellEntry| $ 39)) - #1#) - |HOAGG-;coerce;AOf;10|)))) - (LETT #0# (CDR #0#) |HOAGG-;coerce;AOf;10|))) + #1#))))) + (SETQ #0# (CDR #0#)))) (|getShellEntry| $ 41)) (|getShellEntry| $ 42))) diff --git a/src/algebra/strap/HOAGG.lsp b/src/algebra/strap/HOAGG.lsp index 5bb1cf07..152bfcd1 100644 --- a/src/algebra/strap/HOAGG.lsp +++ b/src/algebra/strap/HOAGG.lsp @@ -11,7 +11,7 @@ (COND (|HomogeneousAggregate;CAT|) ('T - (LETT |HomogeneousAggregate;CAT| + (SETQ |HomogeneousAggregate;CAT| (|Join| (|Aggregate|) (|mkCategory| '|domain| '(((|map| @@ -71,8 +71,7 @@ '((|Boolean|) (|NonNegativeInteger|) (|List| |t#1|)) - NIL)) - |HomogeneousAggregate|)))))) + NIL)))))))) (|setShellEntry| #0# 0 (LIST '|HomogeneousAggregate| (|devaluate| |t#1|))) #0#)) diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp index ea18f466..53c404ad 100644 --- a/src/algebra/strap/ILIST.lsp +++ b/src/algebra/strap/ILIST.lsp @@ -189,8 +189,7 @@ (SEQ (COND ((NULL |x|) (|error| "index out of range"))) (EXIT (LETT |x| (CDR |x|) |ILIST;rest;$Nni$;19|))) - (LETT |i| (QSADD1 |i|) |ILIST;rest;$Nni$;19|) (GO G190) - G191 (EXIT NIL)) + (SETQ |i| (QSADD1 |i|)) (GO G190) G191 (EXIT NIL)) (EXIT |x|))))) (DEFUN |ILIST;copy;2$;20| (|x| $) @@ -206,8 +205,7 @@ (|error| "cyclic list"))))) (LETT |y| (CONS (CAR |x|) |y|) |ILIST;copy;2$;20|) (EXIT (LETT |x| (CDR |x|) |ILIST;copy;2$;20|))) - (LETT |i| (QSADD1 |i|) |ILIST;copy;2$;20|) (GO G190) - G191 (EXIT NIL)) + (SETQ |i| (QSADD1 |i|)) (GO G190) G191 (EXIT NIL)) (EXIT (NREVERSE |y|)))))) (DEFUN |ILIST;coerce;$Of;21| (|x| $) @@ -467,16 +465,15 @@ (PROG (#2=#:G1519) (RETURN (COND - ((LETT #2# + ((SETQ #2# (|lassocShiftWithFunction| (|devaluateList| #1#) (HGET |$ConstructorCache| '|IndexedList|) - '|domainEqualList|) - |IndexedList|) + '|domainEqualList|)) (|CDRwithIncrement| #2#)) ('T (UNWIND-PROTECT (PROG1 (APPLY (|function| |IndexedList;|) #1#) - (LETT #2# T |IndexedList|)) + (SETQ #2# T)) (COND ((NOT #2#) (HREM |$ConstructorCache| '|IndexedList|))))))))) diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp index 8fb11f5a..38e24e3d 100644 --- a/src/algebra/strap/INT.lsp +++ b/src/algebra/strap/INT.lsp @@ -519,13 +519,13 @@ (PROG (#0=#:G1524) (RETURN (COND - ((LETT #0# (HGET |$ConstructorCache| '|Integer|) |Integer|) + ((SETQ #0# (HGET |$ConstructorCache| '|Integer|)) (|CDRwithIncrement| (CDAR #0#))) ('T (UNWIND-PROTECT (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Integer| (LIST (CONS NIL (CONS 1 (|Integer;|)))))) - (LETT #0# T |Integer|)) + (SETQ #0# T)) (COND ((NOT #0#) (HREM |$ConstructorCache| '|Integer|))))))))) (DEFUN |Integer;| () diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp index 7879d51f..e13365f3 100644 --- a/src/algebra/strap/ISTRING.lsp +++ b/src/algebra/strap/ISTRING.lsp @@ -211,32 +211,21 @@ (LETT |k| 0 |ISTRING;replace;$Us2$;15|) G190 (COND ((QSGREATERP |i| #0#) (GO G191))) (SEQ (EXIT (QESET |r| |k| (CHAR |s| |i|)))) - (LETT |k| - (PROG1 (QSADD1 |k|) - (LETT |i| (QSADD1 |i|) - |ISTRING;replace;$Us2$;15|)) - |ISTRING;replace;$Us2$;15|) + (SETQ |k| (PROG1 (QSADD1 |k|) (SETQ |i| (QSADD1 |i|)))) (GO G190) G191 (EXIT NIL)) (SEQ (LETT |i| 0 |ISTRING;replace;$Us2$;15|) (LETT #1# (- |n| 1) |ISTRING;replace;$Us2$;15|) (LETT |k| |k| |ISTRING;replace;$Us2$;15|) G190 (COND ((QSGREATERP |i| #1#) (GO G191))) (SEQ (EXIT (QESET |r| |k| (CHAR |t| |i|)))) - (LETT |k| - (PROG1 (+ |k| 1) - (LETT |i| (QSADD1 |i|) - |ISTRING;replace;$Us2$;15|)) - |ISTRING;replace;$Us2$;15|) + (SETQ |k| (PROG1 (+ |k| 1) (SETQ |i| (QSADD1 |i|)))) (GO G190) G191 (EXIT NIL)) (SEQ (LETT |i| (+ |h| 1) |ISTRING;replace;$Us2$;15|) (LETT #2# (- |m| 1) |ISTRING;replace;$Us2$;15|) (LETT |k| |k| |ISTRING;replace;$Us2$;15|) G190 (COND ((> |i| #2#) (GO G191))) (SEQ (EXIT (QESET |r| |k| (CHAR |s| |i|)))) - (LETT |k| - (PROG1 (+ |k| 1) - (LETT |i| (+ |i| 1) |ISTRING;replace;$Us2$;15|)) - |ISTRING;replace;$Us2$;15|) + (SETQ |k| (PROG1 (+ |k| 1) (SETQ |i| (+ |i| 1)))) (GO G190) G191 (EXIT NIL)) (EXIT |r|))))) @@ -291,11 +280,9 @@ (GO #1#)) |ISTRING;substring?;2$IB;17|) (GO #2#)))))) - (LETT |ip| + (SETQ |ip| (PROG1 (QSADD1 |ip|) - (LETT |iw| (+ |iw| 1) - |ISTRING;substring?;2$IB;17|)) - |ISTRING;substring?;2$IB;17|) + (SETQ |iw| (+ |iw| 1)))) (GO G190) G191 (EXIT NIL))) #2# (EXIT #2#)) (EXIT T))))))) @@ -347,9 +334,8 @@ (|getShellEntry| $ 6)) |ISTRING;position;C$2I;19|) (GO #1#)))))) - (LETT |r| (+ |r| 1) - |ISTRING;position;C$2I;19|) - (GO G190) G191 (EXIT NIL)) + (SETQ |r| (+ |r| 1)) (GO G190) + G191 (EXIT NIL)) (EXIT (- (|getShellEntry| $ 6) 1)))))))) #1# (EXIT #1#))))) @@ -383,9 +369,8 @@ (|getShellEntry| $ 6)) |ISTRING;position;Cc$2I;20|) (GO #1#)))))) - (LETT |r| (+ |r| 1) - |ISTRING;position;Cc$2I;20|) - (GO G190) G191 (EXIT NIL)) + (SETQ |r| (+ |r| 1)) (GO G190) + G191 (EXIT NIL)) (EXIT (- (|getShellEntry| $ 6) 1)))))))) #1# (EXIT #1#))))) @@ -414,9 +399,8 @@ (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) |c| (|getShellEntry| $ 68)))) (GO G191))) - (SEQ (EXIT 0)) - (LETT |i| (+ |i| 1) |ISTRING;split;$CL;22|) (GO G190) - G191 (EXIT NIL)) + (SEQ (EXIT 0)) (SETQ |i| (+ |i| 1)) (GO G190) G191 + (EXIT NIL)) (LETT |l| NIL |ISTRING;split;$CL;22|) (SEQ G190 (COND @@ -446,9 +430,7 @@ (|ISTRING;elt;$IC;30| |s| |i| $) |c| (|getShellEntry| $ 68)))) (GO G191))) - (SEQ (EXIT 0)) - (LETT |i| (+ |i| 1) - |ISTRING;split;$CL;22|) + (SEQ (EXIT 0)) (SETQ |i| (+ |i| 1)) (GO G190) G191 (EXIT NIL)))) NIL (GO G190) G191 (EXIT NIL)) (COND @@ -475,9 +457,8 @@ (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) |cc| (|getShellEntry| $ 64)))) (GO G191))) - (SEQ (EXIT 0)) - (LETT |i| (+ |i| 1) |ISTRING;split;$CcL;23|) (GO G190) - G191 (EXIT NIL)) + (SEQ (EXIT 0)) (SETQ |i| (+ |i| 1)) (GO G190) G191 + (EXIT NIL)) (LETT |l| NIL |ISTRING;split;$CcL;23|) (SEQ G190 (COND @@ -507,9 +488,7 @@ (|ISTRING;elt;$IC;30| |s| |i| $) |cc| (|getShellEntry| $ 64)))) (GO G191))) - (SEQ (EXIT 0)) - (LETT |i| (+ |i| 1) - |ISTRING;split;$CcL;23|) + (SEQ (EXIT 0)) (SETQ |i| (+ |i| 1)) (GO G190) G191 (EXIT NIL)))) NIL (GO G190) G191 (EXIT NIL)) (COND @@ -536,9 +515,8 @@ (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) |c| (|getShellEntry| $ 68)))) (GO G191))) - (SEQ (EXIT 0)) - (LETT |i| (+ |i| 1) |ISTRING;leftTrim;$C$;24|) - (GO G190) G191 (EXIT NIL)) + (SEQ (EXIT 0)) (SETQ |i| (+ |i| 1)) (GO G190) G191 + (EXIT NIL)) (EXIT (|ISTRING;elt;$Us$;31| |s| (SPADCALL |i| |n| (|getShellEntry| $ 24)) $)))))) @@ -555,9 +533,8 @@ (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) |cc| (|getShellEntry| $ 64)))) (GO G191))) - (SEQ (EXIT 0)) - (LETT |i| (+ |i| 1) |ISTRING;leftTrim;$Cc$;25|) - (GO G190) G191 (EXIT NIL)) + (SEQ (EXIT 0)) (SETQ |i| (+ |i| 1)) (GO G190) G191 + (EXIT NIL)) (EXIT (|ISTRING;elt;$Us$;31| |s| (SPADCALL |i| |n| (|getShellEntry| $ 24)) $)))))) @@ -574,9 +551,8 @@ (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $) |c| (|getShellEntry| $ 68)))) (GO G191))) - (SEQ (EXIT 0)) - (LETT |j| (+ |j| -1) |ISTRING;rightTrim;$C$;26|) - (GO G190) G191 (EXIT NIL)) + (SEQ (EXIT 0)) (SETQ |j| (+ |j| -1)) (GO G190) G191 + (EXIT NIL)) (EXIT (|ISTRING;elt;$Us$;31| |s| (SPADCALL (|ISTRING;minIndex;$I;11| |s| $) |j| (|getShellEntry| $ 24)) @@ -595,9 +571,8 @@ (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $) |cc| (|getShellEntry| $ 64)))) (GO G191))) - (SEQ (EXIT 0)) - (LETT |j| (+ |j| -1) |ISTRING;rightTrim;$Cc$;27|) - (GO G190) G191 (EXIT NIL)) + (SEQ (EXIT 0)) (SETQ |j| (+ |j| -1)) (GO G190) G191 + (EXIT NIL)) (EXIT (|ISTRING;elt;$Us$;31| |s| (SPADCALL (|ISTRING;minIndex;$I;11| |s| $) |j| (|getShellEntry| $ 24)) @@ -615,10 +590,7 @@ (LETT #0# |l| |ISTRING;concat;L$;28|) G190 (COND ((OR (ATOM #0#) - (PROGN - (LETT |s| (CAR #0#) - |ISTRING;concat;L$;28|) - NIL)) + (PROGN (SETQ |s| (CAR #0#)) NIL)) (GO G191))) (SEQ (EXIT (PROGN (LETT #1# (QCSIZE |s|) @@ -633,8 +605,8 @@ |ISTRING;concat;L$;28|) (LETT #3# 'T |ISTRING;concat;L$;28|))))))) - (LETT #0# (CDR #0#) |ISTRING;concat;L$;28|) - (GO G190) G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 + (EXIT NIL)) (COND (#3# #2#) ('T 0))) (|spadConstant| $ 53)) |ISTRING;concat;L$;28|) @@ -642,16 +614,12 @@ (SEQ (LETT |s| NIL |ISTRING;concat;L$;28|) (LETT #4# |l| |ISTRING;concat;L$;28|) G190 (COND - ((OR (ATOM #4#) - (PROGN - (LETT |s| (CAR #4#) |ISTRING;concat;L$;28|) - NIL)) + ((OR (ATOM #4#) (PROGN (SETQ |s| (CAR #4#)) NIL)) (GO G191))) (SEQ (|ISTRING;copyInto!;2$I$;29| |t| |s| |i| $) (EXIT (LETT |i| (+ |i| (QCSIZE |s|)) |ISTRING;concat;L$;28|))) - (LETT #4# (CDR #4#) |ISTRING;concat;L$;28|) (GO G190) - G191 (EXIT NIL)) + (SETQ #4# (CDR #4#)) (GO G190) G191 (EXIT NIL)) (EXIT |t|))))) (DEFUN |ISTRING;copyInto!;2$I$;29| (|y| |x| |s| $) @@ -816,15 +784,14 @@ (PROG (#1=#:G1543) (RETURN (COND - ((LETT #1# + ((SETQ #1# (|lassocShiftWithFunction| (LIST (|devaluate| #0#)) (HGET |$ConstructorCache| '|IndexedString|) - '|domainEqualList|) - |IndexedString|) + '|domainEqualList|)) (|CDRwithIncrement| #1#)) ('T (UNWIND-PROTECT - (PROG1 (|IndexedString;| #0#) (LETT #1# T |IndexedString|)) + (PROG1 (|IndexedString;| #0#) (SETQ #1# T)) (COND ((NOT #1#) (HREM |$ConstructorCache| '|IndexedString|))))))))) diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp index 1898f8cb..d215f80d 100644 --- a/src/algebra/strap/LIST.lsp +++ b/src/algebra/strap/LIST.lsp @@ -179,27 +179,25 @@ (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) (T (LET ((|a| (CAR #0#))) - (LETT #1# + (SETQ #1# (CONS (SPADCALL |a| (|getShellEntry| $ 48)) - #1#) - |LIST;convert;$If;13|)))) - (LETT #0# (CDR #0#) |LIST;convert;$If;13|)))) + #1#))))) + (SETQ #0# (CDR #0#))))) (|getShellEntry| $ 52))) (DEFUN |List| (#0=#:G1445) (PROG (#1=#:G1446) (RETURN (COND - ((LETT #1# + ((SETQ #1# (|lassocShiftWithFunction| (LIST (|devaluate| #0#)) (HGET |$ConstructorCache| '|List|) - '|domainEqualList|) - |List|) + '|domainEqualList|)) (|CDRwithIncrement| #1#)) ('T (UNWIND-PROTECT - (PROG1 (|List;| #0#) (LETT #1# T |List|)) + (PROG1 (|List;| #0#) (SETQ #1# T)) (COND ((NOT #1#) (HREM |$ConstructorCache| '|List|))))))))) (DEFUN |List;| (|#1|) diff --git a/src/algebra/strap/LNAGG-.lsp b/src/algebra/strap/LNAGG-.lsp index 013dda16..2dc153c6 100644 --- a/src/algebra/strap/LNAGG-.lsp +++ b/src/algebra/strap/LNAGG-.lsp @@ -27,8 +27,8 @@ (LOOP (COND ((> |i| #0#) (RETURN (NREVERSE #1#))) - (T (LETT #1# (CONS |i| #1#) |LNAGG-;indices;AL;1|))) - (LETT |i| (+ |i| 1) |LNAGG-;indices;AL;1|)))) + (T (SETQ #1# (CONS |i| #1#)))) + (SETQ |i| (+ |i| 1))))) (DEFUN |LNAGG-;index?;IAB;2| (|i| |a| $) (COND diff --git a/src/algebra/strap/LNAGG.lsp b/src/algebra/strap/LNAGG.lsp index 4f274319..42e509b5 100644 --- a/src/algebra/strap/LNAGG.lsp +++ b/src/algebra/strap/LNAGG.lsp @@ -15,7 +15,7 @@ (COND (|LinearAggregate;CAT|) ('T - (LETT |LinearAggregate;CAT| + (SETQ |LinearAggregate;CAT| (|Join| (|IndexedAggregate| '#1# '|t#1|) (|Collection| '|t#1|) (|Eltable| '#2# '$) @@ -59,8 +59,7 @@ (|Integer|)) (|Integer|) (|List| $) (|NonNegativeInteger|)) - NIL)) - |LinearAggregate|))))))) + NIL))))))))) (|setShellEntry| #0# 0 (LIST '|LinearAggregate| (|devaluate| |t#1|))) #0#)) diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp index b00c0a30..f53a0661 100644 --- a/src/algebra/strap/LSAGG-.lsp +++ b/src/algebra/strap/LSAGG-.lsp @@ -441,8 +441,7 @@ (SEQ (EXIT (LETT |x| (SPADCALL |x| (|getShellEntry| $ 17)) |LSAGG-;position;MAI;13|))) - (LETT |k| (+ |k| 1) |LSAGG-;position;MAI;13|) (GO G190) - G191 (EXIT NIL)) + (SETQ |k| (+ |k| 1)) (GO G190) G191 (EXIT NIL)) (EXIT (COND ((SPADCALL |x| (|getShellEntry| $ 16)) (- (SPADCALL |x| (|getShellEntry| $ 33)) 1)) @@ -572,8 +571,7 @@ (SPADCALL |s| |l| (|getShellEntry| $ 14)) |LSAGG-;new;NniSA;18|))) - (LETT |k| (QSADD1 |k|) |LSAGG-;new;NniSA;18|) (GO G190) - G191 (EXIT NIL)) + (SETQ |k| (QSADD1 |k|)) (GO G190) G191 (EXIT NIL)) (EXIT |l|))))) (DEFUN |LSAGG-;map;M3A;19| (|f| |x| |y| $) @@ -657,8 +655,7 @@ (EXIT (LETT |x| (SPADCALL |x| (|getShellEntry| $ 17)) |LSAGG-;copy;2A;21|))) - (LETT |k| (QSADD1 |k|) |LSAGG-;copy;2A;21|) (GO G190) - G191 (EXIT NIL)) + (SETQ |k| (QSADD1 |k|)) (GO G190) G191 (EXIT NIL)) (EXIT (SPADCALL |y| (|getShellEntry| $ 57))))))) (DEFUN |LSAGG-;copyInto!;2AIA;22| (|y| |x| |s| $) @@ -736,9 +733,8 @@ (SPADCALL |x| (|getShellEntry| $ 17)) |LSAGG-;position;SA2I;23|))) - (LETT |k| (+ |k| 1) - |LSAGG-;position;SA2I;23|) - (GO G190) G191 (EXIT NIL)) + (SETQ |k| (+ |k| 1)) (GO G190) G191 + (EXIT NIL)) (EXIT (COND ((SPADCALL |x| (|getShellEntry| $ 16)) (- (SPADCALL |x| @@ -770,7 +766,7 @@ (DEFUN |LSAGG-;removeDuplicates!;2A;24!0| (|#1| $$) (PROG ($) - (LETT $ (|getShellEntry| $$ 0) |LSAGG-;removeDuplicates!;2A;24|) + (SETQ $ (|getShellEntry| $$ 0)) (RETURN (PROGN (SPADCALL |#1| diff --git a/src/algebra/strap/LSAGG.lsp b/src/algebra/strap/LSAGG.lsp index 64bb96bb..eeb2b6ed 100644 --- a/src/algebra/strap/LSAGG.lsp +++ b/src/algebra/strap/LSAGG.lsp @@ -11,14 +11,13 @@ (COND (|ListAggregate;CAT|) ('T - (LETT |ListAggregate;CAT| + (SETQ |ListAggregate;CAT| (|Join| (|StreamAggregate| '|t#1|) (|FiniteLinearAggregate| '|t#1|) (|ExtensibleLinearAggregate| '|t#1|) (|mkCategory| '|domain| '(((|list| ($ |t#1|)) T)) NIL 'NIL - NIL)) - |ListAggregate|)))))) + NIL)))))))) (|setShellEntry| #0# 0 (LIST '|ListAggregate| (|devaluate| |t#1|))) #0#)) diff --git a/src/algebra/strap/MTSCAT.lsp b/src/algebra/strap/MTSCAT.lsp index 743cd473..ae14c0d5 100644 --- a/src/algebra/strap/MTSCAT.lsp +++ b/src/algebra/strap/MTSCAT.lsp @@ -16,7 +16,7 @@ (COND (|MultivariateTaylorSeriesCategory;CAT|) ('T - (LETT |MultivariateTaylorSeriesCategory;CAT| + (SETQ |MultivariateTaylorSeriesCategory;CAT| (|Join| (|PartialDifferentialRing| '|t#2|) (|PowerSeriesCategory| '|t#1| '#1# '|t#2|) @@ -78,8 +78,7 @@ (|NonNegativeInteger|) (|List| |t#2|) (|List| (|NonNegativeInteger|))) - NIL)) - |MultivariateTaylorSeriesCategory|))))))) + NIL))))))))) (|setShellEntry| #0# 0 (LIST '|MultivariateTaylorSeriesCategory| (|devaluate| |t#1|) (|devaluate| |t#2|))) diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp index 9490e64c..50d5af5b 100644 --- a/src/algebra/strap/NNI.lsp +++ b/src/algebra/strap/NNI.lsp @@ -45,8 +45,7 @@ (PROG (#0=#:G1409) (RETURN (COND - ((LETT #0# (HGET |$ConstructorCache| '|NonNegativeInteger|) - |NonNegativeInteger|) + ((SETQ #0# (HGET |$ConstructorCache| '|NonNegativeInteger|)) (|CDRwithIncrement| (CDAR #0#))) ('T (UNWIND-PROTECT @@ -54,7 +53,7 @@ '|NonNegativeInteger| (LIST (CONS NIL (CONS 1 (|NonNegativeInteger;|)))))) - (LETT #0# T |NonNegativeInteger|)) + (SETQ #0# T)) (COND ((NOT #0#) (HREM |$ConstructorCache| '|NonNegativeInteger|))))))))) diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp index 0e90fa71..7fcd1a22 100644 --- a/src/algebra/strap/OUTFORM.lsp +++ b/src/algebra/strap/OUTFORM.lsp @@ -646,9 +646,8 @@ (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) (T (LET ((|l| (CAR #0#))) - (LETT #1# (CONS (LIST2VEC |l|) #1#) - |OUTFORM;matrix;L$;31|)))) - (LETT #0# (CDR #0#) |OUTFORM;matrix;L$;31|))) + (SETQ #1# (CONS (LIST2VEC |l|) #1#))))) + (SETQ #0# (CDR #0#)))) |OUTFORM;matrix;L$;31|) (EXIT (CONS 'MATRIX (LIST2VEC |lv|))))))) @@ -673,11 +672,7 @@ (LETT #0# (REVERSE |l|) |OUTFORM;blankSeparate;L$;35|) G190 (COND - ((OR (ATOM #0#) - (PROGN - (LETT |u| (CAR #0#) - |OUTFORM;blankSeparate;L$;35|) - NIL)) + ((OR (ATOM #0#) (PROGN (SETQ |u| (CAR #0#)) NIL)) (GO G191))) (SEQ (EXIT (COND ((EQCAR |u| |c|) @@ -686,8 +681,7 @@ ('T (LETT |l1| (CONS |u| |l1|) |OUTFORM;blankSeparate;L$;35|))))) - (LETT #0# (CDR #0#) |OUTFORM;blankSeparate;L$;35|) - (GO G190) G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 (EXIT NIL)) (EXIT (CONS |c| |l1|)))))) (DEFUN |OUTFORM;brace;2$;36| (|a| $) @@ -1019,15 +1013,14 @@ (PROG (#0=#:G1557) (RETURN (COND - ((LETT #0# (HGET |$ConstructorCache| '|OutputForm|) - |OutputForm|) + ((SETQ #0# (HGET |$ConstructorCache| '|OutputForm|)) (|CDRwithIncrement| (CDAR #0#))) ('T (UNWIND-PROTECT (PROG1 (CDDAR (HPUT |$ConstructorCache| '|OutputForm| (LIST (CONS NIL (CONS 1 (|OutputForm;|)))))) - (LETT #0# T |OutputForm|)) + (SETQ #0# T)) (COND ((NOT #0#) (HREM |$ConstructorCache| '|OutputForm|))))))))) (DEFUN |OutputForm;| () diff --git a/src/algebra/strap/PI.lsp b/src/algebra/strap/PI.lsp index c7fd8a31..5c9bc5d0 100644 --- a/src/algebra/strap/PI.lsp +++ b/src/algebra/strap/PI.lsp @@ -8,15 +8,14 @@ (PROG (#0=#:G1401) (RETURN (COND - ((LETT #0# (HGET |$ConstructorCache| '|PositiveInteger|) - |PositiveInteger|) + ((SETQ #0# (HGET |$ConstructorCache| '|PositiveInteger|)) (|CDRwithIncrement| (CDAR #0#))) ('T (UNWIND-PROTECT (PROG1 (CDDAR (HPUT |$ConstructorCache| '|PositiveInteger| (LIST (CONS NIL (CONS 1 (|PositiveInteger;|)))))) - (LETT #0# T |PositiveInteger|)) + (SETQ #0# T)) (COND ((NOT #0#) (HREM |$ConstructorCache| '|PositiveInteger|))))))))) diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp index 31e4004f..52d48644 100644 --- a/src/algebra/strap/POLYCAT-.lsp +++ b/src/algebra/strap/POLYCAT-.lsp @@ -153,8 +153,7 @@ (COND ((OR (ATOM #0#) (PROGN - (LETT |e| (CAR #0#) - |POLYCAT-;eval;SLS;1|) + (SETQ |e| (CAR #0#)) NIL)) (GO G191))) (COND @@ -171,9 +170,8 @@ "cannot find a variable to evaluate") |POLYCAT-;eval;SLS;1|) (GO #1#)))) - (LETT #0# (CDR #0#) - |POLYCAT-;eval;SLS;1|) - (GO G190) G191 (EXIT NIL))) + (SETQ #0# (CDR #0#)) (GO G190) G191 + (EXIT NIL))) #1# (EXIT #1#)) (LETT |lvar| (LET ((#2=#:G1693 |l|) (#3=#:G1692 NIL)) @@ -181,15 +179,14 @@ (COND ((ATOM #2#) (RETURN (NREVERSE #3#))) (T (LET ((|e| (CAR #2#))) - (LETT #3# + (SETQ #3# (CONS (SPADCALL (SPADCALL |e| (|getShellEntry| $ 14)) (|getShellEntry| $ 17)) - #3#) - |POLYCAT-;eval;SLS;1|)))) - (LETT #2# (CDR #2#) |POLYCAT-;eval;SLS;1|))) + #3#))))) + (SETQ #2# (CDR #2#)))) |POLYCAT-;eval;SLS;1|) (EXIT (SPADCALL |p| |lvar| (LET ((#4=#:G1695 |l|) (#5=#:G1694 NIL)) @@ -198,14 +195,12 @@ ((ATOM #4#) (RETURN (NREVERSE #5#))) (T (LET ((|e| (CAR #4#))) - (LETT #5# + (SETQ #5# (CONS (SPADCALL |e| (|getShellEntry| $ 18)) - #5#) - |POLYCAT-;eval;SLS;1|)))) - (LETT #4# (CDR #4#) - |POLYCAT-;eval;SLS;1|))) + #5#))))) + (SETQ #4# (CDR #4#)))) (|getShellEntry| $ 21)))))))))) (DEFUN |POLYCAT-;monomials;SL;2| (|p| $) @@ -252,17 +247,15 @@ (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) (T (LET ((|v| (CAR #0#))) - (LETT #1# + (SETQ #1# (CONS (SPADCALL (|spadConstant| $ 43) |v| (SPADCALL |p| |v| (|getShellEntry| $ 46)) (|getShellEntry| $ 47)) - #1#) - |POLYCAT-;isTimes;SU;4|)))) - (LETT #0# (CDR #0#) - |POLYCAT-;isTimes;SU;4|))) + #1#))))) + (SETQ #0# (CDR #0#)))) |POLYCAT-;isTimes;SU;4|) (EXIT (COND ((SPADCALL @@ -377,9 +370,8 @@ (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) (T (LET ((|q| (CAR #0#))) - (LETT #1# (CONS (|POLYCAT-;mkPrim| |q| $) #1#) - |POLYCAT-;primitiveMonomials;SL;12|)))) - (LETT #0# (CDR #0#) |POLYCAT-;primitiveMonomials;SL;12|)))) + (SETQ #1# (CONS (|POLYCAT-;mkPrim| |q| $) #1#))))) + (SETQ #0# (CDR #0#))))) (DEFUN |POLYCAT-;totalDegree;SNni;13| (|p| $) (PROG (#0=#:G1492 |d| |u|) @@ -486,11 +478,10 @@ (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) (T (LET ((|p| (CAR #0#))) - (LETT #1# + (SETQ #1# (CONS (SPADCALL |p| (|getShellEntry| $ 98)) - #1#) - |POLYCAT-;allMonoms|)))) - (LETT #0# (CDR #0#) |POLYCAT-;allMonoms|))) + #1#))))) + (SETQ #0# (CDR #0#)))) (|getShellEntry| $ 99)) (|getShellEntry| $ 100))) @@ -509,18 +500,13 @@ G190 (COND ((OR (> |i| #1#) (ATOM #0#) - (PROGN - (LETT |bj| (CAR #0#) |POLYCAT-;P2R|) - NIL)) + (PROGN (SETQ |bj| (CAR #0#)) NIL)) (GO G191))) (SEQ (EXIT (SPADCALL |w| |i| (SPADCALL |p| |bj| (|getShellEntry| $ 106)) (|getShellEntry| $ 107)))) - (LETT |i| - (PROG1 (+ |i| 1) - (LETT #0# (CDR #0#) |POLYCAT-;P2R|)) - |POLYCAT-;P2R|) + (SETQ |i| (PROG1 (+ |i| 1) (SETQ #0# (CDR #0#)))) (GO G190) G191 (EXIT NIL)) (EXIT |w|))))) @@ -531,23 +517,21 @@ (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) (T (LET ((|bj| (CAR #0#))) - (LETT #1# + (SETQ #1# (CONS (LET ((#2=#:G1706 |l|) (#3=#:G1705 NIL)) (LOOP (COND ((ATOM #2#) (RETURN (NREVERSE #3#))) (T (LET ((|p| (CAR #2#))) - (LETT #3# + (SETQ #3# (CONS (SPADCALL |p| |bj| (|getShellEntry| $ 106)) - #3#) - |POLYCAT-;eq2R|)))) - (LETT #2# (CDR #2#) |POLYCAT-;eq2R|))) - #1#) - |POLYCAT-;eq2R|)))) - (LETT #0# (CDR #0#) |POLYCAT-;eq2R|))) + #3#))))) + (SETQ #2# (CDR #2#)))) + #1#))))) + (SETQ #0# (CDR #0#)))) (|getShellEntry| $ 111))) (DEFUN |POLYCAT-;reducedSystem;MM;20| (|m| $) @@ -563,12 +547,10 @@ (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) (T (LET ((|r| (CAR #0#))) - (LETT #1# + (SETQ #1# (CONS (|POLYCAT-;allMonoms| |r| $) - #1#) - |POLYCAT-;reducedSystem;MM;20|)))) - (LETT #0# (CDR #0#) - |POLYCAT-;reducedSystem;MM;20|))) + #1#))))) + (SETQ #0# (CDR #0#)))) (|getShellEntry| $ 99)) (|getShellEntry| $ 100)) |POLYCAT-;reducedSystem;MM;20|) @@ -578,13 +560,11 @@ (COND ((ATOM #2#) (RETURN (NREVERSE #3#))) (T (LET ((|bj| (CAR #2#))) - (LETT #3# + (SETQ #3# (CONS (SPADCALL |bj| (|getShellEntry| $ 75)) - #3#) - |POLYCAT-;reducedSystem;MM;20|)))) - (LETT #2# (CDR #2#) - |POLYCAT-;reducedSystem;MM;20|))) + #3#))))) + (SETQ #2# (CDR #2#)))) |POLYCAT-;reducedSystem;MM;20|) (LETT |mm| (|POLYCAT-;eq2R| (|SPADfirst| |l|) |d| $) |POLYCAT-;reducedSystem;MM;20|) @@ -618,13 +598,11 @@ ((ATOM #0#) (RETURN (NREVERSE #1#))) (T (LET ((|s| (CAR #0#))) - (LETT #1# + (SETQ #1# (CONS (|POLYCAT-;allMonoms| |s| $) - #1#) - |POLYCAT-;reducedSystem;MVR;21|)))) - (LETT #0# (CDR #0#) - |POLYCAT-;reducedSystem;MVR;21|))) + #1#))))) + (SETQ #0# (CDR #0#)))) (|getShellEntry| $ 99)) (|getShellEntry| $ 124)) (|getShellEntry| $ 100)) @@ -635,13 +613,11 @@ (COND ((ATOM #2#) (RETURN (NREVERSE #3#))) (T (LET ((|bj| (CAR #2#))) - (LETT #3# + (SETQ #3# (CONS (SPADCALL |bj| (|getShellEntry| $ 75)) - #3#) - |POLYCAT-;reducedSystem;MVR;21|)))) - (LETT #2# (CDR #2#) - |POLYCAT-;reducedSystem;MVR;21|))) + #3#))))) + (SETQ #2# (CDR #2#)))) |POLYCAT-;reducedSystem;MVR;21|) (LETT |n| (LENGTH |d|) |POLYCAT-;reducedSystem;MVR;21|) (LETT |mm| (|POLYCAT-;eq2R| (|SPADfirst| |l|) |d| $) @@ -711,16 +687,14 @@ (RETURN (NREVERSE #1#))) (T (LET ((|w| (CAR #0#))) - (LETT #1# + (SETQ #1# (CONS (VECTOR (QVELT |w| 0) (SPADCALL (QVELT |w| 1) (|getShellEntry| $ 51)) (QVELT |w| 2)) - #1#) - |POLYCAT-;factor;SF;26|)))) - (LETT #0# (CDR #0#) - |POLYCAT-;factor;SF;26|))) + #1#))))) + (SETQ #0# (CDR #0#)))) (|getShellEntry| $ 159))))) ('T (SEQ (LETT |up| @@ -746,17 +720,15 @@ (RETURN (NREVERSE #3#))) (T (LET ((|ww| (CAR #2#))) - (LETT #3# + (SETQ #3# (CONS (VECTOR (QVELT |ww| 0) (SPADCALL (QVELT |ww| 1) (CDR |v|) (|getShellEntry| $ 161)) (QVELT |ww| 2)) - #3#) - |POLYCAT-;factor;SF;26|)))) - (LETT #2# (CDR #2#) - |POLYCAT-;factor;SF;26|))) + #3#))))) + (SETQ #2# (CDR #2#)))) (|getShellEntry| $ 159))))))))))) (DEFUN |POLYCAT-;conditionP;MU;27| (|mat| $) @@ -780,10 +752,8 @@ ((ATOM #13#) (RETURN (NREVERSE #14#))) (T (LET ((|z| (CAR #13#))) - (LETT #14# (CONS NIL #14#) - |POLYCAT-;conditionP;MU;27|)))) - (LETT #13# (CDR #13#) - |POLYCAT-;conditionP;MU;27|))) + (SETQ #14# (CONS NIL #14#))))) + (SETQ #13# (CDR #13#)))) |POLYCAT-;conditionP;MU;27|) (LETT |monslist| NIL |POLYCAT-;conditionP;MU;27|) (LETT |ch| (|spadConstant| $ 169) @@ -793,10 +763,7 @@ G190 (COND ((OR (ATOM #0#) - (PROGN - (LETT |l| (CAR #0#) - |POLYCAT-;conditionP;MU;27|) - NIL)) + (PROGN (SETQ |l| (CAR #0#)) NIL)) (GO G191))) (SEQ (LETT |mons| (PROGN @@ -811,8 +778,7 @@ (COND ((OR (ATOM #1#) (PROGN - (LETT |u| (CAR #1#) - |POLYCAT-;conditionP;MU;27|) + (SETQ |u| (CAR #1#)) NIL)) (GO G191))) (SEQ @@ -835,9 +801,8 @@ |POLYCAT-;conditionP;MU;27|) (LETT #4# 'T |POLYCAT-;conditionP;MU;27|))))))) - (LETT #1# (CDR #1#) - |POLYCAT-;conditionP;MU;27|) - (GO G190) G191 (EXIT NIL)) + (SETQ #1# (CDR #1#)) (GO G190) + G191 (EXIT NIL)) (COND (#4# #3#) ('T @@ -854,8 +819,7 @@ (COND ((OR (ATOM #5#) (PROGN - (LETT |m| (CAR #5#) - |POLYCAT-;conditionP;MU;27|) + (SETQ |m| (CAR #5#)) NIL)) (GO G191))) (SEQ @@ -877,7 +841,7 @@ (RETURN (NREVERSE #16#))) (T (LET ((|d| (CAR #15#))) - (LETT #16# + (SETQ #16# (CONS (SEQ (LETT |nd| @@ -903,10 +867,8 @@ (>= #17# 0) '(|NonNegativeInteger|) #17#)))))) - #16#) - |POLYCAT-;conditionP;MU;27|)))) - (LETT #15# (CDR #15#) - |POLYCAT-;conditionP;MU;27|))) + #16#))))) + (SETQ #15# (CDR #15#)))) |POLYCAT-;conditionP;MU;27|) (LETT |redmons| (CONS @@ -931,7 +893,7 @@ (LET ((|u| (CAR #18#)) (|v| (CAR #19#))) - (LETT #20# + (SETQ #20# (CONS (CONS (SPADCALL @@ -942,22 +904,17 @@ (|getShellEntry| $ 175)) |v|) - #20#) - |POLYCAT-;conditionP;MU;27|)))) - (LETT #18# (CDR #18#) - |POLYCAT-;conditionP;MU;27|) - (LETT #19# (CDR #19#) - |POLYCAT-;conditionP;MU;27|))) + #20#))))) + (SETQ #18# (CDR #18#)) + (SETQ #19# (CDR #19#)))) |POLYCAT-;conditionP;MU;27|))) - (LETT #5# (CDR #5#) - |POLYCAT-;conditionP;MU;27|) - (GO G190) G191 (EXIT NIL)) + (SETQ #5# (CDR #5#)) (GO G190) + G191 (EXIT NIL)) (EXIT (LETT |monslist| (CONS |redmons| |monslist|) |POLYCAT-;conditionP;MU;27|))) - (LETT #0# (CDR #0#) - |POLYCAT-;conditionP;MU;27|) - (GO G190) G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 + (EXIT NIL)) (LETT |ans| (SPADCALL (SPADCALL @@ -990,8 +947,7 @@ (COND ((OR (ATOM #8#) (PROGN - (LETT |mons| (CAR #8#) - |POLYCAT-;conditionP;MU;27|) + (SETQ |mons| (CAR #8#)) NIL)) (GO G191))) (SEQ @@ -1010,9 +966,8 @@ (COND ((OR (ATOM #9#) (PROGN - (LETT |m| - (CAR #9#) - |POLYCAT-;conditionP;MU;27|) + (SETQ |m| + (CAR #9#)) NIL)) (GO G191))) (SEQ @@ -1047,19 +1002,16 @@ |POLYCAT-;conditionP;MU;27|) (LETT #12# 'T |POLYCAT-;conditionP;MU;27|))))))) - (LETT #9# (CDR #9#) - |POLYCAT-;conditionP;MU;27|) + (SETQ #9# (CDR #9#)) (GO G190) G191 (EXIT NIL)) (COND (#12# #11#) ('T (|spadConstant| $ 27))))))) - (LETT #8# + (SETQ #8# (PROG1 (CDR #8#) - (LETT #7# (QSADD1 #7#) - |POLYCAT-;conditionP;MU;27|)) - |POLYCAT-;conditionP;MU;27|) + (SETQ #7# (QSADD1 #7#)))) (GO G190) G191 (EXIT NIL)) #21#))))))))) #6# (EXIT #6#))))) @@ -1236,10 +1188,7 @@ G190 (COND ((OR (ATOM #0#) - (PROGN - (LETT |f| (CAR #0#) - |POLYCAT-;squareFreePart;2S;34|) - NIL)) + (PROGN (SETQ |f| (CAR #0#)) NIL)) (GO G191))) (PROGN (LETT #1# (CAR |f|) @@ -1255,9 +1204,7 @@ |POLYCAT-;squareFreePart;2S;34|) (LETT #3# 'T |POLYCAT-;squareFreePart;2S;34|))))) - (LETT #0# (CDR #0#) - |POLYCAT-;squareFreePart;2S;34|) - (GO G190) G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 (EXIT NIL)) (COND (#3# #2#) ('T (|spadConstant| $ 43)))) (|getShellEntry| $ 182)))))) diff --git a/src/algebra/strap/POLYCAT.lsp b/src/algebra/strap/POLYCAT.lsp index 37a40b36..a6d05ac2 100644 --- a/src/algebra/strap/POLYCAT.lsp +++ b/src/algebra/strap/POLYCAT.lsp @@ -14,7 +14,7 @@ (COND (|PolynomialCategory;CAT|) ('T - (LETT |PolynomialCategory;CAT| + (SETQ |PolynomialCategory;CAT| (|Join| (|PartialDifferentialRing| '|t#3|) (|FiniteAbelianMonoidRing| '|t#1| '|t#2|) @@ -197,8 +197,7 @@ (|SparseUnivariatePolynomial| |t#1|) (|List| (|NonNegativeInteger|))) - NIL)) - |PolynomialCategory|)))))) + NIL)))))))) (|setShellEntry| #0# 0 (LIST '|PolynomialCategory| (|devaluate| |t#1|) (|devaluate| |t#2|) (|devaluate| |t#3|))) diff --git a/src/algebra/strap/QFCAT.lsp b/src/algebra/strap/QFCAT.lsp index fcec7860..4a0941f2 100644 --- a/src/algebra/strap/QFCAT.lsp +++ b/src/algebra/strap/QFCAT.lsp @@ -11,7 +11,7 @@ (COND (|QuotientFieldCategory;CAT|) ('T - (LETT |QuotientFieldCategory;CAT| + (SETQ |QuotientFieldCategory;CAT| (|Join| (|Field|) (|Algebra| '|t#1|) (|RetractableTo| '|t#1|) (|FullyEvalableOver| '|t#1|) @@ -73,8 +73,7 @@ ((|PolynomialFactorizationExplicit|) (|has| |t#1| (|PolynomialFactorizationExplicit|)))) - 'NIL NIL)) - |QuotientFieldCategory|)))))) + 'NIL NIL)))))))) (|setShellEntry| #0# 0 (LIST '|QuotientFieldCategory| (|devaluate| |t#1|))) #0#)) diff --git a/src/algebra/strap/RCAGG.lsp b/src/algebra/strap/RCAGG.lsp index 755e7ea0..5fa04082 100644 --- a/src/algebra/strap/RCAGG.lsp +++ b/src/algebra/strap/RCAGG.lsp @@ -11,7 +11,7 @@ (COND (|RecursiveAggregate;CAT|) ('T - (LETT |RecursiveAggregate;CAT| + (SETQ |RecursiveAggregate;CAT| (|Join| (|HomogeneousAggregate| '|t#1|) (|mkCategory| '|domain| '(((|children| ((|List| $) $)) T) @@ -42,8 +42,7 @@ NIL '((|List| $) (|Boolean|) (|Integer|) (|List| |t#1|)) - NIL)) - |RecursiveAggregate|)))))) + NIL)))))))) (|setShellEntry| #0# 0 (LIST '|RecursiveAggregate| (|devaluate| |t#1|))) #0#)) diff --git a/src/algebra/strap/SETAGG.lsp b/src/algebra/strap/SETAGG.lsp index dd352424..00d0411c 100644 --- a/src/algebra/strap/SETAGG.lsp +++ b/src/algebra/strap/SETAGG.lsp @@ -11,7 +11,7 @@ (COND (|SetAggregate;CAT|) ('T - (LETT |SetAggregate;CAT| + (SETQ |SetAggregate;CAT| (|Join| (|SetCategory|) (|Collection| '|t#1|) (|mkCategory| '|domain| '(((|part?| ((|Boolean|) $ $)) T) @@ -30,8 +30,7 @@ ((|union| ($ $ |t#1|)) T) ((|union| ($ |t#1| $)) T)) '((|partiallyOrderedSet| T)) - '((|Boolean|) (|List| |t#1|)) NIL)) - |SetAggregate|)))))) + '((|Boolean|) (|List| |t#1|)) NIL)))))))) (|setShellEntry| #0# 0 (LIST '|SetAggregate| (|devaluate| |t#1|))) #0#)) diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index 2197f582..d1f9499b 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -531,15 +531,14 @@ (PROG (#0=#:G1495) (RETURN (COND - ((LETT #0# (HGET |$ConstructorCache| '|SingleInteger|) - |SingleInteger|) + ((SETQ #0# (HGET |$ConstructorCache| '|SingleInteger|)) (|CDRwithIncrement| (CDAR #0#))) ('T (UNWIND-PROTECT (PROG1 (CDDAR (HPUT |$ConstructorCache| '|SingleInteger| (LIST (CONS NIL (CONS 1 (|SingleInteger;|)))))) - (LETT #0# T |SingleInteger|)) + (SETQ #0# T)) (COND ((NOT #0#) (HREM |$ConstructorCache| '|SingleInteger|))))))))) diff --git a/src/algebra/strap/STAGG-.lsp b/src/algebra/strap/STAGG-.lsp index 0f429a51..3323f313 100644 --- a/src/algebra/strap/STAGG-.lsp +++ b/src/algebra/strap/STAGG-.lsp @@ -55,16 +55,15 @@ (LOOP (COND ((> |i| |n|) (RETURN (NREVERSE #0#))) - (T (LETT #0# + (T (SETQ #0# (CONS (|STAGG-;c2| |x| (LETT |x| (SPADCALL |x| (|getShellEntry| $ 13)) |STAGG-;first;ANniA;3|) $) - #0#) - |STAGG-;first;ANniA;3|))) - (LETT |i| (+ |i| 1) |STAGG-;first;ANniA;3|))) + #0#)))) + (SETQ |i| (+ |i| 1)))) (|getShellEntry| $ 15))) (DEFUN |STAGG-;c2| (|x| |r| $) diff --git a/src/algebra/strap/STAGG.lsp b/src/algebra/strap/STAGG.lsp index e477684c..3f7d7848 100644 --- a/src/algebra/strap/STAGG.lsp +++ b/src/algebra/strap/STAGG.lsp @@ -11,7 +11,7 @@ (COND (|StreamAggregate;CAT|) ('T - (LETT |StreamAggregate;CAT| + (SETQ |StreamAggregate;CAT| (|Join| (|UnaryRecursiveAggregate| '|t#1|) (|LinearAggregate| '|t#1|) (|mkCategory| '|domain| @@ -21,8 +21,7 @@ ((|possiblyInfinite?| ((|Boolean|) $)) T)) - NIL '((|Boolean|)) NIL)) - |StreamAggregate|)))))) + NIL '((|Boolean|)) NIL)))))))) (|setShellEntry| #0# 0 (LIST '|StreamAggregate| (|devaluate| |t#1|))) #0#)) diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp index 40ceb5c1..9386c8f1 100644 --- a/src/algebra/strap/SYMBOL.lsp +++ b/src/algebra/strap/SYMBOL.lsp @@ -234,11 +234,10 @@ (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) (T (LET ((|n| (CAR #0#))) - (LETT #1# + (SETQ #1# (CONS (|SYMBOL;istring| |n| $) - #1#) - |SYMBOL;syprefix|)))) - (LETT #0# (CDR #0#) |SYMBOL;syprefix|)))) + #1#))))) + (SETQ #0# (CDR #0#))))) (|getShellEntry| $ 93))))))) (DEFUN |SYMBOL;syscripts| (|sc| $) @@ -530,15 +529,11 @@ G190 (COND ((OR (ATOM #0#) - (PROGN - (LETT |k| (CAR #0#) - |SYMBOL;resetNew;V;29|) - NIL)) + (PROGN (SETQ |k| (CAR #0#)) NIL)) (GO G191))) (SEQ (EXIT (SPADCALL |k| (|getShellEntry| $ 13) (|getShellEntry| $ 134)))) - (LETT #0# (CDR #0#) |SYMBOL;resetNew;V;29|) - (GO G190) G191 (EXIT NIL))))))) + (SETQ #0# (CDR #0#)) (GO G190) G191 (EXIT NIL))))))) (DEFUN |SYMBOL;scripted?;$B;30| (|sy| $) (NOT (ATOM |sy|))) @@ -588,9 +583,8 @@ (GO #1#)) |SYMBOL;name;2$;31|) (GO #2#)))))) - (LETT |i| (+ |i| 1) - |SYMBOL;name;2$;31|) - (GO G190) G191 (EXIT NIL))) + (SETQ |i| (+ |i| 1)) (GO G190) + G191 (EXIT NIL))) #2# (EXIT #2#)) (EXIT (|error| "Improper scripted symbol")))))) #1# (EXIT #1#))))) @@ -638,11 +632,8 @@ (|check-subtype| (>= #1# 0) '(|NonNegativeInteger|) #1#)) (|getShellEntry| $ 148)) - (LETT |i| - (PROG1 (+ |i| 1) - (LETT |j| (+ |j| 1) - |SYMBOL;scripts;$R;32|)) - |SYMBOL;scripts;$R;32|) + (SETQ |i| + (PROG1 (+ |i| 1) (SETQ |j| (+ |j| 1)))) (GO G190) G191 (EXIT NIL)) (LETT |nscripts| (SPADCALL (CDR |nscripts|) @@ -660,10 +651,7 @@ (LETT |i| |m| |SYMBOL;scripts;$R;32|) G190 (COND ((OR (ATOM #0#) - (PROGN - (LETT |n| (CAR #0#) - |SYMBOL;scripts;$R;32|) - NIL)) + (PROGN (SETQ |n| (CAR #0#)) NIL)) (GO G191))) (COND ((< (LENGTH |allscripts|) |n|) @@ -681,24 +669,19 @@ (RETURN (NREVERSE #3#))) (T (LET ((|a| (CAR #2#))) - (LETT #3# + (SETQ #3# (CONS (|SYMBOL;coerce;$Of;11| |a| $) - #3#) - |SYMBOL;scripts;$R;32|)))) - (LETT #2# (CDR #2#) - |SYMBOL;scripts;$R;32|))) + #3#))))) + (SETQ #2# (CDR #2#)))) (|getShellEntry| $ 157)) (EXIT (LETT |allscripts| (SPADCALL |allscripts| |n| (|getShellEntry| $ 158)) |SYMBOL;scripts;$R;32|))))) - (LETT |i| - (PROG1 (+ |i| 1) - (LETT #0# (CDR #0#) - |SYMBOL;scripts;$R;32|)) - |SYMBOL;scripts;$R;32|) + (SETQ |i| + (PROG1 (+ |i| 1) (SETQ #0# (CDR #0#)))) (GO G190) G191 (EXIT NIL)) (EXIT (VECTOR (SPADCALL |lscripts| |m| (|getShellEntry| $ 159)) @@ -728,13 +711,13 @@ (PROG (#0=#:G1556) (RETURN (COND - ((LETT #0# (HGET |$ConstructorCache| '|Symbol|) |Symbol|) + ((SETQ #0# (HGET |$ConstructorCache| '|Symbol|)) (|CDRwithIncrement| (CDAR #0#))) ('T (UNWIND-PROTECT (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Symbol| (LIST (CONS NIL (CONS 1 (|Symbol;|)))))) - (LETT #0# T |Symbol|)) + (SETQ #0# T)) (COND ((NOT #0#) (HREM |$ConstructorCache| '|Symbol|))))))))) (DEFUN |Symbol;| () diff --git a/src/algebra/strap/UFD-.lsp b/src/algebra/strap/UFD-.lsp index 014395a3..02114011 100644 --- a/src/algebra/strap/UFD-.lsp +++ b/src/algebra/strap/UFD-.lsp @@ -23,10 +23,7 @@ G190 (COND ((OR (ATOM #0#) - (PROGN - (LETT |f| (CAR #0#) - |UFD-;squareFreePart;2S;1|) - NIL)) + (PROGN (SETQ |f| (CAR #0#)) NIL)) (GO G191))) (PROGN (LETT #1# (CAR |f|) |UFD-;squareFreePart;2S;1|) @@ -39,8 +36,7 @@ (PROGN (LETT #2# #1# |UFD-;squareFreePart;2S;1|) (LETT #3# 'T |UFD-;squareFreePart;2S;1|))))) - (LETT #0# (CDR #0#) |UFD-;squareFreePart;2S;1|) - (GO G190) G191 (EXIT NIL)) + (SETQ #0# (CDR #0#)) (GO G190) G191 (EXIT NIL)) (COND (#3# #2#) ('T (|spadConstant| $ 16)))) (|getShellEntry| $ 15)))))) diff --git a/src/algebra/strap/URAGG-.lsp b/src/algebra/strap/URAGG-.lsp index c60624e6..9cea2704 100644 --- a/src/algebra/strap/URAGG-.lsp +++ b/src/algebra/strap/URAGG-.lsp @@ -240,8 +240,7 @@ (EXIT (LETT |x| (SPADCALL |x| (|getShellEntry| $ 14)) |URAGG-;#;ANni;15|))) - (LETT |k| (QSADD1 |k|) |URAGG-;#;ANni;15|) (GO G190) - G191 (EXIT NIL)) + (SETQ |k| (QSADD1 |k|)) (GO G190) G191 (EXIT NIL)) (EXIT |k|))))) (DEFUN |URAGG-;tail;2A;16| (|x| $) @@ -269,8 +268,8 @@ (LETT |x| |y| |URAGG-;tail;2A;16|) (|getShellEntry| $ 14)) |URAGG-;tail;2A;16|))) - (LETT |k| (QSADD1 |k|) |URAGG-;tail;2A;16|) - (GO G190) G191 (EXIT NIL)) + (SETQ |k| (QSADD1 |k|)) (GO G190) G191 + (EXIT NIL)) (EXIT |x|)))))))) (DEFUN |URAGG-;findCycle| (|x| $) @@ -365,17 +364,15 @@ (GO G191))) (LETT |z| (SPADCALL |z| (|getShellEntry| $ 14)) |URAGG-;cycleEntry;2A;19|) - (LETT |l| (QSADD1 |l|) - |URAGG-;cycleEntry;2A;19|) - (GO G190) G191 (EXIT NIL)) + (SETQ |l| (QSADD1 |l|)) (GO G190) G191 + (EXIT NIL)) (LETT |y| |x| |URAGG-;cycleEntry;2A;19|) (SEQ (LETT |k| 1 |URAGG-;cycleEntry;2A;19|) G190 (COND ((QSGREATERP |k| |l|) (GO G191))) (LETT |y| (SPADCALL |y| (|getShellEntry| $ 14)) |URAGG-;cycleEntry;2A;19|) - (LETT |k| (QSADD1 |k|) - |URAGG-;cycleEntry;2A;19|) - (GO G190) G191 (EXIT NIL)) + (SETQ |k| (QSADD1 |k|)) (GO G190) G191 + (EXIT NIL)) (SEQ G190 (COND ((NULL (NOT (SPADCALL |x| |y| @@ -412,9 +409,8 @@ (GO G191))) (LETT |y| (SPADCALL |y| (|getShellEntry| $ 14)) |URAGG-;cycleLength;ANni;20|) - (LETT |k| (QSADD1 |k|) - |URAGG-;cycleLength;ANni;20|) - (GO G190) G191 (EXIT NIL)) + (SETQ |k| (QSADD1 |k|)) (GO G190) G191 + (EXIT NIL)) (EXIT |k|)))))))) (DEFUN |URAGG-;rest;ANniA;21| (|x| |n| $) @@ -430,8 +426,7 @@ (SPADCALL |x| (|getShellEntry| $ 14)) |URAGG-;rest;ANniA;21|))))) - (LETT |i| (QSADD1 |i|) |URAGG-;rest;ANniA;21|) - (GO G190) G191 (EXIT NIL)) + (SETQ |i| (QSADD1 |i|)) (GO G190) G191 (EXIT NIL)) (EXIT |x|))))) (DEFUN |URAGG-;last;ANniA;22| (|x| |n| $) @@ -496,8 +491,8 @@ (SPADCALL |y| (|getShellEntry| $ 14)) |URAGG-;=;2AB;23|))))))) - (LETT |k| (QSADD1 |k|) |URAGG-;=;2AB;23|) - (GO G190) G191 (EXIT NIL)) + (SETQ |k| (QSADD1 |k|)) (GO G190) G191 + (EXIT NIL)) (EXIT (COND ((SPADCALL |x| (|getShellEntry| $ 20)) (SPADCALL |y| (|getShellEntry| $ 20))) @@ -535,9 +530,8 @@ (SPADCALL |v| (|getShellEntry| $ 14)) |URAGG-;node?;2AB;24|))))))) - (LETT |k| (QSADD1 |k|) - |URAGG-;node?;2AB;24|) - (GO G190) G191 (EXIT NIL)) + (SETQ |k| (QSADD1 |k|)) (GO G190) G191 + (EXIT NIL)) (EXIT (SPADCALL |u| |v| (|getShellEntry| $ 65))))) #0# (EXIT #0#))))) diff --git a/src/algebra/strap/URAGG.lsp b/src/algebra/strap/URAGG.lsp index 635b921b..f082c794 100644 --- a/src/algebra/strap/URAGG.lsp +++ b/src/algebra/strap/URAGG.lsp @@ -11,7 +11,7 @@ (COND (|UnaryRecursiveAggregate;CAT|) ('T - (LETT |UnaryRecursiveAggregate;CAT| + (SETQ |UnaryRecursiveAggregate;CAT| (|Join| (|RecursiveAggregate| '|t#1|) (|mkCategory| '|domain| '(((|concat| ($ $ $)) T) @@ -74,8 +74,7 @@ NIL '((|Integer|) (|NonNegativeInteger|)) - NIL)) - |UnaryRecursiveAggregate|)))))) + NIL)))))))) (|setShellEntry| #0# 0 (LIST '|UnaryRecursiveAggregate| (|devaluate| |t#1|))) #0#)) diff --git a/src/algebra/strap/VECTOR.lsp b/src/algebra/strap/VECTOR.lsp index 4e5d078a..ff54456c 100644 --- a/src/algebra/strap/VECTOR.lsp +++ b/src/algebra/strap/VECTOR.lsp @@ -30,15 +30,14 @@ (PROG (#1=#:G1409) (RETURN (COND - ((LETT #1# + ((SETQ #1# (|lassocShiftWithFunction| (LIST (|devaluate| #0#)) (HGET |$ConstructorCache| '|Vector|) - '|domainEqualList|) - |Vector|) + '|domainEqualList|)) (|CDRwithIncrement| #1#)) ('T (UNWIND-PROTECT - (PROG1 (|Vector;| #0#) (LETT #1# T |Vector|)) + (PROG1 (|Vector;| #0#) (SETQ #1# T)) (COND ((NOT #1#) (HREM |$ConstructorCache| '|Vector|))))))))) (DEFUN |Vector;| (|#1|) diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot index 2798bf98..307470eb 100644 --- a/src/interp/c-util.boot +++ b/src/interp/c-util.boot @@ -1523,7 +1523,7 @@ mutateToBackendCode x == if (u := first x) = "MAKEPROP" and $TRACELETFLAG then x.first := "MAKEPROP-SAY" u in '(DCQ RELET PRELET SPADLET SETQ %LET) => - if u ~= "DCQ" then + if u ~= 'DCQ and u ~= 'SETQ then $NEWSPAD or $FUNAME in $traceletFunctions => nconc(x,$FUNNAME__TAIL) x.first := "LETT" |