Avoid using a core function name as a variable

This commit is contained in:
Kodi Arfer 2018-04-06 09:26:01 -07:00
parent 80bece497a
commit 1f95da2b0b

View File

@ -297,16 +297,12 @@ Return series of accumulated sums (or other binary function results)."
(defn macroexpand [form]
"Return the full macro expansion of `form`."
(import hy.macros)
(setv name (calling-module-name))
(hy.macros.macroexpand form (HyASTCompiler name)))
(hy.macros.macroexpand form (HyASTCompiler (calling-module-name))))
(defn macroexpand-1 [form]
"Return the single step macro expansion of `form`."
(import hy.macros)
(setv name (calling-module-name))
(hy.macros.macroexpand-1 form (HyASTCompiler name)))
(hy.macros.macroexpand-1 form (HyASTCompiler (calling-module-name))))
(defn merge-with [f &rest maps]
"Return the map of `maps` joined onto the first via the function `f`.