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.

---
 .../luxc/lang/translation/jvm/extension/common.lux | 37 +++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

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

diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
index 70175b636..eb3d02be7 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
@@ -52,7 +52,7 @@
       (handler extension_name phase archive input')
 
       (#try.Failure error)
-      (phase.throw extension.invalid_syntax [extension_name %synthesis input]))))
+      (phase.except extension.invalid_syntax [extension_name %synthesis input]))))
 
 (import: java/lang/Double
   ["#::."
@@ -103,13 +103,13 @@
                                         (monad.map @ (function (_ [chars branch])
                                                        (do @
                                                          [branchG (phase archive branch)]
-                                                         (wrap (<| _.with_label (function (_ @branch))
-                                                                   [(list@map (function (_ char)
-                                                                                [(.int char) @branch])
-                                                                              chars)
-                                                                    (|>> (_.label @branch)
-                                                                         branchG
-                                                                         (_.GOTO @end))]))))
+                                                         (in (<| _.with_label (function (_ @branch))
+                                                                 [(list@map (function (_ char)
+                                                                              [(.int char) @branch])
+                                                                            chars)
+                                                                  (|>> (_.label @branch)
+                                                                       branchG
+                                                                       (_.GOTO @end))]))))
                                                    conditionals))
                       #let [table (|> conditionalsG+
                                       (list@map product.left)
@@ -117,13 +117,12 @@
                             conditionalsG (|> conditionalsG+
                                               (list@map product.right)
                                               _.fuse)]]
-                     (wrap (|>> inputG (_.unwrap type.long) _.L2I
-                                (_.LOOKUPSWITCH @else table)
-                                conditionalsG
-                                (_.label @else)
-                                elseG
-                                (_.label @end)
-                                )))))]))
+                     (in (|>> inputG (_.unwrap type.long) _.L2I
+                              (_.LOOKUPSWITCH @else table)
+                              conditionalsG
+                              (_.label @else)
+                              elseG
+                              (_.label @end))))))]))
 
 (def: (lux::is [referenceI sampleI])
   (Binary Inst)
@@ -372,7 +371,7 @@
   Bundle
   (<| (bundle.prefix "lux")
       (|> bundle::lux
-          (dictionary.merge bundle::i64)
-          (dictionary.merge bundle::f64)
-          (dictionary.merge bundle::text)
-          (dictionary.merge bundle::io))))
+          (dictionary.merged bundle::i64)
+          (dictionary.merged bundle::f64)
+          (dictionary.merged bundle::text)
+          (dictionary.merged bundle::io))))
-- 
cgit v1.2.3