From: William H. N. <wn...@us...> - 2002-11-24 22:40:55
|
Update of /cvsroot/sbcl/sbcl/tests In directory sc8-pr-cvs1:/tmp/cvs-serv27979/tests Modified Files: stream.pure.lisp Log Message: 0.7.9.66: merged emu patch from sbcl-devel 2002-11-18, tweaking .32 patch to cope with PEEK-CHAR/UNREAD-CHAR on ECHO-STREAMs better Index: stream.pure.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/tests/stream.pure.lisp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- stream.pure.lisp 11 Nov 2002 01:23:22 -0000 1.3 +++ stream.pure.lisp 24 Nov 2002 22:40:52 -0000 1.4 @@ -53,7 +53,7 @@ (return))))) ;;; Entomotomy PEEK-CHAR-WRONGLY-ECHOS-TO-ECHO-STREAM bug, fixed by -;;; by MRD patch sbcl-devel 2002-11-02 merged ca. sbcl-0.7.9.32 +;;; by MRD patch sbcl-devel 2002-11-02 merged ca. sbcl-0.7.9.32... (assert (string= (with-output-to-string (out) (peek-char #\] @@ -61,3 +61,15 @@ (make-string-input-stream "ab cd e df s]") out))) ;; (Before the fix, the result had a trailing #\] in it.) "ab cd e df s")) +;;; ...and a missing wrinkle in the original patch, dealing with +;;; PEEK-CHAR/UNREAD-CHAR on ECHO-STREAMs, fixed by MRD patch +;;; sbcl-devel 2002-11-18, merged ca. sbcl-0.7.9.66 +(assert (string= + (let* ((in-stream (make-string-input-stream "abc")) + (out-stream (make-string-output-stream)) + (echo-stream (make-echo-stream in-stream out-stream))) + (unread-char (read-char echo-stream) echo-stream) + (peek-char #\a echo-stream) + (get-output-stream-string out-stream)) + ;; (Before the fix, the LET* expression just signalled an error.) + "a")) |