X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=package.lisp;h=8c61b3c50e443aac1676bbb3b4a7d00222edee3f;hb=7f6cbd20ca01e6f29b4fa7d68a0908864e400320;hp=e4221b74e66a9ba0b3ba14ba17b684615a163023;hpb=5aab2a0a18e762a02640a8d461fcb8414295b25a;p=hyperobject.git

diff --git a/package.lisp b/package.lisp
index e4221b7..8c61b3c 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.25 2003/03/25 05:08:33 kevin Exp $
+;;;; $Id: package.lisp,v 1.45 2003/05/07 16:01:48 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -17,9 +17,28 @@
 
 (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*)))
+
+#+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)
+  (:use #:common-lisp #:kmrcl
+	#+kmr-sbcl-mop #:sb-mop
+	#+kmr-cmucl-mop #:mop
+	#+allegro #:mop
+	#+lispworks #:clos
+	#+scl #:clos)
   (:export
    #:package
    #:hyperobject
@@ -28,62 +47,61 @@
    #:load-all-subobjects
    #:view
    #:fmt-comma-integer
+   #:processed-queued-definitions
    ))
 
 (defpackage #:hyperobject-user
   (:nicknames #:ho-user)
   (:use #:hyperobject #:cl #:cl-user))
 
+
 (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)
-   #+sbcl 
-   `(,@(if (find-package 'sb-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-mop: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)
-	  '(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
-	    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)))
-   #+cmu
-   `(pcl:class-of  pcl:class-name pcl:class-slots pcl:find-class pcl::standard-class
+   '(clos::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
+     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
+     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)
+   #+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::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)
    #+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::compute-effective-slot-definition-initargs
+     clos::class-prototype
+     ;; note: make-method-lambda is not fbound
+     )
+  
    :hyperobject))
 
+#+sbcl
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (if (find-package 'sb-mop)
+      (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*))))