r4272: Auto commit for Debian build

[hyperobject.git] / package.lisp

diff --git a/package.lisp b/package.lisp
index 94273185bcb011227277b13a4df3f5b045ec4fa6..42e51efbb47df3937d2066f910384d23340af338 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.29 2003/03/25 14:00:53 kevin Exp $
+;;;; $Id: package.lisp,v 1.34 2003/03/29 04:00:37 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
@@ -28,17 +35,13 @@
    #:load-all-subobjects
    #:view
    #:fmt-comma-integer
+   #:processed-queued-definitions
    ))
 
 (defpackage #:hyperobject-user
   (: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-pcl cl:*features*)))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (shadowing-import
@@ -54,16 +57,11 @@
      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::standard-direct-slot-definition
+     sb-pcl::standard-effective-slot-definition
+     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
      sb-pcl:slot-definition-name sb-pcl::finalize-inheritance
@@ -94,6 +92,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-pcl cl:*features*))))
+      (setq cl:*features* (delete :kmr-sbcl-mop cl:*features*))
+      (setq cl:*features* (delete :kmr-sbcl-pcl cl:*features*))))