Commit 90a543e6 authored by Stefan Kangas's avatar Stefan Kangas
Browse files

Decrease code duplication in byte-compiler free-vars warning

* lisp/emacs-lisp/bytecomp.el
(byte-compile-free-vars-warn): New defun extracted from...
(byte-compile-variable-ref, byte-compile-variable-set): ...here.
parent a126c368
Pipeline #7970 passed with stage
in 64 minutes and 27 seconds
......@@ -3432,6 +3432,27 @@ for symbols generated by the byte compiler itself."
(push var byte-compile-bound-variables)
(byte-compile-dynamic-variable-op 'byte-varbind var))
(defun byte-compile-free-vars-warn (var &optional assignment)
"Warn if symbol VAR refers to a free variable.
VAR must not be lexically bound.
If optional argument ASSIGNMENT is non-nil, this is treated as an
assignment (i.e. `setq'). "
(unless (or (not (byte-compile-warning-enabled-p 'free-vars var))
(boundp var)
(memq var byte-compile-bound-variables)
(memq var (if assignment
byte-compile-free-assignments
byte-compile-free-references)))
(let* ((varname (prin1-to-string var))
(desc (if assignment "assignment" "reference"))
(suggestions (help-uni-confusable-suggestions varname)))
(byte-compile-warn "%s to free variable `%s'%s"
desc varname
(if suggestions (concat "\n " suggestions) "")))
(push var (if assignment
byte-compile-free-assignments
byte-compile-free-references))))
(defun byte-compile-variable-ref (var)
"Generate code to push the value of the variable VAR on the stack."
(byte-compile-check-variable var 'reference)
......@@ -3440,15 +3461,7 @@ for symbols generated by the byte compiler itself."
;; VAR is lexically bound
(byte-compile-stack-ref (cdr lex-binding))
;; VAR is dynamically bound
(unless (or (not (byte-compile-warning-enabled-p 'free-vars var))
(boundp var)
(memq var byte-compile-bound-variables)
(memq var byte-compile-free-references))
(let* ((varname (prin1-to-string var))
(suggestions (help-uni-confusable-suggestions varname)))
(byte-compile-warn "reference to free variable `%s'%s" varname
(if suggestions (concat "\n " suggestions) "")))
(push var byte-compile-free-references))
(byte-compile-free-vars-warn var)
(byte-compile-dynamic-variable-op 'byte-varref var))))
(defun byte-compile-variable-set (var)
......@@ -3459,15 +3472,7 @@ for symbols generated by the byte compiler itself."
;; VAR is lexically bound.
(byte-compile-stack-set (cdr lex-binding))
;; VAR is dynamically bound.
(unless (or (not (byte-compile-warning-enabled-p 'free-vars var))
(boundp var)
(memq var byte-compile-bound-variables)
(memq var byte-compile-free-assignments))
(let* ((varname (prin1-to-string var))
(suggestions (help-uni-confusable-suggestions varname)))
(byte-compile-warn "assignment to free variable `%s'%s" varname
(if suggestions (concat "\n " suggestions) "")))
(push var byte-compile-free-assignments))
(byte-compile-free-vars-warn var t)
(byte-compile-dynamic-variable-op 'byte-varset var))))
(defmacro byte-compile-get-constant (const)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment