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/function.lux  | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/lux-jvm/source/luxc/lang/translation/jvm/function.lux b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
index fcbfe1277..bb592ca32 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/function.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
@@ -115,11 +115,11 @@
                        (list (_.int +0))
                        _.fuse)
                    function.identity)]]
-    (wrap (|>> (_.NEW class)
-               _.DUP
-               (_.fuse captureI+)
-               argsI
-               (_.INVOKESPECIAL class "<init>" (init_method env arity))))))
+    (in (|>> (_.NEW class)
+             _.DUP
+             (_.fuse captureI+)
+             argsI
+             (_.INVOKESPECIAL class "<init>" (init_method env arity))))))
 
 (def: (reset_method return)
   (-> (Type Class) (Type Method))
@@ -301,7 +301,7 @@
                           ))]
     (do phase.monad
       [instanceI (..instance generate archive classD arity env)]
-      (wrap [functionD instanceI]))))
+      (in [functionD instanceI]))))
 
 (def: #export (function' forced_context generate archive [env arity bodyS])
   (-> (Maybe Context) (Generator Abstraction))
@@ -312,8 +312,8 @@
                                 (do !
                                   [without_context (generation.with_anchor [@begin 1]
                                                      (generate archive bodyS))]
-                                  (wrap [function_context
-                                         without_context]))
+                                  (in [function_context
+                                       without_context]))
                                 
                                 #.None
                                 (generation.with_new_context archive
@@ -332,8 +332,8 @@
          (generation.save! (product.right function_context) #.None directive)
 
          (#.Some function_context)
-         (wrap []))]
-    (wrap instanceI)))
+         (in []))]
+    (in instanceI)))
 
 (def: #export function
   (Generator Abstraction)
@@ -351,5 +351,5 @@
                                        (_.fuse chunkI+)
                                        (_.INVOKEVIRTUAL //.$Function //runtime.apply_method (//runtime.apply_signature (list.size chunkI+))))))
                       _.fuse)]]
-    (wrap (|>> functionI
-               applyI))))
+    (in (|>> functionI
+             applyI))))
-- 
cgit v1.2.3