mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-11 01:11:31 -07:00
Code Issues Projects Releases Wiki Activity

Simplify some overly defensive compiler macros

Browse source 
* lisp/emacs-lisp/bytecomp.el (bytecomp--check-eq-args)
(bytecomp--check-memq-args, bytecomp--char-before)
(bytecomp--backward-char, bytecomp--backward-word):
Don't bother with malformed calls; macroexp--compiler-macro won't call
the handler unless the arity matches.
This commit is contained in:
Mattias Engdegård 2026-02-28 18:48:27 +01:00
parent e96bb822e3
commit 423a8b7fd8
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lisp/emacs-lisp/bytecomp.el
View file

@ -5912,7 +5912,7 @@ and corresponding effects."
(car form) type parenthesis)
form (list 'suspicious (car form)) t))
(defun bytecomp--check-eq-args (form &optional a b &rest _ignore)
(defun bytecomp--check-eq-args (form a b)
(let* ((number-ok (eq (car form) 'eql))
(bad-arg (cond ((bytecomp--dodgy-eq-arg-p a number-ok) 1)
((bytecomp--dodgy-eq-arg-p b number-ok) 2))))
@ -5926,7 +5926,7 @@ and corresponding effects."
(put 'eq 'compiler-macro #'bytecomp--check-eq-args)
(put 'eql 'compiler-macro #'bytecomp--check-eq-args)
(defun bytecomp--check-memq-args (form &optional elem list &rest _ignore)
(defun bytecomp--check-memq-args (form elem list)
(let* ((fn (car form))
(number-ok (eq fn 'memql)))
(cond
@ -5964,22 +5964,16 @@ and corresponding effects."
;; their own byte-ops.
(put 'char-before 'compiler-macro #'bytecomp--char-before)
(defun bytecomp--char-before (form &optional arg &rest junk-args)
(if junk-args
form ; arity error
`(char-after (1- (or ,arg (point))))))
(defun bytecomp--char-before (_form &optional arg)
`(char-after (1- (or ,arg (point)))))
(put 'backward-char 'compiler-macro #'bytecomp--backward-char)
(defun bytecomp--backward-char (form &optional arg &rest junk-args)
(if junk-args
form ; arity error
`(forward-char (- (or ,arg 1)))))
(defun bytecomp--backward-char (_form &optional arg)
`(forward-char (- (or ,arg 1))))
(put 'backward-word 'compiler-macro #'bytecomp--backward-word)
(defun bytecomp--backward-word (form &optional arg &rest junk-args)
(if junk-args
form ; arity error
`(forward-word (- (or ,arg 1)))))
(defun bytecomp--backward-word (_form &optional arg)
`(forward-word (- (or ,arg 1))))
(defun bytecomp--check-keyword-args (form arglist allowed-keys required-keys)
(let ((fun (car form)))