luciano/specter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

for ALL on maps, interpret transformed key value pair of < size 2 as removal

Browse source
This commit is contained in:
nathanmarz 2017-05-31 21:00:23 -04:00
parent 1411ac495e
commit 5d185ec9f4
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/clj/com/rpl/specter/navs.cljc
View file

@ -39,11 +39,14 @@
(defprotocol AllTransformProtocol (defprotocol AllTransformProtocol
(all-transform [structure next-fn])) (all-transform [structure next-fn]))
(defn void-transformed-kv-pair? [newkv]
(or (identical? newkv i/NONE) (< (count newkv) 2)))
(defn- non-transient-map-all-transform [structure next-fn empty-map] (defn- non-transient-map-all-transform [structure next-fn empty-map]
(reduce-kv (reduce-kv
(fn [m k v] (fn [m k v]
(let [newkv (next-fn [k v])] (let [newkv (next-fn [k v])]
(if (identical? newkv i/NONE) (if (void-transformed-kv-pair? newkv)
m m
(assoc m (nth newkv 0) (nth newkv 1))))) (assoc m (nth newkv 0) (nth newkv 1)))))
@ -100,7 +103,7 @@
(let [k (.next k-it) (let [k (.next k-it)
v (.next v-it) v (.next v-it)
newkv (next-fn [k v])] newkv (next-fn [k v])]
(if (identical? newkv i/NONE) (if (void-transformed-kv-pair? newkv)
(do (do
(i/update-cell! none-cell inc) (i/update-cell! none-cell inc)
(recur (+ i 2) j)) (recur (+ i 2) j))
@ -133,7 +136,7 @@
(reduce-kv (reduce-kv
(fn [m k v] (fn [m k v]
(let [newkv (next-fn [k v])] (let [newkv (next-fn [k v])]
(if (identical? newkv i/NONE) (if (void-transformed-kv-pair? newkv)
m m
(assoc! m (nth newkv 0) (nth newkv 1))))) (assoc! m (nth newkv 0) (nth newkv 1)))))
@ -156,7 +159,7 @@
(reduce-kv (reduce-kv
(fn [m k v] (fn [m k v]
(let [newkv (next-fn [k v])] (let [newkv (next-fn [k v])]
(if (identical? newkv i/NONE) (if (void-transformed-kv-pair? newkv)
m m
(assoc m (nth newkv 0) (nth newkv 1))))) (assoc m (nth newkv 0) (nth newkv 1)))))
@ -175,8 +178,21 @@
#?(:cljs #?(:cljs
(all-transform [structure next-fn] (all-transform [structure next-fn]
(let [empty-structure (empty structure)] (let [empty-structure (empty structure)]
(if (and (list? empty-structure) (not (queue? empty-structure))) (cond
(and (list? empty-structure) (not (queue? empty-structure)))
(all-transform-list structure next-fn) (all-transform-list structure next-fn)
(map? structure)
(reduce-kv
(fn [m k v]
(let [newkv (next-fn [k v])]
(if (void-transformed-kv-pair? newkv)
m
(assoc m (nth newkv 0) (nth newkv 1)))))
empty-structure
structure)
:else
(into empty-structure (into empty-structure
(comp (map next-fn) (filter not-NONE?)) (comp (map next-fn) (filter not-NONE?))
structure)))))) structure))))))