Re-located generation infrastructure.

1 files changed, 15 insertions, 15 deletions

diff --git a/stdlib/source/lux/tool/compiler/default/platform.lux b/stdlib/source/lux/tool/compiler/default/platform.lux
index 23b1c5b6c..3c26cc232 100644
--- a/stdlib/source/lux/tool/compiler/default/platform.lux
+++ b/stdlib/source/lux/tool/compiler/default/platform.lux
@@ -22,11 +22,11 @@
    ["/#" //
     ["#." analysis
      [macro (#+ Expander)]]
+    ["#." generation (#+ Buffer)]
     ["#." directive]
     ["#." phase
      ## TODO: Get rid of this import ASAP
      ["." extension (#+ Extender)]
-     ["." generation (#+ Buffer)]
      [analysis
       ["." module]]]
     [meta
@@ -40,9 +40,9 @@
 
 (type: #export (Platform anchor expression directive)
   {#&file-system (file.System Promise)
-   #host (generation.Host expression directive)
-   #phase (generation.Phase anchor expression directive)
-   #runtime (generation.Operation anchor expression directive Any)})
+   #host (///generation.Host expression directive)
+   #phase (///generation.Phase anchor expression directive)
+   #runtime (///generation.Operation anchor expression directive Any)})
 
 ## (def: (write-module target-dir file-name module-name module outputs)
 ##   (-> File Text Text Module Outputs (Process Any))
@@ -56,37 +56,37 @@
 (with-expansions [<type-vars> (as-is [anchor expression directive])
                   <Platform> (as-is (Platform anchor expression directive))
                   <State+> (as-is (///directive.State+ anchor expression directive))
-                  <Bundle> (as-is (generation.Bundle anchor expression directive))]
+                  <Bundle> (as-is (///generation.Bundle anchor expression directive))]
 
   (def: pause-context
     (All <type-vars>
-      (-> <State+> generation.Context))
-    (get@ [#extension.state #///directive.generation #///directive.state #extension.state #generation.context]))
+      (-> <State+> ///generation.Context))
+    (get@ [#extension.state #///directive.generation #///directive.state #extension.state #///generation.context]))
 
   (def: (resume-context context state)
     (All <type-vars>
-      (-> generation.Context <State+> <State+>))
-    (set@ [#extension.state #///directive.generation #///directive.state #extension.state #generation.context]
+      (-> ///generation.Context <State+> <State+>))
+    (set@ [#extension.state #///directive.generation #///directive.state #extension.state #///generation.context]
           context
           state))
 
   ## TODO: Inline ASAP
   (def: initialize-buffer!
     (All <type-vars>
-      (generation.Operation anchor expression directive Any))
-    (generation.set-buffer generation.empty-buffer))
+      (///generation.Operation anchor expression directive Any))
+    (///generation.set-buffer ///generation.empty-buffer))
 
   ## TODO: Inline ASAP
   (def: compile-runtime!
     (All <type-vars>
-      (-> <Platform> (generation.Operation anchor expression directive Any)))
+      (-> <Platform> (///generation.Operation anchor expression directive Any)))
     (get@ #runtime))
 
   ## TODO: Inline ASAP
   (def: save-runtime-buffer!
     (All <type-vars>
-      (generation.Operation anchor expression directive (Buffer directive)))
-    (generation.save-buffer! ""))
+      (///generation.Operation anchor expression directive (Buffer directive)))
+    (///generation.save-buffer! ""))
   
   (def: #export (initialize target expander host-analysis platform generation-bundle host-directive-bundle program extender)
     (All <type-vars>
@@ -171,7 +171,7 @@
                ## _ (write-module target-dir file-name (get@ #cli.module configuration) module outputs)
                ]
               (loop [archive archive
-                     state (..resume-context (generation.fresh-context module) state)
+                     state (..resume-context (///generation.fresh-context module) state)
                      compilation (compiler (:coerce ///.Input input))]
                 (do @
                   [#let [dependencies (get@ #///.dependencies compilation)