X-Git-Url: https://git.distorted.org.uk/~mdw/lisp/blobdiff_plain/45144b0af47a79c1860575cfc92cdc9fa2bcb40f..8a2e8de1d736200d9aa751b85d5f97af33b91150:/mdw-mop.lisp

diff --git a/mdw-mop.lisp b/mdw-mop.lisp
index 51db744..f274dcb 100644
--- a/mdw-mop.lisp
+++ b/mdw-mop.lisp
@@ -27,7 +27,7 @@
 ;;; Packages.
 
 (defpackage #:mdw.mop
-  (:use #:common-lisp #:mdw.base #+cmu #:mop)
+  (:use #:common-lisp #:mdw.base #+(or cmu clisp) #:mop)
   (:export #:compatible-class
 	   #:copy-instance #:copy-instance-using-class
 	   #:initargs-for-effective-slot #:make-effective-slot
@@ -123,6 +123,7 @@
   (defmethod compute-effective-slot-definition
       ((class compatible-class) slot-name direct-slots)
     "Construct an effective slot definition for the given slot."
+    (declare (ignore slot-name))
     ;;
     ;; Ideally we don't want to mess with a slot if it's entirely handled by
     ;; the implementation.  This check seems to work OK.
@@ -293,7 +294,7 @@
 
 (defun print-object-with-slots (obj stream)
   "Prints objects in a pleasant way.  Not too clever about circularity."
-  (let ((class (pcl:class-of obj))
+  (let ((class (class-of obj))
         (magic (cons 'magic nil)))
     (print-unreadable-object (obj stream)
       (pprint-logical-block
@@ -304,8 +305,8 @@
                            (if (slot-boundp-using-class class obj slot)
                                (slot-value-using-class class obj slot)
                                magic)))
-                   (pcl:class-slots class)))
-        (format stream "~S" (pcl:class-name class))
+                   (class-slots class)))
+        (format stream "~S" (class-name class))
         (let ((sep nil))
           (loop
             (pprint-exit-if-list-exhausted)