base: with-parsed-body, different interface.

[lisp] / mdw-mop.lisp

diff --git a/mdw-mop.lisp b/mdw-mop.lisp
index e7ea27ccd90acf7ef96ad220df78c556b0c409e8..d578f51c88aec266744b021bc8f7e39c532a1169 100644 (file)
--- a/mdw-mop.lisp
+++ b/mdw-mop.lisp
@@ -27,7 +27,7 @@
 ;;; Packages.
 
 (defpackage #:mdw.mop
 ;;; Packages.
 
 (defpackage #:mdw.mop

-  (:use #:common-lisp #:mdw.base #+cmu #:mop)
+  (:use #:common-lisp #:mdw.base #+(or cmu clisp) #:mop #+ecl #:clos)

   (:export #:copy-instance #:copy-instance-using-class
           #:with-slot-variables
           #:compatible-class
   (:export #:copy-instance #:copy-instance-using-class
           #:with-slot-variables
           #:compatible-class


@@ -106,10 +106,7 @@ (defmacro with-slot-variables (slots instance &body body)
                             (listify slots)
                             (mapcar #'slot-definition-name
                                     (class-slots class))))))
                             (listify slots)
                             (mapcar #'slot-definition-name
                                     (class-slots class))))))

-      (multiple-value-bind
-         (docs decls body)
-         (parse-body body :allow-docstring-p nil)
-       (declare (ignore docs))
+      (with-parsed-body (body decls) body

        (with-gensyms (instvar)
          `(let ((,instvar ,instance))
             ,@(and class `((declare (type ,(class-name class) ,instvar))))
        (with-gensyms (instvar)
          `(let ((,instvar ,instance))
             ,@(and class `((declare (type ,(class-name class) ,instvar))))


@@ -196,6 +193,7 @@ (let ((stdslot (find-class 'standard-direct-slot-definition)))
   (defmethod compute-effective-slot-definition
       ((class compatible-class) slot-name direct-slots)
     "Construct an effective slot definition for the given slot."
   (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.
     ;;
     ;; Ideally we don't want to mess with a slot if it's entirely handled by
     ;; the implementation.  This check seems to work OK.


@@ -366,7 +364,7 @@ (defclass singleton-class (mdw-class singleton-class-mixin) ())
 
 (defun print-object-with-slots (obj stream)
   "Prints objects in a pleasant way.  Not too clever about circularity."
 
 (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
         (magic (cons 'magic nil)))
     (print-unreadable-object (obj stream)
       (pprint-logical-block


@@ -377,8 +375,8 @@ (defun print-object-with-slots (obj stream)
                            (if (slot-boundp-using-class class obj slot)
                                (slot-value-using-class class obj slot)
                                magic)))
                            (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)
         (let ((sep nil))
           (loop
             (pprint-exit-if-list-exhausted)