Refactor profiling fn macros

This commit is contained in:
Peter Taoussanis 2015-07-04 13:05:10 +07:00
parent a64fb0f1d5
commit b37ace035e
1 changed files with 29 additions and 32 deletions

View File

@ -207,32 +207,40 @@
;;;; ;;;;
(defn fn-sigs "Implementation detail."
[fn-name sigs]
(let [single-arity? (vector? (first sigs))
sigs (if single-arity? (list sigs) sigs)
get-pid (if single-arity?
(fn [fn-name _params] (name fn-name))
(fn [fn-name params] (str (name fn-name) \_ (count params))))
new-sigs
(map
(fn [[params & others]]
(let [has-prepost-map? (and (map? (first others)) (next others))
[?prepost-map & body] (if has-prepost-map? others (cons nil others))]
(if ?prepost-map
`(~params ~?prepost-map (pspy ~(get-pid fn-name params) ~@body))
`(~params (pspy ~(get-pid fn-name params) ~@body)))))
sigs)]
new-sigs))
(defmacro fnp "Like `fn` but wraps fn bodies with `p` macro." (defmacro fnp "Like `fn` but wraps fn bodies with `p` macro."
{:arglists '([name? [params*] prepost-map? body] {:arglists '([name? [params*] prepost-map? body]
[name? ([params*] prepost-map? body)+])} [name? ([params*] prepost-map? body)+])}
[& sigs] [& sigs]
(let [[?fn-name sigs] (let [[?fn-name sigs] (if (symbol? (first sigs))
(if (symbol? (first sigs)) [(first sigs) (next sigs)] ['anonymous-fn sigs]) [(first sigs) (next sigs)]
[nil sigs])
single-arity? (vector? (first sigs)) new-sigs (fn-sigs (or ?fn-name 'anonymous-fn) sigs)]
[sigs get-pid]
(if single-arity?
[(list sigs) (fn [?fn-name _params] (name ?fn-name))]
[sigs (fn [?fn-name params] (str (name ?fn-name) \_ (count params)))])
new-sigs
(map
(fn [[params & others]]
(let [has-prepost-map? (and (map? (first others)) (next others))
[prepost-map & body] (if has-prepost-map? others (cons {} others))]
`(~params ~prepost-map (pspy ~(get-pid ?fn-name params) ~@body))))
sigs)]
(if ?fn-name (if ?fn-name
`(fn ~?fn-name ~@new-sigs) `(fn ~?fn-name ~@new-sigs)
`(fn ~@new-sigs)))) `(fn ~@new-sigs))))
(comment (comment
(fn-sigs "foo" '([x] (* x x)))
(macroexpand '(fnp [x] (* x x)))
(macroexpand '(fn [x] (* x x)))
(macroexpand '(fnp [x] {:pre [x]} (* x x))) (macroexpand '(fnp [x] {:pre [x]} (* x x)))
(macroexpand '(fn [x] {:pre [x]} (* x x)))) (macroexpand '(fn [x] {:pre [x]} (* x x))))
@ -242,24 +250,13 @@
[name doc-string? attr-map? ([params*] prepost-map? body)+ attr-map?])} [name doc-string? attr-map? ([params*] prepost-map? body)+ attr-map?])}
[& sigs] [& sigs]
(let [[fn-name sigs] (enc/name-with-attrs (first sigs) (next sigs)) (let [[fn-name sigs] (enc/name-with-attrs (first sigs) (next sigs))
single-arity? (vector? (first sigs)) new-sigs (fn-sigs fn-name sigs)]
[sigs get-pid]
(if single-arity?
[(list sigs) (fn [fn-name _params] (name fn-name))]
[sigs (fn [fn-name params] (str (name fn-name) \_ (count params)))])
new-sigs
(map
(fn [[params & others]]
(let [has-prepost-map? (and (map? (first others)) (next others))
[prepost-map & body] (if has-prepost-map? others (cons {} others))]
`(~params ~prepost-map (pspy ~(get-pid fn-name params) ~@body))))
sigs)]
`(defn ~fn-name ~@new-sigs))) `(defn ~fn-name ~@new-sigs)))
(comment (comment
(defnp foo "Docstring "[x] "boo" (* x x)) (defnp foo "Docstring "[x] (* x x))
(macroexpand '(defnp foo "Docstring" [x] "boo" (* x x))) (macroexpand '(defnp foo "Docstring" [x] (* x x)))
(macroexpand '(defn foo "Docstring" [x] (* x x)))
(macroexpand '(defnp foo "Docstring" ([x] (* x x)) (macroexpand '(defnp foo "Docstring" ([x] (* x x))
([x y] (* x y)))) ([x y] (* x y))))
(profile :info :defnp-test (foo 5))) (profile :info :defnp-test (foo 5)))