X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fstream.pure.lisp;h=120c706e7ba6dd7300b4c5abcf0a2bf09dc99151;hb=731d5dd65a7b94b5d49d1663d9b60c3a406ce38c;hp=127333b5c5ef6fc87056595e543ffc419c76ec2a;hpb=954902abeb19dac4f79f0a5b800eac45179b8d7c;p=sbcl.git

diff --git a/tests/stream.pure.lisp b/tests/stream.pure.lisp
index 127333b..120c706 100644
--- a/tests/stream.pure.lisp
+++ b/tests/stream.pure.lisp
@@ -74,6 +74,27 @@
 	 ;; (Before the fix, the LET* expression just signalled an error.)
 	 "a"))
 
+;;; Reported by Fredrik Sandstrom to sbcl-devel 2005-05-17 ("Bug in
+;;; peek-char"):
+;;; Description: In (peek-char nil s nil foo), if foo happens to be
+;;; the same character that peek-char returns, the character is
+;;; removed from the input stream, as if read by read-char.
+(assert (equal (with-input-from-string (s "123")
+		 (list (peek-char nil s nil #\1) (read-char s) (read-char s)))
+	       '(#\1 #\1 #\2)))
+
+;;; ... and verify that the fix does not break echo streams
+(assert (string= (let ((out (make-string-output-stream)))
+		   (with-open-stream (s (make-echo-stream
+					 (make-string-input-stream "123")
+					 out))
+		     (format s "=>~{~A~}"
+			     (list (peek-char nil s nil #\1)
+				   (read-char s)
+				   (read-char s)))
+		     (get-output-stream-string out)))
+		 "12=>112"))
+
 ;;; 0.7.12 doesn't advance current stream in concatenated streams
 ;;; correctly when searching a stream for a char to read.
 (with-input-from-string (p "")
@@ -160,13 +181,14 @@
 ;;; the end of string and the string is adjustable the string will be
 ;;; implicitly extended, otherwise an error will be signalled. The
 ;;; latter case is provided for in the code, but not currently
-;;; excercised since SBCL fill-pointer arrays are always (currently) adjustable.
+;;; excercised since SBCL fill-pointer arrays are always (currently)
+;;; adjustable.
 ;;;
 ;;; * END will refer to the ARRAY-TOTAL-SIZE of string, not
 ;;; FILL-POINTER, since by definition the FILE-POSITION will always be
 ;;; a FILL-POINTER, so that would be of limited use.
 ;;;
-;;; * Rewinding the stream works with owerwriting semantics.
+;;; * Rewinding the stream works with overwriting semantics.
 ;;;
 #+nil (let ((str (make-array 0
 		       :element-type 'character
@@ -238,3 +260,33 @@
   (frob 'character)
   (frob 'base-char)
   (frob 'nil))
+
+(with-open-file (s "/dev/null" :element-type '(signed-byte 48))
+  (assert (eq :eof (read-byte s nil :eof))))
+
+(let* ((is (make-string-input-stream "foo"))
+       (os (make-string-output-stream))
+       (s (make-echo-stream is os))
+       (sequence (copy-seq "abcdef")))
+  (assert (= (read-sequence sequence s) 3))
+  (assert (string= sequence "foodef"))
+  (assert (string= (get-output-stream-string os) "foo")))
+
+(let* ((is (make-string-input-stream "foo"))
+       (os (make-string-output-stream))
+       (s (make-echo-stream is os))
+       (sequence (copy-seq "abcdef")))
+  (assert (char= #\f (read-char s)))
+  (assert (= (read-sequence sequence s) 2))
+  (assert (string= sequence "oocdef"))
+  (assert (string= (get-output-stream-string os) "foo")))
+
+(let* ((is (make-string-input-stream "foo"))
+       (os (make-string-output-stream))
+       (s (make-echo-stream is os))
+       (sequence (copy-seq "abcdef")))
+  (assert (char= #\f (read-char s)))
+  (unread-char #\f s)
+  (assert (= (read-sequence sequence s) 3))
+  (assert (string= sequence "foodef"))
+  (assert (string= (get-output-stream-string os) "foo")))