Changeset 731

Timestamp:

Mar 27, 2004, 2:47:12 AM (21 years ago)

Author:

Gary Byers

Message:

Don't set &allow-other-keys in GF lambda lists if method only says &key.

File:

• trunk/ccl/level-1/l1-dcode.lisp (modified) (2 diffs)

trunk/ccl/level-1/l1-dcode.lisp

@@ -73 +73 @@
       (and method
            (let* ((method-lambda-list (%method-lambda-list method))
-                  (method-has-&key (member '&key method-lambda-list)))
+                  (method-has-&key (member '&key method-lambda-list))
+                  (method-has-&allow-other-keys
+                   (member '&allow-other-keys method-lambda-list)))
              (if method-has-&key
-               ;; Treat gf lambda-list as (... &key &allow-other-keys)
                (nconc (ldiff method-lambda-list (cdr method-has-&key))
-                      '(&allow-other-keys))
+                      (if method-has-&allow-other-keys
+                        '(&allow-other-keys)))
                method-lambda-list)))
       gf-ll)))
@@ -125 +127 @@
                               (logand $lfbits-args-mask newbits)))))
     (when new-method
-          (check-defmethod-congruency gf new-method))))
+      (check-defmethod-congruency gf new-method))))
         
 (defun %gf-name (gf &optional (new-name nil new-name-p))