r11465: new version
[kmrcl.git] / mop.lisp
index 73f949903cd7d61da67f637d551ace80cba9c922..f85912b88e7c97410544a356c054dbc03d5a0beb 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.8 2003/04/29 05:54:24 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; 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*)))
 
    #+kmr-cmucl-mop #:mop
    #+allegro #:mop
    #+lispworks #:clos
-   #+scl #:clos))
+   #+clisp #:clos
+   #+scl #:clos
+   #+openmcl #:openmcl-mop
+   )
+  )
 
 (in-package #:kmr-mop)
 
+#+lispworks
+(defun intern-eql-specializer (slot)
+  `(eql ,slot))
+
+(defmacro process-class-option (metaclass slot-name &optional required)
+  #+lispworks
+  `(defmethod clos:process-a-class-option ((class ,metaclass)
+                                          (name (eql ,slot-name))
+                                          value)
+    (when (and ,required (null value))
+      (error "metaclass ~A class slot ~A must have a value" (quote ,metaclass) name))
+    (list name `',value))
+  #-lispworks
+  (declare (ignore metaclass slot-name required))
+  )
+
+(defmacro process-slot-option (metaclass slot-name)
+  #+lispworks
+  `(defmethod clos:process-a-slot-option ((class ,metaclass)
+                                         (option (eql ,slot-name))
+                                         value
+                                         already-processed-options
+                                         slot)
+    (list* option `',value already-processed-options))
+  #-lispworks
+  (declare (ignore metaclass slot-name))
+  )
+
+
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (shadowing-import
    #+allegro
-   '(class-of class-name class-slots find-class mop::standard-class
-     mop::slot-definition-name mop:finalize-inheritance
-     mop::standard-direct-slot-definition mop::standard-effective-slot-definition
-     mop::validate-superclass mop:direct-slot-definition-class
-     mop:compute-effective-slot-definition
-     excl::compute-effective-slot-definition-initargs
-     mop::slot-value-using-class
-     mop:class-prototype mop:generic-function-method-class mop:intern-eql-specializer
-     mop:make-method-lambda mop:generic-function-lambda-list
-     mop::compute-slots
-     ;; note: make-method-lambda is not fbound
-     )
+   '(excl::compute-effective-slot-definition-initargs)
    #+lispworks
-   '(class-of class-name class-slots find-class
-     clos::standard-class
-     clos:slot-definition-name clos::finalize-inheritance
-     clos::standard-direct-slot-definition
-     clos::standard-effective-slot-definition 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:make-method-lambda clos:generic-function-lambda-list
-     clos::compute-slots)
+   '(clos::compute-effective-slot-definition-initargs)
+   #+clisp
+   '(clos::compute-effective-slot-definition-initargs)
    #+sbcl
-   '(sb-pcl:class-of sb-pcl:class-name sb-pcl:class-slots sb-pcl:find-class
+   '(#+kmr-sbcl-mop class-of #-kmr-sbcl-mop sb-pcl:class-of
+     #+kmr-sbcl-mop class-name #-kmr-sbcl-mop sb-pcl:class-name
+     #+kmr-sbcl-mop class-slots #-kmr-sbcl-mop sb-pcl:class-slots
+     #+kmr-sbcl-mop find-class #-kmr-sbcl-mop sb-pcl:find-class
      sb-pcl::standard-class
      sb-pcl:slot-definition-name sb-pcl::finalize-inheritance
      sb-pcl::standard-direct-slot-definition
      sb-pcl::standard-effective-slot-definition sb-pcl::validate-superclass
-     sb-pcl::direct-slot-definition-class sb-pcl::compute-effective-slot-definition
+     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
    '(pcl:class-of  pcl:class-name pcl:class-slots pcl:find-class pcl::standard-class
      pcl::slot-definition-name pcl:finalize-inheritance
      pcl::standard-direct-slot-definition pcl::standard-effective-slot-definition
-     pcl::validate-superclass pcl:direct-slot-definition-class
+     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
    '(class-of class-name class-slots find-class clos::standard-class
      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
            standard-class
            slot-definition-name finalize-inheritance
            standard-direct-slot-definition
            standard-effective-slot-definition validate-superclass
-           direct-slot-definition-class compute-effective-slot-definition
            compute-effective-slot-definition-initargs
+           direct-slot-definition-class effective-slot-definition-class
+           compute-effective-slot-definition
            slot-value-using-class
            class-prototype generic-function-method-class intern-eql-specializer
            make-method-lambda generic-function-lambda-list
-           compute-slots))
+           compute-slots
+           class-direct-slots
+           ;; KMR-MOP encapsulating macros
+           process-slot-option
+           process-class-option))
   
   #+sbcl
   (if (find-package 'sb-mop)