From d772fe99d5d4990c6774481fb64d12280cdb6aae Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Thu, 19 Aug 2021 04:59:06 -0400
Subject: Enabled compile-time code evaluation (i.e. "eval" function).

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

(limited to 'stdlib/source/program/compositor.lux')

diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux
index 7f0e29903..184914216 100644
--- a/stdlib/source/program/compositor.lux
+++ b/stdlib/source/program/compositor.lux
@@ -121,10 +121,10 @@
           analysis.Bundle
           (IO (Platform <parameters>))
           (generation.Bundle <parameters>)
-          (-> platform.Phase_Wrapper (directive.Bundle <parameters>))
+          (-> phase.Wrapper (directive.Bundle <parameters>))
           (Program expression artifact)
           [Type Type Type]
-          (-> platform.Phase_Wrapper Extender)
+          (-> phase.Wrapper Extender)
           Service
           [Packager file.Path]
           (Async Any)))
@@ -137,20 +137,21 @@
             (do (try.with async.monad)
               [.let [[compilation_sources compilation_host_dependencies compilation_libraries compilation_target compilation_module] compilation]
                import (/import.import (value@ #platform.&file_system platform) compilation_libraries)
-               [state archive] (:sharing [<parameters>]
-                                         (Platform <parameters>)
-                                         platform
-                                         
-                                         (Async (Try [(directive.State+ <parameters>)
-                                                      Archive]))
-                                         (:expected (platform.initialize static compilation_module expander host_analysis platform generation_bundle host_directive_bundle program anchorT,expressionT,directiveT extender
-                                                                         import compilation_sources)))
+               [state archive phase_wrapper] (:sharing [<parameters>]
+                                                       (Platform <parameters>)
+                                                       platform
+                                                       
+                                                       (Async (Try [(directive.State+ <parameters>)
+                                                                    Archive
+                                                                    phase.Wrapper]))
+                                                       (:expected (platform.initialize static compilation_module expander host_analysis platform generation_bundle host_directive_bundle program anchorT,expressionT,directiveT extender
+                                                                                       import compilation_sources)))
                [archive state] (:sharing [<parameters>]
                                          (Platform <parameters>)
                                          platform
                                          
                                          (Async (Try [Archive (directive.State+ <parameters>)]))
-                                         (:expected (platform.compile import static expander platform compilation [archive state])))
+                                         (:expected (platform.compile phase_wrapper import static expander platform compilation [archive state])))
                _ (ioW.freeze (value@ #platform.&file_system platform) static archive)
                program_context (async\in ($/program.context archive))
                host_dependencies (..load_host_dependencies (value@ #platform.&file_system platform) compilation_host_dependencies)
-- 
cgit v1.2.3