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.

---
 .../source/luxc/lang/translation/jvm/structure.lux | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

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

diff --git a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
index a9666958b..86b4431da 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
@@ -46,21 +46,21 @@
   (Generator (List Synthesis))
   (do {@ phase.monad}
     [#let [size (list.size members)]
-     _ (phase.assert ..not_a_tuple size
-                     (n.>= 2 size))
+     _ (phase.assertion ..not_a_tuple size
+                        (n.>= 2 size))
      membersI (|> members
                   list.enumeration
                   (monad.map @ (function (_ [idx member])
                                  (do @
                                    [memberI (generate archive member)]
-                                   (wrap (|>> _.DUP
-                                              (_.int (.int idx))
-                                              memberI
-                                              _.AASTORE)))))
+                                   (in (|>> _.DUP
+                                            (_.int (.int idx))
+                                            memberI
+                                            _.AASTORE)))))
                   (\ @ map _.fuse))]
-    (wrap (|>> (_.int (.int size))
-               (_.array //runtime.$Value)
-               membersI))))
+    (in (|>> (_.int (.int size))
+             (_.array //runtime.$Value)
+             membersI))))
 
 (import: java/lang/Byte
   ["#::."
@@ -109,12 +109,12 @@
   (do phase.monad
     [memberI (generate archive member)
      #let [tagI (..tagI lefts right?)]]
-    (wrap (|>> tagI
-               (flagI right?)
-               memberI
-               (_.INVOKESTATIC //.$Runtime
-                               "variant_make"
-                               (type.method [(list)
-                                             (list //runtime.$Tag //runtime.$Flag //runtime.$Value)
-                                             //.$Variant
-                                             (list)]))))))
+    (in (|>> tagI
+             (flagI right?)
+             memberI
+             (_.INVOKESTATIC //.$Runtime
+                             "variant_make"
+                             (type.method [(list)
+                                           (list //runtime.$Tag //runtime.$Flag //runtime.$Value)
+                                           //.$Variant
+                                           (list)]))))))
-- 
cgit v1.2.3