X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=73f949903cd7d61da67f637d551ace80cba9c922;hb=ab663bd390b95de44dd144fbeea504e0ed2e5d2d;hp=5e4ba96ecf5ca230ae00f4d7589964a822abb20a;hpb=b7af043786744aaf0b67a5ee6f4d42a647dc738d;p=kmrcl.git

diff --git a/mop.lisp b/mop.lisp
index 5e4ba96..73f9499 100644
--- a/mop.lisp
+++ b/mop.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: mop.lisp,v 1.1 2003/04/29 00:26:21 kevin Exp $
+;;;; $Id: mop.lisp,v 1.8 2003/04/29 05:54:24 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -41,32 +41,38 @@
    #+kmr-cmucl-mop #:mop
    #+allegro #:mop
    #+lispworks #:clos
-   #+scl #:clos)
-  (: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
-   #:slot-value-using-class
-   #:class-prototype #:generic-function-method-class #:intern-eql-specializer
-   #:make-method-lambda #:generic-function-lambda-list
-   #:compute-slots)   
-   )
+   #+scl #:clos))
 
 (in-package #:kmr-mop)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (shadowing-import
    #+allegro
-   '(excl::compute-effective-slot-definition-initargs)
+   '(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
+     )
    #+lispworks
-   '(clos::compute-effective-slot-definition-initargs)
-   #+kmr-sbcl-mop 
-   '(sb-pcl::compute-effective-slot-definition-initargs)
-   #+kmr-sbcl-pcl
+   '(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)
+   #+sbcl
    '(sb-pcl:class-of sb-pcl:class-name sb-pcl:class-slots sb-pcl:find-class
      sb-pcl::standard-class
      sb-pcl:slot-definition-name sb-pcl::finalize-inheritance
@@ -78,9 +84,7 @@
      sb-pcl:class-prototype sb-pcl:generic-function-method-class sb-pcl:intern-eql-specializer
      sb-pcl:make-method-lambda sb-pcl:generic-function-lambda-list
      sb-pcl::compute-slots)
-   #+kmr-cmucl-mop 
-   '(pcl::compute-effective-slot-definition-initargs)
-   #+kmr-cmucl-pcl
+   #+cmu
    '(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
@@ -92,29 +96,51 @@
      pcl:make-method-lambda pcl:generic-function-lambda-list
      pcl::compute-slots)
    #+scl
-   '(clos::compute-effective-slot-definition-initargs
-     clos::class-prototype
+   '(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
      ;; note: make-method-lambda is not fbound
-     )
-   '#:kmr-mop))
-
-
-#+sbcl
-(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
+	    slot-value-using-class
+	    class-prototype generic-function-method-class intern-eql-specializer
+	    make-method-lambda generic-function-lambda-list
+	    compute-slots))
+  
+  #+sbcl
   (if (find-package 'sb-mop)
       (setq cl:*features* (delete :kmr-sbcl-mop cl:*features*))
-      (setq cl:*features* (delete :kmr-sbcl-pcl cl:*features*))))
-
-#+cmu
-(eval-when (:compile-toplevel :load-toplevel :execute)
+      (setq cl:*features* (delete :kmr-sbcl-pcl cl:*features*)))
+  
+  #+cmu
   (if (find-package 'mop)
       (setq cl:*features* (delete :kmr-cmucl-mop cl:*features*))
-      (setq cl:*features* (delete :kmr-cmucl-pcl cl:*features*))))
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
+      (setq cl:*features* (delete :kmr-cmucl-pcl cl:*features*)))
+  
   (when (>= (length (generic-function-lambda-list
 		     (ensure-generic-function
 		      'compute-effective-slot-definition)))
 	    3)
-    (pushnew :kmr-named-cesd cl:*features*)))
+    (pushnew :kmr-normal-cesd cl:*features*))
+  
+  (when (>= (length (generic-function-lambda-list
+		     (ensure-generic-function
+		      'direct-slot-definition-class)))
+	    3)
+    (pushnew :kmr-normal-dsdc cl:*features*))
 
+  )  ;; eval-when