aboutsummaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2011-05-18 06:05:00 +0000
committerdos-reis <gdr@axiomatics.org>2011-05-18 06:05:00 +0000
commit533e9e17fca7fcb9c819a49608501408f1d76b6e (patch)
tree3fbdb971351c9268642b0fcfac9ef16be892b10e /src/boot
parentfd748db1e503f9d27de5b91ba607c550ccd16991 (diff)
downloadopen-axiom-533e9e17fca7fcb9c819a49608501408f1d76b6e.tar.gz
* boot/translator.boot: Remove bindings of $GenVarCounter.
* boot/parser.boot (bpOutItem): Bind it here.
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/ast.boot2
-rw-r--r--src/boot/parser.boot3
-rw-r--r--src/boot/strap/ast.clisp1135
-rw-r--r--src/boot/strap/parser.clisp5
-rw-r--r--src/boot/strap/scanner.clisp8
-rw-r--r--src/boot/strap/tokens.clisp113
-rw-r--r--src/boot/strap/translator.clisp296
-rw-r--r--src/boot/translator.boot12
8 files changed, 754 insertions, 820 deletions
diff --git a/src/boot/ast.boot b/src/boot/ast.boot
index 75e582e6..93951c19 100644
--- a/src/boot/ast.boot
+++ b/src/boot/ast.boot
@@ -876,7 +876,7 @@ shoeComps x==
[shoeComp def for def in x]
shoeComp x==
- a:=shoeCompTran second x
+ a := shoeCompTran second x
a is ["LAMBDA",:.] => ["DEFUN",first x,second a,:CDDR a]
["DEFMACRO",first x,second a,:CDDR a]
diff --git a/src/boot/parser.boot b/src/boot/parser.boot
index 472d98ac..dd42631d 100644
--- a/src/boot/parser.boot
+++ b/src/boot/parser.boot
@@ -1175,7 +1175,8 @@ bpCaseItem()==
++ Main entry point into the parser module.
bpOutItem()==
- $op := nil
+ $op: local := nil
+ $GenVarCounter: local := 0
bpComma() or bpTrap()
b := bpPop1()
bpPush
diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp
index beae254d..266b7e21 100644
--- a/src/boot/strap/ast.clisp
+++ b/src/boot/strap/ast.clisp
@@ -294,20 +294,20 @@
(PROGN
(SETQ |a| (COND ((|bfTupleP| |b|) (CDR |b|)) (T (LIST |b|))))
(COND
- ((LET ((|bfVar#89| NIL) (|bfVar#88| |a|) (|x| NIL))
+ ((LET ((|bfVar#2| NIL) (|bfVar#1| |a|) (|x| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#88|)
- (PROGN (SETQ |x| (CAR |bfVar#88|)) NIL))
- (RETURN |bfVar#89|))
- (T (SETQ |bfVar#89|
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |x| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ (T (SETQ |bfVar#2|
(AND (CONSP |x|) (EQ (CAR |x|) 'COLON)
(PROGN
(SETQ |ISTMP#1| (CDR |x|))
(AND (CONSP |ISTMP#1|)
(NULL (CDR |ISTMP#1|))))))
- (COND (|bfVar#89| (RETURN |bfVar#89|)))))
- (SETQ |bfVar#88| (CDR |bfVar#88|))))
+ (COND (|bfVar#2| (RETURN |bfVar#2|)))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))
(|bfMakeCons| |a|))
(T (CONS 'LIST |a|)))))))
@@ -476,22 +476,22 @@
(COND
((NULL |iters|) (LIST NIL NIL NIL NIL NIL NIL))
(T (SETQ |f| (CAR |iters|)) (SETQ |r| (|bfSep| (CDR |iters|)))
- (LET ((|bfVar#92| NIL) (|bfVar#93| NIL) (|bfVar#90| |f|)
- (|i| NIL) (|bfVar#91| |r|) (|j| NIL))
+ (LET ((|bfVar#3| NIL) (|bfVar#4| NIL) (|bfVar#1| |f|)
+ (|i| NIL) (|bfVar#2| |r|) (|j| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#90|)
- (PROGN (SETQ |i| (CAR |bfVar#90|)) NIL)
- (ATOM |bfVar#91|)
- (PROGN (SETQ |j| (CAR |bfVar#91|)) NIL))
- (RETURN |bfVar#92|))
- ((NULL |bfVar#92|)
- (SETQ |bfVar#92| #0=(CONS (|append| |i| |j|) NIL))
- (SETQ |bfVar#93| |bfVar#92|))
- (T (RPLACD |bfVar#93| #0#)
- (SETQ |bfVar#93| (CDR |bfVar#93|))))
- (SETQ |bfVar#90| (CDR |bfVar#90|))
- (SETQ |bfVar#91| (CDR |bfVar#91|)))))))))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL)
+ (ATOM |bfVar#2|)
+ (PROGN (SETQ |j| (CAR |bfVar#2|)) NIL))
+ (RETURN |bfVar#3|))
+ ((NULL |bfVar#3|)
+ (SETQ |bfVar#3| #0=(CONS (|append| |i| |j|) NIL))
+ (SETQ |bfVar#4| |bfVar#3|))
+ (T (RPLACD |bfVar#4| #0#)
+ (SETQ |bfVar#4| (CDR |bfVar#4|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))
+ (SETQ |bfVar#2| (CDR |bfVar#2|)))))))))
(DEFUN |bfReduce| (|op| |y|)
(PROG (|it| |ny| |g2| |body| |g1| |g| |init| |a|)
@@ -635,28 +635,28 @@
(COND
(|vars| (SETQ |loop|
(LIST 'LET
- (LET ((|bfVar#96| NIL) (|bfVar#97| NIL)
- (|bfVar#94| |vars|) (|v| NIL)
- (|bfVar#95| |inits|) (|i| NIL))
+ (LET ((|bfVar#3| NIL) (|bfVar#4| NIL)
+ (|bfVar#1| |vars|) (|v| NIL)
+ (|bfVar#2| |inits|) (|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#94|)
+ ((OR (ATOM |bfVar#1|)
(PROGN
- (SETQ |v| (CAR |bfVar#94|))
+ (SETQ |v| (CAR |bfVar#1|))
NIL)
- (ATOM |bfVar#95|)
+ (ATOM |bfVar#2|)
(PROGN
- (SETQ |i| (CAR |bfVar#95|))
+ (SETQ |i| (CAR |bfVar#2|))
NIL))
- (RETURN |bfVar#96|))
- ((NULL |bfVar#96|)
- (SETQ |bfVar#96|
+ (RETURN |bfVar#3|))
+ ((NULL |bfVar#3|)
+ (SETQ |bfVar#3|
#2=(CONS (LIST |v| |i|) NIL))
- (SETQ |bfVar#97| |bfVar#96|))
- (T (RPLACD |bfVar#97| #2#)
- (SETQ |bfVar#97| (CDR |bfVar#97|))))
- (SETQ |bfVar#94| (CDR |bfVar#94|))
- (SETQ |bfVar#95| (CDR |bfVar#95|))))
+ (SETQ |bfVar#4| |bfVar#3|))
+ (T (RPLACD |bfVar#4| #2#)
+ (SETQ |bfVar#4| (CDR |bfVar#4|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))
+ (SETQ |bfVar#2| (CDR |bfVar#2|))))
|loop|))))
|loop|))))
@@ -1169,51 +1169,51 @@
(AND (CONSP |ISTMP#1|) (NULL (CDR |ISTMP#1|))
(PROGN (SETQ |seq| (CAR |ISTMP#1|)) T)))
(CONSP |seq|)
- (LET ((|bfVar#99| T) (|bfVar#98| |seq|) (|y| NIL))
+ (LET ((|bfVar#2| T) (|bfVar#1| |seq|) (|y| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#98|)
- (PROGN (SETQ |y| (CAR |bfVar#98|)) NIL))
- (RETURN |bfVar#99|))
- (T (SETQ |bfVar#99| (APPLY |pred| |y| NIL))
- (COND ((NOT |bfVar#99|) (RETURN NIL)))))
- (SETQ |bfVar#98| (CDR |bfVar#98|))))))))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |y| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ (T (SETQ |bfVar#2| (APPLY |pred| |y| NIL))
+ (COND ((NOT |bfVar#2|) (RETURN NIL)))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))))))
(DEFUN |idList?| (|x|)
(AND (CONSP |x|) (EQ (CAR |x|) 'LIST)
- (LET ((|bfVar#101| T) (|bfVar#100| (CDR |x|)) (|arg| NIL))
+ (LET ((|bfVar#2| T) (|bfVar#1| (CDR |x|)) (|arg| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#100|)
- (PROGN (SETQ |arg| (CAR |bfVar#100|)) NIL))
- (RETURN |bfVar#101|))
- (T (SETQ |bfVar#101| (|defQuoteId| |arg|))
- (COND ((NOT |bfVar#101|) (RETURN NIL)))))
- (SETQ |bfVar#100| (CDR |bfVar#100|))))))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |arg| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ (T (SETQ |bfVar#2| (|defQuoteId| |arg|))
+ (COND ((NOT |bfVar#2|) (RETURN NIL)))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))))
(DEFUN |charList?| (|x|)
(AND (CONSP |x|) (EQ (CAR |x|) 'LIST)
- (LET ((|bfVar#103| T) (|bfVar#102| (CDR |x|)) (|arg| NIL))
+ (LET ((|bfVar#2| T) (|bfVar#1| (CDR |x|)) (|arg| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#102|)
- (PROGN (SETQ |arg| (CAR |bfVar#102|)) NIL))
- (RETURN |bfVar#103|))
- (T (SETQ |bfVar#103| (|bfChar?| |arg|))
- (COND ((NOT |bfVar#103|) (RETURN NIL)))))
- (SETQ |bfVar#102| (CDR |bfVar#102|))))))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |arg| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ (T (SETQ |bfVar#2| (|bfChar?| |arg|))
+ (COND ((NOT |bfVar#2|) (RETURN NIL)))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))))
(DEFUN |stringList?| (|x|)
(AND (CONSP |x|) (EQ (CAR |x|) 'LIST)
- (LET ((|bfVar#105| T) (|bfVar#104| (CDR |x|)) (|arg| NIL))
+ (LET ((|bfVar#2| T) (|bfVar#1| (CDR |x|)) (|arg| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#104|)
- (PROGN (SETQ |arg| (CAR |bfVar#104|)) NIL))
- (RETURN |bfVar#105|))
- (T (SETQ |bfVar#105| (|bfString?| |arg|))
- (COND ((NOT |bfVar#105|) (RETURN NIL)))))
- (SETQ |bfVar#104| (CDR |bfVar#104|))))))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |arg| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ (T (SETQ |bfVar#2| (|bfString?| |arg|))
+ (COND ((NOT |bfVar#2|) (RETURN NIL)))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))))
(DEFUN |bfMember| (|var| |seq|)
(PROG (|y| |x| |ISTMP#2| |ISTMP#1|)
@@ -1363,48 +1363,44 @@
((NULL |l|) NIL)
((NULL (CDR |l|)) (CAR |l|))
(T (CONS 'OR
- (LET ((|bfVar#107| NIL) (|bfVar#108| NIL)
- (|bfVar#106| |l|) (|c| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL) (|bfVar#1| |l|)
+ (|c| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#106|)
- (PROGN (SETQ |c| (CAR |bfVar#106|)) NIL))
- (RETURN |bfVar#107|))
- (T (LET ((|bfVar#109|
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |c| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ (T (LET ((|bfVar#4|
(|copyList| (|bfFlatten| 'OR |c|))))
(COND
- ((NULL |bfVar#109|) NIL)
- ((NULL |bfVar#107|)
- (SETQ |bfVar#107| |bfVar#109|)
- (SETQ |bfVar#108| (|lastNode| |bfVar#107|)))
- (T (RPLACD |bfVar#108| |bfVar#109|)
- (SETQ |bfVar#108|
- (|lastNode| |bfVar#108|)))))))
- (SETQ |bfVar#106| (CDR |bfVar#106|))))))))
+ ((NULL |bfVar#4|) NIL)
+ ((NULL |bfVar#2|) (SETQ |bfVar#2| |bfVar#4|)
+ (SETQ |bfVar#3| (|lastNode| |bfVar#2|)))
+ (T (RPLACD |bfVar#3| |bfVar#4|)
+ (SETQ |bfVar#3| (|lastNode| |bfVar#3|)))))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))))))
(DEFUN |bfAND| (|l|)
(COND
((NULL |l|) T)
((NULL (CDR |l|)) (CAR |l|))
(T (CONS 'AND
- (LET ((|bfVar#111| NIL) (|bfVar#112| NIL)
- (|bfVar#110| |l|) (|c| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL) (|bfVar#1| |l|)
+ (|c| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#110|)
- (PROGN (SETQ |c| (CAR |bfVar#110|)) NIL))
- (RETURN |bfVar#111|))
- (T (LET ((|bfVar#113|
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |c| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ (T (LET ((|bfVar#4|
(|copyList| (|bfFlatten| 'AND |c|))))
(COND
- ((NULL |bfVar#113|) NIL)
- ((NULL |bfVar#111|)
- (SETQ |bfVar#111| |bfVar#113|)
- (SETQ |bfVar#112| (|lastNode| |bfVar#111|)))
- (T (RPLACD |bfVar#112| |bfVar#113|)
- (SETQ |bfVar#112|
- (|lastNode| |bfVar#112|)))))))
- (SETQ |bfVar#110| (CDR |bfVar#110|))))))))
+ ((NULL |bfVar#4|) NIL)
+ ((NULL |bfVar#2|) (SETQ |bfVar#2| |bfVar#4|)
+ (SETQ |bfVar#3| (|lastNode| |bfVar#2|)))
+ (T (RPLACD |bfVar#3| |bfVar#4|)
+ (SETQ |bfVar#3| (|lastNode| |bfVar#3|)))))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))))))
(DEFUN |defQuoteId| (|x|)
(AND (CONSP |x|) (EQ (CAR |x|) 'QUOTE) (SYMBOLP (CADR |x|))))
@@ -1467,69 +1463,67 @@
(SETQ |nargl| (CADDR . #0#))
(SETQ |largl| (CADDDR . #0#))
(SETQ |sb|
- (LET ((|bfVar#116| NIL) (|bfVar#117| NIL)
- (|bfVar#114| |nargl|) (|i| NIL)
- (|bfVar#115| |sgargl|) (|j| NIL))
+ (LET ((|bfVar#3| NIL) (|bfVar#4| NIL) (|bfVar#1| |nargl|)
+ (|i| NIL) (|bfVar#2| |sgargl|) (|j| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#114|)
- (PROGN (SETQ |i| (CAR |bfVar#114|)) NIL)
- (ATOM |bfVar#115|)
- (PROGN (SETQ |j| (CAR |bfVar#115|)) NIL))
- (RETURN |bfVar#116|))
- ((NULL |bfVar#116|)
- (SETQ |bfVar#116| #1=(CONS (CONS |i| |j|) NIL))
- (SETQ |bfVar#117| |bfVar#116|))
- (T (RPLACD |bfVar#117| #1#)
- (SETQ |bfVar#117| (CDR |bfVar#117|))))
- (SETQ |bfVar#114| (CDR |bfVar#114|))
- (SETQ |bfVar#115| (CDR |bfVar#115|)))))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL)
+ (ATOM |bfVar#2|)
+ (PROGN (SETQ |j| (CAR |bfVar#2|)) NIL))
+ (RETURN |bfVar#3|))
+ ((NULL |bfVar#3|)
+ (SETQ |bfVar#3| #1=(CONS (CONS |i| |j|) NIL))
+ (SETQ |bfVar#4| |bfVar#3|))
+ (T (RPLACD |bfVar#4| #1#)
+ (SETQ |bfVar#4| (CDR |bfVar#4|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))
+ (SETQ |bfVar#2| (CDR |bfVar#2|)))))
(SETQ |body| (|applySubst| |sb| |body|))
(SETQ |sb2|
- (LET ((|bfVar#120| NIL) (|bfVar#121| NIL)
- (|bfVar#118| |sgargl|) (|i| NIL)
- (|bfVar#119| |largl|) (|j| NIL))
+ (LET ((|bfVar#7| NIL) (|bfVar#8| NIL)
+ (|bfVar#5| |sgargl|) (|i| NIL) (|bfVar#6| |largl|)
+ (|j| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#118|)
- (PROGN (SETQ |i| (CAR |bfVar#118|)) NIL)
- (ATOM |bfVar#119|)
- (PROGN (SETQ |j| (CAR |bfVar#119|)) NIL))
- (RETURN |bfVar#120|))
- ((NULL |bfVar#120|)
- (SETQ |bfVar#120|
+ ((OR (ATOM |bfVar#5|)
+ (PROGN (SETQ |i| (CAR |bfVar#5|)) NIL)
+ (ATOM |bfVar#6|)
+ (PROGN (SETQ |j| (CAR |bfVar#6|)) NIL))
+ (RETURN |bfVar#7|))
+ ((NULL |bfVar#7|)
+ (SETQ |bfVar#7|
#2=(CONS (LIST 'CONS (LIST 'QUOTE |i|) |j|)
NIL))
- (SETQ |bfVar#121| |bfVar#120|))
- (T (RPLACD |bfVar#121| #2#)
- (SETQ |bfVar#121| (CDR |bfVar#121|))))
- (SETQ |bfVar#118| (CDR |bfVar#118|))
- (SETQ |bfVar#119| (CDR |bfVar#119|)))))
+ (SETQ |bfVar#8| |bfVar#7|))
+ (T (RPLACD |bfVar#8| #2#)
+ (SETQ |bfVar#8| (CDR |bfVar#8|))))
+ (SETQ |bfVar#5| (CDR |bfVar#5|))
+ (SETQ |bfVar#6| (CDR |bfVar#6|)))))
(SETQ |body|
(LIST '|applySubst| (CONS 'LIST |sb2|)
(LIST 'QUOTE |body|)))
(SETQ |lamex| (LIST 'MLAMBDA |gargl| |body|))
(SETQ |def| (LIST |op| |lamex|))
(CONS (|shoeComp| |def|)
- (LET ((|bfVar#123| NIL) (|bfVar#124| NIL)
- (|bfVar#122| |$wheredefs|) (|d| NIL))
+ (LET ((|bfVar#10| NIL) (|bfVar#11| NIL)
+ (|bfVar#9| |$wheredefs|) (|d| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#122|)
- (PROGN (SETQ |d| (CAR |bfVar#122|)) NIL))
- (RETURN |bfVar#123|))
- (T (LET ((|bfVar#125|
+ ((OR (ATOM |bfVar#9|)
+ (PROGN (SETQ |d| (CAR |bfVar#9|)) NIL))
+ (RETURN |bfVar#10|))
+ (T (LET ((|bfVar#12|
(|copyList|
(|shoeComps| (|bfDef1| |d|)))))
(COND
- ((NULL |bfVar#125|) NIL)
- ((NULL |bfVar#123|)
- (SETQ |bfVar#123| |bfVar#125|)
- (SETQ |bfVar#124| (|lastNode| |bfVar#123|)))
- (T (RPLACD |bfVar#124| |bfVar#125|)
- (SETQ |bfVar#124|
- (|lastNode| |bfVar#124|)))))))
- (SETQ |bfVar#122| (CDR |bfVar#122|)))))))))
+ ((NULL |bfVar#12|) NIL)
+ ((NULL |bfVar#10|)
+ (SETQ |bfVar#10| |bfVar#12|)
+ (SETQ |bfVar#11| (|lastNode| |bfVar#10|)))
+ (T (RPLACD |bfVar#11| |bfVar#12|)
+ (SETQ |bfVar#11| (|lastNode| |bfVar#11|)))))))
+ (SETQ |bfVar#9| (CDR |bfVar#9|)))))))))
(DEFUN |bfGargl| (|argl|)
(PROG (|f| |d| |c| |b| |a| |LETTMP#1|)
@@ -1549,13 +1543,13 @@
(LIST (CONS |f| |a|) (CONS |f| |b|)
(CONS (CAR |argl|) |c|) (CONS |f| |d|)))))))))
-(DEFUN |bfDef1| (|bfVar#126|)
+(DEFUN |bfDef1| (|bfVar#1|)
(PROG (|arglp| |control| |quotes| |LETTMP#1| |argl| |body| |args|
|op|)
(RETURN
(PROGN
- (SETQ |op| (CAR |bfVar#126|))
- (SETQ |args| (CADR . #0=(|bfVar#126|)))
+ (SETQ |op| (CAR |bfVar#1|))
+ (SETQ |args| (CADR . #0=(|bfVar#1|)))
(SETQ |body| (CADDR . #0#))
(SETQ |argl|
(COND
@@ -1596,43 +1590,38 @@
(SETQ |arg1| (CADDR . #0#)) (SETQ |body1| (CDDDR . #0#))
(|bfCompHash| |op1| |arg1| |body1|))
(T (|bfTuple|
- (LET ((|bfVar#128| NIL) (|bfVar#129| NIL)
- (|bfVar#127|
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL)
+ (|bfVar#1|
(CONS (LIST |op| |args| |body|) |$wheredefs|))
(|d| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#127|)
- (PROGN (SETQ |d| (CAR |bfVar#127|)) NIL))
- (RETURN |bfVar#128|))
- (T (LET ((|bfVar#130|
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |d| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ (T (LET ((|bfVar#4|
(|copyList|
(|shoeComps| (|bfDef1| |d|)))))
(COND
- ((NULL |bfVar#130|) NIL)
- ((NULL |bfVar#128|)
- (SETQ |bfVar#128| |bfVar#130|)
- (SETQ |bfVar#129|
- (|lastNode| |bfVar#128|)))
- (T (RPLACD |bfVar#129| |bfVar#130|)
- (SETQ |bfVar#129|
- (|lastNode| |bfVar#129|)))))))
- (SETQ |bfVar#127| (CDR |bfVar#127|))))))))))
+ ((NULL |bfVar#4|) NIL)
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2| |bfVar#4|)
+ (SETQ |bfVar#3| (|lastNode| |bfVar#2|)))
+ (T (RPLACD |bfVar#3| |bfVar#4|)
+ (SETQ |bfVar#3| (|lastNode| |bfVar#3|)))))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))))))))
(DEFUN |shoeComps| (|x|)
- (LET ((|bfVar#132| NIL) (|bfVar#133| NIL) (|bfVar#131| |x|)
- (|def| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL) (|bfVar#1| |x|) (|def| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#131|)
- (PROGN (SETQ |def| (CAR |bfVar#131|)) NIL))
- (RETURN |bfVar#132|))
- ((NULL |bfVar#132|)
- (SETQ |bfVar#132| #0=(CONS (|shoeComp| |def|) NIL))
- (SETQ |bfVar#133| |bfVar#132|))
- (T (RPLACD |bfVar#133| #0#)
- (SETQ |bfVar#133| (CDR |bfVar#133|))))
- (SETQ |bfVar#131| (CDR |bfVar#131|)))))
+ ((OR (ATOM |bfVar#1|) (PROGN (SETQ |def| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2| #0=(CONS (|shoeComp| |def|) NIL))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #0#) (SETQ |bfVar#3| (CDR |bfVar#3|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(DEFUN |shoeComp| (|x|)
(PROG (|a|)
@@ -1777,15 +1766,15 @@
((|symbolMember?| |op|
'(LET PROG LOOP BLOCK DECLARE LAMBDA))
NIL)
- (T (LET ((|bfVar#135| NIL) (|bfVar#134| |body|) (|t| NIL))
+ (T (LET ((|bfVar#2| NIL) (|bfVar#1| |body|) (|t| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#134|)
- (PROGN (SETQ |t| (CAR |bfVar#134|)) NIL))
- (RETURN |bfVar#135|))
- (T (SETQ |bfVar#135| (|needsPROG| |t|))
- (COND (|bfVar#135| (RETURN |bfVar#135|)))))
- (SETQ |bfVar#134| (CDR |bfVar#134|)))))))))))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |t| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ (T (SETQ |bfVar#2| (|needsPROG| |t|))
+ (COND (|bfVar#2| (RETURN |bfVar#2|)))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))))))))
(DEFUN |shoePROG| (|v| |b|)
(PROG (|blist| |blast| |LETTMP#1|)
@@ -1893,11 +1882,11 @@
((EQ U '|%Leave|) (RPLACA |x| 'RETURN) |x|)
((|symbolMember?| U '(PROG LAMBDA))
(SETQ |newbindings| NIL)
- (LET ((|bfVar#136| (CADR |x|)) (|y| NIL))
+ (LET ((|bfVar#1| (CADR |x|)) (|y| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#136|)
- (PROGN (SETQ |y| (CAR |bfVar#136|)) NIL))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |y| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
((NOT (|symbolMember?| |y| |$locVars|))
(IDENTITY
@@ -1905,29 +1894,25 @@
(SETQ |$locVars| (CONS |y| |$locVars|))
(SETQ |newbindings|
(CONS |y| |newbindings|))))))
- (SETQ |bfVar#136| (CDR |bfVar#136|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))
(RPLACD (CDR |x|) (|shoeCompTran1| (CDDR |x|)))
(SETQ |$locVars|
- (LET ((|bfVar#138| NIL) (|bfVar#139| NIL)
- (|bfVar#137| |$locVars|) (|y| NIL))
+ (LET ((|bfVar#3| NIL) (|bfVar#4| NIL)
+ (|bfVar#2| |$locVars|) (|y| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#137|)
- (PROGN
- (SETQ |y| (CAR |bfVar#137|))
- NIL))
- (RETURN |bfVar#138|))
+ ((OR (ATOM |bfVar#2|)
+ (PROGN (SETQ |y| (CAR |bfVar#2|)) NIL))
+ (RETURN |bfVar#3|))
(T (AND (NOT (|symbolMember?| |y|
|newbindings|))
(COND
- ((NULL |bfVar#138|)
- (SETQ |bfVar#138|
- #0=(CONS |y| NIL))
- (SETQ |bfVar#139| |bfVar#138|))
- (T (RPLACD |bfVar#139| #0#)
- (SETQ |bfVar#139|
- (CDR |bfVar#139|)))))))
- (SETQ |bfVar#137| (CDR |bfVar#137|)))))
+ ((NULL |bfVar#3|)
+ (SETQ |bfVar#3| #0=(CONS |y| NIL))
+ (SETQ |bfVar#4| |bfVar#3|))
+ (T (RPLACD |bfVar#4| #0#)
+ (SETQ |bfVar#4| (CDR |bfVar#4|)))))))
+ (SETQ |bfVar#2| (CDR |bfVar#2|)))))
|x|)
((AND (CONSP |x|) (EQ (CAR |x|) '|vector|)
(PROGN
@@ -2044,20 +2029,18 @@
(RETURN
(PROGN
(SETQ |a|
- (LET ((|bfVar#140| NIL) (|bfVar#141| NIL) (|c| |l|))
+ (LET ((|bfVar#1| NIL) (|bfVar#2| NIL) (|c| |l|))
(LOOP
(COND
- ((ATOM |c|) (RETURN |bfVar#140|))
- (T (LET ((|bfVar#142|
+ ((ATOM |c|) (RETURN |bfVar#1|))
+ (T (LET ((|bfVar#3|
(|copyList| (|bfFlattenSeq| |c|))))
(COND
- ((NULL |bfVar#142|) NIL)
- ((NULL |bfVar#140|)
- (SETQ |bfVar#140| |bfVar#142|)
- (SETQ |bfVar#141| (|lastNode| |bfVar#140|)))
- (T (RPLACD |bfVar#141| |bfVar#142|)
- (SETQ |bfVar#141|
- (|lastNode| |bfVar#141|)))))))
+ ((NULL |bfVar#3|) NIL)
+ ((NULL |bfVar#1|) (SETQ |bfVar#1| |bfVar#3|)
+ (SETQ |bfVar#2| (|lastNode| |bfVar#1|)))
+ (T (RPLACD |bfVar#2| |bfVar#3|)
+ (SETQ |bfVar#2| (|lastNode| |bfVar#2|)))))))
(SETQ |c| (CDR |c|)))))
(COND
((NULL |a|) NIL)
@@ -2075,22 +2058,21 @@
((AND (CONSP |f|) (EQ (CAR |f|) 'PROGN))
(COND
((CDR |x|)
- (LET ((|bfVar#144| NIL) (|bfVar#145| NIL)
- (|bfVar#143| (CDR |f|)) (|i| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL)
+ (|bfVar#1| (CDR |f|)) (|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#143|)
- (PROGN (SETQ |i| (CAR |bfVar#143|)) NIL))
- (RETURN |bfVar#144|))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
(T (AND (NOT (ATOM |i|))
(COND
- ((NULL |bfVar#144|)
- (SETQ |bfVar#144| #0=(CONS |i| NIL))
- (SETQ |bfVar#145| |bfVar#144|))
- (T (RPLACD |bfVar#145| #0#)
- (SETQ |bfVar#145|
- (CDR |bfVar#145|)))))))
- (SETQ |bfVar#143| (CDR |bfVar#143|)))))
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2| #0=(CONS |i| NIL))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #0#)
+ (SETQ |bfVar#3| (CDR |bfVar#3|)))))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(T (CDR |f|))))
(T (LIST |f|))))))))
@@ -2139,12 +2121,12 @@
(COND
((NULL |l|) NIL)
(T (SETQ |transform|
- (LET ((|bfVar#147| NIL) (|bfVar#148| NIL)
- (|bfVar#146| |l|) (|x| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL) (|bfVar#1| |l|)
+ (|x| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#146|)
- (PROGN (SETQ |x| (CAR |bfVar#146|)) NIL)
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |x| (CAR |bfVar#1|)) NIL)
(NOT (AND (CONSP |x|) (EQ (CAR |x|) 'COND)
(PROGN
(SETQ |ISTMP#1| (CDR |x|))
@@ -2178,14 +2160,14 @@
(SETQ |b|
(CAR |ISTMP#5|))
T))))))))))))))
- (RETURN |bfVar#147|))
- ((NULL |bfVar#147|)
- (SETQ |bfVar#147|
+ (RETURN |bfVar#2|))
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2|
#0=(CONS (|bfAlternative| |a| |b|) NIL))
- (SETQ |bfVar#148| |bfVar#147|))
- (T (RPLACD |bfVar#148| #0#)
- (SETQ |bfVar#148| (CDR |bfVar#148|))))
- (SETQ |bfVar#146| (CDR |bfVar#146|)))))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #0#)
+ (SETQ |bfVar#3| (CDR |bfVar#3|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(SETQ |no| (LENGTH |transform|))
(SETQ |before| (|bfTake| |no| |l|))
(SETQ |aft| (|bfDrop| |no| |l|))
@@ -2217,22 +2199,22 @@
(SETQ |defs| (CADR . #0=(|LETTMP#1|)))
(SETQ |nondefs| (CADDR . #0#))
(SETQ |a|
- (LET ((|bfVar#150| NIL) (|bfVar#151| NIL)
- (|bfVar#149| |defs|) (|d| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL) (|bfVar#1| |defs|)
+ (|d| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#149|)
- (PROGN (SETQ |d| (CAR |bfVar#149|)) NIL))
- (RETURN |bfVar#150|))
- ((NULL |bfVar#150|)
- (SETQ |bfVar#150|
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |d| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2|
#1=(CONS (LIST (CAR |d|) (CADR |d|)
(|bfSUBLIS| |opassoc| (CADDR |d|)))
NIL))
- (SETQ |bfVar#151| |bfVar#150|))
- (T (RPLACD |bfVar#151| #1#)
- (SETQ |bfVar#151| (CDR |bfVar#151|))))
- (SETQ |bfVar#149| (CDR |bfVar#149|)))))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #1#)
+ (SETQ |bfVar#3| (CDR |bfVar#3|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(SETQ |$wheredefs| (|append| |a| |$wheredefs|))
(|bfMKPROGN|
(|bfSUBLIS| |opassoc| (|append!| |nondefs| (LIST |expr|))))))))
@@ -2319,20 +2301,19 @@
((AND (CONSP |x|) (NULL (CDR |x|))) (SETQ |f| (CAR |x|))
(LIST 'DEFCONSTANT |f| (LIST 'LIST (LIST 'QUOTE |f|))))
(T (SETQ |a|
- (LET ((|bfVar#153| NIL) (|bfVar#154| NIL)
- (|bfVar#152| (CDR |x|)) (|i| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL)
+ (|bfVar#1| (CDR |x|)) (|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#152|)
- (PROGN (SETQ |i| (CAR |bfVar#152|)) NIL))
- (RETURN |bfVar#153|))
- ((NULL |bfVar#153|)
- (SETQ |bfVar#153|
- #0=(CONS (|bfGenSymbol|) NIL))
- (SETQ |bfVar#154| |bfVar#153|))
- (T (RPLACD |bfVar#154| #0#)
- (SETQ |bfVar#154| (CDR |bfVar#154|))))
- (SETQ |bfVar#152| (CDR |bfVar#152|)))))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2| #0=(CONS (|bfGenSymbol|) NIL))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #0#)
+ (SETQ |bfVar#3| (CDR |bfVar#3|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(LIST 'DEFUN (CAR |x|) |a|
(LIST 'CONS (LIST 'QUOTE (CAR |x|)) (CONS 'LIST |a|))))))))
@@ -2361,27 +2342,27 @@
(DEFUN |bfCaseItems| (|g| |x|)
(PROG (|j| |ISTMP#1| |i|)
(RETURN
- (LET ((|bfVar#157| NIL) (|bfVar#158| NIL) (|bfVar#156| |x|)
- (|bfVar#155| NIL))
+ (LET ((|bfVar#3| NIL) (|bfVar#4| NIL) (|bfVar#2| |x|)
+ (|bfVar#1| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#156|)
- (PROGN (SETQ |bfVar#155| (CAR |bfVar#156|)) NIL))
- (RETURN |bfVar#157|))
- (T (AND (CONSP |bfVar#155|)
+ ((OR (ATOM |bfVar#2|)
+ (PROGN (SETQ |bfVar#1| (CAR |bfVar#2|)) NIL))
+ (RETURN |bfVar#3|))
+ (T (AND (CONSP |bfVar#1|)
(PROGN
- (SETQ |i| (CAR |bfVar#155|))
- (SETQ |ISTMP#1| (CDR |bfVar#155|))
+ (SETQ |i| (CAR |bfVar#1|))
+ (SETQ |ISTMP#1| (CDR |bfVar#1|))
(AND (CONSP |ISTMP#1|) (NULL (CDR |ISTMP#1|))
(PROGN (SETQ |j| (CAR |ISTMP#1|)) T)))
(COND
- ((NULL |bfVar#157|)
- (SETQ |bfVar#157|
+ ((NULL |bfVar#3|)
+ (SETQ |bfVar#3|
#0=(CONS (|bfCI| |g| |i| |j|) NIL))
- (SETQ |bfVar#158| |bfVar#157|))
- (T (RPLACD |bfVar#158| #0#)
- (SETQ |bfVar#158| (CDR |bfVar#158|)))))))
- (SETQ |bfVar#156| (CDR |bfVar#156|)))))))
+ (SETQ |bfVar#4| |bfVar#3|))
+ (T (RPLACD |bfVar#4| #0#)
+ (SETQ |bfVar#4| (CDR |bfVar#4|)))))))
+ (SETQ |bfVar#2| (CDR |bfVar#2|)))))))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Thing|) |%Form|) |bfCI|))
@@ -2393,26 +2374,25 @@
(COND
((NULL |a|) (LIST (CAR |x|) |y|))
(T (SETQ |b|
- (LET ((|bfVar#160| NIL) (|bfVar#161| NIL)
- (|bfVar#159| |a|) (|i| NIL) (|j| 1))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL)
+ (|bfVar#1| |a|) (|i| NIL) (|j| 1))
(LOOP
(COND
- ((OR (ATOM |bfVar#159|)
- (PROGN (SETQ |i| (CAR |bfVar#159|)) NIL))
- (RETURN |bfVar#160|))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
(T (AND (NOT (EQ |i| 'DOT))
(COND
- ((NULL |bfVar#160|)
- (SETQ |bfVar#160|
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2|
#0=(CONS
(LIST |i|
(|bfCARCDR| |j| |g|))
NIL))
- (SETQ |bfVar#161| |bfVar#160|))
- (T (RPLACD |bfVar#161| #0#)
- (SETQ |bfVar#161|
- (CDR |bfVar#161|)))))))
- (SETQ |bfVar#159| (CDR |bfVar#159|))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #0#)
+ (SETQ |bfVar#3| (CDR |bfVar#3|)))))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))
(SETQ |j| (+ |j| 1)))))
(COND
((NULL |b|) (LIST (CAR |x|) |y|))
@@ -2555,20 +2535,20 @@
((|symbolMember?| |form| |params|) |form|)
(T (|quote| |form|))))
(T (CONS 'LIST
- (LET ((|bfVar#163| NIL) (|bfVar#164| NIL)
- (|bfVar#162| |form|) (|t| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL) (|bfVar#1| |form|)
+ (|t| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#162|)
- (PROGN (SETQ |t| (CAR |bfVar#162|)) NIL))
- (RETURN |bfVar#163|))
- ((NULL |bfVar#163|)
- (SETQ |bfVar#163|
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |t| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2|
#0=(CONS (|backquote| |t| |params|) NIL))
- (SETQ |bfVar#164| |bfVar#163|))
- (T (RPLACD |bfVar#164| #0#)
- (SETQ |bfVar#164| (CDR |bfVar#164|))))
- (SETQ |bfVar#162| (CDR |bfVar#162|))))))))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #0#)
+ (SETQ |bfVar#3| (CDR |bfVar#3|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))))))
(DEFUN |genTypeAlias| (|head| |body|)
(PROG (|args| |op|)
@@ -2771,57 +2751,56 @@
(RETURN
(PROGN
(SETQ |argtypes|
- (LET ((|bfVar#166| NIL) (|bfVar#167| NIL)
- (|bfVar#165| |s|) (|x| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL) (|bfVar#1| |s|)
+ (|x| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#165|)
- (PROGN (SETQ |x| (CAR |bfVar#165|)) NIL))
- (RETURN |bfVar#166|))
- ((NULL |bfVar#166|)
- (SETQ |bfVar#166|
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |x| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2|
#0=(CONS (|nativeArgumentType| |x|) NIL))
- (SETQ |bfVar#167| |bfVar#166|))
- (T (RPLACD |bfVar#167| #0#)
- (SETQ |bfVar#167| (CDR |bfVar#167|))))
- (SETQ |bfVar#165| (CDR |bfVar#165|)))))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #0#)
+ (SETQ |bfVar#3| (CDR |bfVar#3|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(SETQ |rettype| (|nativeReturnType| |t|))
(COND
- ((LET ((|bfVar#169| T) (|bfVar#168| (CONS |t| |s|))
- (|x| NIL))
+ ((LET ((|bfVar#5| T) (|bfVar#4| (CONS |t| |s|)) (|x| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#168|)
- (PROGN (SETQ |x| (CAR |bfVar#168|)) NIL))
- (RETURN |bfVar#169|))
- (T (SETQ |bfVar#169| (|isSimpleNativeType| |x|))
- (COND ((NOT |bfVar#169|) (RETURN NIL)))))
- (SETQ |bfVar#168| (CDR |bfVar#168|))))
+ ((OR (ATOM |bfVar#4|)
+ (PROGN (SETQ |x| (CAR |bfVar#4|)) NIL))
+ (RETURN |bfVar#5|))
+ (T (SETQ |bfVar#5| (|isSimpleNativeType| |x|))
+ (COND ((NOT |bfVar#5|) (RETURN NIL)))))
+ (SETQ |bfVar#4| (CDR |bfVar#4|))))
(LIST (LIST 'DEFENTRY |op| |argtypes|
(LIST |rettype| (SYMBOL-NAME |op'|)))))
(T (SETQ |cop| (CONCAT (SYMBOL-NAME |op'|) "_stub"))
(SETQ |cargs|
- (LET ((|bfVar#178| NIL) (|bfVar#179| NIL)
- (|bfVar#177| (- (LENGTH |s|) 1)) (|i| 0))
+ (LET ((|bfVar#14| NIL) (|bfVar#15| NIL)
+ (|bfVar#13| (- (LENGTH |s|) 1)) (|i| 0))
(LOOP
(COND
- ((> |i| |bfVar#177|) (RETURN |bfVar#178|))
- ((NULL |bfVar#178|)
- (SETQ |bfVar#178|
+ ((> |i| |bfVar#13|) (RETURN |bfVar#14|))
+ ((NULL |bfVar#14|)
+ (SETQ |bfVar#14|
(CONS (|genGCLnativeTranslation,mkCArgName|
|i|)
NIL))
- (SETQ |bfVar#179| |bfVar#178|))
- (T (RPLACD |bfVar#179|
+ (SETQ |bfVar#15| |bfVar#14|))
+ (T (RPLACD |bfVar#15|
(CONS
(|genGCLnativeTranslation,mkCArgName|
|i|)
NIL))
- (SETQ |bfVar#179| (CDR |bfVar#179|))))
+ (SETQ |bfVar#15| (CDR |bfVar#15|))))
(SETQ |i| (+ |i| 1)))))
(SETQ |ccode|
- (LET ((|bfVar#174| "")
- (|bfVar#176|
+ (LET ((|bfVar#10| "")
+ (|bfVar#12|
(CONS (|genGCLnativeTranslation,gclTypeInC|
|t|)
(CONS " "
@@ -2829,30 +2808,30 @@
(CONS "("
(|append|
(LET
- ((|bfVar#170| NIL)
- (|bfVar#171| NIL) (|x| |s|)
+ ((|bfVar#6| NIL)
+ (|bfVar#7| NIL) (|x| |s|)
(|a| |cargs|))
(LOOP
(COND
((OR (ATOM |x|)
(ATOM |a|))
- (RETURN |bfVar#170|))
- ((NULL |bfVar#170|)
- (SETQ |bfVar#170|
+ (RETURN |bfVar#6|))
+ ((NULL |bfVar#6|)
+ (SETQ |bfVar#6|
(CONS
(|genGCLnativeTranslation,cparm|
|x| |a|)
NIL))
- (SETQ |bfVar#171|
- |bfVar#170|))
+ (SETQ |bfVar#7|
+ |bfVar#6|))
(T
- (RPLACD |bfVar#171|
+ (RPLACD |bfVar#7|
(CONS
(|genGCLnativeTranslation,cparm|
|x| |a|)
NIL))
- (SETQ |bfVar#171|
- (CDR |bfVar#171|))))
+ (SETQ |bfVar#7|
+ (CDR |bfVar#7|))))
(SETQ |x| (CDR |x|))
(SETQ |a| (CDR |a|))))
(CONS ") { "
@@ -2865,45 +2844,44 @@
(CONS "("
(|append|
(LET
- ((|bfVar#172| NIL)
- (|bfVar#173| NIL)
- (|x| |s|) (|a| |cargs|))
+ ((|bfVar#8| NIL)
+ (|bfVar#9| NIL) (|x| |s|)
+ (|a| |cargs|))
(LOOP
(COND
((OR (ATOM |x|)
(ATOM |a|))
- (RETURN
- |bfVar#172|))
- ((NULL |bfVar#172|)
- (SETQ |bfVar#172|
+ (RETURN |bfVar#8|))
+ ((NULL |bfVar#8|)
+ (SETQ |bfVar#8|
(CONS
(|genGCLnativeTranslation,gclArgsInC|
|x| |a|)
NIL))
- (SETQ |bfVar#173|
- |bfVar#172|))
+ (SETQ |bfVar#9|
+ |bfVar#8|))
(T
- (RPLACD |bfVar#173|
+ (RPLACD |bfVar#9|
(CONS
(|genGCLnativeTranslation,gclArgsInC|
|x| |a|)
NIL))
- (SETQ |bfVar#173|
- (CDR |bfVar#173|))))
+ (SETQ |bfVar#9|
+ (CDR |bfVar#9|))))
(SETQ |x| (CDR |x|))
(SETQ |a| (CDR |a|))))
(CONS "); }" NIL))))))))))))
- (|bfVar#175| NIL))
+ (|bfVar#11| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#176|)
+ ((OR (ATOM |bfVar#12|)
(PROGN
- (SETQ |bfVar#175| (CAR |bfVar#176|))
+ (SETQ |bfVar#11| (CAR |bfVar#12|))
NIL))
- (RETURN |bfVar#174|))
- (T (SETQ |bfVar#174|
- (CONCAT |bfVar#174| |bfVar#175|))))
- (SETQ |bfVar#176| (CDR |bfVar#176|)))))
+ (RETURN |bfVar#10|))
+ (T (SETQ |bfVar#10|
+ (CONCAT |bfVar#10| |bfVar#11|))))
+ (SETQ |bfVar#12| (CDR |bfVar#12|)))))
(LIST (LIST 'CLINES |ccode|)
(LIST 'DEFENTRY |op| |argtypes|
(LIST |rettype| |cop|)))))))))
@@ -2964,16 +2942,16 @@
(PROGN
(SETQ |args| NIL)
(SETQ |argtypes| NIL)
- (LET ((|bfVar#180| |s|) (|x| NIL))
+ (LET ((|bfVar#1| |s|) (|x| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#180|)
- (PROGN (SETQ |x| (CAR |bfVar#180|)) NIL))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |x| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (SETQ |argtypes|
(CONS (|nativeArgumentType| |x|) |argtypes|))
(SETQ |args| (CONS (GENSYM) |args|))))
- (SETQ |bfVar#180| (CDR |bfVar#180|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))
(SETQ |args| (|reverse| |args|))
(SETQ |rettype| (|nativeReturnType| |t|))
(LIST (LIST 'DEFUN |op| |args|
@@ -2984,47 +2962,46 @@
:ONE-LINER T)))))))
(DEFUN |genECLnativeTranslation,callTemplate| (|op| |n| |s|)
- (LET ((|bfVar#185| "")
- (|bfVar#187|
+ (LET ((|bfVar#6| "")
+ (|bfVar#8|
(CONS (SYMBOL-NAME |op|)
(CONS "("
(|append|
- (LET ((|bfVar#183| NIL) (|bfVar#184| NIL)
- (|bfVar#181| (- |n| 1)) (|i| 0)
- (|bfVar#182| |s|) (|x| NIL))
+ (LET ((|bfVar#4| NIL) (|bfVar#5| NIL)
+ (|bfVar#2| (- |n| 1)) (|i| 0)
+ (|bfVar#3| |s|) (|x| NIL))
(LOOP
(COND
- ((OR (> |i| |bfVar#181|)
- (ATOM |bfVar#182|)
+ ((OR (> |i| |bfVar#2|)
+ (ATOM |bfVar#3|)
(PROGN
- (SETQ |x| (CAR |bfVar#182|))
+ (SETQ |x| (CAR |bfVar#3|))
NIL))
- (RETURN |bfVar#183|))
- ((NULL |bfVar#183|)
- (SETQ |bfVar#183|
+ (RETURN |bfVar#4|))
+ ((NULL |bfVar#4|)
+ (SETQ |bfVar#4|
(CONS
(|genECLnativeTranslation,sharpArg|
|i| |x|)
NIL))
- (SETQ |bfVar#184| |bfVar#183|))
- (T (RPLACD |bfVar#184|
+ (SETQ |bfVar#5| |bfVar#4|))
+ (T (RPLACD |bfVar#5|
(CONS
(|genECLnativeTranslation,sharpArg|
|i| |x|)
NIL))
- (SETQ |bfVar#184|
- (CDR |bfVar#184|))))
+ (SETQ |bfVar#5| (CDR |bfVar#5|))))
(SETQ |i| (+ |i| 1))
- (SETQ |bfVar#182| (CDR |bfVar#182|))))
+ (SETQ |bfVar#3| (CDR |bfVar#3|))))
(CONS ")" NIL)))))
- (|bfVar#186| NIL))
+ (|bfVar#7| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#187|)
- (PROGN (SETQ |bfVar#186| (CAR |bfVar#187|)) NIL))
- (RETURN |bfVar#185|))
- (T (SETQ |bfVar#185| (CONCAT |bfVar#185| |bfVar#186|))))
- (SETQ |bfVar#187| (CDR |bfVar#187|)))))
+ ((OR (ATOM |bfVar#8|)
+ (PROGN (SETQ |bfVar#7| (CAR |bfVar#8|)) NIL))
+ (RETURN |bfVar#6|))
+ (T (SETQ |bfVar#6| (CONCAT |bfVar#6| |bfVar#7|))))
+ (SETQ |bfVar#8| (CDR |bfVar#8|)))))
(DEFUN |genECLnativeTranslation,sharpArg| (|i| |x|)
(COND
@@ -3064,81 +3041,81 @@
(PROGN
(SETQ |rettype| (|nativeReturnType| |t|))
(SETQ |argtypes|
- (LET ((|bfVar#189| NIL) (|bfVar#190| NIL)
- (|bfVar#188| |s|) (|x| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL) (|bfVar#1| |s|)
+ (|x| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#188|)
- (PROGN (SETQ |x| (CAR |bfVar#188|)) NIL))
- (RETURN |bfVar#189|))
- ((NULL |bfVar#189|)
- (SETQ |bfVar#189|
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |x| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2|
#0=(CONS (|nativeArgumentType| |x|) NIL))
- (SETQ |bfVar#190| |bfVar#189|))
- (T (RPLACD |bfVar#190| #0#)
- (SETQ |bfVar#190| (CDR |bfVar#190|))))
- (SETQ |bfVar#188| (CDR |bfVar#188|)))))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #0#)
+ (SETQ |bfVar#3| (CDR |bfVar#3|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(SETQ |n| (INTERN (CONCAT (SYMBOL-NAME |op|) "%clisp-hack")))
(SETQ |parms|
- (LET ((|bfVar#192| NIL) (|bfVar#193| NIL)
- (|bfVar#191| |s|) (|x| NIL))
+ (LET ((|bfVar#5| NIL) (|bfVar#6| NIL) (|bfVar#4| |s|)
+ (|x| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#191|)
- (PROGN (SETQ |x| (CAR |bfVar#191|)) NIL))
- (RETURN |bfVar#192|))
- ((NULL |bfVar#192|)
- (SETQ |bfVar#192| #1=(CONS (GENSYM "parm") NIL))
- (SETQ |bfVar#193| |bfVar#192|))
- (T (RPLACD |bfVar#193| #1#)
- (SETQ |bfVar#193| (CDR |bfVar#193|))))
- (SETQ |bfVar#191| (CDR |bfVar#191|)))))
+ ((OR (ATOM |bfVar#4|)
+ (PROGN (SETQ |x| (CAR |bfVar#4|)) NIL))
+ (RETURN |bfVar#5|))
+ ((NULL |bfVar#5|)
+ (SETQ |bfVar#5| #1=(CONS (GENSYM "parm") NIL))
+ (SETQ |bfVar#6| |bfVar#5|))
+ (T (RPLACD |bfVar#6| #1#)
+ (SETQ |bfVar#6| (CDR |bfVar#6|))))
+ (SETQ |bfVar#4| (CDR |bfVar#4|)))))
(SETQ |unstableArgs| NIL)
- (LET ((|bfVar#194| |parms|) (|p| NIL) (|bfVar#195| |s|)
- (|x| NIL) (|bfVar#196| |argtypes|) (|y| NIL))
+ (LET ((|bfVar#7| |parms|) (|p| NIL) (|bfVar#8| |s|) (|x| NIL)
+ (|bfVar#9| |argtypes|) (|y| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#194|)
- (PROGN (SETQ |p| (CAR |bfVar#194|)) NIL)
- (ATOM |bfVar#195|)
- (PROGN (SETQ |x| (CAR |bfVar#195|)) NIL)
- (ATOM |bfVar#196|)
- (PROGN (SETQ |y| (CAR |bfVar#196|)) NIL))
+ ((OR (ATOM |bfVar#7|)
+ (PROGN (SETQ |p| (CAR |bfVar#7|)) NIL)
+ (ATOM |bfVar#8|)
+ (PROGN (SETQ |x| (CAR |bfVar#8|)) NIL)
+ (ATOM |bfVar#9|)
+ (PROGN (SETQ |y| (CAR |bfVar#9|)) NIL))
(RETURN NIL))
((|needsStableReference?| |x|)
(IDENTITY
(SETQ |unstableArgs|
(CONS (CONS |p| (CONS |x| |y|))
|unstableArgs|)))))
- (SETQ |bfVar#194| (CDR |bfVar#194|))
- (SETQ |bfVar#195| (CDR |bfVar#195|))
- (SETQ |bfVar#196| (CDR |bfVar#196|))))
+ (SETQ |bfVar#7| (CDR |bfVar#7|))
+ (SETQ |bfVar#8| (CDR |bfVar#8|))
+ (SETQ |bfVar#9| (CDR |bfVar#9|))))
(SETQ |foreignDecl|
(LIST (|bfColonColon| 'FFI 'DEF-CALL-OUT) |n|
(LIST :NAME (SYMBOL-NAME |op'|))
(CONS :ARGUMENTS
- (LET ((|bfVar#199| NIL) (|bfVar#200| NIL)
- (|bfVar#197| |argtypes|) (|x| NIL)
- (|bfVar#198| |parms|) (|a| NIL))
+ (LET ((|bfVar#12| NIL) (|bfVar#13| NIL)
+ (|bfVar#10| |argtypes|) (|x| NIL)
+ (|bfVar#11| |parms|) (|a| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#197|)
+ ((OR (ATOM |bfVar#10|)
(PROGN
- (SETQ |x| (CAR |bfVar#197|))
+ (SETQ |x| (CAR |bfVar#10|))
NIL)
- (ATOM |bfVar#198|)
+ (ATOM |bfVar#11|)
(PROGN
- (SETQ |a| (CAR |bfVar#198|))
+ (SETQ |a| (CAR |bfVar#11|))
NIL))
- (RETURN |bfVar#199|))
- ((NULL |bfVar#199|)
- (SETQ |bfVar#199|
+ (RETURN |bfVar#12|))
+ ((NULL |bfVar#12|)
+ (SETQ |bfVar#12|
#2=(CONS (LIST |a| |x|) NIL))
- (SETQ |bfVar#200| |bfVar#199|))
- (T (RPLACD |bfVar#200| #2#)
- (SETQ |bfVar#200| (CDR |bfVar#200|))))
- (SETQ |bfVar#197| (CDR |bfVar#197|))
- (SETQ |bfVar#198| (CDR |bfVar#198|)))))
+ (SETQ |bfVar#13| |bfVar#12|))
+ (T (RPLACD |bfVar#13| #2#)
+ (SETQ |bfVar#13| (CDR |bfVar#13|))))
+ (SETQ |bfVar#10| (CDR |bfVar#10|))
+ (SETQ |bfVar#11| (CDR |bfVar#11|)))))
(LIST :RETURN-TYPE |rettype|)
(LIST :LANGUAGE :STDC)))
(SETQ |forwardingFun|
@@ -3146,84 +3123,82 @@
((NULL |unstableArgs|)
(LIST 'DEFUN |op| |parms| (CONS |n| |parms|)))
(T (SETQ |localPairs|
- (LET ((|bfVar#203| NIL) (|bfVar#204| NIL)
- (|bfVar#202| |unstableArgs|)
- (|bfVar#201| NIL))
+ (LET ((|bfVar#16| NIL) (|bfVar#17| NIL)
+ (|bfVar#15| |unstableArgs|)
+ (|bfVar#14| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#202|)
+ ((OR (ATOM |bfVar#15|)
(PROGN
- (SETQ |bfVar#201|
- (CAR |bfVar#202|))
+ (SETQ |bfVar#14|
+ (CAR |bfVar#15|))
NIL))
- (RETURN |bfVar#203|))
- (T (AND (CONSP |bfVar#201|)
+ (RETURN |bfVar#16|))
+ (T (AND (CONSP |bfVar#14|)
(PROGN
- (SETQ |a| (CAR |bfVar#201|))
+ (SETQ |a| (CAR |bfVar#14|))
(SETQ |ISTMP#1|
- (CDR |bfVar#201|))
+ (CDR |bfVar#14|))
(AND (CONSP |ISTMP#1|)
(PROGN
(SETQ |x| (CAR |ISTMP#1|))
(SETQ |y| (CDR |ISTMP#1|))
T)))
(COND
- ((NULL |bfVar#203|)
- (SETQ |bfVar#203|
+ ((NULL |bfVar#16|)
+ (SETQ |bfVar#16|
#3=(CONS
(CONS |a|
(CONS |x|
(CONS |y|
(GENSYM "loc"))))
NIL))
- (SETQ |bfVar#204|
- |bfVar#203|))
- (T (RPLACD |bfVar#204| #3#)
- (SETQ |bfVar#204|
- (CDR |bfVar#204|)))))))
- (SETQ |bfVar#202| (CDR |bfVar#202|)))))
+ (SETQ |bfVar#17| |bfVar#16|))
+ (T (RPLACD |bfVar#17| #3#)
+ (SETQ |bfVar#17|
+ (CDR |bfVar#17|)))))))
+ (SETQ |bfVar#15| (CDR |bfVar#15|)))))
(SETQ |call|
(CONS |n|
- (LET ((|bfVar#206| NIL)
- (|bfVar#207| NIL)
- (|bfVar#205| |parms|) (|p| NIL))
+ (LET ((|bfVar#19| NIL) (|bfVar#20| NIL)
+ (|bfVar#18| |parms|) (|p| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#205|)
+ ((OR (ATOM |bfVar#18|)
(PROGN
- (SETQ |p| (CAR |bfVar#205|))
+ (SETQ |p| (CAR |bfVar#18|))
NIL))
- (RETURN |bfVar#206|))
- ((NULL |bfVar#206|)
- (SETQ |bfVar#206|
+ (RETURN |bfVar#19|))
+ ((NULL |bfVar#19|)
+ (SETQ |bfVar#19|
(CONS
(|genCLISPnativeTranslation,actualArg|
|p| |localPairs|)
NIL))
- (SETQ |bfVar#207| |bfVar#206|))
+ (SETQ |bfVar#20| |bfVar#19|))
(T
- (RPLACD |bfVar#207|
+ (RPLACD |bfVar#20|
(CONS
(|genCLISPnativeTranslation,actualArg|
|p| |localPairs|)
NIL))
- (SETQ |bfVar#207|
- (CDR |bfVar#207|))))
- (SETQ |bfVar#205| (CDR |bfVar#205|))))))
+ (SETQ |bfVar#20|
+ (CDR |bfVar#20|))))
+ (SETQ |bfVar#18| (CDR |bfVar#18|))))))
(SETQ |call|
(PROGN
(SETQ |fixups|
- (LET ((|bfVar#209| NIL)
- (|bfVar#210| NIL)
- (|bfVar#208| |localPairs|)
+ (LET ((|bfVar#22| NIL)
+ (|bfVar#23| NIL)
+ (|bfVar#21| |localPairs|)
(|p| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#208|)
+ ((OR (ATOM |bfVar#21|)
(PROGN
- (SETQ |p| (CAR |bfVar#208|))
+ (SETQ |p| (CAR |bfVar#21|))
NIL))
- (RETURN |bfVar#209|))
+ (RETURN |bfVar#22|))
(T
(AND
(NOT
@@ -3232,34 +3207,33 @@
(|genCLISPnativeTranslation,copyBack|
|p|))))
(COND
- ((NULL |bfVar#209|)
- (SETQ |bfVar#209|
+ ((NULL |bfVar#22|)
+ (SETQ |bfVar#22|
(CONS |q| NIL))
- (SETQ |bfVar#210|
- |bfVar#209|))
+ (SETQ |bfVar#23|
+ |bfVar#22|))
(T
- (RPLACD |bfVar#210|
+ (RPLACD |bfVar#23|
(CONS |q| NIL))
- (SETQ |bfVar#210|
- (CDR |bfVar#210|)))))))
- (SETQ |bfVar#208|
- (CDR |bfVar#208|)))))
+ (SETQ |bfVar#23|
+ (CDR |bfVar#23|)))))))
+ (SETQ |bfVar#21| (CDR |bfVar#21|)))))
(COND
((NULL |fixups|) (LIST |call|))
(T (LIST (CONS 'PROG1
(CONS |call| |fixups|)))))))
- (LET ((|bfVar#212| |localPairs|) (|bfVar#211| NIL))
+ (LET ((|bfVar#25| |localPairs|) (|bfVar#24| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#212|)
+ ((OR (ATOM |bfVar#25|)
(PROGN
- (SETQ |bfVar#211| (CAR |bfVar#212|))
+ (SETQ |bfVar#24| (CAR |bfVar#25|))
NIL))
(RETURN NIL))
- (T (AND (CONSP |bfVar#211|)
+ (T (AND (CONSP |bfVar#24|)
(PROGN
- (SETQ |p| (CAR |bfVar#211|))
- (SETQ |ISTMP#1| (CDR |bfVar#211|))
+ (SETQ |p| (CAR |bfVar#24|))
+ (SETQ |ISTMP#1| (CDR |bfVar#24|))
(AND (CONSP |ISTMP#1|)
(PROGN
(SETQ |x| (CAR |ISTMP#1|))
@@ -3282,18 +3256,18 @@
|p|)
|p|)
|call|)))))))
- (SETQ |bfVar#212| (CDR |bfVar#212|))))
+ (SETQ |bfVar#25| (CDR |bfVar#25|))))
(CONS 'DEFUN (CONS |op| (CONS |parms| |call|))))))
(SETQ |$foreignsDefsForCLisp|
(CONS |foreignDecl| |$foreignsDefsForCLisp|))
(LIST |forwardingFun|)))))
-(DEFUN |genCLISPnativeTranslation,copyBack| (|bfVar#213|)
+(DEFUN |genCLISPnativeTranslation,copyBack| (|bfVar#26|)
(PROG (|a| |y| |x| |p|)
(RETURN
(PROGN
- (SETQ |p| (CAR |bfVar#213|))
- (SETQ |x| (CADR . #0=(|bfVar#213|)))
+ (SETQ |p| (CAR |bfVar#26|))
+ (SETQ |x| (CADR . #0=(|bfVar#26|)))
(SETQ |y| (CADDR . #0#))
(SETQ |a| (CDDDR . #0#))
(COND
@@ -3317,52 +3291,51 @@
(PROGN
(SETQ |rettype| (|nativeReturnType| |t|))
(SETQ |argtypes|
- (LET ((|bfVar#215| NIL) (|bfVar#216| NIL)
- (|bfVar#214| |s|) (|x| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL) (|bfVar#1| |s|)
+ (|x| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#214|)
- (PROGN (SETQ |x| (CAR |bfVar#214|)) NIL))
- (RETURN |bfVar#215|))
- ((NULL |bfVar#215|)
- (SETQ |bfVar#215|
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |x| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2|
#0=(CONS (|nativeArgumentType| |x|) NIL))
- (SETQ |bfVar#216| |bfVar#215|))
- (T (RPLACD |bfVar#216| #0#)
- (SETQ |bfVar#216| (CDR |bfVar#216|))))
- (SETQ |bfVar#214| (CDR |bfVar#214|)))))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #0#)
+ (SETQ |bfVar#3| (CDR |bfVar#3|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(SETQ |args|
- (LET ((|bfVar#218| NIL) (|bfVar#219| NIL)
- (|bfVar#217| |s|) (|x| NIL))
+ (LET ((|bfVar#5| NIL) (|bfVar#6| NIL) (|bfVar#4| |s|)
+ (|x| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#217|)
- (PROGN (SETQ |x| (CAR |bfVar#217|)) NIL))
- (RETURN |bfVar#218|))
- ((NULL |bfVar#218|)
- (SETQ |bfVar#218| #1=(CONS (GENSYM) NIL))
- (SETQ |bfVar#219| |bfVar#218|))
- (T (RPLACD |bfVar#219| #1#)
- (SETQ |bfVar#219| (CDR |bfVar#219|))))
- (SETQ |bfVar#217| (CDR |bfVar#217|)))))
+ ((OR (ATOM |bfVar#4|)
+ (PROGN (SETQ |x| (CAR |bfVar#4|)) NIL))
+ (RETURN |bfVar#5|))
+ ((NULL |bfVar#5|)
+ (SETQ |bfVar#5| #1=(CONS (GENSYM) NIL))
+ (SETQ |bfVar#6| |bfVar#5|))
+ (T (RPLACD |bfVar#6| #1#)
+ (SETQ |bfVar#6| (CDR |bfVar#6|))))
+ (SETQ |bfVar#4| (CDR |bfVar#4|)))))
(SETQ |unstableArgs| NIL)
(SETQ |newArgs| NIL)
- (LET ((|bfVar#220| |args|) (|a| NIL) (|bfVar#221| |s|)
- (|x| NIL))
+ (LET ((|bfVar#7| |args|) (|a| NIL) (|bfVar#8| |s|) (|x| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#220|)
- (PROGN (SETQ |a| (CAR |bfVar#220|)) NIL)
- (ATOM |bfVar#221|)
- (PROGN (SETQ |x| (CAR |bfVar#221|)) NIL))
+ ((OR (ATOM |bfVar#7|)
+ (PROGN (SETQ |a| (CAR |bfVar#7|)) NIL)
+ (ATOM |bfVar#8|)
+ (PROGN (SETQ |x| (CAR |bfVar#8|)) NIL))
(RETURN NIL))
(T (SETQ |newArgs|
(CONS (|coerceToNativeType| |a| |x|) |newArgs|))
(COND
((|needsStableReference?| |x|)
(SETQ |unstableArgs| (CONS |a| |unstableArgs|))))))
- (SETQ |bfVar#220| (CDR |bfVar#220|))
- (SETQ |bfVar#221| (CDR |bfVar#221|))))
+ (SETQ |bfVar#7| (CDR |bfVar#7|))
+ (SETQ |bfVar#8| (CDR |bfVar#8|))))
(SETQ |op'|
(COND
((|%hasFeature| :WIN32)
@@ -3400,44 +3373,43 @@
(PROGN
(SETQ |rettype| (|nativeReturnType| |t|))
(SETQ |argtypes|
- (LET ((|bfVar#223| NIL) (|bfVar#224| NIL)
- (|bfVar#222| |s|) (|x| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL) (|bfVar#1| |s|)
+ (|x| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#222|)
- (PROGN (SETQ |x| (CAR |bfVar#222|)) NIL))
- (RETURN |bfVar#223|))
- ((NULL |bfVar#223|)
- (SETQ |bfVar#223|
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |x| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2|
#0=(CONS (|nativeArgumentType| |x|) NIL))
- (SETQ |bfVar#224| |bfVar#223|))
- (T (RPLACD |bfVar#224| #0#)
- (SETQ |bfVar#224| (CDR |bfVar#224|))))
- (SETQ |bfVar#222| (CDR |bfVar#222|)))))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #0#)
+ (SETQ |bfVar#3| (CDR |bfVar#3|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(SETQ |parms|
- (LET ((|bfVar#226| NIL) (|bfVar#227| NIL)
- (|bfVar#225| |s|) (|x| NIL))
+ (LET ((|bfVar#5| NIL) (|bfVar#6| NIL) (|bfVar#4| |s|)
+ (|x| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#225|)
- (PROGN (SETQ |x| (CAR |bfVar#225|)) NIL))
- (RETURN |bfVar#226|))
- ((NULL |bfVar#226|)
- (SETQ |bfVar#226| #1=(CONS (GENSYM "parm") NIL))
- (SETQ |bfVar#227| |bfVar#226|))
- (T (RPLACD |bfVar#227| #1#)
- (SETQ |bfVar#227| (CDR |bfVar#227|))))
- (SETQ |bfVar#225| (CDR |bfVar#225|)))))
+ ((OR (ATOM |bfVar#4|)
+ (PROGN (SETQ |x| (CAR |bfVar#4|)) NIL))
+ (RETURN |bfVar#5|))
+ ((NULL |bfVar#5|)
+ (SETQ |bfVar#5| #1=(CONS (GENSYM "parm") NIL))
+ (SETQ |bfVar#6| |bfVar#5|))
+ (T (RPLACD |bfVar#6| #1#)
+ (SETQ |bfVar#6| (CDR |bfVar#6|))))
+ (SETQ |bfVar#4| (CDR |bfVar#4|)))))
(SETQ |strPairs| NIL)
(SETQ |aryPairs| NIL)
- (LET ((|bfVar#228| |parms|) (|p| NIL) (|bfVar#229| |s|)
- (|x| NIL))
+ (LET ((|bfVar#7| |parms|) (|p| NIL) (|bfVar#8| |s|) (|x| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#228|)
- (PROGN (SETQ |p| (CAR |bfVar#228|)) NIL)
- (ATOM |bfVar#229|)
- (PROGN (SETQ |x| (CAR |bfVar#229|)) NIL))
+ ((OR (ATOM |bfVar#7|)
+ (PROGN (SETQ |p| (CAR |bfVar#7|)) NIL)
+ (ATOM |bfVar#8|)
+ (PROGN (SETQ |x| (CAR |bfVar#8|)) NIL))
(RETURN NIL))
((EQ |x| '|string|)
(SETQ |strPairs|
@@ -3456,31 +3428,31 @@
(NULL (CDR |ISTMP#3|)))))))))
(SETQ |aryPairs|
(CONS (CONS |p| (GENSYM "loc")) |aryPairs|))))
- (SETQ |bfVar#228| (CDR |bfVar#228|))
- (SETQ |bfVar#229| (CDR |bfVar#229|))))
+ (SETQ |bfVar#7| (CDR |bfVar#7|))
+ (SETQ |bfVar#8| (CDR |bfVar#8|))))
(COND
((|%hasFeature| :DARWIN) (SETQ |op'| (CONCAT "_" |op'|))))
(SETQ |call|
(CONS (|bfColonColon| 'CCL 'EXTERNAL-CALL)
(CONS (STRING |op'|)
(|append|
- (LET ((|bfVar#232| NIL) (|bfVar#233| NIL)
- (|bfVar#230| |argtypes|) (|x| NIL)
- (|bfVar#231| |parms|) (|p| NIL))
+ (LET ((|bfVar#11| NIL) (|bfVar#12| NIL)
+ (|bfVar#9| |argtypes|) (|x| NIL)
+ (|bfVar#10| |parms|) (|p| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#230|)
+ ((OR (ATOM |bfVar#9|)
(PROGN
- (SETQ |x| (CAR |bfVar#230|))
+ (SETQ |x| (CAR |bfVar#9|))
NIL)
- (ATOM |bfVar#231|)
+ (ATOM |bfVar#10|)
(PROGN
- (SETQ |p| (CAR |bfVar#231|))
+ (SETQ |p| (CAR |bfVar#10|))
NIL))
- (RETURN |bfVar#232|))
+ (RETURN |bfVar#11|))
(T
(LET
- ((|bfVar#234|
+ ((|bfVar#13|
(LIST |x|
(COND
((SETQ |p'|
@@ -3491,59 +3463,62 @@
(CDR |p'|))
(T |p|)))))
(COND
- ((NULL |bfVar#234|) NIL)
- ((NULL |bfVar#232|)
- (SETQ |bfVar#232|
- |bfVar#234|)
- (SETQ |bfVar#233|
- (|lastNode| |bfVar#232|)))
+ ((NULL |bfVar#13|) NIL)
+ ((NULL |bfVar#11|)
+ (SETQ |bfVar#11| |bfVar#13|)
+ (SETQ |bfVar#12|
+ (|lastNode| |bfVar#11|)))
(T
- (RPLACD |bfVar#233|
- |bfVar#234|)
- (SETQ |bfVar#233|
- (|lastNode| |bfVar#233|)))))))
- (SETQ |bfVar#230| (CDR |bfVar#230|))
- (SETQ |bfVar#231| (CDR |bfVar#231|))))
+ (RPLACD |bfVar#12|
+ |bfVar#13|)
+ (SETQ |bfVar#12|
+ (|lastNode| |bfVar#12|)))))))
+ (SETQ |bfVar#9| (CDR |bfVar#9|))
+ (SETQ |bfVar#10| (CDR |bfVar#10|))))
(CONS |rettype| NIL)))))
(COND
((EQ |t| '|string|)
(SETQ |call|
(LIST (|bfColonColon| 'CCL 'GET-CSTRING) |call|))))
- (LET ((|bfVar#235| |aryPairs|) (|arg| NIL))
+ (LET ((|bfVar#14| |aryPairs|) (|arg| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#235|)
- (PROGN (SETQ |arg| (CAR |bfVar#235|)) NIL))
+ ((OR (ATOM |bfVar#14|)
+ (PROGN (SETQ |arg| (CAR |bfVar#14|)) NIL))
(RETURN NIL))
(T (SETQ |call|
(LIST (|bfColonColon| 'CCL
'WITH-POINTER-TO-IVECTOR)
(LIST (CDR |arg|) (CAR |arg|)) |call|))))
- (SETQ |bfVar#235| (CDR |bfVar#235|))))
+ (SETQ |bfVar#14| (CDR |bfVar#14|))))
(COND
- (|strPairs|
- (SETQ |call|
- (LIST (|bfColonColon| 'CCL 'WITH-CSTRS)
- (LET ((|bfVar#237| NIL) (|bfVar#238| NIL)
- (|bfVar#236| |strPairs|) (|arg| NIL))
- (LOOP
- (COND
- ((OR (ATOM |bfVar#236|)
- (PROGN
- (SETQ |arg| (CAR |bfVar#236|))
- NIL))
- (RETURN |bfVar#237|))
- ((NULL |bfVar#237|)
- (SETQ |bfVar#237|
- #2=(CONS
- (LIST (CDR |arg|)
- (CAR |arg|))
- NIL))
- (SETQ |bfVar#238| |bfVar#237|))
- (T (RPLACD |bfVar#238| #2#)
- (SETQ |bfVar#238| (CDR |bfVar#238|))))
- (SETQ |bfVar#236| (CDR |bfVar#236|))))
- |call|))))
+ (|strPairs| (SETQ |call|
+ (LIST (|bfColonColon| 'CCL 'WITH-CSTRS)
+ (LET ((|bfVar#16| NIL)
+ (|bfVar#17| NIL)
+ (|bfVar#15| |strPairs|)
+ (|arg| NIL))
+ (LOOP
+ (COND
+ ((OR (ATOM |bfVar#15|)
+ (PROGN
+ (SETQ |arg|
+ (CAR |bfVar#15|))
+ NIL))
+ (RETURN |bfVar#16|))
+ ((NULL |bfVar#16|)
+ (SETQ |bfVar#16|
+ #2=(CONS
+ (LIST (CDR |arg|)
+ (CAR |arg|))
+ NIL))
+ (SETQ |bfVar#17| |bfVar#16|))
+ (T (RPLACD |bfVar#17| #2#)
+ (SETQ |bfVar#17|
+ (CDR |bfVar#17|))))
+ (SETQ |bfVar#15|
+ (CDR |bfVar#15|))))
+ |call|))))
(LIST (LIST 'DEFUN |op| |parms| |call|))))))
(DEFUN |genImportDeclaration| (|op| |sig|)
diff --git a/src/boot/strap/parser.clisp b/src/boot/strap/parser.clisp
index 11213e00..925e9a4f 100644
--- a/src/boot/strap/parser.clisp
+++ b/src/boot/strap/parser.clisp
@@ -1214,11 +1214,12 @@
(|bpPush| (|bfCaseItem| (|bpPop2|) (|bpPop1|)))))
(DEFUN |bpOutItem| ()
- (PROG (|r| |ISTMP#2| |l| |ISTMP#1| |b|)
- (DECLARE (SPECIAL |$InteractiveMode| |$op|))
+ (PROG (|$GenVarCounter| |$op| |r| |ISTMP#2| |l| |ISTMP#1| |b|)
+ (DECLARE (SPECIAL |$GenVarCounter| |$op| |$InteractiveMode|))
(RETURN
(PROGN
(SETQ |$op| NIL)
+ (SETQ |$GenVarCounter| 0)
(OR (|bpComma|) (|bpTrap|))
(SETQ |b| (|bpPop1|))
(|bpPush|
diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp
index 1d06b54d..02b7f8c6 100644
--- a/src/boot/strap/scanner.clisp
+++ b/src/boot/strap/scanner.clisp
@@ -533,19 +533,19 @@
(SETQ |ll| (LENGTH |l|))
(SETQ |done| NIL)
(SETQ |s1| "")
- (LET ((|bfVar#2| (- (LENGTH |u|) 1)) (|j| 0))
+ (LET ((|bfVar#1| (- (LENGTH |u|) 1)) (|j| 0))
(LOOP
(COND
- ((OR (> |j| |bfVar#2|) |done|) (RETURN NIL))
+ ((OR (> |j| |bfVar#1|) |done|) (RETURN NIL))
(T (SETQ |s| (ELT |u| |j|)) (SETQ |ls| (LENGTH |s|))
(SETQ |done|
(COND
((< |ll| (+ |ls| |i|)) NIL)
(T (SETQ |eql| T)
- (LET ((|bfVar#3| (- |ls| 1)) (|k| 1))
+ (LET ((|bfVar#2| (- |ls| 1)) (|k| 1))
(LOOP
(COND
- ((OR (> |k| |bfVar#3|) (NOT |eql|))
+ ((OR (> |k| |bfVar#2|) (NOT |eql|))
(RETURN NIL))
(T (SETQ |eql|
(CHAR= (SCHAR |s| |k|)
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index 297bcbb3..e31ba528 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -59,15 +59,15 @@
(RETURN
(PROGN
(SETQ |KeyTable| (|makeTable| #'EQUAL))
- (LET ((|bfVar#2| |shoeKeyWords|) (|st| NIL))
+ (LET ((|bfVar#1| |shoeKeyWords|) (|st| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#2|)
- (PROGN (SETQ |st| (CAR |bfVar#2|)) NIL))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |st| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (SETF (|tableValue| |KeyTable| (CAR |st|))
(CADR |st|))))
- (SETQ |bfVar#2| (CDR |bfVar#2|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))
|KeyTable|))))
(DEFPARAMETER |shoeKeyTable| (|shoeKeyTableCons|))
@@ -86,17 +86,17 @@
((< (LENGTH (ELT |u| |k|)) |l|) (RETURN NIL))
(T (SETQ |k| (+ |k| 1)))))
(SETQ |v| (MAKE-ARRAY (+ |n| 1)))
- (LET ((|bfVar#3| (- |k| 1)) (|i| 0))
+ (LET ((|bfVar#1| (- |k| 1)) (|i| 0))
(LOOP
(COND
- ((> |i| |bfVar#3|) (RETURN NIL))
+ ((> |i| |bfVar#1|) (RETURN NIL))
(T (SETF (ELT |v| |i|) (ELT |u| |i|))))
(SETQ |i| (+ |i| 1))))
(SETF (ELT |v| |k|) |s|)
- (LET ((|bfVar#4| (- |n| 1)) (|i| |k|))
+ (LET ((|bfVar#2| (- |n| 1)) (|i| |k|))
(LOOP
(COND
- ((> |i| |bfVar#4|) (RETURN NIL))
+ ((> |i| |bfVar#2|) (RETURN NIL))
(T (SETF (ELT |v| (+ |i| 1)) (ELT |u| |i|))))
(SETQ |i| (+ |i| 1))))
(SETF (ELT |d| |h|) |v|)
@@ -119,14 +119,14 @@
(T (SETF (ELT |a| |i|) |b|)))
(SETQ |i| (+ |i| 1))))
|a|))
- (LET ((|bfVar#5| |l|) (|s| NIL))
+ (LET ((|bfVar#1| |l|) (|s| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#5|)
- (PROGN (SETQ |s| (CAR |bfVar#5|)) NIL))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |s| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (|shoeInsert| |s| |d|)))
- (SETQ |bfVar#5| (CDR |bfVar#5|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))
|d|))))
(DEFPARAMETER |shoeDict| (|shoeDictCons|))
@@ -143,30 +143,30 @@
((> |i| 255) (RETURN NIL))
(T (SETF (SBIT |a| |i|) 0)))
(SETQ |i| (+ |i| 1))))
- (LET ((|bfVar#6| |listing|) (|k| NIL))
+ (LET ((|bfVar#1| |listing|) (|k| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#6|)
- (PROGN (SETQ |k| (CAR |bfVar#6|)) NIL))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |k| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
((|shoeStartsId| (ELT |k| 0)) NIL)
(T (SETF (SBIT |a| (CHAR-CODE (SCHAR |k| 0))) 1)))
- (SETQ |bfVar#6| (CDR |bfVar#6|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))
|a|))))
(DEFPARAMETER |shoePun| (|shoePunCons|))
(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
- (LET ((|bfVar#7| (LIST 'NOT 'LENGTH)) (|i| NIL))
+ (LET ((|bfVar#1| (LIST 'NOT 'LENGTH)) (|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#7|) (PROGN (SETQ |i| (CAR |bfVar#7|)) NIL))
+ ((OR (ATOM |bfVar#1|) (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (SETF (GET |i| 'SHOEPRE) T)))
- (SETQ |bfVar#7| (CDR |bfVar#7|)))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
- (LET ((|bfVar#8| (LIST (LIST 'SHOEEQ '=) (LIST 'TIMES '*)
+ (LET ((|bfVar#1| (LIST (LIST 'SHOEEQ '=) (LIST 'TIMES '*)
(LIST 'REM '|rem|) (LIST 'QUO '|quo|)
(LIST 'PLUS '+) (LIST 'IS '|is|)
(LIST 'ISNT '|isnt|) (LIST 'AND '|and|)
@@ -177,13 +177,13 @@
(|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#8|) (PROGN (SETQ |i| (CAR |bfVar#8|)) NIL))
+ ((OR (ATOM |bfVar#1|) (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (SETF (GET (CAR |i|) 'SHOEINF) (CADR |i|))))
- (SETQ |bfVar#8| (CDR |bfVar#8|)))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
- (LET ((|bfVar#9|
+ (LET ((|bfVar#1|
(LIST (LIST '+ 0) (LIST '|gcd| 0) (LIST '|lcm| 1)
(LIST 'STRCONC "") (LIST '|strconc| "")
(LIST 'CONCAT "") (LIST 'MAX (- 999999))
@@ -196,13 +196,13 @@
(|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#9|) (PROGN (SETQ |i| (CAR |bfVar#9|)) NIL))
+ ((OR (ATOM |bfVar#1|) (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (SETF (GET (CAR |i|) 'SHOETHETA) (CDR |i|))))
- (SETQ |bfVar#9| (CDR |bfVar#9|)))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
- (LET ((|bfVar#10|
+ (LET ((|bfVar#1|
(LIST (LIST '|abs| 'ABS) (LIST '|abstractChar| 'CODE-CHAR)
(LIST '|alphabetic?| 'ALPHA-CHAR-P)
(LIST '|alphanumeric?| 'ALPHANUMERICP)
@@ -272,44 +272,43 @@
(|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#10|) (PROGN (SETQ |i| (CAR |bfVar#10|)) NIL))
+ ((OR (ATOM |bfVar#1|) (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (SETF (GET (CAR |i|) 'SHOERENAME) (CDR |i|))))
- (SETQ |bfVar#10| (CDR |bfVar#10|)))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
- (LET ((|bfVar#11| (LIST (LIST '|setName| 0) (LIST '|setLabel| 1)
- (LIST '|setLevel| 2) (LIST '|setType| 3)
- (LIST '|setVar| 4) (LIST '|setLeaf| 5)
- (LIST '|setDef| 6) (LIST '|aGeneral| 4)
- (LIST '|aMode| 1) (LIST '|aModeSet| 3)
- (LIST '|aTree| 0) (LIST '|aValue| 2)
- (LIST '|args| 'CDR)
- (LIST '|attributes| 'CADDR)
- (LIST '|cacheCount| 'CADDDDR)
- (LIST '|cacheName| 'CADR)
- (LIST '|cacheReset| 'CADDDR)
- (LIST '|cacheType| 'CADDR)
- (LIST '|env| 'CADDR) (LIST '|expr| 'CAR)
- (LIST 'CAR 'CAR) (LIST '|mmCondition| 'CAADR)
- (LIST '|mmDC| 'CAAR)
- (LIST '|mmImplementation| 'CADADR)
- (LIST '|mmSignature| 'CDAR)
- (LIST '|mmTarget| 'CADAR)
- (LIST '|mmSource| 'CDDAR)
- (LIST '|mode| 'CADR) (LIST '|op| 'CAR)
- (LIST '|opcode| 'CADR) (LIST '|opSig| 'CADR)
- (LIST 'CDR 'CDR) (LIST '|sig| 'CDDR)
- (LIST '|source| 'CDR)
- (LIST '|streamCode| 'CADDDR)
- (LIST '|streamDef| 'CADDR)
- (LIST '|streamName| 'CADR)
- (LIST '|target| 'CAR)))
+ (LET ((|bfVar#1| (LIST (LIST '|setName| 0) (LIST '|setLabel| 1)
+ (LIST '|setLevel| 2) (LIST '|setType| 3)
+ (LIST '|setVar| 4) (LIST '|setLeaf| 5)
+ (LIST '|setDef| 6) (LIST '|aGeneral| 4)
+ (LIST '|aMode| 1) (LIST '|aModeSet| 3)
+ (LIST '|aTree| 0) (LIST '|aValue| 2)
+ (LIST '|args| 'CDR)
+ (LIST '|attributes| 'CADDR)
+ (LIST '|cacheCount| 'CADDDDR)
+ (LIST '|cacheName| 'CADR)
+ (LIST '|cacheReset| 'CADDDR)
+ (LIST '|cacheType| 'CADDR)
+ (LIST '|env| 'CADDR) (LIST '|expr| 'CAR)
+ (LIST 'CAR 'CAR) (LIST '|mmCondition| 'CAADR)
+ (LIST '|mmDC| 'CAAR)
+ (LIST '|mmImplementation| 'CADADR)
+ (LIST '|mmSignature| 'CDAR)
+ (LIST '|mmTarget| 'CADAR)
+ (LIST '|mmSource| 'CDDAR) (LIST '|mode| 'CADR)
+ (LIST '|op| 'CAR) (LIST '|opcode| 'CADR)
+ (LIST '|opSig| 'CADR) (LIST 'CDR 'CDR)
+ (LIST '|sig| 'CDDR) (LIST '|source| 'CDR)
+ (LIST '|streamCode| 'CADDDR)
+ (LIST '|streamDef| 'CADDR)
+ (LIST '|streamName| 'CADR)
+ (LIST '|target| 'CAR)))
(|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#11|) (PROGN (SETQ |i| (CAR |bfVar#11|)) NIL))
+ ((OR (ATOM |bfVar#1|) (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (SETF (GET (CAR |i|) 'SHOESELFUNCTION) (CADR |i|))))
- (SETQ |bfVar#11| (CDR |bfVar#11|)))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp
index 25f4332d..63cd603a 100644
--- a/src/boot/strap/translator.clisp
+++ b/src/boot/strap/translator.clisp
@@ -154,24 +154,22 @@
(|closeFile| |a|)))))
(DEFUN |shoeClLines| (|a| |fn| |lines| |outfn|)
- (PROG (|$GenVarCounter| |stream|)
- (DECLARE (SPECIAL |$GenVarCounter|))
+ (PROG (|stream|)
(RETURN
(COND
((NULL |a|) (|shoeNotFound| |fn|))
- (T (SETQ |$GenVarCounter| 0)
- (UNWIND-PROTECT
+ (T (UNWIND-PROTECT
(PROGN
(SETQ |stream| (|outputTextFile| |outfn|))
(|genOptimizeOptions| |stream|)
- (LET ((|bfVar#7| |lines|) (|line| NIL))
+ (LET ((|bfVar#1| |lines|) (|line| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#7|)
- (PROGN (SETQ |line| (CAR |bfVar#7|)) NIL))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |line| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (|shoeFileLine| |line| |stream|)))
- (SETQ |bfVar#7| (CDR |bfVar#7|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))
(|shoeFileTrees| (|shoeTransformStream| |a|) |stream|)
(|genModuleFinalization| |stream|)
|outfn|)
@@ -195,24 +193,22 @@
(|closeFile| |a|)))))
(DEFUN |shoeClCLines| (|a| |fn| |lines| |outfn|)
- (PROG (|$GenVarCounter| |stream|)
- (DECLARE (SPECIAL |$GenVarCounter|))
+ (PROG (|stream|)
(RETURN
(COND
((NULL |a|) (|shoeNotFound| |fn|))
- (T (SETQ |$GenVarCounter| 0)
- (UNWIND-PROTECT
+ (T (UNWIND-PROTECT
(PROGN
(SETQ |stream| (|outputTextFile| |outfn|))
(|genOptimizeOptions| |stream|)
- (LET ((|bfVar#8| |lines|) (|line| NIL))
+ (LET ((|bfVar#1| |lines|) (|line| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#8|)
- (PROGN (SETQ |line| (CAR |bfVar#8|)) NIL))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |line| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (|shoeFileLine| |line| |stream|)))
- (SETQ |bfVar#8| (CDR |bfVar#8|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))
(|shoeFileTrees|
(|shoeTransformToFile| |stream|
(|shoeInclude|
@@ -225,13 +221,11 @@
(DECLAIM (FTYPE (FUNCTION (|%String|) |%Thing|) BOOTTOMC))
(DEFUN BOOTTOMC (|fn|)
- (PROG (|$GenVarCounter| |a| |callingPackage|)
- (DECLARE (SPECIAL |$GenVarCounter|))
+ (PROG (|a| |callingPackage|)
(RETURN
(PROGN
(SETQ |callingPackage| *PACKAGE*)
(IN-PACKAGE "BOOTTRAN")
- (SETQ |$GenVarCounter| 0)
(UNWIND-PROTECT
(PROGN
(SETQ |a| (|inputTextFile| (|shoeAddbootIfNec| |fn|)))
@@ -266,13 +260,11 @@
(DECLAIM (FTYPE (FUNCTION (|%String|) |%Thing|) BO))
(DEFUN BO (|fn|)
- (PROG (|$GenVarCounter| |a| |b|)
- (DECLARE (SPECIAL |$GenVarCounter|))
+ (PROG (|a| |b|)
(RETURN
(PROGN
(SETQ |b| *PACKAGE*)
(IN-PACKAGE "BOOTTRAN")
- (SETQ |$GenVarCounter| 0)
(UNWIND-PROTECT
(PROGN
(SETQ |a| (|inputTextFile| (|shoeAddbootIfNec| |fn|)))
@@ -280,13 +272,12 @@
(PROGN (|closeFile| |a|) (|setCurrentPackage| |b|)))))))
(DEFUN BOCLAM (|fn|)
- (PROG (|$bfClamming| |$GenVarCounter| |a| |callingPackage|)
- (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter|))
+ (PROG (|$bfClamming| |a| |callingPackage|)
+ (DECLARE (SPECIAL |$bfClamming|))
(RETURN
(PROGN
(SETQ |callingPackage| *PACKAGE*)
(IN-PACKAGE "BOOTTRAN")
- (SETQ |$GenVarCounter| 0)
(SETQ |$bfClamming| T)
(UNWIND-PROTECT
(PROGN
@@ -307,13 +298,11 @@
(DEFUN STOUT (|string|) (PSTOUT (LIST |string|)))
(DEFUN |string2BootTree| (|string|)
- (PROG (|$GenVarCounter| |result| |a| |callingPackage|)
- (DECLARE (SPECIAL |$GenVarCounter|))
+ (PROG (|result| |a| |callingPackage|)
(RETURN
(PROGN
(SETQ |callingPackage| *PACKAGE*)
(IN-PACKAGE "BOOTTRAN")
- (SETQ |$GenVarCounter| 0)
(SETQ |a| (|shoeTransformString| (LIST |string|)))
(SETQ |result|
(COND
@@ -324,13 +313,11 @@
|result|))))
(DEFUN STEVAL (|string|)
- (PROG (|$GenVarCounter| |result| |fn| |a| |callingPackage|)
- (DECLARE (SPECIAL |$GenVarCounter|))
+ (PROG (|result| |fn| |a| |callingPackage|)
(RETURN
(PROGN
(SETQ |callingPackage| *PACKAGE*)
(IN-PACKAGE "BOOTTRAN")
- (SETQ |$GenVarCounter| 0)
(SETQ |a| (|shoeTransformString| (LIST |string|)))
(SETQ |result|
(COND
@@ -343,13 +330,11 @@
|result|))))
(DEFUN STTOMC (|string|)
- (PROG (|$GenVarCounter| |result| |a| |callingPackage|)
- (DECLARE (SPECIAL |$GenVarCounter|))
+ (PROG (|result| |a| |callingPackage|)
(RETURN
(PROGN
(SETQ |callingPackage| *PACKAGE*)
(IN-PACKAGE "BOOTTRAN")
- (SETQ |$GenVarCounter| 0)
(SETQ |a| (|shoeTransformString| (LIST |string|)))
(SETQ |result|
(COND
@@ -454,27 +439,27 @@
(DEFUN |shoeFileLines| (|lines| |fn|)
(PROGN
(|shoeFileLine| " " |fn|)
- (LET ((|bfVar#9| |lines|) (|line| NIL))
+ (LET ((|bfVar#1| |lines|) (|line| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#9|)
- (PROGN (SETQ |line| (CAR |bfVar#9|)) NIL))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |line| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (|shoeFileLine| (|shoeAddComment| |line|) |fn|)))
- (SETQ |bfVar#9| (CDR |bfVar#9|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))
(|shoeFileLine| " " |fn|)))
(DEFUN |shoeConsoleLines| (|lines|)
(PROGN
(|shoeConsole| " ")
- (LET ((|bfVar#10| |lines|) (|line| NIL))
+ (LET ((|bfVar#1| |lines|) (|line| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#10|)
- (PROGN (SETQ |line| (CAR |bfVar#10|)) NIL))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |line| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (|shoeConsole| (|shoeAddComment| |line|))))
- (SETQ |bfVar#10| (CDR |bfVar#10|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))
(|shoeConsole| " ")))
(DEFUN |shoeFileLine| (|x| |stream|)
@@ -582,22 +567,22 @@
(T (COND ((SYMBOLP |vars|) (SETQ |vars| (LIST |vars|))))
(|genDeclaration| |n|
(|applySubst|
- (LET ((|bfVar#12| NIL) (|bfVar#13| NIL)
- (|bfVar#11| |vars|) (|v| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL)
+ (|bfVar#1| |vars|) (|v| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#11|)
+ ((OR (ATOM |bfVar#1|)
(PROGN
- (SETQ |v| (CAR |bfVar#11|))
+ (SETQ |v| (CAR |bfVar#1|))
NIL))
- (RETURN |bfVar#12|))
- ((NULL |bfVar#12|)
- (SETQ |bfVar#12|
+ (RETURN |bfVar#2|))
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2|
#0=(CONS (CONS |v| '*) NIL))
- (SETQ |bfVar#13| |bfVar#12|))
- (T (RPLACD |bfVar#13| #0#)
- (SETQ |bfVar#13| (CDR |bfVar#13|))))
- (SETQ |bfVar#11| (CDR |bfVar#11|))))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #0#)
+ (SETQ |bfVar#3| (CDR |bfVar#3|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))
|t'|)))))
(T (LIST 'DECLAIM (LIST 'TYPE |t| |n|)))))))
@@ -615,15 +600,15 @@
(PROGN
(SETQ |expr'|
(CDR (CDR (|shoeCompTran| (LIST 'LAMBDA NIL |expr|)))))
- (LET ((|bfVar#14| |expr'|) (|t| NIL))
+ (LET ((|bfVar#1| |expr'|) (|t| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#14|)
- (PROGN (SETQ |t| (CAR |bfVar#14|)) NIL))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |t| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
((AND (CONSP |t|) (EQ (CAR |t|) 'DECLARE))
(IDENTITY (RPLACA |t| 'DECLAIM))))
- (SETQ |bfVar#14| (CDR |bfVar#14|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))
(SETQ |expr'|
(COND
((< 1 (LENGTH |expr'|)) (CONS 'PROGN |expr'|))
@@ -667,26 +652,25 @@
(SETQ |$foreignsDefsForCLisp| NIL)
(CONS (LIST 'PROVIDE (SYMBOL-NAME |m|))
(|append| (|exportNames| |ns|)
- (LET ((|bfVar#16| NIL) (|bfVar#17| NIL)
- (|bfVar#15| |ds|) (|d| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL)
+ (|bfVar#1| |ds|) (|d| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#15|)
+ ((OR (ATOM |bfVar#1|)
(PROGN
- (SETQ |d| (CAR |bfVar#15|))
+ (SETQ |d| (CAR |bfVar#1|))
NIL))
- (RETURN |bfVar#16|))
- ((NULL |bfVar#16|)
- (SETQ |bfVar#16|
+ (RETURN |bfVar#2|))
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2|
#0=(CONS
(CAR
(|translateToplevel| |d| T))
NIL))
- (SETQ |bfVar#17| |bfVar#16|))
- (T (RPLACD |bfVar#17| #0#)
- (SETQ |bfVar#17|
- (CDR |bfVar#17|))))
- (SETQ |bfVar#15| (CDR |bfVar#15|)))))))))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #0#)
+ (SETQ |bfVar#3| (CDR |bfVar#3|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))))))
(|%Import|
(LET ((|m| (CADR |b|)))
(COND
@@ -762,22 +746,20 @@
(|bfMDef| |op| |args| |body|)))
(|%Structure|
(LET ((|t| (CADR |b|)) (|alts| (CADDR |b|)))
- (LET ((|bfVar#19| NIL) (|bfVar#20| NIL)
- (|bfVar#18| |alts|) (|alt| NIL))
+ (LET ((|bfVar#5| NIL) (|bfVar#6| NIL)
+ (|bfVar#4| |alts|) (|alt| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#18|)
- (PROGN
- (SETQ |alt| (CAR |bfVar#18|))
- NIL))
- (RETURN |bfVar#19|))
- ((NULL |bfVar#19|)
- (SETQ |bfVar#19|
+ ((OR (ATOM |bfVar#4|)
+ (PROGN (SETQ |alt| (CAR |bfVar#4|)) NIL))
+ (RETURN |bfVar#5|))
+ ((NULL |bfVar#5|)
+ (SETQ |bfVar#5|
#1=(CONS (|bfCreateDef| |alt|) NIL))
- (SETQ |bfVar#20| |bfVar#19|))
- (T (RPLACD |bfVar#20| #1#)
- (SETQ |bfVar#20| (CDR |bfVar#20|))))
- (SETQ |bfVar#18| (CDR |bfVar#18|))))))
+ (SETQ |bfVar#6| |bfVar#5|))
+ (T (RPLACD |bfVar#6| #1#)
+ (SETQ |bfVar#6| (CDR |bfVar#6|))))
+ (SETQ |bfVar#4| (CDR |bfVar#4|))))))
(|%Namespace|
(LET ((|n| (CADR |b|)))
(PROGN
@@ -824,11 +806,10 @@
(DEFPARAMETER |$lispWordTable| NIL)
(DEFUN |shoeDfu| (|a| |fn|)
- (PROG (|$bfClamming| |$GenVarCounter| |$bootDefinedTwice| |$bootUsed|
- |$bootDefined| |$lispWordTable| |stream|)
- (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter|
- |$bootDefinedTwice| |$bootUsed| |$bootDefined|
- |$lispWordTable|))
+ (PROG (|$bfClamming| |$bootDefinedTwice| |$bootUsed| |$bootDefined|
+ |$lispWordTable| |stream|)
+ (DECLARE (SPECIAL |$bfClamming| |$bootDefinedTwice| |$bootUsed|
+ |$bootDefined| |$lispWordTable|))
(RETURN
(COND
((NULL |a|) (|shoeNotFound| |fn|))
@@ -837,8 +818,7 @@
(SETF (|tableValue| |$lispWordTable| |i|) T))
(SETQ |$bootDefined| (|makeTable| #'EQ))
(SETQ |$bootUsed| (|makeTable| #'EQ))
- (SETQ |$bootDefinedTwice| NIL) (SETQ |$GenVarCounter| 0)
- (SETQ |$bfClamming| NIL)
+ (SETQ |$bootDefinedTwice| NIL) (SETQ |$bfClamming| NIL)
(|shoeDefUse| (|shoeTransformStream| |a|))
(UNWIND-PROTECT
(PROGN
@@ -854,21 +834,21 @@
(PROGN
(|shoeFileLine| "DEFINED and not USED" |stream|)
(SETQ |a|
- (LET ((|bfVar#22| NIL) (|bfVar#23| NIL)
- (|bfVar#21| (HKEYS |$bootDefined|)) (|i| NIL))
+ (LET ((|bfVar#2| NIL) (|bfVar#3| NIL)
+ (|bfVar#1| (HKEYS |$bootDefined|)) (|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#21|)
- (PROGN (SETQ |i| (CAR |bfVar#21|)) NIL))
- (RETURN |bfVar#22|))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL))
+ (RETURN |bfVar#2|))
(T (AND (NOT (|tableValue| |$bootUsed| |i|))
(COND
- ((NULL |bfVar#22|)
- (SETQ |bfVar#22| #0=(CONS |i| NIL))
- (SETQ |bfVar#23| |bfVar#22|))
- (T (RPLACD |bfVar#23| #0#)
- (SETQ |bfVar#23| (CDR |bfVar#23|)))))))
- (SETQ |bfVar#21| (CDR |bfVar#21|)))))
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2| #0=(CONS |i| NIL))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #0#)
+ (SETQ |bfVar#3| (CDR |bfVar#3|)))))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(|bootOut| (SSORT |a|) |stream|)
(|shoeFileLine| " " |stream|)
(|shoeFileLine| "DEFINED TWICE" |stream|)
@@ -876,31 +856,31 @@
(|shoeFileLine| " " |stream|)
(|shoeFileLine| "USED and not DEFINED" |stream|)
(SETQ |a|
- (LET ((|bfVar#25| NIL) (|bfVar#26| NIL)
- (|bfVar#24| (HKEYS |$bootUsed|)) (|i| NIL))
+ (LET ((|bfVar#5| NIL) (|bfVar#6| NIL)
+ (|bfVar#4| (HKEYS |$bootUsed|)) (|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#24|)
- (PROGN (SETQ |i| (CAR |bfVar#24|)) NIL))
- (RETURN |bfVar#25|))
+ ((OR (ATOM |bfVar#4|)
+ (PROGN (SETQ |i| (CAR |bfVar#4|)) NIL))
+ (RETURN |bfVar#5|))
(T (AND (NOT (|tableValue| |$bootDefined| |i|))
(COND
- ((NULL |bfVar#25|)
- (SETQ |bfVar#25| #1=(CONS |i| NIL))
- (SETQ |bfVar#26| |bfVar#25|))
- (T (RPLACD |bfVar#26| #1#)
- (SETQ |bfVar#26| (CDR |bfVar#26|)))))))
- (SETQ |bfVar#24| (CDR |bfVar#24|)))))
- (LET ((|bfVar#27| (SSORT |a|)) (|i| NIL))
+ ((NULL |bfVar#5|)
+ (SETQ |bfVar#5| #1=(CONS |i| NIL))
+ (SETQ |bfVar#6| |bfVar#5|))
+ (T (RPLACD |bfVar#6| #1#)
+ (SETQ |bfVar#6| (CDR |bfVar#6|)))))))
+ (SETQ |bfVar#4| (CDR |bfVar#4|)))))
+ (LET ((|bfVar#7| (SSORT |a|)) (|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#27|)
- (PROGN (SETQ |i| (CAR |bfVar#27|)) NIL))
+ ((OR (ATOM |bfVar#7|)
+ (PROGN (SETQ |i| (CAR |bfVar#7|)) NIL))
(RETURN NIL))
(T (SETQ |b| (CONCAT (PNAME |i|) " is used in "))
(|bootOutLines| (SSORT (|tableValue| |$bootUsed| |i|))
|stream| |b|)))
- (SETQ |bfVar#27| (CDR |bfVar#27|))))))))
+ (SETQ |bfVar#7| (CDR |bfVar#7|))))))))
(DEFUN |shoeDefUse| (|s|)
(LOOP
@@ -996,15 +976,15 @@
(T (CONS |nee| |$bootDefinedTwice|)))))
(T (SETF (|tableValue| |$bootDefined| |nee|) T)))
(|defuse1| |e| |niens|)
- (LET ((|bfVar#28| |$used|) (|i| NIL))
+ (LET ((|bfVar#1| |$used|) (|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#28|)
- (PROGN (SETQ |i| (CAR |bfVar#28|)) NIL))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (SETF (|tableValue| |$bootUsed| |i|)
(CONS |nee| (|tableValue| |$bootUsed| |i|)))))
- (SETQ |bfVar#28| (CDR |bfVar#28|))))))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))))))
(DEFUN |defuse1| (|e| |y|)
(PROG (|ndol| |dol| |LETTMP#1| |b| |a| |ISTMP#1|)
@@ -1040,27 +1020,27 @@
T))))
(SETQ |LETTMP#1| (|defSeparate| |a|))
(SETQ |dol| (CAR |LETTMP#1|)) (SETQ |ndol| (CADR |LETTMP#1|))
- (LET ((|bfVar#29| |dol|) (|i| NIL))
+ (LET ((|bfVar#1| |dol|) (|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#29|)
- (PROGN (SETQ |i| (CAR |bfVar#29|)) NIL))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (SETF (|tableValue| |$bootDefined| |i|) T)))
- (SETQ |bfVar#29| (CDR |bfVar#29|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))
(|defuse1| (|append| |ndol| |e|) |b|))
((AND (CONSP |y|) (EQ (CAR |y|) 'QUOTE)) (SETQ |a| (CDR |y|))
NIL)
((AND (CONSP |y|) (EQ (CAR |y|) '+LINE)) (SETQ |a| (CDR |y|))
NIL)
- (T (LET ((|bfVar#30| |y|) (|i| NIL))
+ (T (LET ((|bfVar#2| |y|) (|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#30|)
- (PROGN (SETQ |i| (CAR |bfVar#30|)) NIL))
+ ((OR (ATOM |bfVar#2|)
+ (PROGN (SETQ |i| (CAR |bfVar#2|)) NIL))
(RETURN NIL))
(T (|defuse1| |e| |i|)))
- (SETQ |bfVar#30| (CDR |bfVar#30|)))))))))
+ (SETQ |bfVar#2| (CDR |bfVar#2|)))))))))
(DEFUN |defSeparate| (|x|)
(PROG (|x2| |x1| |LETTMP#1| |f|)
@@ -1093,13 +1073,13 @@
(|tableValue| |$lispWordTable| |x|))
(DEFUN |bootOut| (|l| |outfn|)
- (LET ((|bfVar#31| |l|) (|i| NIL))
+ (LET ((|bfVar#1| |l|) (|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#31|) (PROGN (SETQ |i| (CAR |bfVar#31|)) NIL))
+ ((OR (ATOM |bfVar#1|) (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (|shoeFileLine| (CONCAT " " (PNAME |i|)) |outfn|)))
- (SETQ |bfVar#31| (CDR |bfVar#31|)))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(DEFUN CLESSP (|s1| |s2|) (NOT (SHOEGREATERP |s1| |s2|)))
@@ -1127,10 +1107,10 @@
(|closeFile| |a|)))))
(DEFUN |shoeXref| (|a| |fn|)
- (PROG (|$bfClamming| |$GenVarCounter| |$bootUsed| |$bootDefined|
- |$lispWordTable| |stream| |out|)
- (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter| |$bootUsed|
- |$bootDefined| |$lispWordTable|))
+ (PROG (|$bfClamming| |$bootUsed| |$bootDefined| |$lispWordTable|
+ |stream| |out|)
+ (DECLARE (SPECIAL |$bfClamming| |$bootUsed| |$bootDefined|
+ |$lispWordTable|))
(RETURN
(COND
((NULL |a|) (|shoeNotFound| |fn|))
@@ -1139,7 +1119,7 @@
(SETF (|tableValue| |$lispWordTable| |i|) T))
(SETQ |$bootDefined| (|makeTable| #'EQ))
(SETQ |$bootUsed| (|makeTable| #'EQ))
- (SETQ |$GenVarCounter| 0) (SETQ |$bfClamming| NIL)
+ (SETQ |$bfClamming| NIL)
(|shoeDefUse| (|shoeTransformStream| |a|))
(SETQ |out| (CONCAT |fn| ".xref"))
(UNWIND-PROTECT
@@ -1156,38 +1136,38 @@
(PROGN
(|shoeFileLine| "USED and where DEFINED" |stream|)
(SETQ |c| (SSORT (HKEYS |$bootUsed|)))
- (LET ((|bfVar#32| |c|) (|i| NIL))
+ (LET ((|bfVar#1| |c|) (|i| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#32|)
- (PROGN (SETQ |i| (CAR |bfVar#32|)) NIL))
+ ((OR (ATOM |bfVar#1|)
+ (PROGN (SETQ |i| (CAR |bfVar#1|)) NIL))
(RETURN NIL))
(T (SETQ |a| (CONCAT (PNAME |i|) " is used in "))
(|bootOutLines| (SSORT (|tableValue| |$bootUsed| |i|))
|stream| |a|)))
- (SETQ |bfVar#32| (CDR |bfVar#32|))))))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|))))))))
(DEFUN |shoeItem| (|str|)
(PROG (|dq|)
(RETURN
(PROGN
(SETQ |dq| (CAR |str|))
- (CONS (LIST (LET ((|bfVar#34| NIL) (|bfVar#35| NIL)
- (|bfVar#33| (|shoeDQlines| |dq|))
+ (CONS (LIST (LET ((|bfVar#2| NIL) (|bfVar#3| NIL)
+ (|bfVar#1| (|shoeDQlines| |dq|))
(|line| NIL))
(LOOP
(COND
- ((OR (ATOM |bfVar#33|)
+ ((OR (ATOM |bfVar#1|)
(PROGN
- (SETQ |line| (CAR |bfVar#33|))
+ (SETQ |line| (CAR |bfVar#1|))
NIL))
- (RETURN |bfVar#34|))
- ((NULL |bfVar#34|)
- (SETQ |bfVar#34| #0=(CONS (CAR |line|) NIL))
- (SETQ |bfVar#35| |bfVar#34|))
- (T (RPLACD |bfVar#35| #0#)
- (SETQ |bfVar#35| (CDR |bfVar#35|))))
- (SETQ |bfVar#33| (CDR |bfVar#33|)))))
+ (RETURN |bfVar#2|))
+ ((NULL |bfVar#2|)
+ (SETQ |bfVar#2| #0=(CONS (CAR |line|) NIL))
+ (SETQ |bfVar#3| |bfVar#2|))
+ (T (RPLACD |bfVar#3| #0#)
+ (SETQ |bfVar#3| (CDR |bfVar#3|))))
+ (SETQ |bfVar#1| (CDR |bfVar#1|)))))
(CDR |str|))))))
(DEFUN |stripm| (|x| |pk| |bt|)
@@ -1235,12 +1215,7 @@
(LET ((*PACKAGE* (FIND-PACKAGE "BOOTTRAN"))) (|bStreamNull| |s|)))
(DEFUN PSTTOMC (|string|)
- (PROG (|$GenVarCounter|)
- (DECLARE (SPECIAL |$GenVarCounter|))
- (RETURN
- (PROGN
- (SETQ |$GenVarCounter| 0)
- (|shoePCompileTrees| (|shoeTransformString| |string|))))))
+ (|shoePCompileTrees| (|shoeTransformString| |string|)))
(DEFUN BOOTLOOP ()
(PROG (|stream| |b| |a|)
@@ -1273,13 +1248,8 @@
(T (PSTOUT (LIST |a|)) (BOOTPO)))))))))
(DEFUN PSTOUT (|string|)
- (PROG (|$GenVarCounter|)
- (DECLARE (SPECIAL |$GenVarCounter|))
- (RETURN
- (LET ((*PACKAGE* (FIND-PACKAGE "BOOTTRAN")))
- (PROGN
- (SETQ |$GenVarCounter| 0)
- (|shoeConsoleTrees| (|shoeTransformString| |string|)))))))
+ (LET ((*PACKAGE* (FIND-PACKAGE "BOOTTRAN")))
+ (|shoeConsoleTrees| (|shoeTransformString| |string|))))
(DEFUN |defaultBootToLispFile| (|file|)
(CONCAT (|pathBasename| |file|) ".clisp"))
diff --git a/src/boot/translator.boot b/src/boot/translator.boot
index 749d0b6f..dd740929 100644
--- a/src/boot/translator.boot
+++ b/src/boot/translator.boot
@@ -109,7 +109,6 @@ BOOTTOCLLINES(lines, fn, outfn)==
shoeClLines(a,fn,lines,outfn)==
a=nil => shoeNotFound fn
- $GenVarCounter: local := 0
try
stream := outputTextFile outfn
genOptimizeOptions stream
@@ -138,7 +137,6 @@ BOOTTOCLCLINES(lines, fn, outfn)==
shoeClCLines(a,fn,lines,outfn)==
a=nil => shoeNotFound fn
- $GenVarCounter: local := 0
try
stream := outputTextFile outfn
genOptimizeOptions stream
@@ -156,7 +154,6 @@ BOOTTOMC: %String -> %Thing
BOOTTOMC fn==
callingPackage := namespace .
IN_-PACKAGE '"BOOTTRAN"
- $GenVarCounter: local := 0
try
a := inputTextFile shoeAddbootIfNec fn
shoeMc(a,fn)
@@ -188,7 +185,6 @@ BO: %String -> %Thing
BO fn==
b := namespace .
IN_-PACKAGE '"BOOTTRAN"
- $GenVarCounter: local := 0
try
a := inputTextFile shoeAddbootIfNec fn
shoeToConsole(a,fn)
@@ -199,7 +195,6 @@ BO fn==
BOCLAM fn==
callingPackage := namespace .
IN_-PACKAGE '"BOOTTRAN"
- $GenVarCounter: local := 0
$bfClamming: local := true
try
a := inputTextFile shoeAddbootIfNec fn
@@ -222,7 +217,6 @@ STOUT string ==
string2BootTree string ==
callingPackage := namespace .
IN_-PACKAGE '"BOOTTRAN"
- $GenVarCounter: local := 0
a := shoeTransformString [string]
result :=
bStreamNull a => nil
@@ -234,7 +228,6 @@ string2BootTree string ==
STEVAL string==
callingPackage := namespace .
IN_-PACKAGE '"BOOTTRAN"
- $GenVarCounter: local := 0
a:= shoeTransformString [string]
result :=
bStreamNull a => nil
@@ -249,7 +242,6 @@ STEVAL string==
STTOMC string==
callingPackage := namespace .
IN_-PACKAGE '"BOOTTRAN"
- $GenVarCounter: local := 0
a:= shoeTransformString [string]
result :=
bStreamNull a => nil
@@ -524,7 +516,6 @@ shoeDfu(a,fn)==
$bootDefined: local := makeTable function symbolEq?
$bootUsed:local := makeTable function symbolEq?
$bootDefinedTwice: local := nil
- $GenVarCounter: local := 0
$bfClamming: local := false
shoeDefUse shoeTransformStream a
try
@@ -640,7 +631,6 @@ shoeXref(a,fn)==
DO_-SYMBOLS(i(namespace LISP),tableValue($lispWordTable,i) := true)
$bootDefined: local := makeTable function symbolEq?
$bootUsed: local := makeTable function symbolEq?
- $GenVarCounter: local := 0
$bfClamming: local := false
shoeDefUse shoeTransformStream a
out := strconc(fn,'".xref")
@@ -686,7 +676,6 @@ bStreamPackageNull s==
bStreamNull s
PSTTOMC string==
- $GenVarCounter: local := 0
shoePCompileTrees shoeTransformString string
BOOTLOOP() ==
@@ -719,7 +708,6 @@ BOOTPO() ==
PSTOUT string==
in namespace BOOTTRAN do
- $GenVarCounter: local := 0
shoeConsoleTrees shoeTransformString string
defaultBootToLispFile file ==
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 05:14:32 +0000