[Openmcl-cvs-notifications] r15249 - /trunk/source/lib/method-combination.lisp

[greg at clozure.com]

Author: greg
Date: Mon Mar 12 22:09:10 2012
New Revision: 15249

Log:
Fix broken handling of &WHOLE in long-form method combination. Fixes issue =
#913.

Modified:
    trunk/source/lib/method-combination.lisp

Modified: trunk/source/lib/method-combination.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lib/method-combination.lisp (original)
+++ trunk/source/lib/method-combination.lisp Mon Mar 12 22:09:10 2012
@@ -504,7 +504,7 @@
               (incf req-idx))
              (&whole
               (names arg)
-              (vals `,args-form)
+              (vals (list 'quote `,args-form))
               (setq state :required))
              (&optional
               (let* ((var arg)
@@ -522,7 +522,7 @@
                 (when spvar
                   (names spvar)
                   (vals (list 'quote =

-                         `(nth-opt-gf-arg-present-p ,gf-form ,args-form ,o=
pt-idx))))
+                              `(nth-opt-gf-arg-present-p ,gf-form ,args-fo=
rm ,opt-idx))))
                 (incf opt-idx)))
              (&rest
               (names arg)