r4302: *** empty log message ***

[hyperobject.git] / package.lisp

diff --git a/package.lisp b/package.lisp
index b567852e31922790c7b2e620557cc2e965dbb960..b261fdeb5aa26d5478f07697e020d58915d1a199 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.35 2003/03/29 20:11:09 kevin Exp $
+;;;; $Id: package.lisp,v 1.40 2003/03/31 19:22:22 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -26,7 +26,10 @@
 
 (defpackage #:hyperobject
   (:nicknames #:ho)
-  (:use #:common-lisp #:kmrcl #+kmr-sbcl-mop "SB-MOP")
+  (:use #:common-lisp #:kmrcl
+       #+kmr-sbcl-mop #:sb-mop
+       #+allegro #:mop
+       #+lispworks #:clos)
   (:export
    #:package
    #:hyperobject
@@ -46,25 +49,11 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (shadowing-import
    #+allegro
-   '(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
-     mop:class-prototype mop:generic-function-method-class mop:intern-eql-specializer
-     mop:make-method-lambda)
+   '(excl::compute-effective-slot-definition-initargs)
    #+lispworks
-   '(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 clos:make-method-lambda)
+   '(clos::compute-effective-slot-definition-initargs)
    #+kmr-sbcl-mop 
-   '(sb-pcl::standard-direct-slot-definition
-     sb-pcl::standard-effective-slot-definition
-     sb-pcl::compute-effective-slot-definition-initargs
-     ;sb-pcl:class-prototype sb-pcl:generic-function-method-class sb-pcl:intern-eql-specializer
-     )
+   '(sb-pcl::compute-effective-slot-definition-initargs)
    #+kmr-sbcl-pcl
    '(sb-pcl:class-of sb-pcl:class-name sb-pcl:class-slots sb-pcl:find-class
      sb-pcl::standard-class
@@ -94,7 +83,7 @@
     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::class-prototype clos:generic-function-method-class
     clos:intern-eql-specializer clos:make-method-lambda)
   
    :hyperobject))