X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Freader.impure.lisp;h=5b35f78e0a36b0308568acfddaa0db93d3997bf6;hb=34664ac9b1d27f0dff2514c388cf10813a9b1108;hp=23ccb4c4b2eb284679321308813b20fbe144026e;hpb=68c539ab90bb39f342229e68bf9286f63824597a;p=sbcl.git

diff --git a/tests/reader.impure.lisp b/tests/reader.impure.lisp
index 23ccb4c..5b35f78 100644
--- a/tests/reader.impure.lisp
+++ b/tests/reader.impure.lisp
@@ -8,19 +8,19 @@
 ;;;; 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.
 
-(in-package :cl-user)
+(load "assertoid.lisp")
+(use-package "ASSERTOID")
 
 ;;; Bug 30, involving mistakes in binding the read table, made this
 ;;; code fail.
 (defun read-vector (stream char)
+  (declare (ignorable char))
   (coerce (read-delimited-list #\] stream t) 'vector))
-(set-syntax-from-char #\[ #\() ; do I really need this? -- MNA 2001-01-05
-(set-syntax-from-char #\] #\)) ; do I really need this? -- MNA 2001-01-05
 (set-macro-character #\[ #'read-vector nil)
 (set-macro-character #\] (get-macro-character #\)) nil)
 (multiple-value-bind (res pos)
@@ -36,5 +36,70 @@
   (assert (equalp res #(#\x)))
   (assert (= pos 5)))
 
+;;; Bug 51b. (try to throw READER-ERRORs when the reader encounters
+;;; dubious input)
+(assert (raises-error? (read-from-string "1e1000") reader-error))
+(assert (raises-error? (read-from-string "1/0") reader-error))
+
+;;; Bug reported by Antonio Martinez on comp.lang.lisp 2003-02-03 in
+;;; message <b32da960.0302030640.7d6fc610@posting.google.com>: reading
+;;; circular instances of CLOS classes didn't work:
+(defclass box ()
+  ((value :initarg :value :reader value)))
+(defun read-box (stream char)
+  (declare (ignore char))
+  (let ((objects (read-delimited-list #\] stream t)))
+    (unless (= 1 (length objects))
+      (error "Unknown box reader syntax"))
+    (make-instance 'box :value (first objects))))
+(set-macro-character #\[ 'read-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)
+(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)