diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2017-11-13 12:46:13 -0500 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2017-12-13 17:31:27 -0500 |
| commit | e7b1111155b3116d0c7b137e0e1d312db0f1ca80 (patch) | |
| tree | 30240245d971e634ed1ec0f60733fe6dde2e1421 /test/lisp/emacs-lisp/cl-macs-tests.el | |
| parent | 4cb8696e4754d815efd5fd5e26f2b6b2567a11fe (diff) | |
| download | emacs-e7b1111155b3116d0c7b137e0e1d312db0f1ca80.tar.gz | |
Mention new strictness for &optional, &rest in arglists (Bug#29165)
* 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.
Diffstat (limited to 'test/lisp/emacs-lisp/cl-macs-tests.el')
| -rw-r--r-- | test/lisp/emacs-lisp/cl-macs-tests.el | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/test/lisp/emacs-lisp/cl-macs-tests.el b/test/lisp/emacs-lisp/cl-macs-tests.el index 575f170af6c..bf2e7e12759 100644 --- a/test/lisp/emacs-lisp/cl-macs-tests.el +++ b/test/lisp/emacs-lisp/cl-macs-tests.el @@ -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 |