Updated copyright notices.

1 files changed, 19 insertions, 8 deletions

diff --git a/stdlib/source/program/compositor/cli.lux b/stdlib/source/library/lux/tool/compiler/meta/cli.lux
index 1962569b3..c4d5eb819 100644
--- a/stdlib/source/program/compositor/cli.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/cli.lux
@@ -4,13 +4,13 @@
    [control
     [pipe {"+" case>}]
     ["<>" parser
-     ["[0]" cli {"+" Parser}]]]
+     ["<[0]>" cli {"+" Parser}]]]
    [tool
     [compiler
      [meta
       [archive
        [module
-        [descriptor {"+" Module}]]]]]]
+        ["[0]" descriptor]]]]]]
    [world
     [file {"+" Path}]]]])
 
@@ -26,8 +26,19 @@
 (type: .public Target
   Path)
 
+(type: .public Module
+  descriptor.Module)
+
 (type: .public Compilation
-  [(List Source) (List Host_Dependency) (List Library) Target Module])
+  (Record
+   [#sources (List Source)
+    #host_dependencies (List Host_Dependency)
+    #libraries (List Library)
+    #target Target
+    #module Module]))
+
+(type: .public Interpretation
+  ..Compilation)
 
 (type: .public Export
   [(List Source) Target])
@@ -35,13 +46,13 @@
 (type: .public Service
   (Variant
    {#Compilation Compilation}
-   {#Interpretation Compilation}
+   {#Interpretation Interpretation}
    {#Export Export}))
 
 (template [<name> <long> <type>]
   [(def: <name>
      (Parser <type>)
-     (cli.named <long> cli.any))]
+     (<cli>.named <long> <cli>.any))]
 
   [source_parser "--source" Source]
   [host_dependency_parser "--host_dependency" Host_Dependency]
@@ -53,21 +64,21 @@
 (def: .public service
   (Parser Service)
   ($_ <>.or
-      (<>.after (cli.this "build")
+      (<>.after (<cli>.this "build")
                 ($_ <>.and
                     (<>.some ..source_parser)
                     (<>.some ..host_dependency_parser)
                     (<>.some ..library_parser)
                     ..target_parser
                     ..module_parser))
-      (<>.after (cli.this "repl")
+      (<>.after (<cli>.this "repl")
                 ($_ <>.and
                     (<>.some ..source_parser)
                     (<>.some ..host_dependency_parser)
                     (<>.some ..library_parser)
                     ..target_parser
                     ..module_parser))
-      (<>.after (cli.this "export")
+      (<>.after (<cli>.this "export")
                 ($_ <>.and
                     (<>.some ..source_parser)
                     ..target_parser))