Changeset 12588

Timestamp:

Aug 15, 2009, 2:32:39 PM (15 years ago)

Author:

gz

Message:

in encode-lambda-list, don't return a vector if no &key, and test for that that when checking defgeneric keys

Location:

branches/working-0711/ccl/level-1

Files:

• l1-clos-boot.lisp (modified) (1 diff)
• l1-readloop.lisp (modified) (1 diff)

branches/working-0711/ccl/level-1/l1-clos-boot.lisp

@@ -360 +360 @@
         (when aokp (setq bits (%ilogior (%ilsl $lfbits-aok-bit 1) bits)))
         (if return-keys?
-          (values bits (apply #'vector (nreverse key-list)))
+          (values bits (and keyp (apply #'vector (nreverse key-list))))
           bits)))))
 

branches/working-0711/ccl/level-1/l1-readloop.lisp

@@ -588 +588 @@
         (loop for minfo in old-methods
               do (multiple-value-bind (mkeys aok) (def-info-method.keyvect minfo)
-                   (when (and (not aok)
+                   (when (and mkeys
+                              (not aok)
                               (setq mkeys (loop for gk across gfkeys
                                                 unless (find gk mkeys) collect gk)))