Changeset 5462

Timestamp:

Nov 3, 2006, 12:46:02 PM (18 years ago)

Author:

Gary Byers

Message:

CANONICALIZE-SPECIALIZERS optionally returns its argument if all members are SPECIALIZERS.

Use CANONICALIZE-SPECIALIZERS to canonicalize FIND-METHOD arguments, for the benefit
of people who haven't read the MOP spec or who don't realize that the MOP defines
some things differently from CLHS.

File:

• trunk/ccl/level-1/l1-clos-boot.lisp (modified) (3 diffs)

trunk/ccl/level-1/l1-clos-boot.lisp

@@ -668 +668 @@
     (setf (fdefinition function-name) gf))
 
-(defun canonicalize-specializers (specializers)
+(defun canonicalize-specializers (specializers &optional (copy t))
   (flet ((canonicalize-specializer (spec)
            (if (specializer-p spec)
@@ -680 +680 @@
                  (intern-eql-specializer (cadr spec))
                  (error "Unknown specializer form ~s" spec))))))
-    (mapcar #'canonicalize-specializer specializers)))
+    (if (and (not copy)
+             (dolist (s specializers t)
+               (unless (specializer-p s) (return nil))))
+      specializers
+      (mapcar #'canonicalize-specializer specializers))))
 
 (defun ensure-method (name specializers &rest keys &key (documentation nil doc-p) qualifiers
@@ -2300 +2304 @@
             s)
         (when (equal q method-qualifiers)
-          (dolist (spec specializers #|(canonicalize-specializers specializers)|#
+          (dolist (spec (canonicalize-specializers specializers nil)
                    (if (null ss)
                      (return-from find-method m)