From 1fabe19f7eacb668ef26cccde681dce5e2f98072 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Thu, 26 Oct 2017 14:48:05 -0400
Subject: - WIP: Wiring everything to get the compiler to work fully. - Fixed a
 bug when combining field/method/class modifiers.

---
 new-luxc/source/luxc/host.jvm.lux | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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

diff --git a/new-luxc/source/luxc/host.jvm.lux b/new-luxc/source/luxc/host.jvm.lux
index 6c8eaa350..f118deed2 100644
--- a/new-luxc/source/luxc/host.jvm.lux
+++ b/new-luxc/source/luxc/host.jvm.lux
@@ -5,7 +5,7 @@
        (data ["e" error]
              [text]
              text/format
-             (coll ["d" dict]
+             (coll [dict]
                    [array]))
        [meta #+ Monad<Meta>]
        [host #+ do-to object]
@@ -58,7 +58,7 @@
 
 (def: (fetch-byte-code class-name store)
   (-> Text &&common;Class-Store (Maybe &&common;Bytecode))
-  (|> store A;get io;run (d;get class-name)))
+  (|> store A;get io;run (dict;get class-name)))
 
 (def: (memory-class-loader store)
   (-> &&common;Class-Store ClassLoader)
@@ -72,7 +72,7 @@
                      (:!! class)
 
                      (#e;Error error)
-                     (error! (format "Class definiton error: " class-name "\n"
+                     (error! (format "Class definition error: " class-name "\n"
                                      error)))
 
                    #;None
@@ -81,10 +81,11 @@
 (def: #export init-host
   (io;IO &&common;Host)
   (io;io (let [store (: &&common;Class-Store
-                        (A;atom (d;new text;Hash<Text>)))]
+                        (A;atom (dict;new text;Hash<Text>)))]
            {#&&common;loader (memory-class-loader store)
             #&&common;store store
-            #&&common;function-class #;None})))
+            #&&common;function-class #;None
+            #&&common;artifacts (dict;new text;Hash<Text>)})))
 
 (def: #export class-loader
   (Meta ClassLoader)
-- 
cgit v1.2.3