mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-12-13 20:18:06 +00:00
Code Issues 1 Releases Wiki Activity

fix try macro hygiene

Browse Source 
Allow re-using the same symbol for the fiber and error. This allows you to
write code like (try (print "hi") ([_ _] (print "oh no"))), fixing a regression
introduced in #1605.
This commit is contained in:
Ian Henry
2025-10-24 21:25:44 -07:00
parent 98265f0637
commit f1ec0cc48b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/boot/boot.janet
View File

@@ -348,12 +348,15 @@
[body catch] [body catch]
(assert (and (not (empty? catch)) (indexed? (catch 0))) "the first element of `catch` must be a tuple or array") (assert (and (not (empty? catch)) (indexed? (catch 0))) "the first element of `catch` must be a tuple or array")
(let [[err fib] (catch 0) (let [[err fib] (catch 0)
r (or err (gensym)) r (gensym)
f (or fib (gensym))] f (gensym)]
~(let [,f (,fiber/new (fn :try [] ,body) :ie) ~(let [,f (,fiber/new (fn :try [] ,body) :ie)
,r (,resume ,f)] ,r (,resume ,f)]
(if (,= (,fiber/status ,f) :error) (if (,= (,fiber/status ,f) :error)
(do ,;(tuple/slice catch 1)) (do
,(if err ~(def ,err ,r))
,(if fib ~(def ,fib ,f))
,;(tuple/slice catch 1))
,r)))) ,r))))
(defmacro with-syms (defmacro with-syms