From e4bc4d0e2cd14a955530160c4fc7859e6c46874e Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Thu, 3 Feb 2022 05:55:42 -0400
Subject: Fixes for the pure-Lux JVM compiler machinery. [Part 13 / Done!]

---
 lux-jvm/source/luxc/lang/translation/jvm.lux | 85 ++++++++++++++--------------
 1 file changed, 43 insertions(+), 42 deletions(-)

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

diff --git a/lux-jvm/source/luxc/lang/translation/jvm.lux b/lux-jvm/source/luxc/lang/translation/jvm.lux
index c2f7cea68..e2bd46f5d 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm.lux
@@ -1,44 +1,45 @@
 (.using
-  [library
-   [lux {"-" Definition}
-    ["[0]" ffi {"+" import: do_to object}]
-    [abstract
-     [monad {"+" do}]]
-    [control
-     pipe
-     ["[0]" maybe]
-     ["[0]" try {"+" Try}]
-     ["[0]" exception {"+" exception:}]
-     ["[0]" io {"+" IO io}]
-     [concurrency
-      ["[0]" atom {"+" Atom atom}]]]
-    [data
-     [binary {"+" Binary}]
-     ["[0]" product]
-     ["[0]" text ("[1]@[0]" hash)
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" array]
-      ["[0]" dictionary {"+" Dictionary}]]]
-    [target
-     [jvm
-      ["[0]" loader {"+" Library}]
-      ["[0]" type
-       ["[0]" descriptor]]]]
-    [tool
-     [compiler
-      [language
-       [lux
-        ["[0]" version]
-        ["[0]" generation]]]
-      [meta
-       [io {"+" lux_context}]]]]]]
-  [///
-   [host
-    ["[0]" jvm {"+" Inst Definition Host State}
-     ["[0]" def]
-     ["[0]" inst]]]]
-  )
+ [library
+  [lux {"-" Definition}
+   ["[0]" ffi {"+" import: do_to object}]
+   [abstract
+    [monad {"+" do}]]
+   [control
+    pipe
+    ["[0]" maybe]
+    ["[0]" try {"+" Try}]
+    ["[0]" exception {"+" exception:}]
+    ["[0]" io {"+" IO io}]
+    [concurrency
+     ["[0]" atom {"+" Atom atom}]]]
+   [data
+    [binary {"+" Binary}]
+    ["[0]" product]
+    ["[0]" text ("[1]@[0]" hash)
+     ["%" format {"+" format}]]
+    [collection
+     ["[0]" array]
+     ["[0]" dictionary {"+" Dictionary}]]]
+   [target
+    [jvm
+     ["[0]" loader {"+" Library}]
+     ["[0]" type
+      ["[0]" descriptor]]]]
+   [tool
+    [compiler
+     [language
+      [lux
+       ["[0]" version]]]
+     [meta
+      [io {"+" lux_context}]
+      [archive
+       ["[0]" unit]]]]]]]
+ [///
+  [host
+   ["[0]" jvm {"+" Inst Definition Host State}
+    ["[0]" def]
+    ["[0]" inst]]]]
+ )
 
 (import: java/lang/reflect/Field
   ["[1]::[0]"
@@ -103,7 +104,7 @@
   (text.replaced ..class_path_separator .module_separator))
 
 (def: .public (class_name [module_id artifact_id])
-  (-> generation.Context Text)
+  (-> unit.ID Text)
   (format lux_context
           ..class_path_separator (%.nat version.version)
           ..class_path_separator (%.nat module_id)
@@ -146,7 +147,7 @@
              (loader.load class_name loader))))
 
 (def: (define! library loader context custom valueI)
-  (-> Library java/lang/ClassLoader generation.Context (Maybe Text) Inst (Try [Text Any Definition]))
+  (-> Library java/lang/ClassLoader unit.ID (Maybe Text) Inst (Try [Text Any Definition]))
   (do try.monad
     [[value definition] (evaluate! library loader (..class_name context) valueI)]
     (in [(maybe.else (..class_name context)
-- 
cgit v1.2.3