X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=package.lisp;h=42e51efbb47df3937d2066f910384d23340af338;hb=3f4394e0246c029c40eeade98ef0778356bf3238;hp=a28624175d3e765e9b78b6d2c0971afba05ffe35;hpb=4e875964d95ced73f349adf56590f3c8bf49aa58;p=hyperobject.git

diff --git a/package.lisp b/package.lisp
index a286241..42e51ef 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.23 2003/03/25 04:57:38 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,63 +35,63 @@
    #: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::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)
    #+lispworks
-   `(clos:class-slots clos::slot-definition-name clos:finalize-inheritance
+   '(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-class '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
-     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)
-   
+   #+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
+     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
+    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)
+  
    :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*))))