From fc5f21dee871bb57e18ecd0818333a11eba76ed9 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Mon, 20 Aug 2012 10:46:46 +0000 Subject: * interp/spad.lisp (SPAD): Remove obfuscated binding of OUT-STREAM. * interp/spad-parser.boot (paarseEcho): Use $OutputStream in lieu of OUT-STREAM. * interp/server.boot (serverReadLine): Do not bind IN-STEEAM and *EOF*. Tidy. * interp/lexing.boot (IN-TREAM): Remove definition. (OUT-STREAM): Likewise. * interp/int-top.boot (runspad): Do not bind IN-STREAM and *EOF*. (SpadInterpretStream): Remove $shoeReadLineFunction binding. * interp/debug.lisp: Replace IN-STREAM with $InputStream and OUT-STREAM with $OutputStream. --- src/interp/debug.lisp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/interp/debug.lisp') diff --git a/src/interp/debug.lisp b/src/interp/debug.lisp index 2b3205ab..bb7351e9 100644 --- a/src/interp/debug.lisp +++ b/src/interp/debug.lisp @@ -1129,7 +1129,7 @@ EXAMINE (SETQ RECNO (NOTE |$InputStream|)) (defun SPAD_SYNTAX_ERROR (rd) "Print syntax error indication, underline character, scrub line." (BUMPERRORCOUNT '|syntax|) - (COND ((AND (EQ DEBUGMODE 'YES) (NOT(CONSOLEINPUTP IN-STREAM))) + (COND ((AND (EQ DEBUGMODE 'YES) (NOT(CONSOLEINPUTP |$InputStream|))) (SPAD_LONG_ERROR rd)) ((SPAD_SHORT_ERROR rd))) (|ioClear!| rd) @@ -1154,9 +1154,9 @@ EXAMINE (SETQ RECNO (NOTE |$InputStream|)) (if (|tokenType| |$priorToken|) (progn (format t "The prior token was~%") (describe |$priorToken|))) - (unless (EQUAL OUT-STREAM SPADERRORSTREAM) - (SPAD_ERROR_LOC OUT-STREAM) - (TERPRI OUT-STREAM))) + (unless (EQUAL |$OutputStream| SPADERRORSTREAM) + (SPAD_ERROR_LOC |$OutputStream|) + (TERPRI |$OutputStream|))) (defun SPAD_SHORT_ERROR (rd) (|readerPrintCurrentLine| rd)) -- cgit v1.2.3