From c220d4d9a44a3828d96e55b1b1a0756d3acea9fe Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 29 May 2011 02:28:09 +0000 Subject: * interp/sys-utility.boot (displayTextFile): New. * interp/i-syscmd.boot (summary): Use it. (copyright): Likewise. * algebra/net.spad.pamphlet: Replace closeFile with closeStream. * boot/translator.boot: Likewise. * interp/as.boot: Likewise. * interp/ax.boot: Likewise. * interp/br-saturn.boot: Likewise. * interp/br-search.boot: Likewise. --- src/boot/ast.boot | 2 +- src/boot/strap/translator.clisp | 24 ++++++++++++------------ src/boot/translator.boot | 24 ++++++++++++------------ 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src/boot') diff --git a/src/boot/ast.boot b/src/boot/ast.boot index 6327d8fa..3201d249 100644 --- a/src/boot/ast.boot +++ b/src/boot/ast.boot @@ -104,7 +104,7 @@ structure %Ast == %Leave(%Ast) -- leave x %Throw(%Ast) -- throw OutOfRange 3 %Catch(%Signature,%Ast) -- catch(x: OutOfRange) => print x - %Finally(%Ast) -- finally closeFile f + %Finally(%Ast) -- finally closeStream f %Try(%Ast,%Sequence) -- try x / y catch DivisionByZero %Where(%Ast,%Sequence) -- e where f x == y %Structure(%Ast,%Sequence) -- structure Foo == ... diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp index b7170014..54c28449 100644 --- a/src/boot/strap/translator.clisp +++ b/src/boot/strap/translator.clisp @@ -151,7 +151,7 @@ (PROGN (SETQ |a| (|inputTextFile| (|shoeAddbootIfNec| |fn|))) (|shoeClLines| |a| |fn| |lines| |outfn|)) - (|closeFile| |a|))))) + (|closeStream| |a|))))) (DEFUN |shoeClLines| (|a| |fn| |lines| |outfn|) (PROG (|stream|) @@ -173,7 +173,7 @@ (|shoeFileTrees| (|shoeTransformStream| |a|) |stream|) (|genModuleFinalization| |stream|) |outfn|) - (|closeFile| |stream|))))))) + (|closeStream| |stream|))))))) (DEFUN BOOTTOCLC (|fn| |out|) (UNWIND-PROTECT @@ -190,7 +190,7 @@ (PROGN (SETQ |a| (|inputTextFile| (|shoeAddbootIfNec| |fn|))) (|shoeClCLines| |a| |fn| |lines| |outfn|)) - (|closeFile| |a|))))) + (|closeStream| |a|))))) (DEFUN |shoeClCLines| (|a| |fn| |lines| |outfn|) (PROG (|stream|) @@ -216,7 +216,7 @@ |stream|) (|genModuleFinalization| |stream|) |outfn|) - (|closeFile| |stream|))))))) + (|closeStream| |stream|))))))) (DECLAIM (FTYPE (FUNCTION (|%String|) |%Thing|) BOOTTOMC)) @@ -231,7 +231,7 @@ (SETQ |a| (|inputTextFile| (|shoeAddbootIfNec| |fn|))) (|shoeMc| |a| |fn|)) (PROGN - (|closeFile| |a|) + (|closeStream| |a|) (|setCurrentPackage| |callingPackage|))))))) (DEFUN |shoeMc| (|a| |fn|) @@ -254,7 +254,7 @@ (PROGN (SETQ |a| (|inputTextFile| |infn|)) (|shoeClLines| |a| |infn| NIL |outfn|)) - (PROGN (|closeFile| |a|) (|setCurrentPackage| |b|))) + (PROGN (|closeStream| |a|) (|setCurrentPackage| |b|))) (LOAD |outfn|))))) (DECLAIM (FTYPE (FUNCTION (|%String|) |%Thing|) BO)) @@ -269,7 +269,7 @@ (PROGN (SETQ |a| (|inputTextFile| (|shoeAddbootIfNec| |fn|))) (|shoeToConsole| |a| |fn|)) - (PROGN (|closeFile| |a|) (|setCurrentPackage| |b|))))))) + (PROGN (|closeStream| |a|) (|setCurrentPackage| |b|))))))) (DEFUN BOCLAM (|fn|) (PROG (|$bfClamming| |a| |callingPackage|) @@ -284,7 +284,7 @@ (SETQ |a| (|inputTextFile| (|shoeAddbootIfNec| |fn|))) (|shoeToConsole| |a| |fn|)) (PROGN - (|closeFile| |a|) + (|closeStream| |a|) (|setCurrentPackage| |callingPackage|))))))) (DEFUN |shoeToConsole| (|a| |fn|) @@ -795,7 +795,7 @@ (PROGN (SETQ |a| (|inputTextFile| (CONCAT |fn| ".boot"))) (|shoeDfu| |a| |fn|)) - (|closeFile| |a|))))) + (|closeStream| |a|))))) (DEFPARAMETER |$bootDefined| NIL) @@ -825,7 +825,7 @@ (SETQ |stream| (|outputTextFile| (CONCAT |fn| ".defuse"))) (|shoeReport| |stream|)) - (|closeFile| |stream|))))))) + (|closeStream| |stream|))))))) (DEFUN |shoeReport| (|stream|) (PROG (|b| |a|) @@ -1104,7 +1104,7 @@ (PROGN (SETQ |a| (|inputTextFile| (CONCAT |fn| ".boot"))) (|shoeXref| |a| |fn|)) - (|closeFile| |a|))))) + (|closeStream| |a|))))) (DEFUN |shoeXref| (|a| |fn|) (PROG (|$bfClamming| |$bootUsed| |$bootDefined| |$lispWordTable| @@ -1127,7 +1127,7 @@ (SETQ |stream| (|outputTextFile| |out|)) (|shoeXReport| |stream|) |out|) - (|closeFile| |stream|))))))) + (|closeStream| |stream|))))))) (DEFUN |shoeXReport| (|stream|) (PROG (|a| |c|) diff --git a/src/boot/translator.boot b/src/boot/translator.boot index 89a4059a..e606da82 100644 --- a/src/boot/translator.boot +++ b/src/boot/translator.boot @@ -105,7 +105,7 @@ BOOTTOCLLINES(lines, fn, outfn)== try a := inputTextFile shoeAddbootIfNec fn shoeClLines(a,fn,lines,outfn) - finally closeFile a + finally closeStream a shoeClLines(a,fn,lines,outfn)== a=nil => shoeNotFound fn @@ -117,7 +117,7 @@ shoeClLines(a,fn,lines,outfn)== shoeFileTrees(shoeTransformStream a,stream) genModuleFinalization stream outfn - finally closeFile stream + finally closeStream stream ++ (boottoclc "filename") translates the file "filename.boot" to ++ the common lisp file "filename.clisp" with the original boot @@ -133,7 +133,7 @@ BOOTTOCLCLINES(lines, fn, outfn)== try a := inputTextFile shoeAddbootIfNec fn shoeClCLines(a,fn,lines,outfn) - finally closeFile a + finally closeStream a shoeClCLines(a,fn,lines,outfn)== a=nil => shoeNotFound fn @@ -146,7 +146,7 @@ shoeClCLines(a,fn,lines,outfn)== shoeInclude bAddLineNumber(bRgen a,bIgen 0)),stream) genModuleFinalization(stream) outfn - finally closeFile stream + finally closeStream stream ++ (boottomc "filename") translates the file "filename.boot" ++ to machine code and loads it one item at a time @@ -158,7 +158,7 @@ BOOTTOMC fn== a := inputTextFile shoeAddbootIfNec fn shoeMc(a,fn) finally - closeFile a + closeStream a setCurrentPackage callingPackage shoeMc(a,fn)== @@ -175,7 +175,7 @@ evalBootFile fn == a := inputTextFile infn shoeClLines(a,infn,[],outfn) finally - closeFile a + closeStream a setCurrentPackage b LOAD outfn @@ -189,7 +189,7 @@ BO fn== a := inputTextFile shoeAddbootIfNec fn shoeToConsole(a,fn) finally - closeFile a + closeStream a setCurrentPackage b BOCLAM fn== @@ -200,7 +200,7 @@ BOCLAM fn== a := inputTextFile shoeAddbootIfNec fn shoeToConsole(a,fn) finally - closeFile a + closeStream a setCurrentPackage callingPackage shoeToConsole(a,fn)== @@ -501,7 +501,7 @@ DEFUSE fn== try a := inputTextFile strconc(fn,'".boot") shoeDfu(a,fn) - finally closeFile a + finally closeStream a --% $bootDefined := nil @@ -521,7 +521,7 @@ shoeDfu(a,fn)== try stream := outputTextFile strconc(fn,'".defuse") shoeReport stream - finally closeFile stream + finally closeStream stream shoeReport stream== shoeFileLine('"DEFINED and not USED",stream) @@ -623,7 +623,7 @@ XREF fn== try a := inputTextFile strconc(fn,'".boot") shoeXref(a,fn) - finally closeFile a + finally closeStream a shoeXref(a,fn)== a = nil => shoeNotFound fn @@ -638,7 +638,7 @@ shoeXref(a,fn)== stream := outputTextFile out shoeXReport stream out - finally closeFile stream + finally closeStream stream shoeXReport stream== -- cgit v1.2.3