[Sbcl-commits] master: Use appropriate ANSI-STREAM-* functions in ANSI-STREAM-{READ, WRITE}-SEQUENCE

[Jan M. <sc...@us...>]

The branch "master" has been updated in SBCL:
       via  9d81610e5fbdb506f905d3c235c8f665a2bd15bd (commit)
      from  fb51ab6710ea219afb970c86c590b4d81662ed4c (commit)

- Log -----------------------------------------------------------------
commit 9d81610e5fbdb506f905d3c235c8f665a2bd15bd
Author: Jan Moringen <jmo...@te...>
Date:   Sun Nov 15 15:18:54 2015 +0100

    Use appropriate ANSI-STREAM-* functions in ANSI-STREAM-{READ,WRITE}-SEQUENCE
---
 src/code/stream.lisp |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/code/stream.lisp b/src/code/stream.lisp
index 33672bd..1b3f86e 100644
--- a/src/code/stream.lisp
+++ b/src/code/stream.lisp
@@ -1976,9 +1976,9 @@ benefit of the function GET-OUTPUT-STREAM-STRING."
   (declare (type vector vector)
            (type ansi-stream stream))
   (or (and (typep vector '(simple-array (unsigned-byte 8) (*)))
-           (subtypep (stream-element-type stream) '(unsigned-byte 8)))
+           (subtypep (ansi-stream-element-type stream) '(unsigned-byte 8)))
       (and (typep vector '(simple-array (signed-byte 8) (*)))
-           (subtypep (stream-element-type stream) '(signed-byte 8)))))
+           (subtypep (ansi-stream-element-type stream) '(signed-byte 8)))))
 
 (defun ansi-stream-read-sequence (seq stream start %end)
   (declare (type sequence seq)
@@ -1991,7 +1991,7 @@ benefit of the function GET-OUTPUT-STREAM-STRING."
     (etypecase seq
       (list
        (let ((read-function
-              (if (subtypep (stream-element-type stream) 'character)
+              (if (subtypep (ansi-stream-element-type stream) 'character)
                   #'ansi-stream-read-char
                   #'ansi-stream-read-byte)))
          (do ((rem (nthcdr start seq) (rest rem))
@@ -2019,7 +2019,7 @@ benefit of the function GET-OUTPUT-STREAM-STRING."
                                                          start %end))
                (t
                 (let ((read-function
-                       (if (subtypep (stream-element-type stream) 'character)
+                       (if (subtypep (ansi-stream-element-type stream) 'character)
                            ;; If the stream-element-type is CHARACTER,
                            ;; this might be a bivalent stream. If the
                            ;; sequence is a specialized unsigned-byte
@@ -2109,7 +2109,7 @@ benefit of the function GET-OUTPUT-STREAM-STRING."
     (etypecase seq
       (list
        (let ((write-function
-              (if (subtypep (stream-element-type stream) 'character)
+              (if (subtypep (ansi-stream-element-type stream) 'character)
                   (ansi-stream-out stream)
                   (ansi-stream-bout stream))))
          (do ((rem (nthcdr start seq) (rest rem))
@@ -2119,14 +2119,14 @@ benefit of the function GET-OUTPUT-STREAM-STRING."
                     (type index i))
            (funcall write-function stream (first rem)))))
       (string
-       (%write-string seq stream start end))
+       (ansi-stream-write-string seq stream start end))
       (vector
        (with-array-data ((data seq) (offset-start start) (offset-end end)
                          :check-fill-pointer t)
          (labels
              ((output-seq-in-loop ()
                 (let ((write-function
-                       (if (subtypep (stream-element-type stream) 'character)
+                       (if (subtypep (ansi-stream-element-type stream) 'character)
                            (lambda (stream object)
                              ;; This might be a bivalent stream, so we need
                              ;; to dispatch on a per-element basis, rather

-----------------------------------------------------------------------


hooks/post-receive
-- 
SBCL