diff options
Diffstat (limited to 'src')
28 files changed, 51 insertions, 43 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 47342097..3426f56a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-01-26 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/g-util.boot (expandListlit): Tidy. + 2011-01-25 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/compiler.boot (compForm1): Use %listlit form. diff --git a/src/algebra/strap/ABELGRP-.lsp b/src/algebra/strap/ABELGRP-.lsp index a10e5227..0ef02ccf 100644 --- a/src/algebra/strap/ABELGRP-.lsp +++ b/src/algebra/strap/ABELGRP-.lsp @@ -34,7 +34,7 @@ (DEFUN |AbelianGroup&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|AbelianGroup&| |dv$1|)) ($ (|newShell| 27)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/ABELMON-.lsp b/src/algebra/strap/ABELMON-.lsp index 8bad28b8..e1e691f7 100644 --- a/src/algebra/strap/ABELMON-.lsp +++ b/src/algebra/strap/ABELMON-.lsp @@ -30,7 +30,7 @@ (DEFUN |AbelianMonoid&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|AbelianMonoid&| |dv$1|)) ($ (|newShell| 20)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/ABELSG-.lsp b/src/algebra/strap/ABELSG-.lsp index c06795c0..c236bae4 100644 --- a/src/algebra/strap/ABELSG-.lsp +++ b/src/algebra/strap/ABELSG-.lsp @@ -11,7 +11,7 @@ (DEFUN |AbelianSemiGroup&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|AbelianSemiGroup&| |dv$1|)) ($ (|newShell| 11)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp index f23f32a4..8f78224b 100644 --- a/src/algebra/strap/BOOLEAN.lsp +++ b/src/algebra/strap/BOOLEAN.lsp @@ -164,7 +164,7 @@ (DEFUN |Boolean;| () (DECLARE (SPECIAL |$ConstructorCache|)) (LET ((|dv$| (LIST '|Boolean|)) ($ (|newShell| 39)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|haddProp| |$ConstructorCache| '|Boolean| NIL (CONS 1 $)) diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp index 76abf4fe..bc79fe2d 100644 --- a/src/algebra/strap/CHAR.lsp +++ b/src/algebra/strap/CHAR.lsp @@ -265,7 +265,7 @@ (DEFUN |Character;| () (DECLARE (SPECIAL |$ConstructorCache|)) (LET ((|dv$| (LIST '|Character|)) ($ (|newShell| 62)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|haddProp| |$ConstructorCache| '|Character| NIL (CONS 1 $)) diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index f84457bf..49298ff5 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -862,7 +862,7 @@ (DEFUN |DoubleFloat;| () (DECLARE (SPECIAL |$ConstructorCache|)) (LET ((|dv$| (LIST '|DoubleFloat|)) ($ (|newShell| 164)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|haddProp| |$ConstructorCache| '|DoubleFloat| NIL (CONS 1 $)) diff --git a/src/algebra/strap/DIVRING-.lsp b/src/algebra/strap/DIVRING-.lsp index ffcd2e1d..f84dd7e8 100644 --- a/src/algebra/strap/DIVRING-.lsp +++ b/src/algebra/strap/DIVRING-.lsp @@ -30,7 +30,7 @@ (DEFUN |DivisionRing&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|DivisionRing&| |dv$1|)) ($ (|newShell| 29)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/EUCDOM-.lsp b/src/algebra/strap/EUCDOM-.lsp index d9375a0c..e565cf0a 100644 --- a/src/algebra/strap/EUCDOM-.lsp +++ b/src/algebra/strap/EUCDOM-.lsp @@ -374,7 +374,7 @@ (DEFUN |EuclideanDomain&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|EuclideanDomain&| |dv$1|)) ($ (|newShell| 66)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp index ff4359c7..3972fc1e 100644 --- a/src/algebra/strap/FFIELDC-.lsp +++ b/src/algebra/strap/FFIELDC-.lsp @@ -529,7 +529,7 @@ (DEFUN |FiniteFieldCategory&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|FiniteFieldCategory&| |dv$1|)) - ($ (|newShell| 115)) (|pv$| (|buildPredVector| 0 0 NIL))) + ($ (|newShell| 115)) (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/GCDDOM-.lsp b/src/algebra/strap/GCDDOM-.lsp index 36dbbf51..8a412e1e 100644 --- a/src/algebra/strap/GCDDOM-.lsp +++ b/src/algebra/strap/GCDDOM-.lsp @@ -170,7 +170,7 @@ (DEFUN |GcdDomain&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|GcdDomain&| |dv$1|)) ($ (|newShell| 47)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/INS-.lsp b/src/algebra/strap/INS-.lsp index 19a232bd..387c559b 100644 --- a/src/algebra/strap/INS-.lsp +++ b/src/algebra/strap/INS-.lsp @@ -305,7 +305,7 @@ (DEFUN |IntegerNumberSystem&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|IntegerNumberSystem&| |dv$1|)) - ($ (|newShell| 93)) (|pv$| (|buildPredVector| 0 0 NIL))) + ($ (|newShell| 93)) (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp index 356a972e..407fb0df 100644 --- a/src/algebra/strap/INT.lsp +++ b/src/algebra/strap/INT.lsp @@ -514,7 +514,7 @@ (DEFUN |Integer;| () (DECLARE (SPECIAL |$ConstructorCache|)) (LET ((|dv$| (LIST '|Integer|)) ($ (|newShell| 140)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|haddProp| |$ConstructorCache| '|Integer| NIL (CONS 1 $)) diff --git a/src/algebra/strap/INTDOM-.lsp b/src/algebra/strap/INTDOM-.lsp index 6936faf3..1d9d7019 100644 --- a/src/algebra/strap/INTDOM-.lsp +++ b/src/algebra/strap/INTDOM-.lsp @@ -53,7 +53,7 @@ (DEFUN |IntegralDomain&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|IntegralDomain&| |dv$1|)) ($ (|newShell| 23)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp index 8adc9781..b07685bb 100644 --- a/src/algebra/strap/LSAGG-.lsp +++ b/src/algebra/strap/LSAGG-.lsp @@ -675,7 +675,7 @@ (DEFUN |ListAggregate&| (|#1| |#2|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|)) (|dv$| (LIST '|ListAggregate&| |dv$1| |dv$2|)) - ($ (|newShell| 78)) (|pv$| (|buildPredVector| 0 0 NIL))) + ($ (|newShell| 78)) (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/MONOID-.lsp b/src/algebra/strap/MONOID-.lsp index e8679174..9a3f9dc9 100644 --- a/src/algebra/strap/MONOID-.lsp +++ b/src/algebra/strap/MONOID-.lsp @@ -30,7 +30,7 @@ (DEFUN |Monoid&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|Monoid&| |dv$1|)) - ($ (|newShell| 21)) (|pv$| (|buildPredVector| 0 0 NIL))) + ($ (|newShell| 21)) (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp index 55d5f335..7cecef47 100644 --- a/src/algebra/strap/NNI.lsp +++ b/src/algebra/strap/NNI.lsp @@ -59,7 +59,7 @@ (DEFUN |NonNegativeInteger;| () (DECLARE (SPECIAL |$ConstructorCache|)) (LET ((|dv$| (LIST '|NonNegativeInteger|)) ($ (|newShell| 22)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|haddProp| |$ConstructorCache| '|NonNegativeInteger| NIL diff --git a/src/algebra/strap/ORDRING-.lsp b/src/algebra/strap/ORDRING-.lsp index 6204c289..9c344464 100644 --- a/src/algebra/strap/ORDRING-.lsp +++ b/src/algebra/strap/ORDRING-.lsp @@ -37,7 +37,7 @@ (DEFUN |OrderedRing&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|OrderedRing&| |dv$1|)) ($ (|newShell| 24)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp index dcf7b5d5..6dbfeb26 100644 --- a/src/algebra/strap/OUTFORM.lsp +++ b/src/algebra/strap/OUTFORM.lsp @@ -562,7 +562,7 @@ (|mathprint| |x|)) (DEFUN |OUTFORM;message;S$;7| (|s| $) - (COND ((ZEROP (LENGTH |s|)) (LIST 'NOTHING)) (T |s|))) + (COND ((ZEROP (LENGTH |s|)) '(NOTHING)) (T |s|))) (DEFUN |OUTFORM;messagePrint;SV;8| (|s| $) (|mathprint| (|OUTFORM;message;S$;7| |s| $))) @@ -637,16 +637,15 @@ ((PLUSP |n|) (|OUTFORM;vconcat;3$;50| " " (|OUTFORM;vspace;I$;28| (- |n| 1) $) $)) - (T (LIST 'NOTHING)))) + (T '(NOTHING)))) (DEFUN |OUTFORM;hspace;I$;29| (|n| $) - (COND ((PLUSP |n|) (|fillerSpaces| |n|)) (T (LIST 'NOTHING)))) + (COND ((PLUSP |n|) (|fillerSpaces| |n|)) (T '(NOTHING)))) (DEFUN |OUTFORM;rspace;2I$;30| (|n| |m| $) (SEQ (COND - ((PLUSP |n|) - (COND ((NOT (PLUSP |m|)) (EXIT (LIST 'NOTHING))))) - (T (EXIT (LIST 'NOTHING)))) + ((PLUSP |n|) (COND ((NOT (PLUSP |m|)) (EXIT '(NOTHING))))) + (T (EXIT '(NOTHING)))) (EXIT (|OUTFORM;vconcat;3$;50| (|OUTFORM;hspace;I$;29| |n| $) (|OUTFORM;rspace;2I$;30| |n| (- |m| 1) $) $)))) @@ -733,7 +732,7 @@ (DEFUN |OUTFORM;supersub;$L$;47| (|a| |l| $) (SEQ (COND ((ODDP (LIST-LENGTH |l|)) - (SETQ |l| (APPEND |l| (LIST (LIST 'NOTHING)))))) + (SETQ |l| (APPEND |l| '((NOTHING)))))) (EXIT (CONS 'ALTSUPERSUB (CONS |a| |l|))))) (DEFUN |OUTFORM;hconcat;3$;48| (|a| |b| $) @@ -834,7 +833,7 @@ (DECLARE (IGNORE $)) (LIST 'BINOMIAL |a| |b|)) -(DEFUN |OUTFORM;empty;$;73| ($) (DECLARE (IGNORE $)) (LIST 'NOTHING)) +(DEFUN |OUTFORM;empty;$;73| ($) (DECLARE (IGNORE $)) '(NOTHING)) (DEFUN |OUTFORM;infix?;$B;74| (|a| $) (LET ((|e| (COND @@ -855,7 +854,7 @@ (DEFUN |OUTFORM;infix;$L$;77| (|a| |l| $) (COND - ((NULL |l|) (LIST 'NOTHING)) + ((NULL |l|) '(NOTHING)) ((NULL (CDR |l|)) (SPADCALL |l| (|getShellEntry| $ 78))) ((|OUTFORM;infix?;$B;74| |a| $) (CONS |a| |l|)) (T (|OUTFORM;hconcat;L$;49| @@ -961,7 +960,7 @@ (DEFUN |OUTFORM;sum;2$;98| (|a| $) (DECLARE (IGNORE $)) - (LIST 'SIGMA (LIST 'NOTHING) |a|)) + (LIST 'SIGMA '(NOTHING) |a|)) (DEFUN |OUTFORM;sum;3$;99| (|a| |b| $) (DECLARE (IGNORE $)) @@ -973,7 +972,7 @@ (DEFUN |OUTFORM;prod;2$;101| (|a| $) (DECLARE (IGNORE $)) - (LIST 'PI (LIST 'NOTHING) |a|)) + (LIST 'PI '(NOTHING) |a|)) (DEFUN |OUTFORM;prod;3$;102| (|a| |b| $) (DECLARE (IGNORE $)) @@ -985,11 +984,11 @@ (DEFUN |OUTFORM;int;2$;104| (|a| $) (DECLARE (IGNORE $)) - (LIST 'INTSIGN (LIST 'NOTHING) (LIST 'NOTHING) |a|)) + (LIST 'INTSIGN '(NOTHING) '(NOTHING) |a|)) (DEFUN |OUTFORM;int;3$;105| (|a| |b| $) (DECLARE (IGNORE $)) - (LIST 'INTSIGN |b| (LIST 'NOTHING) |a|)) + (LIST 'INTSIGN |b| '(NOTHING) |a|)) (DEFUN |OUTFORM;int;4$;106| (|a| |b| |c| $) (DECLARE (IGNORE $)) @@ -1013,7 +1012,7 @@ (DEFUN |OutputForm;| () (DECLARE (SPECIAL |$ConstructorCache|)) (LET ((|dv$| (LIST '|OutputForm|)) ($ (|newShell| 150)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|haddProp| |$ConstructorCache| '|OutputForm| NIL (CONS 1 $)) diff --git a/src/algebra/strap/PI.lsp b/src/algebra/strap/PI.lsp index 350ddbe3..f83b73dd 100644 --- a/src/algebra/strap/PI.lsp +++ b/src/algebra/strap/PI.lsp @@ -23,7 +23,7 @@ (DEFUN |PositiveInteger;| () (DECLARE (SPECIAL |$ConstructorCache|)) (LET ((|dv$| (LIST '|PositiveInteger|)) ($ (|newShell| 16)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|haddProp| |$ConstructorCache| '|PositiveInteger| NIL (CONS 1 $)) diff --git a/src/algebra/strap/RING-.lsp b/src/algebra/strap/RING-.lsp index 17403409..423a18ef 100644 --- a/src/algebra/strap/RING-.lsp +++ b/src/algebra/strap/RING-.lsp @@ -9,7 +9,7 @@ (DEFUN |Ring&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|Ring&| |dv$1|)) - ($ (|newShell| 12)) (|pv$| (|buildPredVector| 0 0 NIL))) + ($ (|newShell| 12)) (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/RNS-.lsp b/src/algebra/strap/RNS-.lsp index 1a319cca..52d3b70f 100644 --- a/src/algebra/strap/RNS-.lsp +++ b/src/algebra/strap/RNS-.lsp @@ -123,7 +123,7 @@ (DEFUN |RealNumberSystem&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|RealNumberSystem&| |dv$1|)) ($ (|newShell| 58)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/SETAGG-.lsp b/src/algebra/strap/SETAGG-.lsp index 51617c5b..cfe090d0 100644 --- a/src/algebra/strap/SETAGG-.lsp +++ b/src/algebra/strap/SETAGG-.lsp @@ -32,7 +32,7 @@ (DEFUN |SetAggregate&| (|#1| |#2|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|)) (|dv$| (LIST '|SetAggregate&| |dv$1| |dv$2|)) - ($ (|newShell| 16)) (|pv$| (|buildPredVector| 0 0 NIL))) + ($ (|newShell| 16)) (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index 70423f3e..92ca2f6d 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -525,7 +525,7 @@ (DEFUN |SingleInteger;| () (DECLARE (SPECIAL |$ConstructorCache|)) (LET ((|dv$| (LIST '|SingleInteger|)) ($ (|newShell| 114)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|haddProp| |$ConstructorCache| '|SingleInteger| NIL (CONS 1 $)) diff --git a/src/algebra/strap/STAGG-.lsp b/src/algebra/strap/STAGG-.lsp index 60c28e58..1d78bbe3 100644 --- a/src/algebra/strap/STAGG-.lsp +++ b/src/algebra/strap/STAGG-.lsp @@ -228,7 +228,7 @@ (DEFUN |StreamAggregate&| (|#1| |#2|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|)) (|dv$| (LIST '|StreamAggregate&| |dv$1| |dv$2|)) - ($ (|newShell| 61)) (|pv$| (|buildPredVector| 0 0 NIL))) + ($ (|newShell| 61)) (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp index ce590b2c..82375c50 100644 --- a/src/algebra/strap/SYMBOL.lsp +++ b/src/algebra/strap/SYMBOL.lsp @@ -516,7 +516,7 @@ (SEQ (COND ((NOT (|SYMBOL;scripted?;$B;30| |sy| $)) (VECTOR NIL NIL NIL NIL NIL)) - (T (SEQ (LETT |nscripts| (LIST 0 0 0 0 0) + (T (SEQ (LETT |nscripts| '(0 0 0 0 0) |SYMBOL;scripts;$R;32|) (LETT |lscripts| (LIST NIL NIL NIL NIL NIL) |SYMBOL;scripts;$R;32|) @@ -640,7 +640,7 @@ (DEFUN |Symbol;| () (DECLARE (SPECIAL |$ConstructorCache|)) (LET ((|dv$| (LIST '|Symbol|)) ($ (|newShell| 165)) - (|pv$| (|buildPredVector| 0 0 NIL))) + (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|haddProp| |$ConstructorCache| '|Symbol| NIL (CONS 1 $)) @@ -648,7 +648,7 @@ (|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") + (SPADCALL '("0" "1" "2" "3" "4" "5" "6" "7" "8" "9") (|getShellEntry| $ 17))) (|setShellEntry| $ 19 "0123456789") (|setShellEntry| $ 20 "ABCDEFGHIJKLMNOPQRSTUVWXYZ") diff --git a/src/algebra/strap/UFD-.lsp b/src/algebra/strap/UFD-.lsp index 22eb430f..04e97f69 100644 --- a/src/algebra/strap/UFD-.lsp +++ b/src/algebra/strap/UFD-.lsp @@ -41,7 +41,7 @@ (DEFUN |UniqueFactorizationDomain&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$| (LIST '|UniqueFactorizationDomain&| |dv$1|)) - ($ (|newShell| 29)) (|pv$| (|buildPredVector| 0 0 NIL))) + ($ (|newShell| 29)) (|pv$| (|buildPredVector| 0 0 (LIST)))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|stuffDomainSlots| $) diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot index 95b36c06..50846d50 100644 --- a/src/interp/g-util.boot +++ b/src/interp/g-util.boot @@ -250,8 +250,13 @@ expandCollect ['%collect,:iters,body] == expandListlit(x is ['%listlit,:args]) == args := [expandToVMForm arg for arg in args] args = nil => nil - and/[integer? arg or string? arg for arg in args] => quoteForm args - ['LIST,:args] + args' := [simpleValue? arg or leave 'failed for arg in args] + where simpleValue? arg == + integer? arg or string? arg => arg + arg is ['QUOTE,form] => form + nil + args' = 'failed => ['LIST,:args] + quoteForm args' expandReturn(x is ['%return,.,y]) == $FUNNAME = nil => systemErrorHere ['expandReturn,x] |