From 617069b3986e9271d6e73191b899aa914e430dd6 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 8 Jan 2023 02:13:36 -0400 Subject: Moved compiler target machinery under meta/compiler. --- lux-jvm/source/program.lux | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'lux-jvm/source') diff --git a/lux-jvm/source/program.lux b/lux-jvm/source/program.lux index a6c07bbd4..a597ce394 100644 --- a/lux-jvm/source/program.lux +++ b/lux-jvm/source/program.lux @@ -17,12 +17,12 @@ [collection [array (.only Array)]]] [meta - ["@" target (.only) - ["[0]" jvm - [bytecode (.only Bytecode)] - ["[1]/[0]" type - ["[1]/[0]" box]]]] - [compiler (.only) + [compiler + ["@" target (.only) + ["[0]" jvm + [bytecode (.only Bytecode)] + ["[1]/[0]" type + ["[1]/[0]" box]]]] [default ["[0]" platform (.only Platform)]] [meta @@ -157,16 +157,12 @@ (-> Any (Async Any)) (async.future (of world/environment.default exit +0))) -(def lux_compiler - (-> Any platform.Custom) - (|>> as_expected)) - (def _ (program [service cli.service] (let [context (context.jvm (cli.target service))] (exec (do async.monad [[loader host platform] (async.future ..platform) - _ (compositor.compiler ..lux_compiler + _ (compositor.compiler (|>> (as platform.Custom)) context ..expander (analysis.bundle loader host) -- cgit v1.2.3