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

Fix cl-generic bootstrap problems

Browse source 
* lisp/sqlite-mode.el (require):
* lisp/net/eudc.el (require):
* lisp/arc-mode.el (require): Require subr-x, since these files
are using macros from there.
* lisp/emacs-lisp/subr-x.el (with-memoization): Move from here...
* lisp/subr.el (with-memoization): ... to here, as it's used from
the preloaded cl-generic.el file.

* lisp/emacs-lisp/cl-generic.el (cl--generic-compiler): Don't use
the autoloaded `byte-compile' function during bootstrap.
(cl--generic-get-dispatcher): Don't require subr-x, either.

cl-generic has been preloaded since 2015, and most usages of it (in
preloaded files) work fine.  In particular, using `cl-defgeneric' is
unproblematic.  However, `cl-defmethod' would end up pulling in the
byte compiler (at load time), which would make it impossible to use
`cl-defmethod' in pre-loaded files, and this change fixes that (but
possibly not in the most self-evidently correct way).
This commit is contained in:
Lars Ingebrigtsen 2022-06-24 10:54:01 +02:00
parent 2ff5cb4cb4
commit 49910adf87
8 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/emacs-lisp/cl-generic.el
View file

@ -658,8 +658,10 @@ The set of acceptable TYPEs (also called \"specializers\") is defined
;; compiled. Otherwise the byte-compiler and all the code on
;; which it depends needs to be usable before cl-generic is loaded,
;; which imposes a significant burden on the bootstrap.
(if (consp (lambda (x) (+ x 1)))
(lambda (exp) (eval exp t)) #'byte-compile))
(if (or (consp (lambda (x) (+ x 1)))
(not (featurep 'bytecomp)))
(lambda (exp) (eval exp t))
#'byte-compile))
(defun cl--generic-get-dispatcher (dispatch)
(with-memoization
@ -708,9 +710,6 @@ The set of acceptable TYPEs (also called \"specializers\") is defined
(funcall
cl--generic-compiler
`(lambda (generic dispatches-left methods)
;; FIXME: We should find a way to expand `with-memoize' once
;; and forall so we don't need `subr-x' when we get here.
(eval-when-compile (require 'subr-x))
(let ((method-cache (make-hash-table :test #'eql)))
(lambda (,@fixedargs &rest args)
(let ,bindings