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

some fixes

Browse source
This commit is contained in:
Nathan Marz 2016-09-01 21:07:01 -04:00
parent c80bf573a5
commit e33ecb2c33
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/clj/com/rpl/specter/impl.cljc
View file

@ -193,7 +193,15 @@
(coerce-path o)) (coerce-path o))
#?(:clj java.util.List :cljs cljs.core/PersistentVector) #?(:clj java.util.List :cljs cljs.core/PersistentVector)
(do-comp-paths [navigators] (do-comp-paths [navigators]
(reduce combine-two-navs (map coerce-path navigators)))) (let [coerced (map coerce-path navigators)]
(cond (empty? coerced)
(coerce-path nil)
(= 1 (count coerced))
(first coerced)
:else
(reduce combine-two-navs coerced)))))
;; cell implementation idea taken from prismatic schema library ;; cell implementation idea taken from prismatic schema library
#?(:cljs #?(:cljs
@ -380,7 +388,7 @@
(defn static-path? [path] (defn static-path? [path]
(if (sequential? path) (if (sequential? path)
(every? (complement dynamic-param?) path) (every? static-path? path)
(-> path dynamic-param? not))) (-> path dynamic-param? not)))
(defn late-path [path] (defn late-path [path]
@ -653,7 +661,7 @@
(instance? FnInvocation o) (instance? FnInvocation o)
(let [op (magic-precompilation* (:op o)) (let [op (magic-precompilation* (:op o))
params (map magic-precompilation* (:params o))] params (doall (map magic-precompilation* (:params o)))]
(if (-> op meta :dynamicnav) (if (-> op meta :dynamicnav)
(apply op params) (apply op params)
(->DynamicFunction op params))) (->DynamicFunction op params)))
@ -709,7 +717,7 @@
(if (sequential? path) (if (sequential? path)
(if (empty? path) (if (empty? path)
STAY* STAY*
(let [resolved (vec (map resolve-magic-code path)) (let [resolved (vec (map resolve-magic-code (flatten path)))
combined (continuous-subseqs-transform* combined (continuous-subseqs-transform*
rich-nav? rich-nav?
resolved resolved
@ -738,6 +746,7 @@
(defn magic-precompilation [path ns-str used-locals] (defn magic-precompilation [path ns-str used-locals]
; (println "before magic-precompilation*:" path)
(let [path (magic-precompilation* path) (let [path (magic-precompilation* path)
; _ (println "magic-precompilation*" path) ; _ (println "magic-precompilation*" path)
ns (find-ns (symbol ns-str)) ns (find-ns (symbol ns-str))