X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Freader.impure.lisp;h=bb37bdf3a30d112534642a26cbc93c747b6e0284;hb=e1905b479292158bd2bacdebb81e27b4da041097;hp=b71a2eeb26d70a31f7b8539642088beae5759c58;hpb=12478433c6f18424c5d98f3075e3b832ad2c6ee3;p=sbcl.git

diff --git a/tests/reader.impure.lisp b/tests/reader.impure.lisp
index b71a2ee..bb37bdf 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.
@@ -58,18 +58,71 @@
     (read-from-string "#1=[#1#]")
   (assert (eq (value res) res))
   (assert (= pos 8)))
+;;; much, much, later (in Feb 2007), CSR noticed that the problem
+;;; still exists for funcallable instances.
+(defclass funcallable-box (box sb-mop:funcallable-standard-object) ()
+  (:metaclass sb-mop:funcallable-standard-class))
+(defun read-funcallable-box (stream char)
+  (declare (ignore char))
+  (let ((objects (read-delimited-list #\} stream t)))
+    (unless (= 1 (length objects))
+      (error "Unknown box reader syntax"))
+    (make-instance 'funcallable-box :value (first objects))))
+(set-macro-character #\{ 'read-funcallable-box)
+(set-syntax-from-char #\} #\))
+(multiple-value-bind (res pos)
+    (read-from-string "#1={#1#}")
+  (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)
-(assert (eq (readable-struct-a
-	     (read-from-string "#S(READABLE-STRUCT :A T)"))
-	    t))
+(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 "")))
+            (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))))
+
+;;; NIL as the last argument to SET-SYNTAX-FROM-CHAR in compiled code,
+;;; reported by Levente Mészáros
+(let ((fun (compile nil '(lambda ()
+                          (set-syntax-from-char #\{ #\( *readtable* nil)))))
+  (funcall fun)
+  (assert (equal '(:ok) (read-from-string "{:ok)"))))
 
 ;;; success
-(quit :unix-status 104)