X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Freader.impure.lisp;h=01fcace842e9d2112be0bb210326e75178f903fc;hb=5c52e958cbff33e64084bc165813c90ca0e39085;hp=02f202dc0a70ab23d85f9180e2716d5ce6f71088;hpb=9614655fcb31923424174c4f7a43d5affc8019ad;p=sbcl.git

diff --git a/tests/reader.impure.lisp b/tests/reader.impure.lisp
index 02f202d..01fcace 100644
--- a/tests/reader.impure.lisp
+++ b/tests/reader.impure.lisp
@@ -125,13 +125,54 @@
   (funcall fun)
   (assert (equal '(:ok) (read-from-string "{:ok)"))))
 
+(with-test (:name bad-recursive-read)
+  ;; This use to signal an unbound-variable error instead.
+  (assert (eq :error
+              (handler-case
+                  (with-input-from-string (s "42")
+                    (read s t nil t))
+                (reader-error (e)
+                  :error)))))
+
+(with-test (:name standard-readtable-modified)
+  (macrolet ((test (form &optional op)
+               `(assert
+                 (eq :error
+                     (handler-case
+                         (progn ,form t)
+                       (sb-int:standard-readtable-modified-error (e)
+                         ,@(when op
+                            `((assert
+                               (equal ,op (sb-kernel::standard-readtable-modified-operation e)))))
+                         :error))))))
+    (let ((rt *readtable*))
+     (with-standard-io-syntax
+       (let ((srt *readtable*))
+         (test (setf (readtable-case srt) :preserve) '(setf readtable-case))
+         (test (copy-readtable rt srt) 'copy-readtable)
+         (test (set-syntax-from-char #\a #\a srt rt) 'set-syntax-from-char)
+         (test (set-macro-character #\a (constantly t) t srt) 'set-macro-character)
+         (test (make-dispatch-macro-character #\! t srt))
+         (test (set-dispatch-macro-character #\# #\a (constantly t) srt) 'set-dispatch-macro-character))))))
+
+(with-test (:name :reader-package-errors)
+  (flet ((test (string)
+           (handler-case
+               (progn (read-from-string string) :feh)
+             (error (e)
+               (when (and (typep e 'reader-error) (typep e 'package-error))
+                 (package-error-package e))))))
+    (assert (equal "NO-SUCH-PKG" (test "no-such-pkg::foo")))
+    (assert (eq (find-package :cl) (test "cl:no-such-sym")))))
+
 ;;; THIS SHOULD BE LAST as it frobs the standard readtable
 (with-test (:name set-macro-character-nil)
-  (let ((fun (lambda (&rest args) 'ok)))
-    ;; NIL means the standard readtable.
-    (assert (eq t (set-macro-character #\~ fun nil nil)))
-    (assert (eq fun (get-macro-character #\~ nil)))
-    (assert (eq t (set-dispatch-macro-character #\# #\~ fun nil)))
-    (assert (eq fun (get-dispatch-macro-character #\# #\~ nil)))))
+  (handler-bind ((sb-int:standard-readtable-modified-error #'continue))
+    (let ((fun (lambda (&rest args) 'ok)))
+      ;; NIL means the standard readtable.
+      (assert (eq t (set-macro-character #\~ fun nil nil)))
+      (assert (eq fun (get-macro-character #\~ nil)))
+      (assert (eq t (set-dispatch-macro-character #\# #\~ fun nil)))
+      (assert (eq fun (get-dispatch-macro-character #\# #\~ nil))))))
 
 ;;; success