X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcondition.lisp;h=d76500f083396e62061167c6bf58d094e505f60f;hb=860543cc7ba0266e41e1d41ac9b6a208f3795f1a;hp=9a3ae5ee7640ed868a026d4f8c59c64ab458336d;hpb=1250e993756076f6e12a6459983d9a953529ff96;p=sbcl.git diff --git a/src/code/condition.lisp b/src/code/condition.lisp index 9a3ae5e..d76500f 100644 --- a/src/code/condition.lisp +++ b/src/code/condition.lisp @@ -21,8 +21,8 @@ (/show0 "condition.lisp 24") -(def!struct (condition-class (:include slot-class) - (:constructor bare-make-condition-class)) +(def!struct (condition-classoid (:include slot-classoid) + (:constructor make-condition-classoid)) ;; list of CONDITION-SLOT structures for the direct slots of this ;; class (slots nil :type list) @@ -44,20 +44,14 @@ (/show0 "condition.lisp 49") -(defun make-condition-class (&rest rest) - (apply #'bare-make-condition-class - (rename-key-args '((:name :%name)) rest))) - -(/show0 "condition.lisp 53") - ) ; EVAL-WHEN (!defstruct-with-alternate-metaclass condition :slot-names (actual-initargs assigned-slots) :boa-constructor %make-condition-object :superclass-name instance - :metaclass-name condition-class - :metaclass-constructor make-condition-class + :metaclass-name condition-classoid + :metaclass-constructor make-condition-classoid :dd-type structure) (defun make-condition-object (actual-initargs) @@ -78,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 @@ -88,25 +84,29 @@ (eval-when (:compile-toplevel :load-toplevel :execute) (/show0 "condition.lisp 103") (let ((condition-class (locally - ;; KLUDGE: There's a DEFTRANSFORM FIND-CLASS for - ;; constant class names which creates fast but - ;; non-cold-loadable, non-compact code. In this - ;; context, we'd rather have compact, cold-loadable - ;; code. -- WHN 19990928 - (declare (notinline sb!xc:find-class)) - (sb!xc:find-class 'condition)))) - (setf (condition-class-cpl condition-class) + ;; KLUDGE: There's a DEFTRANSFORM + ;; FIND-CLASSOID for constant class names + ;; which creates fast but + ;; non-cold-loadable, non-compact code. In + ;; this context, we'd rather have compact, + ;; cold-loadable code. -- WHN 19990928 + (declare (notinline find-classoid)) + (find-classoid 'condition)))) + (setf (condition-classoid-cpl condition-class) (list condition-class))) (/show0 "condition.lisp 103")) -(setf (condition-class-report (locally - ;; KLUDGE: There's a DEFTRANSFORM FIND-CLASS - ;; for constant class names which creates fast - ;; but non-cold-loadable, non-compact code. In - ;; this context, we'd rather have compact, - ;; cold-loadable code. -- WHN 19990928 - (declare (notinline sb!xc:find-class)) - (find-class 'condition))) +(setf (condition-classoid-report (locally + ;; KLUDGE: There's a DEFTRANSFORM + ;; FIND-CLASSOID for constant class + ;; names which creates fast but + ;; non-cold-loadable, non-compact + ;; code. In this context, we'd + ;; rather have compact, + ;; cold-loadable code. -- WHN + ;; 19990928 + (declare (notinline find-classoid)) + (find-classoid 'condition))) (lambda (cond stream) (format stream "Condition ~S was signalled." (type-of cond)))) @@ -117,8 +117,8 @@ (reverse (reduce #'append (mapcar (lambda (x) - (condition-class-cpl - (sb!xc:find-class x))) + (condition-classoid-cpl + (find-classoid x))) parent-types))))) (cond-layout (info :type :compiler-layout 'condition)) (olayout (info :type :compiler-layout name)) @@ -130,11 +130,11 @@ (new-inherits (order-layout-inherits (concatenate 'simple-vector (layout-inherits cond-layout) - (mapcar #'class-layout cpl))))) + (mapcar #'classoid-layout cpl))))) (if (and olayout (not (mismatch (layout-inherits olayout) new-inherits))) olayout - (make-layout :class (make-undefined-class name) + (make-layout :classoid (make-undefined-classoid name) :inherits new-inherits :depthoid -1 :length (layout-length cond-layout))))) @@ -155,9 +155,9 @@ ;; KLUDGE: A comment from CMU CL here said ;; 7/13/98 BUG? CPL is not sorted and results here depend on order of ;; superclasses in define-condition call! - (dolist (class (condition-class-cpl (sb!xc:class-of x)) + (dolist (class (condition-classoid-cpl (classoid-of x)) (error "no REPORT? shouldn't happen!")) - (let ((report (condition-class-report class))) + (let ((report (condition-classoid-report class))) (when report (return (funcall report x stream))))))) @@ -167,9 +167,9 @@ (defun find-slot-default (class slot) (let ((initargs (condition-slot-initargs slot)) - (cpl (condition-class-cpl class))) + (cpl (condition-classoid-cpl class))) (dolist (class cpl) - (let ((default-initargs (condition-class-default-initargs class))) + (let ((default-initargs (condition-classoid-default-initargs class))) (dolist (initarg initargs) (let ((val (getf default-initargs initarg *empty-condition-slot*))) (unless (eq val *empty-condition-slot*) @@ -187,28 +187,27 @@ (defun find-condition-class-slot (condition-class slot-name) (dolist (sclass - (condition-class-cpl condition-class) + (condition-classoid-cpl condition-class) (error "There is no slot named ~S in ~S." slot-name condition-class)) - (dolist (slot (condition-class-slots sclass)) + (dolist (slot (condition-classoid-slots sclass)) (when (eq (condition-slot-name slot) slot-name) (return-from find-condition-class-slot slot))))) (defun condition-writer-function (condition new-value name) - (dolist (cslot (condition-class-class-slots - (layout-class (%instance-layout condition))) + (dolist (cslot (condition-classoid-class-slots + (layout-classoid (%instance-layout condition))) (setf (getf (condition-assigned-slots condition) name) new-value)) (when (eq (condition-slot-name cslot) name) (return (setf (car (condition-slot-cell cslot)) new-value))))) (defun condition-reader-function (condition name) - (let ((class (layout-class (%instance-layout condition)))) - (dolist (cslot (condition-class-class-slots class)) + (let ((class (layout-classoid (%instance-layout condition)))) + (dolist (cslot (condition-classoid-class-slots class)) (when (eq (condition-slot-name cslot) name) (return-from condition-reader-function (car (condition-slot-cell cslot))))) - (let ((val (getf (condition-assigned-slots condition) name *empty-condition-slot*))) (if (eq val *empty-condition-slot*) @@ -216,17 +215,15 @@ (slot (find-condition-class-slot class name))) (unless slot (error "missing slot ~S of ~S" name condition)) - (dolist (initarg (condition-slot-initargs slot)) - (let ((val (getf actual-initargs - initarg - *empty-condition-slot*))) - (unless (eq val *empty-condition-slot*) - (return-from condition-reader-function - (setf (getf (condition-assigned-slots condition) - name) - val))))) - (setf (getf (condition-assigned-slots condition) name) - (find-slot-default class slot))) + (do ((initargs actual-initargs (cddr initargs))) + ((endp initargs) + (setf (getf (condition-assigned-slots condition) name) + (find-slot-default class slot))) + (when (member (car initargs) (condition-slot-initargs slot)) + (return-from condition-reader-function + (setf (getf (condition-assigned-slots condition) + name) + (cadr initargs)))))) val)))) ;;;; MAKE-CONDITION @@ -237,11 +234,11 @@ ;; Note: ANSI specifies no exceptional situations in this function. ;; signalling simple-type-error would not be wrong. (let* ((thing (if (symbolp thing) - (sb!xc:find-class thing) + (find-classoid thing) thing)) (class (typecase thing - (condition-class thing) - (class + (condition-classoid thing) + (classoid (error 'simple-type-error :datum thing :expected-type 'condition-class @@ -254,15 +251,15 @@ :format-control "bad thing for class argument:~% ~S" :format-arguments (list thing))))) (res (make-condition-object args))) - (setf (%instance-layout res) (class-layout class)) + (setf (%instance-layout res) (classoid-layout class)) ;; Set any class slots with initargs present in this call. - (dolist (cslot (condition-class-class-slots class)) + (dolist (cslot (condition-classoid-class-slots class)) (dolist (initarg (condition-slot-initargs cslot)) (let ((val (getf args initarg *empty-condition-slot*))) (unless (eq val *empty-condition-slot*) (setf (car (condition-slot-cell cslot)) val))))) ;; Default any slots with non-constant defaults now. - (dolist (hslot (condition-class-hairy-slots class)) + (dolist (hslot (condition-classoid-hairy-slots class)) (when (dolist (initarg (condition-slot-initargs hslot) t) (unless (eq (getf args initarg *empty-condition-slot*) *empty-condition-slot*) @@ -277,16 +274,18 @@ (eval-when (:compile-toplevel :load-toplevel :execute) (defun %compiler-define-condition (name direct-supers layout) (multiple-value-bind (class old-layout) - (insured-find-class name #'condition-class-p #'make-condition-class) - (setf (layout-class layout) class) - (setf (class-direct-superclasses class) - (mapcar #'sb!xc:find-class direct-supers)) + (insured-find-classoid name + #'condition-classoid-p + #'make-condition-classoid) + (setf (layout-classoid layout) class) + (setf (classoid-direct-superclasses class) + (mapcar #'find-classoid direct-supers)) (cond ((not old-layout) (register-layout layout)) ((not *type-system-initialized*) - (setf (layout-class old-layout) class) + (setf (layout-classoid old-layout) class) (setq layout old-layout) - (unless (eq (class-layout class) layout) + (unless (eq (classoid-layout class) layout) (register-layout layout))) ((redefine-layout-warning "current" old-layout @@ -295,7 +294,7 @@ (layout-inherits layout) (layout-depthoid layout)) (register-layout layout :invalidate t)) - ((not (class-layout class)) + ((not (classoid-layout class)) (register-layout layout))) (setf (layout-info layout) @@ -304,14 +303,14 @@ ;; names which creates fast but non-cold-loadable, non-compact ;; code. In this context, we'd rather have compact, cold-loadable ;; code. -- WHN 19990928 - (declare (notinline sb!xc:find-class)) - (layout-info (class-layout (sb!xc:find-class 'condition))))) + (declare (notinline find-classoid)) + (layout-info (classoid-layout (find-classoid 'condition))))) - (setf (sb!xc:find-class name) class) + (setf (find-classoid name) class) ;; Initialize CPL slot. - (setf (condition-class-cpl class) - (remove-if-not #'condition-class-p + (setf (condition-classoid-cpl class) + (remove-if-not #'condition-classoid-p (std-compute-class-precedence-list class)))) (values)) @@ -326,10 +325,11 @@ ;;; and documenting it here would be good. (Or, if this is not in fact ;;; ANSI-compliant, fixing it would also be good.:-) (defun compute-effective-slots (class) - (collect ((res (copy-list (condition-class-slots class)))) - (dolist (sclass (condition-class-cpl class)) - (dolist (sslot (condition-class-slots sclass)) - (let ((found (find (condition-slot-name sslot) (res)))) + (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) + :key #'condition-slot-name))) (cond (found (setf (condition-slot-initargs found) (union (condition-slot-initargs found) @@ -347,10 +347,10 @@ (res))) (defun %define-condition (name slots documentation report default-initargs) - (let ((class (sb!xc:find-class name))) - (setf (condition-class-slots class) slots) - (setf (condition-class-report class) report) - (setf (condition-class-default-initargs class) default-initargs) + (let ((class (find-classoid name))) + (setf (condition-classoid-slots class) slots) + (setf (condition-classoid-report class) report) + (setf (condition-classoid-default-initargs class) default-initargs) (setf (fdocumentation name 'type) documentation) (dolist (slot slots) @@ -371,8 +371,8 @@ (let ((eslots (compute-effective-slots class)) (e-def-initargs (reduce #'append - (mapcar #'condition-class-default-initargs - (condition-class-cpl class))))) + (mapcar #'condition-classoid-default-initargs + (condition-classoid-cpl class))))) (dolist (slot eslots) (ecase (condition-slot-allocation slot) (:class @@ -384,14 +384,14 @@ (funcall initform) initform)) *empty-condition-slot*)))) - (push slot (condition-class-class-slots class))) + (push slot (condition-classoid-class-slots class))) ((:instance nil) (setf (condition-slot-allocation slot) :instance) (when (or (functionp (condition-slot-initform slot)) (dolist (initarg (condition-slot-initargs slot) nil) (when (functionp (getf e-def-initargs initarg)) (return t)))) - (push slot (condition-class-hairy-slots class)))))))) + (push slot (condition-classoid-hairy-slots class)))))))) name) (defmacro define-condition (name (&rest parent-types) (&rest slot-specs) @@ -430,6 +430,7 @@ (slot-name (first spec)) (allocation :instance) (initform-p nil) + documentation initform) (collect ((initargs) (readers) @@ -453,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)))))) @@ -465,6 +473,7 @@ :readers ',(readers) :writers ',(writers) :initform-p ',initform-p + :documentation ',documentation :initform ,(if (constantp initform) `',(eval initform) @@ -604,6 +613,13 @@ "The function ~S is undefined." (cell-error-name condition))))) +(define-condition special-form-function (undefined-function) () + (:report + (lambda (condition stream) + (format stream + "Cannot FUNCALL the SYMBOL-FUNCTION of special operator ~S." + (cell-error-name condition))))) + (define-condition arithmetic-error (error) ((operation :reader arithmetic-error-operation :initarg :operation @@ -656,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 + "~@" + (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 @@ -689,15 +714,31 @@ "The index ~S is too large." (type-error-datum condition))))) -;;; Out-of-range &KEY END arguments are similar to, but off by one -;;; from out-of-range indices into the sequence. -(define-condition index-too-large-error (type-error) - () +(define-condition bounding-indices-bad-error (type-error) + ((object :reader bounding-indices-bad-object :initarg :object)) (:report (lambda (condition stream) - (format stream - "The end-of-sequence specifier ~S is too large." - (type-error-datum condition))))) + (let* ((datum (type-error-datum condition)) + (start (car datum)) + (end (cdr datum)) + (object (bounding-indices-bad-object condition))) + (etypecase object + (sequence + (format stream + "The bounding indices ~S and ~S are bad for a sequence of length ~S." + start end (length object))) + (array + ;; from WITH-ARRAY-DATA + (format stream + "The START and END parameters ~S and ~S are bad for an array of total size ~S." + start end (array-total-size object)))))))) + +(define-condition nil-array-accessed-error (type-error) + () + (:report (lambda (condition stream) + (format stream + "An attempt to access an array of element-type ~ + NIL was made. Congratulations!")))) (define-condition io-timeout (stream-error) ((direction :reader io-timeout-direction :initarg :direction)) @@ -735,6 +776,21 @@ "unexpected end of file on ~S ~A" (stream-error-stream condition) (reader-eof-error-context condition))))) + +(define-condition reader-impossible-number-error (reader-error) + ((error :reader reader-impossible-number-error-error :initarg :error)) + (:report + (lambda (condition stream) + (let ((error-stream (stream-error-stream condition))) + (format stream "READER-ERROR ~@[at ~W ~]on ~S:~%~?~%Original error: ~A" + (file-position error-stream) error-stream + (reader-error-format-control condition) + (reader-error-format-arguments condition) + (reader-impossible-number-error-error condition)))))) + +(define-condition sb!ext::timeout (serious-condition) ()) + + ;;;; special SBCL extension conditions @@ -827,8 +883,9 @@ #!+sb-doc ,doc ;; FIXME: Perhaps this shared logic should be pulled out into ;; FLET MAYBE-INVOKE-RESTART? See whether it shrinks code.. - (when (find-restart ',name condition) - (invoke-restart ',name ,@args))))) + (let ((restart (find-restart ',name condition))) + (when restart + (invoke-restart restart ,@args)))))) (define-nil-returning-restart continue () "Transfer control to a restart named CONTINUE, or return NIL if none exists.") (define-nil-returning-restart store-value (value)