diff options
| author | Eduardo Julian | 2017-10-26 14:48:05 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2017-10-26 14:48:05 -0400 |
| commit | 1fabe19f7eacb668ef26cccde681dce5e2f98072 (patch) | |
| tree | ad2ead4ae5d7f997353e7b8223aa29725df40111 /new-luxc/source/luxc/host | |
| parent | 40e9eae7468af9b03f6c684171d83a521dd90e82 (diff) | |
- WIP: Wiring everything to get the compiler to work fully.
- Fixed a bug when combining field/method/class modifiers.
Diffstat (limited to '')
| -rw-r--r-- | new-luxc/source/luxc/host.jvm.lux | 11 |
1 files changed, 6 insertions, 5 deletions
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) |