diff options
Diffstat (limited to '')
-rw-r--r-- | stdlib/source/lux/tool/compiler/default/evaluation.lux | 12 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/default/init.lux | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/stdlib/source/lux/tool/compiler/default/evaluation.lux b/stdlib/source/lux/tool/compiler/default/evaluation.lux index 3310a1fd1..42bb10ca0 100644 --- a/stdlib/source/lux/tool/compiler/default/evaluation.lux +++ b/stdlib/source/lux/tool/compiler/default/evaluation.lux @@ -9,13 +9,13 @@ [/// ["." phase [macro (#+ Expander)] - ["." analysis + [".P" analysis ["." type]] - ["." synthesis - [".S" expression]] + [".P" synthesis] ["." translation] [// - [analysis (#+ Operation)]]]]) + [analysis (#+ Operation)] + ["." synthesis]]]]) (type: #export Eval (-> Nat Type Code (Operation Any))) @@ -27,13 +27,13 @@ (translation.State+ anchor expression statement) (translation.Phase anchor expression statement) Eval)) - (let [analyze (analysis.phase expander)] + (let [analyze (analysisP.phase expander)] (function (eval count type exprC) (do phase.monad [exprA (type.with-type type (analyze exprC))] (phase.lift (do error.monad - [exprS (|> exprA expressionS.phase (phase.run synthesis-state))] + [exprS (|> exprA synthesisP.phase (phase.run synthesis-state))] (phase.run translation-state (do phase.monad [exprO (translate exprS)] diff --git a/stdlib/source/lux/tool/compiler/default/init.lux b/stdlib/source/lux/tool/compiler/default/init.lux index 41ecc851a..0958c3b01 100644 --- a/stdlib/source/lux/tool/compiler/default/init.lux +++ b/stdlib/source/lux/tool/compiler/default/init.lux @@ -18,13 +18,13 @@ ["." evaluation] ["/." // (#+ Instancer) ["." analysis] + ["." synthesis] ["." host] ["." phase [macro (#+ Expander)] [".P" analysis ["." module]] - ["." synthesis - [".S" expression]] + [".P" synthesis] ["." translation] ["." statement [".S" total]] @@ -84,7 +84,7 @@ {#statement.analysis {#statement.state analysis-state #statement.phase (analysisP.phase expander)} #statement.synthesis {#statement.state synthesis-state - #statement.phase expressionS.phase} + #statement.phase synthesisP.phase} #statement.translation {#statement.state translation-state #statement.phase translate}}])) |