Made attribute class layered

[clinton/lisp-on-lines.git] / src / description-class.lisp

diff --git a/src/description-class.lisp b/src/description-class.lisp
index ac05535..895c7ed 100644 (file)
--- a/src/description-class.lisp
+++ b/src/description-class.lisp
@@ -33,7 +33,7 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defparameter *defined-descriptions* nil))
 
-(defclass description-access-class (standard-layer-class contextl::special-layered-access-class )
+(define-layered-class description-access-class (standard-layer-class contextl::special-layered-access-class )
   ((defined-in-descriptions :initarg :in-description)
    (mixin-class-p :initarg :mixinp)))
 
@@ -72,10 +72,10 @@
 
 (defun description-class-name  (description-class)
     (read-from-string (symbol-name (class-name description-class))))
-
+  
 (defun initialize-description-class (class)
 
-;;; HACK: initialization does not happen properly 
+;;; HACK: initialization does not happ   en properly 
 ;;; when compiling and loading or something like that.
 ;;; Obviously i'm not sure why.
 ;;; So we're going to explicitly initialize things.
@@ -107,9 +107,17 @@
                            (find (slot-definition-name direct-slot) 
                                  attribute-objects 
                                  :key #'attribute-name)))
-                      (apply #'reinitialize-instance attribute 
-                             (direct-attribute-properties direct-slot))
-                      (apply #'change-class attribute (attribute-class attribute) (direct-attribute-properties direct-slot))
+                      (let ((initargs 
+                             (prepare-initargs attribute (direct-attribute-properties direct-slot))))
+                        
+                        (apply #'reinitialize-instance attribute 
+                               initargs )
+                        (when (not (eq (find-class (attribute-class attribute))
+                                       (class-of attribute)))
+                          
+                          (apply #'change-class attribute  (attribute-class attribute) 
+                                 initargs)))
+                      
 
                       (setf (slot-value description (attribute-name attribute))
                             attribute))))))))