X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=package.lisp;h=723a22f13721a9b7a191ffa178fa3814f78d742f;hb=9fac7ca418d0d16d40c24231a686b3ecd6b6a826;hp=e4221b74e66a9ba0b3ba14ba17b684615a163023;hpb=5aab2a0a18e762a02640a8d461fcb8414295b25a;p=hyperobject.git

diff --git a/package.lisp b/package.lisp
index e4221b7..723a22f 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.25 2003/03/25 05:08:33 kevin Exp $
+;;;; $Id: package.lisp,v 1.26 2003/03/25 06:50:47 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -34,56 +34,66 @@
   (:nicknames #:ho-user)
   (:use #:hyperobject #:cl #:cl-user))
 
+#+sbcl
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (if (find-package 'sb-mop)
+      (pushnew :sb-mop cl:*features*)
+      (pushnew :sb-acl cl:*features*)))
+
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (shadowing-import
    #+allegro
-   `(mop::class-slots mop::slot-definition-name mop:finalize-inheritance
+   '(mop::class-slots mop::slot-definition-name mop:finalize-inheritance
      mop::standard-direct-slot-definition mop::standard-effective-slot-definition
      mop:direct-slot-definition-class mop:compute-effective-slot-definition
      excl::compute-effective-slot-definition-initargs
      mop:slot-value-using-class)
    #+lispworks
-   `(clos:class-slots clos::slot-definition-name clos:finalize-inheritance
+   '(clos:class-slots clos::slot-definition-name clos:finalize-inheritance
      clos::standard-direct-slot-definition clos::standard-effective-slot-definition
      clos:direct-slot-definition-class clos:compute-effective-slot-definition
      clos::compute-effective-slot-definition-initargs
      clos:slot-value-using-class)
-   #+sbcl 
-   `(,@(if (find-package 'sb-mop)
-	  '(sb-mop:class-slots
-	    sb-mop::standard-class
-	    sb-mop:slot-definition-name sb-mop:finalize-inheritance
-	    sb-mop::standard-direct-slot-definition
-	    sb-mop::standard-effective-slot-definition sb-mop:validate-superclass
-	    sb-mop:direct-slot-definition-class sb-mop:compute-effective-slot-definition
-	    sb-mop::compute-effective-slot-definition-initargs
-	    sb-mop:slot-value-using-class)
-	  '(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
-	    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::compute-effective-slot-definition-initargs
-	    sb-pcl::slot-value-using-class)))
-   #+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)
-   #+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)
-   
+   #+sbcl-mop 
+   '(sb-mop:class-slots
+     sb-mop::standard-class
+     sb-mop:slot-definition-name sb-mop:finalize-inheritance
+     sb-mop::standard-direct-slot-definition
+     sb-mop::standard-effective-slot-definition sb-mop:validate-superclass
+     sb-mop:direct-slot-definition-class sb-mop:compute-effective-slot-definition
+     sb-mop::compute-effective-slot-definition-initargs
+     sb-mop:slot-value-using-class)
+   #+sbcl-pcl
+   '(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
+     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::compute-effective-slot-definition-initargs
+     sb-pcl::slot-value-using-class))
+  #+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)
+  #+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)
+  
    :hyperobject))
 
-
+#+sbcl
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (if (find-package 'sb-mop)
+      (setq cl:*features* (delete :sb-mop cl:*features*))
+      (setq cl:*features* (delete :sb-acl cl:*features*))))