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

Don't use cond in the definition of a core macro

Browse Source 
`cond` itself is a core macro.
This commit is contained in:
Kodi Arfer 2017-07-28 16:58:45 -07:00
parent d9a5acbcc9
commit 2d20a52379
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hy/core/macros.hy
View File

@ -86,16 +86,14 @@
(setv belse (if (and (isinstance lst HyExpression) (= (get lst 0) "else")) (setv belse (if (and (isinstance lst HyExpression) (= (get lst 0) "else"))
[(body.pop)] [(body.pop)]
[])) []))
(cond (if
[(odd? (len args)) (odd? (len args)) (macro-error args "`for' requires an even number of args.")
(macro-error args "`for' requires an even number of args.")] (empty? body) (macro-error None "`for' requires a body to evaluate")
[(empty? body) (empty? args) `(do ~@body ~@belse)
(macro-error None "`for' requires a body to evaluate")] (= (len args) 2) `(for* [~@args] (do ~@body) ~@belse)
[(empty? args) `(do ~@body ~@belse)] (do
[(= (len args) 2) `(for* [~@args] (do ~@body) ~@belse)]
[True
(setv alist (cut args 0 None 2)) (setv alist (cut args 0 None 2))
`(for* [(, ~@alist) (genexpr (, ~@alist) [~@args])] (do ~@body) ~@belse)])) `(for* [(, ~@alist) (genexpr (, ~@alist) [~@args])] (do ~@body) ~@belse))))
(defmacro -> [head &rest rest] (defmacro -> [head &rest rest]