Changeset 5673

Timestamp:

Jan 2, 2007, 8:57:19 AM (18 years ago)

Author:

Gary Byers

Message:

DOH! STREAM-READ-LINE method on BASIC-CHARACTER-INPUT-STREAM returns both values.

"Composite" (two-way, concatenated, etc) streams need a close protocol.

File:

• trunk/ccl/level-1/l1-streams.lisp (modified) (3 diffs)

trunk/ccl/level-1/l1-streams.lisp

@@ -3687 +3687 @@
   (let* ((ioblock (basic-stream-ioblock stream)))
     (with-ioblock-input-locked (ioblock)
-      (values
-       (funcall (ioblock-read-line-function ioblock) ioblock)))))
+      (funcall (ioblock-read-line-function ioblock) ioblock))))
 
                              
@@ -3749 +3748 @@
   (make-instance 'synonym-stream :symbol (require-type symbol 'symbol)))
 
+;;;
+(defclass composite-stream-mixin ()
+    ((open-p :initform t)))
+
+(defmethod close :after ((stream composite-stream-mixin) &key abort)
+  (declare (ignore abort))
+  (with-slots (open-p) stream
+    (setq open-p nil)))
+
+(defmethod open-stream-p ((stream composite-stream-mixin))
+  (slot-value stream 'open-p))
+
 
 
 ;;; Two-way streams.
-(defclass two-way-stream (fundamental-input-stream fundamental-output-stream)
+(defclass two-way-stream (composite-stream-mixin fundamental-input-stream fundamental-output-stream)
     ((input-stream :initarg :input-stream :accessor two-way-stream-input-stream)
      (output-stream :initarg :output-stream :accessor two-way-stream-output-stream)))
@@ -3910 +3921 @@
 ;;;concatenated-streams
 
-(defclass concatenated-stream (fundamental-input-stream)
-    ((stream :initarg :streams :accessor concatenated-stream-streams)))
+(defclass concatenated-stream (composite-stream-mixin fundamental-input-stream)
+    ((streams :initarg :streams :accessor concatenated-stream-streams)))
+
 
 (defun concatenated-stream-current-input-stream (s)