0.pre7.74:

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

diff --git a/src/code/stream.lisp b/src/code/stream.lisp
index a433a65..3652f87 100644 (file)
--- a/src/code/stream.lisp
+++ b/src/code/stream.lisp
@@ -19,13 +19,13 @@
 
 ;;; 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))
@@ -509,13 +509,13 @@
           (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))))))
 
@@ -533,11 +533,11 @@
           (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
@@ -809,8 +809,8 @@
                          #!+high-security-support
                          %make-two-way-stream (input-stream output-stream))
            (: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)
 
 #!-high-security-support
@@ -1120,12 +1120,12 @@
            (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)))
@@ -1429,7 +1429,7 @@
                      (:misc #'case-frob-misc))
            (: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