From 54bb56a07e6d8f1e76bd447436fb721a74f09f66 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 5 Feb 2022 14:51:37 -0400 Subject: Updated copyright notices. --- README.md | 2 +- commands.md | 2 - documentation/bookmark/back_end/c++.md | 2 + license.json | 2 +- license.txt | 4 +- lux-js/source/program.lux | 140 ++++++++++----------- lux-lua/source/program.lux | 8 +- lux-mode/lux-mode.el | 2 +- lux-ruby/source/program.lux | 8 +- stdlib/source/library/lux/ffi.jvm.lux | 12 +- .../lux/target/jvm/bytecode/instruction.lux | 86 ++++++------- stdlib/source/library/lux/target/python.lux | 4 +- .../library/lux/tool/compiler/default/platform.lux | 2 +- .../source/library/lux/tool/compiler/meta/cli.lux | 92 ++++++++++++++ stdlib/source/program/compositor.lux | 8 +- stdlib/source/program/compositor/cli.lux | 81 ------------ stdlib/source/program/compositor/export.lux | 55 ++++---- stdlib/source/program/compositor/import.lux | 8 +- stdlib/source/test/lux.lux | 75 ++++++----- stdlib/source/test/lux/ffi.jvm.lux | 53 +++++--- stdlib/source/test/lux/tool.lux | 4 +- stdlib/source/test/lux/tool/compiler/meta/cli.lux | 119 ++++++++++++++++++ 22 files changed, 466 insertions(+), 303 deletions(-) create mode 100644 stdlib/source/library/lux/tool/compiler/meta/cli.lux delete mode 100644 stdlib/source/program/compositor/cli.lux create mode 100644 stdlib/source/test/lux/tool/compiler/meta/cli.lux diff --git a/README.md b/README.md index 8d37ac3f6..7dbc96597 100644 --- a/README.md +++ b/README.md @@ -181,4 +181,4 @@ I'll be putting there tasks that people can contribute to; both in the compiler Writing libraries in Lux will also help a lot in making this a more practical language for day to day use. -##### Copyright (c) 2014-2021 Eduardo Julian. All rights reserved. +##### Copyright (c) 2014-2022 Eduardo Julian. All rights reserved. diff --git a/commands.md b/commands.md index 0f8ae0b5a..ed29b9b9b 100644 --- a/commands.md +++ b/commands.md @@ -47,8 +47,6 @@ cd ~/lux/lux-lein/ \ --- -[Patron License](https://github.com/licensezero/patron-license) - [Deploy Clojure Projects to Maven Central with Leiningen](https://kpow.io/how-to/deploy-clojure-projects-to-maven-central/) [How to Generate PGP Signatures with Maven](https://blog.sonatype.com/2010/01/how-to-generate-pgp-signatures-with-maven/) https://central.sonatype.org/publish/requirements/gpg/ diff --git a/documentation/bookmark/back_end/c++.md b/documentation/bookmark/back_end/c++.md index 27f33a229..10ba1fcbb 100644 --- a/documentation/bookmark/back_end/c++.md +++ b/documentation/bookmark/back_end/c++.md @@ -1,5 +1,7 @@ # Reference +0. [Using C Libraries in your Modern C++ Embedded Project - Michael Caisse - CppCon 2021](https://www.youtube.com/watch?v=Ototzy-nP4M) +0. [In-memory and Persistent Representations of C++ - Gabriel Dos Reis - CppCon 2021](https://www.youtube.com/watch?v=39wlNRk-nAg) 0. [Back to Basics: const and constexpr - Rainer Grimm - CppCon 2021](https://www.youtube.com/watch?v=tA6LbPyYdco) 0. [Misra Parallelism Safety-critical Guidelines for C++11, 17, Then C++20, 23 - CppCon 2021](https://www.youtube.com/watch?v=hVv7Nc3f4Jo) 0. [Back to Basics: Move Semantics - Nicolai Josuttis - CppCon 2021](https://www.youtube.com/watch?v=Bt3zcJZIalk) diff --git a/license.json b/license.json index cad63f2c9..202f8b1ce 100644 --- a/license.json +++ b/license.json @@ -4,7 +4,7 @@ "name": "Eduardo Emilio Julián Pereyra", "period": { "start": 2014, - "end": 2021 + "end": 2022 } } ], diff --git a/license.txt b/license.txt index c4576a7d1..9d5f5e2ed 100644 --- a/license.txt +++ b/license.txt @@ -1,7 +1,7 @@ Lux License 0.1.2 -Copyright (C) 2014-2021 Eduardo Emilio Julián Pereyra +Copyright (C) 2014-2022 Eduardo Emilio Julián Pereyra Definitions @@ -231,4 +231,4 @@ Once The Licensed Work has been published under a particular version of This Lic Recipient may also choose to use The Licensed Work under the terms of any subsequent version of This License published by The Licensor. No one other than The Licensor has the right to modify the terms applicable to The Licensed Work created under This License. -END OF TERMS AND CONDITIONS. \ No newline at end of file +END OF TERMS AND CONDITIONS. diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux index 8b1d38e99..824113da5 100644 --- a/lux-js/source/program.lux +++ b/lux-js/source/program.lux @@ -1,71 +1,71 @@ (.using - [library - [lux "*" - [program {"+" program:}] - ["[0]" ffi {"+" import:}] - ["[0]" debug] - [abstract - [monad {"+" do}]] - [control - ["[0]" maybe] - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}] - ["[0]" io {"+" IO io}] - ["[0]" function] - [concurrency - ["[0]" async {"+" Async}]]] - [data - ["[0]" product] - [text - ["%" format {"+" format}] - [encoding - ["[0]" utf8]]] - [collection - ["[0]" array {"+" Array}]]] - [macro - ["[0]" template]] - [math - [number - ["n" nat] - ["i" int] - ["[0]" i64]]] - ["[0]" world "_" - ["[0]" file] - ["[1]/[0]" program]] - ["@" target - ["_" js]] - [tool - [compiler - ["[0]" phase {"+" Operation Phase}] - [reference - [variable {"+" Register}]] - [language - [lux - [program {"+" Program}] - [generation {"+" Context Host}] - [analysis - [macro {"+" Expander}]] - [phase - ["[0]" extension {"+" Extender Handler} - ["[1]/[0]" bundle] - ["[0]" analysis "_" - ["[1]" js]] - ["[0]" generation "_" - ["[1]" js]]] - [generation - ["[0]" reference] - ["[0]" js - ["[0]" runtime]]]]]] - [default - ["[0]" platform {"+" Platform}]] - [meta - [archive {"+" Archive}] - ["[0]" packager "_" - ["[1]" script]]]]]]] - [program - ["/" compositor - ["[1][0]" cli] - ["[1][0]" static]]]) + [library + [lux "*" + [program {"+" program:}] + ["[0]" ffi {"+" import:}] + ["[0]" debug] + [abstract + [monad {"+" do}]] + [control + ["[0]" maybe] + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}] + ["[0]" io {"+" IO io}] + ["[0]" function] + [concurrency + ["[0]" async {"+" Async}]]] + [data + ["[0]" product] + [text + ["%" format {"+" format}] + [encoding + ["[0]" utf8]]] + [collection + ["[0]" array {"+" Array}]]] + [macro + ["[0]" template]] + [math + [number + ["n" nat] + ["i" int] + ["[0]" i64]]] + ["[0]" world "_" + ["[0]" file] + ["[1]/[0]" program]] + ["@" target + ["_" js]] + [tool + [compiler + ["[0]" phase {"+" Operation Phase}] + [reference + [variable {"+" Register}]] + [language + [lux + [program {"+" Program}] + [generation {"+" Context Host}] + [analysis + [macro {"+" Expander}]] + [phase + ["[0]" extension {"+" Extender Handler} + ["[1]/[0]" bundle] + ["[0]" analysis "_" + ["[1]" js]] + ["[0]" generation "_" + ["[1]" js]]] + [generation + ["[0]" reference] + ["[0]" js + ["[0]" runtime]]]]]] + [default + ["[0]" platform {"+" Platform}]] + [meta + ["[0]" cli] + [archive {"+" Archive}] + ["[0]" packager "_" + ["[1]" script]]]]]]] + [program + ["/" compositor + ["[1][0]" static]]]) (exception: (null_has_no_lux_representation [code (Maybe _.Expression)]) (case code @@ -667,12 +667,12 @@ (_.statement (_.apply/* (_.closure (list) body) (list)))) -(program: [service /cli.service] +(program: [service cli.service] (let [extension ".js"] (exec (do async.monad [_ (/.compiler [/static.#host @.js /static.#host_module_extension extension - /static.#target (/cli.target service) + /static.#target (cli.target service) /static.#artifact_extension extension] ..expander analysis.bundle @@ -684,7 +684,7 @@ ..extender service [(packager.package _.use_strict _.code _.then ..scope) - (format (/cli.target service) + (format (cli.target service) (# file.default separator) "program" extension)])] diff --git a/lux-lua/source/program.lux b/lux-lua/source/program.lux index e0b399bcc..2f5fdb67e 100644 --- a/lux-lua/source/program.lux +++ b/lux-lua/source/program.lux @@ -57,12 +57,12 @@ [default ["[0]" platform {"+" Platform}]] [meta + ["[0]" cli] [archive {"+" Archive}] ["[0]" packager "_" ["[1]" script]]]]]]] [program ["/" compositor - ["[1][0]" cli] ["[1][0]" static]]]) (with_expansions [ (as_is (ffi.import: java/lang/String) @@ -810,7 +810,7 @@ (-> Any (Async Any)) (async.future (# world/program.default exit +0))) -(`` (program: [service /cli.service] +(`` (program: [service cli.service] (let [extension ".lua"] (do io.monad [(~~ (for [@.old [baggage platform] @@ -820,7 +820,7 @@ (exec (do async.monad [_ (/.compiler [/static.#host @.lua /static.#host_module_extension extension - /static.#target (/cli.target service) + /static.#target (cli.target service) /static.#artifact_extension extension] (for [@.old (..expander baggage) @.jvm (..expander baggage) @@ -841,7 +841,7 @@ _.code _.then (|>>)) - (format (/cli.target service) + (format (cli.target service) (# file.default separator) "program" extension)])] diff --git a/lux-mode/lux-mode.el b/lux-mode/lux-mode.el index b41c3848a..ee5050d47 100644 --- a/lux-mode/lux-mode.el +++ b/lux-mode/lux-mode.el @@ -1,6 +1,6 @@ ;;; lux-mode.el --- Major mode for Lux code -*- lexical-binding: t; -*- -;; Copyright © 2014-2021 Eduardo Julian +;; Copyright © 2014-2022 Eduardo Julian ;; ;; Authors: Eduardo Julian ;; URL: https://github.com/LuxLang/lux/tree/master/lux-mode diff --git a/lux-ruby/source/program.lux b/lux-ruby/source/program.lux index cd037a5b1..716c2745d 100644 --- a/lux-ruby/source/program.lux +++ b/lux-ruby/source/program.lux @@ -65,12 +65,12 @@ [default ["[0]" platform {"+" Platform}]] [meta + ["[0]" cli] [archive {"+" Archive}] ["[0]" packager "_" ["[1]" ruby]]]]]]] [program ["/" compositor - ["/[0]" cli] ["/[0]" static]]]) (import: java/lang/String) @@ -892,13 +892,13 @@ (-> Any (Async Any)) (async.future (# world/program.default exit +0))) -(program: [service /cli.service] +(program: [service cli.service] (let [extension ".rb"] (exec (do async.monad [_ (/.compiler [/static.#host @.ruby /static.#host_module_extension extension - /static.#target (/cli.target service) + /static.#target (cli.target service) /static.#artifact_extension extension] ..expander analysis.bundle @@ -910,7 +910,7 @@ ..extender service [packager.package - (format (/cli.target service) + (format (cli.target service) (# file.default separator) "program")])] (..declare_success! [])) diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux index 55cbe77ba..f13818a4a 100644 --- a/stdlib/source/library/lux/ffi.jvm.lux +++ b/stdlib/source/library/lux/ffi.jvm.lux @@ -585,18 +585,18 @@ (.form (<>.and class_name^ (<>.some (parameter^ type_vars))))))] (in (type.class (name.safe name) parameters)))) -(exception: .public (unexpected_type_variable [name Text - type_vars (List (Type Var))]) +(exception: .public (unknown_type_variable [name Text + type_vars (List (Type Var))]) (exception.report ["Unexpected Type Variable" (%.text name)] ["Expected Type Variables" (exception.listing parser.name type_vars)])) -(def: (variable^ type_vars) +(def: (type_variable options) (-> (List (Type Var)) (Parser (Type Parameter))) (do <>.monad [name .local_symbol - _ (..assertion ..unexpected_type_variable [name type_vars] - (list.member? text.equivalence (list#each parser.name type_vars) name))] + _ (..assertion ..unknown_type_variable [name options] + (list.member? text.equivalence (list#each parser.name options) name))] (in (type.var name)))) (def: wildcard^ @@ -623,7 +623,7 @@ (function (_ _) (let [class^ (..class^' parameter^ type_vars)] ($_ <>.either - (..variable^ type_vars) + (..type_variable type_vars) ..wildcard^ (upper^ class^) (lower^ class^) diff --git a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux index d1962e192..c422dd1c2 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux @@ -1,40 +1,40 @@ (.using - [library - [lux "*" - [abstract - [monad {"+" do}] - [monoid {"+" Monoid}]] - [control - ["[0]" function] - ["[0]" try]] - [data - ["[0]" product] - ["[0]" binary] - ["[0]" format "_" - ["[1]" binary {"+" Mutation Specification}]] - [collection - ["[0]" list]]] - [macro - ["[0]" template]] - [math - [number {"+" hex} - ["n" nat]]] - [type - abstract]]] - ["[0]" // "_" - ["[1][0]" address {"+" Address}] - ["[1][0]" jump {"+" Jump Big_Jump}] - [environment - [limit - [registry {"+" Register}]]] - ["/[1]" // "_" - ["[1][0]" index {"+" Index}] - ["[1][0]" constant {"+" Class Reference}] - [encoding - ["[1][0]" unsigned {"+" U1 U2 U4}] - ["[1][0]" signed {"+" S1 S2 S4}]] - [type - [category {"+" Value Method}]]]]) + [library + [lux "*" + [abstract + [monad {"+" do}] + [monoid {"+" Monoid}]] + [control + ["[0]" function] + ["[0]" try]] + [data + ["[0]" product] + ["[0]" binary] + ["[0]" format "_" + ["[1]" binary {"+" Mutation Specification}]] + [collection + ["[0]" list]]] + [macro + ["[0]" template]] + [math + [number {"+" hex} + ["n" nat]]] + [type + abstract]]] + ["[0]" // "_" + ["[1][0]" address {"+" Address}] + ["[1][0]" jump {"+" Jump Big_Jump}] + [environment + [limit + [registry {"+" Register}]]] + ["/[1]" // "_" + ["[1][0]" index {"+" Index}] + ["[1][0]" constant {"+" Class Reference}] + [encoding + ["[1][0]" unsigned {"+" U1 U2 U4}] + ["[1][0]" signed {"+" S1 S2 S4}]] + [type + [category {"+" Value Method}]]]]) (type: .public Size U2) @@ -60,15 +60,15 @@ (type: Opcode Nat) -(template [ ] +(template [ ] [(def: Size (|> ///unsigned.u2 try.trusted))] - [opcode_size 1] - [register_size 1] - [byte_size 1] - [index_size 2] - [big_jump_size 4] - [integer_size 4] + [1 opcode_size] + [1 register_size] + [1 byte_size] + [2 index_size] + [4 big_jump_size] + [4 integer_size] ) (def: (nullary' opcode) diff --git a/stdlib/source/library/lux/target/python.lux b/stdlib/source/library/lux/target/python.lux index 6d3746721..87864e062 100644 --- a/stdlib/source/library/lux/target/python.lux +++ b/stdlib/source/library/lux/target/python.lux @@ -194,8 +194,8 @@ ... ..expression (format left_delimiter (|> entries - (list#each entry_serializer) - (text.interposed ", ")) + (list#each (|>> entry_serializer (text.suffix ", "))) + text.together) right_delimiter)))) (template [ 
 ]
diff --git a/stdlib/source/library/lux/tool/compiler/default/platform.lux b/stdlib/source/library/lux/tool/compiler/default/platform.lux
index 668daffc5..dc9ff4533 100644
--- a/stdlib/source/library/lux/tool/compiler/default/platform.lux
+++ b/stdlib/source/library/lux/tool/compiler/default/platform.lux
@@ -49,6 +49,7 @@
      [phase
       ["[0]" extension {"+" Extender}]]]]
    [meta
+    [cli {"+" Compilation Library}]
     ["[0]" archive {"+" Output Archive}
      ["[0]" registry {"+" Registry}]
      ["[0]" artifact]
@@ -60,7 +61,6 @@
      ["ioW" archive]]]]]
  [program
   [compositor
-   [cli {"+" Compilation Library}]
    [import {"+" Import}]
    ["[0]" static {"+" Static}]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/meta/cli.lux b/stdlib/source/library/lux/tool/compiler/meta/cli.lux
new file mode 100644
index 000000000..c4d5eb819
--- /dev/null
+++ b/stdlib/source/library/lux/tool/compiler/meta/cli.lux
@@ -0,0 +1,92 @@
+(.using
+ [library
+  [lux {"-" Module Source}
+   [control
+    [pipe {"+" case>}]
+    ["<>" parser
+     ["<[0]>" cli {"+" Parser}]]]
+   [tool
+    [compiler
+     [meta
+      [archive
+       [module
+        ["[0]" descriptor]]]]]]
+   [world
+    [file {"+" Path}]]]])
+
+(type: .public Source
+  Path)
+
+(type: .public Host_Dependency
+  Path)
+
+(type: .public Library
+  Path)
+
+(type: .public Target
+  Path)
+
+(type: .public Module
+  descriptor.Module)
+
+(type: .public Compilation
+  (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])
+
+(type: .public Service
+  (Variant
+   {#Compilation Compilation}
+   {#Interpretation Interpretation}
+   {#Export Export}))
+
+(template [  ]
+  [(def: 
+     (Parser )
+     (.named  .any))]
+
+  [source_parser "--source" Source]
+  [host_dependency_parser "--host_dependency" Host_Dependency]
+  [library_parser "--library" Library]
+  [target_parser "--target" Target]
+  [module_parser "--module" Module]
+  )
+
+(def: .public service
+  (Parser Service)
+  ($_ <>.or
+      (<>.after (.this "build")
+                ($_ <>.and
+                    (<>.some ..source_parser)
+                    (<>.some ..host_dependency_parser)
+                    (<>.some ..library_parser)
+                    ..target_parser
+                    ..module_parser))
+      (<>.after (.this "repl")
+                ($_ <>.and
+                    (<>.some ..source_parser)
+                    (<>.some ..host_dependency_parser)
+                    (<>.some ..library_parser)
+                    ..target_parser
+                    ..module_parser))
+      (<>.after (.this "export")
+                ($_ <>.and
+                    (<>.some ..source_parser)
+                    ..target_parser))
+      ))
+
+(def: .public target
+  (-> Service Target)
+  (|>> (case> (^or {#Compilation [sources host_dependencies libraries target module]}
+                   {#Interpretation [sources host_dependencies libraries target module]}
+                   {#Export [sources target]})
+              target)))
diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux
index 59c53550e..0d90a15dc 100644
--- a/stdlib/source/program/compositor.lux
+++ b/stdlib/source/program/compositor.lux
@@ -40,6 +40,7 @@
        [phase
         [extension {"+" Extender}]]]]
      [meta
+      ["[0]" cli {"+" Service}]
       [packager {"+" Packager}]
       [archive {"+" Archive}
        ["[0]" unit]
@@ -50,7 +51,6 @@
     ... ["[0]" interpreter]
     ]]]
  ["[0]" / "_"
-  ["[1][0]" cli {"+" Service}]
   ["[1][0]" static {"+" Static}]
   ["[1][0]" export]
   ["[1][0]" import]])
@@ -148,7 +148,7 @@
     (do [! async.monad]
       [platform (async.future platform)]
       (case service
-        {/cli.#Compilation compilation}
+        {cli.#Compilation compilation}
         (<| (or_crash! "Compilation failed:")
             ..timed
             (do (try.with async.monad)
@@ -182,14 +182,14 @@
                              program_context)]
               (in (debug.log! "Compilation complete!"))))
 
-        {/cli.#Export export}
+        {cli.#Export export}
         (<| (or_crash! "Export failed:")
             (do (try.with async.monad)
               [_ (/export.export (value@ platform.#&file_system platform)
                                  export)]
               (in (debug.log! "Export complete!"))))
         
-        {/cli.#Interpretation interpretation}
+        {cli.#Interpretation interpretation}
         ... TODO: Fix the interpreter...
         (undefined)
         ... (<| (or_crash! "Interpretation failed:")
diff --git a/stdlib/source/program/compositor/cli.lux b/stdlib/source/program/compositor/cli.lux
deleted file mode 100644
index 1962569b3..000000000
--- a/stdlib/source/program/compositor/cli.lux
+++ /dev/null
@@ -1,81 +0,0 @@
-(.using
- [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)
-
-(type: .public Host_Dependency
-  Path)
-
-(type: .public Library
-  Path)
-
-(type: .public Target
-  Path)
-
-(type: .public Compilation
-  [(List Source) (List Host_Dependency) (List Library) Target Module])
-
-(type: .public Export
-  [(List Source) Target])
-
-(type: .public Service
-  (Variant
-   {#Compilation Compilation}
-   {#Interpretation Compilation}
-   {#Export Export}))
-
-(template [  ]
-  [(def: 
-     (Parser )
-     (cli.named  cli.any))]
-
-  [source_parser "--source" Source]
-  [host_dependency_parser "--host_dependency" Host_Dependency]
-  [library_parser "--library" Library]
-  [target_parser "--target" Target]
-  [module_parser "--module" Module]
-  )
-
-(def: .public service
-  (Parser Service)
-  ($_ <>.or
-      (<>.after (cli.this "build")
-                ($_ <>.and
-                    (<>.some ..source_parser)
-                    (<>.some ..host_dependency_parser)
-                    (<>.some ..library_parser)
-                    ..target_parser
-                    ..module_parser))
-      (<>.after (cli.this "repl")
-                ($_ <>.and
-                    (<>.some ..source_parser)
-                    (<>.some ..host_dependency_parser)
-                    (<>.some ..library_parser)
-                    ..target_parser
-                    ..module_parser))
-      (<>.after (cli.this "export")
-                ($_ <>.and
-                    (<>.some ..source_parser)
-                    ..target_parser))
-      ))
-
-(def: .public target
-  (-> Service Target)
-  (|>> (case> (^or {#Compilation [sources host_dependencies libraries target module]}
-                   {#Interpretation [sources host_dependencies libraries target module]}
-                   {#Export [sources target]})
-              target)))
diff --git a/stdlib/source/program/compositor/export.lux b/stdlib/source/program/compositor/export.lux
index cb19398e7..4ac08f423 100644
--- a/stdlib/source/program/compositor/export.lux
+++ b/stdlib/source/program/compositor/export.lux
@@ -1,32 +1,31 @@
 (.using
-  [library
-   [lux {"-" Source}
-    [abstract
-     ["[0]" monad {"+" do}]]
-    [control
-     ["[0]" try {"+" Try}]
-     [concurrency
-      ["[0]" async {"+" Async}]]]
-    [data
-     ["[0]" text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" dictionary]
-      ["[0]" sequence]]
-     [format
-      ["[0]" binary]
-      ["[0]" tar]]]
-    [time
-     ["[0]" instant]]
-    [tool
-     [compiler
-      [meta
-       ["[0]" io "_"
-        ["[1]" context {"+" Extension}]]]]]
-    [world
-     ["[0]" file]]]]
-  [//
-   [cli {"+" Source Export}]])
+ [library
+  [lux {"-" Source}
+   [abstract
+    ["[0]" monad {"+" do}]]
+   [control
+    ["[0]" try {"+" Try}]
+    [concurrency
+     ["[0]" async {"+" Async}]]]
+   [data
+    ["[0]" text
+     ["%" format {"+" format}]]
+    [collection
+     ["[0]" dictionary]
+     ["[0]" sequence]]
+    [format
+     ["[0]" binary]
+     ["[0]" tar]]]
+   [time
+    ["[0]" instant]]
+   [tool
+    [compiler
+     [meta
+      [cli {"+" Source Export}]
+      ["[0]" io "_"
+       ["[1]" context {"+" Extension}]]]]]
+   [world
+    ["[0]" file]]]])
 
 (def: file
   "library.tar")
diff --git a/stdlib/source/program/compositor/import.lux b/stdlib/source/program/compositor/import.lux
index 9554ec934..7f21f20ec 100644
--- a/stdlib/source/program/compositor/import.lux
+++ b/stdlib/source/program/compositor/import.lux
@@ -22,13 +22,9 @@
    [tool
     [compiler
      [meta
-      [archive
-       [module
-        [descriptor {"+" Module}]]]]]]
+      [cli {"+" Library Module}]]]]
    [world
-    ["[0]" file]]]]
- [//
-  [cli {"+" Library}]])
+    ["[0]" file]]]])
 
 (def: Action
   (type (All (_ a) (Async (Try a)))))
diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index b859f456f..e8a6a482d 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -449,78 +449,89 @@
                                                   (template.text [ "/" ])
                                                   (template.text [ "/"  "/" ])
                                                   (template.text [ "#[0]"])]
-                                 (and (~~ (template [ ]
+                                 (and (~~ (template [  ]
                                             [(with_expansions [' (macro.final )]
                                                (let [scenario (: (-> Any Bit)
                                                                  (function (_ _)
-                                                                   (case (' ['])
-                                                                     (^code )
-                                                                     true
-
-                                                                     _
-                                                                     false)))]
+                                                                   ... TODO: Remove this hack once Jython is no longer being used as the Python interpreter.
+                                                                   (`` (for [@.python (case (' ['])
+                                                                                        (^code [
+                                                                                                ("lux def" (~ [_ {.#Symbol ["" _]}]) [] #0)
+                                                                                                (~~ (template.spliced ))])
+                                                                                        true
+
+                                                                                        _
+                                                                                        false)]
+                                                                            (case (' ['])
+                                                                              (^code [ (~~ (template.spliced ))])
+                                                                              true
+
+                                                                              _
+                                                                              false)))))]
                                                  (scenario [])))]
 
                                             [(.using ['])
-                                             [("lux def module" [])]]
+                                             ("lux def module" [])
+                                             []]
                                             
                                             [(.using [ ' "*"])
-                                             [("lux def module" [[ ]])
-                                              (  "*")]]
+                                             ("lux def module" [[ ]])
+                                             [(  "*")]]
                                             
                                             [(.using [ ' {"+" }])
-                                             [("lux def module" [[ ]])
-                                              (  {"+" })]]
+                                             ("lux def module" [[ ]])
+                                             [(  {"+" })]]
                                             
                                             [(.using [ ' {"-" }])
-                                             [("lux def module" [[ ]])
-                                              (  {"-" })]]
+                                             ("lux def module" [[ ]])
+                                             [(  {"-" })]]
                                             
                                             [(.using [ ' "_"])
-                                             [("lux def module" [])]]
+                                             ("lux def module" [])
+                                             []]
                                             
                                             [(.using ['
                                                       [ ']])
-                                             [("lux def module" [[ ]])
-                                              ( )]]
+                                             ("lux def module" [[ ]])
+                                             [( )]]
                                             
                                             [(.using ["[0]" '
                                                       ["[0]" ']])
-                                             [("lux def module" [[ ]
-                                                                 [ ]])
-                                              ( )
+                                             ("lux def module" [[ ]
+                                                                [ ]])
+                                             [( )
                                               ( )]]
                                             
                                             [(.using ["[0]" ' "_"
                                                       ["[1]" ']])
-                                             [("lux def module" [[ ]])
-                                              ( )]]
+                                             ("lux def module" [[ ]])
+                                             [( )]]
 
                                             [(.using ["[0]" ' "_"
                                                       ["[1]" ' "_"
                                                        ["[2]" ']]])
-                                             [("lux def module" [[ ]])
-                                              ( )]]
+                                             ("lux def module" [[ ]])
+                                             [( )]]
                                             
                                             [(.using ['
                                                       ["[0]" '
                                                        ["[0]" ']]])
-                                             [("lux def module" [[ ]
-                                                                 [ ]])
-                                              ( )
+                                             ("lux def module" [[ ]
+                                                                [ ]])
+                                             [( )
                                               ( )]]
                                             
                                             [(.using ["[0]" '
                                                       ['
                                                        ["[0]" <\\>']]])
-                                             [("lux def module" [[ ]
-                                                                 [ <\\>]])
-                                              ( )
+                                             ("lux def module" [[ ]
+                                                                [ <\\>]])
+                                             [( )
                                               ( )]]
                                             
                                             [(.using ["[0]" ' ("[1]#[0]" )])
-                                             [("lux def module" [[ ]])
-                                              (  ( ))]]
+                                             ("lux def module" [[ ]])
+                                             [(  ( ))]]
                                             ))))))
                   ))))))
 
diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux
index f77fbc54f..7684d7b96 100644
--- a/stdlib/source/test/lux/ffi.jvm.lux
+++ b/stdlib/source/test/lux/ffi.jvm.lux
@@ -4,11 +4,12 @@
    ["_" test {"+" Test}]
    ["[0]" type ("[1]#[0]" equivalence)]
    ["[0]" meta]
+   ["[0]" debug]
    [abstract
     [monad {"+" do}]]
    [control
     [pipe {"+" case>}]
-    ["[0]" try]
+    ["[0]" try ("[1]#[0]" functor)]
     ["[0]" exception]
     [parser
      ["<[0]>" code]]]
@@ -27,7 +28,10 @@
     [number
      ["n" nat]
      ["i" int ("[1]#[0]" equivalence)]
-     ["f" frac ("[1]#[0]" equivalence)]]]]]
+     ["f" frac ("[1]#[0]" equivalence)]]]
+   [target
+    ["[0]" jvm "_"
+     ["[1]" type ("[1]#[0]" equivalence)]]]]]
  [\\library
   ["[0]" /]])
 
@@ -597,18 +601,39 @@
 
 (def: for_exception
   Test
-  ($_ _.and
-      (_.cover [/.class_names_cannot_contain_periods]
-               (with_expansions [ (template.symbol ["java.lang.Float"])]
-                 (not (expands? (/.import: )))))
-      (_.cover [/.class_name_cannot_be_a_type_variable]
-               (and (not (expands? (/.import: (java/lang/Double a)
-                                     ["[1]::[0]"
-                                      (invalid [] (a java/lang/String))])))
-                    (not (expands? (/.import: java/lang/Double
-                                     ["[1]::[0]"
-                                      ([a] invalid [] (a java/lang/String))])))))
-      ))
+  (do [! random.monad]
+    [var/0 (random.ascii/lower 1)
+     var/1 (random.ascii/lower 2)
+     var/2 (random.ascii/lower 3)]
+    ($_ _.and
+        (_.cover [/.class_names_cannot_contain_periods]
+                 (with_expansions [ (template.symbol ["java.lang.Float"])]
+                   (not (expands? (/.import: )))))
+        (_.cover [/.class_name_cannot_be_a_type_variable]
+                 (and (not (expands? (/.import: (java/lang/Double a)
+                                       ["[1]::[0]"
+                                        (invalid [] (a java/lang/String))])))
+                      (not (expands? (/.import: java/lang/Double
+                                       ["[1]::[0]"
+                                        ([a] invalid [] (a java/lang/String))])))))
+        (_.cover [/.unknown_type_variable]
+                 (let [type_variable ((debug.private /.type_variable) (list (jvm.var var/0) (jvm.var var/1)))]
+                   (and (|> (list (code.local_symbol var/0))
+                            (.result type_variable)
+                            (try#each (|>> (jvm#= (jvm.var var/0))))
+                            (try.else false))
+                        (|> (list (code.local_symbol var/1))
+                            (.result type_variable)
+                            (try#each (|>> (jvm#= (jvm.var var/1))))
+                            (try.else false))
+                        (|> (list (code.local_symbol var/2))
+                            (.result type_variable)
+                            (case> {try.#Failure error}
+                                   (exception.match? /.unknown_type_variable error)
+                                   
+                                   _
+                                   false)))))
+        )))
 
 (def: .public test
   (<| (_.covering /._)
diff --git a/stdlib/source/test/lux/tool.lux b/stdlib/source/test/lux/tool.lux
index 6fa62a7da..2291880ec 100644
--- a/stdlib/source/test/lux/tool.lux
+++ b/stdlib/source/test/lux/tool.lux
@@ -20,7 +20,8 @@
       ... ["[1]/[0]" synthesis]
       ]]]
    ["[1][0]" meta "_"
-    ["[1]/[0]" archive]]
+    ["[1]/[0]" archive]
+    ["[1]/[0]" cli]]
    ]])
 
 (def: .public test
@@ -32,6 +33,7 @@
       /phase.test
       /analysis.test
       /meta/archive.test
+      /meta/cli.test
       /phase/extension.test
       /phase/analysis/simple.test
       /phase/analysis/complex.test
diff --git a/stdlib/source/test/lux/tool/compiler/meta/cli.lux b/stdlib/source/test/lux/tool/compiler/meta/cli.lux
new file mode 100644
index 000000000..7c5f0266e
--- /dev/null
+++ b/stdlib/source/test/lux/tool/compiler/meta/cli.lux
@@ -0,0 +1,119 @@
+(.using
+ [library
+  [lux "*"
+   ["_" test {"+" Test}]
+   [abstract
+    [monad {"+" do}]]
+   [control
+    [pipe {"+" case>}]
+    ["[0]" try ("[1]#[0]" functor)]
+    ["<>" parser
+     ["<[0]>" cli]]]
+   [data
+    ["[0]" product]
+    ["[0]" text]
+    [collection
+     ["[0]" list ("[1]#[0]" monoid monad)]]]
+   [math
+    ["[0]" random]
+    [number
+     ["n" nat]]]]]
+ [\\library
+  ["[0]" /]])
+
+(def: .public test
+  Test
+  (<| (_.covering /._)
+      (_.for [/.Service /.service])
+      (let [(^open "list#[0]") (list.equivalence text.equivalence)])
+      (do [! random.monad]
+        [amount (# ! each (|>> (n.% 5) ++) random.nat)
+         sources (random.list amount (random.ascii/lower 1))
+         host_dependencies (random.list amount (random.ascii/lower 2))
+         libraries (random.list amount (random.ascii/lower 3))
+         target (random.ascii/lower 4)
+         module (random.ascii/lower 5)
+         .let [compilation' ($_ list#composite
+                                (list#conjoint (list#each (|>> (list "--source")) sources))
+                                (list#conjoint (list#each (|>> (list "--host_dependency")) host_dependencies))
+                                (list#conjoint (list#each (|>> (list "--library")) libraries))
+                                (list "--target" target)
+                                (list "--module" module))
+               export ($_ list#composite
+                          (list#conjoint (list#each (|>> (list "--source")) sources))
+                          (list "--target" target))]]
+        ($_ _.and
+            (_.for [/.Compilation]
+                   (`` ($_ _.and
+                           (~~ (template [  ]
+                                 [(_.cover []
+                                           (|> (list& "build" compilation')
+                                               (.result /.service)
+                                               (try#each (|>> (case> {/.#Compilation it}
+                                                                     (|> it
+                                                                         (value@ )
+                                                                         )
+                                                                     
+                                                                     _
+                                                                     false)))
+                                               (try.else false)))]
+
+                                 [/.Source /.#sources (list#= sources)]
+                                 [/.Host_Dependency /.#host_dependencies (list#= host_dependencies)]
+                                 [/.Library /.#libraries (list#= libraries)]
+                                 [/.Target /.#target (same? target)]
+                                 [/.Module /.#module (same? module)]
+                                 ))
+                           )))
+            (_.cover [/.Interpretation]
+                     (`` (and (~~ (template [ ]
+                                    [(|> (list& "repl" compilation')
+                                         (.result /.service)
+                                         (try#each (|>> (case> {/.#Interpretation it}
+                                                               (|> it
+                                                                   (value@ )
+                                                                   )
+                                                               
+                                                               _
+                                                               false)))
+                                         (try.else false))]
+
+                                    [/.#sources (list#= sources)]
+                                    [/.#host_dependencies (list#= host_dependencies)]
+                                    [/.#libraries (list#= libraries)]
+                                    [/.#target (same? target)]
+                                    [/.#module (same? module)]
+                                    )))))
+            (_.cover [/.Export]
+                     (`` (and (~~ (template [ ]
+                                    [(|> (list& "export" export)
+                                         (.result /.service)
+                                         (try#each (|>> (case> {/.#Export it}
+                                                               (|> it
+                                                                   
+                                                                   )
+                                                               
+                                                               _
+                                                               false)))
+                                         (try.else false))]
+
+                                    [product.left (list#= sources)]
+                                    [product.right (same? target)]
+                                    )))))
+            (_.cover [/.target]
+                     (`` (and (~~ (template []
+                                    [(same? target (/.target ))]
+
+                                    [{/.#Compilation [/.#sources sources
+                                                      /.#host_dependencies host_dependencies
+                                                      /.#libraries libraries
+                                                      /.#target target
+                                                      /.#module module]}]
+                                    [{/.#Interpretation [/.#sources sources
+                                                         /.#host_dependencies host_dependencies
+                                                         /.#libraries libraries
+                                                         /.#target target
+                                                         /.#module module]}]
+                                    [{/.#Export [sources target]}]
+                                    )))))
+            ))))
-- 
cgit v1.2.3