r4982: Auto commit for Debian build

[kmrcl.git] / equal.lisp

diff --git a/equal.lisp b/equal.lisp
index 0e98719577bd41c18427b07b6a43669fae715c99..0da3c4865ccb307735fc27a2a9be5f708984be83 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.12 2003/03/25 13:41:54 kevin Exp $
+;;;; $Id: equal.lisp,v 1.14 2003/05/07 21:57:10 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,23 +87,11 @@
        (return-from test nil)))
     (return-from test t)))
 
-#+sbcl
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (if (find-package 'sb-mop)
-      (pushnew :sb-mop cl:*features*)
-      (pushnew :sb-pcl 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)))
+  #+(or allegro cmu lispworks sbcl scl)
+  (mapcar #'kmr-mop:slot-definition-name
+         (kmr-mop:class-slots (kmr-mop:find-class c-name)))
   #+mcl
   (let* ((class (find-class c-name nil)))
     (when (typep class 'standard-class)
@@ -118,12 +106,8 @@
   #+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
@@ -135,12 +119,6 @@
   (error "structure-slot-names is not defined on this platform")
   )
 
-#+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-pcl cl:*features*))))
-
 (defun function-to-string (obj)
   "Returns the lambda code for a function. Relies on
 Allegro implementation-dependent features."