From a1007bcf38130a9a08e32f04a69e6836f76329d2 Mon Sep 17 00:00:00 2001 From: Kevin Rosenberg Date: Wed, 30 Apr 2003 19:55:03 +0000 Subject: [PATCH] 0.8alpha.0.3: * src/pcl/std-class.lisp, src/pcl/generic-functions.lisp: Change signature of {direct,effective}-slot-definiton-class to match AMOP --- src/pcl/generic-functions.lisp | 4 ++-- src/pcl/std-class.lisp | 12 ++++++------ version.lisp-expr | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pcl/generic-functions.lisp b/src/pcl/generic-functions.lisp index 4fc9134..be8ddec 100644 --- a/src/pcl/generic-functions.lisp +++ b/src/pcl/generic-functions.lisp @@ -332,9 +332,9 @@ (defgeneric describe-object (object stream)) -(defgeneric direct-slot-definition-class (class initargs)) +(defgeneric direct-slot-definition-class (class &rest initargs)) -(defgeneric effective-slot-definition-class (class initargs)) +(defgeneric effective-slot-definition-class (class &rest initargs)) (defgeneric legal-documentation-p (object x)) diff --git a/src/pcl/std-class.lisp b/src/pcl/std-class.lisp index 2f88079..d943fb8 100644 --- a/src/pcl/std-class.lisp +++ b/src/pcl/std-class.lisp @@ -744,7 +744,7 @@ (make-class-predicate class predicate-name) (add-slot-accessors class direct-slots))) -(defmethod direct-slot-definition-class ((class structure-class) initargs) +(defmethod direct-slot-definition-class ((class structure-class) &rest initargs) (declare (ignore initargs)) (find-class 'structure-direct-slot-definition)) @@ -936,14 +936,14 @@ ;;;; protocols for constructing direct and effective slot definitions -(defmethod direct-slot-definition-class ((class std-class) initargs) +(defmethod direct-slot-definition-class ((class std-class) &rest initargs) (declare (ignore initargs)) (find-class 'standard-direct-slot-definition)) (defun make-direct-slotd (class initargs) (let ((initargs (list* :class class initargs))) (apply #'make-instance - (direct-slot-definition-class class initargs) + (apply #'direct-slot-definition-class class initargs) initargs))) (defmethod compute-slots ((class std-class)) @@ -1050,14 +1050,14 @@ (defmethod compute-effective-slot-definition ((class slot-class) name dslotds) (declare (ignore name)) (let* ((initargs (compute-effective-slot-definition-initargs class dslotds)) - (class (effective-slot-definition-class class initargs))) + (class (apply #'effective-slot-definition-class class initargs))) (apply #'make-instance class initargs))) -(defmethod effective-slot-definition-class ((class std-class) initargs) +(defmethod effective-slot-definition-class ((class std-class) &rest initargs) (declare (ignore initargs)) (find-class 'standard-effective-slot-definition)) -(defmethod effective-slot-definition-class ((class structure-class) initargs) +(defmethod effective-slot-definition-class ((class structure-class) &rest initargs) (declare (ignore initargs)) (find-class 'structure-effective-slot-definition)) diff --git a/version.lisp-expr b/version.lisp-expr index dbf48b2..de64dda 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8alpha.0.2" +"0.8alpha.0.3" -- 1.7.10.4