From c6790b89e753a9a5268cd6c96753a0afbab9c4bb Mon Sep 17 00:00:00 2001 From: rtoy <rtoy> Date: Tue, 5 Oct 2004 21:59:44 +0000 Subject: [PATCH] Remove the slot named SLOT from the UNBOUND-SLOT condition. Also removes the :slot initarg. These are all subsumed by the :name initarg and slot in a cell-error condition. This makes UNBOUND-SLOT no longer backward compatible. I hope that's ok. --- pcl/slots.lisp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pcl/slots.lisp b/pcl/slots.lisp index c31d65610..a73316297 100644 --- a/pcl/slots.lisp +++ b/pcl/slots.lisp @@ -26,7 +26,7 @@ ;;; (file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/slots.lisp,v 1.27 2003/06/17 11:57:57 gerd Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/slots.lisp,v 1.28 2004/10/05 21:59:44 rtoy Exp $") ;;; (in-package :pcl) @@ -34,11 +34,10 @@ ;;; ANSI CL condition for unbound slots. (define-condition unbound-slot (cell-error) - ((instance :reader unbound-slot-instance :initarg :instance) - (slot :reader unbound-slot-slot :initarg :slot)) + ((instance :reader unbound-slot-instance :initarg :instance)) (:report (lambda (condition stream) (format stream "~@<The slot ~S is unbound in the object ~S.~@:>" - (unbound-slot-slot condition) + (cell-error-name condition) (unbound-slot-instance condition))))) (defmethod wrapper-fetcher ((class standard-class)) @@ -320,7 +319,7 @@ instance))) (defmethod slot-unbound ((class t) instance slot-name) - (error 'unbound-slot :name slot-name :slot slot-name :instance instance)) + (error 'unbound-slot :name slot-name :instance instance)) (defun slot-unbound-internal (instance position) (values -- GitLab