r10333: add sb-posix dependency

[kmrcl.git] / attrib-class.lisp

diff --git a/attrib-class.lisp b/attrib-class.lisp
index ee88042d4ee09342a92c1cd096bff24f9bce0a24..12572a290e458f671d0ee2553589abbf32687349 100644 (file)
--- 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,28 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: attrib-class.lisp,v 1.8 2003/04/29 01:39:40 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)
+  ()
+  (: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
@@ -29,60 +38,49 @@
   ((attributes :initarg :attributes :initform nil 
               :accessor esd-attributes)))
 
+;; encapsulating macro for Lispworks
+(kmr-mop:process-slot-option attributes-class :attributes)
 
-(defclass attributes-class (kmr-mop:standard-class)
-  ()
-  (:documentation "metaclass that implements attributes on slots. Based
-on example from AMOP"))
-
-
-#+(or cmu scl sbcl)
+#+(or cmu scl sbcl openmcl)
 (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))
-  )
-
-#+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))
+(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
+    ((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
-         (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))
+        (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)
@@ -104,6 +102,5 @@ on example from AMOP"))
               slot-name instance attribute))
       attr-bucket)))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (export '(attributes-class slot-attributes)))
+