Changeset 5575

Timestamp:

Dec 3, 2006, 4:09:16 AM (18 years ago)

Author:

Gary Byers

Message:

Tweak stream hierarchy a little, to avoid some NO-NEXT-METHODs.

File:

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

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

@@ -3405 +3405 @@
 ;;; array and that the 'start' and 'end' arguments are sane.
 
-(defmethod stream-write-vector ((stream fundamental-character-output-stream)
+(defmethod stream-write-vector ((stream character-output-stream)
                                 vector start end)
   (declare (fixnum start end))
@@ -3411 +3411 @@
        ((= i end))
     (declare (fixnum i))
-    (stream-write-char stream (uvref vector i))))
-
-(defmethod stream-write-vector ((stream fundamental-binary-output-stream)
+    (write-char (uvref vector i) stream)))
+
+(defmethod stream-write-vector ((stream binary-output-stream)
                                 vector start end)
   (declare (fixnum start end))
@@ -3419 +3419 @@
        ((= i end))
     (declare (fixnum i))
-    (stream-write-byte stream (uvref vector i))))
-
-(defmethod stream-read-vector ((stream fundamental-character-input-stream)
+    (write-byte (uvref vector i) stream)))
+
+(defmethod stream-read-vector ((stream character-input-stream)
                                vector start end)
   (generic-character-read-vector stream vector start end))
 
 
-(defmethod stream-read-vector ((stream fundamental-binary-input-stream)
+(defmethod stream-read-vector ((stream binary-input-stream)
                                vector start end)
   (declare (fixnum start end))
@@ -3432 +3432 @@
        ((= i end) end)
     (declare (fixnum i))
-    (let* ((b (stream-read-byte stream)))
+    (let* ((b (read-byte stream)))
       (if (eq b :eof)
         (return i)
@@ -3573 +3573 @@
     (stream-write-char stream (pop list))))
 
-(defmethod stream-read-list ((stream fundamental-character-input-stream)
+(defmethod stream-read-list ((stream character-input-stream)
                              list count)
   (generic-character-read-list stream list count))
 
-(defmethod stream-read-list ((stream basic-character-input-stream)
-                             list count)
-  (generic-character-read-list stream list count))
 
 (defmethod stream-write-list ((stream fundamental-binary-output-stream)
@@ -3599 +3596 @@
         (write-byte element stream)))))
 
-(defmethod stream-read-list ((stream fundamental-binary-input-stream)
-                             list count)
-  (declare (fixnum count))
-  (do* ((tail list (cdr tail))
-        (i 0 (1+ i)))
-       ((= i count) count)
-    (declare (fixnum i))
-    (let* ((b (stream-read-byte stream)))
-      (if (eq b :eof)
-        (return i)
-        (rplaca tail b)))))
-
-(defmethod stream-read-list ((stream basic-binary-input-stream)
+(defmethod stream-read-list ((stream binary-input-stream)
                              list count)
   (declare (fixnum count))
@@ -3623 +3608 @@
         (rplaca tail b)))))
 
-(defmethod stream-read-vector ((stream basic-character-input-stream)
-                               vector start end)
-  (generic-character-read-vector stream vector start end))
-
-(defmethod stream-read-vector ((stream basic-binary-input-stream)
+
+
+
+
+(defmethod stream-read-vector ((stream binary-input-stream)
                                vector start end)
   (declare (fixnum start end))
@@ -3633 +3618 @@
        ((= i end) end)
     (declare (fixnum i))
-    (let* ((b (stream-read-byte stream)))
+    (let* ((b (read-byte stream)))
       (if (eq b :eof)
         (return i)
@@ -3681 +3666 @@
   (declare (fixnum start end))
   (if (not (typep vector 'simple-base-string))
-    (call-next-method)
+    (generic-character-read-vector stream vector start end)
     (let* ((ioblock (basic-stream-ioblock stream)))
       (with-ioblock-input-locked (ioblock)