X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Freader.impure.lisp;h=5b35f78e0a36b0308568acfddaa0db93d3997bf6;hb=02a50d510572990c2b836e37ec1c0b23dac41b1a;hp=214ca6f96d53516552266bdb917287866128516f;hpb=22b8c6a91a89d0710db10e88f76ce0f2a245905d;p=sbcl.git

diff --git a/tests/reader.impure.lisp b/tests/reader.impure.lisp
index 214ca6f..5b35f78 100644
--- a/tests/reader.impure.lisp
+++ b/tests/reader.impure.lisp
@@ -8,7 +8,7 @@
 ;;;; While most of SBCL is derived from the CMU CL system, the test
 ;;;; files (like this one) were written from scratch after the fork
 ;;;; from CMU CL.
-;;;; 
+;;;;
 ;;;; This software is in the public domain and is provided with
 ;;;; absolutely no warranty. See the COPYING and CREDITS files for
 ;;;; more information.
@@ -59,5 +59,47 @@
   (assert (eq (value res) res))
   (assert (= pos 8)))
 
+;;; CSR managed to break the #S reader macro in the process of merging
+;;; SB-PCL:CLASS and CL:CLASS -- make sure it works
+(defstruct readable-struct a)
+(macrolet
+    ((frob (string)
+       `(assert (eq (readable-struct-a (read-from-string ,string)) t))))
+  (frob "#S(READABLE-STRUCT :A T)")
+  (frob "#S(READABLE-STRUCT A T)")
+  (frob "#S(READABLE-STRUCT \"A\" T)")
+  (frob "#S(READABLE-STRUCT #\\A T)")
+  (frob "#S(READABLE-STRUCT #\\A T :A NIL)"))
+(macrolet
+    ((frob (string)
+       `(assert (raises-error? (read-from-string ,string) reader-error))))
+  (frob "#S(READABLE-STRUCT . :A)")
+  (frob "#S(READABLE-STRUCT :A . T)")
+  (frob "#S(READABLE-STRUCT :A T . :A)")
+  (frob "#S(READABLE-STRUCT :A T :A . T)"))
+
+;;; reported by Henrik Motakef
+(defpackage "")
+(assert (eq (symbol-package (read-from-string "||::FOO"))
+            (find-package "")))
+
+;;; test nested reads, test case by Helmut Eller for cmucl
+(defclass my-in-stream (sb-gray:fundamental-character-input-stream)
+  ((last-char :initarg :last-char)))
+
+(let ((string " a ")
+      (i 0))
+  (defmethod sb-gray:stream-read-char ((s my-in-stream))
+    (with-input-from-string (s "b") (read s))
+    (with-slots (last-char) s
+      (cond (last-char (prog1 last-char (setf last-char nil)))
+             (t (prog1 (aref string i)
+                  (setq i (mod (1+ i) (length string)))))))))
+
+(defmethod sb-gray:stream-unread-char ((s my-in-stream) char)
+  (setf (slot-value s 'last-char) char)
+  nil)
+
+(assert (eq 'a (read (make-instance 'my-in-stream :last-char nil))))
+
 ;;; success
-(quit :unix-status 104)