X-Git-Url: http://git.kpe.io/?p=hyperobject.git;a=blobdiff_plain;f=package.lisp;h=509b34e3abd219b67ccda83fb013d326dab42dfc;hp=fe22efdb05de6de51616d32478c5a756472a3b9c;hb=a88591e62595d2d25d5e6cfd29064d107c8b6b73;hpb=79f18c7d13f75a9139d079afbef9880b4663b188

diff --git a/package.lisp b/package.lisp
index fe22efd..509b34e 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,15 +7,12 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.39 2003/03/31 16:07:08 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,13 +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
-	#+allegro #:mop
-	#+lispworks #:clos)
+        #+kmr-sbcl-mop #:sb-mop
+        #+kmr-cmucl-mop #:mop
+        #+allegro #:mop
+        #+lispworks #:clos
+        #+scl #:clos
+        #+openmcl #:openmcl-mop)
   (:export
    #:package
    #:hyperobject
@@ -37,8 +44,11 @@
    #:hyperobject-class-user-name
    #:load-all-subobjects
    #:view
+   #:view-subobjects
    #:fmt-comma-integer
    #:processed-queued-definitions
+   #:all-subobjects
+   #:subobjects
    ))
 
 (defpackage #:hyperobject-user
@@ -52,9 +62,8 @@
    '(excl::compute-effective-slot-definition-initargs)
    #+lispworks
    '(clos::compute-effective-slot-definition-initargs)
-   #+kmr-sbcl-mop 
-   '(sb-pcl::compute-effective-slot-definition-initargs
-     )
+   #+kmr-sbcl-mop
+   '(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
@@ -64,29 +73,44 @@
      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
+     sb-pcl:slot-definition-type
      sb-pcl:class-prototype sb-pcl:generic-function-method-class sb-pcl:intern-eql-specializer
-     sb-pcl:make-method-lambda)
-  #+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
-    pcl:class-prototype pcl:generic-function-method-class pcl:intern-eql-specializer
-    pcl:make-method-lambda)
-  #+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
-    clos::class-prototype clos:generic-function-method-class
-    clos:intern-eql-specializer clos:make-method-lambda)
-  
+     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:slot-definition-type
+     pcl::class-precedence-list)
+   #+clisp
+   '(clos:class-name clos:class-slots clos:find-class 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:effective-slot-definition-class
+     clos:slot-definition-type
+     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:intern-eql-specializer
+     clos:generic-function-lambda-list
+     clos::class-precedence-list)
+   #+scl
+   '(clos::compute-effective-slot-definition-initargs
+     clos::class-prototype
+     clos:slot-definition-type
+     ;; note: make-method-lambda is not fbound
+     )
+
    :hyperobject))
 
 #+sbcl
@@ -95,4 +119,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*))))