r4687: Automatic commit for debian_version_1_32-1

[kmrcl.git] / attrib-class.lisp

diff --git a/attrib-class.lisp b/attrib-class.lisp
index b5b8961da1911aaf509229c2e069499aa4e6fe63..ee0228b7893e18d8415a4ea293c84dd9393d46bb 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.11 2003/04/29 06:40:03 kevin Exp $
+;;;; $Id: attrib-class.lisp,v 1.12 2003/04/29 07:52:38 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,12 +34,8 @@
   ((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)
@@ -45,25 +46,28 @@ on example from AMOP"))
   (declare (ignore initargs))
   (kmr-mop:find-class 'attributes-dsd))
 
-#+ignore
+(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 :around
     ((cl attributes-class) #+kmr-normal-cesd name dsds)
-  #+kmr-normal-cesd (declare (ignore name))
+  #+(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 dsds))
+   (kmr-mop::compute-effective-slot-definition-initargs cl #+lispworks name dsds))
   )
 
+#+ignore
 (defmethod kmr-mop:compute-effective-slot-definition :around
-    ((cl attributes-class) #+kmr-named-cesd name dsds)
-  #+kmr-named-cesd (declare (ignore name))
+    ((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)))
+    (print (remove-duplicates (mapappend #'dsd-attributes dsds)))
+    (setf (esd-attributes esd) (remove-duplicates (mapappend #'dsd-attributes dsds)))
     esd))
 
 
@@ -77,12 +81,14 @@ on example from AMOP"))
                 (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)))
+    (format t "normal-slots: ~A~%" normal-slots)
+    (format t "alist: ~A~%" alist)
+    (let ((attrib-slot  (make-instance 'attributes-esd
+                        :name 'all-attributes
+                        :initform `',alist
+                        :initfunction #'(lambda () alist))))
+      (format t "attrib-slot: ~A~%" attrib-slot)
+      (cons attrib-slot normal-slots))))
   
 (defun slot-attribute (instance slot-name attribute)
   (cdr (slot-attribute-bucket instance slot-name attribute)))