/[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.6 by ram, Wed Oct 17 03:46:22 1990 UTC revision 1.7 by ram, Sat Jan 12 15:50:40 1991 UTC
# Line 642  Line 642 
642      (setf (concatenated-stream-current stream) current)      (setf (concatenated-stream-current stream) current)
643      (let ((this (car current)))      (let ((this (car current)))
644        (multiple-value-bind (result eofp)        (multiple-value-bind (result eofp)
645                             (read-line this nil nil)                             (read-line this nil :eof)
646          (declare (simple-string result))          (declare (type (or simple-string (member :eof)) result))
647          ;; Once we have found some input, we loop until we either find a          ;; Once we have found some input, we loop until we either find a
648          ;; line not terminated by eof or hit eof on the last stream.          ;; line not terminated by eof or hit eof on the last stream.
649          (when result          (unless (eq result :eof)
650            (do ((current (cdr current) (cdr current))            (do ((current (cdr current) (cdr current))
651                 (new ""))                 (new ""))
652                ((or (not eofp) (null current))                ((or (not eofp) (null current))
# Line 656  Line 656 
656              (let ((this (car current)))              (let ((this (car current)))
657                (multiple-value-setq (new eofp)                (multiple-value-setq (new eofp)
658                  (read-line this nil :eof))                  (read-line this nil :eof))
659                (if new                (if (eq new :eof)
660                    (setq result (concatenate 'simple-string result new))                    (setq eofp t)
661                    (setq eofp t)))))))))                    (setq result (concatenate 'simple-string result new))))))))))
662    
663  (defun concatenated-misc (stream operation &optional arg1 arg2)  (defun concatenated-misc (stream operation &optional arg1 arg2)
664    (if (eq operation :read-line)    (if (eq operation :read-line)

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

  ViewVC Help
Powered by ViewVC 1.1.5