X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=package.lisp;h=71630b20b6529c9d4f507f84b0c0aa1814af61c5;hb=51d6df70857648f762bf43486a5340a548d961c7;hp=be73baa0c8e2aac79a14d9811c24e947691e81d2;hpb=1dac80e26be2fdf61ab7c2add4c190979f7b1b3d;p=hyperobject.git

diff --git a/package.lisp b/package.lisp
index be73baa..71630b2 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,9 +7,9 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.43 2003/04/24 07:00:02 kevin Exp $
+;;;; $Id: package.lisp,v 1.47 2003/05/15 06:30:19 kevin Exp $
 ;;;;
-;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
+;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
 
 (eval-when (:compile-toplevel :execute)
@@ -25,7 +25,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*)))
 
@@ -36,7 +37,8 @@
 	#+kmr-sbcl-mop #:sb-mop
 	#+kmr-cmucl-mop #:mop
 	#+allegro #:mop
-	#+lispworks #:clos)
+	#+lispworks #:clos
+	#+scl #:clos)
   (:export
    #:package
    #:hyperobject
@@ -71,7 +73,8 @@
      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
-     sb-pcl:make-method-lambda sb-pcl:generic-function-lambda-list)
+     sb-pcl:make-method-lambda sb-pcl:generic-function-lambda-list
+     sb-pcl::class-precedence-list)
    #+kmr-cmucl-mop 
    '(pcl::compute-effective-slot-definition-initargs)
    #+kmr-cmucl-pcl
@@ -83,19 +86,13 @@
      pcl::compute-effective-slot-definition-initargs
      pcl::slot-value-using-class
      pcl:class-prototype pcl:generic-function-method-class pcl:intern-eql-specializer
-     pcl:make-method-lambda pcl:generic-function-lambda-list)
+     pcl:make-method-lambda pcl:generic-function-lambda-list
+     pcl::class-precedence-list)
    #+scl
-   '(clos:class-slots 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::compute-effective-slot-definition-initargs
+     clos::class-prototype
      ;; note: make-method-lambda is not fbound
-     clos:intern-eql-specializer clos:make-method-lambda
-     clos:generic-function-lambda-list)
+     )
   
    :hyperobject))
 
@@ -105,4 +102,8 @@
       (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)
+  (if (find-package 'mop)
+      (setq cl:*features* (delete :kmr-cmucl-mop cl:*features*))
+      (setq cl:*features* (delete :kmr-cmucl-pcl cl:*features*))))