Update of /project/elephant/cvsroot/elephant/src In directory common-lisp:/tmp/cvs-serv23860/src
Modified Files: classes.lisp elephant.lisp Log Message: Making Andrew's changes.
--- /project/elephant/cvsroot/elephant/src/classes.lisp 2006/01/24 15:42:30 1.15 +++ /project/elephant/cvsroot/elephant/src/classes.lisp 2006/01/25 14:09:46 1.16 @@ -124,7 +124,7 @@ do (initialize-accessors slot-def instance)) (make-instances-obsolete instance))))
-#+(or cmu sbcl) +#+(or cmu sbcl openmcl) (defmethod reinitialize-instance :around ((instance persistent-metaclass) &rest initargs &key &allow-other-keys) (prog1 (call-next-method) @@ -132,7 +132,7 @@ (update-persistent-slots instance (persistent-slot-names instance)) (make-instances-obsolete instance))))
-#+allegro +;; #+allegro (defmethod finalize-inheritance :around ((instance persistent-metaclass)) (prog1 (call-next-method) @@ -140,13 +140,13 @@ (setf (%persistent-slots instance) (cons (persistent-slot-names instance) nil)))))
-#+(or cmu sbcl) -(defmethod finalize-inheritance :around ((instance persistent-metaclass)) - (prog1 - (call-next-method) - (if (not (slot-boundp instance '%persistent-slots)) - (setf (%persistent-slots instance) - (cons (persistent-slot-names instance) nil))))) +;; #+(or cmu sbcl) +;; (defmethod finalize-inheritance :around ((instance persistent-metaclass)) +;; (prog1 +;; (call-next-method) +;; (if (not (slot-boundp instance '%persistent-slots)) +;; (setf (%persistent-slots instance) +;; (cons (persistent-slot-names instance) nil)))))
(defmethod shared-initialize :around ((instance persistent-object) slot-names &rest initargs &key &allow-other-keys) "Initializes the persistent slots via initargs or forms. --- /project/elephant/cvsroot/elephant/src/elephant.lisp 2006/01/24 15:42:30 1.16 +++ /project/elephant/cvsroot/elephant/src/elephant.lisp 2006/01/25 14:09:46 1.17 @@ -226,6 +226,7 @@ compute-effective-slot-definition-initargs) #+openmcl (:import-from :ccl + class-finalized-p compute-class-precedence-list validate-superclass standard-slot-definition