X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Flate-target-error.lisp;h=0a303b458209a20e26986c3065def99fa0acdeaa;hb=cbaa1997bb097a55d108df592ac3b7eb4a703fff;hp=45b4bd1b1d189a8bdb31bb985fdc098cf9af3769;hpb=099d6dd1f6a5ac2ffec5c14d07a4b905322ef968;p=sbcl.git diff --git a/src/code/late-target-error.lisp b/src/code/late-target-error.lisp index 45b4bd1..0a303b4 100644 --- a/src/code/late-target-error.lisp +++ b/src/code/late-target-error.lisp @@ -17,6 +17,8 @@ ;;;; 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) @@ -217,10 +219,8 @@ (if (eq val *empty-condition-slot*) (let ((actual-initargs (condition-actual-initargs condition)) (slot (find-condition-class-slot class name))) - ;; MNA: cmucl-commit: Mon, 8 Jan 2001 21:21:23 -0800 (PST) - ;; Catch missing slots in condition-reader-function, and signal an error. (unless slot - (error "Slot ~S of ~S missing." name condition)) + (error "missing slot ~S of ~S" name condition)) (dolist (initarg (condition-slot-initargs slot)) (let ((val (getf actual-initargs initarg @@ -798,3 +798,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") +