Fix keyword argument parsing. Please bootstrap.

This commit is contained in:
Daniel Colascione 2014-03-22 23:00:18 -07:00
parent 0ceba22e53
commit 7eab98da1b
4 changed files with 20 additions and 1 deletions

View file

@ -1,3 +1,10 @@
2014-03-23 Daniel Colascione <dancol@dancol.org>
* emacs-lisp/cl-macs.el (cl--do-arglist): Use a little `cl-loop'
list to look for keyword arguments instead of `memq', fixing
(Bug#3647) --- unfortunately, only for freshly-compiled code.
Please make bootstrap.
2014-03-23 Richard Stallman <rms@gnu.org>
* battery.el (battery-linux-sysfs): Search for each field

View file

@ -503,7 +503,8 @@ its argument list allows full Common Lisp conventions."
(varg (if (consp (car arg)) (cl-cadar arg) (car arg)))
(def (if (cdr arg) (cadr arg)
(or (car cl--bind-defs) (cadr (assq varg cl--bind-defs)))))
(look `(memq ',karg ,restarg)))
(look `(cl-loop for cl--arg on ,restarg by #'cddr
when (eq (car cl--arg) ',karg) return cl--arg)))
(and def cl--bind-enquote (setq def `',def))
(if (cddr arg)
(let* ((temp (or (nth 2 arg) (make-symbol "--cl-var--")))

View file

@ -1,3 +1,8 @@
2014-03-23 Daniel Colascione <dancol@dancol.org>
* automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
test: correct parsing of keyword arguments.
2014-03-23 Dmitry Gutov <dgutov@yandex.ru>
* automated/package-test.el (package-test-describe-package):

View file

@ -195,4 +195,10 @@
(should (eql (cl-mismatch "Aa" "aA") 0))
(should (eql (cl-mismatch '(a b c) '(a b d)) 2)))
(ert-deftest cl-lib-keyword-names-versus-values ()
(should (equal
(funcall (cl-function (lambda (&key a b) (list a b)))
:b :a :a 42)
'(42 :a))))
;;; cl-lib.el ends here