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

diff --git a/package.lisp b/package.lisp
index 9d9a718..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.42 2003/04/15 05:18:22 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)
@@ -23,13 +23,22 @@
       (pushnew :kmr-sbcl-mop cl:*features*)
       (pushnew :kmr-sbcl-pcl cl:*features*)))
 
+#+cmu
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (if (eq (symbol-package 'pcl:find-class)
+	  (find-package 'common-lisp))
+      (pushnew :kmr-cmucl-mop cl:*features*)
+      (pushnew :kmr-cmucl-pcl cl:*features*)))
+
 
 (defpackage #:hyperobject
   (:nicknames #:ho)
   (:use #:common-lisp #:kmrcl
 	#+kmr-sbcl-mop #:sb-mop
+	#+kmr-cmucl-mop #:mop
 	#+allegro #:mop
-	#+lispworks #:clos)
+	#+lispworks #:clos
+	#+scl #:clos)
   (:export
    #:package
    #:hyperobject
@@ -64,29 +73,26 @@
      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)
-  #+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
-    pcl::validate-superclass pcl:direct-slot-definition-class
-    pcl:compute-effective-slot-definition
-    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)
-  #+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
-    ;; note: make-method-lambda is not fbound
-    clos:intern-eql-specializer clos:make-method-lambda
-    clos: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
+   '(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:compute-effective-slot-definition
+     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::class-precedence-list)
+   #+scl
+   '(clos::compute-effective-slot-definition-initargs
+     clos::class-prototype
+     ;; note: make-method-lambda is not fbound
+     )
   
    :hyperobject))
 
@@ -96,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*))))