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

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

diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index e86504d60..ea68f2680 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -47,7 +47,7 @@
 (syntax: (declare {codes (p.many s.local_identifier)})
   (|> codes
       (list@map (function (_ code) (` ((~' #static) (~ (code.local_identifier code)) (~' int)))))
-      wrap))
+      in))
 
 (`` (import: org/objectweb/asm/Opcodes
       ["#::."
@@ -375,7 +375,7 @@
           labels_array (ffi.array org/objectweb/asm/Label array_size)
           _ (loop [idx 0]
               (if (n.< array_size idx)
-                (let [[key label] (maybe.assume (list.nth idx keys+labels))]
+                (let [[key label] (maybe.assume (list.item idx keys+labels))]
                   (exec
                     (ffi.array_write idx (ffi.long_to_int key) keys_array)
                     (ffi.array_write idx label labels_array)
@@ -392,7 +392,7 @@
           _ (loop [idx 0]
               (if (n.< num_labels idx)
                 (exec (ffi.array_write idx
-                                       (maybe.assume (list.nth idx labels))
+                                       (maybe.assume (list.item idx labels))
                                        labels_array)
                   (recur (inc idx)))
                 []))]
@@ -459,11 +459,11 @@
 (def: #export (fuse insts)
   (-> (List Inst) Inst)
   (case insts
-    #.Nil
+    #.End
     function.identity
 
-    (#.Cons singleton #.Nil)
+    (#.Item singleton #.End)
     singleton
 
-    (#.Cons head tail)
+    (#.Item head tail)
     (function.compose (fuse tail) head)))
-- 
cgit v1.2.3