X-Git-Url: http://git.kpe.io/?p=hyperobject.git;a=blobdiff_plain;f=package.lisp;h=392caa6493e4ac28b8bdd67e03e0068e3ad36897;hp=509b34e3abd219b67ccda83fb013d326dab42dfc;hb=HEAD;hpb=4a772392fd77659637f19c6d0b69584974a40074

diff --git a/package.lisp b/package.lisp
index 509b34e..a2c4bcd 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,19 +7,11 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
 
 (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)
@@ -27,11 +19,17 @@
       (pushnew :kmr-cmucl-mop cl:*features*)
       (pushnew :kmr-cmucl-pcl cl:*features*)))
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (when (find-package '#:hyperobject-tests)
+    (delete-package '#:hyperobject-tests))
+  (when (find-package '#:hyperobject-user)
+    (delete-package '#:hyperobject-user))
+  (when (find-package '#:hyperobject)
+    (delete-package '#:hyperobject)))
 
 (defpackage #:hyperobject
   (:nicknames #:ho)
   (:use #:common-lisp #:kmrcl
-        #+kmr-sbcl-mop #:sb-mop
         #+kmr-cmucl-mop #:mop
         #+allegro #:mop
         #+lispworks #:clos
@@ -49,34 +47,51 @@
    #:processed-queued-definitions
    #:all-subobjects
    #:subobjects
+   #:cdata
    ))
 
 (defpackage #:hyperobject-user
   (:nicknames #:ho-user)
   (:use #:hyperobject #:cl #:cl-user))
 
-
 (eval-when (:compile-toplevel :load-toplevel :execute)
+  #+sbcl
+  (dolist (name '("CLASS-OF"
+                  "CLASS-NAME"
+                  "CLASS-SLOTS"
+                  "FIND-CLASS"
+                  "STANDARD-CLASS"
+                  "SLOT-DEFINITION-NAME"
+                  "FINALIZE-INHERITANCE"
+                  "STANDARD-DIRECT-SLOT-DEFINITION"
+                  "CLASS-PRECEDENCE-LIST"
+                  "STANDARD-EFFECTIVE-SLOT-DEFINITION"
+                  "VALIDATE-SUPERCLASS" "DIRECT-SLOT-DEFINITION-CLASS"
+                  "EFFECTIVE-SLOT-DEFINITION-CLASS"
+                  "COMPUTE-EFFECTIVE-SLOT-DEFINITION"
+                  "CLASS-DIRECT-SLOTS"
+                  "COMPUTE-EFFECTIVE-SLOT-DEFINITION-INITARGS"
+                  "SLOT-VALUE-USING-CLASS"
+                  "CLASS-PROTOTYPE"
+                  "GENERIC-FUNCTION-METHOD-CLASS"
+                  "INTERN-EQL-SPECIALIZER"
+                  "MAKE-METHOD-LAMBDA"
+                  "GENERIC-FUNCTION-LAMBDA-LIST"
+                  "COMPUTE-SLOTS"))
+    (let ((sym (find-symbol name "SB-MOP")))
+      (if sym
+          (progn (shadowing-import sym :hyperobject))
+          (progn
+            (setq sym (find-symbol name "SB-PCL"))
+            (if sym
+                (shadowing-import sym :hyperobject)
+                (warn "Can't find function ~A in packages SB-MOP or SB-PCL" name))))))
+  #-sbcl
   (shadowing-import
    #+allegro
    '(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-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:slot-definition-type
-     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
@@ -110,15 +125,8 @@
      clos:slot-definition-type
      ;; 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)