diff options
Diffstat (limited to 'stdlib/source/spec/compositor/common.lux')
-rw-r--r-- | stdlib/source/spec/compositor/common.lux | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/stdlib/source/spec/compositor/common.lux b/stdlib/source/spec/compositor/common.lux index 7b1c940fb..05fbe7fc2 100644 --- a/stdlib/source/spec/compositor/common.lux +++ b/stdlib/source/spec/compositor/common.lux @@ -9,7 +9,7 @@ [compiler ["." reference] ["." synthesis (#+ Synthesis)] - ["." statement] + ["." directive] ["." phase ["." macro (#+ Expander)] ["." generation (#+ Operation Bundle)] @@ -22,9 +22,9 @@ (type: #export Definer (-> Name Synthesis (Try Any))) (type: #export (Instancer what) - (All [anchor expression statement] - (-> (Platform IO anchor expression statement) - (generation.State+ anchor expression statement) + (All [anchor expression directive] + (-> (Platform IO anchor expression directive) + (generation.State+ anchor expression directive) what))) (def: (runner (^slots [#platform.runtime #platform.phase #platform.host]) state) @@ -48,27 +48,27 @@ (do phase.monad [_ runtime expressionG (phase expressionS) - [host-name host-value host-statement] (generation.define! lux-name expressionG) + [host-name host-value host-directive] (generation.define! lux-name expressionG) _ (generation.learn lux-name host-name)] (phase (synthesis.constant lux-name))))] (:: host evaluate! "definer" definitionG)))) (def: #export (executors platform bundle expander program) - (All [anchor expression statement] - (-> (Platform IO anchor expression statement) - (Bundle anchor expression statement) + (All [anchor expression directive] + (-> (Platform IO anchor expression directive) + (Bundle anchor expression directive) Expander - (-> expression statement) - (IO (Try [(statement.State+ anchor expression statement) + (-> expression directive) + (IO (Try [(directive.State+ anchor expression directive) Runner Definer])))) (do io.monad [?state (platform.initialize expander platform bundle program)] (wrap (do try.monad - [[statement-bundle statement-state] ?state - #let [generation-state (get@ [#statement.generation - #statement.state] - statement-state)]] - (wrap [[statement-bundle statement-state] + [[directive-bundle directive-state] ?state + #let [generation-state (get@ [#directive.generation + #directive.state] + directive-state)]] + (wrap [[directive-bundle directive-state] (..runner platform generation-state) (..definer platform generation-state)]))))) |