r4688: Auto commit for Debian build

diff --git a/attrib-class.lisp b/attrib-class.lisp
index ee0228b7893e18d8415a4ea293c84dd9393d46bb..505a8a443a9d65cf0ac7a6ffa205bfdafd8f5ec6 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.12 2003/04/29 07:52:38 kevin Exp $
+;;;; $Id: attrib-class.lisp,v 1.13 2003/04/29 09:23:56 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -50,45 +50,37 @@ on example from AMOP"))
   (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 #'dsd-attributes 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-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))
-                                       (esd-attributes slot))))
-                (when attr-list
-                  (cons (kmr-mop:slot-definition-name slot) attr-list))))
-          normal-slots)))
-    (format t "normal-slots: ~A~%" normal-slots)
-    (format t "alist: ~A~%" alist)
+        (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))))
-      (format t "attrib-slot: ~A~%" attrib-slot)
-      (cons attrib-slot normal-slots))))
+                                      :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)))))
   
 (defun slot-attribute (instance slot-name attribute)
   (cdr (slot-attribute-bucket instance slot-name attribute)))

diff --git a/mop.lisp b/mop.lisp
index 79ac647ed59eaea2d307c8a9a9293c1b1916c76d..3252d618bea98f4a1473e10eb0ee81874ad6f0f8 100644 (file)
--- a/mop.lisp
+++ b/mop.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: mop.lisp,v 1.10 2003/04/29 07:52:38 kevin Exp $
+;;;; $Id: mop.lisp,v 1.11 2003/04/29 09:23:56 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -92,6 +92,7 @@
      sb-pcl::direct-slot-definition-class
      sb-pcl::effective-slot-definition-class
      sb-pcl::compute-effective-slot-definition
+     sb-pcl:class-direct-slots
      sb-pcl::compute-effective-slot-definition-initargs
      sb-pcl::slot-value-using-class
      sb-pcl:class-prototype sb-pcl:generic-function-method-class sb-pcl:intern-eql-specializer
@@ -103,6 +104,7 @@
      pcl::standard-direct-slot-definition pcl::standard-effective-slot-definition
      pcl::validate-superclass pcl:direct-slot-definition-class pcl::effective-slot-definition-class
      pcl:compute-effective-slot-definition
+     pcl:class-direct-slots
      pcl::compute-effective-slot-definition-initargs
      pcl::slot-value-using-class
      pcl:class-prototype pcl:generic-function-method-class pcl:intern-eql-specializer
@@ -113,6 +115,7 @@
      clos::slot-definition-name clos:finalize-inheritance
      clos::standard-direct-slot-definition clos::standard-effective-slot-definition
      clos::effective-slot-definition-class
+     clos:class-direct-slots
      clos::validate-superclass clos:direct-slot-definition-class
      clos:compute-effective-slot-definition
      clos::compute-effective-slot-definition-initargs
@@ -136,6 +139,7 @@
            class-prototype generic-function-method-class intern-eql-specializer
            make-method-lambda generic-function-lambda-list
            compute-slots
+           class-direct-slots
            ;; KMR-MOP encapsulating macros
            process-slot-option
            process-class-option))