Fixed a bug in the new compiler which allowed the same module to be imported more than once.

1 files changed, 14 insertions, 14 deletions

diff --git a/lux-jvm/source/luxc/lang/translation/jvm.lux b/lux-jvm/source/luxc/lang/translation/jvm.lux
index 1b916d925..4cf712a45 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm.lux
@@ -88,13 +88,13 @@
         (#try.Success value)
         
         #.None
-        (exception.throw ..invalid_value class_name))
+        (exception.except ..invalid_value class_name))
       
       (#try.Failure error)
-      (exception.throw ..cannot_load [class_name error]))
+      (exception.except ..cannot_load [class_name error]))
     
     (#try.Failure error)
-    (exception.throw ..invalid_field [class_name ..value_field error])))
+    (exception.except ..invalid_field [class_name ..value_field error])))
 
 (def: class_path_separator ".")
 
@@ -129,9 +129,9 @@
     (io.run (do (try.with io.monad)
               [_ (loader.store eval_class bytecode library)
                class (loader.load eval_class loader)
-               value (\ io.monad wrap (..class_value eval_class class))]
-              (wrap [value
-                     [eval_class bytecode]])))))
+               value (\ io.monad in (..class_value eval_class class))]
+              (in [value
+                   [eval_class bytecode]])))))
 
 (def: (execute! library loader [class_name class_bytecode])
   (-> Library java/lang/ClassLoader Definition (Try Any))
@@ -142,7 +142,7 @@
                                  (try.lifted io.monad)
                                  (: (IO (Try Bit))))
              _ (if existing_class?
-                 (wrap [])
+                 (in [])
                  (loader.store class_name class_bytecode library))]
             (loader.load class_name loader))))
 
@@ -150,9 +150,9 @@
   (-> Library java/lang/ClassLoader generation.Context (Maybe Text) Inst (Try [Text Any Definition]))
   (do try.monad
     [[value definition] (evaluate! library loader context valueI)]
-    (wrap [(maybe.default (..class_name context)
-                          custom)
-           value definition])))
+    (in [(maybe.else (..class_name context)
+                     custom)
+         value definition])))
 
 (def: #export host
   (IO [java/lang/ClassLoader Host])
@@ -176,16 +176,16 @@
 
              (def: (re_learn context custom [_ bytecode])
                (io.run
-                (loader.store (maybe.default (..class_name context) custom) bytecode library)))
+                (loader.store (maybe.else (..class_name context) custom) bytecode library)))
              
              (def: (re_load context custom [directive_name bytecode])
                (io.run
                 (do (try.with io.monad)
-                  [#let [class_name (maybe.default (..class_name context)
-                                                   custom)]
+                  [#let [class_name (maybe.else (..class_name context)
+                                                custom)]
                    _ (loader.store class_name bytecode library)
                    class (loader.load class_name loader)]
-                  (\ io.monad wrap (..class_value class_name class)))))))])))
+                  (\ io.monad in (..class_value class_name class)))))))])))
 
 (def: #export $Variant
   (type.array ..$Value))