mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 10:31:37 -08:00
Code Issues Projects Releases Wiki Activity

Mention new strictness for &optional, &rest in arglists (Bug#29165)

Browse source 
* etc/NEWS: Explain that '&optional' not followed by a variable is now
an error.
* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda, cl--do-&aux)
(cl--do-arglist): Also reject '&optional', '&rest', or '&aux' not
followed by a variable for consistency.
* test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs-bad-arglist): New
test.
This commit is contained in:
Noam Postavsky 2017-11-13 12:46:13 -05:00
parent 4cb8696e47
commit e7b1111155
3 changed files with 69 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

31
test/lisp/emacs-lisp/cl-macs-tests.el
View file

@ -497,4 +497,35 @@ collection clause."
vconcat (vector (1+ x)))
[2 3 4 5 6])))
;;; cl-lib lambda list handling
(ert-deftest cl-macs-bad-arglist ()
"Check that `cl-defun' and friends reject weird argument lists.
See Bug#29165, and similar `eval-tests--bugs-24912-and-24913' in
eval-tests.el."
(dolist (args (cl-mapcan
;; For every &rest and &optional variant, check also
;; the same thing with &key and &aux respectively
;; instead.
(lambda (arglist)
(let ((arglists (list arglist)))
(when (memq '&rest arglist)
(push (cl-subst '&key '&rest arglist) arglists))
(when (memq '&optional arglist)
(push (cl-subst '&aux '&optional arglist) arglists))
arglists))
'((&optional) (&rest) (&optional &rest) (&rest &optional)
(&optional &rest _a) (&optional _a &rest)
(&rest _a &optional) (&rest &optional _a)
(&optional &optional) (&optional &optional _a)
(&optional _a &optional _b)
(&rest &rest) (&rest &rest _a)
(&rest _a &rest _b))))
(ert-info ((prin1-to-string args) :prefix "arglist: ")
(should-error (eval `(funcall (cl-function (lambda ,args))) t))
(should-error (cl--transform-lambda (cons args t)))
(let ((byte-compile-debug t))
(should-error (eval `(byte-compile (cl-function (lambda ,args))) t))))))
;;; cl-macs-tests.el ends here