diff options
-rw-r--r-- | src/ChangeLog | 4 | ||||
-rw-r--r-- | src/boot/ast.boot | 9 | ||||
-rw-r--r-- | src/boot/strap/ast.clisp | 1862 | ||||
-rw-r--r-- | src/boot/strap/includer.clisp | 298 | ||||
-rw-r--r-- | src/boot/strap/parser.clisp | 231 | ||||
-rw-r--r-- | src/boot/strap/pile.clisp | 90 | ||||
-rw-r--r-- | src/boot/strap/scanner.clisp | 364 | ||||
-rw-r--r-- | src/boot/strap/tokens.clisp | 31 | ||||
-rw-r--r-- | src/boot/strap/translator.clisp | 698 |
9 files changed, 1750 insertions, 1837 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a99c7d3e..11a82c82 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-09-03 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * boot/ast.boot: More cleanup. + 2009-09-02 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/cstream.boot: Cleanup. diff --git a/src/boot/ast.boot b/src/boot/ast.boot index ee531a0f..03d9bf79 100644 --- a/src/boot/ast.boot +++ b/src/boot/ast.boot @@ -388,8 +388,7 @@ bfLp1(iters,body)== [vars,inits,sucs,filters,exits,value] := bfSep bfAppend iters nbody := if null filters then body else bfAND [:filters,body] value := if null value then "NIL" else first value - exits := ["COND",[bfOR exits,["RETURN",value]], - ['(QUOTE T),nbody]] + exits := ["COND",[bfOR exits,["RETURN",value]],['T,nbody]] loop := ["LOOP",exits,:sucs] if vars then loop := ["LET",[[v, i] for v in vars for i in inits], loop] @@ -958,7 +957,7 @@ bfIf(a,b,c)== b1:=if b is ["PROGN",:.] then rest b else [b] c is ["COND",:.] => ["COND",[a,:b1],:rest c] c1:=if c is ["PROGN",:.] then rest c else [c] - ["COND",[a,:b1],['(QUOTE T),:c1]] + ["COND",[a,:b1],['T,:c1]] bfExit(a,b)== ["COND",[a,["IDENTITY",b]]] @@ -998,7 +997,7 @@ bfSequence l == f bfMKPROGN [first l,bfSequence rest l] null aft => ["COND",:transform] - ["COND",:transform,['(QUOTE T),:bfWashCONDBranchBody bfSequence aft]] + ["COND",:transform,['T,:bfWashCONDBranchBody bfSequence aft]] bfWhere (context,expr)== [opassoc,defs,nondefs] := defSheepAndGoats context @@ -1033,7 +1032,7 @@ bfMain(auxfn,op)== getCode:= ['GETHASH,g1,cacheName] secondPredPair:= [['SETQ,g2,getCode],g2] putCode:= ['SETF ,getCode,computeValue] - thirdPredPair:= ['(QUOTE T),putCode] + thirdPredPair:= ['T,putCode] codeBody:= ['PROG,[g2], ['RETURN,['COND,secondPredPair,thirdPredPair]]] mainFunction:= ["DEFUN",op,arg,codeBody] diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp index 79e71325..2fca7b8a 100644 --- a/src/boot/strap/ast.clisp +++ b/src/boot/strap/ast.clisp @@ -171,12 +171,12 @@ (COND ((AND (|%hasFeature| :CLISP) (MEMBER |package| '(EXT FFI))) (FIND-SYMBOL (SYMBOL-NAME |name|) |package|)) - ('T (INTERN (SYMBOL-NAME |name|) |package|)))) + (T (INTERN (SYMBOL-NAME |name|) |package|)))) (DECLAIM (FTYPE (FUNCTION (|%Thing|) |%Thing|) |bfSymbol|)) (DEFUN |bfSymbol| (|x|) - (COND ((STRINGP |x|) |x|) ('T (LIST 'QUOTE |x|)))) + (COND ((STRINGP |x|) |x|) (T (LIST 'QUOTE |x|)))) (DECLAIM (FTYPE (FUNCTION NIL |%Symbol|) |bfDot|)) @@ -213,8 +213,8 @@ ((AND (CONSP |y|) (EQ (CAR |y|) 'BVQUOTE) (PROGN (SETQ |a| (CDR |y|)) 'T)) (LIST '&REST (CONS 'QUOTE |a|))) - (#0='T (LIST '&REST |y|)))) - (#0# (CONS (CAR |x|) (|bfColonAppend| (CDR |x|) |y|))))))) + (T (LIST '&REST |y|)))) + (T (CONS (CAR |x|) (|bfColonAppend| (CDR |x|) |y|))))))) (DECLAIM (FTYPE (FUNCTION (|%Thing|) |%Boolean|) |bfBeginsDollar|)) @@ -227,23 +227,23 @@ ((AND (IDENTP |x|) (|bfBeginsDollar| |x|)) (|compFluid| |x|)) ((ATOM |x|) |x|) ((AND (CONSP |x|) (EQ (CAR |x|) 'QUOTE)) |x|) - ('T (CONS (|compFluidize| (CAR |x|)) (|compFluidize| (CDR |x|)))))) + (T (CONS (|compFluidize| (CAR |x|)) (|compFluidize| (CDR |x|)))))) (DEFUN |bfTuple| (|x|) (CONS 'TUPLE |x|)) (DEFUN |bfTupleP| (|x|) (AND (CONSP |x|) (EQ (CAR |x|) 'TUPLE))) (DEFUN |bfUntuple| (|bf|) - (COND ((|bfTupleP| |bf|) (CDR |bf|)) ('T |bf|))) + (COND ((|bfTupleP| |bf|) (CDR |bf|)) (T |bf|))) (DEFUN |bfTupleIf| (|x|) - (COND ((|bfTupleP| |x|) |x|) ('T (|bfTuple| |x|)))) + (COND ((|bfTupleP| |x|) |x|) (T (|bfTuple| |x|)))) (DEFUN |bfTupleConstruct| (|b|) (PROG (|ISTMP#1| |a|) (RETURN (PROGN - (SETQ |a| (COND ((|bfTupleP| |b|) (CDR |b|)) ('T (LIST |b|)))) + (SETQ |a| (COND ((|bfTupleP| |b|) (CDR |b|)) (T (LIST |b|)))) (COND ((LET ((|bfVar#80| NIL) (|bfVar#79| |a|) (|x| NIL)) (LOOP @@ -251,24 +251,23 @@ ((OR (ATOM |bfVar#79|) (PROGN (SETQ |x| (CAR |bfVar#79|)) NIL)) (RETURN |bfVar#80|)) - ('T - (PROGN - (SETQ |bfVar#80| - (AND (CONSP |x|) (EQ (CAR |x|) 'COLON) - (PROGN - (SETQ |ISTMP#1| (CDR |x|)) - (AND (CONSP |ISTMP#1|) - (EQ (CDR |ISTMP#1|) NIL))))) - (COND (|bfVar#80| (RETURN |bfVar#80|)))))) + (T (PROGN + (SETQ |bfVar#80| + (AND (CONSP |x|) (EQ (CAR |x|) 'COLON) + (PROGN + (SETQ |ISTMP#1| (CDR |x|)) + (AND (CONSP |ISTMP#1|) + (EQ (CDR |ISTMP#1|) NIL))))) + (COND (|bfVar#80| (RETURN |bfVar#80|)))))) (SETQ |bfVar#79| (CDR |bfVar#79|)))) (|bfMakeCons| |a|)) - ('T (CONS 'LIST |a|))))))) + (T (CONS 'LIST |a|))))))) (DEFUN |bfConstruct| (|b|) (PROG (|a|) (RETURN (PROGN - (SETQ |a| (COND ((|bfTupleP| |b|) (CDR |b|)) ('T (LIST |b|)))) + (SETQ |a| (COND ((|bfTupleP| |b|) (CDR |b|)) (T (LIST |b|)))) (|bfMakeCons| |a|))))) (DEFUN |bfMakeCons| (|l|) @@ -285,10 +284,8 @@ (AND (CONSP |ISTMP#2|) (EQ (CDR |ISTMP#2|) NIL) (PROGN (SETQ |a| (CAR |ISTMP#2|)) #0='T))))) (PROGN (SETQ |l1| (CDR |l|)) #0#)) - (COND - (|l1| (LIST 'APPEND |a| (|bfMakeCons| |l1|))) - (#1='T |a|))) - (#1# (LIST 'CONS (CAR |l|) (|bfMakeCons| (CDR |l|)))))))) + (COND (|l1| (LIST 'APPEND |a| (|bfMakeCons| |l1|))) (T |a|))) + (T (LIST 'CONS (CAR |l|) (|bfMakeCons| (CDR |l|)))))))) (DEFUN |bfFor| (|bflhs| U |step|) (COND @@ -296,7 +293,7 @@ (|bfForTree| 'ON |bflhs| (CADR U))) ((AND (CONSP U) (EQ (CAR U) 'SEGMENT)) (|bfSTEP| |bflhs| (CADR U) |step| (CADDR U))) - ('T (|bfForTree| 'IN |bflhs| U)))) + (T (|bfForTree| 'IN |bflhs| U)))) (DEFUN |bfForTree| (OP |lhs| |whole|) (PROG (G) @@ -305,20 +302,19 @@ (SETQ |whole| (COND ((|bfTupleP| |whole|) (|bfMakeCons| (CDR |whole|))) - (#0='T |whole|))) + (T |whole|))) (COND ((ATOM |lhs|) (|bfINON| (LIST OP |lhs| |whole|))) - (#1='T - (SETQ |lhs| - (COND ((|bfTupleP| |lhs|) (CADR |lhs|)) (#0# |lhs|))) - (COND - ((AND (CONSP |lhs|) (EQ (CAR |lhs|) 'L%T)) - (SETQ G (CADR |lhs|)) - (APPEND (|bfINON| (LIST OP G |whole|)) - (|bfSuchthat| (|bfIS| G (CADDR |lhs|))))) - (#1# (SETQ G (|bfGenSymbol|)) - (APPEND (|bfINON| (LIST OP G |whole|)) - (|bfSuchthat| (|bfIS| G |lhs|))))))))))) + (T (SETQ |lhs| + (COND ((|bfTupleP| |lhs|) (CADR |lhs|)) (T |lhs|))) + (COND + ((AND (CONSP |lhs|) (EQ (CAR |lhs|) 'L%T)) + (SETQ G (CADR |lhs|)) + (APPEND (|bfINON| (LIST OP G |whole|)) + (|bfSuchthat| (|bfIS| G (CADDR |lhs|))))) + (T (SETQ G (|bfGenSymbol|)) + (APPEND (|bfINON| (LIST OP G |whole|)) + (|bfSuchthat| (|bfIS| G |lhs|))))))))))) (DEFUN |bfSTEP| (|id| |fst| |step| |lst|) (PROG (|suc| |ex| |pred| |final| |g2| |inc| |g1| |initval| |initvar|) @@ -329,26 +325,25 @@ (SETQ |inc| (COND ((ATOM |step|) |step|) - (#0='T (SETQ |g1| (|bfGenSymbol|)) - (SETQ |initvar| (CONS |g1| |initvar|)) - (SETQ |initval| (CONS |step| |initval|)) |g1|))) + (T (SETQ |g1| (|bfGenSymbol|)) + (SETQ |initvar| (CONS |g1| |initvar|)) + (SETQ |initval| (CONS |step| |initval|)) |g1|))) (SETQ |final| (COND ((ATOM |lst|) |lst|) - (#0# (SETQ |g2| (|bfGenSymbol|)) - (SETQ |initvar| (CONS |g2| |initvar|)) - (SETQ |initval| (CONS |lst| |initval|)) |g2|))) + (T (SETQ |g2| (|bfGenSymbol|)) + (SETQ |initvar| (CONS |g2| |initvar|)) + (SETQ |initval| (CONS |lst| |initval|)) |g2|))) (SETQ |ex| (COND ((NULL |lst|) NIL) ((INTEGERP |inc|) - (SETQ |pred| (COND ((MINUSP |inc|) '<) (#0# '>))) + (SETQ |pred| (COND ((MINUSP |inc|) '<) (T '>))) (LIST (LIST |pred| |id| |final|))) - ('T - (LIST (LIST 'COND - (LIST (LIST 'MINUSP |inc|) - (LIST '< |id| |final|)) - (LIST 'T (LIST '> |id| |final|))))))) + (T (LIST (LIST 'COND + (LIST (LIST 'MINUSP |inc|) + (LIST '< |id| |final|)) + (LIST 'T (LIST '> |id| |final|))))))) (SETQ |suc| (LIST (LIST 'SETQ |id| (LIST '+ |id| |inc|)))) (LIST (LIST |initvar| |initval| |suc| NIL |ex| NIL)))))) @@ -361,7 +356,7 @@ (SETQ |whole| (CADDR . #0#)) (COND ((EQ |op| 'ON) (|bfON| |id| |whole|)) - ('T (|bfIN| |id| |whole|))))))) + (T (|bfIN| |id| |whole|))))))) (DEFUN |bfIN| (|x| E) (PROG (|g|) @@ -403,32 +398,32 @@ (COND ((AND (CONSP |iters|) (EQ (CAR |iters|) 'ITERATORS)) (|bfLp1| (CDR |iters|) |body|)) - ('T (|bfLpCross| (CDR |iters|) |body|)))) + (T (|bfLpCross| (CDR |iters|) |body|)))) (DEFUN |bfLpCross| (|iters| |body|) (COND ((NULL (CDR |iters|)) (|bfLp| (CAR |iters|) |body|)) - ('T (|bfLp| (CAR |iters|) (|bfLpCross| (CDR |iters|) |body|))))) + (T (|bfLp| (CAR |iters|) (|bfLpCross| (CDR |iters|) |body|))))) (DEFUN |bfSep| (|iters|) (PROG (|r| |f|) (RETURN (COND ((NULL |iters|) (LIST NIL NIL NIL NIL NIL NIL)) - ('T (SETQ |f| (CAR |iters|)) (SETQ |r| (|bfSep| (CDR |iters|))) - (LET ((|bfVar#83| NIL) (|bfVar#81| |f|) (|i| NIL) - (|bfVar#82| |r|) (|j| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#81|) - (PROGN (SETQ |i| (CAR |bfVar#81|)) NIL) - (ATOM |bfVar#82|) - (PROGN (SETQ |j| (CAR |bfVar#82|)) NIL)) - (RETURN (NREVERSE |bfVar#83|))) - ('T - (SETQ |bfVar#83| (CONS (APPEND |i| |j|) |bfVar#83|)))) - (SETQ |bfVar#81| (CDR |bfVar#81|)) - (SETQ |bfVar#82| (CDR |bfVar#82|))))))))) + (T (SETQ |f| (CAR |iters|)) (SETQ |r| (|bfSep| (CDR |iters|))) + (LET ((|bfVar#83| NIL) (|bfVar#81| |f|) (|i| NIL) + (|bfVar#82| |r|) (|j| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#81|) + (PROGN (SETQ |i| (CAR |bfVar#81|)) NIL) + (ATOM |bfVar#82|) + (PROGN (SETQ |j| (CAR |bfVar#82|)) NIL)) + (RETURN (NREVERSE |bfVar#83|))) + (T (SETQ |bfVar#83| + (CONS (APPEND |i| |j|) |bfVar#83|)))) + (SETQ |bfVar#81| (CDR |bfVar#81|)) + (SETQ |bfVar#82| (CDR |bfVar#82|))))))))) (DEFUN |bfReduce| (|op| |y|) (PROG (|it| |ny| |g2| |body| |g1| |g| |init| |a|) @@ -437,7 +432,7 @@ (SETQ |a| (COND ((AND (CONSP |op|) (EQ (CAR |op|) 'QUOTE)) (CADR |op|)) - ('T |op|))) + (T |op|))) (SETQ |op| (|bfReName| |a|)) (SETQ |init| (OR (GET |a| 'SHOETHETA) (GET |op| 'SHOETHETA))) (SETQ |g| (|bfGenSymbol|)) @@ -453,13 +448,13 @@ (|bfIN| |g1| |ny|)))) (|bfMKPROGN| (LIST (LIST 'L%T |g2| |y|) (|bfLp| |it| |body|)))) - ('T (SETQ |init| (CAR |init|)) - (SETQ |it| - (CONS 'ITERATORS - (LIST (LIST (LIST (LIST |g|) (LIST |init|) NIL - NIL NIL (LIST |g|))) - (|bfIN| |g1| |y|)))) - (|bfLp| |it| |body|))))))) + (T (SETQ |init| (CAR |init|)) + (SETQ |it| + (CONS 'ITERATORS + (LIST (LIST (LIST (LIST |g|) (LIST |init|) NIL + NIL NIL (LIST |g|))) + (|bfIN| |g1| |y|)))) + (|bfLp| |it| |body|))))))) (DEFUN |bfReduceCollect| (|op| |y|) (PROG (|init| |a| |itl| |body|) @@ -471,11 +466,11 @@ (COND ((AND (CONSP |op|) (EQ (CAR |op|) 'QUOTE)) (CADR |op|)) - ('T |op|))) + (T |op|))) (SETQ |op| (|bfReName| |a|)) (SETQ |init| (OR (GET |a| 'SHOETHETA) (GET |op| 'SHOETHETA))) (|bfOpReduce| |op| |init| |body| |itl|)) - ('T (|bfReduce| |op| (|bfTupleConstruct| (ELT |y| 1)))))))) + (T (|bfReduce| |op| (|bfTupleConstruct| (ELT |y| 1)))))))) (DEFUN |bfDCollect| (|y| |itl|) (LIST 'COLLECT |y| |itl|)) @@ -494,7 +489,7 @@ ((AND (CONSP |y|) (EQ (CAR |y|) 'TUPLE)) (SETQ |newBody| (|bfConstruct| |y|)) (|bf0APPEND| |newBody| |itl|)) - ('T (|bf0COLLECT| |y| |itl|)))))) + (T (|bf0COLLECT| |y| |itl|)))))) (DEFUN |bf0COLLECT| (|y| |itl|) (|bfListReduce| 'CONS |y| |itl|)) @@ -536,12 +531,12 @@ (SETQ |nbody| (COND ((NULL |filters|) |body|) - (#2='T (|bfAND| (APPEND |filters| (CONS |body| NIL)))))) - (SETQ |value| (COND ((NULL |value|) 'NIL) (#2# (CAR |value|)))) + (T (|bfAND| (APPEND |filters| (CONS |body| NIL)))))) + (SETQ |value| (COND ((NULL |value|) 'NIL) (T (CAR |value|)))) (SETQ |exits| (LIST 'COND (LIST (|bfOR| |exits|) (LIST 'RETURN |value|)) - (LIST ''T |nbody|))) + (LIST 'T |nbody|))) (SETQ |loop| (CONS 'LOOP (CONS |exits| |sucs|))) (COND (|vars| (SETQ |loop| @@ -560,7 +555,7 @@ (SETQ |i| (CAR |bfVar#85|)) NIL)) (RETURN (NREVERSE |bfVar#86|))) - ('T + (T (SETQ |bfVar#86| (CONS (LIST |v| |i|) |bfVar#86|)))) (SETQ |bfVar#84| (CDR |bfVar#84|)) @@ -574,11 +569,11 @@ (COND ((AND (CONSP |itl|) (EQ (CAR |itl|) 'ITERATORS)) (|bfLp1| (CONS |extrait| (CDR |itl|)) |body|)) - ('T (SETQ |iters| (CDR |itl|)) - (|bfLpCross| - (CONS (CONS 'ITERATORS (CONS |extrait| (CDAR |iters|))) - (CDR |iters|)) - |body|)))))) + (T (SETQ |iters| (CDR |itl|)) + (|bfLpCross| + (CONS (CONS 'ITERATORS (CONS |extrait| (CDAR |iters|))) + (CDR |iters|)) + |body|)))))) (DEFUN |bfOpReduce| (|op| |init| |y| |itl|) (PROG (|extrait| |g1| |body| |g|) @@ -597,7 +592,7 @@ (|bfMKPROGN| (LIST (LIST 'SETQ |g| |y|) (LIST 'COND (LIST |g| (LIST 'RETURN |g|)))))) - (#0='T (LIST 'SETQ |g| (LIST |op| |g| |y|))))) + (T (LIST 'SETQ |g| (LIST |op| |g| |y|))))) (COND ((NULL |init|) (SETQ |g1| (|bfGenSymbol|)) (SETQ |init| (LIST 'CAR |g1|)) (SETQ |y| (LIST 'CDR |g1|)) @@ -607,11 +602,11 @@ (|bfMKPROGN| (LIST (LIST 'L%T |g1| |y|) (|bfLp2| |extrait| |itl| |body|)))) - (#0# (SETQ |init| (CAR |init|)) - (SETQ |extrait| - (LIST (LIST (LIST |g|) (LIST |init|) NIL NIL NIL - (LIST |g|)))) - (|bfLp2| |extrait| |itl| |body|))))))) + (T (SETQ |init| (CAR |init|)) + (SETQ |extrait| + (LIST (LIST (LIST |g|) (LIST |init|) NIL NIL NIL + (LIST |g|)))) + (|bfLp2| |extrait| |itl| |body|))))))) (DEFUN |bfLoop1| (|body|) (|bfLp| (|bfIterators| NIL) |body|)) @@ -629,18 +624,18 @@ ((EQ |b| 'FLUID) (|compFluid| |a|)) ((EQ |b| '|fluid|) (|compFluid| |a|)) ((EQ |b| '|local|) (|compFluid| |a|)) - ('T |a|))) + (T |a|))) (DEFUN |bfTake| (|n| |x|) (COND ((NULL |x|) |x|) ((EQL |n| 0) NIL) - ('T (CONS (CAR |x|) (|bfTake| (- |n| 1) (CDR |x|)))))) + (T (CONS (CAR |x|) (|bfTake| (- |n| 1) (CDR |x|)))))) (DEFUN |bfDrop| (|n| |x|) (COND ((OR (NULL |x|) (EQL |n| 0)) |x|) - ('T (|bfDrop| (- |n| 1) (CDR |x|))))) + (T (|bfDrop| (- |n| 1) (CDR |x|))))) (DEFUN |bfReturnNoName| (|a|) (LIST 'RETURN |a|)) @@ -648,17 +643,17 @@ (COND ((ATOM |e|) (|bfSUBLIS1| |p| |e|)) ((AND (CONSP |e|) (EQ (CAR |e|) 'QUOTE)) |e|) - ('T (CONS (|bfSUBLIS| |p| (CAR |e|)) (|bfSUBLIS| |p| (CDR |e|)))))) + (T (CONS (|bfSUBLIS| |p| (CAR |e|)) (|bfSUBLIS| |p| (CDR |e|)))))) (DEFUN |bfSUBLIS1| (|p| |e|) (PROG (|f|) (RETURN (COND ((NULL |p|) |e|) - (#0='T (SETQ |f| (CAR |p|)) - (COND - ((EQ (CAR |f|) |e|) (|bfSUBLIS| |p| (CDR |f|))) - (#0# (|bfSUBLIS1| (CDR |p|) |e|)))))))) + (T (SETQ |f| (CAR |p|)) + (COND + ((EQ (CAR |f|) |e|) (|bfSUBLIS| |p| (CDR |f|))) + (T (|bfSUBLIS1| (CDR |p|) |e|)))))))) (DEFUN |defSheepAndGoats| (|x|) (PROG (|defstack| |op1| |opassoc| |argl|) @@ -672,18 +667,18 @@ (SETQ |argl| (COND ((|bfTupleP| |args|) (CDR |args|)) - (#0='T (LIST |args|)))) + (T (LIST |args|)))) (COND ((NULL |argl|) (SETQ |opassoc| (LIST (CONS |op| |body|))) (LIST |opassoc| NIL NIL)) - (#0# - (SETQ |op1| - (INTERN (CONCAT (PNAME |$op|) "," - (PNAME |op|)))) - (SETQ |opassoc| (LIST (CONS |op| |op1|))) - (SETQ |defstack| (LIST (LIST |op1| |args| |body|))) - (LIST |opassoc| |defstack| NIL)))))) + (T (SETQ |op1| + (INTERN (CONCAT (PNAME |$op|) "," + (PNAME |op|)))) + (SETQ |opassoc| (LIST (CONS |op| |op1|))) + (SETQ |defstack| + (LIST (LIST |op1| |args| |body|))) + (LIST |opassoc| |defstack| NIL)))))) (|%Pile| (LET ((|defs| (CADR |x|))) (|defSheepAndGoatsList| |defs|))) (T (LIST NIL NIL (LIST |x|))))))) @@ -694,16 +689,16 @@ (RETURN (COND ((NULL |x|) (LIST NIL NIL NIL)) - ('T (SETQ |LETTMP#1| (|defSheepAndGoats| (CAR |x|))) - (SETQ |opassoc| (CAR |LETTMP#1|)) - (SETQ |defs| (CADR . #0=(|LETTMP#1|))) - (SETQ |nondefs| (CADDR . #0#)) - (SETQ |LETTMP#1| (|defSheepAndGoatsList| (CDR |x|))) - (SETQ |opassoc1| (CAR |LETTMP#1|)) - (SETQ |defs1| (CADR . #1=(|LETTMP#1|))) - (SETQ |nondefs1| (CADDR . #1#)) - (LIST (APPEND |opassoc| |opassoc1|) (APPEND |defs| |defs1|) - (APPEND |nondefs| |nondefs1|))))))) + (T (SETQ |LETTMP#1| (|defSheepAndGoats| (CAR |x|))) + (SETQ |opassoc| (CAR |LETTMP#1|)) + (SETQ |defs| (CADR . #0=(|LETTMP#1|))) + (SETQ |nondefs| (CADDR . #0#)) + (SETQ |LETTMP#1| (|defSheepAndGoatsList| (CDR |x|))) + (SETQ |opassoc1| (CAR |LETTMP#1|)) + (SETQ |defs1| (CADR . #1=(|LETTMP#1|))) + (SETQ |nondefs1| (CADDR . #1#)) + (LIST (APPEND |opassoc| |opassoc1|) (APPEND |defs| |defs1|) + (APPEND |nondefs| |nondefs1|))))))) (DEFUN |bfLetForm| (|lhs| |rhs|) (LIST 'L%T |lhs| |rhs|)) @@ -725,10 +720,9 @@ (|bfMKPROGN| (LIST |rhs1| |rhs|))) ((AND (CONSP |rhs1|) (EQ (CAR |rhs1|) 'PROGN)) (APPEND |rhs1| (LIST |rhs|))) - (#0='T - (COND - ((IDENTP (CAR |rhs1|)) (SETQ |rhs1| (CONS |rhs1| NIL)))) - (|bfMKPROGN| (APPEND |rhs1| (CONS |rhs| NIL)))))) + (T (COND + ((IDENTP (CAR |rhs1|)) (SETQ |rhs1| (CONS |rhs1| NIL)))) + (|bfMKPROGN| (APPEND |rhs1| (CONS |rhs| NIL)))))) ((AND (CONSP |rhs|) (EQ (CAR |rhs|) 'L%T) (IDENTP (SETQ |name| (CADR |rhs|)))) (SETQ |l1| (|bfLET1| |name| (CADDR |rhs|))) @@ -736,30 +730,28 @@ (COND ((AND (CONSP |l2|) (EQ (CAR |l2|) 'PROGN)) (|bfMKPROGN| (CONS |l1| (CDR |l2|)))) - (#0# - (COND ((IDENTP (CAR |l2|)) (SETQ |l2| (CONS |l2| NIL)))) - (|bfMKPROGN| (CONS |l1| (APPEND |l2| (CONS |name| NIL))))))) - (#0# - (SETQ |g| - (INTERN (CONCAT "LETTMP#" - (STRINGIMAGE |$letGenVarCounter|)))) - (SETQ |$letGenVarCounter| (+ |$letGenVarCounter| 1)) - (SETQ |rhs1| (LIST 'L%T |g| |rhs|)) - (SETQ |let1| (|bfLET1| |lhs| |g|)) - (COND - ((AND (CONSP |let1|) (EQ (CAR |let1|) 'PROGN)) - (|bfMKPROGN| (CONS |rhs1| (CDR |let1|)))) - (#0# - (COND - ((IDENTP (CAR |let1|)) (SETQ |let1| (CONS |let1| NIL)))) - (|bfMKPROGN| (CONS |rhs1| (APPEND |let1| (CONS |g| NIL))))))))))) + (T (COND ((IDENTP (CAR |l2|)) (SETQ |l2| (CONS |l2| NIL)))) + (|bfMKPROGN| (CONS |l1| (APPEND |l2| (CONS |name| NIL))))))) + (T (SETQ |g| + (INTERN (CONCAT "LETTMP#" + (STRINGIMAGE |$letGenVarCounter|)))) + (SETQ |$letGenVarCounter| (+ |$letGenVarCounter| 1)) + (SETQ |rhs1| (LIST 'L%T |g| |rhs|)) + (SETQ |let1| (|bfLET1| |lhs| |g|)) + (COND + ((AND (CONSP |let1|) (EQ (CAR |let1|) 'PROGN)) + (|bfMKPROGN| (CONS |rhs1| (CDR |let1|)))) + (T (COND + ((IDENTP (CAR |let1|)) + (SETQ |let1| (CONS |let1| NIL)))) + (|bfMKPROGN| + (CONS |rhs1| (APPEND |let1| (CONS |g| NIL))))))))))) (DEFUN |bfCONTAINED| (|x| |y|) (COND ((EQ |x| |y|) T) ((ATOM |y|) NIL) - ('T - (OR (|bfCONTAINED| |x| (CAR |y|)) (|bfCONTAINED| |x| (CDR |y|)))))) + (T (OR (|bfCONTAINED| |x| (CAR |y|)) (|bfCONTAINED| |x| (CDR |y|)))))) (DEFUN |bfLET2| (|lhs| |rhs|) (PROG (|isPred| |val1| |ISTMP#3| |g| |rev| |patrev| |l2| |l1| |var2| @@ -788,7 +780,7 @@ ((NULL (SETQ |b| (|bfLET2| |b| |rhs|))) |a|) ((ATOM |b|) (LIST |a| |b|)) ((CONSP (CAR |b|)) (CONS |a| |b|)) - (#1='T (LIST |a| |b|)))) + (T (LIST |a| |b|)))) ((AND (CONSP |lhs|) (EQ (CAR |lhs|) 'CONS) (PROGN (SETQ |ISTMP#1| (CDR |lhs|)) @@ -802,27 +794,25 @@ ((OR (EQ |var1| 'DOT) (AND (CONSP |var1|) (EQ (CAR |var1|) 'QUOTE))) (|bfLET2| |var2| (|addCARorCDR| 'CDR |rhs|))) - (#1# - (SETQ |l1| (|bfLET2| |var1| (|addCARorCDR| 'CAR |rhs|))) - (COND - ((OR (NULL |var2|) (EQ |var2| 'DOT)) |l1|) - (#1# - (COND - ((AND (CONSP |l1|) (ATOM (CAR |l1|))) - (SETQ |l1| (CONS |l1| NIL)))) - (COND - ((IDENTP |var2|) - (APPEND |l1| - (CONS (|bfLetForm| |var2| - (|addCARorCDR| 'CDR |rhs|)) - NIL))) - (#1# - (SETQ |l2| - (|bfLET2| |var2| (|addCARorCDR| 'CDR |rhs|))) - (COND - ((AND (CONSP |l2|) (ATOM (CAR |l2|))) - (SETQ |l2| (CONS |l2| NIL)))) - (APPEND |l1| |l2|)))))))) + (T (SETQ |l1| (|bfLET2| |var1| (|addCARorCDR| 'CAR |rhs|))) + (COND + ((OR (NULL |var2|) (EQ |var2| 'DOT)) |l1|) + (T (COND + ((AND (CONSP |l1|) (ATOM (CAR |l1|))) + (SETQ |l1| (CONS |l1| NIL)))) + (COND + ((IDENTP |var2|) + (APPEND |l1| + (CONS (|bfLetForm| |var2| + (|addCARorCDR| 'CDR |rhs|)) + NIL))) + (T (SETQ |l2| + (|bfLET2| |var2| + (|addCARorCDR| 'CDR |rhs|))) + (COND + ((AND (CONSP |l2|) (ATOM (CAR |l2|))) + (SETQ |l2| (CONS |l2| NIL)))) + (APPEND |l1| |l2|)))))))) ((AND (CONSP |lhs|) (EQ (CAR |lhs|) 'APPEND) (PROGN (SETQ |ISTMP#1| (CDR |lhs|)) @@ -863,24 +853,22 @@ (CONS (|bfLetForm| |var1| (LIST 'NREVERSE |val1|)) NIL)))) - (#1# - (CONS (LIST 'L%T |g| |rev|) - (APPEND |l2| - (CONS (|bfLetForm| |var1| - (LIST 'NREVERSE |var1|)) - NIL)))))) + (T (CONS (LIST 'L%T |g| |rev|) + (APPEND |l2| + (CONS (|bfLetForm| |var1| + (LIST 'NREVERSE |var1|)) + NIL)))))) ((AND (CONSP |lhs|) (EQ (CAR |lhs|) 'EQUAL) (PROGN (SETQ |ISTMP#1| (CDR |lhs|)) (AND (CONSP |ISTMP#1|) (EQ (CDR |ISTMP#1|) NIL) (PROGN (SETQ |var1| (CAR |ISTMP#1|)) #0#)))) (LIST 'COND (LIST (LIST 'EQUAL |var1| |rhs|) |var1|))) - (#1# - (SETQ |isPred| - (COND - (|$inDefIS| (|bfIS1| |rhs| |lhs|)) - (#1# (|bfIS| |rhs| |lhs|)))) - (LIST 'COND (LIST |isPred| |rhs|))))))) + (T (SETQ |isPred| + (COND + (|$inDefIS| (|bfIS1| |rhs| |lhs|)) + (T (|bfIS| |rhs| |lhs|)))) + (LIST 'COND (LIST |isPred| |rhs|))))))) (DEFUN |bfLET| (|lhs| |rhs|) (PROG (|$letGenVarCounter|) @@ -896,23 +884,22 @@ ((AND (EQ |acc| 'CAR) (CONSP |expr|) (EQ (CAR |expr|) 'REVERSE)) (LIST 'CAR (CONS 'LAST (CDR |expr|)))) - (#0='T - (SETQ |funs| - '(CAR CDR CAAR CDAR CADR CDDR CAAAR CADAR CAADR CADDR - CDAAR CDDAR CDADR CDDDR)) - (SETQ |p| (|bfPosition| (CAR |expr|) |funs|)) - (COND - ((EQUAL |p| (- 1)) (LIST |acc| |expr|)) - (#0# - (SETQ |funsA| - '(CAAR CADR CAAAR CADAR CAADR CADDR CAAAAR CAADAR - CAAADR CAADDR CADAAR CADDAR CADADR CADDDR)) - (SETQ |funsR| - '(CDAR CDDR CDAAR CDDAR CDADR CDDDR CDAAAR CDADAR - CDAADR CDADDR CDDAAR CDDDAR CDDADR CDDDDR)) - (COND - ((EQ |acc| 'CAR) (CONS (ELT |funsA| |p|) (CDR |expr|))) - ('T (CONS (ELT |funsR| |p|) (CDR |expr|))))))))))) + (T (SETQ |funs| + '(CAR CDR CAAR CDAR CADR CDDR CAAAR CADAR CAADR CADDR + CDAAR CDDAR CDADR CDDDR)) + (SETQ |p| (|bfPosition| (CAR |expr|) |funs|)) + (COND + ((EQUAL |p| (- 1)) (LIST |acc| |expr|)) + (T (SETQ |funsA| + '(CAAR CADR CAAAR CADAR CAADR CADDR CAAAAR CAADAR + CAAADR CAADDR CADAAR CADDAR CADADR CADDDR)) + (SETQ |funsR| + '(CDAR CDDR CDAAR CDDAR CDADR CDDDR CDAAAR CDADAR + CDAADR CDADDR CDDAAR CDDDAR CDDADR CDDDDR)) + (COND + ((EQ |acc| 'CAR) + (CONS (ELT |funsA| |p|) (CDR |expr|))) + (T (CONS (ELT |funsR| |p|) (CDR |expr|))))))))))) (DEFUN |bfPosition| (|x| |l|) (|bfPosn| |x| |l| 0)) @@ -920,13 +907,13 @@ (COND ((NULL |l|) (- 1)) ((EQUAL |x| (CAR |l|)) |n|) - ('T (|bfPosn| |x| (CDR |l|) (+ |n| 1))))) + (T (|bfPosn| |x| (CDR |l|) (+ |n| 1))))) (DEFUN |bfISApplication| (|op| |left| |right|) (COND ((EQ |op| 'IS) (|bfIS| |left| |right|)) ((EQ |op| 'ISNT) (|bfNOT| (|bfIS| |left| |right|))) - ('T (LIST |op| |left| |right|)))) + (T (LIST |op| |left| |right|)))) (DEFUN |bfIS| (|left| |right|) (PROG (|$inDefIS| |$isGenVarCounter|) @@ -944,9 +931,9 @@ ((AND (CONSP |x|) (EQ (CAR |x|) 'CONS)) (COND ((NULL (CADDR |x|)) (LIST 'CONS (CADR |x|) |a|)) - (#0='T (SETQ |y| (|bfISReverse| (CADDR |x|) NIL)) - (RPLACA (CDDR |y|) (LIST 'CONS (CADR |x|) |a|)) |y|))) - (#0# (|bpSpecificErrorHere| "Error in bfISReverse") (|bpTrap|)))))) + (T (SETQ |y| (|bfISReverse| (CADDR |x|) NIL)) + (RPLACA (CDDR |y|) (LIST 'CONS (CADR |x|) |a|)) |y|))) + (T (|bpSpecificErrorHere| "Error in bfISReverse") (|bpTrap|)))))) (DEFUN |bfIS1| (|lhs| |rhs|) (PROG (|l2| |rev| |patrev| |cls| |b1| |a1| |b| |g| |l| |d| |ISTMP#2| @@ -965,7 +952,7 @@ (PROGN (SETQ |a| (CAR |ISTMP#1|)) #0='T)))) (COND ((IDENTP |a|) (LIST 'EQ |lhs| |rhs|)) - (#1='T (LIST 'EQUAL |lhs| |rhs|)))) + (T (LIST 'EQUAL |lhs| |rhs|)))) ((AND (CONSP |rhs|) (EQ (CAR |rhs|) 'L%T) (PROGN (SETQ |ISTMP#1| (CDR |rhs|)) @@ -1005,9 +992,8 @@ ((NULL |b|) (|bfAND| (LIST (LIST 'CONSP |lhs|) (LIST 'EQ (LIST 'CDR |lhs|) 'NIL)))) - (#1# - (|bfAND| (LIST (LIST 'CONSP |lhs|) - (|bfIS1| (LIST 'CDR |lhs|) |b|)))))) + (T (|bfAND| (LIST (LIST 'CONSP |lhs|) + (|bfIS1| (LIST 'CDR |lhs|) |b|)))))) ((NULL |b|) (|bfAND| (LIST (LIST 'CONSP |lhs|) (LIST 'EQ (LIST 'CDR |lhs|) 'NIL) @@ -1015,24 +1001,24 @@ ((EQ |b| 'DOT) (|bfAND| (LIST (LIST 'CONSP |lhs|) (|bfIS1| (LIST 'CAR |lhs|) |a|)))) - (#1# (SETQ |a1| (|bfIS1| (LIST 'CAR |lhs|) |a|)) - (SETQ |b1| (|bfIS1| (LIST 'CDR |lhs|) |b|)) - (COND - ((AND (CONSP |a1|) (EQ (CAR |a1|) 'PROGN) - (PROGN - (SETQ |ISTMP#1| (CDR |a1|)) - (AND (CONSP |ISTMP#1|) - (PROGN - (SETQ |c| (CAR |ISTMP#1|)) - (SETQ |ISTMP#2| (CDR |ISTMP#1|)) - (AND (CONSP |ISTMP#2|) - (EQ (CDR |ISTMP#2|) NIL) - (EQUAL (CAR |ISTMP#2|) ''T))))) - (CONSP |b1|) (EQ (CAR |b1|) 'PROGN) - (PROGN (SETQ |cls| (CDR |b1|)) #0#)) - (|bfAND| (LIST (LIST 'CONSP |lhs|) - (|bfMKPROGN| (CONS |c| |cls|))))) - (#1# (|bfAND| (LIST (LIST 'CONSP |lhs|) |a1| |b1|))))))) + (T (SETQ |a1| (|bfIS1| (LIST 'CAR |lhs|) |a|)) + (SETQ |b1| (|bfIS1| (LIST 'CDR |lhs|) |b|)) + (COND + ((AND (CONSP |a1|) (EQ (CAR |a1|) 'PROGN) + (PROGN + (SETQ |ISTMP#1| (CDR |a1|)) + (AND (CONSP |ISTMP#1|) + (PROGN + (SETQ |c| (CAR |ISTMP#1|)) + (SETQ |ISTMP#2| (CDR |ISTMP#1|)) + (AND (CONSP |ISTMP#2|) + (EQ (CDR |ISTMP#2|) NIL) + (EQUAL (CAR |ISTMP#2|) ''T))))) + (CONSP |b1|) (EQ (CAR |b1|) 'PROGN) + (PROGN (SETQ |cls| (CDR |b1|)) #0#)) + (|bfAND| (LIST (LIST 'CONSP |lhs|) + (|bfMKPROGN| (CONS |c| |cls|))))) + (T (|bfAND| (LIST (LIST 'CONSP |lhs|) |a1| |b1|))))))) ((AND (CONSP |rhs|) (EQ (CAR |rhs|) 'APPEND) (PROGN (SETQ |ISTMP#1| (CDR |rhs|)) @@ -1059,27 +1045,26 @@ (SETQ |l2| (CONS |l2| NIL)))) (COND ((EQ |a| 'DOT) (|bfAND| (CONS |rev| |l2|))) - (#1# - (|bfAND| (CONS |rev| - (APPEND |l2| - (CONS - (LIST 'PROGN - (|bfLetForm| |a| - (LIST 'NREVERSE |a|)) - ''T) - NIL))))))) - (#1# (|bpSpecificErrorHere| "bad IS code is generated") - (|bpTrap|)))))) + (T (|bfAND| (CONS |rev| + (APPEND |l2| + (CONS + (LIST 'PROGN + (|bfLetForm| |a| + (LIST 'NREVERSE |a|)) + ''T) + NIL))))))) + (T (|bpSpecificErrorHere| "bad IS code is generated") + (|bpTrap|)))))) (DEFUN |bfApplication| (|bfop| |bfarg|) (COND ((|bfTupleP| |bfarg|) (CONS |bfop| (CDR |bfarg|))) - ('T (LIST |bfop| |bfarg|)))) + (T (LIST |bfop| |bfarg|)))) (DEFUN |bfReName| (|x|) (PROG (|a|) (RETURN - (COND ((SETQ |a| (GET |x| 'SHOERENAME)) (CAR |a|)) ('T |x|))))) + (COND ((SETQ |a| (GET |x| 'SHOERENAME)) (CAR |a|)) (T |x|))))) (DEFUN |bfInfApplication| (|op| |left| |right|) (COND @@ -1091,7 +1076,7 @@ ((EQ |op| '>=) (|bfNOT| (|bfLessp| |left| |right|))) ((EQ |op| 'OR) (|bfOR| (LIST |left| |right|))) ((EQ |op| 'AND) (|bfAND| (LIST |left| |right|))) - ('T (LIST |op| |left| |right|)))) + (T (LIST |op| |left| |right|)))) (DEFUN |bfNOT| (|x|) (PROG (|a| |ISTMP#1|) @@ -1109,48 +1094,44 @@ (AND (CONSP |ISTMP#1|) (EQ (CDR |ISTMP#1|) NIL) (PROGN (SETQ |a| (CAR |ISTMP#1|)) #0#)))) |a|) - ('T (LIST 'NOT |x|)))))) + (T (LIST 'NOT |x|)))))) (DEFUN |bfFlatten| (|op| |x|) (COND ((AND (CONSP |x|) (EQUAL (CAR |x|) |op|)) (CDR |x|)) - ('T (LIST |x|)))) + (T (LIST |x|)))) (DEFUN |bfOR| (|l|) (COND ((NULL |l|) NIL) ((NULL (CDR |l|)) (CAR |l|)) - ('T - (CONS 'OR - (LET ((|bfVar#88| NIL) (|bfVar#87| |l|) (|c| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#87|) - (PROGN (SETQ |c| (CAR |bfVar#87|)) NIL)) - (RETURN (NREVERSE |bfVar#88|))) - ('T - (SETQ |bfVar#88| - (APPEND (REVERSE (|bfFlatten| 'OR |c|)) - |bfVar#88|)))) - (SETQ |bfVar#87| (CDR |bfVar#87|)))))))) + (T (CONS 'OR + (LET ((|bfVar#88| NIL) (|bfVar#87| |l|) (|c| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#87|) + (PROGN (SETQ |c| (CAR |bfVar#87|)) NIL)) + (RETURN (NREVERSE |bfVar#88|))) + (T (SETQ |bfVar#88| + (APPEND (REVERSE (|bfFlatten| 'OR |c|)) + |bfVar#88|)))) + (SETQ |bfVar#87| (CDR |bfVar#87|)))))))) (DEFUN |bfAND| (|l|) (COND ((NULL |l|) 'T) ((NULL (CDR |l|)) (CAR |l|)) - ('T - (CONS 'AND - (LET ((|bfVar#90| NIL) (|bfVar#89| |l|) (|c| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#89|) - (PROGN (SETQ |c| (CAR |bfVar#89|)) NIL)) - (RETURN (NREVERSE |bfVar#90|))) - ('T - (SETQ |bfVar#90| - (APPEND (REVERSE (|bfFlatten| 'AND |c|)) - |bfVar#90|)))) - (SETQ |bfVar#89| (CDR |bfVar#89|)))))))) + (T (CONS 'AND + (LET ((|bfVar#90| NIL) (|bfVar#89| |l|) (|c| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#89|) + (PROGN (SETQ |c| (CAR |bfVar#89|)) NIL)) + (RETURN (NREVERSE |bfVar#90|))) + (T (SETQ |bfVar#90| + (APPEND (REVERSE (|bfFlatten| 'AND |c|)) + |bfVar#90|)))) + (SETQ |bfVar#89| (CDR |bfVar#89|)))))))) (DEFUN |defQuoteId| (|x|) (AND (CONSP |x|) (EQ (CAR |x|) 'QUOTE) (IDENTP (CADR |x|)))) @@ -1166,10 +1147,10 @@ ((NULL |l|) (LIST 'NULL |r|)) ((NULL |r|) (LIST 'NULL |l|)) ((OR (EQ |l| T) (EQ |r| T)) (LIST 'EQ |l| |r|)) - ('T (LIST 'EQUAL |l| |r|)))) + (T (LIST 'EQUAL |l| |r|)))) (DEFUN |bfLessp| (|l| |r|) - (COND ((EQL |r| 0) (LIST 'MINUSP |l|)) ('T (LIST '< |l| |r|)))) + (COND ((EQL |r| 0) (LIST 'MINUSP |l|)) (T (LIST '< |l| |r|)))) (DEFUN |bfMDef| (|op| |args| |body|) (PROG (|def| |lamex| |sb2| |sb| |largl| |nargl| |sgargl| |gargl| @@ -1180,7 +1161,7 @@ (SETQ |argl| (COND ((|bfTupleP| |args|) (CDR |args|)) - ('T (LIST |args|)))) + (T (LIST |args|)))) (SETQ |LETTMP#1| (|bfGargl| |argl|)) (SETQ |gargl| (CAR |LETTMP#1|)) (SETQ |sgargl| (CADR . #0=(|LETTMP#1|))) @@ -1196,8 +1177,8 @@ (ATOM |bfVar#92|) (PROGN (SETQ |j| (CAR |bfVar#92|)) NIL)) (RETURN (NREVERSE |bfVar#93|))) - (#1='T - (SETQ |bfVar#93| (CONS (CONS |i| |j|) |bfVar#93|)))) + (T (SETQ |bfVar#93| + (CONS (CONS |i| |j|) |bfVar#93|)))) (SETQ |bfVar#91| (CDR |bfVar#91|)) (SETQ |bfVar#92| (CDR |bfVar#92|))))) (SETQ |body| (SUBLIS |sb| |body|)) @@ -1211,10 +1192,9 @@ (ATOM |bfVar#95|) (PROGN (SETQ |j| (CAR |bfVar#95|)) NIL)) (RETURN (NREVERSE |bfVar#96|))) - (#1# - (SETQ |bfVar#96| - (CONS (LIST 'CONS (LIST 'QUOTE |i|) |j|) - |bfVar#96|)))) + (T (SETQ |bfVar#96| + (CONS (LIST 'CONS (LIST 'QUOTE |i|) |j|) + |bfVar#96|)))) (SETQ |bfVar#94| (CDR |bfVar#94|)) (SETQ |bfVar#95| (CDR |bfVar#95|))))) (SETQ |body| @@ -1229,11 +1209,10 @@ ((OR (ATOM |bfVar#97|) (PROGN (SETQ |d| (CAR |bfVar#97|)) NIL)) (RETURN (NREVERSE |bfVar#98|))) - (#1# - (SETQ |bfVar#98| - (APPEND (REVERSE - (|shoeComps| (|bfDef1| |d|))) - |bfVar#98|)))) + (T (SETQ |bfVar#98| + (APPEND (REVERSE + (|shoeComps| (|bfDef1| |d|))) + |bfVar#98|)))) (SETQ |bfVar#97| (CDR |bfVar#97|))))))))) (DEFUN |bfGargl| (|argl|) @@ -1241,18 +1220,18 @@ (RETURN (COND ((NULL |argl|) (LIST NIL NIL NIL NIL)) - (#0='T (SETQ |LETTMP#1| (|bfGargl| (CDR |argl|))) - (SETQ |a| (CAR |LETTMP#1|)) - (SETQ |b| (CADR . #1=(|LETTMP#1|))) (SETQ |c| (CADDR . #1#)) - (SETQ |d| (CADDDR . #1#)) - (COND - ((EQ (CAR |argl|) '&REST) - (LIST (CONS (CAR |argl|) |b|) |b| |c| - (CONS (LIST 'CONS (LIST 'QUOTE 'LIST) (CAR |d|)) - (CDR |d|)))) - (#0# (SETQ |f| (|bfGenSymbol|)) - (LIST (CONS |f| |a|) (CONS |f| |b|) (CONS (CAR |argl|) |c|) - (CONS |f| |d|))))))))) + (T (SETQ |LETTMP#1| (|bfGargl| (CDR |argl|))) + (SETQ |a| (CAR |LETTMP#1|)) + (SETQ |b| (CADR . #0=(|LETTMP#1|))) (SETQ |c| (CADDR . #0#)) + (SETQ |d| (CADDDR . #0#)) + (COND + ((EQ (CAR |argl|) '&REST) + (LIST (CONS (CAR |argl|) |b|) |b| |c| + (CONS (LIST 'CONS (LIST 'QUOTE 'LIST) (CAR |d|)) + (CDR |d|)))) + (T (SETQ |f| (|bfGenSymbol|)) + (LIST (CONS |f| |a|) (CONS |f| |b|) + (CONS (CAR |argl|) |c|) (CONS |f| |d|))))))))) (DEFUN |bfDef1| (|bfVar#99|) (PROG (|arglp| |control| |quotes| |LETTMP#1| |argl| |body| |args| @@ -1265,7 +1244,7 @@ (SETQ |argl| (COND ((|bfTupleP| |args|) (CDR |args|)) - ('T (LIST |args|)))) + (T (LIST |args|)))) (SETQ |LETTMP#1| (|bfInsertLet| |argl| |body|)) (SETQ |quotes| (CAR |LETTMP#1|)) (SETQ |control| (CADR . #1=(|LETTMP#1|))) @@ -1273,7 +1252,7 @@ (SETQ |body| (CADDDR . #1#)) (COND (|quotes| (|shoeLAM| |op| |arglp| |control| |body|)) - ('T (LIST (LIST |op| (LIST 'LAMBDA |arglp| |body|))))))))) + (T (LIST (LIST |op| (LIST 'LAMBDA |arglp| |body|))))))))) (DEFUN |shoeLAM| (|op| |args| |control| |body|) (PROG (|innerfunc| |margs|) @@ -1300,22 +1279,21 @@ (SETQ |op1| (CADR . #0=(|LETTMP#1|))) (SETQ |arg1| (CADDR . #0#)) (SETQ |body1| (CDDDR . #0#)) (|bfCompHash| |op1| |arg1| |body1|)) - ('T - (|bfTuple| - (LET ((|bfVar#101| NIL) - (|bfVar#100| - (CONS (LIST |op| |args| |body|) |$wheredefs|)) - (|d| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#100|) - (PROGN (SETQ |d| (CAR |bfVar#100|)) NIL)) - (RETURN (NREVERSE |bfVar#101|))) - ('T - (SETQ |bfVar#101| - (APPEND (REVERSE (|shoeComps| (|bfDef1| |d|))) - |bfVar#101|)))) - (SETQ |bfVar#100| (CDR |bfVar#100|)))))))))) + (T (|bfTuple| + (LET ((|bfVar#101| NIL) + (|bfVar#100| + (CONS (LIST |op| |args| |body|) |$wheredefs|)) + (|d| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#100|) + (PROGN (SETQ |d| (CAR |bfVar#100|)) NIL)) + (RETURN (NREVERSE |bfVar#101|))) + (T (SETQ |bfVar#101| + (APPEND (REVERSE + (|shoeComps| (|bfDef1| |d|))) + |bfVar#101|)))) + (SETQ |bfVar#100| (CDR |bfVar#100|)))))))))) (DEFUN |shoeComps| (|x|) (LET ((|bfVar#103| NIL) (|bfVar#102| |x|) (|def| NIL)) @@ -1324,7 +1302,7 @@ ((OR (ATOM |bfVar#102|) (PROGN (SETQ |def| (CAR |bfVar#102|)) NIL)) (RETURN (NREVERSE |bfVar#103|))) - ('T (SETQ |bfVar#103| (CONS (|shoeComp| |def|) |bfVar#103|)))) + (T (SETQ |bfVar#103| (CONS (|shoeComp| |def|) |bfVar#103|)))) (SETQ |bfVar#102| (CDR |bfVar#102|))))) (DEFUN |shoeComp| (|x|) @@ -1335,9 +1313,8 @@ (COND ((AND (CONSP |a|) (EQ (CAR |a|) 'LAMBDA)) (CONS 'DEFUN (CONS (CAR |x|) (CONS (CADR |a|) (CDDR |a|))))) - ('T - (CONS 'DEFMACRO - (CONS (CAR |x|) (CONS (CADR |a|) (CDDR |a|)))))))))) + (T (CONS 'DEFMACRO + (CONS (CAR |x|) (CONS (CADR |a|) (CDDR |a|)))))))))) (DEFUN |bfParameterList| (|p1| |p2|) (COND @@ -1346,10 +1323,10 @@ (COND ((NOT (AND (CONSP |p2|) (EQ (CAR |p2|) '&OPTIONAL))) (|bpSpecificErrorHere| "default value required")) - (#0='T (CONS (CAR |p1|) (APPEND (CDR |p1|) (CDR |p2|)))))) + (T (CONS (CAR |p1|) (APPEND (CDR |p1|) (CDR |p2|)))))) ((AND (CONSP |p2|) (EQ (CAR |p2|) '&OPTIONAL)) (CONS |p1| (CONS (CAR |p2|) (CDR |p2|)))) - (#0# (CONS |p1| |p2|)))) + (T (CONS |p1| |p2|)))) (DEFUN |bfInsertLet| (|x| |body|) (PROG (|body2| |name2| |norq1| |b1| |body1| |name1| |norq| |LETTMP#1| @@ -1369,17 +1346,17 @@ (AND (CONSP |ISTMP#1|) (EQ (CDR |ISTMP#1|) NIL) (PROGN (SETQ |b| (CAR |ISTMP#1|)) #0#)))) (LIST T 'QUOTE (LIST '&REST |b|) |body|)) - (#1='T (LIST NIL NIL |x| |body|)))) - (#1# (SETQ |LETTMP#1| (|bfInsertLet1| (CAR |x|) |body|)) - (SETQ |b| (CAR |LETTMP#1|)) - (SETQ |norq| (CADR . #2=(|LETTMP#1|))) - (SETQ |name1| (CADDR . #2#)) (SETQ |body1| (CADDDR . #2#)) - (SETQ |LETTMP#1| (|bfInsertLet| (CDR |x|) |body1|)) - (SETQ |b1| (CAR |LETTMP#1|)) - (SETQ |norq1| (CADR . #3=(|LETTMP#1|))) - (SETQ |name2| (CADDR . #3#)) (SETQ |body2| (CADDDR . #3#)) - (LIST (OR |b| |b1|) (CONS |norq| |norq1|) - (|bfParameterList| |name1| |name2|) |body2|)))))) + (T (LIST NIL NIL |x| |body|)))) + (T (SETQ |LETTMP#1| (|bfInsertLet1| (CAR |x|) |body|)) + (SETQ |b| (CAR |LETTMP#1|)) + (SETQ |norq| (CADR . #1=(|LETTMP#1|))) + (SETQ |name1| (CADDR . #1#)) (SETQ |body1| (CADDDR . #1#)) + (SETQ |LETTMP#1| (|bfInsertLet| (CDR |x|) |body1|)) + (SETQ |b1| (CAR |LETTMP#1|)) + (SETQ |norq1| (CADR . #2=(|LETTMP#1|))) + (SETQ |name2| (CADDR . #2#)) (SETQ |body2| (CADDDR . #2#)) + (LIST (OR |b| |b1|) (CONS |norq| |norq1|) + (|bfParameterList| |name1| |name2|) |body2|)))))) (DEFUN |bfInsertLet1| (|y| |body|) (PROG (|g| |b| |r| |ISTMP#2| |l| |ISTMP#1|) @@ -1403,19 +1380,18 @@ (AND (CONSP |ISTMP#1|) (EQ (CDR |ISTMP#1|) NIL) (PROGN (SETQ |b| (CAR |ISTMP#1|)) #0#)))) (LIST T 'QUOTE |b| |body|)) - (#1='T (SETQ |g| (|bfGenSymbol|)) - (COND - ((ATOM |y|) (LIST NIL NIL |g| |body|)) - (#1# - (CASE (CAR |y|) - (|%DefaultValue| - (LET ((|p| (CADR |y|)) (|v| (CADDR |y|))) - (LIST NIL NIL (LIST '&OPTIONAL (LIST |p| |v|)) - |body|))) - (T (LIST NIL NIL |g| - (|bfMKPROGN| - (LIST (|bfLET| (|compFluidize| |y|) |g|) - |body|)))))))))))) + (T (SETQ |g| (|bfGenSymbol|)) + (COND + ((ATOM |y|) (LIST NIL NIL |g| |body|)) + (T (CASE (CAR |y|) + (|%DefaultValue| + (LET ((|p| (CADR |y|)) (|v| (CADDR |y|))) + (LIST NIL NIL (LIST '&OPTIONAL (LIST |p| |v|)) + |body|))) + (T (LIST NIL NIL |g| + (|bfMKPROGN| + (LIST (|bfLET| (|compFluidize| |y|) |g|) + |body|)))))))))))) (DEFUN |shoeCompTran| (|x|) (PROG (|$dollarVars| |$locVars| |$fluidVars| |fvs| |fl| |fvars| @@ -1451,13 +1427,13 @@ (COND ((OR |lvars| (|needsPROG| |body|)) (|shoePROG| |lvars| |body'|)) - (#0='T |body'|)))) + (T |body'|)))) (SETQ |fl| (|shoeFluids| |args|)) (SETQ |body| (COND (|fl| (SETQ |fvs| (LIST 'DECLARE (CONS 'SPECIAL |fl|))) (CONS |fvs| |body|)) - (#0# |body|))) + (T |body|))) (CONS |lamtype| (CONS |args| |body|)))))) (DEFUN |needsPROG| (|body|) @@ -1465,36 +1441,35 @@ (RETURN (COND ((ATOM |body|) NIL) - (#0='T (SETQ |op| (CAR |body|)) (SETQ |args| (CDR |body|)) - (COND - ((MEMBER |op| '(RETURN RETURN-FROM)) T) - ((MEMBER |op| '(LET PROG LOOP BLOCK DECLARE LAMBDA)) NIL) - ((LET ((|bfVar#105| NIL) (|bfVar#104| |body|) (|t| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#104|) - (PROGN (SETQ |t| (CAR |bfVar#104|)) NIL)) - (RETURN |bfVar#105|)) - ('T - (PROGN - (SETQ |bfVar#105| (|needsPROG| |t|)) - (COND (|bfVar#105| (RETURN |bfVar#105|)))))) - (SETQ |bfVar#104| (CDR |bfVar#104|)))) - T) - (#0# NIL))))))) + (T (SETQ |op| (CAR |body|)) (SETQ |args| (CDR |body|)) + (COND + ((MEMBER |op| '(RETURN RETURN-FROM)) T) + ((MEMBER |op| '(LET PROG LOOP BLOCK DECLARE LAMBDA)) NIL) + ((LET ((|bfVar#105| NIL) (|bfVar#104| |body|) (|t| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#104|) + (PROGN (SETQ |t| (CAR |bfVar#104|)) NIL)) + (RETURN |bfVar#105|)) + (T (PROGN + (SETQ |bfVar#105| (|needsPROG| |t|)) + (COND (|bfVar#105| (RETURN |bfVar#105|)))))) + (SETQ |bfVar#104| (CDR |bfVar#104|)))) + T) + (T NIL))))))) (DEFUN |shoePROG| (|v| |b|) (PROG (|blist| |blast| |LETTMP#1|) (RETURN (COND ((NULL |b|) (LIST (LIST 'PROG |v|))) - ('T (SETQ |LETTMP#1| (REVERSE |b|)) - (SETQ |blast| (CAR |LETTMP#1|)) - (SETQ |blist| (NREVERSE (CDR |LETTMP#1|))) - (LIST (CONS 'PROG - (CONS |v| - (APPEND |blist| - (CONS (LIST 'RETURN |blast|) NIL)))))))))) + (T (SETQ |LETTMP#1| (REVERSE |b|)) + (SETQ |blast| (CAR |LETTMP#1|)) + (SETQ |blist| (NREVERSE (CDR |LETTMP#1|))) + (LIST (CONS 'PROG + (CONS |v| + (APPEND |blist| + (CONS (LIST 'RETURN |blast|) NIL)))))))))) (DEFUN |shoeFluids| (|x|) (COND @@ -1502,13 +1477,13 @@ ((AND (IDENTP |x|) (|bfBeginsDollar| |x|)) (LIST |x|)) ((ATOM |x|) NIL) ((AND (CONSP |x|) (EQ (CAR |x|) 'QUOTE)) NIL) - ('T (APPEND (|shoeFluids| (CAR |x|)) (|shoeFluids| (CDR |x|)))))) + (T (APPEND (|shoeFluids| (CAR |x|)) (|shoeFluids| (CDR |x|)))))) (DEFUN |shoeATOMs| (|x|) (COND ((NULL |x|) NIL) ((ATOM |x|) (LIST |x|)) - ('T (APPEND (|shoeATOMs| (CAR |x|)) (|shoeATOMs| (CDR |x|)))))) + (T (APPEND (|shoeATOMs| (CAR |x|)) (|shoeATOMs| (CDR |x|)))))) (DEFUN |isDynamicVariable| (|x|) (PROG (|y|) @@ -1522,8 +1497,8 @@ ((OR (BOUNDP |x|) (NULL |$activeNamespace|)) T) ((SETQ |y| (FIND-SYMBOL (STRING |x|) |$activeNamespace|)) (NOT (CONSTANTP |y|))) - (#0='T T))) - (#0# NIL))))) + (T T))) + (T NIL))))) (DEFUN |shoeCompTran1| (|x|) (PROG (|res| |newbindings| |r| |ISTMP#2| |l| |ISTMP#1| U) @@ -1536,72 +1511,72 @@ (SETQ |$dollarVars| (COND ((MEMQ |x| |$dollarVars|) |$dollarVars|) - (#0='T (CONS |x| |$dollarVars|))))) - (#0# NIL))) - (#0# (SETQ U (CAR |x|)) - (COND - ((EQ U 'QUOTE) NIL) - ((AND (CONSP |x|) (EQ (CAR |x|) 'L%T) - (PROGN - (SETQ |ISTMP#1| (CDR |x|)) - (AND (CONSP |ISTMP#1|) - (PROGN - (SETQ |l| (CAR |ISTMP#1|)) - (SETQ |ISTMP#2| (CDR |ISTMP#1|)) - (AND (CONSP |ISTMP#2|) - (EQ (CDR |ISTMP#2|) NIL) - (PROGN (SETQ |r| (CAR |ISTMP#2|)) 'T)))))) - (RPLACA |x| 'SETQ) (|shoeCompTran1| |r|) - (COND - ((IDENTP |l|) - (COND - ((NOT (|bfBeginsDollar| |l|)) - (SETQ |$locVars| - (COND - ((MEMQ |l| |$locVars|) |$locVars|) - (#0# (CONS |l| |$locVars|))))) - (#0# - (SETQ |$dollarVars| - (COND - ((MEMQ |l| |$dollarVars|) |$dollarVars|) - (#0# (CONS |l| |$dollarVars|))))))) - ((AND (CONSP |l|) (EQ (CAR |l|) 'FLUID)) - (SETQ |$fluidVars| - (COND - ((MEMQ (CADR |l|) |$fluidVars|) |$fluidVars|) - (#0# (CONS (CADR |l|) |$fluidVars|)))) - (RPLACA (CDR |x|) (CADR |l|))))) - ((MEMQ U '(PROG LAMBDA)) (SETQ |newbindings| NIL) - (LET ((|bfVar#106| (CADR |x|)) (|y| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#106|) - (PROGN (SETQ |y| (CAR |bfVar#106|)) NIL)) - (RETURN NIL)) - (#1='T - (COND - ((NOT (MEMQ |y| |$locVars|)) - (IDENTITY + (T (CONS |x| |$dollarVars|))))) + (T NIL))) + (T (SETQ U (CAR |x|)) + (COND + ((EQ U 'QUOTE) NIL) + ((AND (CONSP |x|) (EQ (CAR |x|) 'L%T) + (PROGN + (SETQ |ISTMP#1| (CDR |x|)) + (AND (CONSP |ISTMP#1|) (PROGN - (SETQ |$locVars| (CONS |y| |$locVars|)) - (SETQ |newbindings| - (CONS |y| |newbindings|)))))))) - (SETQ |bfVar#106| (CDR |bfVar#106|)))) - (SETQ |res| (|shoeCompTran1| (CDDR |x|))) - (SETQ |$locVars| - (LET ((|bfVar#108| NIL) (|bfVar#107| |$locVars|) - (|y| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#107|) - (PROGN (SETQ |y| (CAR |bfVar#107|)) NIL)) - (RETURN (NREVERSE |bfVar#108|))) - (#1# - (AND (NOT (MEMQ |y| |newbindings|)) - (SETQ |bfVar#108| (CONS |y| |bfVar#108|))))) - (SETQ |bfVar#107| (CDR |bfVar#107|)))))) - (#0# (|shoeCompTran1| (CAR |x|)) - (|shoeCompTran1| (CDR |x|))))))))) + (SETQ |l| (CAR |ISTMP#1|)) + (SETQ |ISTMP#2| (CDR |ISTMP#1|)) + (AND (CONSP |ISTMP#2|) + (EQ (CDR |ISTMP#2|) NIL) + (PROGN (SETQ |r| (CAR |ISTMP#2|)) 'T)))))) + (RPLACA |x| 'SETQ) (|shoeCompTran1| |r|) + (COND + ((IDENTP |l|) + (COND + ((NOT (|bfBeginsDollar| |l|)) + (SETQ |$locVars| + (COND + ((MEMQ |l| |$locVars|) |$locVars|) + (T (CONS |l| |$locVars|))))) + (T (SETQ |$dollarVars| + (COND + ((MEMQ |l| |$dollarVars|) |$dollarVars|) + (T (CONS |l| |$dollarVars|))))))) + ((AND (CONSP |l|) (EQ (CAR |l|) 'FLUID)) + (SETQ |$fluidVars| + (COND + ((MEMQ (CADR |l|) |$fluidVars|) |$fluidVars|) + (T (CONS (CADR |l|) |$fluidVars|)))) + (RPLACA (CDR |x|) (CADR |l|))))) + ((MEMQ U '(PROG LAMBDA)) (SETQ |newbindings| NIL) + (LET ((|bfVar#106| (CADR |x|)) (|y| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#106|) + (PROGN (SETQ |y| (CAR |bfVar#106|)) NIL)) + (RETURN NIL)) + (T (COND + ((NOT (MEMQ |y| |$locVars|)) + (IDENTITY + (PROGN + (SETQ |$locVars| (CONS |y| |$locVars|)) + (SETQ |newbindings| + (CONS |y| |newbindings|)))))))) + (SETQ |bfVar#106| (CDR |bfVar#106|)))) + (SETQ |res| (|shoeCompTran1| (CDDR |x|))) + (SETQ |$locVars| + (LET ((|bfVar#108| NIL) (|bfVar#107| |$locVars|) + (|y| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#107|) + (PROGN + (SETQ |y| (CAR |bfVar#107|)) + NIL)) + (RETURN (NREVERSE |bfVar#108|))) + (T (AND (NOT (MEMQ |y| |newbindings|)) + (SETQ |bfVar#108| + (CONS |y| |bfVar#108|))))) + (SETQ |bfVar#107| (CDR |bfVar#107|)))))) + (T (|shoeCompTran1| (CAR |x|)) + (|shoeCompTran1| (CDR |x|))))))))) (DEFUN |bfTagged| (|a| |b|) (DECLARE (SPECIAL |$typings| |$op|)) @@ -1612,19 +1587,18 @@ ((EQ |b| 'FLUID) (|bfLET| (|compFluid| |a|) NIL)) ((EQ |b| '|fluid|) (|bfLET| (|compFluid| |a|) NIL)) ((EQ |b| '|local|) (|bfLET| (|compFluid| |a|) NIL)) - (#0='T (SETQ |$typings| (CONS (LIST 'TYPE |b| |a|) |$typings|)) - |a|))) - (#0# (LIST 'THE |b| |a|)))) + (T (SETQ |$typings| (CONS (LIST 'TYPE |b| |a|) |$typings|)) |a|))) + (T (LIST 'THE |b| |a|)))) (DEFUN |bfAssign| (|l| |r|) (COND ((|bfTupleP| |l|) (|bfSetelt| (CADR |l|) (CDDR |l|) |r|)) - ('T (|bfLET| |l| |r|)))) + (T (|bfLET| |l| |r|)))) (DEFUN |bfSetelt| (|e| |l| |r|) (COND ((NULL (CDR |l|)) (|defSETELT| |e| (CAR |l|) |r|)) - ('T (|bfSetelt| (|bfElt| |e| (CAR |l|)) (CDR |l|) |r|)))) + (T (|bfSetelt| (|bfElt| |e| (CAR |l|)) (CDR |l|) |r|)))) (DEFUN |bfElt| (|expr| |sel|) (PROG (|y|) @@ -1634,8 +1608,8 @@ (COND (|y| (COND ((INTEGERP |y|) (LIST 'ELT |expr| |y|)) - (#0='T (LIST |y| |expr|)))) - (#0# (LIST 'ELT |expr| |sel|))))))) + (T (LIST |y| |expr|)))) + (T (LIST 'ELT |expr| |sel|))))))) (DEFUN |defSETELT| (|var| |sel| |expr|) (PROG (|y|) @@ -1646,8 +1620,8 @@ (|y| (COND ((INTEGERP |y|) (LIST 'SETF (LIST 'ELT |var| |y|) |expr|)) - (#0='T (LIST 'SETF (LIST |y| |var|) |expr|)))) - (#0# (LIST 'SETF (LIST 'ELT |var| |sel|) |expr|))))))) + (T (LIST 'SETF (LIST |y| |var|) |expr|)))) + (T (LIST 'SETF (LIST 'ELT |var| |sel|) |expr|))))))) (DEFUN |bfIfThenOnly| (|a| |b|) (PROG (|b1|) @@ -1656,7 +1630,7 @@ (SETQ |b1| (COND ((AND (CONSP |b|) (EQ (CAR |b|) 'PROGN)) (CDR |b|)) - ('T (LIST |b|)))) + (T (LIST |b|)))) (LIST 'COND (CONS |a| |b1|)))))) (DEFUN |bfIf| (|a| |b| |c|) @@ -1666,16 +1640,16 @@ (SETQ |b1| (COND ((AND (CONSP |b|) (EQ (CAR |b|) 'PROGN)) (CDR |b|)) - (#0='T (LIST |b|)))) + (T (LIST |b|)))) (COND ((AND (CONSP |c|) (EQ (CAR |c|) 'COND)) (CONS 'COND (CONS (CONS |a| |b1|) (CDR |c|)))) - ('T - (SETQ |c1| - (COND - ((AND (CONSP |c|) (EQ (CAR |c|) 'PROGN)) (CDR |c|)) - (#0# (LIST |c|)))) - (LIST 'COND (CONS |a| |b1|) (CONS ''T |c1|)))))))) + (T (SETQ |c1| + (COND + ((AND (CONSP |c|) (EQ (CAR |c|) 'PROGN)) + (CDR |c|)) + (T (LIST |c|)))) + (LIST 'COND (CONS |a| |b1|) (CONS 'T |c1|)))))))) (DEFUN |bfExit| (|a| |b|) (LIST 'COND (LIST |a| (LIST 'IDENTITY |b|)))) @@ -1689,40 +1663,39 @@ (LOOP (COND ((ATOM |c|) (RETURN (NREVERSE |bfVar#109|))) - ('T - (SETQ |bfVar#109| - (APPEND (REVERSE (|bfFlattenSeq| |c|)) - |bfVar#109|)))) + (T (SETQ |bfVar#109| + (APPEND (REVERSE (|bfFlattenSeq| |c|)) + |bfVar#109|)))) (SETQ |c| (CDR |c|))))) (COND ((NULL |a|) NIL) ((NULL (CDR |a|)) (CAR |a|)) - ('T (CONS 'PROGN |a|))))))) + (T (CONS 'PROGN |a|))))))) (DEFUN |bfFlattenSeq| (|x|) (PROG (|f|) (RETURN (COND ((NULL |x|) NIL) - (#0='T (SETQ |f| (CAR |x|)) - (COND - ((ATOM |f|) (COND ((CDR |x|) NIL) ('T (LIST |f|)))) - ((AND (CONSP |f|) (EQ (CAR |f|) 'PROGN)) - (COND - ((CDR |x|) - (LET ((|bfVar#111| NIL) (|bfVar#110| (CDR |f|)) - (|i| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#110|) - (PROGN (SETQ |i| (CAR |bfVar#110|)) NIL)) - (RETURN (NREVERSE |bfVar#111|))) - ('T - (AND (NOT (ATOM |i|)) - (SETQ |bfVar#111| (CONS |i| |bfVar#111|))))) - (SETQ |bfVar#110| (CDR |bfVar#110|))))) - (#0# (CDR |f|)))) - (#0# (LIST |f|)))))))) + (T (SETQ |f| (CAR |x|)) + (COND + ((ATOM |f|) (COND ((CDR |x|) NIL) (T (LIST |f|)))) + ((AND (CONSP |f|) (EQ (CAR |f|) 'PROGN)) + (COND + ((CDR |x|) + (LET ((|bfVar#111| NIL) (|bfVar#110| (CDR |f|)) + (|i| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#110|) + (PROGN (SETQ |i| (CAR |bfVar#110|)) NIL)) + (RETURN (NREVERSE |bfVar#111|))) + (T (AND (NOT (ATOM |i|)) + (SETQ |bfVar#111| + (CONS |i| |bfVar#111|))))) + (SETQ |bfVar#110| (CDR |bfVar#110|))))) + (T (CDR |f|)))) + (T (LIST |f|)))))))) (DEFUN |bfWashCONDBranchBody| (|x|) (PROG (|y|) @@ -1731,7 +1704,7 @@ ((AND (CONSP |x|) (EQ (CAR |x|) 'PROGN) (PROGN (SETQ |y| (CDR |x|)) 'T)) |y|) - ('T (LIST |x|)))))) + (T (LIST |x|)))))) (DEFUN |bfSequence| (|l|) (PROG (|f| |aft| |before| |no| |transform| |b| |ISTMP#5| |ISTMP#4| @@ -1739,74 +1712,73 @@ (RETURN (COND ((NULL |l|) NIL) - (#0='T - (SETQ |transform| - (LET ((|bfVar#113| NIL) (|bfVar#112| |l|) (|x| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#112|) - (PROGN (SETQ |x| (CAR |bfVar#112|)) NIL) - (NOT (AND (CONSP |x|) (EQ (CAR |x|) 'COND) - (PROGN - (SETQ |ISTMP#1| (CDR |x|)) - (AND (CONSP |ISTMP#1|) - (EQ (CDR |ISTMP#1|) NIL) - (PROGN - (SETQ |ISTMP#2| - (CAR |ISTMP#1|)) - (AND (CONSP |ISTMP#2|) - (PROGN - (SETQ |a| (CAR |ISTMP#2|)) - (SETQ |ISTMP#3| - (CDR |ISTMP#2|)) - (AND (CONSP |ISTMP#3|) - (EQ (CDR |ISTMP#3|) NIL) - (PROGN - (SETQ |ISTMP#4| - (CAR |ISTMP#3|)) - (AND (CONSP |ISTMP#4|) - (EQ (CAR |ISTMP#4|) - 'IDENTITY) - (PROGN - (SETQ |ISTMP#5| - (CDR |ISTMP#4|)) - (AND - (CONSP |ISTMP#5|) - (EQ (CDR |ISTMP#5|) - NIL) - (PROGN - (SETQ |b| - (CAR |ISTMP#5|)) - #1='T)))))))))))))) - (RETURN (NREVERSE |bfVar#113|))) - ('T - (SETQ |bfVar#113| - (CONS (CONS |a| - (|bfWashCONDBranchBody| |b|)) - |bfVar#113|)))) - (SETQ |bfVar#112| (CDR |bfVar#112|))))) - (SETQ |no| (LENGTH |transform|)) - (SETQ |before| (|bfTake| |no| |l|)) - (SETQ |aft| (|bfDrop| |no| |l|)) - (COND - ((NULL |before|) - (COND - ((AND (CONSP |l|) (EQ (CDR |l|) NIL) - (PROGN (SETQ |f| (CAR |l|)) #1#)) - (COND - ((AND (CONSP |f|) (EQ (CAR |f|) 'PROGN)) - (|bfSequence| (CDR |f|))) - (#0# |f|))) - (#0# - (|bfMKPROGN| (LIST (CAR |l|) (|bfSequence| (CDR |l|))))))) - ((NULL |aft|) (CONS 'COND |transform|)) - (#0# - (CONS 'COND - (APPEND |transform| - (CONS (CONS ''T - (|bfWashCONDBranchBody| - (|bfSequence| |aft|))) - NIL)))))))))) + (T (SETQ |transform| + (LET ((|bfVar#113| NIL) (|bfVar#112| |l|) (|x| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#112|) + (PROGN (SETQ |x| (CAR |bfVar#112|)) NIL) + (NOT (AND (CONSP |x|) (EQ (CAR |x|) 'COND) + (PROGN + (SETQ |ISTMP#1| (CDR |x|)) + (AND (CONSP |ISTMP#1|) + (EQ (CDR |ISTMP#1|) NIL) + (PROGN + (SETQ |ISTMP#2| + (CAR |ISTMP#1|)) + (AND (CONSP |ISTMP#2|) + (PROGN + (SETQ |a| + (CAR |ISTMP#2|)) + (SETQ |ISTMP#3| + (CDR |ISTMP#2|)) + (AND (CONSP |ISTMP#3|) + (EQ (CDR |ISTMP#3|) NIL) + (PROGN + (SETQ |ISTMP#4| + (CAR |ISTMP#3|)) + (AND (CONSP |ISTMP#4|) + (EQ (CAR |ISTMP#4|) + 'IDENTITY) + (PROGN + (SETQ |ISTMP#5| + (CDR |ISTMP#4|)) + (AND + (CONSP |ISTMP#5|) + (EQ + (CDR |ISTMP#5|) + NIL) + (PROGN + (SETQ |b| + (CAR |ISTMP#5|)) + #0='T)))))))))))))) + (RETURN (NREVERSE |bfVar#113|))) + (T (SETQ |bfVar#113| + (CONS (CONS |a| + (|bfWashCONDBranchBody| |b|)) + |bfVar#113|)))) + (SETQ |bfVar#112| (CDR |bfVar#112|))))) + (SETQ |no| (LENGTH |transform|)) + (SETQ |before| (|bfTake| |no| |l|)) + (SETQ |aft| (|bfDrop| |no| |l|)) + (COND + ((NULL |before|) + (COND + ((AND (CONSP |l|) (EQ (CDR |l|) NIL) + (PROGN (SETQ |f| (CAR |l|)) #0#)) + (COND + ((AND (CONSP |f|) (EQ (CAR |f|) 'PROGN)) + (|bfSequence| (CDR |f|))) + (T |f|))) + (T (|bfMKPROGN| + (LIST (CAR |l|) (|bfSequence| (CDR |l|))))))) + ((NULL |aft|) (CONS 'COND |transform|)) + (T (CONS 'COND + (APPEND |transform| + (CONS (CONS 'T + (|bfWashCONDBranchBody| + (|bfSequence| |aft|))) + NIL)))))))))) (DEFUN |bfWhere| (|context| |expr|) (PROG (|a| |nondefs| |defs| |opassoc| |LETTMP#1|) @@ -1824,12 +1796,10 @@ ((OR (ATOM |bfVar#114|) (PROGN (SETQ |d| (CAR |bfVar#114|)) NIL)) (RETURN (NREVERSE |bfVar#115|))) - ('T - (SETQ |bfVar#115| - (CONS (LIST (CAR |d|) (CADR |d|) - (|bfSUBLIS| |opassoc| - (CADDR |d|))) - |bfVar#115|)))) + (T (SETQ |bfVar#115| + (CONS (LIST (CAR |d|) (CADR |d|) + (|bfSUBLIS| |opassoc| (CADDR |d|))) + |bfVar#115|)))) (SETQ |bfVar#114| (CDR |bfVar#114|))))) (SETQ |$wheredefs| (APPEND |a| |$wheredefs|)) (|bfMKPROGN| @@ -1866,7 +1836,7 @@ (SETQ |getCode| (LIST 'GETHASH |g1| |cacheName|)) (SETQ |secondPredPair| (LIST (LIST 'SETQ |g2| |getCode|) |g2|)) (SETQ |putCode| (LIST 'SETF |getCode| |computeValue|)) - (SETQ |thirdPredPair| (LIST ''T |putCode|)) + (SETQ |thirdPredPair| (LIST 'T |putCode|)) (SETQ |codeBody| (LIST 'PROG (LIST |g2|) (LIST 'RETURN @@ -1893,7 +1863,7 @@ (DECLAIM (FTYPE (FUNCTION (|%Thing|) |%List|) |bfNameOnly|)) (DEFUN |bfNameOnly| (|x|) - (COND ((EQ |x| '|t|) (LIST 'T)) ('T (LIST |x|)))) + (COND ((EQ |x| '|t|) (LIST 'T)) (T (LIST |x|)))) (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing|) |%List|) |bfNameArgs|)) @@ -1902,7 +1872,7 @@ (SETQ |y| (COND ((AND (CONSP |y|) (EQ (CAR |y|) 'TUPLE)) (CDR |y|)) - ('T (LIST |y|)))) + (T (LIST |y|)))) (CONS |x| |y|))) (DECLAIM (FTYPE (FUNCTION (|%Thing|) |%List|) |bfCreateDef|)) @@ -1914,21 +1884,19 @@ ((AND (CONSP |x|) (EQ (CDR |x|) NIL) (PROGN (SETQ |f| (CAR |x|)) 'T)) (LIST 'DEFCONSTANT |f| (LIST 'LIST (LIST 'QUOTE |f|)))) - ('T - (SETQ |a| - (LET ((|bfVar#117| NIL) (|bfVar#116| (CDR |x|)) - (|i| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#116|) - (PROGN (SETQ |i| (CAR |bfVar#116|)) NIL)) - (RETURN (NREVERSE |bfVar#117|))) - ('T - (SETQ |bfVar#117| - (CONS (|bfGenSymbol|) |bfVar#117|)))) - (SETQ |bfVar#116| (CDR |bfVar#116|))))) - (LIST 'DEFUN (CAR |x|) |a| - (LIST 'CONS (LIST 'QUOTE (CAR |x|)) (CONS 'LIST |a|)))))))) + (T (SETQ |a| + (LET ((|bfVar#117| NIL) (|bfVar#116| (CDR |x|)) + (|i| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#116|) + (PROGN (SETQ |i| (CAR |bfVar#116|)) NIL)) + (RETURN (NREVERSE |bfVar#117|))) + (T (SETQ |bfVar#117| + (CONS (|bfGenSymbol|) |bfVar#117|)))) + (SETQ |bfVar#116| (CDR |bfVar#116|))))) + (LIST 'DEFUN (CAR |x|) |a| + (LIST 'CONS (LIST 'QUOTE (CAR |x|)) (CONS 'LIST |a|)))))))) (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing|) |%List|) |bfCaseItem|)) @@ -1940,13 +1908,13 @@ (PROG (|body| |g|) (RETURN (PROGN - (SETQ |g| (COND ((ATOM |x|) |x|) (#0='T (|bfGenSymbol|)))) + (SETQ |g| (COND ((ATOM |x|) |x|) (T (|bfGenSymbol|)))) (SETQ |body| (CONS 'CASE (CONS (LIST 'CAR |g|) (|bfCaseItems| |g| |y|)))) (COND ((EQ |g| |x|) |body|) - (#0# (LIST 'LET (LIST (LIST |g| |x|)) |body|))))))) + (T (LIST 'LET (LIST (LIST |g| |x|)) |body|))))))) (DECLAIM (FTYPE (FUNCTION (|%Thing| |%List|) |%List|) |bfCaseItems|)) @@ -1959,15 +1927,14 @@ ((OR (ATOM |bfVar#119|) (PROGN (SETQ |bfVar#118| (CAR |bfVar#119|)) NIL)) (RETURN (NREVERSE |bfVar#120|))) - ('T - (AND (CONSP |bfVar#118|) - (PROGN - (SETQ |i| (CAR |bfVar#118|)) - (SETQ |ISTMP#1| (CDR |bfVar#118|)) - (AND (CONSP |ISTMP#1|) (EQ (CDR |ISTMP#1|) NIL) - (PROGN (SETQ |j| (CAR |ISTMP#1|)) 'T))) - (SETQ |bfVar#120| - (CONS (|bfCI| |g| |i| |j|) |bfVar#120|))))) + (T (AND (CONSP |bfVar#118|) + (PROGN + (SETQ |i| (CAR |bfVar#118|)) + (SETQ |ISTMP#1| (CDR |bfVar#118|)) + (AND (CONSP |ISTMP#1|) (EQ (CDR |ISTMP#1|) NIL) + (PROGN (SETQ |j| (CAR |ISTMP#1|)) 'T))) + (SETQ |bfVar#120| + (CONS (|bfCI| |g| |i| |j|) |bfVar#120|))))) (SETQ |bfVar#119| (CDR |bfVar#119|))))))) (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Thing|) |%List|) |bfCI|)) @@ -1979,26 +1946,24 @@ (SETQ |a| (CDR |x|)) (COND ((NULL |a|) (LIST (CAR |x|) |y|)) - ('T - (SETQ |b| - (LET ((|bfVar#122| NIL) (|bfVar#121| |a|) (|i| NIL) - (|j| 1)) - (LOOP - (COND - ((OR (ATOM |bfVar#121|) - (PROGN (SETQ |i| (CAR |bfVar#121|)) NIL)) - (RETURN (NREVERSE |bfVar#122|))) - ('T - (AND (NOT (EQ |i| 'DOT)) - (SETQ |bfVar#122| - (CONS - (LIST |i| (|bfCARCDR| |j| |g|)) - |bfVar#122|))))) - (SETQ |bfVar#121| (CDR |bfVar#121|)) - (SETQ |j| (+ |j| 1))))) - (COND - ((NULL |b|) (LIST (CAR |x|) |y|)) - ('T (LIST (CAR |x|) (LIST 'LET |b| |y|)))))))))) + (T (SETQ |b| + (LET ((|bfVar#122| NIL) (|bfVar#121| |a|) (|i| NIL) + (|j| 1)) + (LOOP + (COND + ((OR (ATOM |bfVar#121|) + (PROGN (SETQ |i| (CAR |bfVar#121|)) NIL)) + (RETURN (NREVERSE |bfVar#122|))) + (T (AND (NOT (EQ |i| 'DOT)) + (SETQ |bfVar#122| + (CONS + (LIST |i| (|bfCARCDR| |j| |g|)) + |bfVar#122|))))) + (SETQ |bfVar#121| (CDR |bfVar#121|)) + (SETQ |j| (+ |j| 1))))) + (COND + ((NULL |b|) (LIST (CAR |x|) |y|)) + (T (LIST (CAR |x|) (LIST 'LET |b| |y|)))))))))) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Thing|) |%List|) |bfCARCDR|)) @@ -2008,48 +1973,46 @@ (DECLAIM (FTYPE (FUNCTION (|%Short|) |%String|) |bfDs|)) (DEFUN |bfDs| (|n|) - (COND ((EQL |n| 0) "") ('T (CONCAT "D" (|bfDs| (- |n| 1)))))) + (COND ((EQL |n| 0) "") (T (CONCAT "D" (|bfDs| (- |n| 1)))))) (DECLAIM (FTYPE (FUNCTION (|%Thing| |%List|) |%Thing|) |bfTry|)) (DEFUN |bfTry| (|e| |cs|) (COND ((NULL |cs|) |e|) - (#0='T - (LET ((|bfVar#123| (CAR |cs|))) - (CASE (CAR |bfVar#123|) - (|%Catch| - (LET ((|tag| (CADR |bfVar#123|))) - (COND - ((ATOM |tag|) - (|bfTry| (LIST 'CATCH (LIST 'QUOTE |tag|) |e|) - (CDR |cs|))) - (#0# (|bpTrap|))))) - (T (|bpTrap|))))))) + (T (LET ((|bfVar#123| (CAR |cs|))) + (CASE (CAR |bfVar#123|) + (|%Catch| + (LET ((|tag| (CADR |bfVar#123|))) + (COND + ((ATOM |tag|) + (|bfTry| (LIST 'CATCH (LIST 'QUOTE |tag|) |e|) + (CDR |cs|))) + (T (|bpTrap|))))) + (T (|bpTrap|))))))) (DEFUN |bfThrow| (|e|) (COND ((ATOM |e|) (LIST 'THROW (LIST 'QUOTE |e|) NIL)) ((NOT (ATOM (CAR |e|))) (|bpTrap|)) - ('T (CONS 'THROW (CONS (LIST 'QUOTE (CAR |e|)) (CDR |e|)))))) + (T (CONS 'THROW (CONS (LIST 'QUOTE (CAR |e|)) (CDR |e|)))))) (DEFUN |backquote| (|form| |params|) (COND ((NULL |params|) (|quote| |form|)) ((ATOM |form|) - (COND ((MEMBER |form| |params|) |form|) (#0='T (|quote| |form|)))) - (#0# - (CONS 'LIST - (LET ((|bfVar#125| NIL) (|bfVar#124| |form|) (|t| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#124|) - (PROGN (SETQ |t| (CAR |bfVar#124|)) NIL)) - (RETURN (NREVERSE |bfVar#125|))) - ('T - (SETQ |bfVar#125| - (CONS (|backquote| |t| |params|) |bfVar#125|)))) - (SETQ |bfVar#124| (CDR |bfVar#124|)))))))) + (COND ((MEMBER |form| |params|) |form|) (T (|quote| |form|)))) + (T (CONS 'LIST + (LET ((|bfVar#125| NIL) (|bfVar#124| |form|) (|t| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#124|) + (PROGN (SETQ |t| (CAR |bfVar#124|)) NIL)) + (RETURN (NREVERSE |bfVar#125|))) + (T (SETQ |bfVar#125| + (CONS (|backquote| |t| |params|) + |bfVar#125|)))) + (SETQ |bfVar#124| (CDR |bfVar#124|)))))))) (DEFUN |genTypeAlias| (|head| |body|) (PROG (|args| |op|) @@ -2095,19 +2058,19 @@ ((|%hasFeature| :SBCL) (|bfColonColon| 'SB-ALIEN |t'|)) ((|%hasFeature| :CLISP) (|bfColonColon| 'FFI |t'|)) - (#0='T |t'|))) + (T |t'|))) (COND ((AND (EQ |t| '|string|) (|%hasFeature| :SBCL)) (LIST |t'| :EXTERNAL-FORMAT :ASCII :ELEMENT-TYPE 'BASE-CHAR)) - (#0# |t'|))) + (T |t'|))) ((MEMBER |t| '(|byte| |uint8|)) (COND ((|%hasFeature| :SBCL) (LIST (|bfColonColon| 'SB-ALIEN 'UNSIGNED) 8)) ((|%hasFeature| :CLISP) (|bfColonColon| 'FFI 'UINT8)) ((|%hasFeature| :ECL) :UNSIGNED-BYTE) - (#0# (|nativeType| '|char|)))) + (T (|nativeType| '|char|)))) ((EQ |t| '|int16|) (COND ((|%hasFeature| :SBCL) @@ -2115,7 +2078,7 @@ ((|%hasFeature| :CLISP) (|bfColonColon| 'FFI 'INT16)) ((AND (|%hasFeature| :ECL) (|%hasFeature| :UINT16-T)) :INT16-T) - (#0# (|unknownNativeTypeError| |t|)))) + (T (|unknownNativeTypeError| |t|)))) ((EQ |t| '|uint16|) (COND ((|%hasFeature| :SBCL) @@ -2123,7 +2086,7 @@ ((|%hasFeature| :CLISP) (|bfColonColon| 'FFI 'UINT16)) ((AND (|%hasFeature| :ECL) (|%hasFeature| :UINT16-T)) :UINT16-T) - (#0# (|unknownNativeTypeError| |t|)))) + (T (|unknownNativeTypeError| |t|)))) ((EQ |t| '|int32|) (COND ((|%hasFeature| :SBCL) @@ -2131,7 +2094,7 @@ ((|%hasFeature| :CLISP) (|bfColonColon| 'FFI 'INT32)) ((AND (|%hasFeature| :ECL) (|%hasFeature| :UINT32-T)) :INT32-T) - (#0# (|unknownNativeTypeError| |t|)))) + (T (|unknownNativeTypeError| |t|)))) ((EQ |t| '|uint32|) (COND ((|%hasFeature| :SBCL) @@ -2139,7 +2102,7 @@ ((|%hasFeature| :CLISP) (|bfColonColon| 'FFI 'INT32)) ((AND (|%hasFeature| :ECL) (|%hasFeature| :UINT32-T)) :UINT32-T) - (#0# (|unknownNativeTypeError| |t|)))) + (T (|unknownNativeTypeError| |t|)))) ((EQ |t| '|int64|) (COND ((|%hasFeature| :SBCL) @@ -2147,7 +2110,7 @@ ((|%hasFeature| :CLISP) (|bfColonColon| 'FFI 'INT64)) ((AND (|%hasFeature| :ECL) (|%hasFeature| :UINT64-T)) :INT64-T) - (#0# (|unknownNativeTypeError| |t|)))) + (T (|unknownNativeTypeError| |t|)))) ((EQ |t| '|uint64|) (COND ((|%hasFeature| :SBCL) @@ -2155,33 +2118,32 @@ ((|%hasFeature| :CLISP) (|bfColonColon| 'FFI 'UINT64)) ((AND (|%hasFeature| :ECL) (|%hasFeature| :UINT64-T)) :UINT64-T) - (#0# (|unknownNativeTypeError| |t|)))) + (T (|unknownNativeTypeError| |t|)))) ((EQ |t| '|float32|) (|nativeType| '|float|)) ((EQ |t| '|float64|) (|nativeType| '|double|)) - (#0# (|unknownNativeTypeError| |t|)))) + (T (|unknownNativeTypeError| |t|)))) ((EQ (CAR |t|) '|buffer|) (COND ((|%hasFeature| :GCL) 'OBJECT) ((|%hasFeature| :ECL) :OBJECT) ((|%hasFeature| :SBCL) (LIST '* (|nativeType| (CADR |t|)))) ((|%hasFeature| :CLISP) (|bfColonColon| 'FFI 'C-POINTER)) - (#0# (|unknownNativeTypeError| |t|)))) + (T (|unknownNativeTypeError| |t|)))) ((EQ (CAR |t|) '|buffer|) (COND ((|%hasFeature| :GCL) '|fixnum|) ((|%hasFeature| :ECL) :OBJECT) ((|%hasFeature| :SBCL) (LIST '* (|nativeType| (CADR |t|)))) ((|%hasFeature| :CLISP) (|bfColonColon| 'FFI 'C-POINTER)) - (#0# (|unknownNativeTypeError| |t|)))) - (#0# (|unknownNativeTypeError| |t|)))))) + (T (|unknownNativeTypeError| |t|)))) + (T (|unknownNativeTypeError| |t|)))))) (DEFUN |nativeReturnType| (|t|) (COND ((MEMBER |t| |$NativeSimpleReturnTypes|) (|nativeType| |t|)) - ('T - (|coreError| - (CONCAT "invalid return type for native function: " - (SYMBOL-NAME |t|)))))) + (T (|coreError| + (CONCAT "invalid return type for native function: " + (SYMBOL-NAME |t|)))))) (DEFUN |nativeArgumentType| (|t|) (PROG (|t'| |c| |m|) @@ -2191,17 +2153,18 @@ ((EQ |t| '|string|) (|nativeType| |t|)) ((OR (ATOM |t|) (NOT (EQL (LENGTH |t|) 2))) (|coreError| "invalid argument type for a native function")) - (#0='T (SETQ |m| (CAR |t|)) (SETQ |c| (CAADR . #1=(|t|))) - (SETQ |t'| (CADADR . #1#)) - (COND - ((NOT (MEMBER |m| '(|readonly| |writeonly| |readwrite|))) - (|coreError| - "missing modifier for argument type for a native function")) - ((NOT (MEMBER |c| '(|buffer| |pointer|))) - (|coreError| "expect 'buffer' or 'pointer' type instance")) - ((NOT (MEMBER |t'| |$NativeSimpleDataTypes|)) - (|coreError| "expected simple native data type")) - (#0# (|nativeType| (CADR |t|))))))))) + (T (SETQ |m| (CAR |t|)) (SETQ |c| (CAADR . #0=(|t|))) + (SETQ |t'| (CADADR . #0#)) + (COND + ((NOT (MEMBER |m| '(|readonly| |writeonly| |readwrite|))) + (|coreError| + "missing modifier for argument type for a native function")) + ((NOT (MEMBER |c| '(|buffer| |pointer|))) + (|coreError| + "expect 'buffer' or 'pointer' type instance")) + ((NOT (MEMBER |t'| |$NativeSimpleDataTypes|)) + (|coreError| "expected simple native data type")) + (T (|nativeType| (CADR |t|))))))))) (DEFUN |needsStableReference?| (|t|) (PROG (|m|) @@ -2219,20 +2182,18 @@ ((|%hasFeature| :SBCL) (COND ((NOT (|needsStableReference?| |t|)) |a|) - (#0='T (SETQ |c| (CAADR . #1=(|t|))) - (SETQ |y| (CADADR . #1#)) - (COND - ((EQ |c| '|buffer|) - (LIST (|bfColonColon| 'SB-SYS 'VECTOR-SAP) |a|)) - ((EQ |c| '|pointer|) - (LIST (|bfColonColon| 'SB-SYS 'ALIEN-SAP) |a|)) - ((|needsStableReference?| |t|) - (|fatalError| - (CONCAT "don't know how to coerce argument for native type" - (SYMBOL-NAME |c|)))))))) - (#0# - (|fatalError| - "don't know how to coerce argument for native type")))))) + (T (SETQ |c| (CAADR . #0=(|t|))) (SETQ |y| (CADADR . #0#)) + (COND + ((EQ |c| '|buffer|) + (LIST (|bfColonColon| 'SB-SYS 'VECTOR-SAP) |a|)) + ((EQ |c| '|pointer|) + (LIST (|bfColonColon| 'SB-SYS 'ALIEN-SAP) |a|)) + ((|needsStableReference?| |t|) + (|fatalError| + (CONCAT "don't know how to coerce argument for native type" + (SYMBOL-NAME |c|)))))))) + (T (|fatalError| + "don't know how to coerce argument for native type")))))) (DEFUN |genGCLnativeTranslation| (|op| |s| |t| |op'|) (PROG (|ccode| |cargs| |cop| |rettype| |argtypes|) @@ -2245,10 +2206,9 @@ ((OR (ATOM |bfVar#126|) (PROGN (SETQ |x| (CAR |bfVar#126|)) NIL)) (RETURN (NREVERSE |bfVar#127|))) - (#0='T - (SETQ |bfVar#127| - (CONS (|nativeArgumentType| |x|) - |bfVar#127|)))) + (T (SETQ |bfVar#127| + (CONS (|nativeArgumentType| |x|) + |bfVar#127|)))) (SETQ |bfVar#126| (CDR |bfVar#126|))))) (SETQ |rettype| (|nativeReturnType| |t|)) (COND @@ -2259,105 +2219,100 @@ ((OR (ATOM |bfVar#128|) (PROGN (SETQ |x| (CAR |bfVar#128|)) NIL)) (RETURN |bfVar#129|)) - (#0# - (PROGN - (SETQ |bfVar#129| (|isSimpleNativeType| |x|)) - (COND ((NOT |bfVar#129|) (RETURN NIL)))))) + (T (PROGN + (SETQ |bfVar#129| (|isSimpleNativeType| |x|)) + (COND ((NOT |bfVar#129|) (RETURN NIL)))))) (SETQ |bfVar#128| (CDR |bfVar#128|)))) (LIST (LIST 'DEFENTRY |op| |argtypes| (LIST |rettype| (SYMBOL-NAME |op'|))))) - (#1='T (SETQ |cop| (CONCAT (SYMBOL-NAME |op'|) "_stub")) - (SETQ |cargs| - (LET ((|bfVar#136| NIL) - (|bfVar#135| (- (LENGTH |s|) 1)) (|i| 0)) - (LOOP - (COND - ((> |i| |bfVar#135|) - (RETURN (NREVERSE |bfVar#136|))) - (#0# - (SETQ |bfVar#136| - (CONS (|genGCLnativeTranslation,mkCArgName| - |i|) - |bfVar#136|)))) - (SETQ |i| (+ |i| 1))))) - (SETQ |ccode| - (LET ((|bfVar#132| "") - (|bfVar#134| - (CONS (|genGCLnativeTranslation,gclTypeInC| - |t|) - (CONS " " - (CONS |cop| - (CONS "(" - (APPEND - (LET - ((|bfVar#130| NIL) (|x| |s|) - (|a| |cargs|)) - (LOOP - (COND - ((OR (ATOM |x|) - (ATOM |a|)) - (RETURN - (NREVERSE - |bfVar#130|))) - (#0# - (SETQ |bfVar#130| - (CONS - (|genGCLnativeTranslation,cparm| - |x| |a|) - |bfVar#130|)))) - (SETQ |x| (CDR |x|)) - (SETQ |a| (CDR |a|)))) - (CONS ") { " - (CONS - (COND - ((NOT (EQ |t| '|void|)) - "return ") - (#1# '||)) - (CONS (SYMBOL-NAME |op'|) - (CONS "(" - (APPEND - (LET - ((|bfVar#131| NIL) - (|x| |s|) - (|a| |cargs|)) - (LOOP - (COND - ((OR (ATOM |x|) - (ATOM |a|)) - (RETURN - (NREVERSE - |bfVar#131|))) - (#0# - (SETQ |bfVar#131| - (CONS - (|genGCLnativeTranslation,gclArgsInC| - |x| |a|) - |bfVar#131|)))) - (SETQ |x| (CDR |x|)) - (SETQ |a| (CDR |a|)))) - (CONS "); }" NIL)))))))))))) - (|bfVar#133| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#134|) - (PROGN - (SETQ |bfVar#133| (CAR |bfVar#134|)) - NIL)) - (RETURN |bfVar#132|)) - (#0# - (SETQ |bfVar#132| - (CONCAT |bfVar#132| |bfVar#133|)))) - (SETQ |bfVar#134| (CDR |bfVar#134|))))) - (LIST (LIST 'CLINES |ccode|) - (LIST 'DEFENTRY |op| |argtypes| - (LIST |rettype| |cop|))))))))) + (T (SETQ |cop| (CONCAT (SYMBOL-NAME |op'|) "_stub")) + (SETQ |cargs| + (LET ((|bfVar#136| NIL) + (|bfVar#135| (- (LENGTH |s|) 1)) (|i| 0)) + (LOOP + (COND + ((> |i| |bfVar#135|) + (RETURN (NREVERSE |bfVar#136|))) + (T (SETQ |bfVar#136| + (CONS (|genGCLnativeTranslation,mkCArgName| + |i|) + |bfVar#136|)))) + (SETQ |i| (+ |i| 1))))) + (SETQ |ccode| + (LET ((|bfVar#132| "") + (|bfVar#134| + (CONS (|genGCLnativeTranslation,gclTypeInC| + |t|) + (CONS " " + (CONS |cop| + (CONS "(" + (APPEND + (LET + ((|bfVar#130| NIL) (|x| |s|) + (|a| |cargs|)) + (LOOP + (COND + ((OR (ATOM |x|) + (ATOM |a|)) + (RETURN + (NREVERSE |bfVar#130|))) + (T + (SETQ |bfVar#130| + (CONS + (|genGCLnativeTranslation,cparm| + |x| |a|) + |bfVar#130|)))) + (SETQ |x| (CDR |x|)) + (SETQ |a| (CDR |a|)))) + (CONS ") { " + (CONS + (COND + ((NOT (EQ |t| '|void|)) + "return ") + (T '||)) + (CONS (SYMBOL-NAME |op'|) + (CONS "(" + (APPEND + (LET + ((|bfVar#131| NIL) + (|x| |s|) (|a| |cargs|)) + (LOOP + (COND + ((OR (ATOM |x|) + (ATOM |a|)) + (RETURN + (NREVERSE + |bfVar#131|))) + (T + (SETQ |bfVar#131| + (CONS + (|genGCLnativeTranslation,gclArgsInC| + |x| |a|) + |bfVar#131|)))) + (SETQ |x| (CDR |x|)) + (SETQ |a| (CDR |a|)))) + (CONS "); }" NIL)))))))))))) + (|bfVar#133| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#134|) + (PROGN + (SETQ |bfVar#133| (CAR |bfVar#134|)) + NIL)) + (RETURN |bfVar#132|)) + (T (SETQ |bfVar#132| + (CONCAT |bfVar#132| |bfVar#133|)))) + (SETQ |bfVar#134| (CDR |bfVar#134|))))) + (LIST (LIST 'CLINES |ccode|) + (LIST 'DEFENTRY |op| |argtypes| + (LIST |rettype| |cop|))))))))) (DEFUN |genGCLnativeTranslation,mkCArgName| (|i|) (CONCAT "x" (STRINGIMAGE |i|))) (DEFUN |genGCLnativeTranslation,cparm| (|x| |a|) (CONCAT (|genGCLnativeTranslation,gclTypeInC| (CAR |x|)) " " - (CAR |a|) (COND ((CDR |x|) ", ") ('T "")))) + (CAR |a|) (COND ((CDR |x|) ", ") (T "")))) (DEFUN |genGCLnativeTranslation,gclTypeInC| (|x|) (PROG (|ISTMP#3| |ISTMP#2| |ISTMP#1|) @@ -2379,7 +2334,7 @@ (AND (CONSP |ISTMP#3|) (EQ (CDR |ISTMP#3|) NIL)))))))) '|fixnum|) - ('T "object"))))) + (T "object"))))) (DEFUN |genGCLnativeTranslation,gclArgInC| (|x| |a|) (PROG (|y| |c|) @@ -2387,19 +2342,19 @@ (COND ((MEMBER |x| |$NativeSimpleDataTypes|) |a|) ((EQ |x| '|string|) |a|) - (#0='T (SETQ |c| (CAADR |x|)) (SETQ |y| (CADADR |x|)) - (COND - ((EQ |c| '|pointer|) |a|) - ((EQ |y| '|char|) (CONCAT |a| "->st.st_self")) - ((EQ |y| '|byte|) (CONCAT |a| "->ust.ust_self")) - ((EQ |y| '|int|) (CONCAT |a| "->fixa.fixa_self")) - ((EQ |y| '|float|) (CONCAT |a| "->sfa.sfa_self")) - ((EQ |y| '|double|) (CONCAT |a| "->lfa.lfa_self")) - (#0# (|coreError| "unknown argument type")))))))) + (T (SETQ |c| (CAADR |x|)) (SETQ |y| (CADADR |x|)) + (COND + ((EQ |c| '|pointer|) |a|) + ((EQ |y| '|char|) (CONCAT |a| "->st.st_self")) + ((EQ |y| '|byte|) (CONCAT |a| "->ust.ust_self")) + ((EQ |y| '|int|) (CONCAT |a| "->fixa.fixa_self")) + ((EQ |y| '|float|) (CONCAT |a| "->sfa.sfa_self")) + ((EQ |y| '|double|) (CONCAT |a| "->lfa.lfa_self")) + (T (|coreError| "unknown argument type")))))))) (DEFUN |genGCLnativeTranslation,gclArgsInC| (|x| |a|) (CONCAT (|genGCLnativeTranslation,gclArgInC| (CAR |x|) (CAR |a|)) - (COND ((CDR |x|) ", ") ('T "")))) + (COND ((CDR |x|) ", ") (T "")))) (DEFUN |genECLnativeTranslation| (|op| |s| |t| |op'|) (PROG (|rettype| |argtypes| |args|) @@ -2413,11 +2368,10 @@ ((OR (ATOM |bfVar#137|) (PROGN (SETQ |x| (CAR |bfVar#137|)) NIL)) (RETURN NIL)) - ('T - (PROGN - (SETQ |argtypes| - (CONS (|nativeArgumentType| |x|) |argtypes|)) - (SETQ |args| (CONS (GENSYM) |args|))))) + (T (PROGN + (SETQ |argtypes| + (CONS (|nativeArgumentType| |x|) |argtypes|)) + (SETQ |args| (CONS (GENSYM) |args|))))) (SETQ |bfVar#137| (CDR |bfVar#137|)))) (SETQ |args| (REVERSE |args|)) (SETQ |rettype| (|nativeReturnType| |t|)) @@ -2444,7 +2398,7 @@ (SETQ |x| (CAR |bfVar#139|)) NIL)) (RETURN (NREVERSE |bfVar#140|))) - (#0='T + (T (SETQ |bfVar#140| (CONS (|genECLnativeTranslation,sharpArg| @@ -2460,39 +2414,37 @@ ((OR (ATOM |bfVar#143|) (PROGN (SETQ |bfVar#142| (CAR |bfVar#143|)) NIL)) (RETURN |bfVar#141|)) - (#0# (SETQ |bfVar#141| (CONCAT |bfVar#141| |bfVar#142|)))) + (T (SETQ |bfVar#141| (CONCAT |bfVar#141| |bfVar#142|)))) (SETQ |bfVar#143| (CDR |bfVar#143|))))) (DEFUN |genECLnativeTranslation,sharpArg| (|i| |x|) (COND ((EQL |i| 0) (CONCAT "(#0)" (|genECLnativeTranslation,selectDatum| |x|))) - ('T - (CONCAT "," "(#" (STRINGIMAGE |i|) ")" - (|genECLnativeTranslation,selectDatum| |x|))))) + (T (CONCAT "," "(#" (STRINGIMAGE |i|) ")" + (|genECLnativeTranslation,selectDatum| |x|))))) (DEFUN |genECLnativeTranslation,selectDatum| (|x|) (PROG (|y| |c|) (RETURN (COND ((|isSimpleNativeType| |x|) "") - (#0='T (SETQ |c| (CAADR |x|)) (SETQ |y| (CADADR |x|)) - (COND - ((EQ |c| '|buffer|) - (COND - ((OR (EQ |y| '|char|) (EQ |y| '|byte|)) - (COND - ((< |$ECLVersionNumber| 90100) "->vector.self.ch") - ((EQ |y| '|char|) "->vector.self.i8") - (#0# "->vector.self.b8"))) - ((EQ |y| '|int|) "->vector.self.fix") - ((EQ |y| '|float|) "->vector.self.sf") - ((EQ |y| '|double|) "->vector.self.df") - (#0# - (|coreError| - "unknown argument to buffer type constructor")))) - ((EQ |c| '|pointer|) '||) - (#0# (|coreError| "unknown type constructor")))))))) + (T (SETQ |c| (CAADR |x|)) (SETQ |y| (CADADR |x|)) + (COND + ((EQ |c| '|buffer|) + (COND + ((OR (EQ |y| '|char|) (EQ |y| '|byte|)) + (COND + ((< |$ECLVersionNumber| 90100) "->vector.self.ch") + ((EQ |y| '|char|) "->vector.self.i8") + (T "->vector.self.b8"))) + ((EQ |y| '|int|) "->vector.self.fix") + ((EQ |y| '|float|) "->vector.self.sf") + ((EQ |y| '|double|) "->vector.self.df") + (T (|coreError| + "unknown argument to buffer type constructor")))) + ((EQ |c| '|pointer|) '||) + (T (|coreError| "unknown type constructor")))))))) (DEFUN |genCLISPnativeTranslation| (|op| |s| |t| |op'|) (PROG (|forwardingFun| |ISTMP#2| |p| |fixups| |q| |call| |localPairs| @@ -2509,10 +2461,9 @@ ((OR (ATOM |bfVar#144|) (PROGN (SETQ |x| (CAR |bfVar#144|)) NIL)) (RETURN (NREVERSE |bfVar#145|))) - (#0='T - (SETQ |bfVar#145| - (CONS (|nativeArgumentType| |x|) - |bfVar#145|)))) + (T (SETQ |bfVar#145| + (CONS (|nativeArgumentType| |x|) + |bfVar#145|)))) (SETQ |bfVar#144| (CDR |bfVar#144|))))) (SETQ |n| (INTERN (CONCAT (SYMBOL-NAME |op|) "%clisp-hack"))) (SETQ |parms| @@ -2522,9 +2473,8 @@ ((OR (ATOM |bfVar#146|) (PROGN (SETQ |x| (CAR |bfVar#146|)) NIL)) (RETURN (NREVERSE |bfVar#147|))) - (#0# - (SETQ |bfVar#147| - (CONS (GENSYM "parm") |bfVar#147|)))) + (T (SETQ |bfVar#147| + (CONS (GENSYM "parm") |bfVar#147|)))) (SETQ |bfVar#146| (CDR |bfVar#146|))))) (SETQ |unstableArgs| NIL) (LET ((|bfVar#148| |parms|) (|p| NIL) (|bfVar#149| |s|) @@ -2538,13 +2488,12 @@ (ATOM |bfVar#150|) (PROGN (SETQ |y| (CAR |bfVar#150|)) NIL)) (RETURN NIL)) - (#0# - (COND - ((|needsStableReference?| |x|) - (IDENTITY - (SETQ |unstableArgs| - (CONS (CONS |p| (CONS |x| |y|)) - |unstableArgs|))))))) + (T (COND + ((|needsStableReference?| |x|) + (IDENTITY + (SETQ |unstableArgs| + (CONS (CONS |p| (CONS |x| |y|)) + |unstableArgs|))))))) (SETQ |bfVar#148| (CDR |bfVar#148|)) (SETQ |bfVar#149| (CDR |bfVar#149|)) (SETQ |bfVar#150| (CDR |bfVar#150|)))) @@ -2566,10 +2515,8 @@ (SETQ |a| (CAR |bfVar#152|)) NIL)) (RETURN (NREVERSE |bfVar#153|))) - (#0# - (SETQ |bfVar#153| - (CONS (LIST |a| |x|) - |bfVar#153|)))) + (T (SETQ |bfVar#153| + (CONS (LIST |a| |x|) |bfVar#153|)))) (SETQ |bfVar#151| (CDR |bfVar#151|)) (SETQ |bfVar#152| (CDR |bfVar#152|))))) (LIST :RETURN-TYPE |rettype|) @@ -2578,95 +2525,95 @@ (COND ((NULL |unstableArgs|) (LIST 'DEFUN |op| |parms| (CONS |n| |parms|))) - (#1='T - (SETQ |localPairs| - (LET ((|bfVar#156| NIL) - (|bfVar#155| |unstableArgs|) - (|bfVar#154| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#155|) - (PROGN - (SETQ |bfVar#154| - (CAR |bfVar#155|)) - NIL)) - (RETURN (NREVERSE |bfVar#156|))) - (#0# - (AND (CONSP |bfVar#154|) - (PROGN - (SETQ |a| (CAR |bfVar#154|)) - (SETQ |ISTMP#1| (CDR |bfVar#154|)) - (AND (CONSP |ISTMP#1|) - (PROGN - (SETQ |x| (CAR |ISTMP#1|)) - (SETQ |y| (CDR |ISTMP#1|)) - #2='T))) - (SETQ |bfVar#156| - (CONS - (CONS |a| - (CONS |x| - (CONS |y| (GENSYM "loc")))) - |bfVar#156|))))) - (SETQ |bfVar#155| (CDR |bfVar#155|))))) - (SETQ |call| - (CONS |n| - (LET ((|bfVar#158| NIL) - (|bfVar#157| |parms|) (|p| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#157|) - (PROGN - (SETQ |p| (CAR |bfVar#157|)) - NIL)) - (RETURN (NREVERSE |bfVar#158|))) - (#0# - (SETQ |bfVar#158| - (CONS - (|genCLISPnativeTranslation,actualArg| - |p| |localPairs|) - |bfVar#158|)))) - (SETQ |bfVar#157| (CDR |bfVar#157|)))))) - (SETQ |call| - (PROGN - (SETQ |fixups| - (LET ((|bfVar#160| NIL) - (|bfVar#159| |localPairs|) - (|p| NIL)) + (T (SETQ |localPairs| + (LET ((|bfVar#156| NIL) + (|bfVar#155| |unstableArgs|) + (|bfVar#154| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#155|) + (PROGN + (SETQ |bfVar#154| + (CAR |bfVar#155|)) + NIL)) + (RETURN (NREVERSE |bfVar#156|))) + (T (AND (CONSP |bfVar#154|) + (PROGN + (SETQ |a| (CAR |bfVar#154|)) + (SETQ |ISTMP#1| + (CDR |bfVar#154|)) + (AND (CONSP |ISTMP#1|) + (PROGN + (SETQ |x| (CAR |ISTMP#1|)) + (SETQ |y| (CDR |ISTMP#1|)) + #0='T))) + (SETQ |bfVar#156| + (CONS + (CONS |a| + (CONS |x| + (CONS |y| (GENSYM "loc")))) + |bfVar#156|))))) + (SETQ |bfVar#155| (CDR |bfVar#155|))))) + (SETQ |call| + (CONS |n| + (LET ((|bfVar#158| NIL) + (|bfVar#157| |parms|) (|p| NIL)) (LOOP (COND - ((OR (ATOM |bfVar#159|) + ((OR (ATOM |bfVar#157|) (PROGN - (SETQ |p| (CAR |bfVar#159|)) + (SETQ |p| (CAR |bfVar#157|)) NIL)) - (RETURN (NREVERSE |bfVar#160|))) - (#0# - (AND - (NOT - (NULL - (SETQ |q| - (|genCLISPnativeTranslation,copyBack| - |p|)))) - (SETQ |bfVar#160| - (CONS |q| |bfVar#160|))))) - (SETQ |bfVar#159| (CDR |bfVar#159|))))) - (COND - ((NULL |fixups|) (LIST |call|)) - (#1# - (LIST (CONS 'PROG1 (CONS |call| |fixups|))))))) - (LET ((|bfVar#162| |localPairs|) (|bfVar#161| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#162|) - (PROGN - (SETQ |bfVar#161| (CAR |bfVar#162|)) - NIL)) - (RETURN NIL)) - (#0# - (AND (CONSP |bfVar#161|) - (PROGN - (SETQ |p| (CAR |bfVar#161|)) - (SETQ |ISTMP#1| (CDR |bfVar#161|)) - (AND (CONSP |ISTMP#1|) + (RETURN (NREVERSE |bfVar#158|))) + (T + (SETQ |bfVar#158| + (CONS + (|genCLISPnativeTranslation,actualArg| + |p| |localPairs|) + |bfVar#158|)))) + (SETQ |bfVar#157| (CDR |bfVar#157|)))))) + (SETQ |call| + (PROGN + (SETQ |fixups| + (LET ((|bfVar#160| NIL) + (|bfVar#159| |localPairs|) + (|p| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#159|) + (PROGN + (SETQ |p| (CAR |bfVar#159|)) + NIL)) + (RETURN + (NREVERSE |bfVar#160|))) + (T + (AND + (NOT + (NULL + (SETQ |q| + (|genCLISPnativeTranslation,copyBack| + |p|)))) + (SETQ |bfVar#160| + (CONS |q| |bfVar#160|))))) + (SETQ |bfVar#159| + (CDR |bfVar#159|))))) + (COND + ((NULL |fixups|) (LIST |call|)) + (T (LIST (CONS 'PROG1 + (CONS |call| |fixups|))))))) + (LET ((|bfVar#162| |localPairs|) (|bfVar#161| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#162|) + (PROGN + (SETQ |bfVar#161| (CAR |bfVar#162|)) + NIL)) + (RETURN NIL)) + (T (AND (CONSP |bfVar#161|) + (PROGN + (SETQ |p| (CAR |bfVar#161|)) + (SETQ |ISTMP#1| (CDR |bfVar#161|)) + (AND (CONSP |ISTMP#1|) (PROGN (SETQ |x| (CAR |ISTMP#1|)) (SETQ |ISTMP#2| (CDR |ISTMP#1|)) @@ -2674,22 +2621,22 @@ (PROGN (SETQ |y| (CAR |ISTMP#2|)) (SETQ |a| (CDR |ISTMP#2|)) - #2#))))) - (SETQ |call| - (LIST - (CONS - (|bfColonColon| 'FFI - 'WITH-FOREIGN-OBJECT) - (CONS - (LIST |a| - (LIST 'FUNCALL - (LIST 'INTERN "getCLISPType" - "BOOTTRAN") - |p|) - |p|) - |call|))))))) - (SETQ |bfVar#162| (CDR |bfVar#162|)))) - (CONS 'DEFUN (CONS |op| (CONS |parms| |call|)))))) + #0#))))) + (SETQ |call| + (LIST + (CONS + (|bfColonColon| 'FFI + 'WITH-FOREIGN-OBJECT) + (CONS + (LIST |a| + (LIST 'FUNCALL + (LIST 'INTERN + "getCLISPType" "BOOTTRAN") + |p|) + |p|) + |call|))))))) + (SETQ |bfVar#162| (CDR |bfVar#162|)))) + (CONS 'DEFUN (CONS |op| (CONS |parms| |call|)))))) (SETQ |$foreignsDefsForCLisp| (CONS |foreignDecl| |$foreignsDefsForCLisp|)) (LIST |forwardingFun|))))) @@ -2704,16 +2651,15 @@ (SETQ |a| (CDDDR . #0#)) (COND ((AND (CONSP |x|) (EQ (CAR |x|) '|readonly|)) NIL) - ('T - (LIST 'SETF |p| - (LIST (|bfColonColon| 'FFI 'FOREIGN-VALUE) |a|)))))))) + (T (LIST 'SETF |p| + (LIST (|bfColonColon| 'FFI 'FOREIGN-VALUE) |a|)))))))) (DEFUN |genCLISPnativeTranslation,actualArg| (|p| |pairs|) (PROG (|a'|) (RETURN (COND ((SETQ |a'| (CDR (ASSOC |p| |pairs|))) (CDR (CDR |a'|))) - ('T |p|))))) + (T |p|))))) (DEFUN |getCLISPType| (|a|) (LIST (|bfColonColon| 'FFI 'C-ARRAY) (LENGTH |a|))) @@ -2730,10 +2676,9 @@ ((OR (ATOM |bfVar#164|) (PROGN (SETQ |x| (CAR |bfVar#164|)) NIL)) (RETURN (NREVERSE |bfVar#165|))) - (#0='T - (SETQ |bfVar#165| - (CONS (|nativeArgumentType| |x|) - |bfVar#165|)))) + (T (SETQ |bfVar#165| + (CONS (|nativeArgumentType| |x|) + |bfVar#165|)))) (SETQ |bfVar#164| (CDR |bfVar#164|))))) (SETQ |args| (LET ((|bfVar#167| NIL) (|bfVar#166| |s|) (|x| NIL)) @@ -2742,8 +2687,7 @@ ((OR (ATOM |bfVar#166|) (PROGN (SETQ |x| (CAR |bfVar#166|)) NIL)) (RETURN (NREVERSE |bfVar#167|))) - (#0# - (SETQ |bfVar#167| (CONS (GENSYM) |bfVar#167|)))) + (T (SETQ |bfVar#167| (CONS (GENSYM) |bfVar#167|)))) (SETQ |bfVar#166| (CDR |bfVar#166|))))) (SETQ |unstableArgs| NIL) (SETQ |newArgs| NIL) @@ -2756,20 +2700,20 @@ (ATOM |bfVar#169|) (PROGN (SETQ |x| (CAR |bfVar#169|)) NIL)) (RETURN NIL)) - (#0# - (PROGN - (SETQ |newArgs| - (CONS (|coerceToNativeType| |a| |x|) |newArgs|)) - (COND - ((|needsStableReference?| |x|) - (SETQ |unstableArgs| (CONS |a| |unstableArgs|))))))) + (T (PROGN + (SETQ |newArgs| + (CONS (|coerceToNativeType| |a| |x|) + |newArgs|)) + (COND + ((|needsStableReference?| |x|) + (SETQ |unstableArgs| (CONS |a| |unstableArgs|))))))) (SETQ |bfVar#168| (CDR |bfVar#168|)) (SETQ |bfVar#169| (CDR |bfVar#169|)))) (SETQ |op'| (COND ((|%hasFeature| :WIN32) (CONCAT "_" (SYMBOL-NAME |op'|))) - (#1='T (SYMBOL-NAME |op'|)))) + (T (SYMBOL-NAME |op'|)))) (COND ((NULL |unstableArgs|) (LIST (LIST 'DEFUN |op| |args| @@ -2780,19 +2724,20 @@ (CONS 'FUNCTION (CONS |rettype| |argtypes|))) |args|))))) - (#1# - (LIST (LIST 'DEFUN |op| |args| - (LIST (|bfColonColon| 'SB-SYS - 'WITH-PINNED-OBJECTS) - (NREVERSE |unstableArgs|) - (CONS (INTERN "ALIEN-FUNCALL" "SB-ALIEN") - (CONS - (LIST - (INTERN "EXTERN-ALIEN" "SB-ALIEN") - |op'| - (CONS 'FUNCTION - (CONS |rettype| |argtypes|))) - (NREVERSE |newArgs|)))))))))))) + (T (LIST (LIST 'DEFUN |op| |args| + (LIST (|bfColonColon| 'SB-SYS + 'WITH-PINNED-OBJECTS) + (NREVERSE |unstableArgs|) + (CONS (INTERN "ALIEN-FUNCALL" + "SB-ALIEN") + (CONS + (LIST + (INTERN "EXTERN-ALIEN" + "SB-ALIEN") + |op'| + (CONS 'FUNCTION + (CONS |rettype| |argtypes|))) + (NREVERSE |newArgs|)))))))))))) (DEFUN |genImportDeclaration| (|op| |sig|) (PROG (|s| |t| |m| |ISTMP#2| |op'| |ISTMP#1|) @@ -2824,19 +2769,18 @@ (SETQ |s| (CAR |ISTMP#2|)) #0#))))))) (|coreError| "invalid function type")) - (#1='T - (COND - ((AND (NOT (NULL |s|)) (SYMBOLP |s|)) (SETQ |s| (LIST |s|)))) - (COND - ((|%hasFeature| :GCL) - (|genGCLnativeTranslation| |op| |s| |t| |op'|)) - ((|%hasFeature| :SBCL) - (|genSBCLnativeTranslation| |op| |s| |t| |op'|)) - ((|%hasFeature| :CLISP) - (|genCLISPnativeTranslation| |op| |s| |t| |op'|)) - ((|%hasFeature| :ECL) - (|genECLnativeTranslation| |op| |s| |t| |op'|)) - (#1# - (|fatalError| - "import declaration not implemented for this Lisp")))))))) + (T (COND + ((AND (NOT (NULL |s|)) (SYMBOLP |s|)) + (SETQ |s| (LIST |s|)))) + (COND + ((|%hasFeature| :GCL) + (|genGCLnativeTranslation| |op| |s| |t| |op'|)) + ((|%hasFeature| :SBCL) + (|genSBCLnativeTranslation| |op| |s| |t| |op'|)) + ((|%hasFeature| :CLISP) + (|genCLISPnativeTranslation| |op| |s| |t| |op'|)) + ((|%hasFeature| :ECL) + (|genECLnativeTranslation| |op| |s| |t| |op'|)) + (T (|fatalError| + "import declaration not implemented for this Lisp")))))))) diff --git a/src/boot/strap/includer.clisp b/src/boot/strap/includer.clisp index 94aee881..646429c2 100644 --- a/src/boot/strap/includer.clisp +++ b/src/boot/strap/includer.clisp @@ -9,7 +9,7 @@ (COND ((SYMBOLP |x|) (SYMBOL-NAME |x|)) ((CHARACTERP |x|) (STRING |x|)) - ('T NIL))) + (T NIL))) (DEFUN |char| (|x|) (CHAR (PNAME |x|) 0)) @@ -27,9 +27,8 @@ (SETQ |l| (LENGTH |s|)) (COND ((NOT (< |n| |l|)) NIL) - ('T - (READ-FROM-STRING - (CONCAT '|(| (SUBSTRING |s| |n| (- |l| |n|)) '|)|)))))))) + (T (READ-FROM-STRING + (CONCAT '|(| (SUBSTRING |s| |n| (- |l| |n|)) '|)|)))))))) (DEFUN |shoeReadLine| (|stream|) (READ-LINE |stream| NIL NIL)) @@ -91,40 +90,40 @@ (RETURN (COND ((|bStreamNull| |stream|) (LIST NIL (LIST '|nullstream|))) - ('T (SETQ |a| (CAAR |stream|)) - (COND - ((AND (NOT (< (LENGTH |a|) 8)) - (EQUAL (SUBSTRING |a| 0 8) ")package")) - (|shoePackageStartsAt| (CONS (CAAR |stream|) |lines|) |sz| - |name| (CDR |stream|))) - ((< (LENGTH |a|) |sz|) - (|shoePackageStartsAt| |lines| |sz| |name| (CDR |stream|))) - ((AND (EQUAL (SUBSTRING |a| 0 |sz|) |name|) - (< |sz| (LENGTH |a|)) - (NOT (|shoeIdChar| (ELT |a| |sz|)))) - (LIST |lines| |stream|)) - ('T - (|shoePackageStartsAt| |lines| |sz| |name| (CDR |stream|))))))))) + (T (SETQ |a| (CAAR |stream|)) + (COND + ((AND (NOT (< (LENGTH |a|) 8)) + (EQUAL (SUBSTRING |a| 0 8) ")package")) + (|shoePackageStartsAt| (CONS (CAAR |stream|) |lines|) + |sz| |name| (CDR |stream|))) + ((< (LENGTH |a|) |sz|) + (|shoePackageStartsAt| |lines| |sz| |name| + (CDR |stream|))) + ((AND (EQUAL (SUBSTRING |a| 0 |sz|) |name|) + (< |sz| (LENGTH |a|)) + (NOT (|shoeIdChar| (ELT |a| |sz|)))) + (LIST |lines| |stream|)) + (T (|shoePackageStartsAt| |lines| |sz| |name| + (CDR |stream|))))))))) (DEFUN |shoeFindLines| (|fn| |name| |a|) (PROG (|b| |lines| |LETTMP#1|) (RETURN (COND ((NULL |a|) (|shoeNotFound| |fn|) NIL) - (#0='T - (SETQ |LETTMP#1| - (|shoePackageStartsAt| NIL (LENGTH |name|) |name| - (|shoeInclude| - (|bAddLineNumber| (|bRgen| |a|) (|bIgen| 0))))) - (SETQ |lines| (CAR |LETTMP#1|)) (SETQ |b| (CADR |LETTMP#1|)) - (SETQ |b| (|shoeTransform2| |b|)) - (COND - ((|bStreamNull| |b|) - (|shoeConsole| (CONCAT |name| " not found in " |fn|)) NIL) - (#0# - (COND - ((NULL |lines|) (|shoeConsole| ")package not found"))) - (APPEND (REVERSE |lines|) (CAR |b|))))))))) + (T (SETQ |LETTMP#1| + (|shoePackageStartsAt| NIL (LENGTH |name|) |name| + (|shoeInclude| + (|bAddLineNumber| (|bRgen| |a|) (|bIgen| 0))))) + (SETQ |lines| (CAR |LETTMP#1|)) (SETQ |b| (CADR |LETTMP#1|)) + (SETQ |b| (|shoeTransform2| |b|)) + (COND + ((|bStreamNull| |b|) + (|shoeConsole| (CONCAT |name| " not found in " |fn|)) + NIL) + (T (COND + ((NULL |lines|) (|shoeConsole| ")package not found"))) + (APPEND (REVERSE |lines|) (CAR |b|))))))))) (DEFPARAMETER |$bStreamNil| (LIST '|nullstream|)) @@ -134,17 +133,15 @@ (COND ((OR (NULL |x|) (AND (CONSP |x|) (EQ (CAR |x|) '|nullstream|))) T) - ('T - (LOOP - (COND - ((NOT (AND (CONSP |x|) (EQ (CAR |x|) '|nonnullstream|))) - (RETURN NIL)) - ('T - (PROGN - (SETQ |st| (APPLY (CADR |x|) (CDDR |x|))) - (RPLACA |x| (CAR |st|)) - (RPLACD |x| (CDR |st|)))))) - (AND (CONSP |x|) (EQ (CAR |x|) '|nullstream|))))))) + (T (LOOP + (COND + ((NOT (AND (CONSP |x|) (EQ (CAR |x|) '|nonnullstream|))) + (RETURN NIL)) + (T (PROGN + (SETQ |st| (APPLY (CADR |x|) (CDDR |x|))) + (RPLACA |x| (CAR |st|)) + (RPLACD |x| (CDR |st|)))))) + (AND (CONSP |x|) (EQ (CAR |x|) '|nullstream|))))))) (DEFUN |bMap| (|f| |x|) (|bDelay| #'|bMap1| (LIST |f| |x|))) @@ -157,7 +154,7 @@ (SETQ |x| (CADR |z|)) (COND ((|bStreamNull| |x|) |$bStreamNil|) - ('T (CONS (FUNCALL |f| (CAR |x|)) (|bMap| |f| (CDR |x|))))))))) + (T (CONS (FUNCALL |f| (CAR |x|)) (|bMap| |f| (CDR |x|))))))))) (DEFUN |shoeFileMap| (|f| |fn|) (PROG (|a|) @@ -168,10 +165,10 @@ (COND ((NULL |a|) (|shoeConsole| (CONCAT |fn| " NOT FOUND")) |$bStreamNil|) - ('T (|shoeConsole| (CONCAT "READING " |fn|)) - (|shoeInclude| - (|bAddLineNumber| (|bMap| |f| (|bRgen| |a|)) - (|bIgen| 0))))))))) + (T (|shoeConsole| (CONCAT "READING " |fn|)) + (|shoeInclude| + (|bAddLineNumber| (|bMap| |f| (|bRgen| |a|)) + (|bIgen| 0))))))))) (DEFUN |bDelay| (|f| |x|) (CONS '|nonnullstream| (CONS |f| |x|))) @@ -182,8 +179,8 @@ ((|bStreamNull| (CAR |z|)) (COND ((|bStreamNull| (CADR |z|)) (LIST '|nullstream|)) - (#0='T (CADR |z|)))) - (#0# (CONS (CAAR |z|) (|bAppend| (CDAR |z|) (CADR |z|)))))) + (T (CADR |z|)))) + (T (CONS (CAAR |z|) (|bAppend| (CDAR |z|) (CADR |z|)))))) (DEFUN |bNext| (|f| |s|) (|bDelay| #'|bNext1| (LIST |f| |s|))) @@ -192,8 +189,8 @@ (RETURN (COND ((|bStreamNull| |s|) (LIST '|nullstream|)) - ('T (SETQ |h| (APPLY |f| (LIST |s|))) - (|bAppend| (CAR |h|) (|bNext| |f| (CDR |h|)))))))) + (T (SETQ |h| (APPLY |f| (LIST |s|))) + (|bAppend| (CAR |h|) (|bNext| |f| (CDR |h|)))))))) (DEFUN |bRgen| (|s|) (|bDelay| #'|bRgen1| (LIST |s|))) @@ -204,7 +201,7 @@ (SETQ |a| (|shoeReadLine| (CAR |s|))) (COND ((|shoePLACEP| |a|) (LIST '|nullstream|)) - ('T (CONS |a| (|bRgen| (CAR |s|))))))))) + (T (CONS |a| (|bRgen| (CAR |s|))))))))) (DEFUN |bIgen| (|n|) (|bDelay| #'|bIgen1| (LIST |n|))) @@ -223,9 +220,8 @@ (COND ((|bStreamNull| |f1|) (LIST '|nullstream|)) ((|bStreamNull| |f2|) (LIST '|nullstream|)) - ('T - (CONS (CONS (CAR |f1|) (CAR |f2|)) - (|bAddLineNumber| (CDR |f1|) (CDR |f2|))))))))) + (T (CONS (CONS (CAR |f1|) (CAR |f2|)) + (|bAddLineNumber| (CDR |f1|) (CDR |f2|))))))))) (DEFUN |shoeFileInput| (|fn|) (|shoeFileMap| #'IDENTITY |fn|)) @@ -244,24 +240,23 @@ (RETURN (COND ((< (LENGTH |whole|) (LENGTH |prefix|)) NIL) - ('T (SETQ |good| T) - (LET ((|bfVar#1| (- (LENGTH |prefix|) 1)) (|i| 0) (|j| 0)) - (LOOP - (COND - ((OR (> |i| |bfVar#1|) (NOT |good|)) (RETURN NIL)) - ('T - (SETQ |good| - (EQUAL (ELT |prefix| |i|) (ELT |whole| |j|))))) - (SETQ |i| (+ |i| 1)) - (SETQ |j| (+ |j| 1)))) - (COND - (|good| (SUBSTRING |whole| (LENGTH |prefix|) NIL)) - ('T |good|))))))) + (T (SETQ |good| T) + (LET ((|bfVar#1| (- (LENGTH |prefix|) 1)) (|i| 0) (|j| 0)) + (LOOP + (COND + ((OR (> |i| |bfVar#1|) (NOT |good|)) (RETURN NIL)) + (T (SETQ |good| + (EQUAL (ELT |prefix| |i|) (ELT |whole| |j|))))) + (SETQ |i| (+ |i| 1)) + (SETQ |j| (+ |j| 1)))) + (COND + (|good| (SUBSTRING |whole| (LENGTH |prefix|) NIL)) + (T |good|))))))) (DEFUN |shoePlainLine?| (|s|) (COND ((EQL (LENGTH |s|) 0) T) - ('T (NOT (EQL (ELT |s| 0) (|char| '|)|)))))) + (T (NOT (EQL (ELT |s| 0) (|char| '|)|)))))) (DEFUN |shoeSay?| (|s|) (|shoePrefix?| ")say" |s|)) @@ -299,12 +294,11 @@ (SETQ |n| (STRPOSL " " |x| 0 T)) (COND ((NULL |n|) NIL) - (#0='T (SETQ |n1| (STRPOSL " " |x| |n| NIL)) - (COND - ((NULL |n1|) (LIST (SUBSTRING |x| |n| NIL) "")) - (#0# - (LIST (SUBSTRING |x| |n| (- |n1| |n|)) - (SUBSTRING |x| |n1| NIL)))))))))) + (T (SETQ |n1| (STRPOSL " " |x| |n| NIL)) + (COND + ((NULL |n1|) (LIST (SUBSTRING |x| |n| NIL) "")) + (T (LIST (SUBSTRING |x| |n| (- |n1| |n|)) + (SUBSTRING |x| |n1| NIL)))))))))) (DEFUN |shoeFileName| (|x|) (PROG (|c| |a|) @@ -313,10 +307,10 @@ (SETQ |a| (|shoeBiteOff| |x|)) (COND ((NULL |a|) "") - (#0='T (SETQ |c| (|shoeBiteOff| (CADR |a|))) - (COND - ((NULL |c|) (CAR |a|)) - (#0# (CONCAT (CAR |a|) "." (CAR |c|)))))))))) + (T (SETQ |c| (|shoeBiteOff| (CADR |a|))) + (COND + ((NULL |c|) (CAR |a|)) + (T (CONCAT (CAR |a|) "." (CAR |c|)))))))))) (DEFUN |shoeFnFileName| (|x|) (PROG (|c| |a|) @@ -325,10 +319,10 @@ (SETQ |a| (|shoeBiteOff| |x|)) (COND ((NULL |a|) (LIST "" "")) - (#0='T (SETQ |c| (|shoeFileName| (CADR |a|))) - (COND - ((NULL |c|) (LIST (CAR |a|) "")) - (#0# (LIST (CAR |a|) |c|))))))))) + (T (SETQ |c| (|shoeFileName| (CADR |a|))) + (COND + ((NULL |c|) (LIST (CAR |a|) "")) + (T (LIST (CAR |a|) |c|))))))))) (DEFUN |shoeFunctionFileInput| (|bfVar#2|) (PROG (|fn| |fun|) @@ -349,13 +343,13 @@ (RETURN (COND ((|bStreamNull| |s|) |s|) - (#0='T (SETQ |h| (CAR |s|)) (SETQ |t| (CDR |s|)) - (SETQ |string| (CAR |h|)) - (COND - ((SETQ |command| (|shoeFin?| |string|)) |$bStreamNil|) - ((SETQ |command| (|shoeIf?| |string|)) - (|shoeThen| (LIST T) (LIST (STTOMC |command|)) |t|)) - (#0# (|bAppend| (|shoeSimpleLine| |h|) (|shoeInclude| |t|))))))))) + (T (SETQ |h| (CAR |s|)) (SETQ |t| (CDR |s|)) + (SETQ |string| (CAR |h|)) + (COND + ((SETQ |command| (|shoeFin?| |string|)) |$bStreamNil|) + ((SETQ |command| (|shoeIf?| |string|)) + (|shoeThen| (LIST T) (LIST (STTOMC |command|)) |t|)) + (T (|bAppend| (|shoeSimpleLine| |h|) (|shoeInclude| |t|))))))))) (DEFUN |shoeSimpleLine| (|h|) (PROG (|command| |string|) @@ -379,7 +373,7 @@ (|shoeConsole| |command|) NIL) ((SETQ |command| (|shoeEval?| |string|)) (STTOMC |command|) NIL) - ('T (|shoeLineSyntaxError| |h|) NIL)))))) + (T (|shoeLineSyntaxError| |h|) NIL)))))) (DEFUN |shoeThen| (|keep| |b| |s|) (|bDelay| #'|shoeThen1| (LIST |keep| |b| |s|))) @@ -389,44 +383,42 @@ (RETURN (COND ((|bPremStreamNull| |s|) |s|) - (#0='T (SETQ |h| (CAR |s|)) (SETQ |t| (CDR |s|)) - (SETQ |string| (CAR |h|)) - (COND - ((SETQ |command| (|shoeFin?| |string|)) - (|bPremStreamNil| |h|)) - (#0# (SETQ |keep1| (CAR |keep|)) (SETQ |b1| (CAR |b|)) - (COND - ((SETQ |command| (|shoeIf?| |string|)) - (COND - ((AND |keep1| |b1|) - (|shoeThen| (CONS T |keep|) - (CONS (STTOMC |command|) |b|) |t|)) - (#0# - (|shoeThen| (CONS NIL |keep|) (CONS NIL |b|) |t|)))) - ((SETQ |command| (|shoeElseIf?| |string|)) - (COND - ((AND |keep1| (NOT |b1|)) - (|shoeThen| (CONS T (CDR |keep|)) - (CONS (STTOMC |command|) (CDR |b|)) |t|)) - (#0# - (|shoeThen| (CONS NIL (CDR |keep|)) - (CONS NIL (CDR |b|)) |t|)))) - ((SETQ |command| (|shoeElse?| |string|)) - (COND - ((AND |keep1| (NOT |b1|)) - (|shoeElse| (CONS T (CDR |keep|)) (CONS T (CDR |b|)) - |t|)) - (#0# - (|shoeElse| (CONS NIL (CDR |keep|)) - (CONS NIL (CDR |b|)) |t|)))) - ((SETQ |command| (|shoeEndIf?| |string|)) - (COND - ((NULL (CDR |b|)) (|shoeInclude| |t|)) - (#0# (|shoeThen| (CDR |keep|) (CDR |b|) |t|)))) - ((AND |keep1| |b1|) - (|bAppend| (|shoeSimpleLine| |h|) - (|shoeThen| |keep| |b| |t|))) - (#0# (|shoeThen| |keep| |b| |t|)))))))))) + (T (SETQ |h| (CAR |s|)) (SETQ |t| (CDR |s|)) + (SETQ |string| (CAR |h|)) + (COND + ((SETQ |command| (|shoeFin?| |string|)) + (|bPremStreamNil| |h|)) + (T (SETQ |keep1| (CAR |keep|)) (SETQ |b1| (CAR |b|)) + (COND + ((SETQ |command| (|shoeIf?| |string|)) + (COND + ((AND |keep1| |b1|) + (|shoeThen| (CONS T |keep|) + (CONS (STTOMC |command|) |b|) |t|)) + (T (|shoeThen| (CONS NIL |keep|) (CONS NIL |b|) + |t|)))) + ((SETQ |command| (|shoeElseIf?| |string|)) + (COND + ((AND |keep1| (NOT |b1|)) + (|shoeThen| (CONS T (CDR |keep|)) + (CONS (STTOMC |command|) (CDR |b|)) |t|)) + (T (|shoeThen| (CONS NIL (CDR |keep|)) + (CONS NIL (CDR |b|)) |t|)))) + ((SETQ |command| (|shoeElse?| |string|)) + (COND + ((AND |keep1| (NOT |b1|)) + (|shoeElse| (CONS T (CDR |keep|)) + (CONS T (CDR |b|)) |t|)) + (T (|shoeElse| (CONS NIL (CDR |keep|)) + (CONS NIL (CDR |b|)) |t|)))) + ((SETQ |command| (|shoeEndIf?| |string|)) + (COND + ((NULL (CDR |b|)) (|shoeInclude| |t|)) + (T (|shoeThen| (CDR |keep|) (CDR |b|) |t|)))) + ((AND |keep1| |b1|) + (|bAppend| (|shoeSimpleLine| |h|) + (|shoeThen| |keep| |b| |t|))) + (T (|shoeThen| |keep| |b| |t|)))))))))) (DEFUN |shoeElse| (|keep| |b| |s|) (|bDelay| #'|shoeElse1| (LIST |keep| |b| |s|))) @@ -436,28 +428,28 @@ (RETURN (COND ((|bPremStreamNull| |s|) |s|) - (#0='T (SETQ |h| (CAR |s|)) (SETQ |t| (CDR |s|)) - (SETQ |string| (CAR |h|)) - (COND - ((SETQ |command| (|shoeFin?| |string|)) - (|bPremStreamNil| |h|)) - (#0# (SETQ |b1| (CAR |b|)) (SETQ |keep1| (CAR |keep|)) - (COND - ((SETQ |command| (|shoeIf?| |string|)) - (COND - ((AND |keep1| |b1|) - (|shoeThen| (CONS T |keep|) - (CONS (STTOMC |command|) |b|) |t|)) - (#0# - (|shoeThen| (CONS NIL |keep|) (CONS NIL |b|) |t|)))) - ((SETQ |command| (|shoeEndIf?| |string|)) - (COND - ((NULL (CDR |b|)) (|shoeInclude| |t|)) - (#0# (|shoeThen| (CDR |keep|) (CDR |b|) |t|)))) - ((AND |keep1| |b1|) - (|bAppend| (|shoeSimpleLine| |h|) - (|shoeElse| |keep| |b| |t|))) - (#0# (|shoeElse| |keep| |b| |t|)))))))))) + (T (SETQ |h| (CAR |s|)) (SETQ |t| (CDR |s|)) + (SETQ |string| (CAR |h|)) + (COND + ((SETQ |command| (|shoeFin?| |string|)) + (|bPremStreamNil| |h|)) + (T (SETQ |b1| (CAR |b|)) (SETQ |keep1| (CAR |keep|)) + (COND + ((SETQ |command| (|shoeIf?| |string|)) + (COND + ((AND |keep1| |b1|) + (|shoeThen| (CONS T |keep|) + (CONS (STTOMC |command|) |b|) |t|)) + (T (|shoeThen| (CONS NIL |keep|) (CONS NIL |b|) + |t|)))) + ((SETQ |command| (|shoeEndIf?| |string|)) + (COND + ((NULL (CDR |b|)) (|shoeInclude| |t|)) + (T (|shoeThen| (CDR |keep|) (CDR |b|) |t|)))) + ((AND |keep1| |b1|) + (|bAppend| (|shoeSimpleLine| |h|) + (|shoeElse| |keep| |b| |t|))) + (T (|shoeElse| |keep| |b| |t|)))))))))) (DEFUN |shoeLineSyntaxError| (|h|) (PROGN @@ -480,5 +472,5 @@ (COND ((|bStreamNull| |s|) (|shoeConsole| "FILE TERMINATED BEFORE )endif") T) - ('T NIL))) + (T NIL))) diff --git a/src/boot/strap/parser.clisp b/src/boot/strap/parser.clisp index 44e1a285..ceb88b33 100644 --- a/src/boot/strap/parser.clisp +++ b/src/boot/strap/parser.clisp @@ -17,7 +17,7 @@ ((NULL |$inputStream|) (|shoeTokConstruct| 'ERROR 'NOMORE (|shoeTokPosn| |$stok|))) - ('T (CAR |$inputStream|)))) + (T (CAR |$inputStream|)))) (SETQ |$ttok| (|shoeTokPart| |$stok|)) T)) @@ -30,7 +30,7 @@ ((NULL |$inputStream|) (|shoeTokConstruct| 'ERROR 'NOMORE (|shoeTokPosn| |$stok|))) - ('T (CAR |$inputStream|)))) + (T (CAR |$inputStream|)))) (SETQ |$ttok| (|shoeTokPart| |$stok|)) (COND ((AND (< 0 |$bpParenCount|) (CONSP |$stok|) @@ -41,8 +41,8 @@ ((EQ |$ttok| 'BACKTAB) (SETQ |$bpCount| (- |$bpCount| 1)) (|bpNext|)) ((EQ |$ttok| 'BACKSET) (|bpNext|)) - (#0='T T))) - (#0# T)))) + (T T))) + (T T)))) (DEFUN |bpNext| () (DECLARE (SPECIAL |$inputStream|)) @@ -119,19 +119,18 @@ (|bpNextToken|) (COND ((EQL |$bpCount| 0) T) - (#0='T - (SETQ |$inputStream| - (APPEND (|bpAddTokens| |$bpCount|) - |$inputStream|)) - (|bpFirstToken|) - (COND - ((EQL |$bpParenCount| 0) (|bpCancel|) T) - (#0# T))))) + (T (SETQ |$inputStream| + (APPEND (|bpAddTokens| |$bpCount|) + |$inputStream|)) + (|bpFirstToken|) + (COND + ((EQL |$bpParenCount| 0) (|bpCancel|) T) + (T T))))) ((|bpEqPeek| 'CPAREN) (|bpPush| (|bfTuple| NIL)) (SETQ |$bpParenCount| (- |$bpParenCount| 1)) (|bpNextToken|) T) - (#1='T (|bpParenTrap| |a|)))) - (#1# NIL)))))) + (T (|bpParenTrap| |a|)))) + (T NIL)))))) (DEFUN |bpParenthesized| (|f|) (PROG (|a|) @@ -146,8 +145,8 @@ (OR (|bpEqKey| 'CPAREN) (|bpParenTrap| |a|))) T) ((|bpEqKey| 'CPAREN) (|bpPush| (|bfTuple| NIL)) T) - (#0='T (|bpParenTrap| |a|)))) - (#0# NIL)))))) + (T (|bpParenTrap| |a|)))) + (T NIL)))))) (DEFUN |bpBracket| (|f|) (PROG (|a|) @@ -162,8 +161,8 @@ (OR (|bpEqKey| 'CBRACK) (|bpBrackTrap| |a|))) (|bpPush| (|bfBracket| (|bpPop1|)))) ((|bpEqKey| 'CBRACK) (|bpPush| NIL)) - (#0='T (|bpBrackTrap| |a|)))) - (#0# NIL)))))) + (T (|bpBrackTrap| |a|)))) + (T NIL)))))) (DEFUN |bpPileBracketed| (|f|) (COND @@ -172,8 +171,8 @@ ((|bpEqKey| 'BACKTAB) T) ((AND (APPLY |f| NIL) (OR (|bpEqKey| 'BACKTAB) (|bpPileTrap|))) (|bpPush| (|bfPile| (|bpPop1|)))) - (#0='T NIL))) - (#0# NIL))) + (T NIL))) + (T NIL))) (DEFUN |bpListof| (|f| |str1| |g|) (PROG (|a|) @@ -189,13 +188,13 @@ ((NOT (AND (|bpEqKey| |str1|) (OR (APPLY |f| NIL) (|bpTrap|)))) (RETURN NIL)) - ('T 0))) + (T 0))) (SETQ |$stack| (CONS (NREVERSE |$stack|) |a|)) (|bpPush| (FUNCALL |g| (CONS (|bpPop3|) (CONS (|bpPop2|) (|bpPop1|)))))) - (#0='T T))) - (#0# NIL))))) + (T T))) + (T NIL))))) (DEFUN |bpListofFun| (|f| |h| |g|) (PROG (|a|) @@ -211,13 +210,13 @@ ((NOT (AND (APPLY |h| NIL) (OR (APPLY |f| NIL) (|bpTrap|)))) (RETURN NIL)) - ('T 0))) + (T 0))) (SETQ |$stack| (CONS (NREVERSE |$stack|) |a|)) (|bpPush| (FUNCALL |g| (CONS (|bpPop3|) (CONS (|bpPop2|) (|bpPop1|)))))) - (#0='T T))) - (#0# NIL))))) + (T T))) + (T NIL))))) (DEFUN |bpList| (|f| |str1|) (PROG (|a|) @@ -233,11 +232,11 @@ ((NOT (AND (|bpEqKey| |str1|) (OR (APPLY |f| NIL) (|bpTrap|)))) (RETURN NIL)) - ('T 0))) + (T 0))) (SETQ |$stack| (CONS (NREVERSE |$stack|) |a|)) (|bpPush| (CONS (|bpPop3|) (CONS (|bpPop2|) (|bpPop1|))))) - (#0='T (|bpPush| (LIST (|bpPop1|)))))) - (#0# (|bpPush| NIL)))))) + (T (|bpPush| (LIST (|bpPop1|)))))) + (T (|bpPush| NIL)))))) (DEFUN |bpOneOrMore| (|f|) (PROG (|a|) @@ -245,13 +244,13 @@ (RETURN (COND ((APPLY |f| NIL) (SETQ |a| |$stack|) (SETQ |$stack| NIL) - (LOOP (COND ((NOT (APPLY |f| NIL)) (RETURN NIL)) ('T 0))) + (LOOP (COND ((NOT (APPLY |f| NIL)) (RETURN NIL)) (T 0))) (SETQ |$stack| (CONS (NREVERSE |$stack|) |a|)) (|bpPush| (CONS (|bpPop2|) (|bpPop1|)))) - ('T NIL))))) + (T NIL))))) (DEFUN |bpAnyNo| (|s|) - (PROGN (LOOP (COND ((NOT (APPLY |s| NIL)) (RETURN NIL)) ('T 0))) T)) + (PROGN (LOOP (COND ((NOT (APPLY |s| NIL)) (RETURN NIL)) (T 0))) T)) (DEFUN |bpAndOr| (|keyword| |p| |f|) (AND (|bpEqKey| |keyword|) (OR (APPLY |p| NIL) (|bpTrap|)) @@ -267,11 +266,11 @@ ((|bpEqKey| 'THEN) (AND (OR (APPLY |f| NIL) (|bpTrap|)) (|bpElse| |f|) (|bpEqKey| 'BACKTAB))) - (#0='T (|bpMissing| 'THEN)))) + (T (|bpMissing| 'THEN)))) ((|bpEqKey| 'THEN) (AND (OR (APPLY |f| NIL) (|bpTrap|)) (|bpElse| |f|))) - (#0# (|bpMissing| '|then|)))) - (#0# NIL))) + (T (|bpMissing| '|then|)))) + (T NIL))) (DEFUN |bpElse| (|f|) (PROG (|a|) @@ -282,13 +281,13 @@ ((|bpBacksetElse|) (AND (OR (APPLY |f| NIL) (|bpTrap|)) (|bpPush| (|bfIf| (|bpPop3|) (|bpPop2|) (|bpPop1|))))) - ('T (|bpRestore| |a|) - (|bpPush| (|bfIfThenOnly| (|bpPop2|) (|bpPop1|))))))))) + (T (|bpRestore| |a|) + (|bpPush| (|bfIfThenOnly| (|bpPop2|) (|bpPop1|))))))))) (DEFUN |bpBacksetElse| () (COND ((|bpEqKey| 'BACKSET) (|bpEqKey| 'ELSE)) - ('T (|bpEqKey| 'ELSE)))) + (T (|bpEqKey| 'ELSE)))) (DEFUN |bpEqPeek| (|s|) (DECLARE (SPECIAL |$ttok| |$stok|)) @@ -350,25 +349,25 @@ (LOOP (COND (|done| (RETURN NIL)) - ('T - (PROGN - (SETQ |found| (CATCH 'TRAPPOINT (APPLY |f| NIL))) - (COND - ((EQ |found| 'TRAPPED) (SETQ |$inputStream| |c|) - (|bpRecoverTrap|)) - ((NOT |found|) (SETQ |$inputStream| |c|) - (|bpGeneralErrorHere|) (|bpRecoverTrap|))) - (COND - ((|bpEqKey| 'BACKSET) (SETQ |c| |$inputStream|)) - ((OR (|bpEqPeek| 'BACKTAB) (NULL |$inputStream|)) - (SETQ |done| T)) - (#0='T (SETQ |$inputStream| |c|) - (|bpGeneralErrorHere|) (|bpRecoverTrap|) - (COND - ((OR (|bpEqPeek| 'BACKTAB) (NULL |$inputStream|)) - (SETQ |done| T)) - (#0# (|bpNext|) (SETQ |c| |$inputStream|))))) - (SETQ |b| (CONS (|bpPop1|) |b|)))))) + (T (PROGN + (SETQ |found| (CATCH 'TRAPPOINT (APPLY |f| NIL))) + (COND + ((EQ |found| 'TRAPPED) (SETQ |$inputStream| |c|) + (|bpRecoverTrap|)) + ((NOT |found|) (SETQ |$inputStream| |c|) + (|bpGeneralErrorHere|) (|bpRecoverTrap|))) + (COND + ((|bpEqKey| 'BACKSET) (SETQ |c| |$inputStream|)) + ((OR (|bpEqPeek| 'BACKTAB) (NULL |$inputStream|)) + (SETQ |done| T)) + (T (SETQ |$inputStream| |c|) (|bpGeneralErrorHere|) + (|bpRecoverTrap|) + (COND + ((OR (|bpEqPeek| 'BACKTAB) + (NULL |$inputStream|)) + (SETQ |done| T)) + (T (|bpNext|) (SETQ |c| |$inputStream|))))) + (SETQ |b| (CONS (|bpPop1|) |b|)))))) (SETQ |$stack| |a|) (|bpPush| (NREVERSE |b|)))))) @@ -379,16 +378,16 @@ ((|bpEqPeek| 'BACKTAB) (COND ((EQL |n| 0) T) - (#0='T (|bpNextToken|) (SETQ |$bpCount| (- |$bpCount| 1)) - (|bpMoveTo| (- |n| 1))))) + (T (|bpNextToken|) (SETQ |$bpCount| (- |$bpCount| 1)) + (|bpMoveTo| (- |n| 1))))) ((|bpEqPeek| 'BACKSET) - (COND ((EQL |n| 0) T) (#0# (|bpNextToken|) (|bpMoveTo| |n|)))) + (COND ((EQL |n| 0) T) (T (|bpNextToken|) (|bpMoveTo| |n|)))) ((|bpEqPeek| 'SETTAB) (|bpNextToken|) (|bpMoveTo| (+ |n| 1))) ((|bpEqPeek| 'OPAREN) (|bpNextToken|) (SETQ |$bpParenCount| (+ |$bpParenCount| 1)) (|bpMoveTo| |n|)) ((|bpEqPeek| 'CPAREN) (|bpNextToken|) (SETQ |$bpParenCount| (- |$bpParenCount| 1)) (|bpMoveTo| |n|)) - (#0# (|bpNextToken|) (|bpMoveTo| |n|)))) + (T (|bpNextToken|) (|bpMoveTo| |n|)))) (DEFUN |bpQualifiedName| () (DECLARE (SPECIAL |$stok|)) @@ -396,14 +395,14 @@ ((|bpEqPeek| 'COLON-COLON) (|bpNext|) (AND (CONSP |$stok|) (EQ (CAR |$stok|) 'ID) (|bpPushId|) (|bpNext|) (|bpPush| (|bfColonColon| (|bpPop2|) (|bpPop1|))))) - ('T NIL))) + (T NIL))) (DEFUN |bpName| () (DECLARE (SPECIAL |$stok|)) (COND ((AND (CONSP |$stok|) (EQ (CAR |$stok|) 'ID)) (|bpPushId|) (|bpNext|) (|bpAnyNo| #'|bpQualifiedName|)) - ('T NIL))) + (T NIL))) (DEFUN |bpConstTok| () (DECLARE (SPECIAL |$ttok| |$stok|)) @@ -419,7 +418,7 @@ ((|bpEqPeek| 'QUOTE) (|bpNext|) (AND (OR (|bpSexp|) (|bpTrap|)) (|bpPush| (|bfSymbol| (|bpPop1|))))) - ('T (|bpString|)))) + (T (|bpString|)))) (DEFUN |bpExportItemTail| () (OR (AND (|bpEqKey| 'BEC) (OR (|bpAssign|) (|bpTrap|)) @@ -431,15 +430,15 @@ (RETURN (COND ((|bpEqPeek| 'STRUCTURE) (|bpStruct|)) - (#0='T (SETQ |a| (|bpState|)) - (COND - ((|bpName|) - (COND - ((|bpEqPeek| 'COLON) (|bpRestore| |a|) - (OR (|bpSignature|) (|bpTrap|)) - (OR (|bpExportItemTail|) T)) - (#0# (|bpRestore| |a|) (|bpTypeAliasDefition|)))) - (#0# NIL))))))) + (T (SETQ |a| (|bpState|)) + (COND + ((|bpName|) + (COND + ((|bpEqPeek| 'COLON) (|bpRestore| |a|) + (OR (|bpSignature|) (|bpTrap|)) + (OR (|bpExportItemTail|) T)) + (T (|bpRestore| |a|) (|bpTypeAliasDefition|)))) + (T NIL))))))) (DEFUN |bpExportItemList| () (|bpListAndRecover| #'|bpExportItem|)) @@ -455,7 +454,7 @@ ((|bpEqKey| 'WHERE) (AND (|bpExports|) (|bpPush| (|%Module| (|bpPop2|) (|bpPop1|))))) - ('T (|bpPush| (|%Module| (|bpPop1|) NIL))))))))) + (T (|bpPush| (|%Module| (|bpPop1|) NIL))))))))) (DEFUN |bpImport| () (PROG (|a|) @@ -469,8 +468,8 @@ (OR (|bpEqKey| 'FOR) (|bpTrap|)) (OR (|bpName|) (|bpTrap|)) (|bpPush| (|%ImportSignature| (|bpPop1|) (|bpPop1|))))) - (#0='T (|bpPush| (|%Import| (|bpPop1|)))))) - (#0# NIL))))) + (T (|bpPush| (|%Import| (|bpPop1|)))))) + (T NIL))))) (DEFUN |bpNamespace| () (AND (|bpEqKey| 'NAMESPACE) (|bpName|) @@ -490,7 +489,7 @@ (AND (|bpEqKey| 'ARROW) (OR (|bpApplication|) (|bpTrap|)) (|bpPush| (|%Mapping| (|bpPop1|) (|bfUntuple| (|bpPop1|))))) T) - ('T NIL))) + (T NIL))) (DEFUN |bpArgtypeList| () (|bpTuple| #'|bpApplication|)) @@ -511,10 +510,10 @@ ((|bpCancel|) (COND ((|bpEqKeyNextTok| 'BACKTAB) T) - (#0='T (|bpRestore| |a|) NIL))) + (T (|bpRestore| |a|) NIL))) ((|bpEqKeyNextTok| 'BACKTAB) T) - (#0# (|bpRestore| |a|) NIL))) - (#0# NIL)))))) + (T (|bpRestore| |a|) NIL))) + (T NIL)))))) (DEFUN |bpAddTokens| (|n|) (DECLARE (SPECIAL |$stok|)) @@ -523,9 +522,8 @@ ((< 0 |n|) (CONS (|shoeTokConstruct| 'KEY 'SETTAB (|shoeTokPosn| |$stok|)) (|bpAddTokens| (- |n| 1)))) - ('T - (CONS (|shoeTokConstruct| 'KEY 'BACKTAB (|shoeTokPosn| |$stok|)) - (|bpAddTokens| (+ |n| 1)))))) + (T (CONS (|shoeTokConstruct| 'KEY 'BACKTAB (|shoeTokPosn| |$stok|)) + (|bpAddTokens| (+ |n| 1)))))) (DEFUN |bpExceptions| () (OR (|bpEqPeek| 'DOT) (|bpEqPeek| 'QUOTE) (|bpEqPeek| 'OPAREN) @@ -542,8 +540,8 @@ (SETQ |a| (GET |$ttok| 'SHOEINF)) (COND ((NULL |a|) (AND (|bpPush| |$ttok|) (|bpNext|))) - (#0='T (AND (|bpPush| |a|) (|bpNext|))))) - (#0# NIL))))) + (T (AND (|bpPush| |a|) (|bpNext|))))) + (T NIL))))) (DEFUN |bpAnyId| () (DECLARE (SPECIAL |$ttok| |$stok|)) @@ -640,12 +638,11 @@ ((NOT (AND (|bpInfGeneric| |o|) (OR (|bpRightAssoc| |o| |p|) (|bpTrap|)))) (RETURN NIL)) - ('T - (|bpPush| - (|bfInfApplication| (|bpPop2|) (|bpPop2|) - (|bpPop1|)))))) + (T (|bpPush| + (|bfInfApplication| (|bpPop2|) (|bpPop2|) + (|bpPop1|)))))) T) - ('T (|bpRestore| |a|) NIL)))))) + (T (|bpRestore| |a|) NIL)))))) (DEFUN |bpLeftAssoc| (|operations| |parser|) (COND @@ -655,11 +652,10 @@ ((NOT (AND (|bpInfGeneric| |operations|) (OR (APPLY |parser| NIL) (|bpTrap|)))) (RETURN NIL)) - ('T - (|bpPush| - (|bfInfApplication| (|bpPop2|) (|bpPop2|) (|bpPop1|)))))) + (T (|bpPush| + (|bfInfApplication| (|bpPop2|) (|bpPop2|) (|bpPop1|)))))) T) - ('T NIL))) + (T NIL))) (DEFUN |bpString| () (DECLARE (SPECIAL |$ttok| |$stok|)) @@ -672,7 +668,7 @@ ((AND (CONSP |$stok|) (EQ (CAR |$stok|) 'ID) (GET |$ttok| 'SHOETHETA)) (|bpPushId|) (|bpNext|)) - ('T NIL))) + (T NIL))) (DEFUN |bpReduceOperator| () (OR (|bpInfixOperator|) (|bpString|) (|bpThetaName|))) @@ -688,10 +684,9 @@ ((|bpEqPeek| 'OBRACK) (AND (OR (|bpDConstruct|) (|bpTrap|)) (|bpPush| (|bfReduceCollect| (|bpPop2|) (|bpPop1|))))) - ('T - (AND (OR (|bpApplication|) (|bpTrap|)) - (|bpPush| (|bfReduce| (|bpPop2|) (|bpPop1|))))))) - ('T (|bpRestore| |a|) NIL)))))) + (T (AND (OR (|bpApplication|) (|bpTrap|)) + (|bpPush| (|bfReduce| (|bpPop2|) (|bpPop1|))))))) + (T (|bpRestore| |a|) NIL)))))) (DEFUN |bpTimes| () (OR (|bpReduce|) (|bpLeftAssoc| '(TIMES SLASH) #'|bpExpt|))) @@ -833,8 +828,8 @@ (COND ((|bpEqPeek| 'BEC) (|bpRestore| |a|) (OR (|bpAssignment|) (|bpTrap|))) - (#0='T T))) - (#0# (|bpRestore| |a|) NIL)))))) + (T T))) + (T (|bpRestore| |a|) NIL)))))) (DEFUN |bpAssignment| () (AND (|bpAssignVariable|) (|bpEqKey| 'BEC) @@ -859,8 +854,8 @@ ((|bpEqPeek| 'TDEF) (|bpRestore| |a|) (|bpTypeAliasDefition|)) ((|bpEqPeek| 'MDEF) (|bpRestore| |a|) (|bpMdef|)) - (#0='T T))) - (#0# (|bpRestore| |a|) NIL)))))) + (T T))) + (T (|bpRestore| |a|) NIL)))))) (DEFUN |bpStoreName| () (DECLARE (SPECIAL |$typings| |$wheredefs| |$op| |$stack|)) @@ -905,13 +900,13 @@ (SETQ |a| (|bpState|)) (COND ((|bpDDef|) T) - (#0='T (|bpRestore| |a|) - (COND - ((|bpBDefinitionPileItems|) T) - (#0# (|bpRestore| |a|) - (COND - ((|bpPDefinitionItems|) T) - (#0# (|bpRestore| |a|) (|bpWhere|))))))))))) + (T (|bpRestore| |a|) + (COND + ((|bpBDefinitionPileItems|) T) + (T (|bpRestore| |a|) + (COND + ((|bpPDefinitionItems|) T) + (T (|bpRestore| |a|) (|bpWhere|))))))))))) (DEFUN |bpDefinitionPileItems| () (AND (|bpListAndRecover| #'|bpDefinitionItem|) @@ -1014,9 +1009,9 @@ (|bpTrap|)) NIL)))) (RETURN NIL)) - ('T (|bpPush| (APPEND (|bpPop2|) (|bpPop1|)))))) + (T (|bpPush| (APPEND (|bpPop2|) (|bpPop1|)))))) T) - ('T (|bpPatternTail|)))) + (T (|bpPatternTail|)))) (DEFUN |bpPatternTail| () (AND (|bpPatternColon|) @@ -1065,10 +1060,10 @@ (|bpTrap|)) NIL)))) (RETURN NIL)) - ('T (|bpPush| (APPEND (|bpPop2|) (|bpPop1|)))))) + (T (|bpPush| (APPEND (|bpPop2|) (|bpPop1|)))))) T) - ('T - (AND (|bpColonName|) (|bpPush| (|bfColonAppend| NIL (|bpPop1|))))))) + (T (AND (|bpColonName|) + (|bpPush| (|bfColonAppend| NIL (|bpPop1|))))))) (DEFUN |bpVariable| () (OR (AND (|bpParenthesized| #'|bpBoundVariablelist|) @@ -1092,7 +1087,7 @@ (RETURN (PROGN (SETQ |a| (|bpPop1|)) - (COND ((NULL |a|) (|bpTrap|)) ('T (|bpPush| |a|))))))) + (COND ((NULL |a|) (|bpTrap|)) (T (|bpPush| |a|))))))) (DEFUN |bpStruct| () (AND (|bpEqKey| 'STRUCTURE) (OR (|bpName|) (|bpTrap|)) @@ -1162,6 +1157,6 @@ (IDENTP |l|)) (COND (|$InteractiveMode| (LIST (LIST 'SETQ |l| |r|))) - (#0='T (LIST (LIST 'DEFPARAMETER |l| |r|))))) - (#0# (|translateToplevel| |b| NIL)))))))) + (T (LIST (LIST 'DEFPARAMETER |l| |r|))))) + (T (|translateToplevel| |b| NIL)))))))) diff --git a/src/boot/strap/pile.clisp b/src/boot/strap/pile.clisp index 79b45cc0..934e6728 100644 --- a/src/boot/strap/pile.clisp +++ b/src/boot/strap/pile.clisp @@ -18,36 +18,36 @@ (RETURN (COND ((|bStreamNull| |s|) (CONS NIL |s|)) - (#0='T (SETQ |toktype| (|shoeTokType| (CAAAR |s|))) - (COND - ((OR (EQ |toktype| 'LISP) (EQ |toktype| 'LINE)) - (CONS (LIST (CAR |s|)) (CDR |s|))) - (#0# (SETQ |a| (|shoePileTree| (- 1) |s|)) - (CONS (LIST (ELT |a| 2)) (ELT |a| 3))))))))) + (T (SETQ |toktype| (|shoeTokType| (CAAAR |s|))) + (COND + ((OR (EQ |toktype| 'LISP) (EQ |toktype| 'LINE)) + (CONS (LIST (CAR |s|)) (CDR |s|))) + (T (SETQ |a| (|shoePileTree| (- 1) |s|)) + (CONS (LIST (ELT |a| 2)) (ELT |a| 3))))))))) (DEFUN |shoePileTree| (|n| |s|) (PROG (|hh| |t| |h| |LETTMP#1|) (RETURN (COND ((|bStreamNull| |s|) (LIST NIL |n| NIL |s|)) - (#0='T (SETQ |LETTMP#1| (LIST (CAR |s|) (CDR |s|))) - (SETQ |h| (CAR |LETTMP#1|)) (SETQ |t| (CADR |LETTMP#1|)) - (SETQ |hh| (|shoePileColumn| |h|)) - (COND - ((< |n| |hh|) (|shoePileForests| |h| |hh| |t|)) - (#0# (LIST NIL |n| NIL |s|)))))))) + (T (SETQ |LETTMP#1| (LIST (CAR |s|) (CDR |s|))) + (SETQ |h| (CAR |LETTMP#1|)) (SETQ |t| (CADR |LETTMP#1|)) + (SETQ |hh| (|shoePileColumn| |h|)) + (COND + ((< |n| |hh|) (|shoePileForests| |h| |hh| |t|)) + (T (LIST NIL |n| NIL |s|)))))))) (DEFUN |eqshoePileTree| (|n| |s|) (PROG (|hh| |t| |h| |LETTMP#1|) (RETURN (COND ((|bStreamNull| |s|) (LIST NIL |n| NIL |s|)) - (#0='T (SETQ |LETTMP#1| (LIST (CAR |s|) (CDR |s|))) - (SETQ |h| (CAR |LETTMP#1|)) (SETQ |t| (CADR |LETTMP#1|)) - (SETQ |hh| (|shoePileColumn| |h|)) - (COND - ((EQUAL |hh| |n|) (|shoePileForests| |h| |hh| |t|)) - (#0# (LIST NIL |n| NIL |s|)))))))) + (T (SETQ |LETTMP#1| (LIST (CAR |s|) (CDR |s|))) + (SETQ |h| (CAR |LETTMP#1|)) (SETQ |t| (CADR |LETTMP#1|)) + (SETQ |hh| (|shoePileColumn| |h|)) + (COND + ((EQUAL |hh| |n|) (|shoePileForests| |h| |hh| |t|)) + (T (LIST NIL |n| NIL |s|)))))))) (DEFUN |shoePileForest| (|n| |s|) (PROG (|t1| |h1| |t| |h| |hh| |b| |LETTMP#1|) @@ -63,7 +63,7 @@ (SETQ |h1| (CAR |LETTMP#1|)) (SETQ |t1| (CADR |LETTMP#1|)) (LIST (CONS |h| |h1|) |t1|)) - ('T (LIST NIL |s|))))))) + (T (LIST NIL |s|))))))) (DEFUN |shoePileForest1| (|n| |s|) (PROG (|t1| |h1| |t| |h| |n1| |b| |LETTMP#1|) @@ -79,7 +79,7 @@ (SETQ |h1| (CAR |LETTMP#1|)) (SETQ |t1| (CADR |LETTMP#1|)) (LIST (CONS |h| |h1|) |t1|)) - ('T (LIST NIL |s|))))))) + (T (LIST NIL |s|))))))) (DEFUN |shoePileForests| (|h| |n| |s|) (PROG (|t1| |h1| |LETTMP#1|) @@ -90,7 +90,7 @@ (SETQ |t1| (CADR |LETTMP#1|)) (COND ((|bStreamNull| |h1|) (LIST T |n| |h| |s|)) - ('T (|shoePileForests| (|shoePileCtree| |h| |h1|) |n| |t1|))))))) + (T (|shoePileForests| (|shoePileCtree| |h| |h1|) |n| |t1|))))))) (DEFUN |shoePileCtree| (|x| |y|) (|dqAppend| |x| (|shoePileCforest| |y|))) @@ -101,29 +101,29 @@ (COND ((NULL |x|) NIL) ((NULL (CDR |x|)) (CAR |x|)) - (#0='T (SETQ |a| (CAR |x|)) - (SETQ |b| (|shoePileCoagulate| |a| (CDR |x|))) - (COND - ((NULL (CDR |b|)) (CAR |b|)) - (#0# (|shoeEnPile| (|shoeSeparatePiles| |b|))))))))) + (T (SETQ |a| (CAR |x|)) + (SETQ |b| (|shoePileCoagulate| |a| (CDR |x|))) + (COND + ((NULL (CDR |b|)) (CAR |b|)) + (T (|shoeEnPile| (|shoeSeparatePiles| |b|))))))))) (DEFUN |shoePileCoagulate| (|a| |b|) (PROG (|e| |d| |c|) (RETURN (COND ((NULL |b|) (LIST |a|)) - (#0='T (SETQ |c| (CAR |b|)) - (COND - ((OR (EQ (|shoeTokPart| (CAAR |c|)) 'THEN) - (EQ (|shoeTokPart| (CAAR |c|)) 'ELSE)) - (|shoePileCoagulate| (|dqAppend| |a| |c|) (CDR |b|))) - (#0# (SETQ |d| (CADR |a|)) (SETQ |e| (|shoeTokPart| |d|)) - (COND - ((AND (CONSP |d|) (EQ (CAR |d|) 'KEY) - (OR (GET |e| 'SHOEINF) (EQ |e| 'COMMA) - (EQ |e| 'SEMICOLON))) - (|shoePileCoagulate| (|dqAppend| |a| |c|) (CDR |b|))) - (#0# (CONS |a| (|shoePileCoagulate| |c| (CDR |b|)))))))))))) + (T (SETQ |c| (CAR |b|)) + (COND + ((OR (EQ (|shoeTokPart| (CAAR |c|)) 'THEN) + (EQ (|shoeTokPart| (CAAR |c|)) 'ELSE)) + (|shoePileCoagulate| (|dqAppend| |a| |c|) (CDR |b|))) + (T (SETQ |d| (CADR |a|)) (SETQ |e| (|shoeTokPart| |d|)) + (COND + ((AND (CONSP |d|) (EQ (CAR |d|) 'KEY) + (OR (GET |e| 'SHOEINF) (EQ |e| 'COMMA) + (EQ |e| 'SEMICOLON))) + (|shoePileCoagulate| (|dqAppend| |a| |c|) (CDR |b|))) + (T (CONS |a| (|shoePileCoagulate| |c| (CDR |b|)))))))))))) (DEFUN |shoeSeparatePiles| (|x|) (PROG (|semicolon| |a|) @@ -131,13 +131,13 @@ (COND ((NULL |x|) NIL) ((NULL (CDR |x|)) (CAR |x|)) - ('T (SETQ |a| (CAR |x|)) - (SETQ |semicolon| - (|dqUnit| - (|shoeTokConstruct| 'KEY 'BACKSET - (|shoeLastTokPosn| |a|)))) - (|dqConcat| - (LIST |a| |semicolon| (|shoeSeparatePiles| (CDR |x|))))))))) + (T (SETQ |a| (CAR |x|)) + (SETQ |semicolon| + (|dqUnit| + (|shoeTokConstruct| 'KEY 'BACKSET + (|shoeLastTokPosn| |a|)))) + (|dqConcat| + (LIST |a| |semicolon| (|shoeSeparatePiles| (CDR |x|))))))))) (DEFUN |shoeEnPile| (|x|) (|dqConcat| diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp index 21722a2a..6aa88c61 100644 --- a/src/boot/strap/scanner.clisp +++ b/src/boot/strap/scanner.clisp @@ -16,15 +16,15 @@ (COND ((NULL |x|) |y|) ((NULL |y|) |x|) - ('T (RPLACD (CDR |x|) (CAR |y|)) (RPLACD |x| (CDR |y|)) |x|))) + (T (RPLACD (CDR |x|) (CAR |y|)) (RPLACD |x| (CDR |y|)) |x|))) (DEFUN |dqConcat| (|ld|) (COND ((NULL |ld|) NIL) ((NULL (CDR |ld|)) (CAR |ld|)) - ('T (|dqAppend| (CAR |ld|) (|dqConcat| (CDR |ld|)))))) + (T (|dqAppend| (CAR |ld|) (|dqConcat| (CDR |ld|)))))) -(DEFUN |dqToList| (|s|) (COND ((NULL |s|) NIL) ('T (CAR |s|)))) +(DEFUN |dqToList| (|s|) (COND ((NULL |s|) NIL) (T (CAR |s|)))) (DEFUN |shoeConstructToken| (|ln| |lp| |b| |n|) (CONS (ELT |b| 0) (CONS (ELT |b| 1) (CONS |lp| |n|)))) @@ -43,19 +43,19 @@ (RETURN (COND ((|bStreamNull| |s|) NIL) - ('T (SETQ |$linepos| |s|) (SETQ |$f| (CAR |s|)) - (SETQ |$r| (CDR |s|)) (SETQ |$ln| (CAR |$f|)) - (SETQ |$n| (STRPOSL " " |$ln| 0 T)) - (SETQ |$sz| (LENGTH |$ln|)) - (COND - ((NULL |$n|) T) - ((EQUAL (QENUM |$ln| |$n|) |shoeTAB|) - (SETQ |a| (MAKE-FULL-CVEC (- 7 (REM |$n| 8)) " ")) - (SETF (ELT |$ln| |$n|) (ELT " " 0)) - (SETQ |$ln| (CONCAT |a| |$ln|)) - (SETQ |s1| (CONS (CONS |$ln| (CDR |$f|)) |$r|)) - (|shoeNextLine| |s1|)) - ('T T))))))) + (T (SETQ |$linepos| |s|) (SETQ |$f| (CAR |s|)) + (SETQ |$r| (CDR |s|)) (SETQ |$ln| (CAR |$f|)) + (SETQ |$n| (STRPOSL " " |$ln| 0 T)) + (SETQ |$sz| (LENGTH |$ln|)) + (COND + ((NULL |$n|) T) + ((EQUAL (QENUM |$ln| |$n|) |shoeTAB|) + (SETQ |a| (MAKE-FULL-CVEC (- 7 (REM |$n| 8)) " ")) + (SETF (ELT |$ln| |$n|) (ELT " " 0)) + (SETQ |$ln| (CONCAT |a| |$ln|)) + (SETQ |s1| (CONS (CONS |$ln| (CDR |$f|)) |$r|)) + (|shoeNextLine| |s1|)) + (T T))))))) (DEFUN |shoeLineToks| (|s|) (PROG (|$linepos| |$floatok| |$sz| |$n| |$ln| |$r| |$f| |toks| |a| @@ -73,34 +73,35 @@ (COND ((NOT (|shoeNextLine| |s|)) (CONS NIL NIL)) ((NULL |$n|) (|shoeLineToks| |$r|)) - (#0='T (SETQ |fst| (QENUM |$ln| 0)) - (COND - ((EQL |fst| |shoeCLOSEPAREN|) - (COND - ((SETQ |command| (|shoeLine?| |$ln|)) - (SETQ |dq| - (|dqUnit| - (|shoeConstructToken| |$ln| |$linepos| - (|shoeLeafLine| |command|) 0))) - (CONS (LIST |dq|) |$r|)) - ((SETQ |command| (|shoeLisp?| |$ln|)) - (|shoeLispToken| |$r| |command|)) - ((SETQ |command| (|shoePackage?| |$ln|)) - (SETQ |a| (CONCAT "(IN-PACKAGE " |command| ")")) - (SETQ |dq| - (|dqUnit| - (|shoeConstructToken| |$ln| |$linepos| - (|shoeLeafLisp| |a|) 0))) - (CONS (LIST |dq|) |$r|)) - (#0# (|shoeLineToks| |$r|)))) - (#0# (SETQ |toks| NIL) - (LOOP + (T (SETQ |fst| (QENUM |$ln| 0)) + (COND + ((EQL |fst| |shoeCLOSEPAREN|) (COND - ((NOT (< |$n| |$sz|)) (RETURN NIL)) - ('T (SETQ |toks| (|dqAppend| |toks| (|shoeToken|)))))) - (COND - ((NULL |toks|) (|shoeLineToks| |$r|)) - (#0# (CONS (LIST |toks|) |$r|))))))))))) + ((SETQ |command| (|shoeLine?| |$ln|)) + (SETQ |dq| + (|dqUnit| + (|shoeConstructToken| |$ln| |$linepos| + (|shoeLeafLine| |command|) 0))) + (CONS (LIST |dq|) |$r|)) + ((SETQ |command| (|shoeLisp?| |$ln|)) + (|shoeLispToken| |$r| |command|)) + ((SETQ |command| (|shoePackage?| |$ln|)) + (SETQ |a| (CONCAT "(IN-PACKAGE " |command| ")")) + (SETQ |dq| + (|dqUnit| + (|shoeConstructToken| |$ln| |$linepos| + (|shoeLeafLisp| |a|) 0))) + (CONS (LIST |dq|) |$r|)) + (T (|shoeLineToks| |$r|)))) + (T (SETQ |toks| NIL) + (LOOP + (COND + ((NOT (< |$n| |$sz|)) (RETURN NIL)) + (T (SETQ |toks| + (|dqAppend| |toks| (|shoeToken|)))))) + (COND + ((NULL |toks|) (|shoeLineToks| |$r|)) + (T (CONS (LIST |toks|) |$r|))))))))))) (DEFUN |shoeLispToken| (|s| |string|) (PROG (|dq| |st| |r| |LETTMP#1| |linepos| |ln|) @@ -112,7 +113,7 @@ ((OR (EQL (LENGTH |string|) 0) (EQL (QENUM |string| 0) (QENUM ";" 0))) "") - ('T |string|))) + (T |string|))) (SETQ |ln| |$ln|) (SETQ |linepos| |$linepos|) (SETQ |LETTMP#1| (|shoeAccumulateLines| |s| |string|)) @@ -132,25 +133,25 @@ ((NOT (|shoeNextLine| |s|)) (CONS |s| |string|)) ((NULL |$n|) (|shoeAccumulateLines| |$r| |string|)) ((EQL (LENGTH |$ln|) 0) (|shoeAccumulateLines| |$r| |string|)) - (#0='T (SETQ |fst| (QENUM |$ln| 0)) - (COND - ((EQL |fst| |shoeCLOSEPAREN|) - (SETQ |command| (|shoeLisp?| |$ln|)) - (COND - ((AND |command| (< 0 (LENGTH |command|))) - (COND - ((EQL (QENUM |command| 0) (QENUM ";" 0)) - (|shoeAccumulateLines| |$r| |string|)) - (#0# (SETQ |a| (STRPOS ";" |command| 0 NIL)) - (COND - (|a| (|shoeAccumulateLines| |$r| - (CONCAT |string| - (SUBSTRING |command| 0 (- |a| 1))))) - (#0# - (|shoeAccumulateLines| |$r| - (CONCAT |string| |command|))))))) - (#0# (|shoeAccumulateLines| |$r| |string|)))) - (#0# (CONS |s| |string|)))))))) + (T (SETQ |fst| (QENUM |$ln| 0)) + (COND + ((EQL |fst| |shoeCLOSEPAREN|) + (SETQ |command| (|shoeLisp?| |$ln|)) + (COND + ((AND |command| (< 0 (LENGTH |command|))) + (COND + ((EQL (QENUM |command| 0) (QENUM ";" 0)) + (|shoeAccumulateLines| |$r| |string|)) + (T (SETQ |a| (STRPOS ";" |command| 0 NIL)) + (COND + (|a| (|shoeAccumulateLines| |$r| + (CONCAT |string| + (SUBSTRING |command| 0 + (- |a| 1))))) + (T (|shoeAccumulateLines| |$r| + (CONCAT |string| |command|))))))) + (T (|shoeAccumulateLines| |$r| |string|)))) + (T (CONS |s| |string|)))))))) (DEFUN |shoeCloser| (|t|) (MEMBER (|shoeKeyWord| |t|) '(CPAREN CBRACK))) @@ -177,11 +178,10 @@ ((|shoeDigit| |ch|) (|shoeNumber|)) ((EQUAL |c| |shoeESCAPE|) (|shoeEscape|)) ((EQUAL |c| |shoeTAB|) (SETQ |$n| (+ |$n| 1)) NIL) - (#0='T (|shoeError|)))) + (T (|shoeError|)))) (COND ((NULL |b|) NIL) - (#0# - (|dqUnit| (|shoeConstructToken| |ln| |linepos| |b| |n|)))))))) + (T (|dqUnit| (|shoeConstructToken| |ln| |linepos| |b| |n|)))))))) (DEFUN |shoeLeafId| (|x|) (LIST 'ID (INTERN |x|))) @@ -225,17 +225,17 @@ ((NOT (< |$n| |$sz|)) (|SoftShoeError| (CONS |$linepos| |$n|) "lisp escape error") (|shoeLeafError| (ELT |$ln| |$n|))) - ('T (SETQ |a| (|shoeReadLispString| |$ln| |$n|)) - (COND - ((NULL |a|) - (|SoftShoeError| (CONS |$linepos| |$n|) - "lisp escape error") - (|shoeLeafError| (ELT |$ln| |$n|))) - (#0='T (SETQ |exp| (CAR |a|)) (SETQ |n| (CADR |a|)) - (COND - ((NULL |n|) (SETQ |$n| |$sz|) - (|shoeLeafLispExp| |exp|)) - (#0# (SETQ |$n| |n|) (|shoeLeafLispExp| |exp|))))))))))) + (T (SETQ |a| (|shoeReadLispString| |$ln| |$n|)) + (COND + ((NULL |a|) + (|SoftShoeError| (CONS |$linepos| |$n|) + "lisp escape error") + (|shoeLeafError| (ELT |$ln| |$n|))) + (T (SETQ |exp| (CAR |a|)) (SETQ |n| (CADR |a|)) + (COND + ((NULL |n|) (SETQ |$n| |$sz|) + (|shoeLeafLispExp| |exp|)) + (T (SETQ |$n| |n|) (|shoeLeafLispExp| |exp|))))))))))) (DEFUN |shoeEscape| () (PROG (|a|) @@ -244,7 +244,7 @@ (PROGN (SETQ |$n| (+ |$n| 1)) (SETQ |a| (|shoeEsc|)) - (COND (|a| (|shoeWord| T)) ('T NIL)))))) + (COND (|a| (|shoeWord| T)) (T NIL)))))) (DEFUN |shoeEsc| () (PROG (|n1|) @@ -255,16 +255,16 @@ (COND ((|shoeNextLine| |$r|) (LOOP - (COND (|$n| (RETURN NIL)) (#0='T (|shoeNextLine| |$r|)))) - (|shoeEsc|) NIL) - (#1='T NIL))) - (#1# (SETQ |n1| (STRPOSL " " |$ln| |$n| T)) - (COND - ((NULL |n1|) (|shoeNextLine| |$r|) - (LOOP - (COND (|$n| (RETURN NIL)) (#0# (|shoeNextLine| |$r|)))) + (COND (|$n| (RETURN NIL)) (T (|shoeNextLine| |$r|)))) (|shoeEsc|) NIL) - (#1# T))))))) + (T NIL))) + (T (SETQ |n1| (STRPOSL " " |$ln| |$n| T)) + (COND + ((NULL |n1|) (|shoeNextLine| |$r|) + (LOOP + (COND (|$n| (RETURN NIL)) (T (|shoeNextLine| |$r|)))) + (|shoeEsc|) NIL) + (T T))))))) (DEFUN |shoeStartsComment| () (PROG (|www|) @@ -277,9 +277,9 @@ (SETQ |www| (+ |$n| 1)) (COND ((NOT (< |www| |$sz|)) NIL) - (#0='T (EQUAL (QENUM |$ln| |www|) |shoePLUSCOMMENT|)))) - (#0# NIL))) - (#0# NIL))))) + (T (EQUAL (QENUM |$ln| |www|) |shoePLUSCOMMENT|)))) + (T NIL))) + (T NIL))))) (DEFUN |shoeStartsNegComment| () (PROG (|www|) @@ -292,9 +292,9 @@ (SETQ |www| (+ |$n| 1)) (COND ((NOT (< |www| |$sz|)) NIL) - (#0='T (EQUAL (QENUM |$ln| |www|) |shoeMINUSCOMMENT|)))) - (#0# NIL))) - (#0# NIL))))) + (T (EQUAL (QENUM |$ln| |www|) |shoeMINUSCOMMENT|)))) + (T NIL))) + (T NIL))))) (DEFUN |shoeNegComment| () (PROG (|n|) @@ -327,18 +327,15 @@ (DECLARE (SPECIAL |$floatok|)) (COND ((EQ (|shoeKeyWord| |w|) 'DOT) - (COND - (|$floatok| (|shoePossFloat| |w|)) - (#0='T (|shoeLeafKey| |w|)))) - (#0# (SETQ |$floatok| (NOT (|shoeCloser| |w|))) - (|shoeLeafKey| |w|)))) + (COND (|$floatok| (|shoePossFloat| |w|)) (T (|shoeLeafKey| |w|)))) + (T (SETQ |$floatok| (NOT (|shoeCloser| |w|))) (|shoeLeafKey| |w|)))) (DEFUN |shoePossFloat| (|w|) (DECLARE (SPECIAL |$ln| |$sz| |$n|)) (COND ((OR (NOT (< |$n| |$sz|)) (NOT (|shoeDigit| (ELT |$ln| |$n|)))) (|shoeLeafKey| |w|)) - ('T (SETQ |w| (|shoeInteger|)) (|shoeExponent| "0" |w|)))) + (T (SETQ |w| (|shoeInteger|)) (|shoeExponent| "0" |w|)))) (DEFUN |shoeSpace| () (PROG (|n|) @@ -350,7 +347,7 @@ (SETQ |$floatok| T) (COND ((NULL |$n|) (|shoeLeafSpaces| 0) (SETQ |$n| (LENGTH |$ln|))) - ('T (|shoeLeafSpaces| (- |$n| |n|)))))))) + (T (|shoeLeafSpaces| (- |$n| |n|)))))))) (DEFUN |shoeString| () (DECLARE (SPECIAL |$floatok| |$n|)) @@ -366,24 +363,25 @@ (COND ((NOT (< |$n| |$sz|)) (|SoftShoeError| (CONS |$linepos| |$n|) "quote added") "") - (#0='T (SETQ |n| |$n|) - (SETQ |strsym| (OR (STRPOS "\"" |$ln| |$n| NIL) |$sz|)) - (SETQ |escsym| (OR (STRPOS "_" |$ln| |$n| NIL) |$sz|)) - (SETQ |mn| (MIN |strsym| |escsym|)) - (COND - ((EQUAL |mn| |$sz|) (SETQ |$n| |$sz|) - (|SoftShoeError| (CONS |$linepos| |$n|) "quote added") - (SUBSTRING |$ln| |n| NIL)) - ((EQUAL |mn| |strsym|) (SETQ |$n| (+ |mn| 1)) - (SUBSTRING |$ln| |n| (- |mn| |n|))) - (#0# (SETQ |str| (SUBSTRING |$ln| |n| (- |mn| |n|))) - (SETQ |$n| (+ |mn| 1)) (SETQ |a| (|shoeEsc|)) - (SETQ |b| - (COND - (|a| (SETQ |str| (CONCAT |str| (ELT |$ln| |$n|))) - (SETQ |$n| (+ |$n| 1)) (|shoeS|)) - (#0# (|shoeS|)))) - (CONCAT |str| |b|)))))))) + (T (SETQ |n| |$n|) + (SETQ |strsym| (OR (STRPOS "\"" |$ln| |$n| NIL) |$sz|)) + (SETQ |escsym| (OR (STRPOS "_" |$ln| |$n| NIL) |$sz|)) + (SETQ |mn| (MIN |strsym| |escsym|)) + (COND + ((EQUAL |mn| |$sz|) (SETQ |$n| |$sz|) + (|SoftShoeError| (CONS |$linepos| |$n|) "quote added") + (SUBSTRING |$ln| |n| NIL)) + ((EQUAL |mn| |strsym|) (SETQ |$n| (+ |mn| 1)) + (SUBSTRING |$ln| |n| (- |mn| |n|))) + (T (SETQ |str| (SUBSTRING |$ln| |n| (- |mn| |n|))) + (SETQ |$n| (+ |mn| 1)) (SETQ |a| (|shoeEsc|)) + (SETQ |b| + (COND + (|a| (SETQ |str| + (CONCAT |str| (ELT |$ln| |$n|))) + (SETQ |$n| (+ |$n| 1)) (|shoeS|)) + (T (|shoeS|)))) + (CONCAT |str| |b|)))))))) (DEFUN |shoeIdEnd| (|line| |n|) (PROGN @@ -392,7 +390,7 @@ ((NOT (AND (< |n| (LENGTH |line|)) (|shoeIdChar| (ELT |line| |n|)))) (RETURN NIL)) - ('T (SETQ |n| (+ |n| 1))))) + (T (SETQ |n| (+ |n| 1))))) |n|)) (DEFUN |shoeDigit| (|x|) (DIGIT-CHAR-P |x|)) @@ -411,10 +409,10 @@ (NOT (EQUAL (QENUM |$ln| |endid|) |shoeESCAPE|))) (SETQ |$n| |endid|) (LIST |b| (SUBSTRING |$ln| |n1| (- |endid| |n1|)))) - (#0='T (SETQ |str| (SUBSTRING |$ln| |n1| (- |endid| |n1|))) - (SETQ |$n| (+ |endid| 1)) (SETQ |a| (|shoeEsc|)) - (SETQ |bb| (COND (|a| (|shoeW| T)) (#0# (LIST |b| "")))) - (LIST (OR (ELT |bb| 0) |b|) (CONCAT |str| (ELT |bb| 1))))))))) + (T (SETQ |str| (SUBSTRING |$ln| |n1| (- |endid| |n1|))) + (SETQ |$n| (+ |endid| 1)) (SETQ |a| (|shoeEsc|)) + (SETQ |bb| (COND (|a| (|shoeW| T)) (T (LIST |b| "")))) + (LIST (OR (ELT |bb| 0) |b|) (CONCAT |str| (ELT |bb| 1))))))))) (DEFUN |shoeWord| (|esp|) (PROG (|w| |aaa|) @@ -428,7 +426,7 @@ ((OR |esp| (ELT |aaa| 0)) (|shoeLeafId| |w|)) ((|shoeKeyWordP| |w|) (SETQ |$floatok| T) (|shoeLeafKey| |w|)) - ('T (|shoeLeafId| |w|))))))) + (T (|shoeLeafId| |w|))))))) (DEFUN |shoeInteger| () (|shoeInteger1| NIL)) @@ -443,16 +441,16 @@ (COND ((NOT (AND (< |$n| |l|) (|shoeDigit| (ELT |$ln| |$n|)))) (RETURN NIL)) - ('T (SETQ |$n| (+ |$n| 1))))) + (T (SETQ |$n| (+ |$n| 1))))) (COND ((OR (EQUAL |$n| |l|) (NOT (EQUAL (QENUM |$ln| |$n|) |shoeESCAPE|))) (COND ((AND (EQUAL |n| |$n|) |zro|) "0") - (#0='T (SUBSTRING |$ln| |n| (- |$n| |n|))))) - (#0# (SETQ |str| (SUBSTRING |$ln| |n| (- |$n| |n|))) - (SETQ |$n| (+ |$n| 1)) (SETQ |a| (|shoeEsc|)) - (SETQ |bb| (|shoeInteger1| |zro|)) (CONCAT |str| |bb|))))))) + (T (SUBSTRING |$ln| |n| (- |$n| |n|))))) + (T (SETQ |str| (SUBSTRING |$ln| |n| (- |$n| |n|))) + (SETQ |$n| (+ |$n| 1)) (SETQ |a| (|shoeEsc|)) + (SETQ |bb| (|shoeInteger1| |zro|)) (CONCAT |str| |bb|))))))) (DEFUN |shoeIntValue| (|s|) (PROG (|d| |ival| |ns|) @@ -464,10 +462,9 @@ (LOOP (COND ((> |i| |bfVar#1|) (RETURN NIL)) - ('T - (PROGN - (SETQ |d| (|shoeOrdToNum| (ELT |s| |i|))) - (SETQ |ival| (+ (* 10 |ival|) |d|))))) + (T (PROGN + (SETQ |d| (|shoeOrdToNum| (ELT |s| |i|))) + (SETQ |ival| (+ (* 10 |ival|) |d|))))) (SETQ |i| (+ |i| 1)))) |ival|)))) @@ -484,9 +481,8 @@ (COND ((AND (< |$n| |$sz|) (EQUAL (QENUM |$ln| |$n|) |shoeDOT|)) (SETQ |$n| |n|) (|shoeLeafInteger| |a|)) - (#0='T (SETQ |w| (|shoeInteger1| T)) - (|shoeExponent| |a| |w|)))) - (#0# (|shoeLeafInteger| |a|))))))) + (T (SETQ |w| (|shoeInteger1| T)) (|shoeExponent| |a| |w|)))) + (T (|shoeLeafInteger| |a|))))))) (DEFUN |shoeExponent| (|a| |w|) (PROG (|c1| |e| |c| |n|) @@ -494,35 +490,36 @@ (RETURN (COND ((NOT (< |$n| |$sz|)) (|shoeLeafFloat| |a| |w| 0)) - (#0='T (SETQ |n| |$n|) (SETQ |c| (QENUM |$ln| |$n|)) - (COND - ((OR (EQUAL |c| |shoeEXPONENT1|) - (EQUAL |c| |shoeEXPONENT2|)) - (SETQ |$n| (+ |$n| 1)) - (COND - ((NOT (< |$n| |$sz|)) (SETQ |$n| |n|) - (|shoeLeafFloat| |a| |w| 0)) - ((|shoeDigit| (ELT |$ln| |$n|)) - (SETQ |e| (|shoeInteger|)) - (SETQ |e| (|shoeIntValue| |e|)) - (|shoeLeafFloat| |a| |w| |e|)) - (#0# (SETQ |c1| (QENUM |$ln| |$n|)) - (COND - ((OR (EQUAL |c1| |shoePLUSCOMMENT|) - (EQUAL |c1| |shoeMINUSCOMMENT|)) - (SETQ |$n| (+ |$n| 1)) - (COND - ((NOT (< |$n| |$sz|)) (SETQ |$n| |n|) - (|shoeLeafFloat| |a| |w| 0)) - ((|shoeDigit| (ELT |$ln| |$n|)) - (SETQ |e| (|shoeInteger|)) - (SETQ |e| (|shoeIntValue| |e|)) - (|shoeLeafFloat| |a| |w| - (COND - ((EQUAL |c1| |shoeMINUSCOMMENT|) (- |e|)) - (#0# |e|)))) - (#0# (SETQ |$n| |n|) (|shoeLeafFloat| |a| |w| 0)))))))) - (#0# (|shoeLeafFloat| |a| |w| 0)))))))) + (T (SETQ |n| |$n|) (SETQ |c| (QENUM |$ln| |$n|)) + (COND + ((OR (EQUAL |c| |shoeEXPONENT1|) + (EQUAL |c| |shoeEXPONENT2|)) + (SETQ |$n| (+ |$n| 1)) + (COND + ((NOT (< |$n| |$sz|)) (SETQ |$n| |n|) + (|shoeLeafFloat| |a| |w| 0)) + ((|shoeDigit| (ELT |$ln| |$n|)) + (SETQ |e| (|shoeInteger|)) + (SETQ |e| (|shoeIntValue| |e|)) + (|shoeLeafFloat| |a| |w| |e|)) + (T (SETQ |c1| (QENUM |$ln| |$n|)) + (COND + ((OR (EQUAL |c1| |shoePLUSCOMMENT|) + (EQUAL |c1| |shoeMINUSCOMMENT|)) + (SETQ |$n| (+ |$n| 1)) + (COND + ((NOT (< |$n| |$sz|)) (SETQ |$n| |n|) + (|shoeLeafFloat| |a| |w| 0)) + ((|shoeDigit| (ELT |$ln| |$n|)) + (SETQ |e| (|shoeInteger|)) + (SETQ |e| (|shoeIntValue| |e|)) + (|shoeLeafFloat| |a| |w| + (COND + ((EQUAL |c1| |shoeMINUSCOMMENT|) + (- |e|)) + (T |e|)))) + (T (SETQ |$n| |n|) (|shoeLeafFloat| |a| |w| 0)))))))) + (T (|shoeLeafFloat| |a| |w| 0)))))))) (DEFUN |shoeError| () (PROG (|n|) @@ -560,25 +557,24 @@ (LOOP (COND ((OR (> |j| |bfVar#2|) |done|) (RETURN NIL)) - (#0='T - (PROGN - (SETQ |s| (ELT |u| |j|)) - (SETQ |ls| (SIZE |s|)) - (SETQ |done| - (COND - ((< |ll| (+ |ls| |i|)) NIL) - (#1='T (SETQ |eql| T) - (LET ((|bfVar#3| (- |ls| 1)) (|k| 1)) - (LOOP - (COND - ((OR (> |k| |bfVar#3|) (NOT |eql|)) - (RETURN NIL)) - (#0# - (SETQ |eql| - (EQL (QENUM |s| |k|) - (QENUM |l| (+ |k| |i|)))))) - (SETQ |k| (+ |k| 1)))) - (COND (|eql| (SETQ |s1| |s|) T) (#1# NIL)))))))) + (T (PROGN + (SETQ |s| (ELT |u| |j|)) + (SETQ |ls| (SIZE |s|)) + (SETQ |done| + (COND + ((< |ll| (+ |ls| |i|)) NIL) + (T (SETQ |eql| T) + (LET ((|bfVar#3| (- |ls| 1)) (|k| 1)) + (LOOP + (COND + ((OR (> |k| |bfVar#3|) (NOT |eql|)) + (RETURN NIL)) + (T + (SETQ |eql| + (EQL (QENUM |s| |k|) + (QENUM |l| (+ |k| |i|)))))) + (SETQ |k| (+ |k| 1)))) + (COND (|eql| (SETQ |s1| |s|) T) (T NIL)))))))) (SETQ |j| (+ |j| 1)))) |s1|)))) diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index daa7cfe3..9deef054 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -40,7 +40,7 @@ ((OR (ATOM |bfVar#1|) (PROGN (SETQ |st| (CAR |bfVar#1|)) NIL)) (RETURN NIL)) - ('T (HPUT |KeyTable| (CAR |st|) (CADR |st|)))) + (T (HPUT |KeyTable| (CAR |st|) (CADR |st|)))) (SETQ |bfVar#1| (CDR |bfVar#1|)))) |KeyTable|)))) @@ -80,20 +80,20 @@ (LOOP (COND ((< (LENGTH (ELT |u| |k|)) |l|) (RETURN NIL)) - (#0='T (SETQ |k| (+ |k| 1))))) + (T (SETQ |k| (+ |k| 1))))) (SETQ |v| (MAKE-VEC (+ |n| 1))) (LET ((|bfVar#2| (- |k| 1)) (|i| 0)) (LOOP (COND ((> |i| |bfVar#2|) (RETURN NIL)) - (#0# (VEC-SETELT |v| |i| (ELT |u| |i|)))) + (T (VEC-SETELT |v| |i| (ELT |u| |i|)))) (SETQ |i| (+ |i| 1)))) (VEC-SETELT |v| |k| |s|) (LET ((|bfVar#3| (- |n| 1)) (|i| |k|)) (LOOP (COND ((> |i| |bfVar#3|) (RETURN NIL)) - (#0# (VEC-SETELT |v| (+ |i| 1) (ELT |u| |i|)))) + (T (VEC-SETELT |v| (+ |i| 1) (ELT |u| |i|)))) (SETQ |i| (+ |i| 1)))) (VEC-SETELT |d| |h| |v|) |s|)))) @@ -112,7 +112,7 @@ (LOOP (COND ((> |i| 255) (RETURN NIL)) - (#0='T (VEC-SETELT |a| |i| |b|))) + (T (VEC-SETELT |a| |i| |b|))) (SETQ |i| (+ |i| 1)))) |a|)) (LET ((|bfVar#4| |l|) (|s| NIL)) @@ -121,7 +121,7 @@ ((OR (ATOM |bfVar#4|) (PROGN (SETQ |s| (CAR |bfVar#4|)) NIL)) (RETURN NIL)) - (#0# (|shoeInsert| |s| |d|))) + (T (|shoeInsert| |s| |d|))) (SETQ |bfVar#4| (CDR |bfVar#4|)))) |d|)))) @@ -137,7 +137,7 @@ (LOOP (COND ((> |i| 255) (RETURN NIL)) - (#0='T (BVEC-SETELT |a| |i| 0))) + (T (BVEC-SETELT |a| |i| 0))) (SETQ |i| (+ |i| 1)))) (LET ((|bfVar#5| |listing|) (|k| NIL)) (LOOP @@ -145,10 +145,9 @@ ((OR (ATOM |bfVar#5|) (PROGN (SETQ |k| (CAR |bfVar#5|)) NIL)) (RETURN NIL)) - (#0# - (COND - ((NOT (|shoeStartsId| (ELT |k| 0))) - (BVEC-SETELT |a| (QENUM |k| 0) 1))))) + (T (COND + ((NOT (|shoeStartsId| (ELT |k| 0))) + (BVEC-SETELT |a| (QENUM |k| 0) 1))))) (SETQ |bfVar#5| (CDR |bfVar#5|)))) |a|)))) @@ -160,7 +159,7 @@ (COND ((OR (ATOM |bfVar#6|) (PROGN (SETQ |i| (CAR |bfVar#6|)) NIL)) (RETURN NIL)) - ('T (SETF (GET |i| 'SHOEPRE) 'T))) + (T (SETF (GET |i| 'SHOEPRE) 'T))) (SETQ |bfVar#6| (CDR |bfVar#6|))))) (EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) @@ -176,7 +175,7 @@ (COND ((OR (ATOM |bfVar#7|) (PROGN (SETQ |i| (CAR |bfVar#7|)) NIL)) (RETURN NIL)) - ('T (SETF (GET (CAR |i|) 'SHOEINF) (CADR |i|)))) + (T (SETF (GET (CAR |i|) 'SHOEINF) (CADR |i|)))) (SETQ |bfVar#7| (CDR |bfVar#7|))))) (EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) @@ -195,7 +194,7 @@ (COND ((OR (ATOM |bfVar#8|) (PROGN (SETQ |i| (CAR |bfVar#8|)) NIL)) (RETURN NIL)) - ('T (SETF (GET (CAR |i|) 'SHOETHETA) (CDR |i|)))) + (T (SETF (GET (CAR |i|) 'SHOETHETA) (CDR |i|)))) (SETQ |bfVar#8| (CDR |bfVar#8|))))) (EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) @@ -237,7 +236,7 @@ (COND ((OR (ATOM |bfVar#9|) (PROGN (SETQ |i| (CAR |bfVar#9|)) NIL)) (RETURN NIL)) - ('T (SETF (GET (CAR |i|) 'SHOERENAME) (CDR |i|)))) + (T (SETF (GET (CAR |i|) 'SHOERENAME) (CDR |i|)))) (SETQ |bfVar#9| (CDR |bfVar#9|))))) (EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) @@ -271,6 +270,6 @@ (COND ((OR (ATOM |bfVar#10|) (PROGN (SETQ |i| (CAR |bfVar#10|)) NIL)) (RETURN NIL)) - ('T (SETF (GET (CAR |i|) 'SHOESELFUNCTION) (CADR |i|)))) + (T (SETF (GET (CAR |i|) 'SHOESELFUNCTION) (CADR |i|)))) (SETQ |bfVar#10| (CDR |bfVar#10|))))) diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp index 341c0200..91f09a69 100644 --- a/src/boot/strap/translator.clisp +++ b/src/boot/strap/translator.clisp @@ -27,60 +27,59 @@ ((NULL |$foreignsDefsForCLisp|) NIL) ((NULL |$currentModuleName|) (|coreError| "current module has no name")) - (#0='T - (SETQ |init| - (CONS 'DEFUN - (CONS (INTERN (CONCAT |$currentModuleName| - '|InitCLispFFI|)) - (CONS NIL - (CONS - (LIST 'MAPC - (LIST 'FUNCTION 'FMAKUNBOUND) - (LIST 'QUOTE + (T (SETQ |init| + (CONS 'DEFUN + (CONS (INTERN (CONCAT |$currentModuleName| + '|InitCLispFFI|)) + (CONS NIL + (CONS + (LIST 'MAPC + (LIST 'FUNCTION 'FMAKUNBOUND) + (LIST 'QUOTE + (LET + ((|bfVar#2| NIL) + (|bfVar#1| + |$foreignsDefsForCLisp|) + (|d| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#1|) + (PROGN + (SETQ |d| + (CAR |bfVar#1|)) + NIL)) + (RETURN + (NREVERSE |bfVar#2|))) + (T + (SETQ |bfVar#2| + (CONS (CADR |d|) + |bfVar#2|)))) + (SETQ |bfVar#1| + (CDR |bfVar#1|)))))) (LET - ((|bfVar#2| NIL) - (|bfVar#1| + ((|bfVar#4| NIL) + (|bfVar#3| |$foreignsDefsForCLisp|) (|d| NIL)) (LOOP (COND - ((OR (ATOM |bfVar#1|) + ((OR (ATOM |bfVar#3|) (PROGN (SETQ |d| - (CAR |bfVar#1|)) + (CAR |bfVar#3|)) NIL)) (RETURN - (NREVERSE |bfVar#2|))) - (#1='T - (SETQ |bfVar#2| - (CONS (CADR |d|) - |bfVar#2|)))) - (SETQ |bfVar#1| - (CDR |bfVar#1|)))))) - (LET - ((|bfVar#4| NIL) - (|bfVar#3| - |$foreignsDefsForCLisp|) - (|d| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#3|) - (PROGN - (SETQ |d| - (CAR |bfVar#3|)) - NIL)) - (RETURN - (NREVERSE |bfVar#4|))) - (#1# - (SETQ |bfVar#4| - (CONS - (LIST 'EVAL - (LIST 'QUOTE |d|)) - |bfVar#4|)))) - (SETQ |bfVar#3| - (CDR |bfVar#3|))))))))) - (REALLYPRETTYPRINT |init| |stream|)))) - (#0# NIL))))) + (NREVERSE |bfVar#4|))) + (T + (SETQ |bfVar#4| + (CONS + (LIST 'EVAL + (LIST 'QUOTE |d|)) + |bfVar#4|)))) + (SETQ |bfVar#3| + (CDR |bfVar#3|))))))))) + (REALLYPRETTYPRINT |init| |stream|)))) + (T NIL))))) (DEFUN |genOptimizeOptions| (|stream|) (REALLYPRETTYPRINT @@ -145,21 +144,21 @@ (DECLARE (SPECIAL |$GenVarCounter|)) (COND ((NULL |a|) (|shoeNotFound| |fn|)) - ('T (SETQ |$GenVarCounter| 0) - (|shoeOpenOutputFile| |stream| |outfn| - (PROGN - (|genOptimizeOptions| |stream|) - (LET ((|bfVar#5| |lines|) (|line| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#5|) - (PROGN (SETQ |line| (CAR |bfVar#5|)) NIL)) - (RETURN NIL)) - ('T (|shoeFileLine| |line| |stream|))) - (SETQ |bfVar#5| (CDR |bfVar#5|)))) - (|shoeFileTrees| (|shoeTransformStream| |a|) |stream|) - (|genModuleFinalization| |stream|))) - |outfn|))) + (T (SETQ |$GenVarCounter| 0) + (|shoeOpenOutputFile| |stream| |outfn| + (PROGN + (|genOptimizeOptions| |stream|) + (LET ((|bfVar#5| |lines|) (|line| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#5|) + (PROGN (SETQ |line| (CAR |bfVar#5|)) NIL)) + (RETURN NIL)) + (T (|shoeFileLine| |line| |stream|))) + (SETQ |bfVar#5| (CDR |bfVar#5|)))) + (|shoeFileTrees| (|shoeTransformStream| |a|) |stream|) + (|genModuleFinalization| |stream|))) + |outfn|))) (DEFUN BOOTTOCLC (|fn| |out|) (PROG (|result| |callingPackage|) @@ -186,25 +185,25 @@ (DECLARE (SPECIAL |$GenVarCounter|)) (COND ((NULL |a|) (|shoeNotFound| |fn|)) - ('T (SETQ |$GenVarCounter| 0) - (|shoeOpenOutputFile| |stream| |outfn| - (PROGN - (|genOptimizeOptions| |stream|) - (LET ((|bfVar#6| |lines|) (|line| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#6|) - (PROGN (SETQ |line| (CAR |bfVar#6|)) NIL)) - (RETURN NIL)) - ('T (|shoeFileLine| |line| |stream|))) - (SETQ |bfVar#6| (CDR |bfVar#6|)))) - (|shoeFileTrees| - (|shoeTransformToFile| |stream| - (|shoeInclude| - (|bAddLineNumber| (|bRgen| |a|) (|bIgen| 0)))) - |stream|) - (|genModuleFinalization| |stream|))) - |outfn|))) + (T (SETQ |$GenVarCounter| 0) + (|shoeOpenOutputFile| |stream| |outfn| + (PROGN + (|genOptimizeOptions| |stream|) + (LET ((|bfVar#6| |lines|) (|line| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#6|) + (PROGN (SETQ |line| (CAR |bfVar#6|)) NIL)) + (RETURN NIL)) + (T (|shoeFileLine| |line| |stream|))) + (SETQ |bfVar#6| (CDR |bfVar#6|)))) + (|shoeFileTrees| + (|shoeTransformToFile| |stream| + (|shoeInclude| + (|bAddLineNumber| (|bRgen| |a|) (|bIgen| 0)))) + |stream|) + (|genModuleFinalization| |stream|))) + |outfn|))) (DECLAIM (FTYPE (FUNCTION (|%String|) |%Thing|) BOOTTOMC)) @@ -225,8 +224,8 @@ (DEFUN |shoeMc| (|a| |fn|) (COND ((NULL |a|) (|shoeNotFound| |fn|)) - ('T (|shoePCompileTrees| (|shoeTransformStream| |a|)) - (|shoeConsole| (CONCAT |fn| " COMPILED AND LOADED"))))) + (T (|shoePCompileTrees| (|shoeTransformStream| |a|)) + (|shoeConsole| (CONCAT |fn| " COMPILED AND LOADED"))))) (DEFUN EVAL-BOOT-FILE (|fn|) (PROG (|outfn| |infn| |b|) @@ -276,11 +275,10 @@ (DEFUN |shoeToConsole| (|a| |fn|) (COND ((NULL |a|) (|shoeNotFound| |fn|)) - ('T - (|shoeConsoleTrees| - (|shoeTransformToConsole| - (|shoeInclude| - (|bAddLineNumber| (|bRgen| |a|) (|bIgen| 0)))))))) + (T (|shoeConsoleTrees| + (|shoeTransformToConsole| + (|shoeInclude| + (|bAddLineNumber| (|bRgen| |a|) (|bIgen| 0)))))))) (DEFUN STOUT (|string|) (PSTOUT (LIST |string|))) @@ -296,9 +294,8 @@ (SETQ |result| (COND ((|bStreamNull| |a|) NIL) - ('T - (|stripm| (CAR |a|) |callingPackage| - (FIND-PACKAGE "BOOTTRAN"))))) + (T (|stripm| (CAR |a|) |callingPackage| + (FIND-PACKAGE "BOOTTRAN"))))) (|setCurrentPackage| |callingPackage|) |result|)))) @@ -314,11 +311,10 @@ (SETQ |result| (COND ((|bStreamNull| |a|) NIL) - ('T - (SETQ |fn| - (|stripm| (CAR |a|) *PACKAGE* - (FIND-PACKAGE "BOOTTRAN"))) - (EVAL |fn|)))) + (T (SETQ |fn| + (|stripm| (CAR |a|) *PACKAGE* + (FIND-PACKAGE "BOOTTRAN"))) + (EVAL |fn|)))) (|setCurrentPackage| |callingPackage|) |result|)))) @@ -334,7 +330,7 @@ (SETQ |result| (COND ((|bStreamNull| |a|) NIL) - ('T (|shoePCompile| (CAR |a|))))) + (T (|shoePCompile| (CAR |a|))))) (|setCurrentPackage| |callingPackage|) |result|)))) @@ -342,7 +338,7 @@ (LOOP (COND ((|bStreamNull| |s|) (RETURN NIL)) - ('T (PROGN (|shoeCompile| (CAR |s|)) (SETQ |s| (CDR |s|))))))) + (T (PROGN (|shoeCompile| (CAR |s|)) (SETQ |s| (CDR |s|))))))) (DECLAIM (FTYPE (FUNCTION (|%Ast|) |%Thing|) |shoeCompile|)) @@ -363,7 +359,7 @@ (SETQ |body| (CDR |ISTMP#2|)) 'T)))))) (COMPILE |name| (CONS 'LAMBDA (CONS |bv| |body|)))) - ('T (EVAL |fn|)))))) + (T (EVAL |fn|)))))) (DEFUN |shoeTransform| (|str|) (|bNext| #'|shoeTreeConstruct| @@ -401,17 +397,17 @@ (RETURN (COND ((|bStreamNull| |s|) (LIST '|nullstream|)) - ('T (SETQ |dq| (CAR |s|)) - (|shoeFileLines| (|shoeDQlines| |dq|) |fn|) - (|bAppend| (|shoeParseTrees| |dq|) - (|bFileNext| |fn| (CDR |s|)))))))) + (T (SETQ |dq| (CAR |s|)) + (|shoeFileLines| (|shoeDQlines| |dq|) |fn|) + (|bAppend| (|shoeParseTrees| |dq|) + (|bFileNext| |fn| (CDR |s|)))))))) (DEFUN |shoeParseTrees| (|dq|) (PROG (|toklist|) (RETURN (PROGN (SETQ |toklist| (|dqToList| |dq|)) - (COND ((NULL |toklist|) NIL) ('T (|shoeOutParse| |toklist|))))))) + (COND ((NULL |toklist|) NIL) (T (|shoeOutParse| |toklist|))))))) (DEFUN |shoeTreeConstruct| (|str|) (CONS (|shoeParseTrees| (CAR |str|)) (CDR |str|))) @@ -429,7 +425,7 @@ (COND ((|bStreamNull| |s|) NIL) ((EQL |n| 0) NIL) - ('T (CONS (CAR |s|) (|streamTake| (- |n| 1) (CDR |s|)))))) + (T (CONS (CAR |s|) (|streamTake| (- |n| 1) (CDR |s|)))))) (DEFUN |shoeFileLines| (|lines| |fn|) (PROGN @@ -440,7 +436,7 @@ ((OR (ATOM |bfVar#7|) (PROGN (SETQ |line| (CAR |bfVar#7|)) NIL)) (RETURN NIL)) - ('T (|shoeFileLine| (|shoeAddComment| |line|) |fn|))) + (T (|shoeFileLine| (|shoeAddComment| |line|) |fn|))) (SETQ |bfVar#7| (CDR |bfVar#7|)))) (|shoeFileLine| " " |fn|))) @@ -453,7 +449,7 @@ ((OR (ATOM |bfVar#8|) (PROGN (SETQ |line| (CAR |bfVar#8|)) NIL)) (RETURN NIL)) - ('T (|shoeConsole| (|shoeAddComment| |line|)))) + (T (|shoeConsole| (|shoeAddComment| |line|)))) (SETQ |bfVar#8| (CDR |bfVar#8|)))) (|shoeConsole| " "))) @@ -466,14 +462,13 @@ (LOOP (COND ((|bStreamNull| |s|) (RETURN NIL)) - ('T - (PROGN - (SETQ |a| (CAR |s|)) - (COND - ((AND (CONSP |a|) (EQ (CAR |a|) '+LINE)) - (|shoeFileLine| (CADR |a|) |st|)) - ('T (REALLYPRETTYPRINT |a| |st|) (TERPRI |st|))) - (SETQ |s| (CDR |s|))))))))) + (T (PROGN + (SETQ |a| (CAR |s|)) + (COND + ((AND (CONSP |a|) (EQ (CAR |a|) '+LINE)) + (|shoeFileLine| (CADR |a|) |st|)) + (T (REALLYPRETTYPRINT |a| |st|) (TERPRI |st|))) + (SETQ |s| (CDR |s|))))))))) (DEFUN |shoePPtoFile| (|x| |stream|) (PROGN (SHOENOTPRETTYPRINT |x| |stream|) |x|)) @@ -484,13 +479,12 @@ (LOOP (COND ((|bStreamPackageNull| |s|) (RETURN NIL)) - ('T - (PROGN - (SETQ |fn| - (|stripm| (CAR |s|) *PACKAGE* - (FIND-PACKAGE "BOOTTRAN"))) - (REALLYPRETTYPRINT |fn|) - (SETQ |s| (CDR |s|))))))))) + (T (PROGN + (SETQ |fn| + (|stripm| (CAR |s|) *PACKAGE* + (FIND-PACKAGE "BOOTTRAN"))) + (REALLYPRETTYPRINT |fn|) + (SETQ |s| (CDR |s|))))))))) (DEFUN |shoeAddComment| (|l|) (CONCAT "; " (CAR |l|))) @@ -518,7 +512,7 @@ ((NOT (|bStreamNull| |$inputStream|)) (|bpGeneralErrorHere|) NIL) ((NULL |$stack|) (|bpGeneralErrorHere|) NIL) - ('T (CAR |$stack|))))))) + (T (CAR |$stack|))))))) (DEFUN |genDeclaration| (|n| |t|) (PROG (|argTypes| |ISTMP#2| |valType| |ISTMP#1|) @@ -542,7 +536,7 @@ (SETQ |argTypes| (LIST |argTypes|)))) (LIST 'DECLAIM (LIST 'FTYPE (LIST 'FUNCTION |argTypes| |valType|) |n|))) - ('T (LIST 'DECLAIM (LIST 'TYPE |t| |n|))))))) + (T (LIST 'DECLAIM (LIST 'TYPE |t| |n|))))))) (DEFUN |translateSignatureDeclaration| (|d|) (CASE (CAR |d|) @@ -565,18 +559,17 @@ ((OR (ATOM |bfVar#9|) (PROGN (SETQ |t| (CAR |bfVar#9|)) NIL)) (RETURN NIL)) - ('T - (COND - ((AND (CONSP |t|) (EQ (CAR |t|) 'DECLARE)) - (IDENTITY (RPLACA |t| 'DECLAIM)))))) + (T (COND + ((AND (CONSP |t|) (EQ (CAR |t|) 'DECLARE)) + (IDENTITY (RPLACA |t| 'DECLAIM)))))) (SETQ |bfVar#9| (CDR |bfVar#9|)))) (SETQ |expr'| (COND ((< 1 (LENGTH |expr'|)) (CONS 'PROGN |expr'|)) - (#0='T (CAR |expr'|)))) + (T (CAR |expr'|)))) (COND (|$InteractiveMode| |expr'|) - (#0# (|shoeEVALANDFILEACTQ| |expr'|))))))) + (T (|shoeEVALANDFILEACTQ| |expr'|))))))) (DEFUN |translateToplevel| (|b| |export?|) (PROG (|lhs| |t| |ISTMP#2| |n| |ISTMP#1| |sig| |xs|) @@ -589,120 +582,122 @@ ((AND (CONSP |b|) (EQ (CAR |b|) 'TUPLE) (PROGN (SETQ |xs| (CDR |b|)) #0='T)) (|coreError| "invalid AST")) - (#1='T - (CASE (CAR |b|) - (|%Signature| - (LET ((|op| (CADR |b|)) (|t| (CADDR |b|))) - (LIST (|genDeclaration| |op| |t|)))) - (|%Definition| - (LET ((|op| (CADR |b|)) (|args| (CADDR |b|)) - (|body| (CADDDR |b|))) - (CDR (|bfDef| |op| |args| |body|)))) - (|%Module| - (LET ((|m| (CADR |b|)) (|ds| (CADDR |b|))) - (PROGN - (SETQ |$currentModuleName| |m|) - (SETQ |$foreignsDefsForCLisp| NIL) - (CONS (LIST 'PROVIDE (STRING |m|)) - (LET ((|bfVar#11| NIL) (|bfVar#10| |ds|) - (|d| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#10|) + (T (CASE (CAR |b|) + (|%Signature| + (LET ((|op| (CADR |b|)) (|t| (CADDR |b|))) + (LIST (|genDeclaration| |op| |t|)))) + (|%Definition| + (LET ((|op| (CADR |b|)) (|args| (CADDR |b|)) + (|body| (CADDDR |b|))) + (CDR (|bfDef| |op| |args| |body|)))) + (|%Module| + (LET ((|m| (CADR |b|)) (|ds| (CADDR |b|))) + (PROGN + (SETQ |$currentModuleName| |m|) + (SETQ |$foreignsDefsForCLisp| NIL) + (CONS (LIST 'PROVIDE (STRING |m|)) + (LET ((|bfVar#11| NIL) (|bfVar#10| |ds|) + (|d| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#10|) + (PROGN + (SETQ |d| (CAR |bfVar#10|)) + NIL)) + (RETURN (NREVERSE |bfVar#11|))) + (T (SETQ |bfVar#11| + (CONS + (CAR (|translateToplevel| |d| T)) + |bfVar#11|)))) + (SETQ |bfVar#10| (CDR |bfVar#10|)))))))) + (|%Import| + (LET ((|m| (CADR |b|))) + (PROGN + (COND + ((NOT (EQUAL (|getOptionValue| '|import|) + "skip")) + (|bootImport| (STRING |m|)))) + (LIST (LIST 'IMPORT-MODULE (STRING |m|)))))) + (|%ImportSignature| + (LET ((|x| (CADR |b|)) (|sig| (CADDR |b|))) + (|genImportDeclaration| |x| |sig|))) + (|%TypeAlias| + (LET ((|lhs| (CADR |b|)) (|rhs| (CADDR |b|))) + (LIST (|genTypeAlias| |lhs| |rhs|)))) + (|%ConstantDefinition| + (LET ((|lhs| (CADR |b|)) (|rhs| (CADDR |b|))) + (PROGN + (SETQ |sig| NIL) + (COND + ((AND (CONSP |lhs|) + (EQ (CAR |lhs|) '|%Signature|) + (PROGN + (SETQ |ISTMP#1| (CDR |lhs|)) + (AND (CONSP |ISTMP#1|) (PROGN - (SETQ |d| (CAR |bfVar#10|)) - NIL)) - (RETURN (NREVERSE |bfVar#11|))) - (#2='T - (SETQ |bfVar#11| - (CONS - (CAR - (|translateToplevel| |d| T)) - |bfVar#11|)))) - (SETQ |bfVar#10| (CDR |bfVar#10|)))))))) - (|%Import| - (LET ((|m| (CADR |b|))) - (PROGN - (COND - ((NOT (EQUAL (|getOptionValue| '|import|) "skip")) - (|bootImport| (STRING |m|)))) - (LIST (LIST 'IMPORT-MODULE (STRING |m|)))))) - (|%ImportSignature| - (LET ((|x| (CADR |b|)) (|sig| (CADDR |b|))) - (|genImportDeclaration| |x| |sig|))) - (|%TypeAlias| - (LET ((|lhs| (CADR |b|)) (|rhs| (CADDR |b|))) - (LIST (|genTypeAlias| |lhs| |rhs|)))) - (|%ConstantDefinition| - (LET ((|lhs| (CADR |b|)) (|rhs| (CADDR |b|))) - (PROGN - (SETQ |sig| NIL) - (COND - ((AND (CONSP |lhs|) (EQ (CAR |lhs|) '|%Signature|) - (PROGN - (SETQ |ISTMP#1| (CDR |lhs|)) - (AND (CONSP |ISTMP#1|) - (PROGN - (SETQ |n| (CAR |ISTMP#1|)) - (SETQ |ISTMP#2| (CDR |ISTMP#1|)) - (AND (CONSP |ISTMP#2|) - (EQ (CDR |ISTMP#2|) NIL) - (PROGN - (SETQ |t| (CAR |ISTMP#2|)) - #0#)))))) - (SETQ |sig| (|genDeclaration| |n| |t|)) - (SETQ |lhs| |n|))) - (SETQ |$constantIdentifiers| - (CONS |lhs| |$constantIdentifiers|)) - (LIST (LIST 'DEFCONSTANT |lhs| |rhs|))))) - (|%Assignment| - (LET ((|lhs| (CADR |b|)) (|rhs| (CADDR |b|))) - (PROGN - (SETQ |sig| NIL) - (COND - ((AND (CONSP |lhs|) (EQ (CAR |lhs|) '|%Signature|) - (PROGN - (SETQ |ISTMP#1| (CDR |lhs|)) - (AND (CONSP |ISTMP#1|) - (PROGN - (SETQ |n| (CAR |ISTMP#1|)) - (SETQ |ISTMP#2| (CDR |ISTMP#1|)) - (AND (CONSP |ISTMP#2|) - (EQ (CDR |ISTMP#2|) NIL) - (PROGN - (SETQ |t| (CAR |ISTMP#2|)) - #0#)))))) - (SETQ |sig| (|genDeclaration| |n| |t|)) - (SETQ |lhs| |n|))) - (COND - (|$InteractiveMode| - (LIST (LIST 'SETF |lhs| |rhs|))) - (#1# (LIST (LIST 'DEFPARAMETER |lhs| |rhs|))))))) - (|%Macro| - (LET ((|op| (CADR |b|)) (|args| (CADDR |b|)) - (|body| (CADDDR |b|))) - (|bfMDef| |op| |args| |body|))) - (|%Structure| - (LET ((|t| (CADR |b|)) (|alts| (CADDR |b|))) - (LET ((|bfVar#13| NIL) (|bfVar#12| |alts|) - (|alt| NIL)) - (LOOP + (SETQ |n| (CAR |ISTMP#1|)) + (SETQ |ISTMP#2| (CDR |ISTMP#1|)) + (AND (CONSP |ISTMP#2|) + (EQ (CDR |ISTMP#2|) NIL) + (PROGN + (SETQ |t| (CAR |ISTMP#2|)) + #0#)))))) + (SETQ |sig| (|genDeclaration| |n| |t|)) + (SETQ |lhs| |n|))) + (SETQ |$constantIdentifiers| + (CONS |lhs| |$constantIdentifiers|)) + (LIST (LIST 'DEFCONSTANT |lhs| |rhs|))))) + (|%Assignment| + (LET ((|lhs| (CADR |b|)) (|rhs| (CADDR |b|))) + (PROGN + (SETQ |sig| NIL) + (COND + ((AND (CONSP |lhs|) + (EQ (CAR |lhs|) '|%Signature|) + (PROGN + (SETQ |ISTMP#1| (CDR |lhs|)) + (AND (CONSP |ISTMP#1|) + (PROGN + (SETQ |n| (CAR |ISTMP#1|)) + (SETQ |ISTMP#2| (CDR |ISTMP#1|)) + (AND (CONSP |ISTMP#2|) + (EQ (CDR |ISTMP#2|) NIL) + (PROGN + (SETQ |t| (CAR |ISTMP#2|)) + #0#)))))) + (SETQ |sig| (|genDeclaration| |n| |t|)) + (SETQ |lhs| |n|))) (COND - ((OR (ATOM |bfVar#12|) - (PROGN (SETQ |alt| (CAR |bfVar#12|)) NIL)) - (RETURN (NREVERSE |bfVar#13|))) - (#2# - (SETQ |bfVar#13| - (CONS (|bfCreateDef| |alt|) |bfVar#13|)))) - (SETQ |bfVar#12| (CDR |bfVar#12|)))))) - (|%Namespace| - (LET ((|n| (CADR |b|))) - (PROGN - (SETQ |$activeNamespace| (STRING |n|)) - (LIST (LIST 'IN-PACKAGE (STRING |n|)))))) - (|%Lisp| (LET ((|s| (CADR |b|))) - (|shoeReadLispString| |s| 0))) - (T (LIST (|translateToplevelExpression| |b|))))))))) + (|$InteractiveMode| + (LIST (LIST 'SETF |lhs| |rhs|))) + (T (LIST (LIST 'DEFPARAMETER |lhs| |rhs|))))))) + (|%Macro| + (LET ((|op| (CADR |b|)) (|args| (CADDR |b|)) + (|body| (CADDDR |b|))) + (|bfMDef| |op| |args| |body|))) + (|%Structure| + (LET ((|t| (CADR |b|)) (|alts| (CADDR |b|))) + (LET ((|bfVar#13| NIL) (|bfVar#12| |alts|) + (|alt| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#12|) + (PROGN + (SETQ |alt| (CAR |bfVar#12|)) + NIL)) + (RETURN (NREVERSE |bfVar#13|))) + (T (SETQ |bfVar#13| + (CONS (|bfCreateDef| |alt|) + |bfVar#13|)))) + (SETQ |bfVar#12| (CDR |bfVar#12|)))))) + (|%Namespace| + (LET ((|n| (CADR |b|))) + (PROGN + (SETQ |$activeNamespace| (STRING |n|)) + (LIST (LIST 'IN-PACKAGE (STRING |n|)))))) + (|%Lisp| (LET ((|s| (CADR |b|))) + (|shoeReadLispString| |s| 0))) + (T (LIST (|translateToplevelExpression| |b|))))))))) (DEFUN |shoeAddbootIfNec| (|s|) (|shoeAddStringIfNec| ".boot" |s|)) @@ -714,14 +709,14 @@ (RETURN (PROGN (SETQ |a| (STRPOS |str| |s| 0 NIL)) - (COND ((NULL |a|) (CONCAT |s| |str|)) ('T |s|)))))) + (COND ((NULL |a|) (CONCAT |s| |str|)) (T |s|)))))) (DEFUN |shoeRemoveStringIfNec| (|str| |s|) (PROG (|n|) (RETURN (PROGN (SETQ |n| (SEARCH |str| |s| :FROM-END T)) - (COND ((NULL |n|) |s|) ('T (SUBSTRING |s| 0 |n|))))))) + (COND ((NULL |n|) |s|) (T (SUBSTRING |s| 0 |n|))))))) (DEFUN DEFUSE (|fn|) (PROG (|infn|) @@ -746,17 +741,18 @@ (RETURN (COND ((NULL |a|) (|shoeNotFound| |fn|)) - ('T (SETQ |$lispWordTable| (MAKE-HASHTABLE 'EQ)) - (DO-SYMBOLS (|i| (FIND-PACKAGE 'LISP)) - (HPUT |$lispWordTable| |i| T)) - (SETQ |$bootDefined| (MAKE-HASHTABLE 'EQ)) - (SETQ |$bootUsed| (MAKE-HASHTABLE 'EQ)) - (SETQ |$bootDefinedTwice| NIL) (SETQ |$GenVarCounter| 0) - (SETQ |$bfClamming| NIL) - (|shoeDefUse| (|shoeTransformStream| |a|)) - (SETQ |out| (CONCAT |fn| ".defuse")) - (|shoeOpenOutputFile| |stream| |out| (|shoeReport| |stream|)) - |out|))))) + (T (SETQ |$lispWordTable| (MAKE-HASHTABLE 'EQ)) + (DO-SYMBOLS (|i| (FIND-PACKAGE 'LISP)) + (HPUT |$lispWordTable| |i| T)) + (SETQ |$bootDefined| (MAKE-HASHTABLE 'EQ)) + (SETQ |$bootUsed| (MAKE-HASHTABLE 'EQ)) + (SETQ |$bootDefinedTwice| NIL) (SETQ |$GenVarCounter| 0) + (SETQ |$bfClamming| NIL) + (|shoeDefUse| (|shoeTransformStream| |a|)) + (SETQ |out| (CONCAT |fn| ".defuse")) + (|shoeOpenOutputFile| |stream| |out| + (|shoeReport| |stream|)) + |out|))))) (DEFUN |shoeReport| (|stream|) (PROG (|b| |a|) @@ -772,9 +768,8 @@ ((OR (ATOM |bfVar#14|) (PROGN (SETQ |i| (CAR |bfVar#14|)) NIL)) (RETURN (NREVERSE |bfVar#15|))) - (#0='T - (AND (NOT (GETHASH |i| |$bootUsed|)) - (SETQ |bfVar#15| (CONS |i| |bfVar#15|))))) + (T (AND (NOT (GETHASH |i| |$bootUsed|)) + (SETQ |bfVar#15| (CONS |i| |bfVar#15|))))) (SETQ |bfVar#14| (CDR |bfVar#14|))))) (|bootOut| (SSORT |a|) |stream|) (|shoeFileLine| " " |stream|) @@ -790,9 +785,8 @@ ((OR (ATOM |bfVar#16|) (PROGN (SETQ |i| (CAR |bfVar#16|)) NIL)) (RETURN (NREVERSE |bfVar#17|))) - (#0# - (AND (NOT (GETHASH |i| |$bootDefined|)) - (SETQ |bfVar#17| (CONS |i| |bfVar#17|))))) + (T (AND (NOT (GETHASH |i| |$bootDefined|)) + (SETQ |bfVar#17| (CONS |i| |bfVar#17|))))) (SETQ |bfVar#16| (CDR |bfVar#16|))))) (LET ((|bfVar#18| (SSORT |a|)) (|i| NIL)) (LOOP @@ -800,18 +794,17 @@ ((OR (ATOM |bfVar#18|) (PROGN (SETQ |i| (CAR |bfVar#18|)) NIL)) (RETURN NIL)) - (#0# - (PROGN - (SETQ |b| (CONCAT (PNAME |i|) " is used in ")) - (|bootOutLines| (SSORT (GETHASH |i| |$bootUsed|)) - |stream| |b|)))) + (T (PROGN + (SETQ |b| (CONCAT (PNAME |i|) " is used in ")) + (|bootOutLines| (SSORT (GETHASH |i| |$bootUsed|)) + |stream| |b|)))) (SETQ |bfVar#18| (CDR |bfVar#18|)))))))) (DEFUN |shoeDefUse| (|s|) (LOOP (COND ((|bStreamPackageNull| |s|) (RETURN NIL)) - ('T (PROGN (|defuse| NIL (CAR |s|)) (SETQ |s| (CDR |s|))))))) + (T (PROGN (|defuse| NIL (CAR |s|)) (SETQ |s| (CDR |s|))))))) (DEFUN |defuse| (|e| |x|) (PROG (|niens| |nee| |LETTMP#1| |exp| |ISTMP#5| |id| |ISTMP#4| @@ -890,7 +883,7 @@ (SETQ |exp| (CAR |ISTMP#2|)) #0#)))))) (LIST |id| |exp|)) - (#1='T (LIST 'TOP-LEVEL |x|)))) + (T (LIST 'TOP-LEVEL |x|)))) (SETQ |nee| (CAR |LETTMP#1|)) (SETQ |niens| (CADR |LETTMP#1|)) (COND @@ -898,8 +891,8 @@ (SETQ |$bootDefinedTwice| (COND ((EQ |nee| 'TOP-LEVEL) |$bootDefinedTwice|) - (#1# (CONS |nee| |$bootDefinedTwice|))))) - ('T (HPUT |$bootDefined| |nee| T))) + (T (CONS |nee| |$bootDefinedTwice|))))) + (T (HPUT |$bootDefined| |nee| T))) (|defuse1| |e| |niens|) (LET ((|bfVar#19| |$used|) (|i| NIL)) (LOOP @@ -907,9 +900,8 @@ ((OR (ATOM |bfVar#19|) (PROGN (SETQ |i| (CAR |bfVar#19|)) NIL)) (RETURN NIL)) - ('T - (HPUT |$bootUsed| |i| - (CONS |nee| (GETHASH |i| |$bootUsed|))))) + (T (HPUT |$bootUsed| |i| + (CONS |nee| (GETHASH |i| |$bootUsed|))))) (SETQ |bfVar#19| (CDR |bfVar#19|)))))))) (DEFUN |defuse1| (|e| |y|) @@ -925,8 +917,8 @@ ((MEMQ |y| |e|) |$used|) ((MEMQ |y| |$used|) |$used|) ((|defusebuiltin| |y|) |$used|) - (#0='T (UNION (LIST |y|) |$used|))))) - (#0# NIL))) + (T (UNION (LIST |y|) |$used|))))) + (T NIL))) ((AND (CONSP |y|) (EQ (CAR |y|) 'LAMBDA) (PROGN (SETQ |ISTMP#1| (CDR |y|)) @@ -934,7 +926,7 @@ (PROGN (SETQ |a| (CAR |ISTMP#1|)) (SETQ |b| (CDR |ISTMP#1|)) - #1='T)))) + #0='T)))) (|defuse1| (APPEND (|unfluidlist| |a|) |e|) |b|)) ((AND (CONSP |y|) (EQ (CAR |y|) 'PROG) (PROGN @@ -943,7 +935,7 @@ (PROGN (SETQ |a| (CAR |ISTMP#1|)) (SETQ |b| (CDR |ISTMP#1|)) - #1#)))) + #0#)))) (SETQ |LETTMP#1| (|defSeparate| |a|)) (SETQ |dol| (CAR |LETTMP#1|)) (SETQ |ndol| (CADR |LETTMP#1|)) (LET ((|bfVar#20| |dol|) (|i| NIL)) @@ -952,36 +944,35 @@ ((OR (ATOM |bfVar#20|) (PROGN (SETQ |i| (CAR |bfVar#20|)) NIL)) (RETURN NIL)) - (#2='T (HPUT |$bootDefined| |i| T))) + (T (HPUT |$bootDefined| |i| T))) (SETQ |bfVar#20| (CDR |bfVar#20|)))) (|defuse1| (APPEND |ndol| |e|) |b|)) ((AND (CONSP |y|) (EQ (CAR |y|) 'QUOTE) - (PROGN (SETQ |a| (CDR |y|)) #1#)) + (PROGN (SETQ |a| (CDR |y|)) #0#)) NIL) ((AND (CONSP |y|) (EQ (CAR |y|) '+LINE) - (PROGN (SETQ |a| (CDR |y|)) #1#)) + (PROGN (SETQ |a| (CDR |y|)) #0#)) NIL) - (#0# - (LET ((|bfVar#21| |y|) (|i| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#21|) - (PROGN (SETQ |i| (CAR |bfVar#21|)) NIL)) - (RETURN NIL)) - (#2# (|defuse1| |e| |i|))) - (SETQ |bfVar#21| (CDR |bfVar#21|))))))))) + (T (LET ((|bfVar#21| |y|) (|i| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#21|) + (PROGN (SETQ |i| (CAR |bfVar#21|)) NIL)) + (RETURN NIL)) + (T (|defuse1| |e| |i|))) + (SETQ |bfVar#21| (CDR |bfVar#21|))))))))) (DEFUN |defSeparate| (|x|) (PROG (|x2| |x1| |LETTMP#1| |f|) (RETURN (COND ((NULL |x|) (LIST NIL NIL)) - (#0='T (SETQ |f| (CAR |x|)) - (SETQ |LETTMP#1| (|defSeparate| (CDR |x|))) - (SETQ |x1| (CAR |LETTMP#1|)) (SETQ |x2| (CADR |LETTMP#1|)) - (COND - ((|bfBeginsDollar| |f|) (LIST (CONS |f| |x1|) |x2|)) - (#0# (LIST |x1| (CONS |f| |x2|))))))))) + (T (SETQ |f| (CAR |x|)) + (SETQ |LETTMP#1| (|defSeparate| (CDR |x|))) + (SETQ |x1| (CAR |LETTMP#1|)) (SETQ |x2| (CADR |LETTMP#1|)) + (COND + ((|bfBeginsDollar| |f|) (LIST (CONS |f| |x1|) |x2|)) + (T (LIST |x1| (CONS |f| |x2|))))))))) (DEFUN |unfluidlist| (|x|) (PROG (|y| |ISTMP#1|) @@ -995,7 +986,7 @@ (AND (CONSP |ISTMP#1|) (EQ (CDR |ISTMP#1|) NIL) (PROGN (SETQ |y| (CAR |ISTMP#1|)) 'T)))) (LIST |y|)) - ('T (CONS (CAR |x|) (|unfluidlist| (CDR |x|)))))))) + (T (CONS (CAR |x|) (|unfluidlist| (CDR |x|)))))))) (DEFUN |defusebuiltin| (|x|) (DECLARE (SPECIAL |$lispWordTable|)) @@ -1007,7 +998,7 @@ (COND ((OR (ATOM |bfVar#22|) (PROGN (SETQ |i| (CAR |bfVar#22|)) NIL)) (RETURN NIL)) - ('T (|shoeFileLine| (CONCAT " " (PNAME |i|)) |outfn|))) + (T (|shoeFileLine| (CONCAT " " (PNAME |i|)) |outfn|))) (SETQ |bfVar#22| (CDR |bfVar#22|))))) (DEFUN CLESSP (|s1| |s2|) (NOT (SHOEGREATERP |s1| |s2|))) @@ -1019,13 +1010,12 @@ (RETURN (COND ((NULL |l|) (|shoeFileLine| |s| |outfn|)) - (#0='T (SETQ |a| (PNAME (CAR |l|))) - (COND - ((< 70 (+ (LENGTH |s|) (LENGTH |a|))) - (|shoeFileLine| |s| |outfn|) - (|bootOutLines| |l| |outfn| " ")) - (#0# - (|bootOutLines| (CDR |l|) |outfn| (CONCAT |s| " " |a|))))))))) + (T (SETQ |a| (PNAME (CAR |l|))) + (COND + ((< 70 (+ (LENGTH |s|) (LENGTH |a|))) + (|shoeFileLine| |s| |outfn|) + (|bootOutLines| |l| |outfn| " ")) + (T (|bootOutLines| (CDR |l|) |outfn| (CONCAT |s| " " |a|))))))))) (DEFUN XREF (|fn|) (PROG (|infn|) @@ -1041,16 +1031,17 @@ (RETURN (COND ((NULL |a|) (|shoeNotFound| |fn|)) - ('T (SETQ |$lispWordTable| (MAKE-HASHTABLE 'EQ)) - (DO-SYMBOLS (|i| (FIND-PACKAGE 'LISP)) - (HPUT |$lispWordTable| |i| T)) - (SETQ |$bootDefined| (MAKE-HASHTABLE 'EQ)) - (SETQ |$bootUsed| (MAKE-HASHTABLE 'EQ)) - (SETQ |$GenVarCounter| 0) (SETQ |$bfClamming| NIL) - (|shoeDefUse| (|shoeTransformStream| |a|)) - (SETQ |out| (CONCAT |fn| ".xref")) - (|shoeOpenOutputFile| |stream| |out| (|shoeXReport| |stream|)) - |out|))))) + (T (SETQ |$lispWordTable| (MAKE-HASHTABLE 'EQ)) + (DO-SYMBOLS (|i| (FIND-PACKAGE 'LISP)) + (HPUT |$lispWordTable| |i| T)) + (SETQ |$bootDefined| (MAKE-HASHTABLE 'EQ)) + (SETQ |$bootUsed| (MAKE-HASHTABLE 'EQ)) + (SETQ |$GenVarCounter| 0) (SETQ |$bfClamming| NIL) + (|shoeDefUse| (|shoeTransformStream| |a|)) + (SETQ |out| (CONCAT |fn| ".xref")) + (|shoeOpenOutputFile| |stream| |out| + (|shoeXReport| |stream|)) + |out|))))) (DEFUN |shoeXReport| (|stream|) (PROG (|a| |c|) @@ -1065,11 +1056,10 @@ ((OR (ATOM |bfVar#23|) (PROGN (SETQ |i| (CAR |bfVar#23|)) NIL)) (RETURN NIL)) - ('T - (PROGN - (SETQ |a| (CONCAT (PNAME |i|) " is used in ")) - (|bootOutLines| (SSORT (GETHASH |i| |$bootUsed|)) - |stream| |a|)))) + (T (PROGN + (SETQ |a| (CONCAT (PNAME |i|) " is used in ")) + (|bootOutLines| (SSORT (GETHASH |i| |$bootUsed|)) + |stream| |a|)))) (SETQ |bfVar#23| (CDR |bfVar#23|)))))))) (DEFUN FBO (|name| |fn|) (|shoeGeneralFC| #'BO |name| |fn|)) @@ -1091,10 +1081,8 @@ (SETQ |filename| (COND ((< 8 (LENGTH |name|)) (SUBSTRING |name| 0 8)) - ('T |name|))) - (COND - (|a| (FUNCALL |f| (CONCAT "/tmp/" |filename|))) - ('T NIL)))))) + (T |name|))) + (COND (|a| (FUNCALL |f| (CONCAT "/tmp/" |filename|))) (T NIL)))))) (DEFUN |shoeFindName2| (|fn| |name| |a|) (PROG (|filename| |lines|) @@ -1106,7 +1094,7 @@ (COND ((< 8 (LENGTH |name|)) (SUBSTRING |name| 0 8)) - ('T |name|))) + (T |name|))) (SETQ |filename| (CONCAT "/tmp/" |filename| ".boot")) (|shoeOpenOutputFile| |stream| |filename| @@ -1118,10 +1106,10 @@ (SETQ |line| (CAR |bfVar#24|)) NIL)) (RETURN NIL)) - ('T (|shoeFileLine| |line| |stream|))) + (T (|shoeFileLine| |line| |stream|))) (SETQ |bfVar#24| (CDR |bfVar#24|))))) T) - ('T NIL)))))) + (T NIL)))))) (DEFUN |shoeTransform2| (|str|) (|bNext| #'|shoeItem| @@ -1144,9 +1132,8 @@ (SETQ |line| (CAR |bfVar#25|)) NIL)) (RETURN (NREVERSE |bfVar#26|))) - ('T - (SETQ |bfVar#26| - (CONS (CAR |line|) |bfVar#26|)))) + (T (SETQ |bfVar#26| + (CONS (CAR |line|) |bfVar#26|)))) (SETQ |bfVar#25| (CDR |bfVar#25|))))) (CDR |str|)))))) @@ -1157,11 +1144,10 @@ ((IDENTP |x|) (COND ((EQUAL (SYMBOL-PACKAGE |x|) |bt|) (INTERN (PNAME |x|) |pk|)) - (#0='T |x|))) - (#0# |x|))) - (#0# - (CONS (|stripm| (CAR |x|) |pk| |bt|) - (|stripm| (CDR |x|) |pk| |bt|))))) + (T |x|))) + (T |x|))) + (T (CONS (|stripm| (CAR |x|) |pk| |bt|) + (|stripm| (CDR |x|) |pk| |bt|))))) (DEFUN |shoePCompile| (|fn|) (PROG (|body| |bv| |ISTMP#2| |name| |ISTMP#1|) @@ -1182,7 +1168,7 @@ (SETQ |body| (CDR |ISTMP#2|)) 'T)))))) (COMPILE |name| (CONS 'LAMBDA (CONS |bv| |body|)))) - ('T (EVAL |fn|))))))) + (T (EVAL |fn|))))))) (DEFUN FC (|name| |fn|) (PROG (|infn|) @@ -1205,10 +1191,9 @@ (LOOP (COND ((|bStreamNull| |s|) (RETURN NIL)) - ('T - (PROGN - (REALLYPRETTYPRINT (|shoePCompile| (CAR |s|))) - (SETQ |s| (CDR |s|))))))) + (T (PROGN + (REALLYPRETTYPRINT (|shoePCompile| (CAR |s|))) + (SETQ |s| (CDR |s|))))))) (DEFUN |bStreamPackageNull| (|s|) (PROG (|b| |a|) @@ -1234,12 +1219,12 @@ (COND ((EQL (LENGTH |a|) 0) (WRITE-LINE "Boot Loop; to exit type ] ") (BOOTLOOP)) - (#0='T (SETQ |b| (|shoePrefix?| ")console" |a|)) - (COND - (|b| (SETQ |stream| *TERMINAL-IO*) - (PSTTOMC (|bRgen| |stream|)) (BOOTLOOP)) - ((EQUAL (ELT |a| 0) (ELT "]" 0)) NIL) - (#0# (PSTTOMC (LIST |a|)) (BOOTLOOP))))))))) + (T (SETQ |b| (|shoePrefix?| ")console" |a|)) + (COND + (|b| (SETQ |stream| *TERMINAL-IO*) + (PSTTOMC (|bRgen| |stream|)) (BOOTLOOP)) + ((EQUAL (ELT |a| 0) (ELT "]" 0)) NIL) + (T (PSTTOMC (LIST |a|)) (BOOTLOOP))))))))) (DEFUN BOOTPO () (PROG (|stream| |b| |a|) @@ -1249,12 +1234,12 @@ (COND ((EQL (LENGTH |a|) 0) (WRITE-LINE "Boot Loop; to exit type ] ") (BOOTPO)) - (#0='T (SETQ |b| (|shoePrefix?| ")console" |a|)) - (COND - (|b| (SETQ |stream| *TERMINAL-IO*) - (PSTOUT (|bRgen| |stream|)) (BOOTPO)) - ((EQUAL (ELT |a| 0) (ELT "]" 0)) NIL) - (#0# (PSTOUT (LIST |a|)) (BOOTPO))))))))) + (T (SETQ |b| (|shoePrefix?| ")console" |a|)) + (COND + (|b| (SETQ |stream| *TERMINAL-IO*) + (PSTOUT (|bRgen| |stream|)) (BOOTPO)) + ((EQUAL (ELT |a| 0) (ELT "]" 0)) NIL) + (T (PSTOUT (LIST |a|)) (BOOTPO))))))))) (DEFUN PSTOUT (|string|) (PROG (|result| |callingPackage|) @@ -1281,7 +1266,7 @@ (|out| (CONCAT (|shoeRemoveStringIfNec| (CONCAT "." |$effectiveFaslType|) |out|) ".clisp")) - ('T (|defaultBootToLispFile| |file|))))))) + (T (|defaultBootToLispFile| |file|))))))) (DEFUN |translateBootFile| (|progname| |options| |file|) (PROG (|outFile|) @@ -1306,7 +1291,7 @@ (|compileLispHandler| |progname| |options| |intFile|)) (DELETE-FILE |intFile|) |objFile|) - ('T NIL)))))) + (T NIL)))))) (EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (|associateRequestWithFileType| (|Option| "translate") "boot" @@ -1325,14 +1310,13 @@ (EVAL (LIST (|bfColonColon| 'FFI 'DEFAULT-FOREIGN-LIBRARY) |m|))) ((|%hasFeature| :ECL) (EVAL (LIST (|bfColonColon| 'FFI 'LOAD-FOREIGN-LIBRARY) |m|))) - ('T - (|coreError| "don't know how to load a dynamically linked module")))) + (T (|coreError| + "don't know how to load a dynamically linked module")))) (DEFUN |loadSystemRuntimeCore| () (COND ((OR (|%hasFeature| :ECL) (|%hasFeature| :GCL)) NIL) - ('T - (|loadNativeModule| - (CONCAT (|systemLibraryDirectory|) "libopen-axiom-core" - |$NativeModuleExt|))))) + (T (|loadNativeModule| + (CONCAT (|systemLibraryDirectory|) "libopen-axiom-core" + |$NativeModuleExt|))))) |