diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-05-04 20:56:18 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-05-04 20:56:18 +0000 |
| commit | accf24b495a8de5bac09572e588d9b696a130e1a (patch) | |
| tree | f88693858ed460c9b92a97effd0b4fac5dca234b /src/boot/strap | |
| parent | 7c728cac1d19bad7ed597c881fa6c1c0588e0e2c (diff) | |
| download | open-axiom-accf24b495a8de5bac09572e588d9b696a130e1a.tar.gz | |
* boot/initial-env.lisp (shoeOpenOutputFile): Remove. Adjust
callers to use outputTextFile.
Diffstat (limited to 'src/boot/strap')
| -rw-r--r-- | src/boot/strap/translator.clisp | 94 |
1 files changed, 51 insertions, 43 deletions
diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp index d0fe10fd..3ad025ec 100644 --- a/src/boot/strap/translator.clisp +++ b/src/boot/strap/translator.clisp @@ -159,26 +159,28 @@ (|closeFile| |a|))))) (DEFUN |shoeClLines| (|a| |fn| |lines| |outfn|) - (PROG (|$GenVarCounter|) + (PROG (|$GenVarCounter| |stream|) (DECLARE (SPECIAL |$GenVarCounter|)) (RETURN (COND ((NULL |a|) (|shoeNotFound| |fn|)) (T (SETQ |$GenVarCounter| 0) - (|shoeOpenOutputFile| |stream| |outfn| - (PROGN - (|genOptimizeOptions| |stream|) - (LET ((|bfVar#7| |lines|) (|line| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#7|) - (PROGN (SETQ |line| (CAR |bfVar#7|)) NIL)) - (RETURN NIL)) - (T (|shoeFileLine| |line| |stream|))) - (SETQ |bfVar#7| (CDR |bfVar#7|)))) - (|shoeFileTrees| (|shoeTransformStream| |a|) |stream|) - (|genModuleFinalization| |stream|))) - |outfn|))))) + (UNWIND-PROTECT + (PROGN + (SETQ |stream| (|outputTextFile| |outfn|)) + (|genOptimizeOptions| |stream|) + (LET ((|bfVar#7| |lines|) (|line| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#7|) + (PROGN (SETQ |line| (CAR |bfVar#7|)) NIL)) + (RETURN NIL)) + (T (|shoeFileLine| |line| |stream|))) + (SETQ |bfVar#7| (CDR |bfVar#7|)))) + (|shoeFileTrees| (|shoeTransformStream| |a|) |stream|) + (|genModuleFinalization| |stream|) + |outfn|) + (|closeFile| |stream|))))))) (DEFUN BOOTTOCLC (|fn| |out|) (PROG (|result| |callingPackage|) @@ -203,31 +205,32 @@ (|closeFile| |a|))))) (DEFUN |shoeClCLines| (|a| |fn| |lines| |outfn|) - (PROG (|$GenVarCounter|) + (PROG (|$GenVarCounter| |stream|) (DECLARE (SPECIAL |$GenVarCounter|)) (RETURN (COND ((NULL |a|) (|shoeNotFound| |fn|)) (T (SETQ |$GenVarCounter| 0) - (|shoeOpenOutputFile| |stream| |outfn| - (PROGN - (|genOptimizeOptions| |stream|) - (LET ((|bfVar#8| |lines|) (|line| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#8|) - (PROGN (SETQ |line| (CAR |bfVar#8|)) NIL)) - (RETURN NIL)) - (T (|shoeFileLine| |line| |stream|))) - (SETQ |bfVar#8| (CDR |bfVar#8|)))) - (|shoeFileTrees| - (|shoeTransformToFile| |stream| - (|shoeInclude| - (|bAddLineNumber| (|bRgen| |a|) - (|bIgen| 0)))) - |stream|) - (|genModuleFinalization| |stream|))) - |outfn|))))) + (UNWIND-PROTECT + (PROGN + (SETQ |stream| (|outputTextFile| |outfn|)) + (|genOptimizeOptions| |stream|) + (LET ((|bfVar#8| |lines|) (|line| NIL)) + (LOOP + (COND + ((OR (ATOM |bfVar#8|) + (PROGN (SETQ |line| (CAR |bfVar#8|)) NIL)) + (RETURN NIL)) + (T (|shoeFileLine| |line| |stream|))) + (SETQ |bfVar#8| (CDR |bfVar#8|)))) + (|shoeFileTrees| + (|shoeTransformToFile| |stream| + (|shoeInclude| + (|bAddLineNumber| (|bRgen| |a|) (|bIgen| 0)))) + |stream|) + (|genModuleFinalization| |stream|) + |outfn|) + (|closeFile| |stream|))))))) (DECLAIM (FTYPE (FUNCTION (|%String|) |%Thing|) BOOTTOMC)) @@ -535,7 +538,7 @@ (SETQ |$bpParenCount| 0) (|bpFirstTok|) (SETQ |found| - (LET ((#0=#:G1362 + (LET ((#0=#:G1364 (CATCH :OPEN-AXIOM-CATCH-POINT (|bpOutItem|)))) (COND ((AND (CONSP #0#) @@ -832,7 +835,7 @@ (DEFUN |shoeDfu| (|a| |fn|) (PROG (|$bfClamming| |$GenVarCounter| |$bootDefinedTwice| |$bootUsed| - |$bootDefined| |$lispWordTable| |out|) + |$bootDefined| |$lispWordTable| |stream|) (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter| |$bootDefinedTwice| |$bootUsed| |$bootDefined| |$lispWordTable|)) @@ -847,10 +850,12 @@ (SETQ |$bootDefinedTwice| NIL) (SETQ |$GenVarCounter| 0) (SETQ |$bfClamming| NIL) (|shoeDefUse| (|shoeTransformStream| |a|)) - (SETQ |out| (CONCAT |fn| ".defuse")) - (|shoeOpenOutputFile| |stream| |out| + (UNWIND-PROTECT + (PROGN + (SETQ |stream| + (|outputTextFile| (CONCAT |fn| ".defuse"))) (|shoeReport| |stream|)) - |out|))))) + (|closeFile| |stream|))))))) (DEFUN |shoeReport| (|stream|) (PROG (|b| |a|) @@ -1147,9 +1152,12 @@ (SETQ |$GenVarCounter| 0) (SETQ |$bfClamming| NIL) (|shoeDefUse| (|shoeTransformStream| |a|)) (SETQ |out| (CONCAT |fn| ".xref")) - (|shoeOpenOutputFile| |stream| |out| - (|shoeXReport| |stream|)) - |out|))))) + (UNWIND-PROTECT + (PROGN + (SETQ |out| (|outputTextFile| |out|)) + (|shoeXReport| |stream|) + |out|) + (|closeFile| |stream|))))))) (DEFUN |shoeXReport| (|stream|) (PROG (|a| |c|) |