diff options
| author | Alan Mackenzie <acm@muc.de> | 2015-11-26 10:36:32 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2015-11-26 10:36:32 +0000 |
| commit | 5d93a89e805baa2f29941fd801e48235f6c1a6b6 (patch) | |
| tree | d8bb921b2d2a9185aab21ae0165518fd9f8f378c /lisp/emacs-lisp/bytecomp.el | |
| parent | 768b6f67746d2ba8407eb264c4b2d5c8ca011f58 (diff) | |
| download | emacs-5d93a89e805baa2f29941fd801e48235f6c1a6b6.tar.gz emacs-5d93a89e805baa2f29941fd801e48235f6c1a6b6.tar.bz2 emacs-5d93a89e805baa2f29941fd801e48235f6c1a6b6.zip | |
Byte compiler: on setq with an odd number of arguments, generate a `signal'
* lisp/emacs-lisp/cconv.el (cconv-convert): Don't transform `setq' form when
it has an odd number of arguments, to allow bytecomp to handle the error.
* lisp/emacs-lisp/bytecomp.el (byte-compile-setq): In a `setq' form with an
odd number of arguments, generate a `signal' instead of the normal code.
Diffstat (limited to 'lisp/emacs-lisp/bytecomp.el')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 58cce67598c..ffe73defcbb 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -3741,20 +3741,24 @@ discarding." (byte-defop-compiler-1 quote) (defun byte-compile-setq (form) - (let ((args (cdr form))) - (if args - (while args - (if (eq (length args) 1) - (byte-compile-log-warning - (format "missing value for `%S' at end of setq" (car args)) - nil :error)) - (byte-compile-form (car (cdr args))) - (or byte-compile--for-effect (cdr (cdr args)) - (byte-compile-out 'byte-dup 0)) - (byte-compile-variable-set (car args)) - (setq args (cdr (cdr args)))) - ;; (setq), with no arguments. - (byte-compile-form nil byte-compile--for-effect)) + (let* ((args (cdr form)) + (len (length args))) + (if (= (logand len 1) 1) + (progn + (byte-compile-log-warning + (format "missing value for `%S' at end of setq" (car (last args))) + nil :error) + (byte-compile-form + `(signal 'wrong-number-of-arguments '(setq ,len)))) + (if args + (while args + (byte-compile-form (car (cdr args))) + (or byte-compile--for-effect (cdr (cdr args)) + (byte-compile-out 'byte-dup 0)) + (byte-compile-variable-set (car args)) + (setq args (cdr (cdr args)))) + ;; (setq), with no arguments. + (byte-compile-form nil byte-compile--for-effect))) (setq byte-compile--for-effect nil))) (defun byte-compile-setq-default (form) |