Better error messages when re-using a name when making a definition.

1 files changed, 11 insertions, 11 deletions

diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
index 26db95ac1..86b814bad 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
@@ -822,14 +822,14 @@
       (synthesis.path/then (normalize bodyS))
 
       (^template [<tag>]
-        (^ (<tag> leftP rightP))
-        (<tag> (recur leftP) (recur rightP)))
+        [(^ (<tag> leftP rightP))
+         (<tag> (recur leftP) (recur rightP))])
       ([#synthesis.Alt]
        [#synthesis.Seq])
 
       (^template [<tag>]
-        (^ (<tag> value))
-        path)
+        [(^ (<tag> value))
+         path])
       ([#synthesis.Pop]
        [#synthesis.Bind]
        [#synthesis.Access])
@@ -838,11 +838,11 @@
       (#synthesis.Bit-Fork when (recur then) (maybe@map recur else))
 
       (^template [<tag>]
-        (<tag> [[test then] elses])
-        (<tag> [[test (recur then)]
-                (list@map (function (_ [else-test else-then])
-                            [else-test (recur else-then)])
-                          elses)]))
+        [(<tag> [[test then] elses])
+         (<tag> [[test (recur then)]
+                 (list@map (function (_ [else-test else-then])
+                             [else-test (recur else-then)])
+                           elses)])])
       ([#synthesis.I64-Fork]
        [#synthesis.F64-Fork]
        [#synthesis.Text-Fork])
@@ -853,8 +853,8 @@
   (function (recur body)
     (case body
       (^template [<tag>]
-        (^ (<tag> value))
-        body)
+        [(^ (<tag> value))
+         body])
       ([#synthesis.Primitive]
        [synthesis.constant])