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

change filterer so it accepts a path that acts like selected?

Browse source
This commit is contained in:
Nathan Marz 2015-06-22 14:37:39 -04:00
parent eb11d3771a
commit 6d028cbe24
2 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/clj/com/rpl/specter.clj
View file

@ -129,7 +129,7 @@
(defn codewalker [afn] (->CodeWalkerStructurePath afn)) (defn codewalker [afn] (->CodeWalkerStructurePath afn))
(defn filterer [afn] (->FilterStructurePath afn)) (defn filterer [& path] (->FilterStructurePath (comp-paths* path)))
(defn keypath [akey] (->KeyPath akey)) (defn keypath [akey] (->KeyPath akey))

41
src/clj/com/rpl/specter/impl.clj
View file

@ -301,6 +301,25 @@
(defn- conj-all! [cell elems] (defn- conj-all! [cell elems]
(set-cell! cell (concat (get-cell cell) elems))) (set-cell! cell (concat (get-cell cell) elems)))
(defn compiled-select*
[^com.rpl.specter.impl.TransformFunctions tfns structure]
(let [^com.rpl.specter.impl.ExecutorFunctions ex (.executors tfns)]
((.select-executor ex) (.selector tfns) structure)
))
(defn compiled-update*
[^com.rpl.specter.impl.TransformFunctions tfns update-fn structure]
(let [^com.rpl.specter.impl.ExecutorFunctions ex (.executors tfns)]
((.update-executor ex) (.updater tfns) update-fn structure)
))
(defn selected?*
[compiled-path structure]
(->> structure
(compiled-select* compiled-path)
empty?
not))
;; returns vector of all results ;; returns vector of all results
(defn- walk-select [pred continue-fn structure] (defn- walk-select [pred continue-fn structure]
(let [ret (mutable-cell []) (let [ret (mutable-cell [])
@ -313,12 +332,12 @@
(get-cell ret) (get-cell ret)
)) ))
(defn- filter+ancestry [afn aseq] (defn- filter+ancestry [path aseq]
(let [aseq (vec aseq)] (let [aseq (vec aseq)]
(reduce (fn [[s m :as orig] i] (reduce (fn [[s m :as orig] i]
(let [e (get aseq i) (let [e (get aseq i)
pos (count s)] pos (count s)]
(if (afn e) (if (selected?* path e)
[(conj s e) (assoc m pos i)] [(conj s e) (assoc m pos i)]
orig orig
))) )))
@ -391,14 +410,14 @@
(codewalk-until (.afn this) next-fn structure))) (codewalk-until (.afn this) next-fn structure)))
(deftype FilterStructurePath [afn]) (deftype FilterStructurePath [path])
(extend-protocol StructurePath (extend-protocol StructurePath
FilterStructurePath FilterStructurePath
(select* [^FilterStructurePath this structure next-fn] (select* [^FilterStructurePath this structure next-fn]
(->> structure (filter (.afn this)) doall next-fn)) (->> structure (filter #(selected?* (.path this) %)) doall next-fn))
(update* [^FilterStructurePath this structure next-fn] (update* [^FilterStructurePath this structure next-fn]
(let [[filtered ancestry] (filter+ancestry (.afn this) structure) (let [[filtered ancestry] (filter+ancestry (.path this) structure)
;; the vec is necessary so that we can get by index later ;; the vec is necessary so that we can get by index later
;; (can't get by index for cons'd lists) ;; (can't get by index for cons'd lists)
next (vec (next-fn filtered))] next (vec (next-fn filtered))]
@ -473,18 +492,6 @@
(next-fn structure) (next-fn structure)
)) ))
(defn compiled-select*
[^com.rpl.specter.impl.TransformFunctions tfns structure]
(let [^com.rpl.specter.impl.ExecutorFunctions ex (.executors tfns)]
((.select-executor ex) (.selector tfns) structure)
))
(defn compiled-update*
[^com.rpl.specter.impl.TransformFunctions tfns update-fn structure]
(let [^com.rpl.specter.impl.ExecutorFunctions ex (.executors tfns)]
((.update-executor ex) (.updater tfns) update-fn structure)
))
(deftype ConditionalPath [cond-pairs]) (deftype ConditionalPath [cond-pairs])
(defn- retrieve-selector [cond-pairs structure] (defn- retrieve-selector [cond-pairs structure]