procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/emacs-lisp/cl-generic.el (cl--generic-method): New struct.

Browse source 
(cl--generic): The method-table is now a (list-of cl--generic-method).
(cl--generic-member-method): New function.
(cl-generic-define-method): Use it.
(cl--generic-build-combined-method, cl--generic-cache-miss):
Adapt to new method-table.
(cl--generic-no-next-method-function): Add `method' argument.
(cl-generic-call-method): Adapt to new method representation.
(cl--generic-cnm-sample, cl--generic-nnm-sample): Adjust.
(cl-find-method, cl-method-qualifiers): New functions.
(cl--generic-method-info): Adapt to new method representation.
Return a string for the qualifiers.
(cl--generic-describe):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-class): Adjust accordingly.
(eieio-all-generic-functions, eieio-method-documentation):
Adjust to new method representation.

* lisp/emacs-lisp/eieio-compat.el (eieio--defmethod): Use cl-find-method.

* test/automated/cl-generic-tests.el: Try and make sure cl-lib is not
required at run-time.
This commit is contained in:
Stefan Monnier 2015-01-26 11:43:06 -05:00
parent 4cdde9196f
commit a9a3d429e6
6 changed files with 133 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lisp/ChangeLog
View file

@ -1,3 +1,25 @@
2015-01-26 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/cl-generic.el (cl--generic-method): New struct.
(cl--generic): The method-table is now a (list-of cl--generic-method).
(cl--generic-member-method): New function.
(cl-generic-define-method): Use it.
(cl--generic-build-combined-method, cl--generic-cache-miss):
Adapt to new method-table.
(cl--generic-no-next-method-function): Add `method' argument.
(cl-generic-call-method): Adapt to new method representation.
(cl--generic-cnm-sample, cl--generic-nnm-sample): Adjust.
(cl-find-method, cl-method-qualifiers): New functions.
(cl--generic-method-info): Adapt to new method representation.
Return a string for the qualifiers.
(cl--generic-describe):
* emacs-lisp/eieio-opt.el (eieio-help-class): Adjust accordingly.
(eieio-all-generic-functions, eieio-method-documentation):
Adjust to new method representation.
* emacs-lisp/eieio-compat.el (eieio--defmethod): Use cl-find-method.
2015-01-26 Stefan Monnier <monnier@iro.umontreal.ca> 2015-01-26 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/cl-generic.el: Add a method-combination hook. * emacs-lisp/cl-generic.el: Add a method-combination hook.

158
lisp/emacs-lisp/cl-generic.el
View file

