0.8.8.13:

[sbcl.git] / src / code / stream.lisp

diff --git a/src/code/stream.lisp b/src/code/stream.lisp
index a433a65..5de7271 100644 (file)
--- a/src/code/stream.lisp
+++ b/src/code/stream.lisp
@@ -11,21 +11,17 @@
 
 (in-package "SB!IMPL")
 
 
 (in-package "SB!IMPL")
 

-(deftype string-stream ()
-  '(or string-input-stream string-output-stream
-       fill-pointer-output-stream))
-

 ;;;; standard streams
 
 ;;; The initialization of these streams is performed by
 ;;; STREAM-COLD-INIT-OR-RESET.
 ;;;; standard streams
 
 ;;; The initialization of these streams is performed by
 ;;; STREAM-COLD-INIT-OR-RESET.

-(defvar *terminal-io* () #!+sb-doc "Terminal I/O stream.")
-(defvar *standard-input* () #!+sb-doc "Default input stream.")
-(defvar *standard-output* () #!+sb-doc "Default output stream.")
-(defvar *error-output* () #!+sb-doc "Error output stream.")
-(defvar *query-io* () #!+sb-doc "Query I/O stream.")
-(defvar *trace-output* () #!+sb-doc "Trace output stream.")
-(defvar *debug-io* () #!+sb-doc "Interactive debugging stream.")
+(defvar *terminal-io* () #!+sb-doc "terminal I/O stream")
+(defvar *standard-input* () #!+sb-doc "default input stream")
+(defvar *standard-output* () #!+sb-doc "default output stream")
+(defvar *error-output* () #!+sb-doc "error output stream")
+(defvar *query-io* () #!+sb-doc "query I/O stream")
+(defvar *trace-output* () #!+sb-doc "trace output stream")
+(defvar *debug-io* () #!+sb-doc "interactive debugging stream")

 
 (defun ill-in (stream &rest ignore)
   (declare (ignore ignore))
 
 (defun ill-in (stream &rest ignore)
   (declare (ignore ignore))

@@ -58,157 +54,107 @@
 (defun closed-flame (stream &rest ignore)
   (declare (ignore ignore))
   (error "~S is closed." stream))
 (defun closed-flame (stream &rest ignore)
   (declare (ignore ignore))
   (error "~S is closed." stream))

-(defun do-nothing (&rest ignore)
+(defun no-op-placeholder (&rest ignore)

   (declare (ignore ignore)))
 \f
   (declare (ignore ignore)))
 \f

-;;; HOW THE STREAM STRUCTURE IS USED:
-;;;
-;;; Many of the slots of the stream structure contain functions
-;;; which are called to perform some operation on the stream. Closed
-;;; streams have #'CLOSED-FLAME in all of their function slots. If
-;;; one side of an I/O or echo stream is closed, the whole stream is
-;;; considered closed. The functions in the operation slots take
-;;; arguments as follows:
-;;;
-;;; In:                        Stream, Eof-Errorp, Eof-Value
-;;; Bin:               Stream, Eof-Errorp, Eof-Value
-;;; N-Bin:             Stream, Buffer, Start, Numbytes, Eof-Errorp
-;;; Out:               Stream, Character
-;;; Bout:              Stream, Integer
-;;; Sout:              Stream, String, Start, End
-;;; Misc:              Stream, Operation, &Optional Arg1, Arg2
-;;;
-;;; In order to save space, some of the less common stream operations
-;;; are handled by just one function, the MISC method. This function
-;;; is passed a keyword which indicates the operation to perform.
-;;; The following keywords are used:
-;;;  :listen           - Return the following values:
-;;;                         t if any input waiting.
-;;;                         :eof if at eof.
-;;;                         nil if no input is available and not at eof.
-;;;  :unread           - Unread the character Arg.
-;;;  :close            - Do any stream specific stuff to close the stream.
-;;;                      The methods are set to closed-flame by the close
-;;;                      function, so that need not be done by this
-;;;                      function.
-;;;  :clear-input      - Clear any unread input
-;;;  :finish-output,
-;;;  :force-output     - Cause output to happen
-;;;  :clear-output     - Clear any undone output
-;;;  :element-type     - Return the type of element the stream deals with.
-;;;  :line-length      - Return the length of a line of output.
-;;;  :charpos          - Return current output position on the line.
-;;;  :file-length      - Return the file length of a file stream.
-;;;  :file-position    - Return or change the current position of a
-;;;                       file stream.
-;;;  :file-name                - Return the name of an associated file.
-;;;  :interactive-p     - Is this an interactive device?
-;;;
-;;; In order to do almost anything useful, it is necessary to
-;;; define a new type of structure that includes stream, so that the
-;;; stream can have some state information.
-;;;
-;;; THE STREAM IN-BUFFER:
-;;;
-;;; The IN-BUFFER in the stream holds characters or bytes that
-;;; are ready to be read by some input function. If there is any
-;;; stuff in the IN-BUFFER, then the reading function can use it
-;;; without calling any stream method. Any stream may put stuff in
-;;; the IN-BUFFER, and may also assume that any input in the IN-BUFFER
-;;; has been consumed before any in-method is called. If a text
-;;; stream has in IN-BUFFER, then the first character should not be
-;;; used to buffer normal input so that it is free for unreading into.
-;;;
-;;; The IN-BUFFER slot is a vector +IN-BUFFER-LENGTH+ long. The
-;;; IN-INDEX is the index in the IN-BUFFER of the first available
-;;; object. The available objects are thus between IN-INDEX and the
-;;; length of the IN-BUFFER.
-;;;
-;;; When this buffer is only accessed by the normal stream
-;;; functions, the number of function calls is halved, thus
-;;; potentially doubling the speed of simple operations. If the
-;;; FAST-READ-CHAR and FAST-READ-BYTE macros are used, nearly all
-;;; function call overhead is removed, vastly speeding up these
-;;; important operations.
-;;;
-;;; If a stream does not have an IN-BUFFER, then the IN-BUFFER slot
-;;; must be nil, and the IN-INDEX must be +IN-BUFFER-LENGTH+. These are
-;;; the default values for the slots.
-\f

 ;;; stream manipulation functions
 
 ;;; stream manipulation functions
 

-(defun input-stream-p (stream)
-  (declare (type stream stream))
+(declaim (inline ansi-stream-input-stream-p))
+(defun ansi-stream-input-stream-p (stream)
+  (declare (type ansi-stream stream))

 
 

-  #!+high-security

   (when (synonym-stream-p stream)
     (setf stream
          (symbol-value (synonym-stream-symbol stream))))
 
   (when (synonym-stream-p stream)
     (setf stream
          (symbol-value (synonym-stream-symbol stream))))
 

-  (and (lisp-stream-p stream)
-       (not (eq (lisp-stream-in stream) #'closed-flame))
+  (and (not (eq (ansi-stream-in stream) #'closed-flame))

        ;;; KLUDGE: It's probably not good to have EQ tests on function
        ;;; values like this. What if someone's redefined the function?
        ;;; Is there a better way? (Perhaps just VALID-FOR-INPUT and
        ;;; VALID-FOR-OUTPUT flags? -- WHN 19990902
        ;;; KLUDGE: It's probably not good to have EQ tests on function
        ;;; values like this. What if someone's redefined the function?
        ;;; Is there a better way? (Perhaps just VALID-FOR-INPUT and
        ;;; VALID-FOR-OUTPUT flags? -- WHN 19990902

-       (or (not (eq (lisp-stream-in stream) #'ill-in))
-          (not (eq (lisp-stream-bin stream) #'ill-bin)))))
+       (or (not (eq (ansi-stream-in stream) #'ill-in))
+          (not (eq (ansi-stream-bin stream) #'ill-bin)))))

 
 

-(defun output-stream-p (stream)
+(defun input-stream-p (stream)

   (declare (type stream stream))
   (declare (type stream stream))

+  (and (ansi-stream-p stream)
+       (ansi-stream-input-stream-p stream)))
+
+(declaim (inline ansi-stream-output-stream-p))
+(defun ansi-stream-output-stream-p (stream)
+  (declare (type ansi-stream stream))

 
 

-  #!+high-security

   (when (synonym-stream-p stream)
     (setf stream (symbol-value
                  (synonym-stream-symbol stream))))
 
   (when (synonym-stream-p stream)
     (setf stream (symbol-value
                  (synonym-stream-symbol stream))))
 

-  (and (lisp-stream-p stream)
-       (not (eq (lisp-stream-in stream) #'closed-flame))
-       (or (not (eq (lisp-stream-out stream) #'ill-out))
-          (not (eq (lisp-stream-bout stream) #'ill-bout)))))
+  (and (not (eq (ansi-stream-in stream) #'closed-flame))
+       (or (not (eq (ansi-stream-out stream) #'ill-out))
+          (not (eq (ansi-stream-bout stream) #'ill-bout)))))

 
 

-(defun open-stream-p (stream)
+(defun output-stream-p (stream)

   (declare (type stream stream))
   (declare (type stream stream))

-  (not (eq (lisp-stream-in stream) #'closed-flame)))
+
+  (and (ansi-stream-p stream)
+       (ansi-stream-output-stream-p stream)))
+
+(declaim (inline ansi-stream-open-stream-p))
+(defun ansi-stream-open-stream-p (stream)
+  (declare (type ansi-stream stream))
+  ;; CLHS 22.1.4 lets us not worry about synonym streams here.
+  (not (eq (ansi-stream-in stream) #'closed-flame)))
+
+(defun open-stream-p (stream)
+  (ansi-stream-open-stream-p stream))
+
+(declaim (inline ansi-stream-element-type))
+(defun ansi-stream-element-type (stream)
+  (declare (type ansi-stream stream))
+  (funcall (ansi-stream-misc stream) stream :element-type))

 
 (defun stream-element-type (stream)
 
 (defun stream-element-type (stream)

-  (declare (type stream stream))
-  (funcall (lisp-stream-misc stream) stream :element-type))
+  (ansi-stream-element-type stream))

 
 (defun interactive-stream-p (stream)
   (declare (type stream stream))
 
 (defun interactive-stream-p (stream)
   (declare (type stream stream))

-  (funcall (lisp-stream-misc stream) stream :interactive-p))
+  (funcall (ansi-stream-misc stream) stream :interactive-p))

 
 

-(defun close (stream &key abort)
-  (declare (type stream stream))
+(declaim (inline ansi-stream-close))
+(defun ansi-stream-close (stream abort)
+  (declare (type ansi-stream stream))

   (when (open-stream-p stream)
   (when (open-stream-p stream)

-    (funcall (lisp-stream-misc stream) stream :close abort))
+    (funcall (ansi-stream-misc stream) stream :close abort))

   t)
 
   t)
 

+(defun close (stream &key abort)
+  (ansi-stream-close stream abort))
+

 (defun set-closed-flame (stream)
 (defun set-closed-flame (stream)

-  (setf (lisp-stream-in stream) #'closed-flame)
-  (setf (lisp-stream-bin stream) #'closed-flame)
-  (setf (lisp-stream-n-bin stream) #'closed-flame)
-  (setf (lisp-stream-in stream) #'closed-flame)
-  (setf (lisp-stream-out stream) #'closed-flame)
-  (setf (lisp-stream-bout stream) #'closed-flame)
-  (setf (lisp-stream-sout stream) #'closed-flame)
-  (setf (lisp-stream-misc stream) #'closed-flame))
+  (setf (ansi-stream-in stream) #'closed-flame)
+  (setf (ansi-stream-bin stream) #'closed-flame)
+  (setf (ansi-stream-n-bin stream) #'closed-flame)
+  (setf (ansi-stream-in stream) #'closed-flame)
+  (setf (ansi-stream-out stream) #'closed-flame)
+  (setf (ansi-stream-bout stream) #'closed-flame)
+  (setf (ansi-stream-sout stream) #'closed-flame)
+  (setf (ansi-stream-misc stream) #'closed-flame))

 \f
 ;;;; file position and file length
 
 ;;; Call the MISC method with the :FILE-POSITION operation.
 (defun file-position (stream &optional position)
   (declare (type stream stream))
 \f
 ;;;; file position and file length
 
 ;;; Call the MISC method with the :FILE-POSITION operation.
 (defun file-position (stream &optional position)
   (declare (type stream stream))

-  (declare (type (or index (member nil :start :end)) position))
+  (declare (type (or index (alien sb!unix:off-t) (member nil :start :end)) position))

   (cond
    (position
   (cond
    (position

-    (setf (lisp-stream-in-index stream) +in-buffer-length+)
-    (funcall (lisp-stream-misc stream) stream :file-position position))
+    (setf (ansi-stream-in-index stream) +ansi-stream-in-buffer-length+)
+    (funcall (ansi-stream-misc stream) stream :file-position position))

    (t
    (t

-    (let ((res (funcall (lisp-stream-misc stream) stream :file-position nil)))
+    (let ((res (funcall (ansi-stream-misc stream) stream :file-position nil)))

       (when res
       (when res

-       (- res (- +in-buffer-length+ (lisp-stream-in-index stream))))))))
+       (- res
+          (- +ansi-stream-in-buffer-length+
+             (ansi-stream-in-index stream))))))))

 
 ;;; This is a literal translation of the ANSI glossary entry "stream
 ;;; associated with a file".
 
 ;;; This is a literal translation of the ANSI glossary entry "stream
 ;;; associated with a file".

@@ -238,15 +184,18 @@
           ;; private predicate function..) is ugly and confusing, but
           ;; I can't see any other way. -- WHN 2001-04-14
           :expected-type '(satisfies stream-associated-with-file-p)
           ;; private predicate function..) is ugly and confusing, but
           ;; I can't see any other way. -- WHN 2001-04-14
           :expected-type '(satisfies stream-associated-with-file-p)

-          :format-string
+          :format-control

           "~@<The stream ~2I~_~S ~I~_isn't associated with a file.~:>"
           :format-arguments (list stream))))
 
 ;;; like FILE-POSITION, only using :FILE-LENGTH
 (defun file-length (stream)
           "~@<The stream ~2I~_~S ~I~_isn't associated with a file.~:>"
           :format-arguments (list stream))))
 
 ;;; like FILE-POSITION, only using :FILE-LENGTH
 (defun file-length (stream)

-  (declare (type (or file-stream synonym-stream) stream))
+  ;; FIXME: The following declaration uses yet undefined types, which
+  ;; cause cross-compiler hangup.
+  ;;
+  ;; (declare (type (or file-stream synonym-stream) stream))

   (stream-must-be-associated-with-file stream)
   (stream-must-be-associated-with-file stream)

-  (funcall (lisp-stream-misc stream) stream :file-length))
+  (funcall (ansi-stream-misc stream) stream :file-length))

 \f
 ;;;; input functions
 
 \f
 ;;;; input functions
 

@@ -254,7 +203,7 @@
                            recursive-p)
   (declare (ignore recursive-p))
   (let ((stream (in-synonym-of stream)))
                            recursive-p)
   (declare (ignore recursive-p))
   (let ((stream (in-synonym-of stream)))

-    (if (lisp-stream-p stream)
+    (if (ansi-stream-p stream)

        (prepare-for-fast-read-char stream
          (let ((res (make-string 80))
                (len 80)
        (prepare-for-fast-read-char stream
          (let ((res (make-string 80))
                (len 80)

@@ -299,7 +248,7 @@
                            recursive-p)
   (declare (ignore recursive-p))
   (let ((stream (in-synonym-of stream)))
                            recursive-p)
   (declare (ignore recursive-p))
   (let ((stream (in-synonym-of stream)))

-    (if (lisp-stream-p stream)
+    (if (ansi-stream-p stream)

        (prepare-for-fast-read-char stream
          (prog1
              (fast-read-char eof-error-p eof-value)
        (prepare-for-fast-read-char stream
          (prog1
              (fast-read-char eof-error-p eof-value)

@@ -312,92 +261,28 @@
 
 (defun unread-char (character &optional (stream *standard-input*))
   (let ((stream (in-synonym-of stream)))
 
 (defun unread-char (character &optional (stream *standard-input*))
   (let ((stream (in-synonym-of stream)))

-    (if (lisp-stream-p stream)
-       (let ((index (1- (lisp-stream-in-index stream)))
-             (buffer (lisp-stream-in-buffer stream)))
+    (if (ansi-stream-p stream)
+       (let ((index (1- (ansi-stream-in-index stream)))
+             (buffer (ansi-stream-in-buffer stream)))

          (declare (fixnum index))
          (when (minusp index) (error "nothing to unread"))
          (cond (buffer
                 (setf (aref buffer index) (char-code character))
          (declare (fixnum index))
          (when (minusp index) (error "nothing to unread"))
          (cond (buffer
                 (setf (aref buffer index) (char-code character))

-                (setf (lisp-stream-in-index stream) index))
+                (setf (ansi-stream-in-index stream) index))

                (t
                (t

-                (funcall (lisp-stream-misc stream) stream
+                (funcall (ansi-stream-misc stream) stream

                          :unread character))))
        ;; must be Gray streams FUNDAMENTAL-STREAM
        (stream-unread-char stream character)))
   nil)
 
                          :unread character))))
        ;; must be Gray streams FUNDAMENTAL-STREAM
        (stream-unread-char stream character)))
   nil)
 

-(defun peek-char (&optional (peek-type nil)
-                           (stream *standard-input*)
-                           (eof-error-p t)
-                           eof-value
-                           recursive-p)
-  (declare (ignore recursive-p))
-  ;; FIXME: The type of PEEK-TYPE is also declared in a DEFKNOWN, but
-  ;; the compiler doesn't seem to be smart enough to go from there to
-  ;; imposing a type check. Figure out why (because PEEK-TYPE is an
-  ;; &OPTIONAL argument?) and fix it, and then this explicit type
-  ;; check can go away.
-  (unless (typep peek-type '(or character boolean))
-    (error 'simple-type-error
-          :datum peek-type
-          :expected-type '(or character boolean)
-          :format-control "~@<bad PEEK-TYPE=~S, ~_expected ~S~:>"
-          :format-arguments (list peek-type '(or character boolean))))
-  (let ((stream (in-synonym-of stream)))
-    (if (lisp-stream-p stream)
-       (let ((char (read-char stream eof-error-p eof-value)))
-         (cond ((eq char eof-value) char)
-               ((characterp peek-type)
-                (do ((char char (read-char stream eof-error-p eof-value)))
-                    ((or (eq char eof-value) (char= char peek-type))
-                     (unless (eq char eof-value)
-                       (unread-char char stream))
-                     char)))
-               ((eq peek-type t)
-                (do ((char char (read-char stream eof-error-p eof-value)))
-                    ((or (eq char eof-value) (not (whitespace-char-p char)))
-                     (unless (eq char eof-value)
-                       (unread-char char stream))
-                     char)))
-               ((null peek-type)
-                (unread-char char stream)
-                char)
-               (t
-                (error "internal error: impossible case"))))
-       ;; by elimination, must be Gray streams FUNDAMENTAL-STREAM
-       (cond ((characterp peek-type)
-              (do ((char (stream-read-char stream)
-                         (stream-read-char stream)))
-                  ((or (eq char :eof) (char= char peek-type))
-                   (cond ((eq char :eof)
-                          (eof-or-lose stream eof-error-p eof-value))
-                         (t
-                          (stream-unread-char stream char)
-                          char)))))
-             ((eq peek-type t)
-              (do ((char (stream-read-char stream)
-                         (stream-read-char stream)))
-                  ((or (eq char :eof) (not (whitespace-char-p char)))
-                   (cond ((eq char :eof)
-                          (eof-or-lose stream eof-error-p eof-value))
-                         (t
-                          (stream-unread-char stream char)
-                          char)))))
-             ((null peek-type)
-              (let ((char (stream-peek-char stream)))
-                (if (eq char :eof)
-                    (eof-or-lose stream eof-error-p eof-value)
-                    char)))
-             (t
-              (error "internal error: impossible case"))))))
-

 (defun listen (&optional (stream *standard-input*))
   (let ((stream (in-synonym-of stream)))
 (defun listen (&optional (stream *standard-input*))
   (let ((stream (in-synonym-of stream)))

-    (if (lisp-stream-p stream)
-       (or (/= (the fixnum (lisp-stream-in-index stream)) +in-buffer-length+)
+    (if (ansi-stream-p stream)
+       (or (/= (the fixnum (ansi-stream-in-index stream))
+               +ansi-stream-in-buffer-length+)

            ;; Test for T explicitly since misc methods return :EOF sometimes.
            ;; Test for T explicitly since misc methods return :EOF sometimes.

-           (eq (funcall (lisp-stream-misc stream) stream :listen) t))
+           (eq (funcall (ansi-stream-misc stream) stream :listen) t))

        ;; Fall through to Gray streams FUNDAMENTAL-STREAM case.
        (stream-listen stream))))
 
        ;; Fall through to Gray streams FUNDAMENTAL-STREAM case.
        (stream-listen stream))))
 

@@ -407,8 +292,8 @@
                                    recursive-p)
   (declare (ignore recursive-p))
   (let ((stream (in-synonym-of stream)))
                                    recursive-p)
   (declare (ignore recursive-p))
   (let ((stream (in-synonym-of stream)))

-    (if (lisp-stream-p stream)
-       (if (funcall (lisp-stream-misc stream) stream :listen)
+    (if (ansi-stream-p stream)
+       (if (funcall (ansi-stream-misc stream) stream :listen)

            ;; On T or :EOF get READ-CHAR to do the work.
            (read-char stream eof-error-p eof-value)
            nil)
            ;; On T or :EOF get READ-CHAR to do the work.
            (read-char stream eof-error-p eof-value)
            nil)

@@ -420,9 +305,9 @@
 
 (defun clear-input (&optional (stream *standard-input*))
   (let ((stream (in-synonym-of stream)))
 
 (defun clear-input (&optional (stream *standard-input*))
   (let ((stream (in-synonym-of stream)))

-    (cond ((lisp-stream-p stream)
-          (setf (lisp-stream-in-index stream) +in-buffer-length+)
-          (funcall (lisp-stream-misc stream) stream :clear-input))
+    (cond ((ansi-stream-p stream)
+          (setf (ansi-stream-in-index stream) +ansi-stream-in-buffer-length+)
+          (funcall (ansi-stream-misc stream) stream :clear-input))

          (t
           (stream-clear-input stream))))
   nil)
          (t
           (stream-clear-input stream))))
   nil)

@@ -430,7 +315,7 @@
 (declaim (maybe-inline read-byte))
 (defun read-byte (stream &optional (eof-error-p t) eof-value)
   (let ((stream (in-synonym-of stream)))
 (declaim (maybe-inline read-byte))
 (defun read-byte (stream &optional (eof-error-p t) eof-value)
   (let ((stream (in-synonym-of stream)))

-    (if (lisp-stream-p stream)
+    (if (ansi-stream-p stream)

        (prepare-for-fast-read-byte stream
          (prog1
              (fast-read-byte eof-error-p eof-value t)
        (prepare-for-fast-read-byte stream
          (prog1
              (fast-read-byte eof-error-p eof-value t)

@@ -452,17 +337,17 @@
 ;;; If we ever need it, it could be added later as a new variant N-BIN
 ;;; method (perhaps N-BIN-ASAP?) or something.
 (defun read-n-bytes (stream buffer start numbytes &optional (eof-error-p t))
 ;;; If we ever need it, it could be added later as a new variant N-BIN
 ;;; method (perhaps N-BIN-ASAP?) or something.
 (defun read-n-bytes (stream buffer start numbytes &optional (eof-error-p t))

-  (declare (type lisp-stream stream)
+  (declare (type ansi-stream stream)

           (type index numbytes start)
           (type (or (simple-array * (*)) system-area-pointer) buffer))
           (type index numbytes start)
           (type (or (simple-array * (*)) system-area-pointer) buffer))

-  (let* ((stream (in-synonym-of stream lisp-stream))
-        (in-buffer (lisp-stream-in-buffer stream))
-        (index (lisp-stream-in-index stream))
-        (num-buffered (- +in-buffer-length+ index)))
+  (let* ((stream (in-synonym-of stream ansi-stream))
+        (in-buffer (ansi-stream-in-buffer stream))
+        (index (ansi-stream-in-index stream))
+        (num-buffered (- +ansi-stream-in-buffer-length+ index)))

     (declare (fixnum index num-buffered))
     (cond
      ((not in-buffer)
     (declare (fixnum index num-buffered))
     (cond
      ((not in-buffer)

-      (funcall (lisp-stream-n-bin stream)
+      (funcall (ansi-stream-n-bin stream)

               stream
               buffer
               start
               stream
               buffer
               start

@@ -471,13 +356,13 @@
      ((<= numbytes num-buffered)
       (%byte-blt in-buffer index
                 buffer start (+ start numbytes))
      ((<= numbytes num-buffered)
       (%byte-blt in-buffer index
                 buffer start (+ start numbytes))

-      (setf (lisp-stream-in-index stream) (+ index numbytes))
+      (setf (ansi-stream-in-index stream) (+ index numbytes))

       numbytes)
      (t
       (let ((end (+ start num-buffered)))
        (%byte-blt in-buffer index buffer start end)
       numbytes)
      (t
       (let ((end (+ start num-buffered)))
        (%byte-blt in-buffer index buffer start end)

-       (setf (lisp-stream-in-index stream) +in-buffer-length+)
-       (+ (funcall (lisp-stream-n-bin stream)
+       (setf (ansi-stream-in-index stream) +ansi-stream-in-buffer-length+)
+       (+ (funcall (ansi-stream-n-bin stream)

                    stream
                    buffer
                    end
                    stream
                    buffer
                    end

@@ -489,180 +374,192 @@
 ;;; unreading
 ;;;
 ;;; (It's 4 instead of 1 to allow word-aligned copies.)
 ;;; unreading
 ;;;
 ;;; (It's 4 instead of 1 to allow word-aligned copies.)

-(defconstant +in-buffer-extra+ 4) ; FIXME: should be symbolic constant
+(defconstant +ansi-stream-in-buffer-extra+
+  4) ; FIXME: should be symbolic constant

 
 ;;; This function is called by the FAST-READ-CHAR expansion to refill
 ;;; the IN-BUFFER for text streams. There is definitely an IN-BUFFER,
 ;;; and hence must be an N-BIN method.
 (defun fast-read-char-refill (stream eof-error-p eof-value)
 
 ;;; This function is called by the FAST-READ-CHAR expansion to refill
 ;;; the IN-BUFFER for text streams. There is definitely an IN-BUFFER,
 ;;; and hence must be an N-BIN method.
 (defun fast-read-char-refill (stream eof-error-p eof-value)

-  (let* ((ibuf (lisp-stream-in-buffer stream))
-        (count (funcall (lisp-stream-n-bin stream)
+  (let* ((ibuf (ansi-stream-in-buffer stream))
+        (count (funcall (ansi-stream-n-bin stream)

                         stream
                         ibuf
                         stream
                         ibuf

-                        +in-buffer-extra+
-                        (- +in-buffer-length+ +in-buffer-extra+)
+                        +ansi-stream-in-buffer-extra+
+                        (- +ansi-stream-in-buffer-length+
+                           +ansi-stream-in-buffer-extra+)

                         nil))
                         nil))

-        (start (- +in-buffer-length+ count)))
+        (start (- +ansi-stream-in-buffer-length+ count)))

     (declare (type index start count))
     (cond ((zerop count)
     (declare (type index start count))
     (cond ((zerop count)

-          (setf (lisp-stream-in-index stream) +in-buffer-length+)
-          (funcall (lisp-stream-in stream) stream eof-error-p eof-value))
+          (setf (ansi-stream-in-index stream) +ansi-stream-in-buffer-length+)
+          (funcall (ansi-stream-in stream) stream eof-error-p eof-value))

          (t
          (t

-          (when (/= start +in-buffer-extra+)
-            (bit-bash-copy ibuf (+ (* +in-buffer-extra+ sb!vm:byte-bits)
+          (when (/= start +ansi-stream-in-buffer-extra+)
+            (bit-bash-copy ibuf (+ (* +ansi-stream-in-buffer-extra+
+                                      sb!vm:n-byte-bits)

                                    (* sb!vm:vector-data-offset
                                    (* sb!vm:vector-data-offset

-                                      sb!vm:word-bits))
-                           ibuf (+ (the index (* start sb!vm:byte-bits))
+                                      sb!vm:n-word-bits))
+                           ibuf (+ (the index (* start sb!vm:n-byte-bits))

                                    (* sb!vm:vector-data-offset
                                    (* sb!vm:vector-data-offset

-                                      sb!vm:word-bits))
-                           (* count sb!vm:byte-bits)))
-          (setf (lisp-stream-in-index stream) (1+ start))
+                                      sb!vm:n-word-bits))
+                           (* count sb!vm:n-byte-bits)))
+          (setf (ansi-stream-in-index stream) (1+ start))

           (code-char (aref ibuf start))))))
 
 ;;; This is similar to FAST-READ-CHAR-REFILL, but we don't have to
 ;;; leave room for unreading.
 (defun fast-read-byte-refill (stream eof-error-p eof-value)
           (code-char (aref ibuf start))))))
 
 ;;; This is similar to FAST-READ-CHAR-REFILL, but we don't have to
 ;;; leave room for unreading.
 (defun fast-read-byte-refill (stream eof-error-p eof-value)

-  (let* ((ibuf (lisp-stream-in-buffer stream))
-        (count (funcall (lisp-stream-n-bin stream) stream
-                        ibuf 0 +in-buffer-length+
+  (let* ((ibuf (ansi-stream-in-buffer stream))
+        (count (funcall (ansi-stream-n-bin stream) stream
+                        ibuf 0 +ansi-stream-in-buffer-length+

                         nil))
                         nil))

-        (start (- +in-buffer-length+ count)))
+        (start (- +ansi-stream-in-buffer-length+ count)))

     (declare (type index start count))
     (cond ((zerop count)
     (declare (type index start count))
     (cond ((zerop count)

-          (setf (lisp-stream-in-index stream) +in-buffer-length+)
-          (funcall (lisp-stream-bin stream) stream eof-error-p eof-value))
+          (setf (ansi-stream-in-index stream) +ansi-stream-in-buffer-length+)
+          (funcall (ansi-stream-bin stream) stream eof-error-p eof-value))

          (t
           (unless (zerop start)
          (t
           (unless (zerop start)

-            (bit-bash-copy ibuf (* sb!vm:vector-data-offset sb!vm:word-bits)
-                           ibuf (+ (the index (* start sb!vm:byte-bits))
+            (bit-bash-copy ibuf (* sb!vm:vector-data-offset sb!vm:n-word-bits)
+                           ibuf (+ (the index (* start sb!vm:n-byte-bits))

                                    (* sb!vm:vector-data-offset
                                    (* sb!vm:vector-data-offset

-                                      sb!vm:word-bits))
-                           (* count sb!vm:byte-bits)))
-          (setf (lisp-stream-in-index stream) (1+ start))
+                                      sb!vm:n-word-bits))
+                           (* count sb!vm:n-byte-bits)))
+          (setf (ansi-stream-in-index stream) (1+ start))

           (aref ibuf start)))))
 \f
 ;;; output functions
 
 (defun write-char (character &optional (stream *standard-output*))
           (aref ibuf start)))))
 \f
 ;;; output functions
 
 (defun write-char (character &optional (stream *standard-output*))

-  (with-out-stream stream (lisp-stream-out character)
+  (with-out-stream stream (ansi-stream-out character)

                   (stream-write-char character))
   character)
 
 (defun terpri (&optional (stream *standard-output*))
                   (stream-write-char character))
   character)
 
 (defun terpri (&optional (stream *standard-output*))

-  (with-out-stream stream (lisp-stream-out #\newline) (stream-terpri))
+  (with-out-stream stream (ansi-stream-out #\newline) (stream-terpri))

   nil)
 
 (defun fresh-line (&optional (stream *standard-output*))
   (let ((stream (out-synonym-of stream)))
   nil)
 
 (defun fresh-line (&optional (stream *standard-output*))
   (let ((stream (out-synonym-of stream)))

-    (if (lisp-stream-p stream)
+    (if (ansi-stream-p stream)

        (when (/= (or (charpos stream) 1) 0)
        (when (/= (or (charpos stream) 1) 0)

-         (funcall (lisp-stream-out stream) stream #\newline)
+         (funcall (ansi-stream-out stream) stream #\newline)

          t)
        ;; must be Gray streams FUNDAMENTAL-STREAM
        (stream-fresh-line stream))))
 
 (defun write-string (string &optional (stream *standard-output*)
          t)
        ;; must be Gray streams FUNDAMENTAL-STREAM
        (stream-fresh-line stream))))
 
 (defun write-string (string &optional (stream *standard-output*)

-                           &key (start 0) (end nil))
-  (%write-string string stream start (or end (length string)))
-  string)
-
-(defun %write-string (string stream start end)
+                           &key (start 0) end)

   (declare (type string string))
   (declare (type string string))

-  (declare (type streamlike stream))
-  (declare (type index start end))
-

   ;; Note that even though you might expect, based on the behavior of
   ;; things like AREF, that the correct upper bound here is
   ;; (ARRAY-DIMENSION STRING 0), the ANSI glossary definitions for
   ;; "bounding index" and "length" indicate that in this case (i.e.
   ;; Note that even though you might expect, based on the behavior of
   ;; things like AREF, that the correct upper bound here is
   ;; (ARRAY-DIMENSION STRING 0), the ANSI glossary definitions for
   ;; "bounding index" and "length" indicate that in this case (i.e.

-  ;; for the ANSI-specified functions WRITE-STRING and WRITE-LINE
-  ;; which are implemented in terms of this function), (LENGTH STRING)
-  ;; is the required upper bound. A foolish consistency is the
-  ;; hobgoblin of lesser languages..
-  (unless (<= 0 start end (length string))
-    (error "~@<bad bounding indices START=~W END=~W for ~2I~_~S~:>"
-          start
-          end
-          string))
+  ;; for the ANSI-specified functions WRITE-STRING [and WRITE-LINE]),
+  ;; (LENGTH STRING) is the required upper bound. A foolish
+  ;; consistency is the hobgoblin of lesser languages..
+  (%write-string string stream start (%check-vector-sequence-bounds
+                                     string start end))
+  string)

 
 

+(defun %write-string (string stream start end)
+  (declare (type string string))
+  (declare (type stream-designator stream))
+  (declare (type index start end))

   (let ((stream (out-synonym-of stream)))
   (let ((stream (out-synonym-of stream)))

-    (cond ((lisp-stream-p stream)
+    (cond ((ansi-stream-p stream)

           (if (array-header-p string)
               (with-array-data ((data string) (offset-start start)
                                 (offset-end end))
           (if (array-header-p string)
               (with-array-data ((data string) (offset-start start)
                                 (offset-end end))

-                (funcall (lisp-stream-sout stream)
+                (funcall (ansi-stream-sout stream)

                          stream data offset-start offset-end))
                          stream data offset-start offset-end))

-              (funcall (lisp-stream-sout stream) stream string start end))
+              (funcall (ansi-stream-sout stream) stream string start end))

           string)
          (t ; must be Gray streams FUNDAMENTAL-STREAM
           (stream-write-string stream string start end)))))
 
           string)
          (t ; must be Gray streams FUNDAMENTAL-STREAM
           (stream-write-string stream string start end)))))
 

+;;; A wrapper function for all those (MACROLET OUT-FUN) definitions,
+;;; which cannot deal with keyword arguments.
+(declaim (inline write-string-no-key))
+(defun write-string-no-key (string stream start end)
+  (write-string string stream :start start :end end))
+

 (defun write-line (string &optional (stream *standard-output*)
 (defun write-line (string &optional (stream *standard-output*)

-                         &key (start 0) (end nil))
-  (let ((defaulted-stream (out-synonym-of stream))
-       (defaulted-end (or end (length string))))
-    (%write-string string defaulted-stream start defaulted-end)
+                         &key (start 0) end)
+  (declare (type string string))
+  ;; FIXME: Why is there this difference between the treatments of the
+  ;; STREAM argument in WRITE-STRING and WRITE-LINE?
+  (let ((defaulted-stream (out-synonym-of stream)))
+    (%write-string string defaulted-stream start (%check-vector-sequence-bounds
+                                                 string start end))

     (write-char #\newline defaulted-stream))
   string)
 
 (defun charpos (&optional (stream *standard-output*))
     (write-char #\newline defaulted-stream))
   string)
 
 (defun charpos (&optional (stream *standard-output*))

-  (with-out-stream stream (lisp-stream-misc :charpos) (stream-line-column)))
+  (with-out-stream stream (ansi-stream-misc :charpos) (stream-line-column)))

 
 (defun line-length (&optional (stream *standard-output*))
 
 (defun line-length (&optional (stream *standard-output*))

-  (with-out-stream stream (lisp-stream-misc :line-length)
+  (with-out-stream stream (ansi-stream-misc :line-length)

                   (stream-line-length)))
 
 (defun finish-output (&optional (stream *standard-output*))
                   (stream-line-length)))
 
 (defun finish-output (&optional (stream *standard-output*))

-  (with-out-stream stream (lisp-stream-misc :finish-output)
+  (with-out-stream stream (ansi-stream-misc :finish-output)

                   (stream-finish-output))
   nil)
 
 (defun force-output (&optional (stream *standard-output*))
                   (stream-finish-output))
   nil)
 
 (defun force-output (&optional (stream *standard-output*))

-  (with-out-stream stream (lisp-stream-misc :force-output)
+  (with-out-stream stream (ansi-stream-misc :force-output)

                   (stream-force-output))
   nil)
 
 (defun clear-output (&optional (stream *standard-output*))
                   (stream-force-output))
   nil)
 
 (defun clear-output (&optional (stream *standard-output*))

-  (with-out-stream stream (lisp-stream-misc :clear-output)
+  (with-out-stream stream (ansi-stream-misc :clear-output)

                   (stream-force-output))
   nil)
 
 (defun write-byte (integer stream)
                   (stream-force-output))
   nil)
 
 (defun write-byte (integer stream)

-  (with-out-stream stream (lisp-stream-bout integer)
+  (with-out-stream stream (ansi-stream-bout integer)

                   (stream-write-byte integer))
   integer)
 \f
                   (stream-write-byte integer))
   integer)
 \f

-;;; This is called from LISP-STREAM routines that encapsulate CLOS
+
+;;; (These were inline throughout this file, but that's not appropriate
+;;; globally.  And we must not inline them in the rest of this file if
+;;; dispatch to gray or simple streams is to work, since both redefine
+;;; these functions later.)
+(declaim (maybe-inline read-char unread-char read-byte listen))
+
+;;; This is called from ANSI-STREAM routines that encapsulate CLOS

 ;;; streams to handle the misc routines and dispatch to the
 ;;; streams to handle the misc routines and dispatch to the

-;;; appropriate Gray stream functions.
+;;; appropriate SIMPLE- or FUNDAMENTAL-STREAM functions.

 (defun stream-misc-dispatch (stream operation &optional arg1 arg2)
 (defun stream-misc-dispatch (stream operation &optional arg1 arg2)

-  (declare (type fundamental-stream stream)
-          (ignore arg2))
-  (case operation
+  (declare (type stream stream) (ignore arg2))
+  (ecase operation

     (:listen
      ;; Return T if input available, :EOF for end-of-file, otherwise NIL.
     (:listen
      ;; Return T if input available, :EOF for end-of-file, otherwise NIL.

-     (let ((char (stream-read-char-no-hang stream)))
+     (let ((char (read-char-no-hang stream nil :eof)))

        (when (characterp char)
        (when (characterp char)

-        (stream-unread-char stream char))
+        (unread-char char stream))

        char))
     (:unread
        char))
     (:unread

-     (stream-unread-char stream arg1))
+     (unread-char arg1 stream))

     (:close
      (close stream))
     (:clear-input
     (:close
      (close stream))
     (:clear-input

-     (stream-clear-input stream))
+     (clear-input stream))

     (:force-output
     (:force-output

-     (stream-force-output stream))
+     (force-output stream))

     (:finish-output
     (:finish-output

-     (stream-finish-output stream))
+     (finish-output stream))

     (:element-type
      (stream-element-type stream))
     (:interactive-p
      (interactive-stream-p stream))
     (:line-length
     (:element-type
      (stream-element-type stream))
     (:interactive-p
      (interactive-stream-p stream))
     (:line-length

-     (stream-line-length stream))
+     (line-length stream))

     (:charpos
     (:charpos

-     (stream-line-column stream))
+     (charpos stream))

     (:file-length
      (file-length stream))
     (:file-position
     (:file-length
      (file-length stream))
     (:file-position

@@ -670,48 +567,50 @@
 \f
 ;;;; broadcast streams
 
 \f
 ;;;; broadcast streams
 

-(defstruct (broadcast-stream (:include lisp-stream
+(defstruct (broadcast-stream (:include ansi-stream

                                       (out #'broadcast-out)
                                       (bout #'broadcast-bout)
                                       (sout #'broadcast-sout)
                                       (misc #'broadcast-misc))
                                       (out #'broadcast-out)
                                       (bout #'broadcast-bout)
                                       (sout #'broadcast-sout)
                                       (misc #'broadcast-misc))

-                            (:constructor #!-high-security-support
-                                          make-broadcast-stream
-                                          #!+high-security-support
-                                          %make-broadcast-stream (&rest
-                                                                  streams))
+                            (:constructor %make-broadcast-stream
+                                          (&rest streams))

                             (:copier nil))
   ;; a list of all the streams we broadcast to
   (streams () :type list :read-only t))
 
                             (:copier nil))
   ;; a list of all the streams we broadcast to
   (streams () :type list :read-only t))
 

-#!+high-security-support

 (defun make-broadcast-stream (&rest streams)
   (dolist (stream streams)
 (defun make-broadcast-stream (&rest streams)
   (dolist (stream streams)

-    (unless (or (and (synonym-stream-p stream)
-                    (output-stream-p (symbol-value
-                                      (synonym-stream-symbol stream))))
-               (output-stream-p stream))
+    (unless (output-stream-p stream)

       (error 'type-error
             :datum stream
             :expected-type '(satisfies output-stream-p))))
   (apply #'%make-broadcast-stream streams))
 
       (error 'type-error
             :datum stream
             :expected-type '(satisfies output-stream-p))))
   (apply #'%make-broadcast-stream streams))
 

-(macrolet ((out-fun (fun method stream-method &rest args)
-            `(defun ,fun (stream ,@args)
+(macrolet ((out-fun (name fun &rest args)
+            `(defun ,name (stream ,@args)

                (dolist (stream (broadcast-stream-streams stream))
                (dolist (stream (broadcast-stream-streams stream))

-                 (if (lisp-stream-p stream)
-                     (funcall (,method stream) stream ,@args)
-                     (,stream-method stream ,@args))))))
-  (out-fun broadcast-out lisp-stream-out stream-write-char char)
-  (out-fun broadcast-bout lisp-stream-bout stream-write-byte byte)
-  (out-fun broadcast-sout lisp-stream-sout stream-write-string
-          string start end))
+                 (,fun ,(car args) stream ,@(cdr args))))))
+  (out-fun broadcast-out write-char char)
+  (out-fun broadcast-bout write-byte byte)
+  (out-fun broadcast-sout write-string-no-key string start end))

 
 (defun broadcast-misc (stream operation &optional arg1 arg2)
   (let ((streams (broadcast-stream-streams stream)))
     (case operation
 
 (defun broadcast-misc (stream operation &optional arg1 arg2)
   (let ((streams (broadcast-stream-streams stream)))
     (case operation

+      ;; FIXME: This may not be the best place to note this, but I
+      ;; think the :CHARPOS protocol needs revision.  Firstly, I think
+      ;; this is the last place where a NULL return value was possible
+      ;; (before adjusting it to be 0), so a bunch of conditionals IF
+      ;; CHARPOS can be removed; secondly, it is my belief that
+      ;; FD-STREAMS, when running FILE-POSITION, do not update the
+      ;; CHARPOS, and consequently there will be much wrongness.
+      ;;
+      ;; FIXME: see also TWO-WAY-STREAM treatment of :CHARPOS -- why
+      ;; is it testing the :charpos of an input stream?
+      ;;
+      ;; -- CSR, 2004-02-04

       (:charpos
       (:charpos

-       (dolist (stream streams)
+       (dolist (stream streams 0)

         (let ((charpos (charpos stream)))
           (if charpos (return charpos)))))
       (:line-length
         (let ((charpos (charpos stream)))
           (if charpos (return charpos)))))
       (:line-length

@@ -720,22 +619,30 @@
           (let ((res (line-length stream)))
             (when res (setq min (if min (min res min) res)))))))
       (:element-type
           (let ((res (line-length stream)))
             (when res (setq min (if min (min res min) res)))))))
       (:element-type

+       #+nil ; old, arguably more logical, version

        (let (res)
        (let (res)

-        (dolist (stream streams (if (> (length res) 1) `(and ,@res) res))
-          (pushnew (stream-element-type stream) res :test #'equal))))
-      (:close)
+        (dolist (stream streams (if (> (length res) 1) `(and ,@res) t))
+          (pushnew (stream-element-type stream) res :test #'equal)))
+       ;; ANSI-specified version (under System Class BROADCAST-STREAM)
+       (let ((res t))
+        (do ((streams streams (cdr streams)))
+            ((null streams) res)
+          (when (null (cdr streams))
+            (setq res (stream-element-type (car streams)))))))
+      (:close
+       (set-closed-flame stream))

       (t
        (let ((res nil))
         (dolist (stream streams res)
           (setq res
       (t
        (let ((res nil))
         (dolist (stream streams res)
           (setq res

-                (if (lisp-stream-p stream)
-                    (funcall (lisp-stream-misc stream) stream operation
+                (if (ansi-stream-p stream)
+                    (funcall (ansi-stream-misc stream) stream operation

                              arg1 arg2)
                     (stream-misc-dispatch stream operation arg1 arg2)))))))))
 \f
 ;;;; synonym streams
 
                              arg1 arg2)
                     (stream-misc-dispatch stream operation arg1 arg2)))))))))
 \f
 ;;;; synonym streams
 

-(defstruct (synonym-stream (:include lisp-stream
+(defstruct (synonym-stream (:include ansi-stream

                                     (in #'synonym-in)
                                     (bin #'synonym-bin)
                                     (n-bin #'synonym-n-bin)
                                     (in #'synonym-in)
                                     (bin #'synonym-bin)
                                     (n-bin #'synonym-n-bin)

@@ -751,18 +658,16 @@
   (print-unreadable-object (x stream :type t :identity t)
     (format stream ":SYMBOL ~S" (synonym-stream-symbol x))))
 
   (print-unreadable-object (x stream :type t :identity t)
     (format stream ":SYMBOL ~S" (synonym-stream-symbol x))))
 

-;;; The output simple output methods just call the corresponding method
-;;; in the synonymed stream.
-(macrolet ((out-fun (name slot stream-method &rest args)
+;;; The output simple output methods just call the corresponding
+;;; function on the synonymed stream.
+(macrolet ((out-fun (name fun &rest args)

             `(defun ,name (stream ,@args)
                (declare (optimize (safety 1)))
                (let ((syn (symbol-value (synonym-stream-symbol stream))))
             `(defun ,name (stream ,@args)
                (declare (optimize (safety 1)))
                (let ((syn (symbol-value (synonym-stream-symbol stream))))

-                 (if (lisp-stream-p syn)
-                     (funcall (,slot syn) syn ,@args)
-                     (,stream-method syn ,@args))))))
-  (out-fun synonym-out lisp-stream-out stream-write-char ch)
-  (out-fun synonym-bout lisp-stream-bout stream-write-byte n)
-  (out-fun synonym-sout lisp-stream-sout stream-write-string string start end))
+                 (,fun ,(car args) syn ,@(cdr args))))))
+  (out-fun synonym-out write-char ch)
+  (out-fun synonym-bout write-byte n)
+  (out-fun synonym-sout write-string-no-key string start end))

 
 ;;; For the input methods, we just call the corresponding function on the
 ;;; synonymed stream. These functions deal with getting input out of
 
 ;;; For the input methods, we just call the corresponding function on the
 ;;; synonymed stream. These functions deal with getting input out of

@@ -779,24 +684,24 @@
 (defun synonym-misc (stream operation &optional arg1 arg2)
   (declare (optimize (safety 1)))
   (let ((syn (symbol-value (synonym-stream-symbol stream))))
 (defun synonym-misc (stream operation &optional arg1 arg2)
   (declare (optimize (safety 1)))
   (let ((syn (symbol-value (synonym-stream-symbol stream))))

-    (if (lisp-stream-p syn)
+    (if (ansi-stream-p syn)

        ;; We have to special-case some operations which interact with
        ;; the in-buffer of the wrapped stream, since just calling
        ;; We have to special-case some operations which interact with
        ;; the in-buffer of the wrapped stream, since just calling

-       ;; LISP-STREAM-MISC on them
+       ;; ANSI-STREAM-MISC on them

        (case operation
        (case operation

-         (:listen (or (/= (the fixnum (lisp-stream-in-index syn))
-                          +in-buffer-length+)
-                      (funcall (lisp-stream-misc syn) syn :listen)))
+         (:listen (or (/= (the fixnum (ansi-stream-in-index syn))
+                          +ansi-stream-in-buffer-length+)
+                      (funcall (ansi-stream-misc syn) syn :listen)))

           (:clear-input (clear-input syn))
           (:unread (unread-char arg1 syn))
          (t
           (:clear-input (clear-input syn))
           (:unread (unread-char arg1 syn))
          (t

-          (funcall (lisp-stream-misc syn) syn operation arg1 arg2)))
+          (funcall (ansi-stream-misc syn) syn operation arg1 arg2)))

        (stream-misc-dispatch syn operation arg1 arg2))))
 \f
 ;;;; two-way streams
 
 (defstruct (two-way-stream
        (stream-misc-dispatch syn operation arg1 arg2))))
 \f
 ;;;; two-way streams
 
 (defstruct (two-way-stream

-           (:include lisp-stream
+           (:include ansi-stream

                      (in #'two-way-in)
                      (bin #'two-way-bin)
                      (n-bin #'two-way-n-bin)
                      (in #'two-way-in)
                      (bin #'two-way-bin)
                      (n-bin #'two-way-n-bin)

@@ -804,52 +709,36 @@
                      (bout #'two-way-bout)
                      (sout #'two-way-sout)
                      (misc #'two-way-misc))
                      (bout #'two-way-bout)
                      (sout #'two-way-sout)
                      (misc #'two-way-misc))

-           (:constructor #!-high-security-support
-                         make-two-way-stream
-                         #!+high-security-support
-                         %make-two-way-stream (input-stream output-stream))
+           (:constructor %make-two-way-stream (input-stream output-stream))

            (:copier nil))
            (:copier nil))

-  (input-stream (required-argument) :type stream :read-only t)
-  (output-stream (required-argument) :type stream :read-only t))
+  (input-stream (missing-arg) :type stream :read-only t)
+  (output-stream (missing-arg) :type stream :read-only t))

 (defprinter (two-way-stream) input-stream output-stream)
 
 (defprinter (two-way-stream) input-stream output-stream)
 

-#!-high-security-support
-(setf (fdocumentation 'make-two-way-stream 'function)
-  "Return a bidirectional stream which gets its input from Input-Stream and
-   sends its output to Output-Stream.")
-#!+high-security-support

 (defun make-two-way-stream (input-stream output-stream)
   #!+sb-doc
 (defun make-two-way-stream (input-stream output-stream)
   #!+sb-doc

-  "Return a bidirectional stream which gets its input from Input-Stream and
-   sends its output to Output-Stream."
+  "Return a bidirectional stream which gets its input from INPUT-STREAM and
+   sends its output to OUTPUT-STREAM."

   ;; FIXME: This idiom of the-real-stream-of-a-possibly-synonym-stream
   ;; should be encapsulated in a function, and used here and most of
   ;; the other places that SYNONYM-STREAM-P appears.
   ;; FIXME: This idiom of the-real-stream-of-a-possibly-synonym-stream
   ;; should be encapsulated in a function, and used here and most of
   ;; the other places that SYNONYM-STREAM-P appears.

-  (unless (or (and (synonym-stream-p output-stream)
-                  (output-stream-p (symbol-value
-                                    (synonym-stream-symbol output-stream))))
-             (output-stream-p output-stream))
+  (unless (output-stream-p output-stream)

     (error 'type-error
           :datum output-stream
           :expected-type '(satisfies output-stream-p)))
     (error 'type-error
           :datum output-stream
           :expected-type '(satisfies output-stream-p)))

-  (unless (or (and (synonym-stream-p input-stream)
-                  (input-stream-p (symbol-value
-                                   (synonym-stream-symbol input-stream))))
-             (input-stream-p input-stream))
+  (unless (input-stream-p input-stream)

     (error 'type-error
           :datum input-stream
           :expected-type '(satisfies input-stream-p)))
   (funcall #'%make-two-way-stream input-stream output-stream))
 
     (error 'type-error
           :datum input-stream
           :expected-type '(satisfies input-stream-p)))
   (funcall #'%make-two-way-stream input-stream output-stream))
 

-(macrolet ((out-fun (name slot stream-method &rest args)
+(macrolet ((out-fun (name fun &rest args)

             `(defun ,name (stream ,@args)
                (let ((syn (two-way-stream-output-stream stream)))
             `(defun ,name (stream ,@args)
                (let ((syn (two-way-stream-output-stream stream)))

-                 (if (lisp-stream-p syn)
-                     (funcall (,slot syn) syn ,@args)
-                     (,stream-method syn ,@args))))))
-  (out-fun two-way-out lisp-stream-out stream-write-char ch)
-  (out-fun two-way-bout lisp-stream-bout stream-write-byte n)
-  (out-fun two-way-sout lisp-stream-sout stream-write-string string start end))
+                 (,fun ,(car args) syn ,@(cdr args))))))
+  (out-fun two-way-out write-char ch)
+  (out-fun two-way-bout write-byte n)
+  (out-fun two-way-sout write-string-no-key string start end))

 
 (macrolet ((in-fun (name fun &rest args)
             `(defun ,name (stream ,@args)
 
 (macrolet ((in-fun (name fun &rest args)
             `(defun ,name (stream ,@args)

@@ -862,17 +751,18 @@
 (defun two-way-misc (stream operation &optional arg1 arg2)
   (let* ((in (two-way-stream-input-stream stream))
         (out (two-way-stream-output-stream stream))
 (defun two-way-misc (stream operation &optional arg1 arg2)
   (let* ((in (two-way-stream-input-stream stream))
         (out (two-way-stream-output-stream stream))

-        (in-lisp-stream-p (lisp-stream-p in))
-        (out-lisp-stream-p (lisp-stream-p out)))
+        (in-ansi-stream-p (ansi-stream-p in))
+        (out-ansi-stream-p (ansi-stream-p out)))

     (case operation
       (:listen
     (case operation
       (:listen

-       (if in-lisp-stream-p
-          (or (/= (the fixnum (lisp-stream-in-index in)) +in-buffer-length+)
-              (funcall (lisp-stream-misc in) in :listen))
+       (if in-ansi-stream-p
+          (or (/= (the fixnum (ansi-stream-in-index in))
+                  +ansi-stream-in-buffer-length+)
+              (funcall (ansi-stream-misc in) in :listen))

           (stream-listen in)))
       ((:finish-output :force-output :clear-output)
           (stream-listen in)))
       ((:finish-output :force-output :clear-output)

-       (if out-lisp-stream-p
-          (funcall (lisp-stream-misc out) out operation arg1 arg2)
+       (if out-ansi-stream-p
+          (funcall (ansi-stream-misc out) out operation arg1 arg2)

           (stream-misc-dispatch out operation arg1 arg2)))
       (:clear-input (clear-input in))
       (:unread (unread-char arg1 in))
           (stream-misc-dispatch out operation arg1 arg2)))
       (:clear-input (clear-input in))
       (:unread (unread-char arg1 in))

@@ -884,58 +774,38 @@
       (:close
        (set-closed-flame stream))
       (t
       (:close
        (set-closed-flame stream))
       (t

-       (or (if in-lisp-stream-p
-              (funcall (lisp-stream-misc in) in operation arg1 arg2)
+       (or (if in-ansi-stream-p
+              (funcall (ansi-stream-misc in) in operation arg1 arg2)

               (stream-misc-dispatch in operation arg1 arg2))
               (stream-misc-dispatch in operation arg1 arg2))

-          (if out-lisp-stream-p
-              (funcall (lisp-stream-misc out) out operation arg1 arg2)
+          (if out-ansi-stream-p
+              (funcall (ansi-stream-misc out) out operation arg1 arg2)

               (stream-misc-dispatch out operation arg1 arg2)))))))
 \f
 ;;;; concatenated streams
 
 (defstruct (concatenated-stream
               (stream-misc-dispatch out operation arg1 arg2)))))))
 \f
 ;;;; concatenated streams
 
 (defstruct (concatenated-stream

-           (:include lisp-stream
+           (:include ansi-stream

                      (in #'concatenated-in)
                      (bin #'concatenated-bin)
                      (n-bin #'concatenated-n-bin)
                      (misc #'concatenated-misc))
                      (in #'concatenated-in)
                      (bin #'concatenated-bin)
                      (n-bin #'concatenated-n-bin)
                      (misc #'concatenated-misc))

-           (:constructor
-            #!-high-security-support make-concatenated-stream
-            #!+high-security-support %make-concatenated-stream
-                (&rest streams &aux (current streams)))
+           (:constructor %make-concatenated-stream
+                         (&rest streams &aux (current streams)))

            (:copier nil))
   ;; The car of this is the substream we are reading from now.
            (:copier nil))
   ;; The car of this is the substream we are reading from now.

-  current
-  ;; This is a list of all the substreams there ever were. We need to
-  ;; remember them so that we can close them.
-  ;;
-  ;; FIXME: ANSI says this is supposed to be the list of streams that
-  ;; we still have to read from. So either this needs to become a
-  ;; private member %STREAM (with CONCATENATED-STREAM-STREAMS a wrapper
-  ;; around it which discards closed files from the head of the list)
-  ;; or we need to update it as we run out of files.
-  (streams nil :type list :read-only t))
+  (streams nil :type list))

 (def!method print-object ((x concatenated-stream) stream)
   (print-unreadable-object (x stream :type t :identity t)
     (format stream
            ":STREAMS ~S"
            (concatenated-stream-streams x))))
 
 (def!method print-object ((x concatenated-stream) stream)
   (print-unreadable-object (x stream :type t :identity t)
     (format stream
            ":STREAMS ~S"
            (concatenated-stream-streams x))))
 

-#!-high-security-support
-(setf (fdocumentation 'make-concatenated-stream 'function)
-  "Return a stream which takes its input from each of the Streams in turn,
-   going on to the next at EOF.")
-
-#!+high-security-support

 (defun make-concatenated-stream (&rest streams)
   #!+sb-doc
 (defun make-concatenated-stream (&rest streams)
   #!+sb-doc

-  "Return a stream which takes its input from each of the Streams in turn,
+  "Return a stream which takes its input from each of the streams in turn,

    going on to the next at EOF."
   (dolist (stream streams)
    going on to the next at EOF."
   (dolist (stream streams)

-    (unless (or (and (synonym-stream-p stream)
-                    (input-stream-p (symbol-value
-                                     (synonym-stream-symbol stream))))
-               (input-stream-p stream))
+    (unless (input-stream-p stream)

       (error 'type-error
             :datum stream
             :expected-type '(satisfies input-stream-p))))
       (error 'type-error
             :datum stream
             :expected-type '(satisfies input-stream-p))))

@@ -943,19 +813,19 @@
 
 (macrolet ((in-fun (name fun)
             `(defun ,name (stream eof-error-p eof-value)
 
 (macrolet ((in-fun (name fun)
             `(defun ,name (stream eof-error-p eof-value)

-               (do ((current (concatenated-stream-current stream)
-                             (cdr current)))
-                   ((null current)
+               (do ((streams (concatenated-stream-streams stream)
+                             (cdr streams)))
+                   ((null streams)

                     (eof-or-lose stream eof-error-p eof-value))
                     (eof-or-lose stream eof-error-p eof-value))

-                 (let* ((stream (car current))
+                 (let* ((stream (car streams))

                         (result (,fun stream nil nil)))
                    (when result (return result)))
                         (result (,fun stream nil nil)))
                    (when result (return result)))

-                 (setf (concatenated-stream-current stream) current)))))
+                 (pop (concatenated-stream-streams stream))))))

   (in-fun concatenated-in read-char)
   (in-fun concatenated-bin read-byte))
 
 (defun concatenated-n-bin (stream buffer start numbytes eof-errorp)
   (in-fun concatenated-in read-char)
   (in-fun concatenated-bin read-byte))
 
 (defun concatenated-n-bin (stream buffer start numbytes eof-errorp)

-  (do ((current (concatenated-stream-current stream) (cdr current))
+  (do ((streams (concatenated-stream-streams stream) (cdr streams))

        (current-start start)
        (remaining-bytes numbytes))
       ((null current)
        (current-start start)
        (remaining-bytes numbytes))
       ((null current)

@@ -968,24 +838,24 @@
       (incf current-start bytes-read)
       (decf remaining-bytes bytes-read)
       (when (zerop remaining-bytes) (return numbytes)))
       (incf current-start bytes-read)
       (decf remaining-bytes bytes-read)
       (when (zerop remaining-bytes) (return numbytes)))

-    (setf (concatenated-stream-current stream) (cdr current))))
+    (setf (concatenated-stream-streams stream) (cdr streams))))

 
 (defun concatenated-misc (stream operation &optional arg1 arg2)
 
 (defun concatenated-misc (stream operation &optional arg1 arg2)

-  (let ((left (concatenated-stream-current stream)))
+  (let ((left (concatenated-stream-streams stream)))

     (when left
       (let* ((current (car left)))
        (case operation
          (:listen
           (loop
     (when left
       (let* ((current (car left)))
        (case operation
          (:listen
           (loop

-            (let ((stuff (if (lisp-stream-p current)
-                             (funcall (lisp-stream-misc current) current
+            (let ((stuff (if (ansi-stream-p current)
+                             (funcall (ansi-stream-misc current) current

                                       :listen)
                              (stream-misc-dispatch current :listen))))
               (cond ((eq stuff :eof)
                                       :listen)
                              (stream-misc-dispatch current :listen))))
               (cond ((eq stuff :eof)

-                     ;; Advance CURRENT, and try again.
-                     (pop (concatenated-stream-current stream))
+                     ;; Advance STREAMS, and try again.
+                     (pop (concatenated-stream-streams stream))

                      (setf current
                      (setf current

-                           (car (concatenated-stream-current stream)))
+                           (car (concatenated-stream-streams stream)))

                      (unless current
                        ;; No further streams. EOF.
                        (return :eof)))
                      (unless current
                        ;; No further streams. EOF.
                        (return :eof)))

@@ -1000,8 +870,8 @@
           (:close
           (set-closed-flame stream))
          (t
           (:close
           (set-closed-flame stream))
          (t

-          (if (lisp-stream-p current)
-              (funcall (lisp-stream-misc current) current operation arg1 arg2)
+          (if (ansi-stream-p current)
+              (funcall (ansi-stream-misc current) current operation arg1 arg2)

               (stream-misc-dispatch current operation arg1 arg2))))))))
 \f
 ;;;; echo streams
               (stream-misc-dispatch current operation arg1 arg2))))))))
 \f
 ;;;; echo streams

@@ -1012,7 +882,7 @@
                      (bin #'echo-bin)
                      (misc #'echo-misc)
                      (n-bin #'ill-bin))
                      (bin #'echo-bin)
                      (misc #'echo-misc)
                      (n-bin #'ill-bin))

-           (:constructor make-echo-stream (input-stream output-stream))
+           (:constructor %make-echo-stream (input-stream output-stream))

            (:copier nil))
   unread-stuff)
 (def!method print-object ((x echo-stream) stream)
            (:copier nil))
   unread-stuff)
 (def!method print-object ((x echo-stream) stream)

@@ -1022,89 +892,83 @@
            (two-way-stream-input-stream x)
            (two-way-stream-output-stream x))))
 
            (two-way-stream-input-stream x)
            (two-way-stream-output-stream x))))
 

-(macrolet ((in-fun (name fun out-slot stream-method &rest args)
+(defun make-echo-stream (input-stream output-stream)
+  #!+sb-doc
+  "Return a bidirectional stream which gets its input from INPUT-STREAM and
+   sends its output to OUTPUT-STREAM. In addition, all input is echoed to
+   the output stream."
+  (unless (output-stream-p output-stream)
+    (error 'type-error
+          :datum output-stream
+          :expected-type '(satisfies output-stream-p)))
+  (unless (input-stream-p input-stream)
+    (error 'type-error
+          :datum input-stream
+          :expected-type '(satisfies input-stream-p)))
+  (funcall #'%make-echo-stream input-stream output-stream))
+
+(macrolet ((in-fun (name in-fun out-fun &rest args)

             `(defun ,name (stream ,@args)
                (or (pop (echo-stream-unread-stuff stream))
                    (let* ((in (echo-stream-input-stream stream))
                           (out (echo-stream-output-stream stream))
             `(defun ,name (stream ,@args)
                (or (pop (echo-stream-unread-stuff stream))
                    (let* ((in (echo-stream-input-stream stream))
                           (out (echo-stream-output-stream stream))

-                          (result (,fun in ,@args)))
-                     (if (lisp-stream-p out)
-                         (funcall (,out-slot out) out result)
-                         (,stream-method out result))
-                     result)))))
-  (in-fun echo-in read-char lisp-stream-out stream-write-char
-         eof-error-p eof-value)
-  (in-fun echo-bin read-byte lisp-stream-bout stream-write-byte
-         eof-error-p eof-value))
-
-(defun echo-misc (stream operation &optional arg1 arg2)
-  (let* ((in (two-way-stream-input-stream stream))
-        (out (two-way-stream-output-stream stream)))
-    (case operation
-      (:listen
-       (or (not (null (echo-stream-unread-stuff stream)))
-          (if (lisp-stream-p in)
-              (or (/= (the fixnum (lisp-stream-in-index in))
-                      +in-buffer-length+)
-                  (funcall (lisp-stream-misc in) in :listen))
-              (stream-misc-dispatch in :listen))))
-      (:unread (push arg1 (echo-stream-unread-stuff stream)))
-      (:element-type
-       (let ((in-type (stream-element-type in))
-            (out-type (stream-element-type out)))
-        (if (equal in-type out-type)
-            in-type `(and ,in-type ,out-type))))
-      (:close
-       (set-closed-flame stream))
-      (t
-       (or (if (lisp-stream-p in)
-              (funcall (lisp-stream-misc in) in operation arg1 arg2)
-              (stream-misc-dispatch in operation arg1 arg2))
-          (if (lisp-stream-p out)
-              (funcall (lisp-stream-misc out) out operation arg1 arg2)
-              (stream-misc-dispatch out operation arg1 arg2)))))))
-
-#!+sb-doc
-(setf (fdocumentation 'make-echo-stream 'function)
-  "Return a bidirectional stream which gets its input from INPUT-STREAM and
-   sends its output to OUTPUT-STREAM. In addition, all input is echoed to
-   the output stream")
+                          (result (if eof-error-p
+                                      (,in-fun in ,@args)
+                                      (,in-fun in nil in))))
+                     (cond
+                       ((eql result in) eof-value)
+                       (t (,out-fun result out) result)))))))
+  (in-fun echo-in read-char write-char eof-error-p eof-value)
+  (in-fun echo-bin read-byte write-byte eof-error-p eof-value))
+\f
+;;;; base STRING-STREAM stuff
+
+(defstruct (string-stream
+             (:include ansi-stream)
+             (:constructor nil)
+             (:copier nil))
+  ;; FIXME: This type declaration is true, and will probably continue
+  ;; to be true.  However, note well the comments in DEFTRANSFORM
+  ;; REPLACE, implying that performance of REPLACE is somewhat
+  ;; critical to performance of string streams.  If (VECTOR CHARACTER)
+  ;; ever becomes different from (VECTOR BASE-CHAR), the transform
+  ;; probably needs to be extended.
+  (string (missing-arg) :type (vector character)))

 \f
 \f

-;;;; string input streams
+;;;; STRING-INPUT-STREAM stuff

 
 (defstruct (string-input-stream
 
 (defstruct (string-input-stream

-            (:include lisp-stream
+            (:include string-stream

                       (in #'string-inch)
                       (in #'string-inch)

-                      (bin #'string-binch)
+                      (bin #'ill-bin)

                       (n-bin #'string-stream-read-n-bytes)
                       (n-bin #'string-stream-read-n-bytes)

-                      (misc #'string-in-misc))
+                      (misc #'string-in-misc)
+                       (string (missing-arg) :type simple-string))

             (:constructor internal-make-string-input-stream
                           (string current end))
             (:copier nil))
             (:constructor internal-make-string-input-stream
                           (string current end))
             (:copier nil))

-  (string nil :type simple-string)
-  (current nil :type index)
-  (end nil :type index))
+  (current (missing-arg) :type index)
+  (end (missing-arg) :type index))

 
 (defun string-inch (stream eof-error-p eof-value)
 
 (defun string-inch (stream eof-error-p eof-value)

+  (declare (type string-input-stream stream))

   (let ((string (string-input-stream-string stream))
        (index (string-input-stream-current stream)))
   (let ((string (string-input-stream-string stream))
        (index (string-input-stream-current stream)))

-    (declare (simple-string string) (fixnum index))
-    (cond ((= index (the index (string-input-stream-end stream)))
+    (cond ((>= index (the index (string-input-stream-end stream)))

           (eof-or-lose stream eof-error-p eof-value))
          (t
           (setf (string-input-stream-current stream) (1+ index))
           (eof-or-lose stream eof-error-p eof-value))
          (t
           (setf (string-input-stream-current stream) (1+ index))

-          (aref string index)))))
+          (char string index)))))

 
 (defun string-binch (stream eof-error-p eof-value)
 
 (defun string-binch (stream eof-error-p eof-value)

+  (declare (type string-input-stream stream))

   (let ((string (string-input-stream-string stream))
        (index (string-input-stream-current stream)))
   (let ((string (string-input-stream-string stream))
        (index (string-input-stream-current stream)))

-    (declare (simple-string string)
-            (type index index))
-    (cond ((= index (the index (string-input-stream-end stream)))
+    (cond ((>= index (the index (string-input-stream-end stream)))

           (eof-or-lose stream eof-error-p eof-value))
          (t
           (setf (string-input-stream-current stream) (1+ index))
           (eof-or-lose stream eof-error-p eof-value))
          (t
           (setf (string-input-stream-current stream) (1+ index))

-          (char-code (aref string index))))))
+          (char-code (char string index))))))

 
 (defun string-stream-read-n-bytes (stream buffer start requested eof-error-p)
   (declare (type string-input-stream stream)
 
 (defun string-stream-read-n-bytes (stream buffer start requested eof-error-p)
   (declare (type string-input-stream stream)

@@ -1113,94 +977,117 @@
         (index (string-input-stream-current stream))
         (available (- (string-input-stream-end stream) index))
         (copy (min available requested)))
         (index (string-input-stream-current stream))
         (available (- (string-input-stream-end stream) index))
         (copy (min available requested)))

-    (declare (simple-string string)
-            (type index index available copy))
+    (declare (type simple-string string))

     (when (plusp copy)
       (setf (string-input-stream-current stream)
            (truly-the index (+ index copy)))
       (sb!sys:without-gcing
        (system-area-copy (vector-sap string)
     (when (plusp copy)
       (setf (string-input-stream-current stream)
            (truly-the index (+ index copy)))
       (sb!sys:without-gcing
        (system-area-copy (vector-sap string)

-                        (* index sb!vm:byte-bits)
+                        (* index sb!vm:n-byte-bits)

                         (if (typep buffer 'system-area-pointer)
                             buffer
                             (vector-sap buffer))
                         (if (typep buffer 'system-area-pointer)
                             buffer
                             (vector-sap buffer))

-                        (* start sb!vm:byte-bits)
-                        (* copy sb!vm:byte-bits))))
+                        (* start sb!vm:n-byte-bits)
+                        (* copy sb!vm:n-byte-bits))))

     (if (and (> requested copy) eof-error-p)
        (error 'end-of-file :stream stream)
        copy)))
 
 (defun string-in-misc (stream operation &optional arg1 arg2)
     (if (and (> requested copy) eof-error-p)
        (error 'end-of-file :stream stream)
        copy)))
 
 (defun string-in-misc (stream operation &optional arg1 arg2)

-  (declare (ignore arg2))
+  (declare (type string-input-stream stream)
+          (ignore arg2))

   (case operation
     (:file-position
      (if arg1
   (case operation
     (:file-position
      (if arg1

-        (setf (string-input-stream-current stream) arg1)
+        (setf (string-input-stream-current stream)
+              (case arg1
+                (:start 0)
+                (:end (string-input-stream-end stream))
+                ;; We allow moving position beyond EOF. Errors happen
+                ;; on read, not move -- or the user may extend the
+                ;; input string.
+                (t arg1)))

         (string-input-stream-current stream)))
         (string-input-stream-current stream)))

-    (:file-length (length (string-input-stream-string stream)))
+    ;; According to ANSI: "Should signal an error of type type-error
+    ;; if stream is not a stream associated with a file."
+    ;; This is checked by FILE-LENGTH, so no need to do it here either.
+    ;; (:file-length (length (string-input-stream-string stream)))

     (:unread (decf (string-input-stream-current stream)))
     (:unread (decf (string-input-stream-current stream)))

-    (:listen (or (/= (the fixnum (string-input-stream-current stream))
-                    (the fixnum (string-input-stream-end stream)))
+    (:listen (or (/= (the index (string-input-stream-current stream))
+                    (the index (string-input-stream-end stream)))

                 :eof))
                 :eof))

-    (:element-type 'base-char)))
+    (:element-type (array-element-type (string-input-stream-string stream)))))

 
 

-(defun make-string-input-stream (string &optional
-                                       (start 0) (end (length string)))
+(defun make-string-input-stream (string &optional (start 0) end)

   #!+sb-doc
   "Return an input stream which will supply the characters of STRING between
   START and END in order."
   (declare (type string string)
           (type index start)
           (type (or index null) end))
   #!+sb-doc
   "Return an input stream which will supply the characters of STRING between
   START and END in order."
   (declare (type string string)
           (type index start)
           (type (or index null) end))

-
-  #!+high-security
-  (when (> end (length string))
-    (cerror "Continue with end changed from ~S to ~S"
-           "Write-string: end (~S) is larger then the length of the string (~S)"
-           end (1- (length string))))
-
-  (internal-make-string-input-stream (coerce string 'simple-string)
-                                    start end))
+  (let* ((string (coerce string '(simple-array character (*))))
+        (end (%check-vector-sequence-bounds string start end)))
+    (with-array-data ((string string) (start start) (end end))
+      (internal-make-string-input-stream
+       string ;; now simple
+       start
+       end))))

 \f
 \f

-;;;; string output streams
+;;;; STRING-OUTPUT-STREAM stuff

 
 (defstruct (string-output-stream
 
 (defstruct (string-output-stream

-           (:include lisp-stream
+           (:include string-stream

                      (out #'string-ouch)
                      (sout #'string-sout)
                      (out #'string-ouch)
                      (sout #'string-sout)

-                     (misc #'string-out-misc))
-           (:constructor make-string-output-stream ())
+                     (misc #'string-out-misc)
+                      ;; The string we throw stuff in.
+                      (string (missing-arg)
+                             :type (simple-array character (*))))
+           (:constructor make-string-output-stream 
+                         (&key (element-type 'character)
+                          &aux (string (make-string 40))))

            (:copier nil))
            (:copier nil))

-  ;; The string we throw stuff in.
-  (string (make-string 40) :type simple-string)

   ;; Index of the next location to use.
   ;; Index of the next location to use.

-  (index 0 :type fixnum))
+  (index 0 :type fixnum)
+  ;; Index cache for string-output-stream-last-index
+  (index-cache 0 :type fixnum)
+  ;; Requested element type
+  (element-type 'character))

 
 #!+sb-doc
 (setf (fdocumentation 'make-string-output-stream 'function)
   "Return an output stream which will accumulate all output given it for
    the benefit of the function GET-OUTPUT-STREAM-STRING.")
 
 
 #!+sb-doc
 (setf (fdocumentation 'make-string-output-stream 'function)
   "Return an output stream which will accumulate all output given it for
    the benefit of the function GET-OUTPUT-STREAM-STRING.")
 

+(defun string-output-stream-last-index (stream)
+  (max (string-output-stream-index stream)
+       (string-output-stream-index-cache stream)))
+

 (defun string-ouch (stream character)
   (let ((current (string-output-stream-index stream))
        (workspace (string-output-stream-string stream)))
 (defun string-ouch (stream character)
   (let ((current (string-output-stream-index stream))
        (workspace (string-output-stream-string stream)))

-    (declare (simple-string workspace) (fixnum current))
+    (declare (type (simple-array character (*)) workspace)
+            (type fixnum current))

     (if (= current (the fixnum (length workspace)))
        (let ((new-workspace (make-string (* current 2))))
          (replace new-workspace workspace)
     (if (= current (the fixnum (length workspace)))
        (let ((new-workspace (make-string (* current 2))))
          (replace new-workspace workspace)

-         (setf (aref new-workspace current) character)
-         (setf (string-output-stream-string stream) new-workspace))
+         (setf (aref new-workspace current) character
+               (string-output-stream-string stream) new-workspace))

        (setf (aref workspace current) character))
     (setf (string-output-stream-index stream) (1+ current))))
 
 (defun string-sout (stream string start end)
        (setf (aref workspace current) character))
     (setf (string-output-stream-index stream) (1+ current))))
 
 (defun string-sout (stream string start end)

-  (declare (simple-string string) (fixnum start end))
-  (let* ((current (string-output-stream-index stream))
+  (declare (type simple-string string)
+          (type fixnum start end))
+  (let* ((string (if (typep string '(simple-array character (*)))
+                    string
+                    (coerce string '(simple-array character (*)))))
+        (current (string-output-stream-index stream))

         (length (- end start))
         (dst-end (+ length current))
         (workspace (string-output-stream-string stream)))
         (length (- end start))
         (dst-end (+ length current))
         (workspace (string-output-stream-string stream)))

-    (declare (simple-string workspace)
-            (fixnum current length dst-end))
+    (declare (type (simple-array character (*)) workspace string)
+            (type fixnum current length dst-end))

     (if (> dst-end (the fixnum (length workspace)))
        (let ((new-workspace (make-string (+ (* current 2) length))))
          (replace new-workspace workspace :end2 current)
     (if (> dst-end (the fixnum (length workspace)))
        (let ((new-workspace (make-string (+ (* current 2) length))))
          (replace new-workspace workspace :end2 current)

@@ -1217,7 +1104,25 @@
   (declare (ignore arg2))
   (case operation
     (:file-position
   (declare (ignore arg2))
   (case operation
     (:file-position

-     (if (null arg1)
+     (if arg1
+        (let ((end (string-output-stream-last-index stream)))
+          (setf (string-output-stream-index-cache stream) end
+                (string-output-stream-index stream)
+                (case arg1
+                  (:start 0)
+                  (:end end)
+                  (t
+                   ;; We allow moving beyond the end of stream,
+                   ;; implicitly extending the output stream.
+                   (let ((buffer (string-output-stream-string stream)))
+                     (when (> arg1 (length buffer))
+                       (setf (string-output-stream-string stream)
+                             (make-string
+                              arg1 :element-type (array-element-type buffer))
+                             (subseq (string-output-stream-string stream)
+                                     0 end)
+                             (subseq buffer 0 end))))
+                     arg1))))

         (string-output-stream-index stream)))
     (:charpos
      (do ((index (1- (the fixnum (string-output-stream-index stream)))
         (string-output-stream-index stream)))
     (:charpos
      (do ((index (1- (the fixnum (string-output-stream-index stream)))

@@ -1225,20 +1130,32 @@
          (count 0 (1+ count))
          (string (string-output-stream-string stream)))
         ((< index 0) count)
          (count 0 (1+ count))
          (string (string-output-stream-string stream)))
         ((< index 0) count)

-       (declare (simple-string string)
-               (fixnum index count))
+       (declare (type (simple-array character (*)) string)
+               (type fixnum index count))

        (if (char= (schar string index) #\newline)
           (return count))))
        (if (char= (schar string index) #\newline)
           (return count))))

-    (:element-type 'base-char)))
+    (:element-type (array-element-type (string-output-stream-string stream)))))

 
 ;;; Return a string of all the characters sent to a stream made by
 ;;; MAKE-STRING-OUTPUT-STREAM since the last call to this function.
 (defun get-output-stream-string (stream)
   (declare (type string-output-stream stream))
 
 ;;; Return a string of all the characters sent to a stream made by
 ;;; MAKE-STRING-OUTPUT-STREAM since the last call to this function.
 (defun get-output-stream-string (stream)
   (declare (type string-output-stream stream))

-  (let* ((length (string-output-stream-index stream))
-        (result (make-string length)))
-    (replace result (string-output-stream-string stream))
-    (setf (string-output-stream-index stream) 0)
+  (let* ((length (string-output-stream-last-index stream))
+        (element-type (string-output-stream-element-type stream))
+        (result 
+         (case element-type
+           ;; Overwhelmingly common case; can be inlined.
+           ((character) (make-string length))
+           (t (make-string length :element-type element-type)))))
+    ;; For the benefit of the REPLACE transform, let's do this, so
+    ;; that the common case isn't ludicrously expensive.
+    (etypecase result 
+      ((simple-array character (*)) 
+       (replace result (string-output-stream-string stream)))
+      ((simple-array nil (*))
+       (replace result (string-output-stream-string stream))))
+    (setf (string-output-stream-index stream) 0
+         (string-output-stream-index-cache stream) 0)

     result))
 
 ;;; Dump the characters buffer up in IN-STREAM to OUT-STREAM as
     result))
 
 ;;; Dump the characters buffer up in IN-STREAM to OUT-STREAM as

@@ -1247,8 +1164,9 @@
   (%write-string (string-output-stream-string in-stream)
                 out-stream
                 0
   (%write-string (string-output-stream-string in-stream)
                 out-stream
                 0

-                (string-output-stream-index in-stream))
-  (setf (string-output-stream-index in-stream) 0))
+                (string-output-stream-last-index in-stream))
+  (setf (string-output-stream-index in-stream) 0
+       (string-output-stream-index-cache in-stream) 0))

 \f
 ;;;; fill-pointer streams
 
 \f
 ;;;; fill-pointer streams
 

@@ -1256,15 +1174,22 @@
 ;;; the CLM, but they are required for the implementation of
 ;;; WITH-OUTPUT-TO-STRING.
 
 ;;; the CLM, but they are required for the implementation of
 ;;; WITH-OUTPUT-TO-STRING.
 

+(deftype string-with-fill-pointer ()
+  '(and (vector character)
+       (satisfies array-has-fill-pointer-p)))
+

 (defstruct (fill-pointer-output-stream
 (defstruct (fill-pointer-output-stream

-           (:include lisp-stream
+           (:include string-stream

                      (out #'fill-pointer-ouch)
                      (sout #'fill-pointer-sout)
                      (out #'fill-pointer-ouch)
                      (sout #'fill-pointer-sout)

-                     (misc #'fill-pointer-misc))
+                     (misc #'fill-pointer-misc)
+                      ;; a string with a fill pointer where we stuff
+                      ;; the stuff we write
+                      (string (missing-arg)
+                              :type string-with-fill-pointer
+                              :read-only t))

            (:constructor make-fill-pointer-output-stream (string))
            (:constructor make-fill-pointer-output-stream (string))

-           (:copier nil))
-  ;; the string we throw stuff in
-  string)
+           (:copier nil)))

 
 (defun fill-pointer-ouch (stream character)
   (let* ((buffer (fill-pointer-output-stream-string stream))
 
 (defun fill-pointer-ouch (stream character)
   (let* ((buffer (fill-pointer-output-stream-string stream))

@@ -1272,7 +1197,7 @@
         (current+1 (1+ current)))
     (declare (fixnum current))
     (with-array-data ((workspace buffer) (start) (end))
         (current+1 (1+ current)))
     (declare (fixnum current))
     (with-array-data ((workspace buffer) (start) (end))

-      (declare (simple-string workspace))
+      (declare (type (simple-array character (*)) workspace))

       (let ((offset-current (+ start current)))
        (declare (fixnum offset-current))
        (if (= offset-current end)
       (let ((offset-current (+ start current)))
        (declare (fixnum offset-current))
        (if (= offset-current end)

@@ -1281,8 +1206,8 @@
              (declare (simple-string new-workspace))
              (%byte-blt workspace start
                         new-workspace 0 current)
              (declare (simple-string new-workspace))
              (%byte-blt workspace start
                         new-workspace 0 current)

-             (setf workspace new-workspace)
-             (setf offset-current current)
+             (setf workspace new-workspace
+                   offset-current current)

              (set-array-header buffer workspace new-length
                                current+1 0 new-length nil))
            (setf (fill-pointer buffer) current+1))
              (set-array-header buffer workspace new-length
                                current+1 0 new-length nil))
            (setf (fill-pointer buffer) current+1))

@@ -1291,20 +1216,23 @@
 
 (defun fill-pointer-sout (stream string start end)
   (declare (simple-string string) (fixnum start end))
 
 (defun fill-pointer-sout (stream string start end)
   (declare (simple-string string) (fixnum start end))

-  (let* ((buffer (fill-pointer-output-stream-string stream))
+  (let* ((string (if (typep string '(simple-array character (*)))
+                    string
+                    (coerce string '(simple-array character (*)))))
+        (buffer (fill-pointer-output-stream-string stream))

         (current (fill-pointer buffer))
         (string-len (- end start))
         (dst-end (+ string-len current)))
     (declare (fixnum current dst-end string-len))
     (with-array-data ((workspace buffer) (dst-start) (dst-length))
         (current (fill-pointer buffer))
         (string-len (- end start))
         (dst-end (+ string-len current)))
     (declare (fixnum current dst-end string-len))
     (with-array-data ((workspace buffer) (dst-start) (dst-length))

-      (declare (simple-string workspace))
+      (declare (type (simple-array character (*)) workspace))

       (let ((offset-dst-end (+ dst-start dst-end))
            (offset-current (+ dst-start current)))
        (declare (fixnum offset-dst-end offset-current))
        (if (> offset-dst-end dst-length)
            (let* ((new-length (+ (the fixnum (* current 2)) string-len))
                   (new-workspace (make-string new-length)))
       (let ((offset-dst-end (+ dst-start dst-end))
            (offset-current (+ dst-start current)))
        (declare (fixnum offset-dst-end offset-current))
        (if (> offset-dst-end dst-length)
            (let* ((new-length (+ (the fixnum (* current 2)) string-len))
                   (new-workspace (make-string new-length)))

-             (declare (simple-string new-workspace))
+             (declare (type (simple-array character (*)) new-workspace))

              (%byte-blt workspace dst-start
                         new-workspace 0 current)
              (setf workspace new-workspace)
              (%byte-blt workspace dst-start
                         new-workspace 0 current)
              (setf workspace new-workspace)

@@ -1325,6 +1253,25 @@
 (defun fill-pointer-misc (stream operation &optional arg1 arg2)
   (declare (ignore arg1 arg2))
   (case operation
 (defun fill-pointer-misc (stream operation &optional arg1 arg2)
   (declare (ignore arg1 arg2))
   (case operation

+    (:file-position
+     (let ((buffer (fill-pointer-output-stream-string stream)))
+       (if arg1
+          (setf (fill-pointer buffer)
+                (case arg1
+                  (:start 0)
+                  ;; Fill-pointer is always at fill-pointer we will
+                  ;; make :END move to the end of the actual string.
+                  (:end (array-total-size buffer))
+                  ;; We allow moving beyond the end of string if the
+                  ;; string is adjustable.
+                  (t (when (>= arg1 (array-total-size buffer))
+                       (if (adjustable-array-p buffer)
+                           (adjust-array buffer arg1)
+                           (error "Cannot move FILE-POSITION beyond the end ~
+                                    of WITH-OUTPUT-TO-STRING stream ~
+                                    constructed with non-adjustable string.")))
+                     arg1)))
+          (fill-pointer buffer))))

     (:charpos
      (let* ((buffer (fill-pointer-output-stream-string stream))
            (current (fill-pointer buffer)))
     (:charpos
      (let* ((buffer (fill-pointer-output-stream-string stream))
            (current (fill-pointer buffer)))

@@ -1335,11 +1282,12 @@
           (if found
               (- end (the fixnum found))
               current)))))
           (if found
               (- end (the fixnum found))
               current)))))

-     (:element-type 'base-char)))
+     (:element-type (array-element-type
+                    (fill-pointer-output-stream-string stream)))))

 \f
 ;;;; indenting streams
 
 \f
 ;;;; indenting streams
 

-(defstruct (indenting-stream (:include lisp-stream
+(defstruct (indenting-stream (:include ansi-stream

                                       (out #'indenting-out)
                                       (sout #'indenting-sout)
                                       (misc #'indenting-misc))
                                       (out #'indenting-out)
                                       (sout #'indenting-sout)
                                       (misc #'indenting-misc))

@@ -1394,8 +1342,8 @@
 ;;; the base stream minus the stream's indentation.
 (defun indenting-misc (stream operation &optional arg1 arg2)
   (let ((sub-stream (indenting-stream-stream stream)))
 ;;; the base stream minus the stream's indentation.
 (defun indenting-misc (stream operation &optional arg1 arg2)
   (let ((sub-stream (indenting-stream-stream stream)))

-    (if (lisp-stream-p sub-stream)
-       (let ((method (lisp-stream-misc sub-stream)))
+    (if (ansi-stream-p sub-stream)
+       (let ((method (ansi-stream-misc sub-stream)))

          (case operation
            (:line-length
             (let ((line-length (funcall method sub-stream operation)))
          (case operation
            (:line-length
             (let ((line-length (funcall method sub-stream operation)))

@@ -1425,11 +1373,11 @@
 ;;;; case frobbing streams, used by FORMAT ~(...~)
 
 (defstruct (case-frob-stream
 ;;;; case frobbing streams, used by FORMAT ~(...~)
 
 (defstruct (case-frob-stream

-           (:include lisp-stream
-                     (:misc #'case-frob-misc))
+           (:include ansi-stream
+                     (misc #'case-frob-misc))

            (:constructor %make-case-frob-stream (target out sout))
            (:copier nil))
            (:constructor %make-case-frob-stream (target out sout))
            (:copier nil))

-  (target (required-argument) :type stream))
+  (target (missing-arg) :type stream))

 
 (defun make-case-frob-stream (target kind)
   #!+sb-doc
 
 (defun make-case-frob-stream (target kind)
   #!+sb-doc

@@ -1469,11 +1417,12 @@
 (defun case-frob-misc (stream op &optional arg1 arg2)
   (declare (type case-frob-stream stream))
   (case op
 (defun case-frob-misc (stream op &optional arg1 arg2)
   (declare (type case-frob-stream stream))
   (case op

-    (:close)
+    (:close
+     (set-closed-flame stream))

     (t
      (let ((target (case-frob-stream-target stream)))
     (t
      (let ((target (case-frob-stream-target stream)))

-       (if (lisp-stream-p target)
-          (funcall (lisp-stream-misc target) target op arg1 arg2)
+       (if (ansi-stream-p target)
+          (funcall (ansi-stream-misc target) target op arg1 arg2)

           (stream-misc-dispatch target op arg1 arg2))))))
 
 (defun case-frob-upcase-out (stream char)
           (stream-misc-dispatch target op arg1 arg2))))))
 
 (defun case-frob-upcase-out (stream char)

@@ -1481,8 +1430,8 @@
           (type base-char char))
   (let ((target (case-frob-stream-target stream))
        (char (char-upcase char)))
           (type base-char char))
   (let ((target (case-frob-stream-target stream))
        (char (char-upcase char)))

-    (if (lisp-stream-p target)
-       (funcall (lisp-stream-out target) target char)
+    (if (ansi-stream-p target)
+       (funcall (ansi-stream-out target) target char)

        (stream-write-char target char))))
 
 (defun case-frob-upcase-sout (stream str start end)
        (stream-write-char target char))))
 
 (defun case-frob-upcase-sout (stream str start end)

@@ -1497,8 +1446,8 @@
                     (string-upcase str)
                     (nstring-upcase (subseq str start end))))
         (string-len (- end start)))
                     (string-upcase str)
                     (nstring-upcase (subseq str start end))))
         (string-len (- end start)))

-    (if (lisp-stream-p target)
-       (funcall (lisp-stream-sout target) target string 0 string-len)
+    (if (ansi-stream-p target)
+       (funcall (ansi-stream-sout target) target string 0 string-len)

        (stream-write-string target string 0 string-len))))
 
 (defun case-frob-downcase-out (stream char)
        (stream-write-string target string 0 string-len))))
 
 (defun case-frob-downcase-out (stream char)

@@ -1506,8 +1455,8 @@
           (type base-char char))
   (let ((target (case-frob-stream-target stream))
        (char (char-downcase char)))
           (type base-char char))
   (let ((target (case-frob-stream-target stream))
        (char (char-downcase char)))

-    (if (lisp-stream-p target)
-       (funcall (lisp-stream-out target) target char)
+    (if (ansi-stream-p target)
+       (funcall (ansi-stream-out target) target char)

        (stream-write-char target char))))
 
 (defun case-frob-downcase-sout (stream str start end)
        (stream-write-char target char))))
 
 (defun case-frob-downcase-sout (stream str start end)

@@ -1522,8 +1471,8 @@
                     (string-downcase str)
                     (nstring-downcase (subseq str start end))))
         (string-len (- end start)))
                     (string-downcase str)
                     (nstring-downcase (subseq str start end))))
         (string-len (- end start)))

-    (if (lisp-stream-p target)
-       (funcall (lisp-stream-sout target) target string 0 string-len)
+    (if (ansi-stream-p target)
+       (funcall (ansi-stream-sout target) target string 0 string-len)

        (stream-write-string target string 0 string-len))))
 
 (defun case-frob-capitalize-out (stream char)
        (stream-write-string target string 0 string-len))))
 
 (defun case-frob-capitalize-out (stream char)

@@ -1532,15 +1481,15 @@
   (let ((target (case-frob-stream-target stream)))
     (cond ((alphanumericp char)
           (let ((char (char-upcase char)))
   (let ((target (case-frob-stream-target stream)))
     (cond ((alphanumericp char)
           (let ((char (char-upcase char)))

-            (if (lisp-stream-p target)
-                (funcall (lisp-stream-out target) target char)
+            (if (ansi-stream-p target)
+                (funcall (ansi-stream-out target) target char)

                 (stream-write-char target char)))
           (setf (case-frob-stream-out stream) #'case-frob-capitalize-aux-out)
           (setf (case-frob-stream-sout stream)
                 #'case-frob-capitalize-aux-sout))
          (t
                 (stream-write-char target char)))
           (setf (case-frob-stream-out stream) #'case-frob-capitalize-aux-out)
           (setf (case-frob-stream-sout stream)
                 #'case-frob-capitalize-aux-sout))
          (t

-          (if (lisp-stream-p target)
-              (funcall (lisp-stream-out target) target char)
+          (if (ansi-stream-p target)
+              (funcall (ansi-stream-out target) target char)

               (stream-write-char target char))))))
 
 (defun case-frob-capitalize-sout (stream str start end)
               (stream-write-char target char))))))
 
 (defun case-frob-capitalize-sout (stream str start end)

@@ -1566,8 +1515,8 @@
            #'case-frob-capitalize-aux-out)
       (setf (case-frob-stream-sout stream)
            #'case-frob-capitalize-aux-sout))
            #'case-frob-capitalize-aux-out)
       (setf (case-frob-stream-sout stream)
            #'case-frob-capitalize-aux-sout))

-    (if (lisp-stream-p target)
-       (funcall (lisp-stream-sout target) target str 0 len)
+    (if (ansi-stream-p target)
+       (funcall (ansi-stream-sout target) target str 0 len)

        (stream-write-string target str 0 len))))
 
 (defun case-frob-capitalize-aux-out (stream char)
        (stream-write-string target str 0 len))))
 
 (defun case-frob-capitalize-aux-out (stream char)

@@ -1576,12 +1525,12 @@
   (let ((target (case-frob-stream-target stream)))
     (cond ((alphanumericp char)
           (let ((char (char-downcase char)))
   (let ((target (case-frob-stream-target stream)))
     (cond ((alphanumericp char)
           (let ((char (char-downcase char)))

-            (if (lisp-stream-p target)
-                (funcall (lisp-stream-out target) target char)
+            (if (ansi-stream-p target)
+                (funcall (ansi-stream-out target) target char)

                 (stream-write-char target char))))
          (t
                 (stream-write-char target char))))
          (t

-          (if (lisp-stream-p target)
-              (funcall (lisp-stream-out target) target char)
+          (if (ansi-stream-p target)
+              (funcall (ansi-stream-out target) target char)

               (stream-write-char target char))
           (setf (case-frob-stream-out stream)
                 #'case-frob-capitalize-out)
               (stream-write-char target char))
           (setf (case-frob-stream-out stream)
                 #'case-frob-capitalize-out)

@@ -1611,8 +1560,8 @@
            #'case-frob-capitalize-out)
       (setf (case-frob-stream-sout stream)
            #'case-frob-capitalize-sout))
            #'case-frob-capitalize-out)
       (setf (case-frob-stream-sout stream)
            #'case-frob-capitalize-sout))

-    (if (lisp-stream-p target)
-       (funcall (lisp-stream-sout target) target str 0 len)
+    (if (ansi-stream-p target)
+       (funcall (ansi-stream-sout target) target str 0 len)

        (stream-write-string target str 0 len))))
 
 (defun case-frob-capitalize-first-out (stream char)
        (stream-write-string target str 0 len))))
 
 (defun case-frob-capitalize-first-out (stream char)

@@ -1621,16 +1570,16 @@
   (let ((target (case-frob-stream-target stream)))
     (cond ((alphanumericp char)
           (let ((char (char-upcase char)))
   (let ((target (case-frob-stream-target stream)))
     (cond ((alphanumericp char)
           (let ((char (char-upcase char)))

-            (if (lisp-stream-p target)
-                (funcall (lisp-stream-out target) target char)
+            (if (ansi-stream-p target)
+                (funcall (ansi-stream-out target) target char)

                 (stream-write-char target char)))
           (setf (case-frob-stream-out stream)
                 #'case-frob-downcase-out)
           (setf (case-frob-stream-sout stream)
                 #'case-frob-downcase-sout))
          (t
                 (stream-write-char target char)))
           (setf (case-frob-stream-out stream)
                 #'case-frob-downcase-out)
           (setf (case-frob-stream-sout stream)
                 #'case-frob-downcase-sout))
          (t

-          (if (lisp-stream-p target)
-              (funcall (lisp-stream-out target) target char)
+          (if (ansi-stream-p target)
+              (funcall (ansi-stream-out target) target char)

               (stream-write-char target char))))))
 
 (defun case-frob-capitalize-first-sout (stream str start end)
               (stream-write-char target char))))))
 
 (defun case-frob-capitalize-first-sout (stream str start end)

@@ -1653,42 +1602,13 @@
          (setf (case-frob-stream-sout stream)
                #'case-frob-downcase-sout)
          (return))))
          (setf (case-frob-stream-sout stream)
                #'case-frob-downcase-sout)
          (return))))

-    (if (lisp-stream-p target)
-       (funcall (lisp-stream-sout target) target str 0 len)
+    (if (ansi-stream-p target)
+       (funcall (ansi-stream-sout target) target str 0 len)

        (stream-write-string target str 0 len))))
 \f
        (stream-write-string target str 0 len))))
 \f

-;;;; stream commands
+;;;; READ-SEQUENCE

 
 

-(defstruct (stream-command (:constructor make-stream-command
-                                        (name &optional args))
-                          (:copier nil))
-  (name nil :type symbol)
-  (args nil :type list))
-(def!method print-object ((obj stream-command) str)
-  (print-unreadable-object (obj str :type t :identity t)
-    (prin1 (stream-command-name obj) str)))
-
-;;; Take a stream and wait for text or a command to appear on it. If
-;;; text appears before a command, return NIL, otherwise return a
-;;; command.
-;;;
-;;; We can't simply call the stream's misc method because NIL is an
-;;; ambiguous return value: does it mean text arrived, or does it mean
-;;; the stream's misc method had no :GET-COMMAND implementation? We
-;;; can't return NIL until there is text input. We don't need to loop
-;;; because any stream implementing :GET-COMMAND would wait until it
-;;; had some input. If the LISTEN fails, then we have some stream we
-;;; must wait on.
-(defun get-stream-command (stream)
-  (let ((cmdp (funcall (lisp-stream-misc stream) stream :get-command)))
-    (cond (cmdp)
-         ((listen stream)
-          nil)
-         (t
-          ;; This waits for input and returns NIL when it arrives.
-          (unread-char (read-char stream) stream)))))
-\f
-(defun read-sequence (seq stream &key (start 0) (end nil))
+(defun read-sequence (seq stream &key (start 0) end)

   #!+sb-doc
   "Destructively modify SEQ by reading elements from STREAM.
   That part of SEQ bounded by START and END is destructively modified by
   #!+sb-doc
   "Destructively modify SEQ by reading elements from STREAM.
   That part of SEQ bounded by START and END is destructively modified by

@@ -1701,7 +1621,18 @@
           (type index start)
           (type sequence-end end)
           (values index))
           (type index start)
           (type sequence-end end)
           (values index))

-  (let ((end (or end (length seq))))
+  (if (ansi-stream-p stream)
+      (ansi-stream-read-sequence seq stream start end)
+      ;; must be Gray streams FUNDAMENTAL-STREAM
+      (stream-read-sequence stream seq start end)))
+
+(defun ansi-stream-read-sequence (seq stream start %end)
+  (declare (type sequence seq)
+          (type ansi-stream stream)
+          (type index start)
+          (type sequence-end %end)
+          (values index))
+  (let ((end (or %end (length seq))))

     (declare (type index end))
     (etypecase seq
       (list
     (declare (type index end))
     (etypecase seq
       (list

@@ -1720,7 +1651,7 @@
             (setf (first rem) el)))))
       (vector
        (with-array-data ((data seq) (offset-start start) (offset-end end))
             (setf (first rem) el)))))
       (vector
        (with-array-data ((data seq) (offset-start start) (offset-end end))

-        (typecase data
+         (typecase data

           ((or (simple-array (unsigned-byte 8) (*))
                (simple-array (signed-byte 8) (*))
                simple-string)
           ((or (simple-array (unsigned-byte 8) (*))
                (simple-array (signed-byte 8) (*))
                simple-string)

@@ -1745,6 +1676,8 @@
                  (when (eq el :eof)
                    (return (+ start (- i offset-start))))
                  (setf (aref data i) el)))))))))))
                  (when (eq el :eof)
                    (return (+ start (- i offset-start))))
                  (setf (aref data i) el)))))))))))

+\f
+;;;; WRITE-SEQUENCE

 
 (defun write-sequence (seq stream &key (start 0) (end nil))
   #!+sb-doc
 
 (defun write-sequence (seq stream &key (start 0) (end nil))
   #!+sb-doc

@@ -1754,8 +1687,19 @@
           (type index start)
           (type sequence-end end)
           (values sequence))
           (type index start)
           (type sequence-end end)
           (values sequence))

-  (let ((end (or end (length seq))))
-    (declare (type index start end))
+  (if (ansi-stream-p stream)
+      (ansi-stream-write-sequence seq stream start end)
+      ;; must be Gray-streams FUNDAMENTAL-STREAM
+      (stream-write-sequence stream seq start end)))
+
+(defun ansi-stream-write-sequence (seq stream start %end)
+  (declare (type sequence seq)
+          (type ansi-stream stream)
+          (type index start)
+          (type sequence-end %end)
+          (values sequence))
+  (let ((end (or %end (length seq))))
+    (declare (type index end))

     (etypecase seq
       (list
        (let ((write-function
     (etypecase seq
       (list
        (let ((write-function

@@ -1779,7 +1723,5 @@
             ((>= i end) seq)
           (declare (type index i))
           (funcall write-function (aref seq i) stream)))))))
             ((>= i end) seq)
           (declare (type index i))
           (funcall write-function (aref seq i) stream)))))))

-
-;;; (These were inline throughout this file, but that's not appropriate
-;;; globally.)
-(declaim (maybe-inline read-char unread-char read-byte listen))
+\f
+;;;; etc.