diff options
Diffstat (limited to '')
| -rw-r--r-- | stdlib/source/program/compositor.lux | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux index 2a6f9bfd4..1725e80e5 100644 --- a/stdlib/source/program/compositor.lux +++ b/stdlib/source/program/compositor.lux @@ -26,7 +26,7 @@ [tool [compiler ["." analysis] - ["." statement] + ["." directive] ["." phase [macro (#+ Expander)] ["." generation]] @@ -58,17 +58,17 @@ (wrap output)))) (def: (save-artifacts! system state) - (All [anchor expression statement] + (All [anchor expression directive] (-> (file.System IO) - (statement.State+ anchor expression statement) + (directive.State+ anchor expression directive) (IO (Try Any)))) (let [?outcome (phase.run' state - (:share [anchor expression statement] - {(statement.State+ anchor expression statement) + (:share [anchor expression directive] + {(directive.State+ anchor expression directive) state} - {(statement.Operation anchor expression statement - (generation.Output statement)) - (statement.lift-generation generation.output)}))] + {(directive.Operation anchor expression directive + (generation.Output directive)) + (directive.lift-generation generation.output)}))] (case ?outcome (#try.Success [state output]) (do (try.with io.monad) @@ -79,16 +79,16 @@ (#try.Failure error) (:: io.monad wrap (#try.Failure error))))) -(def: #export (compiler target partial-host-extension expander host-analysis platform generation-bundle host-statement-bundle program service) - (All [anchor expression statement] +(def: #export (compiler target partial-host-extension expander host-analysis platform generation-bundle host-directive-bundle program service) + (All [anchor expression directive] (-> Text Text Expander analysis.Bundle - (IO (Platform IO anchor expression statement)) - (generation.Bundle anchor expression statement) - (statement.Bundle anchor expression statement) - (-> expression statement) + (IO (Platform IO anchor expression directive)) + (generation.Bundle anchor expression directive) + (directive.Bundle anchor expression directive) + (-> expression directive) Service (IO Any))) (do io.monad @@ -98,15 +98,15 @@ (#cli.Compilation configuration) (<| (or-crash! "Compilation failed:") (do (try.with io.monad) - [state (:share [anchor expression statement] - {(Platform IO anchor expression statement) + [state (:share [anchor expression directive] + {(Platform IO anchor expression directive) platform} - {(IO (Try (statement.State+ anchor expression statement))) - (platform.initialize target expander host-analysis platform generation-bundle host-statement-bundle program)}) - [archive state] (:share [anchor expression statement] - {(Platform IO anchor expression statement) + {(IO (Try (directive.State+ anchor expression directive))) + (platform.initialize target expander host-analysis platform generation-bundle host-directive-bundle program)}) + [archive state] (:share [anchor expression directive] + {(Platform IO anchor expression directive) platform} - {(IO (Try [Archive (statement.State+ anchor expression statement)])) + {(IO (Try [Archive (directive.State+ anchor expression directive)])) (platform.compile partial-host-extension expander platform configuration archive.empty state)}) _ (save-artifacts! (get@ #platform.&file-system platform) state) ## _ (cache/io.clean target ...) |