r8264: rename entities.xml to entities.inc

[hyperobject.git] / package.lisp

diff --git a/package.lisp b/package.lisp
index e7b92835bce51edd5f406d373e8c94308fda92c0..f38c860200e2d79a45b92f03ae7430dc86984e63 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -7,15 +7,12 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.33 2003/03/25 16:04:18 kevin Exp $
+;;;; $Id$
 ;;;;
-;;;; 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)
-  (declaim (optimize (speed 2) (safety 2) (compilation-speed 0) (debug 2))))
-
-(in-package :cl-user)
+(in-package #:cl-user)
 
 #+sbcl
 (eval-when (:compile-toplevel :load-toplevel :execute)
@@ -23,10 +20,23 @@
       (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")
+  (:use #:common-lisp #:kmrcl
+       #+kmr-sbcl-mop #:sb-mop
+       #+kmr-cmucl-mop #:mop
+       #+allegro #:mop
+       #+lispworks #:clos
+       #+scl #:clos
+       #+openmcl #:openmcl-mop)
   (:export
    #:package
    #:hyperobject
@@ -34,7 +44,11 @@
    #:hyperobject-class-user-name
    #:load-all-subobjects
    #:view
+   #:view-subobjects
    #:fmt-comma-integer
+   #:processed-queued-definitions
+   #:all-subobjects
+   #:subobjects
    ))
 
 (defpackage #:hyperobject-user
@@ -45,21 +59,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)
+   '(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::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::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
@@ -68,23 +72,28 @@
      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)
+     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
+     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))
 
@@ -94,3 +103,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*))))