X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=attrib-class.lisp;h=b102eca9300d33edb1e92ac8ce42dfc507b50cd6;hp=505a8a443a9d65cf0ac7a6ffa205bfdafd8f5ec6;hb=373a64e9369c2e96c465eb462a035884c7e08fa6;hpb=d4cc19d53788d5180eeef28b1c63edad0f201d5f

diff --git a/attrib-class.lisp b/attrib-class.lisp
index 505a8a4..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,19 +7,23 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: attrib-class.lisp,v 1.13 2003/04/29 09:23:56 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 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)
+(in-package #:kmrcl)
 
 (defclass attributes-class (kmr-mop:standard-class)
   ()
@@ -28,18 +32,18 @@ on example from AMOP"))
 
 (defclass attributes-dsd (kmr-mop:standard-direct-slot-definition)
   ((attributes :initarg :attributes :initform nil
-	       :accessor dsd-attributes)))
+               :accessor dsd-attributes)))
 
 (defclass attributes-esd (kmr-mop:standard-effective-slot-definition)
-  ((attributes :initarg :attributes :initform nil 
-	       :accessor esd-attributes)))
+  ((attributes :initarg :attributes :initform nil
+               :accessor esd-attributes)))
 
 ;; encapsulating macro for Lispworks
 (kmr-mop:process-slot-option attributes-class :attributes)
 
-#+(or cmu scl sbcl)
+#+(or cmu scl sbcl openmcl)
 (defmethod kmr-mop:validate-superclass ((class attributes-class)
-					(superclass kmr-mop:standard-class))
+                                        (superclass kmr-mop:standard-class))
   t)
 
 (defmethod kmr-mop:direct-slot-definition-class ((cl attributes-class) #+kmr-normal-dsdc &rest initargs)
@@ -50,38 +54,35 @@ on example from AMOP"))
   (declare (ignore initargs))
   (kmr-mop:find-class 'attributes-esd))
 
-(defmethod kmr-mop:compute-effective-slot-definition :around
+(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 kmr-mop:compute-slots ((class attributes-class))
   (let* ((normal-slots (call-next-method))
-	 (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)))))
-  
+         (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)))
 
@@ -91,16 +92,15 @@ on example from AMOP"))
 
 (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)))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (export '(attributes-class slot-attributes)))
+