X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=package.lisp;h=3693970e6736c4a204d0d5b1ce3bb0fb39eb0d5c;hb=e79129717914af092ba893960b68f133463b91c4;hp=94d452bcdd76606a4ec72a55fe1b439daf8d47fa;hpb=c9386c508a27852a6ae9da0569a9c4398ba9c58f;p=hyperobject.git

diff --git a/package.lisp b/package.lisp
index 94d452b..3693970 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.28 2003/03/25 07:01:22 kevin Exp $
+;;;; $Id: package.lisp,v 1.32 2003/03/25 14:28:53 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -17,9 +17,16 @@
 
 (in-package :cl-user)
 
+#+sbcl
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (if (find-package 'sb-mop)
+      (pushnew :kmr-sbcl-mop cl:*features*)
+      (pushnew :kmr-sbcl-pcl cl:*features*)))
+
+
 (defpackage #:hyperobject
   (:nicknames #:ho)
-  (:use #:common-lisp #:kmrcl)
+  (:use #:common-lisp #:kmrcl #+kmr-sbcl-mop "SB-MOP")
   (:export
    #:package
    #:hyperobject
@@ -34,11 +41,6 @@
   (: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
@@ -54,16 +56,14 @@
      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-pcl: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
+   #+kmr-sbcl-mop 
+   '(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)
+   #+kmr-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
@@ -94,6 +94,6 @@
 #+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*))))
+      (setq cl:*features* (delete :kmr-sbcl-mop cl:*features*))
+      (setq cl:*features* (delete :kmr-sbcl-pcl cl:*features*))))