@ -33,10 +33,6 @@
;; code generation. Given how rarely method-combinations are used, ;; code generation. Given how rarely method-combinations are used,
;; I just provided a cl-generic-method-combination-function, which ;; I just provided a cl-generic-method-combination-function, which
;; people can use if they are really desperate for such functionality. ;; people can use if they are really desperate for such functionality.
;; - Method and generic function objects: CLOS defines methods as objects
;; (same for generic functions), whereas we don't offer such an abstraction.
;; - `no-next-method' should receive the "calling method" object, but since we
;; don't have such a thing, we pass nil instead.
;; - In defgeneric we don't support the options: ;; - In defgeneric we don't support the options:
;; declare, :method-combination, :generic-function-class, :method-class, ;; declare, :method-combination, :generic-function-class, :method-class,
;; :method. ;; :method.
@ -50,6 +46,8 @@
;; eieio-core adds dispatch on: ;; eieio-core adds dispatch on:
;; - class of eieio objects ;; - class of eieio objects
;; - actual class argument, using the syntax (subclass <class>). ;; - actual class argument, using the syntax (subclass <class>).
;; - cl-generic-method-combination-function (i.s.o define-method-combination).
;; - cl-generic-call-method (which replaces make-method and call-method).
;; Efficiency considerations: overall, I've made an effort to make this fairly ;; Efficiency considerations: overall, I've made an effort to make this fairly
;; efficient for the expected case (e.g. no constant redefinition of methods). ;; efficient for the expected case (e.g. no constant redefinition of methods).
@ -103,6 +101,18 @@ that for all other (PRIORITY . TAGCODE) where PRIORITY ≤ N, then
"Function to get the list of types that a given \"tag\" matches. "Function to get the list of types that a given \"tag\" matches.
They should be sorted from most specific to least specific.") They should be sorted from most specific to least specific.")
(cl-defstruct (cl--generic-method
(:constructor nil)
(:constructor cl--generic-method-make
(specializers qualifiers uses-cnm function))
(:predicate nil))
(specializers nil :read-only t :type list)
(qualifiers nil :read-only t :type (list-of atom))
;; USES-CNM is a boolean indicating if FUNCTION expects an extra argument
;; holding the next-method.
(uses-cnm nil :read-only t :type boolean)
(function nil :read-only t :type function))
(cl-defstruct (cl--generic (cl-defstruct (cl--generic
(:constructor nil) (:constructor nil)
(:constructor cl--generic-make (:constructor cl--generic-make
@ -116,12 +126,7 @@ They should be sorted from most specific to least specific.")
;; decide in which order to sort them. ;; decide in which order to sort them.
;; The most important dispatch is last in the list (and the least is first). ;; The most important dispatch is last in the list (and the least is first).
(dispatches nil :type (list-of (cons natnum (list-of tagcode)))) (dispatches nil :type (list-of (cons natnum (list-of tagcode))))
;; `method-table' is a list of (method-table nil :type (list-of cl--generic-method)))
;; ((SPECIALIZERS . QUALIFIERS) USES-CNM . FUNCTION), where
;; USES-CNM is a boolean indicating if FUNCTION calls `cl-call-next-method'
;; (and hence expects an extra argument holding the next-method).
(method-table nil :type (list-of (cons (cons (list-of type) (list-of atom))
(cons boolean function)))))
(defmacro cl--generic (name) (defmacro cl--generic (name)
`(get ,name 'cl--generic)) `(get ,name 'cl--generic))
@ -344,15 +349,25 @@ which case this method will be invoked when the argument is `eql' to VAL.
(cl-generic-define-method ',name ',qualifiers ',args (cl-generic-define-method ',name ',qualifiers ',args
,uses-cnm ,fun))))) ,uses-cnm ,fun)))))
(defun cl--generic-member-method (specializers qualifiers methods)
(while
(and methods
(let ((m (car methods)))
(not (and (equal (cl--generic-method-specializers m) specializers)
(equal (cl--generic-method-qualifiers m) qualifiers)))))
(setq methods (cdr methods))
methods))
;;;###autoload ;;;###autoload
(defun cl-generic-define-method (name qualifiers args uses-cnm function) (defun cl-generic-define-method (name qualifiers args uses-cnm function)
(let* ((generic (cl-generic-ensure-function name)) (let* ((generic (cl-generic-ensure-function name))
(mandatory (cl--generic-mandatory-args args)) (mandatory (cl--generic-mandatory-args args))
(specializers (specializers
(mapcar (lambda (arg) (if (consp arg) (cadr arg) t)) mandatory)) (mapcar (lambda (arg) (if (consp arg) (cadr arg) t)) mandatory))
(key (cons specializers qualifiers)) (method (cl--generic-method-make
specializers qualifiers uses-cnm function))
(mt (cl--generic-method-table generic)) (mt (cl--generic-method-table generic))
(me (assoc key mt)) (me (cl--generic-member-method specializers qualifiers mt))
(dispatches (cl--generic-dispatches generic)) (dispatches (cl--generic-dispatches generic))
(i 0)) (i 0))
(dolist (specializer specializers) (dolist (specializer specializers)
@ -367,9 +382,8 @@ which case this method will be invoked when the argument is `eql' to VAL.
(nreverse (sort (cons tagcode (cdr x)) (nreverse (sort (cons tagcode (cdr x))
#'car-less-than-car)))) #'car-less-than-car))))
(setq i (1+ i)))) (setq i (1+ i))))
(if me (setcdr me (cons uses-cnm function)) (if me (setcar me method)
(setf (cl--generic-method-table generic) (setf (cl--generic-method-table generic) (cons method mt)))
(cons `(,key ,uses-cnm . ,function) mt)))
(cl-pushnew `(cl-defmethod . (,(cl--generic-name generic) . ,specializers)) (cl-pushnew `(cl-defmethod . (,(cl--generic-name generic) . ,specializers))
current-load-list :test #'equal) current-load-list :test #'equal)
(let ((gfun (cl--generic-make-function generic)) (let ((gfun (cl--generic-make-function generic))
@ -459,47 +473,40 @@ for all those different tags in the method-cache.")
(gethash (cons generic-name methods) (gethash (cons generic-name methods)
cl--generic-combined-method-memoization) cl--generic-combined-method-memoization)
(let ((mets-by-qual ())) (let ((mets-by-qual ()))
(dolist (qm methods) (dolist (method methods)
(let* ((qualifiers (cdar qm)) (let* ((qualifiers (cl--generic-method-qualifiers method))
(x (assoc qualifiers mets-by-qual))) (x (assoc qualifiers mets-by-qual)))
;; FIXME: sadly, alist-get only uses `assq' and we need `assoc'. ;; FIXME: sadly, alist-get only uses `assq' and we need `assoc'.
;;(push (cdr qm) (alist-get qualifiers mets-by-qual))) ;;(push (cdr qm) (alist-get qualifiers mets-by-qual)))
(if x (if x
(push (cdr qm) (cdr x)) (push method (cdr x))
(push (list qualifiers (cdr qm)) mets-by-qual)))) (push (list qualifiers method) mets-by-qual))))
(funcall cl-generic-method-combination-function (funcall cl-generic-method-combination-function
generic-name mets-by-qual)))) generic-name mets-by-qual))))
(defun cl--generic-no-next-method-function (generic) (defun cl--generic-no-next-method-function (generic method)
(lambda (&rest args) (lambda (&rest args)
;; FIXME: CLOS passes as second arg the "calling method". (apply #'cl-no-next-method generic method args)))
;; We don't currently have "method objects" like CLOS
;; does so we can't really do it the CLOS way.
;; The closest would be to pass the lambda corresponding
;; to the method, or maybe the ((SPECIALIZERS
;; . QUALIFIER) USE-CNM . FUNCTION) entry from the method
;; table, but the caller wouldn't be able to do much with
;; it anyway. So we pass nil for now.
(apply #'cl-no-next-method generic nil args)))
(defun cl-generic-call-method (generic-name method &optional fun) (defun cl-generic-call-method (generic-name method &optional fun)
"Return a function that calls METHOD. "Return a function that calls METHOD.
FUN is the function that should be called when METHOD calls FUN is the function that should be called when METHOD calls
`call-next-method'." `call-next-method'."
(pcase method (if (not (cl--generic-method-uses-cnm method))
(`(nil . ,method) method) (cl--generic-method-function method)
(`(,_uses-cnm . ,method) (let ((met-fun (cl--generic-method-function method))
(let ((next (or fun (cl--generic-no-next-method-function generic-name)))) (next (or fun (cl--generic-no-next-method-function
(lambda (&rest args) generic-name method))))
(apply method (lambda (&rest args)
;; FIXME: This sucks: passing just `next' would (apply met-fun
;; be a lot more efficient than the lambda+apply ;; FIXME: This sucks: passing just `next' would
;; quasi-η, but we need this to implement the ;; be a lot more efficient than the lambda+apply
;; "if call-next-method is called with no ;; quasi-η, but we need this to implement the
;; arguments, then use the previous arguments". ;; "if call-next-method is called with no
(lambda (&rest cnm-args) ;; arguments, then use the previous arguments".
(apply next (or cnm-args args))) (lambda (&rest cnm-args)
args)))))) (apply next (or cnm-args args)))
args)))))
(defun cl--generic-standard-method-combination (generic-name mets-by-qual) (defun cl--generic-standard-method-combination (generic-name mets-by-qual)
(dolist (x mets-by-qual) (dolist (x mets-by-qual)
@ -533,10 +540,10 @@ FUN is the function that should be called when METHOD calls
(setq fun (cl-generic-call-method generic-name method fun))) (setq fun (cl-generic-call-method generic-name method fun)))
fun)))) fun))))
(defconst cl--generic-nnm-sample (cl--generic-no-next-method-function 'dummy)) (defconst cl--generic-nnm-sample (cl--generic-no-next-method-function t t))
(defconst cl--generic-cnm-sample (defconst cl--generic-cnm-sample
(funcall (cl--generic-build-combined-method (funcall (cl--generic-build-combined-method
nil `(((specializer . nil) t . ,#'identity))))) nil (list (cl--generic-method-make () () t #'identity)))))
(defun cl--generic-isnot-nnm-p (cnm) (defun cl--generic-isnot-nnm-p (cnm)
"Return non-nil if CNM is the function that calls `cl-no-next-method'." "Return non-nil if CNM is the function that calls `cl-no-next-method'."
@ -567,11 +574,13 @@ FUN is the function that should be called when METHOD calls
(defun cl--generic-cache-miss (generic dispatch-arg dispatches-left tags) (defun cl--generic-cache-miss (generic dispatch-arg dispatches-left tags)
(let ((types (apply #'append (mapcar cl-generic-tag-types-function tags))) (let ((types (apply #'append (mapcar cl-generic-tag-types-function tags)))
(methods '())) (methods '()))
(dolist (method-desc (cl--generic-method-table generic)) (dolist (method (cl--generic-method-table generic))
(let* ((specializer (or (nth dispatch-arg (caar method-desc)) t)) (let* ((specializer (or (nth dispatch-arg
(cl--generic-method-specializers method))
t))
(m (member specializer types))) (m (member specializer types)))
(when m (when m
(push (cons (length m) method-desc) methods)))) (push (cons (length m) method) methods))))
;; Sort the methods, most specific first. ;; Sort the methods, most specific first.
;; It would be tempting to sort them once and for all in the method-table ;; It would be tempting to sort them once and for all in the method-table
;; rather than here, but the order might depend on the actual argument ;; rather than here, but the order might depend on the actual argument
@ -614,6 +623,14 @@ Can only be used from within the lexical body of a primary or around method."
(declare (obsolete "make sure there's always a next method, or catch `cl-no-next-method' instead" "25.1")) (declare (obsolete "make sure there's always a next method, or catch `cl-no-next-method' instead" "25.1"))
(error "cl-next-method-p only allowed inside primary and around methods")) (error "cl-next-method-p only allowed inside primary and around methods"))
;;;###autoload
(defun cl-find-method (generic qualifiers specializers)
(car (cl--generic-member-method
specializers qualifiers
(cl--generic-method-table (cl--generic generic)))))
(defalias 'cl-method-qualifiers 'cl--generic-method-qualifiers)
;;; Add support for describe-function ;;; Add support for describe-function
(defun cl--generic-search-method (met-name) (defun cl--generic-search-method (met-name)
@ -638,22 +655,30 @@ Can only be used from within the lexical body of a primary or around method."
`(cl-defmethod . ,#'cl--generic-search-method))) `(cl-defmethod . ,#'cl--generic-search-method)))
(defun cl--generic-method-info (method) (defun cl--generic-method-info (method)
(pcase-let ((`((,specializers . ,qualifier) ,uses-cnm . ,function) method)) (let* ((specializers (cl--generic-method-specializers method))
(let* ((args (help-function-arglist function 'names)) (qualifiers (cl--generic-method-qualifiers method))
(docstring (documentation function)) (uses-cnm (cl--generic-method-uses-cnm method))
(doconly (if docstring (function (cl--generic-method-function method))
(let ((split (help-split-fundoc docstring nil))) (args (help-function-arglist function 'names))
(if split (cdr split) docstring)))) (docstring (documentation function))
(combined-args ())) (qual-string
(if uses-cnm (setq args (cdr args))) (if (null qualifiers) ""
(dolist (specializer specializers) (cl-assert (consp qualifiers))
(let ((arg (if (eq '&rest (car args)) (let ((s (prin1-to-string qualifiers)))
(intern (format "arg%d" (length combined-args))) (concat (substring s 1 -1) " "))))
(pop args)))) (doconly (if docstring
(push (if (eq specializer t) arg (list arg specializer)) (let ((split (help-split-fundoc docstring nil)))
combined-args))) (if split (cdr split) docstring))))
(setq combined-args (append (nreverse combined-args) args)) (combined-args ()))
(list qualifier combined-args doconly)))) (if uses-cnm (setq args (cdr args)))
(dolist (specializer specializers)
(let ((arg (if (eq '&rest (car args))
(intern (format "arg%d" (length combined-args)))
(pop args))))
(push (if (eq specializer t) arg (list arg specializer))
combined-args)))
(setq combined-args (append (nreverse combined-args) args))
(list qual-string combined-args doconly)))
(add-hook 'help-fns-describe-function-functions #'cl--generic-describe) (add-hook 'help-fns-describe-function-functions #'cl--generic-describe)
(defun cl--generic-describe (function) (defun cl--generic-describe (function)
@ -667,8 +692,9 @@ Can only be used from within the lexical body of a primary or around method."
(dolist (method (cl--generic-method-table generic)) (dolist (method (cl--generic-method-table generic))
(let* ((info (cl--generic-method-info method))) (let* ((info (cl--generic-method-info method)))
;; FIXME: Add hyperlinks for the types as well. ;; FIXME: Add hyperlinks for the types as well.
(insert (format "%S %S" (nth 0 info) (nth 1 info))) (insert (format "%s%S" (nth 0 info) (nth 1 info)))
(let* ((met-name (cons function (caar method))) (let* ((met-name (cons function
(cl--generic-method-specializers method)))
(file (find-lisp-object-file-name met-name 'cl-defmethod))) (file (find-lisp-object-file-name met-name 'cl-defmethod)))
(when file (when file
(insert " in `") (insert " in `")

9
lisp/emacs-lisp/eieio-compat.el
View file

@ -203,11 +203,10 @@ Summary:
;; or :after, make sure there's a matching dummy primary. ;; or :after, make sure there's a matching dummy primary.
(when (and (memq kind '(:before :after)) (when (and (memq kind '(:before :after))
;; FIXME: Use `cl-find-method'? ;; FIXME: Use `cl-find-method'?
(not (assoc (cons (mapcar (lambda (arg) (not (cl-find-method method ()
(if (consp arg) (nth 1 arg) t)) (mapcar (lambda (arg)
specializers) (if (consp arg) (nth 1 arg) t))
nil) specializers))))
(cl--generic-method-table (cl--generic method)))))
(cl-generic-define-method method () specializers t (cl-generic-define-method method () specializers t
(lambda (cnm &rest args) (lambda (cnm &rest args)
(if (cl--generic-isnot-nnm-p cnm) (if (cl--generic-isnot-nnm-p cnm)

18
lisp/emacs-lisp/eieio-opt.el
View file

@ -129,9 +129,9 @@ If CLASS is actually an object, then also display current values of that object.
(insert "`") (insert "`")
(help-insert-xref-button (symbol-name generic) 'help-function generic) (help-insert-xref-button (symbol-name generic) 'help-function generic)
(insert "'") (insert "'")
(pcase-dolist (`(,qualifier ,args ,doc) (pcase-dolist (`(,qualifiers ,args ,doc)
(eieio-method-documentation generic class)) (eieio-method-documentation generic class))
(insert (format " %S %S\n" qualifier args) (insert (format " %s%S\n" qualifiers args)
(or doc ""))) (or doc "")))
(insert "\n\n"))))) (insert "\n\n")))))
@ -325,10 +325,9 @@ methods for CLASS."
(and generic (and generic
(catch 'found (catch 'found
(if (null class) (throw 'found t)) (if (null class) (throw 'found t))
(pcase-dolist (`((,specializers . ,_qualifier) . ,_) (dolist (method (cl--generic-method-table generic))
(cl--generic-method-table generic))
(if (eieio--specializers-apply-to-class-p (if (eieio--specializers-apply-to-class-p
specializers class) (cl--generic-method-specializers method) class)
(throw 'found t)))) (throw 'found t))))
(push symbol l))))) (push symbol l)))))
l)) l))
@ -336,15 +335,14 @@ methods for CLASS."
(defun eieio-method-documentation (generic class) (defun eieio-method-documentation (generic class)
"Return info for all methods of GENERIC applicable to CLASS. "Return info for all methods of GENERIC applicable to CLASS.
The value returned is a list of elements of the form The value returned is a list of elements of the form
\(QUALIFIER ARGS DOC)." \(QUALIFIERS ARGS DOC)."
(let ((generic (cl--generic generic)) (let ((generic (cl--generic generic))
(docs ())) (docs ()))
(when generic (when generic
(dolist (method (cl--generic-method-table generic)) (dolist (method (cl--generic-method-table generic))
(pcase-let ((`((,specializers . ,_qualifier) . ,_) method)) (when (eieio--specializers-apply-to-class-p
(when (eieio--specializers-apply-to-class-p (cl--generic-method-specializers method) class)
specializers class) (push (cl--generic-method-info method) docs))))
(push (cl--generic-method-info method) docs)))))
docs)) docs))
;;; METHOD STATS ;;; METHOD STATS

5
test/ChangeLog
View file

@ -1,3 +1,8 @@
2015-01-26 Stefan Monnier <monnier@iro.umontreal.ca>
* automated/cl-generic-tests.el: Try and make sure cl-lib is not
required at run-time.
2015-01-26 Stefan Monnier <monnier@iro.umontreal.ca> 2015-01-26 Stefan Monnier <monnier@iro.umontreal.ca>
* automated/cl-generic-tests.el (cl-generic-test-11-next-method-p): * automated/cl-generic-tests.el (cl-generic-test-11-next-method-p):

4
test/automated/cl-generic-tests.el
View file

@ -23,8 +23,8 @@
;;; Code: ;;; Code:
(require 'ert) (eval-when-compile (require 'ert)) ;Don't indirectly require cl-lib at run-time.
(require 'cl-lib) (require 'cl-generic)
(cl-defgeneric cl--generic-1 (x y)) (cl-defgeneric cl--generic-1 (x y))
(cl-defgeneric (setf cl--generic-1) (v y z) "My generic doc.") (cl-defgeneric (setf cl--generic-1) (v y z) "My generic doc.")