mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-11 05:51:21 -08:00
Code Issues Projects Releases Wiki Activity

Correctly fix the problem of unreferenced symbols after compilation

Browse source 
Fixes https://github.com/jwiegley/use-package/issues/571
This commit is contained in:
John Wiegley 2017-12-06 20:59:10 -08:00
parent 20694696b2
commit 7803571280
2 changed files with 71 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lisp/use-package/use-package-core.el
View file

@ -671,14 +671,14 @@ If ALLOW-EMPTY is non-nil, it's OK for ARGS to be an empty list."
(defun use-package-memoize (f arg)
"Ensure the macro-expansion of F applied to ARG evaluates ARG
no more than once."
(let ((loaded (cl-gensym "use-package--loaded"))
(result (cl-gensym "use-package--result"))
(next (cl-gensym "use-package--next")))
`((lexical-let (,loaded ,result)
,@(funcall f `((if ,loaded
,result
(setq ,loaded t)
(setq ,result ,arg))))))))
(let ((loaded (cl-gentemp "use-package--loaded"))
(result (cl-gentemp "use-package--result"))
(next (cl-gentemp "use-package--next")))
`((defvar ,loaded nil)
(defvar ,result nil)
(defvar ,next #'(lambda () (if ,loaded ,result
(setq ,loaded t ,result ,arg))))
,@(funcall f `((funcall ,next))))))
(defsubst use-package-normalize-value (label arg)
"Normalize the Lisp value given by ARG.

119
test/lisp/use-package/use-package-tests.el
View file

@ -1190,107 +1190,114 @@
(ert-deftest use-package-test/:after-5 ()
(match-expansion
(use-package foo :after (:any bar quux))
`(lexical-let (,_ ,_)
`(progn
(defvar ,_ nil)
(defvar ,_ nil)
(defvar ,_
#'(lambda nil
(if ,_ ,_
(setq ,_ t ,_
(require 'foo nil nil)))))
(eval-after-load 'bar
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil))))
'(funcall ,_))
(eval-after-load 'quux
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil)))))))
'(funcall ,_)))))
(ert-deftest use-package-test/:after-6 ()
(match-expansion
(use-package foo :after (:all (:any bar quux) bow))
`(lexical-let (,_ ,_)
`(progn
(defvar ,_ nil)
(defvar ,_ nil)
(defvar ,_
#'(lambda nil
(if ,_ ,_
(setq ,_ t ,_
(require 'foo nil nil)))))
(eval-after-load 'bow
'(progn
(eval-after-load 'bar
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil))))
'(funcall ,_))
(eval-after-load 'quux
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil)))))))
))
'(funcall ,_)))))))
(ert-deftest use-package-test/:after-7 ()
(match-expansion
(use-package foo :after (:any (:all bar quux) bow))
`(lexical-let (,_ ,_)
`(progn
(defvar ,_ nil)
(defvar ,_ nil)
(defvar ,_
#'(lambda nil
(if ,_ ,_
(setq ,_ t ,_
(require 'foo nil nil)))))
(eval-after-load 'quux
'(eval-after-load 'bar
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil)))))
'(funcall ,_)))
(eval-after-load 'bow
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil)))))
))
'(funcall ,_)))))
(ert-deftest use-package-test/:after-8 ()
(match-expansion
(use-package foo :after (:all (:any bar quux) (:any bow baz)))
`(lexical-let (,_ ,_)
`(progn
(defvar ,_ nil)
(defvar ,_ nil)
(defvar ,_
#'(lambda nil
(if ,_ ,_
(setq ,_ t ,_
(require 'foo nil nil)))))
(eval-after-load 'bow
'(progn
(eval-after-load 'bar
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil))))
'(funcall ,_))
(eval-after-load 'quux
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil))))))
'(funcall ,_))))
(eval-after-load 'baz
'(progn
(eval-after-load 'bar
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil))))
'(funcall ,_))
(eval-after-load 'quux
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil)))))))
))
'(funcall ,_)))))))
(ert-deftest use-package-test/:after-9 ()
(match-expansion
(use-package foo :after (:any (:all bar quux) (:all bow baz)))
`(lexical-let (,_ ,_)
`(progn
(defvar ,_ nil)
(defvar ,_ nil)
(defvar ,_
#'(lambda nil
(if ,_ ,_
(setq ,_ t ,_
(require 'foo nil nil)))))
(eval-after-load 'quux
'(eval-after-load 'bar
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil)))))
'(funcall ,_)))
(eval-after-load 'baz
'(eval-after-load 'bow
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil))))))
))
'(funcall ,_))))))
(ert-deftest use-package-test/:after-10 ()
(match-expansion
(use-package foo :after (:any (:all bar quux) (:any bow baz)))
`(lexical-let (,_ ,_)
`(progn
(defvar ,_ nil)
(defvar ,_ nil)
(defvar ,_
#'(lambda nil
(if ,_ ,_
(setq ,_ t ,_
(require 'foo nil nil)))))
(eval-after-load 'quux
'(eval-after-load 'bar
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil)))))
'(funcall ,_)))
(eval-after-load 'bow
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil))))
'(funcall ,_))
(eval-after-load 'baz
'(if ,_ ,_
(setq ,_ t)
(setq ,_ (require 'foo nil nil)))))
))
'(funcall ,_)))))
(ert-deftest use-package-test/:demand-1 ()
(match-expansion