From 84ad5052fd65053a665219897883fdee88a3409c Mon Sep 17 00:00:00 2001 From: Philipp Stephani Date: Wed, 18 Jan 2017 19:49:58 +0100 Subject: [PATCH] Check that variable lists are actually lists 'let' and 'let*' document that their first argument has to be a list, but don't check for that; instead, they allow (and silently ignore) other types. Introduce an explicit type check. * src/eval.c (Flet, FletX): Check that the variable list is indeed a list. * test/src/eval-tests.el: Add unit tests. --- src/eval.c | 2 ++ test/src/eval-tests.el | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/src/eval.c b/src/eval.c index 1f8d409932..c05c8d8f8d 100644 --- a/src/eval.c +++ b/src/eval.c @@ -857,6 +857,7 @@ usage: (let* VARLIST BODY...) */) lexenv = Vinternal_interpreter_environment; varlist = XCAR (args); + CHECK_LIST (varlist); while (CONSP (varlist)) { QUIT; @@ -917,6 +918,7 @@ usage: (let VARLIST BODY...) */) USE_SAFE_ALLOCA; varlist = XCAR (args); + CHECK_LIST (varlist); /* Make space to hold the values to give the bound variables. */ elt = Flength (varlist); diff --git a/test/src/eval-tests.el b/test/src/eval-tests.el index a1fe8ccd7d..95655eac82 100644 --- a/test/src/eval-tests.el +++ b/test/src/eval-tests.el @@ -47,4 +47,14 @@ (let ((byte-compile-debug t)) (should-error (eval `(byte-compile (lambda ,args)) t))))) + +(dolist (form '(let let*)) + (dolist (arg '(1 "a" [a])) + (eval + `(ert-deftest ,(intern (format "eval-tests--%s--%s" form (type-of arg))) () + ,(format "Check that the first argument of `%s' cannot be a %s" + form (type-of arg)) + (should-error (,form ,arg) :type 'wrong-type-argument)) + t))) + ;;; eval-tests.el ends here -- 2.11.0.483.g087da7b7c-goog