luciano/telemere
1
0
Fork 0
mirror of https://github.com/taoensso/telemere.git synced 2025-12-21 19:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[nop] Tweak macro hygiene

Browse source
This commit is contained in:
Peter Taoussanis 2025-02-24 10:30:57 +01:00
parent fc7e748ac8
commit 94f13e44f9
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
main/src/taoensso/telemere.cljc
View file

@ -266,10 +266,11 @@
:arglists (impl/signal-arglists :error!)} :arglists (impl/signal-arglists :error!)}
([opts-or-id error] `(error! ~(assoc (merge-or-assoc-opts base-opts &form &env :id opts-or-id) :error error))) ([opts-or-id error] `(error! ~(assoc (merge-or-assoc-opts base-opts &form &env :id opts-or-id) :error error)))
([opts-or-error] ([opts-or-error]
(let [opts (merge-or-assoc-opts base-opts &form &env :error opts-or-error)] (let [opts (merge-or-assoc-opts base-opts &form &env :error opts-or-error)
`(let [~'__error ~(get opts :error)] gs-error (gensym "error")]
(impl/signal! ~(assoc opts :error '__error)) `(let [~gs-error ~(get opts :error)]
(do ~'__error))))))) (impl/signal! ~(assoc opts :error gs-error))
(do ~gs-error)))))))
(comment (with-signal (throw (error! ::my-id (ex-info "MyEx" {}))))) (comment (with-signal (throw (error! ::my-id (ex-info "MyEx" {})))))
@ -285,12 +286,13 @@
rethrow? (not (contains? opts :catch-val)) rethrow? (not (contains? opts :catch-val))
catch-val (get opts :catch-val) catch-val (get opts :catch-val)
run-form (get opts :run) run-form (get opts :run)
opts (dissoc opts :run :catch-val)] opts (dissoc opts :run :catch-val)
gs-caught (gensym "caught")]
`(enc/try* ~run-form `(enc/try* ~run-form
(catch :all ~'__caught (catch :all ~gs-caught
(impl/signal! ~(assoc opts :error '__caught)) (impl/signal! ~(assoc opts :error gs-caught))
(if ~rethrow? (throw ~'__caught) ~catch-val)))))))) (if ~rethrow? (throw ~gs-caught) ~catch-val))))))))
(comment (with-signal (catch->error! ::my-id (/ 1 0)))) (comment (with-signal (catch->error! ::my-id (/ 1 0))))