X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcondition.lisp;h=62b7465e244b3bbbedcfd96e4fe9b6e56b7437c1;hb=58084279740fc96c6ffcd14e86dca73b71b7c288;hp=46721e8d4a7aa73b52d82631aa93a0334072b658;hpb=477633652dec02536c4b24d0be07d3505dc8829c;p=sbcl.git

diff --git a/src/code/condition.lisp b/src/code/condition.lisp
index 46721e8..62b7465 100644
--- a/src/code/condition.lisp
+++ b/src/code/condition.lisp
@@ -72,7 +72,9 @@
   ;; allocation of this slot, or NIL until defaulted
   (allocation nil :type (member :instance :class nil))
   ;; If ALLOCATION is :CLASS, this is a cons whose car holds the value.
-  (cell nil :type (or cons null)))
+  (cell nil :type (or cons null))
+  ;; slot documentation
+  (documentation nil :type (or string null)))
 
 ;;; KLUDGE: It's not clear to me why CONDITION-CLASS has itself listed
 ;;; in its CPL, while other classes derived from CONDITION-CLASS don't
@@ -326,7 +328,8 @@
   (collect ((res (copy-list (condition-classoid-slots class))))
     (dolist (sclass (cdr (condition-classoid-cpl class)))
       (dolist (sslot (condition-classoid-slots sclass))
-	(let ((found (find (condition-slot-name sslot) (res))))
+	(let ((found (find (condition-slot-name sslot) (res)
+                           :key #'condition-slot-name)))
 	  (cond (found
 		 (setf (condition-slot-initargs found)
 		       (union (condition-slot-initargs found)
@@ -427,6 +430,7 @@
 	       (slot-name (first spec))
 	       (allocation :instance)
 	       (initform-p nil)
+	       documentation
 	       initform)
 	  (collect ((initargs)
 		    (readers)
@@ -450,6 +454,13 @@
 		  (:initarg (initargs arg))
 		  (:allocation
 		   (setq allocation arg))
+		  (:documentation
+		   (when documentation
+		     (error "more than one :DOCUMENTATION in ~S" spec))
+		   (unless (stringp arg)
+		     (error "slot :DOCUMENTATION argument is not a string: ~S"
+			    arg))
+		   (setq documentation arg))
 		  (:type)
 		  (t
 		   (error "unknown slot option:~%  ~S" (first options))))))
@@ -462,6 +473,7 @@
 		     :readers ',(readers)
 		     :writers ',(writers)
 		     :initform-p ',initform-p
+		     :documentation ',documentation
 		     :initform
 		     ,(if (constantp initform)
 			  `',(eval initform)
@@ -514,7 +526,7 @@
 ;;; methods)
 (defun describe-condition (condition stream)
   (format stream
-	  "~@<~S ~_is a ~S. ~_Its slot values are ~_~S.~:>"
+	  "~&~@<~S ~_is a ~S. ~_Its slot values are ~_~S.~:>~%"
 	  condition
 	  (type-of condition)
 	  (concatenate 'list
@@ -660,6 +672,15 @@
 ;;;; setup of CONDITION machinery, only because that makes it easier to
 ;;;; get cold init to work.
 
+(define-condition values-type-error (type-error)
+  ()
+  (:report
+   (lambda (condition stream)
+     (format stream
+	     "~@<The values set ~2I~:_[~{~S~^ ~}] ~I~_is not of type ~2I~_~S.~:>"
+	     (type-error-datum condition)
+	     (type-error-expected-type condition)))))
+
 ;;; KLUDGE: a condition for floating point errors when we can't or
 ;;; won't figure out what type they are. (In FreeBSD and OpenBSD we
 ;;; don't know how, at least as of sbcl-0.6.7; in Linux we probably
@@ -767,10 +788,19 @@
 	       (reader-error-format-arguments condition)
 	       (reader-impossible-number-error-error condition))))))
 
-;;; should this inherit from error?  good question
-(define-condition timeout (error) ())
-
+(define-condition sb!ext::timeout (serious-condition) ())
 
+(define-condition defconstant-uneql (error)
+  ((name :initarg :name :reader defconstant-uneql-name)
+   (old-value :initarg :old-value :reader defconstant-uneql-old-value)
+   (new-value :initarg :new-value :reader defconstant-uneql-new-value))
+  (:report
+   (lambda (condition stream)
+     (format stream
+	     "~@<The constant ~S is being redefined (from ~S to ~S)~@:>"
+	     (defconstant-uneql-name condition)
+	     (defconstant-uneql-old-value condition)
+	     (defconstant-uneql-new-value condition)))))
 
 ;;;; special SBCL extension conditions
 
@@ -845,7 +875,7 @@
   #!+sb-doc
   "Transfer control to a restart named ABORT, signalling a CONTROL-ERROR if
    none exists."
-  (invoke-restart (find-restart 'abort condition))
+  (invoke-restart (find-restart-or-control-error 'abort condition))
   ;; ABORT signals an error in case there was a restart named ABORT
   ;; that did not transfer control dynamically. This could happen with
   ;; RESTART-BIND.
@@ -855,7 +885,7 @@
   #!+sb-doc
   "Transfer control to a restart named MUFFLE-WARNING, signalling a
    CONTROL-ERROR if none exists."
-  (invoke-restart (find-restart 'muffle-warning condition)))
+  (invoke-restart (find-restart-or-control-error 'muffle-warning condition)))
 
 (macrolet ((define-nil-returning-restart (name args doc)
 	     #!-sb-doc (declare (ignore doc))