Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/cljs/clojure/walk.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ the sorting function."}
{:added "1.1"}
[inner outer form]
(cond
(list? form) (outer (apply list (map inner form)))
(list? form) (outer (with-meta (apply list (map inner form)) (meta form)))
(map-entry? form)
(outer (MapEntry. (inner (key form)) (inner (val form)) nil))
(seq? form) (outer (doall (map inner form)))
(seq? form) (outer (with-meta (doall (map inner form)) (meta form)))
(record? form) (outer (reduce (fn [r x] (conj r (inner x))) form form))
(coll? form) (outer (into (empty form) (map inner form)))
:else (outer form)))
Expand Down
13 changes: 12 additions & 1 deletion src/test/cljs/cljs/walk_test.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
;; You must not remove this notice, or any other, from this software.

(ns cljs.walk-test
(:require [cljs.test :refer-macros [deftest testing is]]
(:require [cljs.test :refer-macros [deftest testing is are]]
[clojure.walk :as w]))

(deftest t-prewalk-replace
Expand Down Expand Up @@ -80,3 +80,14 @@
(let [coll [:html {:a ["b" 1]} ""]
f (fn [e] (if (and (vector? e) (not (map-entry? e))) (apply list e) e))]
(is (= (list :html {:a (list "b" 1)} "") (w/postwalk f coll)))))

(defrecord RM [a])
(deftest retain-meta
(let [m {:foo true}]
(are [o] (= m (meta (w/postwalk identity (with-meta o m))))
'(1 2)
[1 2]
#{1 2}
{1 2}
(map inc (range 3))
(->RM 1))))
Loading