X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=attrib-class.lisp;h=26a645a6248dc1b7a65ca179de96de5d89968a78;hp=ee0228b7893e18d8415a4ea293c84dd9393d46bb;hb=e83a72f1e88062d7e17ac77c17cc9c32d51f3c13;hpb=23dc098eb50376f955b164df32cea3927ec7f945

diff --git a/attrib-class.lisp b/attrib-class.lisp
index ee0228b..26a645a 100644
--- a/attrib-class.lisp
+++ b/attrib-class.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: attrib-class.lisp,v 1.12 2003/04/29 07:52:38 kevin Exp $
+;;;; $Id: attrib-class.lisp,v 1.16 2003/07/01 22:16:40 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,7 +19,7 @@
 ;;;; Defines a metaclass that allows the use of attributes (or subslots)
 ;;;; on slots. Based on example in AMOP, but modified to use ACL's MOP.
 
-(in-package :kmrcl)
+(in-package #:kmrcl)
 
 (defclass attributes-class (kmr-mop:standard-class)
   ()
@@ -37,7 +37,7 @@ on example from AMOP"))
 ;; encapsulating macro for Lispworks
 (kmr-mop:process-slot-option attributes-class :attributes)
 
-#+(or cmu scl sbcl)
+#+(or cmu scl sbcl openmcl)
 (defmethod kmr-mop:validate-superclass ((class attributes-class)
 					(superclass kmr-mop:standard-class))
   t)
@@ -50,45 +50,34 @@ on example from AMOP"))
   (declare (ignore initargs))
   (kmr-mop:find-class 'attributes-esd))
 
-(defmethod kmr-mop:compute-effective-slot-definition :around
-    ((cl attributes-class) #+kmr-normal-cesd name dsds)
-  #+(and kmr-normal-cesd (not lispworks)) (declare (ignore name))
-  (apply
-   #'make-instance 'attributes-esd 
-   :attributes (remove-duplicates (mapappend #'dsd-attributes dsds))
-   (kmr-mop::compute-effective-slot-definition-initargs cl #+lispworks name dsds))
-  )
-
-#+ignore
-(defmethod kmr-mop:compute-effective-slot-definition :around
+(defmethod kmr-mop:compute-effective-slot-definition
     ((cl attributes-class) #+kmr-normal-cesd name dsds)
   #+kmr-normal-cesd (declare (ignore name))
   (let ((esd (call-next-method)))
-    (setq esd (change-class esd 'attributes-esd))
-    (print esd)
-    (print (remove-duplicates (mapappend #'dsd-attributes dsds)))
     (setf (esd-attributes esd) (remove-duplicates (mapappend #'dsd-attributes dsds)))
     esd))
 
-
 (defmethod kmr-mop:compute-slots ((class attributes-class))
   (let* ((normal-slots (call-next-method))
-	 (alist
-	  (mapcar
-	   #'(lambda (slot)
-	       (let ((attr-list (mapcar #'(lambda (attr) (cons attr nil))
-					(esd-attributes slot))))
-		 (when attr-list
-		   (cons (kmr-mop:slot-definition-name slot) attr-list))))
-	   normal-slots)))
-    (format t "normal-slots: ~A~%" normal-slots)
-    (format t "alist: ~A~%" alist)
-    (let ((attrib-slot  (make-instance 'attributes-esd
+	 (alist (mapcar
+		 #'(lambda (slot)
+		     (cons (kmr-mop:slot-definition-name slot)
+			   (mapcar #'(lambda (attr) (list attr))
+				   (esd-attributes slot))))
+		 normal-slots)))
+    (cons (make-instance 'attributes-esd
 			 :name 'all-attributes
 			 :initform `',alist
-			 :initfunction #'(lambda () alist))))
-      (format t "attrib-slot: ~A~%" attrib-slot)
-      (cons attrib-slot normal-slots))))
+			 :initfunction #'(lambda () alist)
+			 :allocation :instance
+			 :class class
+			 :documentation ""
+			 :type t
+			 ;; This is an attempted work-around -- lispworks doesn't work
+			 ;; it appears to setup storage someplace
+			 ;; #+lispworks :location #+lispworks (length normal-slots)
+			 )
+	  normal-slots)))
   
 (defun slot-attribute (instance slot-name attribute)
   (cdr (slot-attribute-bucket instance slot-name attribute)))
@@ -109,6 +98,5 @@ on example from AMOP"))
 	       slot-name instance attribute))
       attr-bucket)))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (export '(attributes-class slot-attributes)))
+