X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=attrib-class.lisp;h=b102eca9300d33edb1e92ac8ce42dfc507b50cd6;hp=05a0778492aa28061f71086fc58cdd6b5a621a5e;hb=03712fbb06acbb103602bae10f41aeae7fa05127;hpb=1245205caa5937842d5d13ec805e15fe0d6a88c2

diff --git a/attrib-class.lisp b/attrib-class.lisp
index 05a0778..b102eca 100644
--- a/attrib-class.lisp
+++ b/attrib-class.lisp
@@ -1,4 +1,4 @@
-;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: kmrcl-*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,76 +7,82 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: attrib-class.lisp,v 1.3 2002/10/06 13:35:30 kevin Exp $
+;;;; $Id$
 ;;;;
-;;;; This file, part of Kmrcl, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of KMRCL, is Copyright (c) 2002-2003 by Kevin M. Rosenberg
 ;;;;
-;;;; Kmrcl users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the GNU General Public License.
+;;;; KMRCL users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
+;; Disable attrib class until understand changes in sbcl/cmucl
+;; using COMPUTE-SLOT-ACCESSOR-INFO and defining method
+;; for slot access of ALL-ATTRIBUTES. Does this work on Allegro/LW?
+
 ;;;; 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)
-
-(defclass attributes-dsd (mop::standard-direct-slot-definition)
-  ((attributes :initarg :attributes :initform nil 
-	       :accessor attributes)))
+(in-package #:kmrcl)
 
-(defclass attributes-esd (mop::standard-effective-slot-definition)
-  ((attributes :initarg :attributes :initform nil 
-	       :accessor slot-definition-attributes)))
+(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)))
 
-(defclass attributes-class (mop::standard-class)
-  ()
-  )
+(defclass attributes-esd (kmr-mop:standard-effective-slot-definition)
+  ((attributes :initarg :attributes :initform nil
+               :accessor esd-attributes)))
 
-(defmethod mop::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))
+;; encapsulating macro for Lispworks
+(kmr-mop:process-slot-option attributes-class :attributes)
 
+#+(or cmu scl sbcl openmcl)
+(defmethod kmr-mop:validate-superclass ((class attributes-class)
+                                        (superclass kmr-mop:standard-class))
+  t)
 
-(defmethod mop::compute-effective-slot-definition :around
-	   ((cl attributes-class) slot dsds)
-  (declare (ignorable slot))
-  (apply
-   #'make-instance 'attributes-esd 
-   :attributes (remove-duplicates (mapappend #'attributes dsds))
-   (excl::compute-effective-slot-definition-initargs cl dsds))
-  )
+(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:effective-slot-definition-class ((cl attributes-class) #+kmr-normal-dsdc &rest initargs)
+  (declare (ignore initargs))
+  (kmr-mop:find-class 'attributes-esd))
 
-#+ignore
-(defmethod mop::compute-effective-slot-definition ((cl attributes-class) slot dsds)
-  (declare (ignorable slot))
-  (let ((normal-slot (call-next-method)))
-    (setf (slot-definition-attributes normal-slot)
-      (remove-duplicates
-       (mapappend #'slot-definition-attributes dsds)))
-    normal-slot))
+(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))
 
+;; This does not work in Lispworks prior to version 4.3
 
-(defmethod mop::compute-slots ((class attributes-class))
+(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))))
-		 (when attr-list
-		   (cons (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)))
-  
+         (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 bucket"
+           :type t
+           )
+          normal-slots)))
+
 (defun slot-attribute (instance slot-name attribute)
   (cdr (slot-attribute-bucket instance slot-name attribute)))
 
@@ -86,39 +92,15 @@
 
 (defun slot-attribute-bucket (instance slot-name attribute)
   (let* ((all-buckets (slot-value instance 'all-attributes))
-	 (slot-bucket (assoc slot-name all-buckets)))
+         (slot-bucket (assoc slot-name all-buckets)))
     (unless slot-bucket
       (error "The slot named ~S of ~S has no attributes."
-	     slot-name instance))
+             slot-name instance))
     (let ((attr-bucket (assoc attribute (cdr slot-bucket))))
       (unless attr-bucket
-	(error "The slot named ~S of ~S has no attributes named ~S."
-	       slot-name instance attribute))
+        (error "The slot named ~S of ~S has no attributes named ~S."
+               slot-name instance attribute))
       attr-bucket)))
 
 
-#||
-(in-package :kmrcl)
-
-(defclass credit-rating ()
-  ((level :attributes (date-set time-set))
-   (id :attributes (person-setting)))
-  (:metaclass kmrcl:attributes-class))
-(defparameter cr (make-instance 'credit-rating))
-
-(format t "~&date-set: ~a" (slot-attribute cr 'level 'date-set))
-(setf (slot-attribute cr 'level 'date-set) "12/15/1990")
-(format t "~&date-set: ~a" (slot-attribute cr 'level 'date-set))
-  
-(defclass monitored-credit-rating (credit-rating)
-  ((level :attributes (last-checked interval date-set))
-   (cc :initarg :cc)
-   (id :attributes (verified))
-   )
-  (:metaclass attributes-class))
-(defparameter mcr (make-instance 'monitored-credit-rating))
-
-(setf (slot-attribute mcr 'level 'date-set) "01/05/2002")
-(format t "~&date-set for mcr: ~a" (slot-attribute mcr 'level 'date-set))
 
-||#