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

protocol path extensions now verify if correct number of parameters and error otherwise

Browse source
This commit is contained in:
Nathan Marz 2016-01-11 14:45:06 -05:00
parent 06f0d6b656
commit e37c605697
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -591,13 +591,19 @@
(let [^com.rpl.specter.impl.TransformFunctions tfns (.-transform-fns path)] (let [^com.rpl.specter.impl.TransformFunctions tfns (.-transform-fns path)]
(.-transformer tfns))) (.-transformer tfns)))
#+clj #+clj
(defn extend-protocolpath* [protpath-prot extensions] (defn extend-protocolpath* [protpath protpath-prot extensions]
(let [extensions (partition 2 extensions) (let [extensions (partition 2 extensions)
m (-> protpath-prot :sigs keys first)] m (-> protpath-prot :sigs keys first)
expected-params (num-needed-params protpath)]
(doseq [[atype apath] extensions] (doseq [[atype apath] extensions]
;;TODO: validate that the path has the correct number of args (or none at all)
(let [p (comp-paths* apath) (let [p (comp-paths* apath)
rp (assoc p :transform-fns (coerce-tfns-rich (:transform-fns p)))] rp (assoc p :transform-fns (coerce-tfns-rich (:transform-fns p)))
needed-params (num-needed-params rp)]
(if-not (= needed-params expected-params)
(throw-illegal "Invalid number of params in extended protocol path, expected "
expected-params " but got " needed-params))
(extend atype protpath-prot {m (fn [_] rp)}) (extend atype protpath-prot {m (fn [_] rp)})
)))) ))))

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

@ -248,4 +248,4 @@
))))) )))))
(defmacro extend-protocolpath [protpath & extensions] (defmacro extend-protocolpath [protpath & extensions]
`(extend-protocolpath* ~(protpath-sym protpath) ~(vec extensions))) `(extend-protocolpath* ~protpath ~(protpath-sym protpath) ~(vec extensions)))