Refactored the machinery to make local macros into its own module.

4 files changed, 7 insertions, 7 deletions

diff --git a/stdlib/source/lux/tool/compiler/default/init.lux b/stdlib/source/lux/tool/compiler/default/init.lux
index 781383df8..e697f62a9 100644
--- a/stdlib/source/lux/tool/compiler/default/init.lux
+++ b/stdlib/source/lux/tool/compiler/default/init.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux (#- Module)
-   ["@" target (#+ Host)]
+   ["@" target (#+ Target)]
    [abstract
     ["." monad (#+ do)]]
    [control
@@ -51,7 +51,7 @@
 
 (def: #export (state target module expander host_analysis host generate generation_bundle host_directive_bundle program anchorT,expressionT,directiveT extender)
   (All [anchor expression directive]
-    (-> Host
+    (-> Target
         Module
         Expander
         ///analysis.Bundle
diff --git a/stdlib/source/lux/tool/compiler/default/platform.lux b/stdlib/source/lux/tool/compiler/default/platform.lux
index a89ddd43e..d505f5f7c 100644
--- a/stdlib/source/lux/tool/compiler/default/platform.lux
+++ b/stdlib/source/lux/tool/compiler/default/platform.lux
@@ -2,7 +2,7 @@
   [lux (#- Module)
    [type (#+ :share)]
    ["." debug]
-   ["@" target (#+ Host)]
+   ["@" target]
    [abstract
     ["." monad (#+ Monad do)]]
    [control
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
index 4203516d4..bb5587dfe 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
@@ -934,7 +934,7 @@
                                        (wrap [])
                                        (do !
                                          [from_class (phase.lift (reflection!.load from_name))]
-                                         (phase.assert cannot_cast [fromT toT fromC]
+                                         (phase.assert ..cannot_cast [fromT toT fromC]
                                                        (java/lang/Class::isAssignableFrom from_class to_class))))]
                                   (loop [[current_name currentT] [from_name fromT]]
                                     (if (text\= to_name current_name)
diff --git a/stdlib/source/lux/tool/compiler/meta/io/archive.lux b/stdlib/source/lux/tool/compiler/meta/io/archive.lux
index 8cf7fdcc2..7fe4b96a9 100644
--- a/stdlib/source/lux/tool/compiler/meta/io/archive.lux
+++ b/stdlib/source/lux/tool/compiler/meta/io/archive.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux (#- Module)
-   ["@" target (#+ Host)]
+   ["@" target (#+ Target)]
    [abstract
     [predicate (#+ Predicate)]
     ["." monad (#+ do)]]
@@ -171,11 +171,11 @@
           (document.parser $.parser)))
 
 (def: (fresh_analysis_state host)
-  (-> Host .Lux)
+  (-> Target .Lux)
   (analysis.state (analysis.info version.version host)))
 
 (def: (analysis_state host archive)
-  (-> Host Archive (Try .Lux))
+  (-> Target Archive (Try .Lux))
   (do {! try.monad}
     [modules (: (Try (List [Module .Module]))
                 (monad.map ! (function (_ module)