Changeset 6255

Timestamp:

Apr 11, 2007, 3:11:04 AM (18 years ago)

Author:

Gary Byers

Message:

Set IOBLOCK-ELEMENT-TYPE to CHARACTER for bivalent streams.

STREAM-ELEMENT-TYPE of BASIC-STREAM, BUFFERED-STREAM-MIXIN: don't maintain
the element-type separately, just look in ioblock. (STREAM-ELEMENT-TYPE
isn't required to work on closed streams.)

File:

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

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

@@ -3083 +3083 @@
       (setup-ioblock-output ioblock character-p element-type sharing encoding line-termination))
     (when element-type
-      (setf (ioblock-element-type ioblock) element-type))
+      (setf (ioblock-element-type ioblock) (if character-p 'character element-type)))
 ;    (when element-shift
 ;      (setf (ioblock-element-shift ioblock) element-shift))
@@ -3537 +3537 @@
     (gvector :basic-stream class 0 nil nil)))
 
-(defmethod initialize-basic-stream ((s basic-stream) &key element-type &allow-other-keys)
-  (setf (getf (basic-stream.info s) :element-type) element-type))
-
+
+(defmethod initialize-basic-stream ((s basic-stream) &key &allow-other-keys)
+  )
+  
 (defmethod initialize-basic-stream :after  ((s basic-input-stream) &key &allow-other-keys)
   (setf (basic-stream.flags s)
@@ -4587 +4588 @@
 
 (defclass buffered-stream-mixin ()
-  ((ioblock :reader %stream-ioblock :writer (setf stream-ioblock) :initform nil)
-   (element-type :initarg :element-type :reader %buffered-stream-element-type)))
+  ((ioblock :reader %stream-ioblock :writer (setf stream-ioblock) :initform nil)))
 
 (defmethod open-stream-p ((s buffered-stream-mixin))
@@ -4612 +4612 @@
   
 (defmethod stream-element-type ((s buffered-stream-mixin))
-  (%buffered-stream-element-type s))
+  (ioblock-element-type (stream-ioblock s t)))
 
 (defmethod stream-element-type ((s basic-stream))
-  (getf (basic-stream.info s) :element-type))
+  (ioblock-element-type (basic-stream-ioblock s)))