diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-04-26 22:58:08 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-04-26 23:01:39 +0200 |
| commit | edf42af2cccab9d2ea2730f721fec5d41b4700f8 (patch) | |
| tree | 8eec5a86f62f36b8f6c790db41c8487d692bfd60 /lisp/emacs-lisp | |
| parent | 4396ef5a386969580bf4685fc2e6b1e3afec0bd7 (diff) | |
| download | emacs-edf42af2cccab9d2ea2730f721fec5d41b4700f8.tar.gz emacs-edf42af2cccab9d2ea2730f721fec5d41b4700f8.tar.bz2 emacs-edf42af2cccab9d2ea2730f721fec5d41b4700f8.zip | |
Rework where `comp-ctxt' is defined.
* test/lisp/emacs-lisp/comp-cstr-tests.el (comp-ctxt): Remove
`comp-ctxt' definition.
* lisp/emacs-lisp/comp.el (comp-ctxt): Likewise.
* lisp/emacs-lisp/comp-cstr.el (comp-ctxt): Define it here.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/comp-cstr.el | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/comp.el | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el index d22d19ce1ec..b87cbf7e83c 100644 --- a/lisp/emacs-lisp/comp-cstr.el +++ b/lisp/emacs-lisp/comp-cstr.el @@ -175,6 +175,10 @@ Return them as multiple value." collect cstr into positives finally return (cl-values positives negatives))) +;; So we can load comp-cstr.el and comp.el in non native compiled +;; builds. +(defvar comp-ctxt) + (defvar comp-cstr-one (comp-value-to-cstr 1) "Represent the integer immediate one.") diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index c2c9987d9e3..1fb07c66adf 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -552,8 +552,6 @@ Useful to hook into pass checkers.") (signal (function (symbol t) nil))) "Alist used for type propagation.") -(defvar comp-ctxt) ; To make comp.el loadable in non native comp builds. - (defconst comp-known-func-cstr-h (cl-loop with comp-ctxt = (make-comp-cstr-ctxt) |