procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Maintain byte-compile-form-stack in cconv-convert (bug#67483)

Browse source 
* lisp/emacs-lisp/macroexp.el (macroexp--with-extended-form-stack):
New.
* lisp/emacs-lisp/cconv.el (cconv-closure-convert, cconv-convert):
Push forms onto byte-compile-form-stack.
This commit is contained in:
Mattias Engdegård 2023-12-20 13:21:36 +01:00
parent 14ecc377ab
commit 57fd0f47f6
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/emacs-lisp/cconv.el
View file

@ -123,7 +123,8 @@ using dynamic scoping.
Returns a form where all lambdas don't have any free variables." Returns a form where all lambdas don't have any free variables."
(let ((cconv--dynbound-variables dynbound-vars) (let ((cconv--dynbound-variables dynbound-vars)
(cconv-freevars-alist '()) (cconv-freevars-alist '())
(cconv-var-classification '())) (cconv-var-classification '())
(byte-compile-form-stack byte-compile-form-stack))
;; Analyze form - fill these variables with new information. ;; Analyze form - fill these variables with new information.
(cconv-analyze-form form '()) (cconv-analyze-form form '())
(setq cconv-freevars-alist (nreverse cconv-freevars-alist)) (setq cconv-freevars-alist (nreverse cconv-freevars-alist))
@ -328,6 +329,7 @@ places where they originally did not directly appear."
;; to find the number of a specific variable in the environment vector, ;; to find the number of a specific variable in the environment vector,
;; so we never touch it(unless we enter to the other closure). ;; so we never touch it(unless we enter to the other closure).
;;(if (listp form) (print (car form)) form) ;;(if (listp form) (print (car form)) form)
(macroexp--with-extended-form-stack form
(pcase form (pcase form
(`(,(and letsym (or 'let* 'let)) ,binders . ,body) (`(,(and letsym (or 'let* 'let)) ,binders . ,body)
@ -624,7 +626,7 @@ places where they originally did not directly appear."
(byte-compile-warn-x form "Malformed function `%S'" func) (byte-compile-warn-x form "Malformed function `%S'" func)
nil)) nil))
(_ (or (cdr (assq form env)) form)))) (_ (or (cdr (assq form env)) form)))))
(defvar byte-compile-lexical-variables) (defvar byte-compile-lexical-variables)

12
lisp/emacs-lisp/macroexp.el
View file

@ -39,6 +39,18 @@ of `byte-compile-form', etc., and manually popped off at its end.
This is to preserve the data in it in the event of a This is to preserve the data in it in the event of a
condition-case handling a signaled error.") condition-case handling a signaled error.")
(defmacro macroexp--with-extended-form-stack (expr &rest body)
"Evaluate BODY with EXPR pushed onto `byte-compile-form-stack'."
(declare (indent 1))
;; FIXME: We really should just be using a simple dynamic let-binding here,
;; but these explicit push and pop make the extended stack value visible
;; to error handlers. Remove that need for that!
`(progn
(push ,expr byte-compile-form-stack)
(prog1
(progn ,@body)
(pop byte-compile-form-stack))))
;; Bound by the top-level `macroexpand-all', and modified to include any ;; Bound by the top-level `macroexpand-all', and modified to include any
;; macros defined by `defmacro'. ;; macros defined by `defmacro'.
(defvar macroexpand-all-environment nil) (defvar macroexpand-all-environment nil)