X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=571b1f445243e99610a00c621755764aec512b10;hb=c59bcb7e1dcdb2c2ec24422f6534a05da56e9bb5;hp=995b368db06dd650d9a97b66ab85522cc9916057;hpb=5ef3317938a27c4fe0341ebe1ccc3fb453901cba;p=kmrcl.git

diff --git a/mop.lisp b/mop.lisp
index 995b368..571b1f4 100644
--- a/mop.lisp
+++ b/mop.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: mop.lisp,v 1.2 2003/04/29 03:50:42 kevin Exp $
+;;;; $Id: mop.lisp,v 1.7 2003/04/29 05:11:57 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -41,20 +41,7 @@
    #+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)
 
@@ -95,33 +82,40 @@
    '(clos::compute-effective-slot-definition-initargs
      clos::class-prototype
      ;; 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
+	    #+allero excl::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-normal-cesd cl:*features*)))
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
+    (pushnew :kmr-normal-cesd cl:*features*))
+  
   (when (>= (length (generic-function-lambda-list
-		    (ensure-generic-function
-		     'direct-slot-definition-class)))
+		     (ensure-generic-function
+		      'direct-slot-definition-class)))
 	    3)
-    (pushnew :kmr-normal-dsdc cl:*features*)))
+    (pushnew :kmr-normal-dsdc cl:*features*))
 
+  )  ;; eval-when