From eff4c59794868b89d60fdc411f9b544a270b817e Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 2 Aug 2021 20:26:21 -0400
Subject: Fixed a bug in the new compiler which allowed the same module to be
 imported more than once.

---
 lux-jvm/source/luxc/lang/host/jvm.lux | 38 +++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'lux-jvm/source/luxc/lang/host/jvm.lux')

diff --git a/lux-jvm/source/luxc/lang/host/jvm.lux b/lux-jvm/source/luxc/lang/host/jvm.lux
index 1c81be667..5c854d646 100644
--- a/lux-jvm/source/luxc/lang/host/jvm.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm.lux
@@ -103,25 +103,25 @@
                                     (|> (~ g!none)
                                         (set@ (~ (code.local_tag option)) #1)))))
                              options)]
-    (wrap (list& (` (type: (~' #export) (~ g!type)
-                      (~ (code.record (list/map (function (_ tag)
-                                                  [tag (` .Bit)])
-                                                g!tags+)))))
-
-                 (` (def: (~' #export) (~ g!none)
-                      (~ g!type)
-                      (~ (code.record (list/map (function (_ tag)
-                                                  [tag (` #0)])
-                                                g!tags+)))))
-
-                 (` (def: (~' #export) ((~ (code.local_identifier ++)) (~ g!_left) (~ g!_right))
-                      (-> (~ g!type) (~ g!type) (~ g!type))
-                      (~ (code.record (list/map (function (_ tag)
-                                                  [tag (` (or (get@ (~ tag) (~ g!_left))
-                                                              (get@ (~ tag) (~ g!_right))))])
-                                                g!tags+)))))
-
-                 g!options+))))
+    (in (list& (` (type: (~' #export) (~ g!type)
+                    (~ (code.record (list/map (function (_ tag)
+                                                [tag (` .Bit)])
+                                              g!tags+)))))
+
+               (` (def: (~' #export) (~ g!none)
+                    (~ g!type)
+                    (~ (code.record (list/map (function (_ tag)
+                                                [tag (` #0)])
+                                              g!tags+)))))
+
+               (` (def: (~' #export) ((~ (code.local_identifier ++)) (~ g!_left) (~ g!_right))
+                    (-> (~ g!type) (~ g!type) (~ g!type))
+                    (~ (code.record (list/map (function (_ tag)
+                                                [tag (` (or (get@ (~ tag) (~ g!_left))
+                                                            (get@ (~ tag) (~ g!_right))))])
+                                              g!tags+)))))
+
+               g!options+))))
 
 (config: Class_Config  noneC ++C [finalC])
 (config: Method_Config noneM ++M [finalM staticM synchronizedM strictM])
-- 
cgit v1.2.3