more name refactoring

This commit is contained in:
Nathan Marz 2015-09-10 00:04:57 -04:00
parent d1a5b66c71
commit d693ad29ae

View file

@ -35,9 +35,9 @@
(deftype ExecutorFunctions [type select-executor transform-executor]) (deftype ExecutorFunctions [type select-executor transform-executor])
(def StructureValsPathExecutor (def RichPathExecutor
(->ExecutorFunctions (->ExecutorFunctions
:svalspath :richpath
(fn [selector structure] (fn [selector structure]
(selector [] structure (selector [] structure
(fn [vals structure] (fn [vals structure]
@ -122,7 +122,7 @@
afn (fn [vals structure next-fn] afn (fn [vals structure next-fn]
(next-fn (conj vals (cfn this structure)) structure) (next-fn (conj vals (cfn this structure)) structure)
)] )]
(->TransformFunctions StructureValsPathExecutor afn afn))) (->TransformFunctions RichPathExecutor afn afn)))
(defn coerce-structure-path [this] (defn coerce-structure-path [this]
@ -142,7 +142,7 @@
selector (:select* pimpl) selector (:select* pimpl)
transformer (:transform* pimpl)] transformer (:transform* pimpl)]
(->TransformFunctions (->TransformFunctions
StructureValsPathExecutor RichPathExecutor
(fn [vals structure next-fn] (fn [vals structure next-fn]
(selector this structure (fn [structure] (next-fn vals structure)))) (selector this structure (fn [structure] (next-fn vals structure))))
(fn [vals structure next-fn] (fn [vals structure next-fn]
@ -199,7 +199,7 @@
t (.-type exs) t (.-type exs)
combiner combiner
(if (= t :svalspath) (if (= t :richpath)
(fn [curr next] (fn [curr next]
(fn [vals structure next-fn] (fn [vals structure next-fn]
(curr vals structure (curr vals structure
@ -220,12 +220,12 @@
all)))) all))))
(defn coerce-structure-vals [^TransformFunctions tfns] (defn coerce-structure-vals [^TransformFunctions tfns]
(if (= (extype tfns) :svalspath) (if (= (extype tfns) :richpath)
tfns tfns
(let [selector (.-selector tfns) (let [selector (.-selector tfns)
transformer (.-transformer tfns)] transformer (.-transformer tfns)]
(->TransformFunctions (->TransformFunctions
StructureValsPathExecutor RichPathExecutor
(fn [vals structure next-fn] (fn [vals structure next-fn]
(selector structure (fn [structure] (next-fn vals structure)))) (selector structure (fn [structure] (next-fn vals structure))))
(fn [vals structure next-fn] (fn [vals structure next-fn]