Also expand vector values that are functions

This commit is contained in:
Michael S. Klishin 2012-03-06 12:02:26 +04:00
parent 64981ac913
commit a2eb9ce964
2 changed files with 3 additions and 1 deletions

View file

@ -47,7 +47,7 @@
(expand-all [m] (apply-to-values m expand-all)) (expand-all [m] (apply-to-values m expand-all))
clojure.lang.PersistentVector clojure.lang.PersistentVector
(expand-all [v] v) (expand-all [v] (map expand-all v))
clojure.lang.APersistentMap clojure.lang.APersistentMap
(expand-all [m] (apply-to-values m expand-all)) (expand-all [m] (apply-to-values m expand-all))

View file

@ -14,6 +14,7 @@
:d (Double/valueOf 11.1) :d (Double/valueOf 11.1)
:f (Float/valueOf 2.5) :f (Float/valueOf 2.5)
:v [1 2 3] :v [1 2 3]
:dyn-v [(fn [] 10) (fn [] 20) (fn [] 30)]
:dyn-i (fn [] 1) :dyn-i (fn [] 1)
:dyn-s (fn [] "Clojure (expanded)") :dyn-s (fn [] "Clojure (expanded)")
:m { :nested "String" } :m { :nested "String" }
@ -26,6 +27,7 @@
:d (Double/valueOf 11.1) :d (Double/valueOf 11.1)
:f (Float/valueOf 2.5) :f (Float/valueOf 2.5)
:v [1 2 3] :v [1 2 3]
:dyn-v [10 20 30]
:dyn-i 1 :dyn-i 1
:dyn-s "Clojure (expanded)" :dyn-s "Clojure (expanded)"
:m { :nested "String" } :m { :nested "String" }