From 1888b5c3288e4e7653a424e7314ea5c8277ab360 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Thu, 16 Apr 2020 00:22:24 -0400
Subject: Generating definition names in a new way.

---
 stdlib/source/program/compositor.lux | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'stdlib/source/program')

diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux
index 886582c34..371dbdec7 100644
--- a/stdlib/source/program/compositor.lux
+++ b/stdlib/source/program/compositor.lux
@@ -37,7 +37,7 @@
        ["." syntax]
        ["." analysis
         [macro (#+ Expander)]]
-       ["." generation]
+       ["." generation (#+ Buffer)]
        ["." directive]
        [phase
         [extension (#+ Extender)]]]]
@@ -46,8 +46,8 @@
        [descriptor (#+ Module)]]]]
     ## ["." interpreter]
     ]]
-  [/
-   ["." cli (#+ Service)]])
+  ["." / #_
+   ["#." cli (#+ Service)]])
 
 (def: (or-crash! failure-description action)
   (All [a]
@@ -90,7 +90,7 @@
   ##       (promise@wrap (#try.Failure error)))))
 
   (def: #export (compiler target partial-host-extension
-                          expander host-analysis platform host module generation-bundle host-directive-bundle program extender
+                          expander host-analysis platform host generation-bundle host-directive-bundle program extender
                           service
                           packager,package)
     (All [<parameters>]
@@ -100,7 +100,6 @@
           analysis.Bundle
           (IO (Platform <parameters>))
           Host
-          Module
           (generation.Bundle <parameters>)
           (directive.Bundle <parameters>)
           (-> expression artifact)
@@ -114,14 +113,15 @@
                    promise.future
                    (:: @ map (|>> try.assume console.async)))]
       (case service
-        (#cli.Compilation configuration)
+        (#/cli.Compilation configuration)
         (<| (or-crash! "Compilation failed:")
             (do (try.with promise.monad)
-              [state (:share [<parameters>]
-                             {(Platform <parameters>)
-                              platform}
-                             {(Promise (Try (directive.State+ <parameters>)))
-                              (platform.initialize target host module expander host-analysis platform generation-bundle host-directive-bundle program extender)})
+              [[state runtime-buffer] (:share [<parameters>]
+                                              {(Platform <parameters>)
+                                               platform}
+                                              {(Promise (Try [(directive.State+ <parameters>)
+                                                              (Buffer artifact)]))
+                                               (platform.initialize target host (get@ #/cli.module configuration) expander host-analysis platform generation-bundle host-directive-bundle program extender)})
                [archive state] (:share [<parameters>]
                                        {(Platform <parameters>)
                                         platform}
@@ -132,7 +132,7 @@
                ]
               (wrap (log! "Compilation complete!"))))
         
-        (#cli.Interpretation configuration)
+        (#/cli.Interpretation configuration)
         ## TODO: Fix the interpreter...
         (undefined)
         ## (<| (or-crash! "Interpretation failed:")
-- 
cgit v1.2.3