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

more fixes

Browse source
This commit is contained in:
Nathan Marz 2016-08-04 16:03:59 -04:00
parent 423da1e03f
commit 53682de1eb
3 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/clj/com/rpl/specter.cljx
View file

@ -619,8 +619,8 @@
([cond-p then-path] ([cond-p then-path]
(if-path cond-p then-path STOP)) (if-path cond-p then-path STOP))
([cond-p then-path else-path] ([cond-p then-path else-path]
(let [then-comp (i/comp-paths* then-path) (let [then-comp (i/comp-paths-internalized then-path)
else-comp (i/comp-paths* else-path) else-comp (i/comp-paths-internalized else-path)
then-needed (i/num-needed-params then-comp) then-needed (i/num-needed-params then-comp)
else-needed (i/num-needed-params else-comp) else-needed (i/num-needed-params else-comp)
then-nav (i/extract-rich-nav then-comp) then-nav (i/extract-rich-nav then-comp)
@ -651,7 +651,7 @@
then-needed then-needed
else-nav else-nav
)))) ))))
(let [cond-comp (i/comp-paths* cond-p) (let [cond-comp (i/comp-paths-internalized cond-p)
cond-needed (i/num-needed-params cond-comp)] cond-needed (i/num-needed-params cond-comp)]
(richnav (+ then-needed else-needed cond-needed) (richnav (+ then-needed else-needed cond-needed)
(select* [this params params-idx vals structure next-fn] (select* [this params params-idx vals structure next-fn]
@ -706,8 +706,8 @@
([] STAY) ([] STAY)
([path] (i/comp-paths* path)) ([path] (i/comp-paths* path))
([path1 path2] ([path1 path2]
(let [comp1 (i/comp-paths* path1) (let [comp1 (i/comp-paths-internalized path1)
comp2 (i/comp-paths* path2) comp2 (i/comp-paths-internalized path2)
comp1-needed (i/num-needed-params comp1) comp1-needed (i/num-needed-params comp1)
nav1 (i/extract-rich-nav comp1) nav1 (i/extract-rich-nav comp1)
nav2 (i/extract-rich-nav comp2) nav2 (i/extract-rich-nav comp2)

3
src/clj/com/rpl/specter/impl.cljx
View file

@ -389,6 +389,9 @@
(next-fn params2 params-idx2 vals-next structure-next) (next-fn params2 params-idx2 vals-next structure-next)
))))))))) )))))))))
(defn comp-paths-internalized [path]
(capture-params-internally (comp-paths* path)))
(extend-protocol PathComposer (extend-protocol PathComposer
nil nil
(do-comp-paths [o] (do-comp-paths [o]

27
src/clj/com/rpl/specter/macros.clj
View file

@ -67,16 +67,19 @@
(+ ~PARAMS-IDX-SYM ~num-params) (+ ~PARAMS-IDX-SYM ~num-params)
(conj vals# c#) (conj vals# c#)
~structure-sym) ~structure-sym)
))] ))
(i/->ParamsNeededPath nav# (reify RichNavigator
(reify RichNavigator (~'rich-select* [this# ~PARAMS-SYM ~PARAMS-IDX-SYM vals# ~structure-sym next-fn#]
(~'rich-select* [this# ~PARAMS-SYM ~PARAMS-IDX-SYM vals# ~structure-sym next-fn#] (collector# ~PARAMS-SYM ~PARAMS-IDX-SYM vals# ~structure-sym next-fn#))
(collector# ~PARAMS-SYM ~PARAMS-IDX-SYM vals# ~structure-sym next-fn#)) (~'rich-transform* [this# ~PARAMS-SYM ~PARAMS-IDX-SYM vals# ~structure-sym next-fn#]
(~'rich-transform* [this# ~PARAMS-SYM ~PARAMS-IDX-SYM vals# ~structure-sym next-fn#] (collector# ~PARAMS-SYM ~PARAMS-IDX-SYM vals# ~structure-sym next-fn#))
(collector# ~PARAMS-SYM ~PARAMS-IDX-SYM vals# ~structure-sym next-fn#)) )]
) (if (= ~num-params 0)
~num-params (i/no-params-rich-compiled-path nav#)
))) (i/->ParamsNeededPath
nav#
~num-params
))))
(defn ^:no-doc pathed-nav* [builder paths-seq latefns-sym pre-bindings post-bindings impls] (defn ^:no-doc pathed-nav* [builder paths-seq latefns-sym pre-bindings post-bindings impls]
(let [num-params-sym (gensym "num-params")] (let [num-params-sym (gensym "num-params")]
@ -102,7 +105,9 @@
ret# ~(builder post-bindings num-params-sym impls) ret# ~(builder post-bindings num-params-sym impls)
] ]
(if (not any-params-needed?#) (if (not any-params-needed?#)
(i/bind-params* ret# nil 0) (if (i/params-needed-path? ret#)
(i/bind-params* ret# nil 0)
ret#)
ret# ret#
)))) ))))