0.pre7.60:
[sbcl.git] / src / code / stream.lisp
index fb1d207..41701aa 100644 (file)
 
 ;;; 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))
   (declare (type stream stream))
   (funcall (lisp-stream-misc stream) stream :interactive-p))
 
-(defun open-stream-p (stream)
-  (declare (type stream stream))
-  (not (eq (lisp-stream-in stream) #'closed-flame)))
-
 (defun close (stream &key abort)
   (declare (type stream stream))
   (when (open-stream-p stream)
           (funcall (lisp-stream-in stream) stream eof-error-p eof-value))
          (t
           (when (/= start +in-buffer-extra+)
-            (bit-bash-copy ibuf (+ (* +in-buffer-extra+ sb!vm:byte-bits)
+            (bit-bash-copy ibuf (+ (* +in-buffer-extra+ sb!vm:n-byte-bits)
                                    (* 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:word-bits))
-                           (* count sb!vm:byte-bits)))
+                                      sb!vm:n-word-bits))
+                           (* count sb!vm:n-byte-bits)))
           (setf (lisp-stream-in-index stream) (1+ start))
           (code-char (aref ibuf start))))))
 
           (funcall (lisp-stream-bin stream) stream eof-error-p eof-value))
          (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:word-bits))
-                           (* count sb!vm:byte-bits)))
+                                      sb!vm:n-word-bits))
+                           (* count sb!vm:n-byte-bits)))
           (setf (lisp-stream-in-index stream) (1+ start))
           (aref ibuf start)))))
 \f
 
 #!-high-security-support
 (setf (fdocumentation 'make-concatenated-stream 'function)
-  "Returns 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.")
 
 #!+high-security-support
 (defun make-concatenated-stream (&rest streams)
   #!+sb-doc
-  "Returns 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)
     (unless (or (and (synonym-stream-p stream)
 
 #!+sb-doc
 (setf (fdocumentation 'make-echo-stream 'function)
-  "Returns a bidirectional stream which gets its input from Input-Stream and
-   sends its output to Output-Stream. In addition, all input is echoed to
+  "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")
 \f
 ;;;; string input streams
            (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))
-                        (* 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 make-string-input-stream (string &optional
                                        (start 0) (end (length string)))
   #!+sb-doc
-  "Returns an input stream which will supply the characters of String between
-  Start and End in order."
+  "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
 (setf (fdocumentation 'make-string-output-stream 'function)
-  "Returns an Output stream which will accumulate all output given it for
-   the benefit of the function Get-Output-Stream-String.")
+  "Return an output stream which will accumulate all output given it for
+   the benefit of the function GET-OUTPUT-STREAM-STRING.")
 
 (defun string-ouch (stream character)
   (let ((current (string-output-stream-index stream))
 
 #!+sb-doc
 (setf (fdocumentation 'make-indenting-stream 'function)
- "Returns an output stream which indents its output by some amount.")
+ "Return an output stream which indents its output by some amount.")
 
 ;;; INDENTING-INDENT writes the correct number of spaces needed to indent
 ;;; output on the given STREAM based on the specified SUB-STREAM.
 
 (defun make-case-frob-stream (target kind)
   #!+sb-doc
-  "Returns a stream that sends all output to the stream TARGET, but modifies
+  "Return a stream that sends all output to the stream TARGET, but modifies
    the case of letters, depending on KIND, which should be one of:
      :upcase - convert to upper case.
      :downcase - convert to lower case.