X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=package.lisp;h=dbc22cc7ee294baa0dbe6613eb227aaa6d83b5db;hb=409c40b1221545d7230f6e812921d441ba2d5f89;hp=b9d924c7004d389aef46b082c5d570ff666bfa4c;hpb=e0a53e9770cbdd4911708f400aa93ad5bdb8fe65;p=hyperobject.git

diff --git a/package.lisp b/package.lisp
index b9d924c..dbc22cc 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.27 2003/03/25 06:58:02 kevin Exp $
+;;;; $Id: package.lisp,v 1.37 2003/03/31 14:15:08 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-acl cl:*features*)))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (shadowing-import
@@ -47,23 +50,19 @@
      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)
+     mop:slot-value-using-class
+     mop:class-prototype mop:generic-function-method-class mop:intern-eql-specializer
+     mop:make-method-lambda)
    #+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-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)
-   #+sbcl-pcl
+     clos:slot-value-using-class clos:make-method-lambda)
+   #+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
@@ -71,7 +70,9 @@
      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::slot-value-using-class
+     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
@@ -79,7 +80,9 @@
     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)
   #+scl
   '(clos:class-slots clos::standard-class
     clos::slot-definition-name clos:finalize-inheritance
@@ -87,13 +90,16 @@
     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::slot-value-using-class
+    clos::class-prototype clos:generic-function-method-class
+    clos:intern-eql-specializer clos:make-method-lambda)
   
    :hyperobject))
 
 #+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-acl cl:*features*))))
+      (setq cl:*features* (delete :kmr-sbcl-mop cl:*features*))
+      (setq cl:*features* (delete :kmr-sbcl-pcl cl:*features*))))
+