X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Flate-target-error.lisp;h=fc31a557a6c2e06d797b8dfd0fd0a519eedf522a;hb=2c6b90e36a7c0377cd79625eb6c94d580f98cb93;hp=f941ab0701e1efb44039701c12fedf21a5df2f72;hpb=a26fc2e03904bd0dac626a43e169e2e3514344d4;p=sbcl.git diff --git a/src/code/late-target-error.lisp b/src/code/late-target-error.lisp index f941ab0..fc31a55 100644 --- a/src/code/late-target-error.lisp +++ b/src/code/late-target-error.lisp @@ -13,10 +13,12 @@ ;;;; provided with absolutely no warranty. See the COPYING and CREDITS ;;;; files for more information. -(in-package "SB!CONDITIONS") +(in-package "SB!KERNEL") ;;;; the CONDITION class +(/show0 "late-target-error.lisp 20") + (eval-when (:compile-toplevel :load-toplevel :execute) (def!struct (condition-class (:include slot-class) @@ -42,7 +44,7 @@ (defun make-condition-class (&rest rest) (apply #'bare-make-condition-class - (rename-keyword-args '((:name :%name)) rest))) + (rename-key-args '((:name :%name)) rest))) ) ; EVAL-WHEN @@ -60,7 +62,7 @@ ;; defaulted after creation (assigned-slots () :type list)) -(defstruct condition-slot +(defstruct (condition-slot (:copier nil)) (name (required-argument) :type symbol) ;; list of all applicable initargs (initargs (required-argument) :type list) @@ -78,9 +80,9 @@ (cell nil :type (or cons null))) (eval-when (#-sb-xc :compile-toplevel :load-toplevel :execute) - ;; the appropriate initialization value for the CPL slot of a CONDITION, - ;; calculated by looking at the INHERITS information in the LAYOUT - ;; of the CONDITION + ;; the appropriate initialization value for the CPL slot of a + ;; CONDITION, calculated by looking at the INHERITS information in + ;; the LAYOUT of the CONDITION (defun condition-class-cpl-from-layout (condition) (declare (type condition condition)) (let* ((class (sb!xc:find-class condition)) @@ -166,7 +168,7 @@ ;;;; slots of CONDITION objects -(defvar *empty-slot* '(empty)) +(defvar *empty-condition-slot* '(empty)) (defun find-slot-default (class slot) (let ((initargs (condition-slot-initargs slot)) @@ -174,8 +176,8 @@ (dolist (class cpl) (let ((default-initargs (condition-class-default-initargs class))) (dolist (initarg initargs) - (let ((val (getf default-initargs initarg *empty-slot*))) - (unless (eq val *empty-slot*) + (let ((val (getf default-initargs initarg *empty-condition-slot*))) + (unless (eq val *empty-condition-slot*) (return-from find-slot-default (if (functionp val) (funcall val) @@ -188,11 +190,14 @@ initform)) (error "unbound condition slot: ~S" (condition-slot-name slot))))) -(defun find-slot (classes name) - (dolist (sclass classes nil) +(defun find-condition-class-slot (condition-class slot-name) + (dolist (sclass + (condition-class-cpl condition-class) + (error "There is no slot named ~S in ~S." + slot-name condition-class)) (dolist (slot (condition-class-slots sclass)) - (when (eq (condition-slot-name slot) name) - (return-from find-slot slot))))) + (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 @@ -210,13 +215,17 @@ (car (condition-slot-cell cslot))))) (let ((val (getf (condition-assigned-slots condition) name - *empty-slot*))) - (if (eq val *empty-slot*) + *empty-condition-slot*))) + (if (eq val *empty-condition-slot*) (let ((actual-initargs (condition-actual-initargs condition)) - (slot (find-slot (condition-class-cpl class) name))) + (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-slot*))) - (unless (eq val *empty-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) @@ -254,13 +263,14 @@ ;; Set any class slots with initargs present in this call. (dolist (cslot (condition-class-class-slots class)) (dolist (initarg (condition-slot-initargs cslot)) - (let ((val (getf args initarg *empty-slot*))) - (unless (eq val *empty-slot*) + (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)) (when (dolist (initarg (condition-slot-initargs hslot) t) - (unless (eq (getf args initarg *empty-slot*) *empty-slot*) + (unless (eq (getf args initarg *empty-condition-slot*) + *empty-condition-slot*) (return nil))) (setf (getf (condition-assigned-slots res) (condition-slot-name hslot)) (find-slot-default class hslot)))) @@ -365,8 +375,8 @@ #'(lambda (new-value condition) (condition-writer-function condition new-value name)))))) - ;; Compute effective slots and set up the class and hairy slots (subsets of - ;; the effective slots.) + ;; Compute effective slots and set up the class and hairy slots + ;; (subsets of the effective slots.) (let ((eslots (compute-effective-slots class)) (e-def-initargs (reduce #'append @@ -382,7 +392,7 @@ (if (functionp initform) (funcall initform) initform)) - *empty-slot*)))) + *empty-condition-slot*)))) (push slot (condition-class-class-slots class))) ((:instance nil) (setf (condition-slot-allocation slot) :instance) @@ -537,10 +547,10 @@ (define-condition style-warning (warning) ()) (defun simple-condition-printer (condition stream) - ;; FIXME: Why use APPLY instead of an ordinary form? To stop the optimizer - ;; from doing something? - (apply #'format stream (simple-condition-format-control condition) - (simple-condition-format-arguments condition))) + (apply #'format + stream + (simple-condition-format-control condition) + (simple-condition-format-arguments condition))) (define-condition simple-condition () ((format-control :reader simple-condition-format-control @@ -554,7 +564,13 @@ (defun print-simple-error (condition stream) (format stream - "~&~@" + ;; FIXME: It seems reasonable to display the "in function + ;; ~S" information, but doesn't the logic to display it + ;; belong in the debugger or someplace like that instead of + ;; in the format string for this particular family of + ;; conditions? Then this printer might look more + ;; ("~@<~S: ~2I~:_~?~:>" (TYPE-OF C) ..) instead. + "~@" (condition-function-name condition) (simple-condition-format-control condition) (simple-condition-format-arguments condition))) @@ -566,9 +582,9 @@ (define-condition storage-condition (serious-condition) ()) -;;; FIXME: Should we really be reporting CONDITION-FUNCTION-NAME data on an -;;; ad hoc basis, for some conditions and not others? Why not standardize -;;; it somehow? perhaps by making the debugger report it? +;;; FIXME: Should we really be reporting CONDITION-FUNCTION-NAME data +;;; on an ad hoc basis, for some conditions and not others? Why not +;;; standardize it somehow? perhaps by making the debugger report it? (define-condition type-error (error) ((datum :reader type-error-datum :initarg :datum) @@ -576,7 +592,8 @@ (:report (lambda (condition stream) (format stream - "~@." + "~@" (condition-function-name condition) (type-error-datum condition) (type-error-expected-type condition))))) @@ -599,7 +616,7 @@ (:report (lambda (condition stream) (format stream - "~&~@" + "~@" (condition-function-name condition) (serious-condition-format-control condition) (serious-condition-format-arguments condition))))) @@ -642,11 +659,11 @@ (arithmetic-error-operation condition) (arithmetic-error-operands condition)))))) -(define-condition division-by-zero (arithmetic-error) ()) +(define-condition division-by-zero (arithmetic-error) ()) (define-condition floating-point-overflow (arithmetic-error) ()) (define-condition floating-point-underflow (arithmetic-error) ()) (define-condition floating-point-inexact (arithmetic-error) ()) -(define-condition floating-point-invalid-operation (arithmetic-error) ()) +(define-condition floating-point-invalid-operation (arithmetic-error) ()) (define-condition print-not-readable (error) ((object :reader print-not-readable-object :initarg :object)) @@ -657,6 +674,8 @@ (format stream "~S cannot be printed readably." obj))))) (define-condition reader-error (parse-error stream-error) + ;; FIXME: Do we need FORMAT-CONTROL and FORMAT-ARGUMENTS when + ;; we have an explicit :REPORT function? I thought we didn't.. ((format-control :reader reader-error-format-control :initarg :format-control) @@ -688,6 +707,7 @@ ;;; floating point exceptions? (define-condition floating-point-exception (arithmetic-error) ((flags :initarg :traps + :initform nil :reader floating-point-exception-traps)) (:report (lambda (condition stream) (format stream @@ -727,7 +747,14 @@ :initform nil) (namestring :reader namestring-parse-error-namestring :initarg :namestring) (offset :reader namestring-parse-error-offset :initarg :offset)) - (:report %print-namestring-parse-error)) + (:report + (lambda (condition stream) + (format stream + "parse error in namestring: ~?~% ~A~% ~V@T^" + (namestring-parse-error-complaint condition) + (namestring-parse-error-arguments condition) + (namestring-parse-error-namestring condition) + (namestring-parse-error-offset condition))))) (define-condition simple-package-error (simple-condition package-error) ()) @@ -753,8 +780,9 @@ "Transfer control to a restart named ABORT, signalling a CONTROL-ERROR if none exists." (invoke-restart (find-restart '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. + ;; ABORT signals an error in case there was a restart named ABORT + ;; that did not transfer control dynamically. This could happen with + ;; RESTART-BIND. (error 'abort-failure)) (defun muffle-warning (&optional condition) @@ -779,3 +807,6 @@ (define-nil-returning-restart use-value (value) "Transfer control and VALUE to a restart named USE-VALUE, or return NIL if none exists.")) + +(/show0 "late-target-error.lisp end of file") +