X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=attrib-class.lisp;h=d1d47bd239fd572c0c40d0d3d59be6fe1445af19;hp=02bfb458ba7ef1b1ba376218d2eee2e4becf2b8c;hb=c2974df32b94d3bd25c32fa2e181b1980da59631;hpb=9c6f7a6f3559a32d75d15c3ae9d31b0db0e2acb3

diff --git a/attrib-class.lisp b/attrib-class.lisp
index 02bfb45..d1d47bd 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.7 2003/04/29 01:35:58 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,7 +19,12 @@
 ;;;; 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)
+  ()
+  (:documentation "metaclass that implements attributes on slots. Based
+on example from AMOP"))
 
 (defclass attributes-dsd (kmr-mop:standard-direct-slot-definition)
   ((attributes :initarg :attributes :initform nil
@@ -29,61 +34,50 @@
   ((attributes :initarg :attributes :initform nil 
 	       :accessor esd-attributes)))
 
+;; encapsulating macro for Lispworks
+(kmr-mop:process-slot-option attributes-class :attributes)
 
-(defclass attributes-class (kmr-mop:standard-class)
-  ()
-  (:documentation "metaclass that implements attributes on slots. Based
-on example from AMOP"))
-
-
-#+(or cmu scl sbcl)
+#+(or cmu scl sbcl openmcl)
 (defmethod kmr-mop:validate-superclass ((class attributes-class)
 					(superclass kmr-mop:standard-class))
   t)
 
-(defmethod kmr-mop:direct-slot-definition-class ((cl attributes-class)
-						 #+(or sbcl cmu scl lispworks)
-						 initargs
-						 #+(or allegro)
-						 &rest iargs)
-  ;;  (format t "attributes:~s iargs:~s~%" attributes iargs)
+(defmethod kmr-mop:direct-slot-definition-class ((cl attributes-class) #+kmr-normal-dsdc &rest initargs)
+  (declare (ignore initargs))
   (kmr-mop:find-class 'attributes-dsd))
 
-(defmethod kmr-mop:compute-effective-slot-definition :around
-    ((cl attributes-class) #+kmr-named-cesd name dsds)
-  #+kmr-named-cesd (declare (ignore name))
-  (apply
-   #'make-instance 'attributes-esd 
-   :attributes (remove-duplicates (mapappend #'dsd-attributes dsds))
-   (kmr-mop:compute-effective-slot-definition-initargs cl dsds))
-  )
-
-#+ignore
-(defmethod kmr-mop:compute-effective-slot-definition :around
-    ((cl attributes-class) #+kmr-named-cesd name dsds)
-  #+kmr-named-cesd (declare (ignore name))
-  (let ((normal-slot (call-next-method)))
-    (setf (esd-attributes normal-slot)
-      (remove-duplicates
-       (mapappend #'esd-attributes dsds)))
-    normal-slot))
+(defmethod kmr-mop:effective-slot-definition-class ((cl attributes-class) #+kmr-normal-dsdc &rest initargs)
+  (declare (ignore initargs))
+  (kmr-mop:find-class 'attributes-esd))
 
+(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)))
+    (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)))
-    (setq alist (delete nil alist))
-    (cons (make-instance 'kmr-mop:standard-effective-slot-definition
-	    :name 'all-attributes
-	    :initform `',alist
-	    :initfunction #'(lambda () alist))
+	 (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)
+	   :allocation :instance
+	   :documentation "Attribute bucker"
+	   :type t
+	   #-lispworks :class #-lispworks class
+	   ;; 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)
@@ -105,6 +99,5 @@ on example from AMOP"))
 	       slot-name instance attribute))
       attr-bucket)))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (export '(attributes-class slot-attributes)))
+