[Openmcl-cvs-notifications] r15250 - in /release/1.8/source: ./ lib/method-combination.lisp

[rme at clozure.com]

Author: rme
Date: Tue Mar 13 11:30:29 2012
New Revision: 15250

Log:
Fix for broken &whole in define-method-combination from trunk.
See ticket:913.

Modified:
    release/1.8/source/   (props changed)
    release/1.8/source/lib/method-combination.lisp

Propchange: release/1.8/source/
---------------------------------------------------------------------------=
---
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 13 11:30:29 2012
@@ -4,4 +4,4 @@
 /branches/rme-logops:13875-13886
 /branches/working-0711/ccl:7970-13192,13197-13198,13202,13208,13214,13235-=
13236,13239,13263,13277-13278,13290,13293-13294,13302-13306,13331-13332,133=
39,13361-13364,13379,13383,13386,13388,13409,13435-13436,13438,13440-13442,=
13460-13461,13465,13467,13476,13487,13490,13492-13493,13502-13528,13545-135=
47,13549,13557-13558
 /release/1.5/source:13667
-/trunk/source:15221-15223,15225-15226,15228
+/trunk/source:15221-15223,15225-15226,15228,15249

Modified: release/1.8/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
--- release/1.8/source/lib/method-combination.lisp (original)
+++ release/1.8/source/lib/method-combination.lisp Tue Mar 13 11:30:29 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)