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

Merge pull request #1345 from Kodiologist/cond-in-core-macro-def

Browse Source 
Don't use `cond` in the definition of a core macro
This commit is contained in:
Tuukka Turto 2017-08-02 18:45:17 +03:00 committed by GitHub
commit 3dcf91ab39
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
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)] (setv alist (cut args 0 None 2))
[True `(for* [(, ~@alist) (genexpr (, ~@alist) [~@args])] (do ~@body) ~@belse))))
(setv alist (cut args 0 None 2))
`(for* [(, ~@alist) (genexpr (, ~@alist) [~@args])] (do ~@body) ~@belse)]))
(defmacro -> [head &rest rest] (defmacro -> [head &rest rest]