Yaltik/hy
2
0
Fork 0
Code Pull Requests Releases Activity

Make (require [foo [*]]) pull in macros required by foo

Browse Source
This commit is contained in:
Kodi Arfer 2019-01-16 08:02:01 -05:00
parent a5ed98f5b9
commit 983ea2dda2
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hy/macros.py
View File

@ -190,14 +190,9 @@ def require(source_module, target_module, assignments, prefix=""):
prefix += "." prefix += "."
if assignments == "ALL": if assignments == "ALL":
# Only add macros/tags created in/by the source module. name_assigns = [(k, k) for k in
name_assigns = [(n, n) for n, f in source_macros.items() tuple(source_macros.keys()) + tuple(source_tags.keys())]
if inspect.getmodule(f) == source_module]
name_assigns += [(n, n) for n, f in source_tags.items()
if inspect.getmodule(f) == source_module]
else: else:
# If one specifically requests a macro/tag not created in the source
# module, I guess we allow it?
name_assigns = assignments name_assigns = assignments
for name, alias in name_assigns: for name, alias in name_assigns:

12
tests/native_tests/native_macros.hy
View File

@ -378,10 +378,6 @@ in expansions."
(require [tests.resources.macro-with-require [*]]) (require [tests.resources.macro-with-require [*]])
;; Make sure our local version wasn't overwritten by a faulty `require` of the
;; one in tests.resources.macro-with-require.
(assert (= nonlocal-test-macro (get __macros__ "nonlocal_test_macro")))
(setv module-name-var "tests.native_tests.native_macros.test-macro-namespace-resolution") (setv module-name-var "tests.native_tests.native_macros.test-macro-namespace-resolution")
(assert (= (+ "This macro was created in tests.resources.macros, " (assert (= (+ "This macro was created in tests.resources.macros, "
"expanded in tests.native_tests.native_macros.test-macro-namespace-resolution " "expanded in tests.native_tests.native_macros.test-macro-namespace-resolution "
@ -479,3 +475,11 @@ in expansions."
;; ensure that an imported module used the cached bytecode. We'll simply have ;; ensure that an imported module used the cached bytecode. We'll simply have
;; to trust that the .pyc loading convention was followed. ;; to trust that the .pyc loading convention was followed.
(test-requires-and-macros)) (test-requires-and-macros))
(defn test-recursive-require-star []
"(require [foo [*]]) should pull in macros required by `foo`."
(require [tests.resources.macro-with-require [*]])
(test-macro)
(assert (= blah 1)))