A few JVM-related fixes & improvements.

3 files changed, 47 insertions, 44 deletions

diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux
index bb7c80765..59c53550e 100644
--- a/stdlib/source/program/compositor.lux
+++ b/stdlib/source/program/compositor.lux
@@ -42,8 +42,9 @@
      [meta
       [packager {"+" Packager}]
       [archive {"+" Archive}
-       [descriptor {"+" Module}]
-       ["[0]" unit]]
+       ["[0]" unit]
+       [module
+        [descriptor {"+" Module}]]]
       [io
        ["ioW" archive]]]]
     ... ["[0]" interpreter]
diff --git a/stdlib/source/program/compositor/cli.lux b/stdlib/source/program/compositor/cli.lux
index e36de7098..1962569b3 100644
--- a/stdlib/source/program/compositor/cli.lux
+++ b/stdlib/source/program/compositor/cli.lux
@@ -1,17 +1,18 @@
 (.using
-  [library
-   [lux {"-" Module Source}
-    [control
-     [pipe {"+" case>}]
-     ["<>" parser
-      ["[0]" cli {"+" Parser}]]]
-    [tool
-     [compiler
-      [meta
-       [archive
-        [descriptor {"+" Module}]]]]]
-    [world
-     [file {"+" Path}]]]])
+ [library
+  [lux {"-" Module Source}
+   [control
+    [pipe {"+" case>}]
+    ["<>" parser
+     ["[0]" cli {"+" Parser}]]]
+   [tool
+    [compiler
+     [meta
+      [archive
+       [module
+        [descriptor {"+" Module}]]]]]]
+   [world
+    [file {"+" Path}]]]])
 
 (type: .public Source
   Path)
diff --git a/stdlib/source/program/compositor/import.lux b/stdlib/source/program/compositor/import.lux
index 484322c8f..9554ec934 100644
--- a/stdlib/source/program/compositor/import.lux
+++ b/stdlib/source/program/compositor/import.lux
@@ -1,33 +1,34 @@
 (.using
-  [library
-   [lux {"-" Module}
-    [abstract
-     ["[0]" monad {"+" Monad do}]]
-    [control
-     ["[0]" try {"+" Try}]
-     ["[0]" exception {"+" exception:}]
-     [concurrency
-      ["[0]" async {"+" Async} ("[1]#[0]" monad)]]
-     ["<>" parser
-      ["<[0]>" binary]]]
-    [data
-     [binary {"+" Binary}]
-     ["[0]" text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" dictionary {"+" Dictionary}]
-      ["[0]" sequence]]
-     [format
-      ["[0]" tar]]]
-    [tool
-     [compiler
-      [meta
-       [archive
-        [descriptor {"+" Module}]]]]]
-    [world
-     ["[0]" file]]]]
-  [//
-   [cli {"+" Library}]])
+ [library
+  [lux {"-" Module}
+   [abstract
+    ["[0]" monad {"+" Monad do}]]
+   [control
+    ["[0]" try {"+" Try}]
+    ["[0]" exception {"+" exception:}]
+    [concurrency
+     ["[0]" async {"+" Async} ("[1]#[0]" monad)]]
+    ["<>" parser
+     ["<[0]>" binary]]]
+   [data
+    [binary {"+" Binary}]
+    ["[0]" text
+     ["%" format {"+" format}]]
+    [collection
+     ["[0]" dictionary {"+" Dictionary}]
+     ["[0]" sequence]]
+    [format
+     ["[0]" tar]]]
+   [tool
+    [compiler
+     [meta
+      [archive
+       [module
+        [descriptor {"+" Module}]]]]]]
+   [world
+    ["[0]" file]]]]
+ [//
+  [cli {"+" Library}]])
 
 (def: Action
   (type (All (_ a) (Async (Try a)))))