New "parser" hierarchy. [Part 5]

1 files changed, 15 insertions, 14 deletions

diff --git a/stdlib/source/library/lux/tool/compiler/meta/cli.lux b/stdlib/source/library/lux/tool/compiler/meta/cli.lux
index 685467d32..caeb07961 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/cli.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/cli.lux
@@ -5,9 +5,8 @@
     [monad (.only do)]
     [equivalence (.only Equivalence)]]
    [control
-    ["[0]" pipe]
-    ["<>" parser (.only)
-     ["<[0]>" cli (.only Parser)]]]
+    ["<>" parser]
+    ["[0]" pipe]]
    [data
     ["[0]" product]
     ["[0]" text (.only)
@@ -22,6 +21,8 @@
    [meta
     ["[0]" symbol]
     ["[0]" configuration (.only Configuration)]]
+   ["[0]" program
+    ["<[1]>" \\parser (.only Parser)]]
    [tool
     [compiler
      [meta
@@ -73,15 +74,15 @@
 (with_template [<name> <long> <type> <parser>]
   [(def <name>
      (Parser <type>)
-     (<cli>.named <long> <parser>))]
+     (<program>.named <long> <parser>))]
 
-  [host_dependency_parser "--host_dependency" Host_Dependency <cli>.any]
-  [library_parser "--library" Library <cli>.any]
-  [compiler_parser "--compiler" Compiler (<text>.then /compiler.parser <cli>.any)]
-  [source_parser "--source" Source <cli>.any]
-  [target_parser "--target" Target <cli>.any]
-  [module_parser "--module" Module <cli>.any]
-  [configuration_parser "--configuration" Configuration (<text>.then configuration.parser <cli>.any)]
+  [host_dependency_parser "--host_dependency" Host_Dependency <program>.any]
+  [library_parser "--library" Library <program>.any]
+  [compiler_parser "--compiler" Compiler (<text>.then /compiler.parser <program>.any)]
+  [source_parser "--source" Source <program>.any]
+  [target_parser "--target" Target <program>.any]
+  [module_parser "--module" Module <program>.any]
+  [configuration_parser "--configuration" Configuration (<text>.then configuration.parser <program>.any)]
   )
 
 (def .public service
@@ -96,11 +97,11 @@
                              ..module_parser
                              (<>.else configuration.empty ..configuration_parser)))]
     (all <>.or
-         (<>.after (<cli>.this "build")
+         (<>.after (<program>.this "build")
                    compilation)
-         (<>.after (<cli>.this "repl")
+         (<>.after (<program>.this "repl")
                    compilation)
-         (<>.after (<cli>.this "export")
+         (<>.after (<program>.this "export")
                    (all <>.and
                         (<>.some ..source_parser)
                         ..target_parser))