r5354: *** empty log message ***

[kmrcl.git] / equal.lisp

diff --git a/equal.lisp b/equal.lisp
index ba43f7a4fa7dcbf09ac6b2843d729bb70481eee0..4ba6049dab960e351b8d5e9f3a3bd7b50175e325 100644 (file)
--- a/equal.lisp
+++ b/equal.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: equal.lisp,v 1.8 2003/03/25 05:25:54 kevin Exp $
+;;;; $Id: equal.lisp,v 1.15 2003/06/25 18:08:09 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -37,7 +37,7 @@
       (complex
        (and (generalized-equal (realpart obj1) (realpart obj2))
            (generalized-equal (imagpart obj1) (imagpart obj2))))
-      (standard-xstructure
+      (structure-object
        (generalized-equal-fielded-object obj1 obj2))
       (standard-object
        (generalized-equal-fielded-object obj1 obj2))
@@ -87,29 +87,17 @@
        (return-from test nil)))
     (return-from test t)))
 
-#+sbcl
-(eval-when (:toplevel-compile :toplevel-load :execute)
-  (if (find-package 'sb-mop)
-      (pushnew :sb-mop cl:*features*)
-      (pushnew :sb-acl cl:*features*)))
-
 (defun class-slot-names (c-name)
   "Given a CLASS-NAME, returns a list of the slots in the class."
-  #+(or allegro lispworks scl)
-  (mapcar #'clos:slot-definition-name
-         (clos:class-slots (find-class c-name)))
-  #+sbcl-mop (mapcar #'sb-mop::slot-definition-name
-                    (sb-mop:class-slots (find-class c-name)))
-  #+sbcl-pcl (mapcar #'sb-pcl::slot-definition-name
-                    (sb-pcl:class-slots (sb-pcl::find-class c-name)))
-  #+cmu (mapcar #'pcl::slot-definition-name
-                (pcl:class-slots (pcl:find-class c-name)))
-  #+mcl
+  #+(or allegro cmu lispworks sbcl scl)
+  (mapcar #'kmr-mop:slot-definition-name
+         (kmr-mop:class-slots (kmr-mop:find-class c-name)))
+  #+(and mcl (not openmcl))
   (let* ((class (find-class c-name nil)))
     (when (typep class 'standard-class)
       (nconc (mapcar #'car (ccl:class-instance-slots class))
              (mapcar #'car (ccl:class-class-slots class)))))
-  #-(or allegro lispworks cmu mcl sbcl scl)
+  #-(or allegro lispworks cmu mcl sbcl scl openmcl)
   (error "class-slot-names is not defined on this platform")
   )
 
@@ -118,29 +106,20 @@
   #+allegro (class-slot-names s-name)
   #+lispworks (structure:structure-class-slot-names
               (find-class s-name))
-  #+sbcl-mop (mapcar #'sb-mop::slot-definition-name
-                    (sb-mop:class-slots (find-class s-name)))
-  #+sbcl-pcl (mapcar #'sb-pcl::slot-definition-name
-                    (sb-pcl:class-slots (sb-pcl::find-class s-name)))
-  #+cmu (mapcar #'pcl::slot-definition-name
-                (pcl:class-slots (pcl:find-class s-name)))
+  #+(or sbcl cmu) (mapcar #'kmr-mop:slot-definition-name
+                         (kmr-mop:class-slots (kmr-mop:find-class s-name)))
   #+scl (mapcar #'kernel:dsd-name
                (kernel:dd-slots
                 (kernel:layout-info
                  (kernel:class-layout (find-class s-name)))))
-  #+mcl (let* ((sd (gethash s-name ccl::%defstructs%))
+  #+(and mcl (not openmcl))
+  (let* ((sd (gethash s-name ccl::%defstructs%))
               (slots (if sd (ccl::sd-slots sd))))
          (mapcar #'car (if (symbolp (caar slots)) slots (cdr slots))))
   #-(or allegro lispworks cmu sbcl scl mcl)
   (error "structure-slot-names is not defined on this platform")
   )
 
-
-(eval-when (:toplevel-compile :toplevel-load :execute)
-  (if (find-package 'sb-mop)
-      (setq cl:*features* (delete :sb-mop cl:*features*))
-      (setq cl:*features* (delete :sb-acl cl:*features*))))
-
 (defun function-to-string (obj)
   "Returns the lambda code for a function. Relies on
 Allegro implementation-dependent features."