Fix macex1 to keep syntax location for all tuples - Address #1404

janet-lang · Feb 17, 2024 · 7a2868c · 7a2868c
1 parent 9e0daae
commit 7a2868c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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)