diff options
author | dos-reis <gdr@axiomatics.org> | 2008-03-25 21:33:58 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2008-03-25 21:33:58 +0000 |
commit | 68c6afce19df6a92b0569a23bcfe3a73f109b754 (patch) | |
tree | 4091c71856bf51388d07c677191ba13d2457128a /src/interp/spad.lisp | |
parent | daed04c57b8ff8c3be53a5a183635c5687ab7bf6 (diff) | |
download | open-axiom-68c6afce19df6a92b0569a23bcfe3a73f109b754.tar.gz |
* interp/bootlex.lisp: Import "sys-globals".
Consistently use $InputStream and $OutputStream for I/O.
* interp/c-util.boot: Likewise.
* interp/comp.lisp: Likewise.
* interp/compat.boot: Likewise.
* interp/debug.lisp: Likewise.
* interp/def.lisp: Likewise.
* interp/g-error.boot: Likewise.
* interp/i-toplev.boot: Likewise.
* interp/int-top.boot: Likewise.
* interp/intfile.boot: Likewise.
* interp/lisplib.boot: Likewise.
* interp/macros.lisp: Likewise.
* interp/metalex.lisp: Likewise.
* interp/msgdb.boot: Likewise.
* interp/patches.lisp: Likewise.
* interp/preparse.lisp: Likewise.
* interp/server.boot: Likewise.
* interp/spad-parser.boot: Likewise.
* interp/spad.lisp: Likewise.
* interp/sys-globals.boot: Likewise.
* interp/sys-macros.lisp: Likewise.
* interp/sys-os.boot: Likewise.
* interp/unlisp.lisp: Likewise.
* interp/vmlisp.lisp: Likewise.
* interp/Makefile.pamphlet (bootlex.$(FASLEXT)): Require
sys-globals.$(FASLEXT) too.
(vmlisp.$(FASLEXT)): Likewise.
Diffstat (limited to 'src/interp/spad.lisp')
-rw-r--r-- | src/interp/spad.lisp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/interp/spad.lisp b/src/interp/spad.lisp index 0ef5b248..ee3dbd50 100644 --- a/src/interp/spad.lisp +++ b/src/interp/spad.lisp @@ -311,8 +311,8 @@ (|$genSDVar| 0) (|$VariableCount| 0) (|$previousTime| (TEMPUS-FUGIT))) - (prog ((CURSTRM CUROUTSTREAM) |$s| |$x| |$m| u) - (declare (special CURSTRM |$s| |$x| |$m| CUROUTSTREAM)) + (prog ((CURSTRM |$OutputStream|) |$s| |$x| |$m| u) + (declare (special CURSTRM |$s| |$x| |$m|)) (SETQ |$exitModeStack| ()) (SETQ |$postStack| nil) (SETQ |$TraceFlag| T) @@ -361,9 +361,9 @@ (SETQ SINGLELINEMODE T) ; SEE NewSYSTOK (SETQ NewFLAG T) (SETQ ULCASEFG T) - (setq STR (|New,ENTRY,2| '|PARSE-NewEXPR| '|process| curinstream)) + (setq STR (|New,ENTRY,2| '|PARSE-NewEXPR| '|process| |$InputStream|)) (if (/= 0 (setq N (NOTE STR))) - (progn (SETQ CURINSTREAM (POINTW N CURINSTREAM))) + (progn (SETQ |$InputStream| (POINTW N |$InputStream|))) ) '|END_OF_New|)) @@ -377,7 +377,7 @@ (defun INITIALIZE () (init-boot/spad-reader) - (initialize-preparse INPUTSTREAM)) + (initialize-preparse |$InputStream|)) (defmacro try (X) `(LET ((|$autoLine|)) |