From 7a2868c1477c5430002547573cdc1fed756f1051 Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Sat, 17 Feb 2024 13:34:23 -0600 Subject: [PATCH] Fix macex1 to keep syntax location for all tuples - Address #1404 --- src/boot/boot.janet | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/boot/boot.janet b/src/boot/boot.janet index 26699ca8..9b4af135 100644 --- a/src/boot/boot.janet +++ b/src/boot/boot.janet @@ -2136,15 +2136,15 @@ (def m (do (def r (get entry :ref)) (if r (in r 0) (get entry :value)))) (def m? (in entry :macro)) (cond - s (s t) + s (keep-syntax t (s t)) m? (do (setdyn *macro-form* t) (m ;(tuple/slice t 1))) - (tuple/slice (map recur t)))) + (keep-syntax! t (map recur t)))) (def ret (case (type x) :tuple (if (= (tuple/type x) :brackets) - (tuple/brackets ;(map recur x)) - (dotup x)) + (tuple/brackets ;(map recur x)) + (dotup x)) :array (map recur x) :struct (table/to-struct (dotable x recur)) :table (dotable x recur)