balkian/clojure-koans
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow r-infix to work with more than 2 operands.

Browse Source
This commit is contained in:
Colin Jones 2011-02-08 07:46:48 -06:00
parent 3e4d2caebf
commit b7d3022b77
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/koans/macros.clj
View File

@ -10,14 +10,17 @@
__ )) __ ))
(defmacro r-infix [form] (defmacro r-infix [form]
(list (second form) (cond (not (seq? form))
(if (instance? clojure.lang.PersistentList (first form)) form
`(r-infix ~(first form)) (= 1 (count form))
(first form)) `(r-infix ~(first form))
(if (instance? clojure.lang.PersistentList (nth form 2)) :else
`(r-infix ~(nth form 2)) (let [operator (second form)
(nth form 2)) first-arg (first form)
)) others (drop 2 form)]
`(~operator
(r-infix ~first-arg)
(r-infix ~others)))))
(meditations (meditations
@ -37,5 +40,5 @@
(= __ (macroexpand '(infix-better ( 10 + (2 * 3))))) (= __ (macroexpand '(infix-better ( 10 + (2 * 3)))))
"Really, you dont understand recursion until you understand recursion" "Really, you dont understand recursion until you understand recursion"
(= __ (r-infix (10 + (2 * 3))))) (= __ (r-infix (10 + (2 * 3) + (4 * 5)))))

2
src/path_to_answer_sheet.clj
View File

@ -141,7 +141,7 @@
''(+ 9 1) ''(+ 9 1)
''(* 10 2) ''(* 10 2)
''(+ 10 (2 * 3)) ''(+ 10 (2 * 3))
16]} 36]}
}) })
(defn replace-with [s k replacements] (defn replace-with [s k replacements]