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 0b837adda6f44f586a1a58aa25c4e079a6de41af..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.5 2003/04/28 21:12:27 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,74 +21,74 @@
 
 (in-package :kmrcl)
 
-(defclass attributes-dsd (standard-direct-slot-definition)
-  ((attributes :initarg :attributes :initform nil 
-              :accessor attributes)))
+(defclass attributes-class (kmr-mop:standard-class)
+  ()
+  (:documentation "metaclass that implements attributes on slots. Based
+on example from AMOP"))
 
-(defclass attributes-esd (standard-effective-slot-definition)
-  ((attributes :initarg :attributes :initform nil 
-              :accessor slot-definition-attributes)))
+(defclass attributes-dsd (kmr-mop:standard-direct-slot-definition)
+  ((attributes :initarg :attributes :initform nil
+              :accessor dsd-attributes)))
 
+(defclass attributes-esd (kmr-mop:standard-effective-slot-definition)
+  ((attributes :initarg :attributes :initform nil 
+              :accessor esd-attributes)))
 
-(defclass attributes-class (standard-class)
-  ()
-  )
+;; encapsulating macro for Lispworks
+(kmr-mop:process-slot-option attributes-class :attributes)
 
 #+(or cmu scl sbcl)
-(defmethod validate-superclass ((class attributes-class)
-                               (superclass standard-class))
+(defmethod kmr-mop:validate-superclass ((class attributes-class)
+                                       (superclass kmr-mop:standard-class))
   t)
 
-(defmethod direct-slot-definition-class ((cl attributes-class) 
-                                             &rest iargs &key attributes)
-  (declare (ignorable attributes))
-;;  (format t "attributes:~s iargs:~s~%" attributes iargs)
-  (find-class 'attributes-dsd))
+(defmethod kmr-mop:direct-slot-definition-class ((cl attributes-class) #+kmr-normal-dsdc &rest initargs)
+  (declare (ignore initargs))
+  (kmr-mop:find-class 'attributes-dsd))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (when (>= (length (generic-function-lambda-list
-                    (ensure-generic-function
-                     'compute-effective-slot-definition)))
-           3)
-    (push :ho-named-cesd-fun cl:*features*)))
-
-(defmethod compute-effective-slot-definition :around
-    ((cl attributes-class) #+ho-named-cesd-fun name dsds)
-  #+ho-named-cesd-fun (declare (ignore name))
+(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)
+  #+(and kmr-normal-cesd (not lispworks)) (declare (ignore name))
   (apply
    #'make-instance 'attributes-esd 
-   :attributes (remove-duplicates (mapappend #'attributes dsds))
-   (compute-effective-slot-definition-initargs cl dsds))
+   :attributes (remove-duplicates (mapappend #'dsd-attributes dsds))
+   (kmr-mop::compute-effective-slot-definition-initargs cl #+lispworks name dsds))
   )
 
-
 #+ignore
-(defmethod compute-effective-slot-definition :around
-    ((cl attributes-class) #+ho-named-cesd-fun name dsds)
-  #+ho-named-cesd-fun (declare (ignore name))
-  (let ((normal-slot (call-next-method)))
-    (setf (slot-definition-attributes normal-slot)
-      (remove-duplicates
-       (mapappend #'slot-definition-attributes dsds)))
-    normal-slot))
-
-
-(defmethod compute-slots ((class attributes-class))
+(defmethod kmr-mop:compute-effective-slot-definition :around
+    ((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))
-                                       (slot-definition-attributes slot))))
+                                       (esd-attributes slot))))
                 (when attr-list
-                  (cons (mop::slot-definition-name slot) attr-list))))
+                  (cons (kmr-mop:slot-definition-name slot) attr-list))))
           normal-slots)))
-    (setq alist (delete nil alist))
-    (cons (mop::make-instance '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)))
@@ -109,4 +109,6 @@
               slot-name instance attribute))
       attr-bucket)))
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (export '(attributes-class slot-attributes)))