mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-12 09:28:24 +00:00
Code Issues Releases Activity

Normalise nested progn forms in byte-code optimiser

Browse Source 
* lisp/emacs-lisp/byte-opt.el (byte-optimize-body): Flatten body.
This simplifies the source tree and reduces the number of different
cases that other optimisations need to take into account.
This commit is contained in:
Mattias Engdegård 2021-09-06 14:41:26 +02:00
parent bba48d6ee5
commit c4724add00
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/emacs-lisp/byte-opt.el
View File

@ -727,8 +727,12 @@ Same format as `byte-optimize--lexvars', with shared structure and contents.")
(while rest (while rest
(setq fe (or all-for-effect (cdr rest))) (setq fe (or all-for-effect (cdr rest)))
(setq new (and (car rest) (byte-optimize-form (car rest) fe))) (setq new (and (car rest) (byte-optimize-form (car rest) fe)))
(if (or new (not fe)) (when (and (consp new) (eq (car new) 'progn))
(setq result (cons new result))) ;; Flatten `progn' form into the body.
(setq result (append (reverse (cdr new)) result))
(setq new (pop result)))
(when (or new (not fe))
(setq result (cons new result)))
(setq rest (cdr rest))) (setq rest (cdr rest)))
(nreverse result))) (nreverse result)))