[armedbear-cvs] r12373 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Wed Jan 13 14:55:22 2010
New Revision: 12373

Log:
Change parents of FUNDAMENTAL-STREAM in Gray streams.
  Note: includes experimental removal of override of TWO-WAY-STREAM.

Modified:
   trunk/abcl/src/org/armedbear/lisp/gray-streams.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/gray-streams.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/gray-streams.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/gray-streams.lisp	Wed Jan 13 14:55:22 2010
@@ -179,7 +179,7 @@
   (or (xp::xp-structure-p stream)
       (funcall *old-streamp* stream)))
 
-(defclass fundamental-stream ())
+(defclass fundamental-stream (standard-object stream))
 
 (defgeneric gray-close (stream &key abort))
 (defgeneric gray-open-stream-p (stream))
@@ -545,7 +545,8 @@
       (funcall *old-read-sequence* sequence stream :start start :end end)
       (stream-read-sequence stream sequence start end)))
 
-(defstruct two-way-stream-g
+#|
+(defstruct (two-way-stream-g (:include stream))
   input-stream output-stream)
 
 (defun gray-make-two-way-stream (in out)
@@ -563,6 +564,8 @@
       (funcall *old-two-way-stream-output-stream* stream)
       (two-way-stream-g-output-stream stream)))
 
+|#
+
 (setf (symbol-function 'common-lisp::read-char) #'gray-read-char)
 (setf (symbol-function 'common-lisp::peek-char) #'gray-peek-char)
 (setf (symbol-function 'common-lisp::unread-char) #'gray-unread-char)
@@ -589,8 +592,11 @@
 (setf (symbol-function 'common-lisp::streamp) #'gray-streamp)
 (setf (symbol-function 'common-lisp::read-sequence) #'gray-read-sequence)
 (setf (symbol-function 'common-lisp::write-sequence) #'gray-write-sequence)
+
+#|
 (setf (symbol-function 'common-lisp::make-two-way-stream) #'gray-make-two-way-stream)
 (setf (symbol-function 'common-lisp::two-way-stream-input-stream) #'gray-two-way-stream-input-stream)
 (setf (symbol-function 'common-lisp::two-way-stream-output-stream) #'gray-two-way-stream-output-stream)
+|#
 
 (provide 'gray-streams)