base: with-parsed-body, different interface.

[lisp] / mdw-mop.lisp

diff --git a/mdw-mop.lisp b/mdw-mop.lisp
index ff43c11a53ea437760cc681081ef8a4177260bad..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 #+(or cmu clisp) #: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))))