* lisp/emacs-lisp/eieio-core.el: Add `subclass' specializer for cl-generic.

(eieio--generic-subclass-tagcode, eieio--generic-subclass-tag-types):
New functions.
(cl-generic-tagcode-function, cl-generic-tag-types-function): Use them.

* test/automated/eieio-test-methodinvoke.el (eieio-test-cl-generic-1):
Test `subclass' specializer.

2 files changed, 32 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c731551f913..ab4428382fe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2015-01-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * emacs-lisp/eieio-core.el: Add `subclass' specializer for cl-generic.
+        (eieio--generic-subclass-tagcode, eieio--generic-subclass-tag-types):
+        New functions.
+        (cl-generic-tagcode-function, cl-generic-tag-types-function): Use them.
+
         * emacs-lisp/eieio.el (defclass): Add obsolescence warning for the
         `newname' argument.
 
@@ -152,8 +157,8 @@
 2015-01-16  Artur Malabarba  <bruce.connor.am@gmail.com>
 
         * emacs-lisp/package.el (package--read-pkg-desc):
-        New function. Read a `define-package' form in current buffer. Return
-        the pkg-desc, with desc-kind set to KIND.
+        New function. Read a `define-package' form in current buffer.
+        Return the pkg-desc, with desc-kind set to KIND.
         (package-dir-info): New function. Find package information for a
         directory. The return result is a `package-desc'.
         (package-install-from-buffer): Install packages from dired buffer.
diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el
index a82e887fa0c..e4221e48fe2 100644
--- a/lisp/emacs-lisp/eieio-core.el
+++ b/lisp/emacs-lisp/eieio-core.el
@@ -1227,6 +1227,8 @@ method invocation orders of the involved classes."
 
 (require 'cl-generic)
 
+;;;; General support to dispatch based on the type of the argument.
+
 (add-function :before-until cl-generic-tagcode-function
               #'eieio--generic-tagcode)
 (defun eieio--generic-tagcode (type name)
@@ -1246,6 +1248,29 @@ method invocation orders of the involved classes."
        (mapcar #'eieio--class-symbol
                (eieio--class-precedence-list (symbol-value tag)))))
 
+;;;; Dispatch for arguments which are classes.
+
+;; Since EIEIO does not support metaclasses, users can't easily use the
+;; "dispatch on argument type" for class arguments.  That's why EIEIO's
+;; `defmethod' added the :static qualifier.  For cl-generic, such a qualifier
+;; would not make much sense (e.g. to which argument should it apply?).
+;; Instead, we add a new "subclass" specializer.
+
+(add-function :before-until cl-generic-tagcode-function
+              #'eieio--generic-subclass-tagcode)
+(defun eieio--generic-subclass-tagcode (type name)
+  (when (eq 'subclass (car-safe type))
+    `(60 . (and (symbolp ,name) (eieio--class-v ,name)))))
+
+(add-function :before-until cl-generic-tag-types-function
+              #'eieio--generic-subclass-tag-types)
+(defun eieio--generic-subclass-tag-types (tag)
+  (when (eieio--class-p tag)
+    (mapcar (lambda (class)
+              `(subclass
+                ,(if (symbolp class) class (eieio--class-symbol class))))
+            (eieio--class-precedence-list tag))))
+
 ;;; Backward compatibility functions
 ;; To support .elc files compiled for older versions of EIEIO.