Update of /project/elephant/cvsroot/elephant/src/elephant In directory clnet:/tmp/cvs-serv17545/src/elephant
Modified Files: classes.lisp classindex.lisp metaclasses.lisp Log Message: A few details to go green on sbcl and acl on mac32
--- /project/elephant/cvsroot/elephant/src/elephant/classes.lisp 2007/03/08 19:24:08 1.20 +++ /project/elephant/cvsroot/elephant/src/elephant/classes.lisp 2007/03/08 21:29:53 1.21 @@ -49,7 +49,6 @@
(defmethod ensure-class-using-class :around ((class (eql nil)) name &rest args &key index) "Support the :index class option" - (format t "ecuc nil index = ~A~%" index) (let ((result (apply #'call-next-method class name (remove-keywords '(:index) args)))) (when (and index (subtypep (type-of result) 'persistent-metaclass)) (update-indexed-record result nil :class-indexed t)) @@ -57,7 +56,6 @@
(defmethod ensure-class-using-class :around ((class persistent-metaclass) name &rest args &key index) "Support the :index class option on redefinition" - (format t "ecuc class index = ~A~%" index) (let ((result (apply #'call-next-method class name (remove-keywords '(:index) args)))) (when index (update-indexed-record result nil :class-indexed t)) @@ -83,6 +81,7 @@ (setf (%persistent-slots instance) (cons (persistent-slot-names instance) nil))) (update-indexed-record instance (indexed-slot-names-from-defs instance)))) +
(defmethod reinitialize-instance :around ((instance persistent-metaclass) &rest initargs &key &allow-other-keys) (declare (ignore initargs)) --- /project/elephant/cvsroot/elephant/src/elephant/classindex.lisp 2007/02/26 19:12:18 1.26 +++ /project/elephant/cvsroot/elephant/src/elephant/classindex.lisp 2007/03/08 21:29:53 1.27 @@ -71,7 +71,8 @@ (find-class-index (find-class class-name) :sc sc :errorp errorp))
(defmethod class-indexedp-by-name ((class-name symbol) &key (sc *store-controller*)) - (get-value class-name (controller-class-root sc))) + (let ((class (find-class class-name nil))) + (when class (indexed class))))
(defmethod find-class-index ((class persistent-metaclass) &key (sc *store-controller*) (errorp t)) (ensure-finalized class) --- /project/elephant/cvsroot/elephant/src/elephant/metaclasses.lisp 2007/02/26 19:12:18 1.9 +++ /project/elephant/cvsroot/elephant/src/elephant/metaclasses.lisp 2007/03/08 21:29:53 1.10 @@ -132,7 +132,7 @@ (indexed-record class) nil))) (setf (%indexed-slots class) - (cons (make-new-indexed-record new-slot-list oldrec class-indexed) + (cons (make-new-indexed-record new-slot-list oldrec (or new-slot-list class-indexed)) (if oldrec oldrec nil)))))
(defmethod make-new-indexed-record (new-slot-list oldrec class-indexed)