mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

; elisp-scope.el: Cease handling 'let-alist' specially.

Browse source 
This removes the bespoke analyzer for 'let-alist'.  It
required special accommodations in 'elisp-scope--symbol'
(which is otherwise very generic), and didn't bring any
concrete benefit for semantic highlighting purposes.
Instead, we rely on 'elisp-scope-1' macro-expanding
'let-alist' forms and analyzing the result.

* lisp/emacs-lisp/elisp-scope.el: Delete bespoke analyzer
definition for 'let-alist'.
(elisp-scope--current-let-alist-form): Remove, no longer used.
(elisp-scope--symbol, elisp-scope--handle-quoted): Simplify.
This commit is contained in:
Eshel Yaron 2025-10-26 14:41:03 +01:00
parent 035c43c46b
commit 90afc7aaa3
No known key found for this signature in database
GPG key ID: EF3EE9CA35D78618
1 changed files with 6 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lisp/emacs-lisp/elisp-scope.el
View file

@ -551,8 +551,6 @@ See `elisp-scope-1' for possible values.")
(defvar elisp-scope--callback #'ignore
"Function to call to report information about each analyzed symbol.")
(defvar elisp-scope--current-let-alist-form nil)
(defsubst elisp-scope--local-new (sym pos &optional local)
"Return new local context with SYM bound at POS.
@ -590,21 +588,12 @@ Optional argument LOCAL is a local context to extend."
beg sym beg))
(defun elisp-scope--symbol (sym)
(let* ((beg (elisp-scope--sym-pos sym))
(bare (elisp-scope--sym-bare sym))
(name (symbol-name bare)))
(when (and beg (not (booleanp bare)))
(cond
((keywordp bare) (elisp-scope--report 'constant beg bare))
((and elisp-scope--current-let-alist-form (= (aref name 0) ?.))
(if (and (length> name 1) (= (aref name 1) ?.))
;; Double dot escapes `let-alist'.
(let* ((unescaped (intern (substring name 1))))
(elisp-scope--variable unescaped beg (alist-get unescaped elisp-scope-local-bindings)))
(elisp-scope--report 'bound-variable beg
(list 'let-alist (car elisp-scope--current-let-alist-form) bare)
(cdr elisp-scope--current-let-alist-form))))
(t (elisp-scope--variable bare beg (alist-get bare elisp-scope-local-bindings)))))))
(when-let* ((beg (elisp-scope--sym-pos sym))
(bare (bare-symbol sym)))
(if (keywordp bare) (elisp-scope--report 'constant beg bare)
(unless (eq bare t) ; Do not report t as a variable.
(elisp-scope--variable
bare beg (alist-get bare elisp-scope-local-bindings))))))
(defun elisp-scope--let-1 (local bindings body)
(if bindings
@ -2462,14 +2451,6 @@ ARGS bound to the analyzed arguments."
(setq l (elisp-scope--local-new bare beg l)))))
(let ((elisp-scope-local-bindings l)) (elisp-scope-n body))))
(elisp-scope-define-analyzer let-alist (f alist &rest body)
(elisp-scope-report-s f 'macro)
(elisp-scope-1 alist)
(let ((elisp-scope--current-let-alist-form
(cons (or (elisp-scope--sym-pos f) (cons 'gen (incf elisp-scope--counter)))
(elisp-scope--sym-pos f))))
(elisp-scope-n body)))
(elisp-scope-define-macro-analyzer define-obsolete-face-alias (&optional obs cur when)
(when-let* ((q (elisp-scope--unquote obs))) (elisp-scope-report-s q 'defface))
(when-let* ((q (elisp-scope--unquote cur))) (elisp-scope-report-s q 'face))
@ -2574,7 +2555,6 @@ ARGS bound to the analyzed arguments."
(cl-defmethod elisp-scope--handle-quoted ((_spec (eql 'code)) arg)
(let ((elisp-scope-local-bindings nil)
(elisp-scope--current-let-alist-form nil)
(elisp-scope-local-definitions nil)
(elisp-scope-block-alist nil)
(elisp-scope-label-alist nil)