r5408: *** empty log message ***

[kmrcl.git] / mop.lisp

diff --git a/mop.lisp b/mop.lisp
index 79ac647ed59eaea2d307c8a9a9293c1b1916c76d..cd7c47736dd6e9d38ccc7ce977a21628bf0ffcb4 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.18 2003/07/30 19:04:41 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -29,7 +29,8 @@
 
 #+cmu
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (if (find-package 'mop)
+  (if (eq (symbol-package 'pcl:find-class)
+         (find-package 'common-lisp))
       (pushnew :kmr-cmucl-mop cl:*features*)
       (pushnew :kmr-cmucl-pcl cl:*features*)))
 
@@ -41,7 +42,10 @@
    #+kmr-cmucl-mop #:mop
    #+allegro #:mop
    #+lispworks #:clos
-   #+scl #:clos))
+   #+scl #:clos
+   #+openmcl #:openmcl-mop
+   )
+  )
 
 (in-package #:kmr-mop)
 
@@ -57,8 +61,8 @@
       (when (and ,required (null value))
        (error "metaclass ~A class slot ~A must have a value" (quote ,metaclass) name))
       (list name `',value))
-    #+(or allegro sbcl cmu scl)
-    (declare (ignore slot-name required))
+    #-lispworks
+    (declare (ignore metaclass slot-name required))
     )
 
   (defmacro process-slot-option (metaclass slot-name)
@@ -70,7 +74,7 @@
                                            slot)
       (list* option `',value already-processed-options))
     #-lispworks
-    (declare (ignore slot-name))
+    (declare (ignore metaclass slot-name))
     )
 
 
@@ -92,6 +96,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 +108,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,15 +119,27 @@
      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
      clos::slot-value-using-class
-     clos:class-prototype clos:generic-function-method-class clos:intern-eql-specializer
+     clos::class-prototype clos:generic-function-method-class clos:intern-eql-specializer
      clos:make-method-lambda clos:generic-function-lambda-list
      clos::compute-slots
      ;; note: make-method-lambda is not fbound
-     )))
+     )
+   #+openmcl
+   '(openmcl-mop::slot-definition-name openmcl-mop:finalize-inheritance
+     openmcl-mop::standard-direct-slot-definition openmcl-mop::standard-effective-slot-definition
+     openmcl-mop::validate-superclass openmcl-mop:direct-slot-definition-class openmcl-mop::effective-slot-definition-class
+     openmcl-mop:compute-effective-slot-definition
+     openmcl-mop:class-direct-slots
+     openmcl-mop::compute-effective-slot-definition-initargs
+     openmcl-mop::slot-value-using-class
+     openmcl-mop:class-prototype openmcl-mop:generic-function-method-class openmcl-mop:intern-eql-specializer
+     openmcl-mop:make-method-lambda openmcl-mop:generic-function-lambda-list
+     openmcl-mop::compute-slots)   ))
   
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (export '(class-of class-name class-slots find-class
@@ -136,6 +154,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))