Changeset 14289 for trunk/abcl/src/org/armedbear/lisp/clos.lisp

Timestamp:

12/04/12 16:36:39 (8 years ago)

Author:

rschlatte

Message:

Don't shortcut add-method for subclasses of standard-generic-function

• Fixes #276

• Reported by Pascal Costanza

File:

• trunk/abcl/src/org/armedbear/lisp/clos.lisp (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/clos.lisp

@@ -1719 +1719 @@
         ;; specified by CLHS, 7.7 (Macro DEFGENERIC).
         (dolist (method (generic-function-initial-methods gf))
-          (if (typep gf 'standard-generic-function)
+          (if (eq  (class-of gf) +the-standard-generic-function-class+)
               (progn
                 (std-remove-method gf method)
@@ -2126 +2126 @@
                (apply #'make-instance-standard-method gf all-keys)
                (apply #'make-instance (generic-function-method-class gf) all-keys))))
-      (if (eq (generic-function-method-class gf) +the-standard-method-class+)
+      (if (and
+           (eq (generic-function-method-class gf) +the-standard-method-class+)
+           (eq (class-of gf) +the-standard-generic-function-class+))
           (progn
             (std-add-method gf method)