1 files changed, 10 insertions, 9 deletions
diff --git a/new-luxc/source/luxc/lang/host.jvm.lux b/new-luxc/source/luxc/lang/host.jvm.lux
index 01afaeccc..ba617aa42 100644
--- a/new-luxc/source/luxc/lang/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/host.jvm.lux
@@ -11,10 +11,11 @@
                    [array]))
        [macro]
        [host #+ do-to object]
-       [io])
-  (luxc ["&" lang]
-        (lang [".L" variable #+ Register]
-              (translation (jvm [".T" common])))))
+       [io]
+       ["//" lang]
+       (lang ["//." reference #+ Register]))
+  (luxc [lang]
+        (lang (translation (jvm [".T" common])))))
 
 (host.import org/objectweb/asm/Label)
 
@@ -57,7 +58,7 @@
                    (array.from-list (list (:! Object class-name)
                                           (:! Object byte-code)
                                           (:! Object (host.long-to-int 0))
-                                          (:! Object (host.long-to-int (nat-to-int (host.array-length byte-code))))))]
+                                          (:! Object (host.long-to-int (.int (host.array-length byte-code))))))]
                   ClassLoader::defineClass))
 
 (def: (fetch-byte-code class-name store)
@@ -122,14 +123,14 @@
                    anchor])
 
       #.None
-      ((&.throw No-Anchor "") compiler))))
+      ((//.throw No-Anchor "") compiler))))
 
 (def: #export (with-context name expr)
   (All [a] (-> Text (Meta a) (Meta a)))
   (.function (_ compiler)
     (let [old (:! commonT.Host (get@ #.host compiler))]
       (case (expr (set@ #.host
-                        (:! Nothing (set@ #commonT.context [(&.normalize-name name) +0] old))
+                        (:! Nothing (set@ #commonT.context [(lang.normalize-name name) +0] old))
                         compiler))
         (#e.Success [compiler' output])
         (#e.Success [(update@ #.host
@@ -147,14 +148,14 @@
   (.function (_ compiler)
     (let [old (:! commonT.Host (get@ #.host compiler))
           [old-name old-sub] (get@ #commonT.context old)
-          new-name (format old-name "$" (%i (nat-to-int old-sub)))]
+          new-name (format old-name "$" (%i (.int old-sub)))]
       (case (expr (set@ #.host
                         (:! Nothing (set@ #commonT.context [new-name +0] old))
                         compiler))
         (#e.Success [compiler' output])
         (#e.Success [(update@ #.host
                               (|>> (:! commonT.Host)
-                                   (set@ #commonT.context [old-name (n/inc old-sub)])
+                                   (set@ #commonT.context [old-name (inc old-sub)])
                                    (:! Nothing))
                               compiler')
                      [new-name output]])