r4982: Auto commit for Debian build

[kmrcl.git] / attrib-class.lisp

diff --git a/attrib-class.lisp b/attrib-class.lisp
index ee88042d4ee09342a92c1cd096bff24f9bce0a24..505a8a443a9d65cf0ac7a6ffa205bfdafd8f5ec6 100644 (file)
--- 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.8 2003/04/29 01:39:40 kevin Exp $
+;;;; $Id: attrib-class.lisp,v 1.13 2003/04/29 09:23:56 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -21,6 +21,11 @@
 
 (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
               :accessor dsd-attributes)))
@@ -29,61 +34,53 @@
   ((attributes :initarg :attributes :initform nil 
               :accessor esd-attributes)))
 
-
-(defclass attributes-class (kmr-mop:standard-class)
-  ()
-  (:documentation "metaclass that implements attributes on slots. Based
-on example from AMOP"))
-
+;; encapsulating macro for Lispworks
+(kmr-mop:process-slot-option attributes-class :attributes)
 
 #+(or cmu scl sbcl)
 (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 #+(or allegro) 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))
-  )
+(defmethod kmr-mop:effective-slot-definition-class ((cl attributes-class) #+kmr-normal-dsdc &rest initargs)
+  (declare (ignore initargs))
+  (kmr-mop:find-class 'attributes-esd))
 
-#+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))
-
+    ((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))
-         normal-slots)))
+        (alist (delete
+                nil
+                (mapcar
+                 #'(lambda (slot)
+                     (let ((attr-list (mapcar #'(lambda (attr) (list attr))
+                                              (esd-attributes slot))))
+                       (when attr-list
+                         (cons (kmr-mop:slot-definition-name slot) attr-list))))
+                 normal-slots))))
+    (let ((attrib-slot  (make-instance 'attributes-esd
+                                      :name 'all-attributes
+                                      :initform `',alist
+                                      :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)
+                                      )))
+      (append normal-slots (list attrib-slot)))))
   
 (defun slot-attribute (instance slot-name attribute)
   (cdr (slot-attribute-bucket instance slot-name attribute)))