Changeset 12587

Timestamp:

Aug 15, 2009, 12:27:48 PM (15 years ago)

Author:

gz

Message:

fix some logic errors in previous checkin

Location:

branches/working-0711/ccl

Files:

• compiler/nx0.lisp (modified) (2 diffs)
• level-1/l1-readloop.lisp (modified) (2 diffs)

branches/working-0711/ccl/compiler/nx0.lisp

@@ -2095 +2095 @@
                (logbitp $lfbits-keys-bit bits)
                (not (logbitp $lfbits-aok-bit bits))
+               #-BOOTSTRAPPED (fboundp 'def-info-method.keyvect)
                (loop for m in (def-info.methods info)
-                     thereis (nth-value 1 (def-info-method.keyvect m))))
+                     thereis (null (def-info-method.keyvect m))))
       ;; Some method has &aok, don't bother checking keywords.
       (setq bits (logior bits (ash 1 $lfbits-aok-bit))))
@@ -2178 +2179 @@
       (assert (eq (def-info.function-type definfo) 'defgeneric))
       (loop for m in (def-info.methods definfo)
-            thereis (multiple-value-bind (keyvect aok) (def-info-method.keyvect m)
-                      (or aok (find key keyvect)))))
+            as keyvect = (def-info-method.keyvect m)
+            thereis (or (null keyvect) (find key keyvect))))
     (let ((gf (find-unencapsulated-definition def)))
       (or (find key (%defgeneric-keys gf))

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

@@ -456 +456 @@
 (defun %cons-def-info-method (lfbits keyvect qualifiers specializers)
   (cons (cons (and keyvect
-                   (if (and (logbitp $lfbits-aok-bit lfbits)
-                            (logbitp $lfbits-rest-bit lfbits))
-                       (list keyvect)
-                       keyvect))
+                   (if (logbitp $lfbits-aok-bit lfbits)
+                     (and (not (logbitp $lfbits-rest-bit lfbits))
+                          (list keyvect))
+                     keyvect))
               *loading-file-source-file*)
         (cons qualifiers specializers)))
@@ -557 +557 @@
       (return-from combine-gf-def-infos new-info))
     (unless (congruent-lfbits-p old-bits new-bits)
-      ;; Too bad don't have the actual lambda lists recorded.
       (if (logbitp $lfbits-gfn-bit new-bits)
         ;; A defgeneric, incongruent with previously defined methods