Fix pprint routines using SYS:OUTPUT-OBJECT to a GRAY-STREAM.

Correct the renaming of ABCL SYSTEM functions that aren't part of the
ANSI standard.
parent 71dc5b19
This diff is collapsed.
......@@ -4,8 +4,8 @@ build.xml.stylesheet.CRC32=be360661
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=742204ce
nbproject/build-impl.xml.script.CRC32=330b50b7
nbproject/build-impl.xml.stylesheet.CRC32=229523de@1.38.3.45
nbproject/build-impl.xml.script.CRC32=1b34e6ea
nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
nbproject/profiler-build-impl.xml.data.CRC32=71623fcd
nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
nbproject/profiler-build-impl.xml.stylesheet.CRC32=42cb6bcf
......@@ -164,9 +164,10 @@
(defvar *ansi-terpri* #'terpri)
(defvar *ansi-write-string* #'write-string)
(defvar *ansi-write-line* #'write-line)
(defvar *ansi-force-output* #'sys::%force-output)
(defvar *ansi-finish-output* #'sys::%finish-output)
(defvar *ansi-clear-output* #'sys::%clear-output)
(defvar *sys-%force-output* #'sys::%force-output)
(defvar *sys-%finish-output* #'sys::%finish-output)
(defvar *sys-%clear-output* #'sys::%clear-output)
(defvar *sys-%output-object* #'sys::%output-object)
(defvar *ansi-clear-input* #'clear-input)
(defvar *ansi-read-byte* #'read-byte)
(defvar *ansi-write-byte* #'write-byte)
......@@ -461,6 +462,13 @@
(funcall *ansi-clear-input* stream)
(stream-clear-input stream))))
(defun gray-output-object (object stream)
(if (ansi-streamp stream)
(funcall *sys-%output-object* object stream)
(stream-write-string stream
(with-output-to-string (s)
(funcall *sys-%output-object* object s)))))
(defun gray-read-char-no-hang (&optional input-stream (eof-errorp t)
eof-value recursive-p)
(let ((stream (decode-read-arg input-stream)))
......@@ -505,19 +513,19 @@
(defun gray-force-output (&optional output-stream)
(let ((stream (decode-print-arg output-stream)))
(if (ansi-streamp stream)
(funcall *ansi-force-output* stream)
(funcall *sys-%force-output* stream)
(stream-force-output stream))))
(defun gray-finish-output (&optional output-stream)
(let ((stream (decode-print-arg output-stream)))
(if (ansi-streamp stream)
(funcall *ansi-finish-output* stream)
(funcall *sys-%finish-output* stream)
(stream-finish-output stream))))
(defun gray-clear-output (&optional output-stream)
(let ((stream (decode-print-arg output-stream)))
(if (ansi-streamp stream)
(funcall *ansi-clear-output* stream)
(funcall *sys-%clear-output* stream)
(stream-clear-output stream))))
(defun gray-read-byte (binary-input-stream &optional (eof-errorp t) eof-value)
......@@ -617,6 +625,7 @@
(setf (symbol-function 'sys::%force-output) #'gray-force-output)
(setf (symbol-function 'sys::%finish-output) #'gray-finish-output)
(setf (symbol-function 'sys::%clear-output) #'gray-clear-output)
(setf (symbol-function 'sys::%output-object) #'gray-output-object)
(setf (symbol-function 'common-lisp::read-byte) #'gray-read-byte)
(setf (symbol-function 'common-lisp::write-byte) #'gray-write-byte)
(setf (symbol-function 'common-lisp::stream-column) #'gray-stream-column)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment