diff options
| author | dos-reis <gdr@axiomatics.org> | 2013-06-30 23:45:16 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2013-06-30 23:45:16 +0000 |
| commit | 09de7e4ede72b8eaa1c42e8d08e338bfe9945f2c (patch) | |
| tree | 873c23ffce30f1b83b08500e1a7a8e88e07fb482 | |
| parent | a55fc6a97340fb8a42eab82f97f1693971e75567 (diff) | |
| download | open-axiom-09de7e4ede72b8eaa1c42e8d08e338bfe9945f2c.tar.gz | |
Tidy detection of terminal in CLisp.
| -rw-r--r-- | src/interp/vmlisp.lisp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp index 8528cb17..68735213 100644 --- a/src/interp/vmlisp.lisp +++ b/src/interp/vmlisp.lisp @@ -294,14 +294,14 @@ ; 9.13 Streams -#+KCL -(defun |ioTerminal?| (stream) - (and (streamp stream) (output-stream-p stream) - (eq (system:fp-output-stream stream) - (system:fp-output-stream *terminal-io*)))) - -#-KCL (defun |ioTerminal?| (stream) + #+:gcl (and (streamp stream) (output-stream-p stream) + (eq (system:fp-output-stream stream) + (system:fp-output-stream *terminal-io*))) + #+:clisp (or (eq stream *terminal-io*) + (and (typep stream 'synonym-stream) + (|ioTerminal?| (symbol-value (synonym-stream-symbol stream))))) + #-(or :clisp :gcl) (cond ((not (streamp stream)) nil) ((not (typep stream 'synonym-stream)) @@ -1421,10 +1421,6 @@ ((PROGN (NEXTSTRMLINE STRM) (STRMBLANKLINE STRM)) STRM) ((STRMSKIPTOBLANK STRM)))) -(DEFUN CURINPUTLINE () (CURSTRMLINE |$InputStream|)) - -(DEFUN NEXTINPUTLINE () (NEXTSTRMLINE |$InputStream|)) - ; 22.3 Output Functions ; 22.3.1 Output to Character Streams |