diff options
Diffstat (limited to 'new-luxc/source/program.lux')
| -rw-r--r-- | new-luxc/source/program.lux | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/new-luxc/source/program.lux b/new-luxc/source/program.lux index b579b0df0..f22d9ef58 100644 --- a/new-luxc/source/program.lux +++ b/new-luxc/source/program.lux @@ -22,8 +22,8 @@ [compiler [phase ["." macro (#+ Expander)] - ["." extension #_ - [analysis + [extension + ["." analysis #_ ["#" jvm]]]] [default ["." platform (#+ Platform)]]]]] @@ -36,15 +36,13 @@ ["_" jvm ["$d" def] ["$i" inst]]] - [directive - [".S" jvm]] + ["." directive #_ + ["#" jvm]] [translation ["." jvm ["." runtime] ["." expression] - [procedure - [".E" common] - [".E" host]]]]]]) + ["translation" extension]]]]]) (import: #long java/lang/reflect/Method (invoke [java/lang/Object [java/lang/Object]] #try java/lang/Object)) @@ -80,7 +78,7 @@ (host.array-write 1 (:coerce java/lang/Object lux))) apply-method)))) -(def: #export jvm +(def: #export platform (IO (Platform IO _.Anchor _.Inst _.Definition)) (do io.monad [host jvm.host] @@ -156,18 +154,13 @@ $i.POP $i.RETURN))))])) -(def: #export bundle - _.Bundle - (dictionary.merge commonE.bundle - hostE.bundle)) - (program: [{service /cli.service}] (/.compiler @.jvm ".jvm" ..expander - extension.bundle - ..jvm - ..bundle - jvmS.bundle + analysis.bundle + ..platform + translation.bundle + directive.bundle ..program service)) |