1.0.46.43: fix sb-introspect on non-threaded builds

[sbcl.git] / tests / condition.impure.lisp

diff --git a/tests/condition.impure.lisp b/tests/condition.impure.lisp
index 07b41e0..4722d92 100644 (file)
--- a/tests/condition.impure.lisp
+++ b/tests/condition.impure.lisp
@@ -54,7 +54,70 @@
         (assert (eq (car (compute-restarts)) (car (compute-restarts c))))))
   (picky-restart ()
     :report "Do nothing."
-    :test (lambda (c) (typep c 'picky-condition))
+    :test (lambda (c)
+            (typep c '(or null picky-condition)))
     'ok))
 
-;;; success
+;;; adapted from Helmut Eller on cmucl-imp
+(assert (eq 'it
+            (restart-case
+                (handler-case
+                    (error 'picky-condition)
+                  (picky-condition (c)
+                    (invoke-restart (find-restart 'give-it c))))
+              (give-it ()
+                :test (lambda (c) (typep c 'picky-condition))
+                'it))))
+
+;;; In sbcl-1.0.9, a condition derived from CL:STREAM-ERROR (or
+;;; CL:READER-ERROR or or CL:PARSE-ERROR) didn't inherit a usable
+;;; PRINT-OBJECT method --- the PRINT-OBJECT code implicitly assumed
+;;; that CL:STREAM-ERROR was like a SIMPLE-CONDITION, with args and
+;;; format control, which seems to be a preANSIism.
+;;;
+;;; (The spec for DEFINE-CONDITION says that if :REPORT is not
+;;; supplied, "information about how to report this type of condition
+;;; is inherited from the PARENT-TYPE." The spec doesn't explicitly
+;;; forbid the inherited printer from trying to read slots which
+;;; aren't portably specified for the condition, but it doesn't seem
+;;; reasonable for the inherited printer to do so. It does seem
+;;; reasonable for app code to derive a new condition from
+;;; CL:READER-ERROR (perhaps for an error in a readmacro) or
+;;; CL:PARSE-ERROR (perhaps for an error in an operator
+;;; READ-MY-FAVORITE-DATA-STRUCTURE) or CL:STREAM-ERROR (dunno why
+;;; offhand, but perhaps for some Gray-stream-ish reason), not define
+;;; a :REPORT method for its new condition, and expect to inherit from
+;;; the application's printer all the cruft required for describing
+;;; the location of the error in the input.)
+(define-condition my-stream-error-1-0-9 (stream-error) ())
+(define-condition parse-foo-error-1-0-9 (parse-error) ())
+(define-condition read-bar-error-1-0-9 (reader-error) ())
+(let (;; instances created initializing all the slots specified in
+      ;; ANSI CL
+      (parse-foo-error-1-0-9 (make-condition 'parse-foo-error-1-0-9
+                                             :stream *standard-input*))
+      (read-foo-error-1-0-9 (make-condition 'read-bar-error-1-0-9
+                                            :stream *standard-input*))
+      (my-stream-error-1-0-9 (make-condition 'my-stream-error-1-0-9
+                                             :stream *standard-input*)))
+  ;; should be printable
+  (dolist (c (list
+              my-stream-error-1-0-9
+              parse-foo-error-1-0-9
+              read-foo-error-1-0-9))
+    ;; whether escaped or not
+    (dolist (*print-escape* '(nil t))
+      (write c :stream (make-string-output-stream)))))
+
+;;; Reported by Michael Weber: restart computation in :TEST-FUNCTION used to
+;;; cause infinite recursion.
+(defun restart-test-finds-restarts ()
+  (restart-bind
+      ((bar (lambda ()
+              (return-from restart-test-finds-restarts 42))
+         :test-function
+         (lambda (condition)
+           (find-restart 'qux))))
+    (when (find-restart 'bar)
+      (invoke-restart 'bar))))
+(assert (not (restart-test-finds-restarts)))