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

all tests passing for both clj and cljs

Browse source
This commit is contained in:
Nathan Marz 2016-05-23 10:21:43 -04:00
parent b156727f3c
commit 1e0a43c903
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -349,13 +349,19 @@
(do (do
(mapcat (mapcat
(fn [e] (fn [e]
(cond (i/fn-invocation? e) (cond (or (set? e)
(map? e) ; in case inline maps are ever extended
(and (i/fn-invocation? e) (= 'fn* (first e))))
[e]
(i/fn-invocation? e)
(concat (rest e) (ic-possible-params e)) (concat (rest e) (ic-possible-params e))
(vector? e) (vector? e)
(ic-possible-params e) (ic-possible-params e)
)) ))
path))) path
)))
;; still possible to mess this up with alter-var-root ;; still possible to mess this up with alter-var-root
(defmacro path [& path] ; "inline cache" (defmacro path [& path] ; "inline cache"
@ -366,8 +372,9 @@
(-> &env keys set) ;clj (-> &env keys set) ;clj
) )
used-locals (vec (i/walk-select local-syms vector path)) used-locals (vec (i/walk-select local-syms vector path))
prepared-path (ic-prepare-path local-syms (walk/macroexpand-all (vec path))) expanded (walk/macroexpand-all (vec path))
possible-params (vec (ic-possible-params path)) prepared-path (ic-prepare-path local-syms expanded)
possible-params (vec (ic-possible-params expanded))
;; TODO: unclear if using long here versus string makes ;; TODO: unclear if using long here versus string makes
;; a significant difference ;; a significant difference