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

Avoid using a core function name as a variable

Browse Source
This commit is contained in:
Kodi Arfer 2018-04-06 09:26:01 -07:00
parent 80bece497a
commit 1f95da2b0b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hy/core/language.hy
View File

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