X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fcondition.pure.lisp;h=2ed2786a28ccd37bf81fdc499cb694ee004d45bc;hb=94b8f6d07445666017dfeac29bbbe0863a3c2de2;hp=310562d85479fb0d462738d5899a4136889743a9;hpb=b72f483c96c09a775515af0104e3be831261ae36;p=sbcl.git

diff --git a/tests/condition.pure.lisp b/tests/condition.pure.lisp
index 310562d..2ed2786 100644
--- a/tests/condition.pure.lisp
+++ b/tests/condition.pure.lisp
@@ -6,7 +6,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.
@@ -18,8 +18,8 @@
 ;;; referred to unbound slots. This was reported and fixed by Antonio
 ;;; Martinez (sbcl-devel 2002-09-10).
 (format t
-	"~&printable now: ~A~%"
-	(make-condition 'file-error :pathname "foo"))
+        "~&printable now: ~A~%"
+        (make-condition 'file-error :pathname "foo"))
 
 (assert (eq
          (block nil
@@ -104,7 +104,7 @@
 
 ;;; clauses in HANDLER-CASE are allowed to have declarations (and
 ;;; indeed, only declarations)
-(assert 
+(assert
  (null (handler-case (error "foo") (error () (declare (optimize speed))))))
 
 (handler-case
@@ -119,6 +119,35 @@
     (funcall (lambda (x) (check-type x fixnum) x) t)
   (type-error (c)
     (assert (and (subtypep (type-error-expected-type c) 'fixnum)
-		 (subtypep 'fixnum (type-error-expected-type c))))
+                 (subtypep 'fixnum (type-error-expected-type c))))
     (assert (eq (type-error-datum c) t)))
   (:no-error (&rest rest) (error "no error: ~S" rest)))
+
+;;; ANSI specifies TYPE-ERROR if datum and arguments of ERROR are not
+;;; designators for a condition. Reported by Bruno Haible on cmucl-imp
+;;; 2004-10-12.
+(flet ((test (&rest args)
+         (multiple-value-bind (res err)
+             (ignore-errors (apply #'error args))
+           (assert (not res))
+           (assert (typep err 'type-error))
+           (assert (not (nth-value 1 (ignore-errors
+                                       (type-error-datum err)))))
+           (assert (not (nth-value 1 (ignore-errors
+                                       (type-error-expected-type err))))))))
+  (test '#:no-such-condition)
+  (test nil)
+  (test t)
+  (test 42)
+  (test (make-instance 'standard-object)))
+
+;;; If CERROR is given a condition, any remaining arguments are only
+;;; used for the continue format control.
+(let ((x 0))
+  (handler-bind
+      ((simple-error (lambda (c) (incf x) (continue c))))
+    (cerror "Continue from ~A at ~A"
+            (make-condition 'simple-error :format-control "foo"
+                            :format-arguments nil)
+            'cerror (get-universal-time))
+    (assert (= x 1))))