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

* lisp/emacs-lisp/eieio.el (eieio-defgeneric-form-primary-only-one):

Browse source 
Fix function quoting.  Use backquote better.
This commit is contained in:
Stefan Monnier 2011-05-22 21:39:25 -03:00
parent 7400048f60
commit b1ef1257fe
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lisp/emacs-lisp/eieio.el
View file

@ -1226,29 +1226,28 @@ IMPL is the symbol holding the method implementation."
(if (not (eieio-object-p (car local-args)))
;; Not an object. Just signal.
(signal 'no-method-definition
(list ,(list 'quote method) local-args))
(list ',method local-args))
;; We do have an object. Make sure it is the right type.
(if ,(if (eq class eieio-default-superclass)
nil ; default superclass means just an obj. Already asked.
nil ; default superclass means just an obj. Already asked.
`(not (child-of-class-p (aref (car local-args) object-class)
,(list 'quote class)))
)
',class)))
;; If not the right kind of object, call no applicable
(apply 'no-applicable-method (car local-args)
,(list 'quote method) local-args)
',method local-args)
;; It is ok, do the call.
;; Fill in inter-call variables then evaluate the method.
(let ((scoped-class ,(list 'quote class))
(let ((scoped-class ',class)
(eieio-generic-call-next-method-list nil)
(eieio-generic-call-key method-primary)
(eieio-generic-call-methodname ,(list 'quote method))
(eieio-generic-call-methodname ',method)
(eieio-generic-call-arglst local-args)
)
(apply ,(list 'quote impl) local-args)
;(,impl local-args)
(apply #',impl local-args)
;;(,impl local-args)
)))))))
(defsubst eieio-defgeneric-reset-generic-form-primary-only-one (method)