Changeset 13876

Timestamp:

02/23/12 10:33:06 (11 years ago)

Author:

rschlatte

Message:

Beginning support for non-standard method metaclasses

... canonicalize specializers in defmethod macroexpansion, instead of in

the bowels of make-instance-standard-method.

... handle non-standard method metaclass in more places

File:

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

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

@@ -1791 +1791 @@
                (apply #'make-instance-standard-method gf all-keys)
                (apply #'make-instance (generic-function-method-class gf) all-keys))))
-      (std-add-method gf method)
+      (if (eq (generic-function-method-class gf) +the-standard-method-class+)
+          (std-add-method gf method)
+          (add-method gf method))
       method)))
 
@@ -2474 +2476 @@
                         :lambda-list ',lambda-list
                         :qualifiers ',qualifiers
-                        :specializers ,specializers-form
+                        :specializers (canonicalize-specializers ,specializers-form)
                         ,@(if documentation `(:documentation ,documentation))
                         :function (function ,method-function)