diff options
| author | Mattias Engdegård <mattiase@acm.org> | 2022-12-16 11:08:02 +0100 |
|---|---|---|
| committer | Mattias Engdegård <mattiase@acm.org> | 2022-12-16 19:18:34 +0100 |
| commit | 30d2b72c4124b351026a8a5420686d5dc04ecc61 (patch) | |
| tree | 5a64b5e98866d05a1143581b365c3c897ae7fea8 /lisp/emacs-lisp | |
| parent | 8624734504af4572525665c713a47e1b6f439a2c (diff) | |
| download | emacs-30d2b72c4124b351026a8a5420686d5dc04ecc61.tar.gz emacs-30d2b72c4124b351026a8a5420686d5dc04ecc61.tar.bz2 emacs-30d2b72c4124b351026a8a5420686d5dc04ecc61.zip | |
alist-get testfn argument evaluation correction
* lisp/emacs-lisp/gv.el (alist-get):
Evaluate TESTFN exactly once (previously up to 3 times).
Reduce the macro-expansion to include a call to either assoc or assq,
not both; this reduces the generated code size in some cases.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/gv.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el index 11251d7a963..48bc0269f36 100644 --- a/lisp/emacs-lisp/gv.el +++ b/lisp/emacs-lisp/gv.el @@ -417,9 +417,9 @@ The return value is the last VAL in the list. (lambda (do key alist &optional default remove testfn) (macroexp-let2 macroexp-copyable-p k key (gv-letplace (getter setter) alist - (macroexp-let2 nil p `(if (and ,testfn (not (eq ,testfn 'eq))) - (assoc ,k ,getter ,testfn) - (assq ,k ,getter)) + (macroexp-let2 nil p (if (member testfn '(nil 'eq #'eq)) + `(assq ,k ,getter) + `(assoc ,k ,getter ,testfn)) (funcall do (if (null default) `(cdr ,p) `(if ,p (cdr ,p) ,default)) (lambda (v) |