diff options
| author | Noam Postavsky | 2017-12-15 23:20:25 -0500 |
|---|---|---|
| committer | Noam Postavsky | 2017-12-15 23:41:20 -0500 |
| commit | 777fe9466168d935e9055c7592b943cd4d2d2ff9 (patch) | |
| tree | 7ca50e3ebaa3c76da75f129ed8019324b6375267 /test | |
| parent | ad17db7964a1022fb0f646b35a00ffc5fb70ec30 (diff) | |
| download | emacs-777fe9466168d935e9055c7592b943cd4d2d2ff9.tar.gz emacs-777fe9466168d935e9055c7592b943cd4d2d2ff9.zip | |
Partially revert "Mention new strictness for &optional, &rest..."
The changes to cl argument parsing are not backwards compatible, and
cause inconvenience when writing macros (e.g., instead of doing '&aux
,@auxargs', some more complicated conditionals would be required).
The `cl-defstruct' macro makes use of this convenience when defining
empty structs (Bug#29728).
* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
(cl--do-&aux, cl--do-arglist): Undo strict checking of &rest, &key,
and &aux.
* test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs-bad-arglist): Remove
test.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/emacs-lisp/cl-macs-tests.el | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/test/lisp/emacs-lisp/cl-macs-tests.el b/test/lisp/emacs-lisp/cl-macs-tests.el index bf2e7e12759..575f170af6c 100644 --- a/test/lisp/emacs-lisp/cl-macs-tests.el +++ b/test/lisp/emacs-lisp/cl-macs-tests.el | |||
| @@ -497,35 +497,4 @@ collection clause." | |||
| 497 | vconcat (vector (1+ x))) | 497 | vconcat (vector (1+ x))) |
| 498 | [2 3 4 5 6]))) | 498 | [2 3 4 5 6]))) |
| 499 | 499 | ||
| 500 | |||
| 501 | ;;; cl-lib lambda list handling | ||
| 502 | |||
| 503 | (ert-deftest cl-macs-bad-arglist () | ||
| 504 | "Check that `cl-defun' and friends reject weird argument lists. | ||
| 505 | See Bug#29165, and similar `eval-tests--bugs-24912-and-24913' in | ||
| 506 | eval-tests.el." | ||
| 507 | (dolist (args (cl-mapcan | ||
| 508 | ;; For every &rest and &optional variant, check also | ||
| 509 | ;; the same thing with &key and &aux respectively | ||
| 510 | ;; instead. | ||
| 511 | (lambda (arglist) | ||
| 512 | (let ((arglists (list arglist))) | ||
| 513 | (when (memq '&rest arglist) | ||
| 514 | (push (cl-subst '&key '&rest arglist) arglists)) | ||
| 515 | (when (memq '&optional arglist) | ||
| 516 | (push (cl-subst '&aux '&optional arglist) arglists)) | ||
| 517 | arglists)) | ||
| 518 | '((&optional) (&rest) (&optional &rest) (&rest &optional) | ||
| 519 | (&optional &rest _a) (&optional _a &rest) | ||
| 520 | (&rest _a &optional) (&rest &optional _a) | ||
| 521 | (&optional &optional) (&optional &optional _a) | ||
| 522 | (&optional _a &optional _b) | ||
| 523 | (&rest &rest) (&rest &rest _a) | ||
| 524 | (&rest _a &rest _b)))) | ||
| 525 | (ert-info ((prin1-to-string args) :prefix "arglist: ") | ||
| 526 | (should-error (eval `(funcall (cl-function (lambda ,args))) t)) | ||
| 527 | (should-error (cl--transform-lambda (cons args t))) | ||
| 528 | (let ((byte-compile-debug t)) | ||
| 529 | (should-error (eval `(byte-compile (cl-function (lambda ,args))) t)))))) | ||
| 530 | |||
| 531 | ;;; cl-macs-tests.el ends here | 500 | ;;; cl-macs-tests.el ends here |