diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/source/lux/tool/compiler/default/init.lux | 10 | ||||
| -rw-r--r-- | stdlib/source/lux/tool/compiler/default/platform.lux | 6 | ||||
| -rw-r--r-- | stdlib/source/lux/tool/compiler/language/lux/syntax.lux (renamed from stdlib/source/lux/tool/compiler/default/syntax.lux) | 0 | ||||
| -rw-r--r-- | stdlib/source/program/compositor.lux | 6 |
4 files changed, 14 insertions, 8 deletions
diff --git a/stdlib/source/lux/tool/compiler/default/init.lux b/stdlib/source/lux/tool/compiler/default/init.lux index dc94f5507..370894d26 100644 --- a/stdlib/source/lux/tool/compiler/default/init.lux +++ b/stdlib/source/lux/tool/compiler/default/init.lux @@ -16,8 +16,10 @@ [world ["." file]]] ["." // - ["#." syntax (#+ Aliases)] ["/#" // (#+ Instancer) + [language + [lux + ["." syntax (#+ Aliases)]]] ["#." analysis [macro (#+ Expander)] ["#/." evaluation]] @@ -80,7 +82,7 @@ (-> Module Aliases Source (///analysis.Operation Reader)) (function (_ [bundle state]) (#try.Success [[bundle state] - (//syntax.parse current-module aliases ("lux text size" source-code))]))) + (syntax.parse current-module aliases ("lux text size" source-code))]))) (def: (read source reader) (-> Source Reader (///analysis.Operation [Source Code])) @@ -175,7 +177,7 @@ (#try.Success [state (#.Some source&requirements&buffer)]) (#try.Failure error) - (if (ex.match? //syntax.end-of-file error) + (if (ex.match? syntax.end-of-file error) (#try.Success [state #.None]) (ex.with-stack ///.cannot-compile module (#try.Failure error))))))) @@ -204,7 +206,7 @@ (..begin dependencies hash input)) #let [module (get@ #///.module input)]] (loop [iteration (<| (///phase.run' state) - (..iterate expander module source buffer //syntax.no-aliases))] + (..iterate expander module source buffer syntax.no-aliases))] (do @ [[state ?source&requirements&buffer] iteration] (case ?source&requirements&buffer diff --git a/stdlib/source/lux/tool/compiler/default/platform.lux b/stdlib/source/lux/tool/compiler/default/platform.lux index 3c26cc232..c6df2955e 100644 --- a/stdlib/source/lux/tool/compiler/default/platform.lux +++ b/stdlib/source/lux/tool/compiler/default/platform.lux @@ -18,8 +18,10 @@ ["." file (#+ File)]]] ["." // #_ ["#." init] - ["#." syntax] ["/#" // + [language + [lux + ["." syntax]]] ["#." analysis [macro (#+ Expander)]] ["#." generation (#+ Buffer)] @@ -151,7 +153,7 @@ {<State+> state} {(///.Compiler <State+> .Module Any) - ((//init.compiler expander //syntax.prelude) //init.key (list))})] + ((//init.compiler expander syntax.prelude) //init.key (list))})] (loop [module source-module [archive state] [archive state]] (if (archive.archived? archive module) diff --git a/stdlib/source/lux/tool/compiler/default/syntax.lux b/stdlib/source/lux/tool/compiler/language/lux/syntax.lux index 0b938b49a..0b938b49a 100644 --- a/stdlib/source/lux/tool/compiler/default/syntax.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/syntax.lux diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux index 8324df002..4faa66057 100644 --- a/stdlib/source/program/compositor.lux +++ b/stdlib/source/program/compositor.lux @@ -35,8 +35,10 @@ ["." phase [extension (#+ Extender)]] [default - ["." platform (#+ Platform)] - ["." syntax]] + ["." platform (#+ Platform)]] + [language + [lux + ["." syntax]]] [meta ["." archive (#+ Archive)]]] ## ["." interpreter] |