/[cmucl]/src/code/stream.lisp
ViewVC logotype

Diff of /src/code/stream.lisp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.87.6.11 by rtoy, Wed Oct 7 17:55:58 2009 UTC revision 1.87.6.12 by rtoy, Thu Oct 8 02:06:25 2009 UTC
# Line 298  Line 298 
298      ;; fundamental-stream      ;; fundamental-stream
299      :default))      :default))
300    
301    #+unicode
302  (defun %set-fd-stream-external-format (stream extfmt &optional (updatep t))  (defun %set-fd-stream-external-format (stream extfmt &optional (updatep t))
303    (declare (type fd-stream stream))    (declare (type fd-stream stream))
304    (let ((old-format (fd-stream-external-format stream)))    (let ((old-format (fd-stream-external-format stream)))
# Line 762  Line 763 
763             (setf (lisp-stream-in-index stream) (1+ start))             (setf (lisp-stream-in-index stream) (1+ start))
764             (code-char (aref ibuf start))))))             (code-char (aref ibuf start))))))
765    
766    #+unicode
767  (defun fast-read-char-string-refill (stream eof-errorp eof-value)  (defun fast-read-char-string-refill (stream eof-errorp eof-value)
768    ;; Like fast-read-char-refill, but we don't need or want the    ;; Like fast-read-char-refill, but we don't need or want the
769    ;; in-buffer-extra.    ;; in-buffer-extra.
# Line 805  Line 807 
807                 (setf (fd-stream-in-length stream) (+ count (- in-buffer-length index)))                 (setf (fd-stream-in-length stream) (+ count (- in-buffer-length index)))
808                 (let ((state (fd-stream-oc-state stream)))                 (let ((state (fd-stream-oc-state stream)))
809                   (setf (fd-stream-saved-oc-state stream)                   (setf (fd-stream-saved-oc-state stream)
810                         (cons (car state) (funcall (ef-copy-state (fd-stream-external-format stream))                         (cons (car state)
811                                                    (cdr state)))))                               (funcall (ef-copy-state (fd-stream-external-format stream))
812                                          (cdr state)))))
813    
814                 ;; Copy the last read character to the beginning of the                 ;; Copy the last read character to the beginning of the
815                 ;; buffer to support unreading.                 ;; buffer to support unreading.
# Line 831  Line 834 
834                   (setf (lisp-stream-in-index stream) octet-count)                   (setf (lisp-stream-in-index stream) octet-count)
835                   (schar sbuf 1))))))))                   (schar sbuf 1))))))))
836    
   
837  ;;; FAST-READ-BYTE-REFILL  --  Interface  ;;; FAST-READ-BYTE-REFILL  --  Interface
838  ;;;  ;;;
839  ;;;    Similar to FAST-READ-CHAR-REFILL, but we don't have to leave room for  ;;;    Similar to FAST-READ-CHAR-REFILL, but we don't have to leave room for

Legend:
Removed from v.1.87.6.11  
changed lines
  Added in v.1.87.6.12

  ViewVC Help
Powered by ViewVC 1.1.5