diff options
Diffstat (limited to '')
73 files changed, 68 insertions, 64 deletions
diff --git a/stdlib/source/lux/host/js.lux b/stdlib/source/lux/target/js.lux index 756530817..756530817 100644 --- a/stdlib/source/lux/host/js.lux +++ b/stdlib/source/lux/target/js.lux diff --git a/stdlib/source/lux/host/jvm/attribute.lux b/stdlib/source/lux/target/jvm/attribute.lux index bcd3a3734..bcd3a3734 100644 --- a/stdlib/source/lux/host/jvm/attribute.lux +++ b/stdlib/source/lux/target/jvm/attribute.lux diff --git a/stdlib/source/lux/host/jvm/class.lux b/stdlib/source/lux/target/jvm/class.lux index 6fb6f48d4..6fb6f48d4 100644 --- a/stdlib/source/lux/host/jvm/class.lux +++ b/stdlib/source/lux/target/jvm/class.lux diff --git a/stdlib/source/lux/host/jvm/constant.lux b/stdlib/source/lux/target/jvm/constant.lux index 3af24af55..3af24af55 100644 --- a/stdlib/source/lux/host/jvm/constant.lux +++ b/stdlib/source/lux/target/jvm/constant.lux diff --git a/stdlib/source/lux/host/jvm/constant/pool.lux b/stdlib/source/lux/target/jvm/constant/pool.lux index a304d5ac4..a304d5ac4 100644 --- a/stdlib/source/lux/host/jvm/constant/pool.lux +++ b/stdlib/source/lux/target/jvm/constant/pool.lux diff --git a/stdlib/source/lux/host/jvm/constant/tag.lux b/stdlib/source/lux/target/jvm/constant/tag.lux index 71e75f40b..71e75f40b 100644 --- a/stdlib/source/lux/host/jvm/constant/tag.lux +++ b/stdlib/source/lux/target/jvm/constant/tag.lux diff --git a/stdlib/source/lux/host/jvm/descriptor.lux b/stdlib/source/lux/target/jvm/descriptor.lux index d350cec65..d350cec65 100644 --- a/stdlib/source/lux/host/jvm/descriptor.lux +++ b/stdlib/source/lux/target/jvm/descriptor.lux diff --git a/stdlib/source/lux/host/jvm/encoding.lux b/stdlib/source/lux/target/jvm/encoding.lux index 33ac427c2..33ac427c2 100644 --- a/stdlib/source/lux/host/jvm/encoding.lux +++ b/stdlib/source/lux/target/jvm/encoding.lux diff --git a/stdlib/source/lux/host/jvm/field.lux b/stdlib/source/lux/target/jvm/field.lux index 930ca97d8..930ca97d8 100644 --- a/stdlib/source/lux/host/jvm/field.lux +++ b/stdlib/source/lux/target/jvm/field.lux diff --git a/stdlib/source/lux/host/jvm/index.lux b/stdlib/source/lux/target/jvm/index.lux index 3a425dd32..3a425dd32 100644 --- a/stdlib/source/lux/host/jvm/index.lux +++ b/stdlib/source/lux/target/jvm/index.lux diff --git a/stdlib/source/lux/host/jvm/loader.old.lux b/stdlib/source/lux/target/jvm/loader.old.lux index 0ca92fa23..0ca92fa23 100644 --- a/stdlib/source/lux/host/jvm/loader.old.lux +++ b/stdlib/source/lux/target/jvm/loader.old.lux diff --git a/stdlib/source/lux/host/jvm/magic.lux b/stdlib/source/lux/target/jvm/magic.lux index 5b74dc572..5b74dc572 100644 --- a/stdlib/source/lux/host/jvm/magic.lux +++ b/stdlib/source/lux/target/jvm/magic.lux diff --git a/stdlib/source/lux/host/jvm/method.lux b/stdlib/source/lux/target/jvm/method.lux index e4f3cdea2..e4f3cdea2 100644 --- a/stdlib/source/lux/host/jvm/method.lux +++ b/stdlib/source/lux/target/jvm/method.lux diff --git a/stdlib/source/lux/host/jvm/modifier.lux b/stdlib/source/lux/target/jvm/modifier.lux index f858e6548..f858e6548 100644 --- a/stdlib/source/lux/host/jvm/modifier.lux +++ b/stdlib/source/lux/target/jvm/modifier.lux diff --git a/stdlib/source/lux/host/jvm/modifier/inner.lux b/stdlib/source/lux/target/jvm/modifier/inner.lux index 2980ef6e4..2980ef6e4 100644 --- a/stdlib/source/lux/host/jvm/modifier/inner.lux +++ b/stdlib/source/lux/target/jvm/modifier/inner.lux diff --git a/stdlib/source/lux/host/jvm/name.lux b/stdlib/source/lux/target/jvm/name.lux index 7f2119bc0..7f2119bc0 100644 --- a/stdlib/source/lux/host/jvm/name.lux +++ b/stdlib/source/lux/target/jvm/name.lux diff --git a/stdlib/source/lux/host/jvm/version.lux b/stdlib/source/lux/target/jvm/version.lux index dd76a594d..dd76a594d 100644 --- a/stdlib/source/lux/host/jvm/version.lux +++ b/stdlib/source/lux/target/jvm/version.lux diff --git a/stdlib/source/lux/host/lua.lux b/stdlib/source/lux/target/lua.lux index 8dde357cc..8dde357cc 100644 --- a/stdlib/source/lux/host/lua.lux +++ b/stdlib/source/lux/target/lua.lux diff --git a/stdlib/source/lux/host/php.lux b/stdlib/source/lux/target/php.lux index 286d8d397..286d8d397 100644 --- a/stdlib/source/lux/host/php.lux +++ b/stdlib/source/lux/target/php.lux diff --git a/stdlib/source/lux/host/python.lux b/stdlib/source/lux/target/python.lux index 80f6b12de..80f6b12de 100644 --- a/stdlib/source/lux/host/python.lux +++ b/stdlib/source/lux/target/python.lux diff --git a/stdlib/source/lux/host/ruby.lux b/stdlib/source/lux/target/ruby.lux index 037cdca5b..037cdca5b 100644 --- a/stdlib/source/lux/host/ruby.lux +++ b/stdlib/source/lux/target/ruby.lux diff --git a/stdlib/source/lux/host/scheme.lux b/stdlib/source/lux/target/scheme.lux index 820ff8c83..820ff8c83 100644 --- a/stdlib/source/lux/host/scheme.lux +++ b/stdlib/source/lux/target/scheme.lux diff --git a/stdlib/source/lux/tool/compiler/meta/packager/script.lux b/stdlib/source/lux/tool/compiler/meta/packager/script.lux index 57e0800b1..2b93fc311 100644 --- a/stdlib/source/lux/tool/compiler/meta/packager/script.lux +++ b/stdlib/source/lux/tool/compiler/meta/packager/script.lux @@ -10,7 +10,7 @@ [collection ["." row] ["." list ("#@." monad fold)]]] - [host + [target ["_" js]] [tool [compiler diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux index 74b1128c2..edfa2d038 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux @@ -9,7 +9,7 @@ format] [collection ["." list ("#@." functor fold)]]] - [host + [target ["_" js (#+ Expression Computation Var Statement)]]] ["." // #_ ["#." runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/extension/common.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/extension/common.lux index 3cc75105f..7a38dc5cd 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/extension/common.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/extension/common.lux @@ -1,12 +1,13 @@ (.module: [lux #* + [host (#+ import:)] [abstract ["." monad (#+ do)]] [data ["." product] [collection ["." dictionary]]] - [host (#+ import:) + [target ["_" js (#+ Expression)]]] ["." /// #_ ["#." runtime (#+ Operation Phase Handler Bundle)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/function.lux index 4839c9978..e43e71fe4 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/function.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/function.lux @@ -10,7 +10,7 @@ format] [collection ["." list ("#@." functor fold)]]] - [host + [target ["_" js (#+ Expression Computation Var)]]] ["." // #_ [runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/loop.lux index 9ab04cae6..fd2d3de58 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/loop.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/loop.lux @@ -8,7 +8,7 @@ format] [collection ["." list ("#@." functor)]]] - [host + [target ["_" js (#+ Computation Var)]]] ["." // #_ [runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/primitive.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/primitive.lux index 1eb6141f9..6b1e32a36 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/primitive.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/primitive.lux @@ -5,7 +5,7 @@ [data [number ["." frac]]] - [host + [target ["_" js (#+ Computation)]]] ["." // #_ ["#." runtime]]) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/reference.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/reference.lux index 9f8555788..4ac7483fa 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/reference.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/reference.lux @@ -1,6 +1,6 @@ (.module: [lux #* - [host + [target ["_" js (#+ Expression)]]] [// [// diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux index 314fe300d..ea42f44e2 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux @@ -16,7 +16,7 @@ ["." macro ["." code] [syntax (#+ syntax:)]] - [host + [target ["_" js (#+ Expression Var Computation Statement)]]] ["." /// ["//." // diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/structure.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/structure.lux index a70376569..5bdbfd1a6 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/structure.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/structure.lux @@ -2,7 +2,7 @@ [lux #* [abstract ["." monad (#+ do)]] - [host + [target ["_" js (#+ Expression)]]] ["." // #_ ["#." runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/lua/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/lua/case.lux index 13683f0ca..1e2e7d254 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/lua/case.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/lua/case.lux @@ -10,7 +10,7 @@ [collection ["." list ("#@." functor fold)] ["." set]]] - [host + [target ["_" lua (#+ Expression Var Statement)]]] ["." // #_ ["#." runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/lua/extension/common.lux b/stdlib/source/lux/tool/compiler/phase/generation/lua/extension/common.lux index 6d060f0bf..e9aafeef6 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/lua/extension/common.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/lua/extension/common.lux @@ -1,5 +1,6 @@ (.module: [lux #* + [host (#+ import:)] [abstract ["." monad (#+ do)]] [control @@ -8,7 +9,7 @@ ["." product] [collection ["." dictionary]]] - [host (#+ import:) + [target ["_" lua (#+ Expression Literal)]]] ["." /// #_ ["#." runtime (#+ Operation Phase Handler Bundle)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/lua/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/lua/function.lux index 9fa8a3c7d..325ac58a6 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/lua/function.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/lua/function.lux @@ -10,7 +10,7 @@ format] [collection ["." list ("#@." functor fold)]]] - [host + [target ["_" lua (#+ Expression Statement)]]] ["." // #_ ["#." runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/lua/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/lua/loop.lux index 39c983dcc..49180db8b 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/lua/loop.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/lua/loop.lux @@ -8,7 +8,7 @@ format] [collection ["." list ("#@." functor)]]] - [host + [target ["_" lua (#+ Expression)]]] ["." // #_ [runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/lua/primitive.lux b/stdlib/source/lux/tool/compiler/phase/generation/lua/primitive.lux index 47ccf5006..4e326d1a3 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/lua/primitive.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/lua/primitive.lux @@ -5,7 +5,7 @@ [data [number ["." frac]]] - [host + [target ["_" lua (#+ Literal)]]] ["." // #_ ["#." runtime]]) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/lua/reference.lux b/stdlib/source/lux/tool/compiler/phase/generation/lua/reference.lux index 62c69e8bc..ad8e4c6a0 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/lua/reference.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/lua/reference.lux @@ -1,10 +1,9 @@ (.module: [lux #* - [host + [target ["_" lua (#+ Expression)]]] - [// - [// - ["." reference]]]) + [/// + ["." reference]]) (def: #export system (reference.system (: (-> Text (Expression Any)) _.var) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/lua/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/lua/runtime.lux index 57f8e11df..602897f1b 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/lua/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/lua/runtime.lux @@ -16,7 +16,7 @@ ["." macro ["." code] [syntax (#+ syntax:)]] - [host + [target ["_" lua (#+ Expression Location Var Computation Literal Statement)]]] ["." /// ["//." // diff --git a/stdlib/source/lux/tool/compiler/phase/generation/lua/structure.lux b/stdlib/source/lux/tool/compiler/phase/generation/lua/structure.lux index 2fab4daf0..d7c26c8a0 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/lua/structure.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/lua/structure.lux @@ -2,7 +2,7 @@ [lux #* [abstract ["." monad (#+ do)]] - [host + [target ["_" lua (#+ Expression)]]] ["." // #_ ["#." runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/php/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/php/case.lux index 1167ae5a6..4e672e600 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/php/case.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/php/case.lux @@ -11,7 +11,7 @@ [collection ["." list ("#@." functor fold)] ["." set]]] - [host + [target ["_" php (#+ Var Expression Statement)]]] ["." // #_ ["#." runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/php/extension/common.lux b/stdlib/source/lux/tool/compiler/phase/generation/php/extension/common.lux index 9938bb2c1..bdda1861b 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/php/extension/common.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/php/extension/common.lux @@ -1,5 +1,6 @@ (.module: [lux #* + [host (#+ import:)] [abstract ["." monad (#+ do)]] [control @@ -9,7 +10,7 @@ ["." text] [collection ["." dictionary]]] - [host (#+ import:) + [target ["_" php (#+ Expression)]]] ["." /// #_ ["#." runtime (#+ Operation Phase Handler Bundle)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/php/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/php/function.lux index b2b446ed0..5cbf855b6 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/php/function.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/php/function.lux @@ -10,7 +10,7 @@ format] [collection ["." list ("#@." functor fold)]]] - [host + [target ["_" php (#+ Argument Expression Statement)]]] ["." // #_ [runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/php/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/php/loop.lux index 3404953fe..94857fe4f 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/php/loop.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/php/loop.lux @@ -8,7 +8,7 @@ format] [collection ["." list ("#@." functor)]]] - [host + [target ["_" php (#+ Expression)]]] ["." // #_ [runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/php/primitive.lux b/stdlib/source/lux/tool/compiler/phase/generation/php/primitive.lux index 48a32389b..b5b953ba7 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/php/primitive.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/php/primitive.lux @@ -5,7 +5,7 @@ [data [number ["." frac]]] - [host + [target ["_" php (#+ Literal)]]] ["." // #_ ["#." runtime]]) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/php/reference.lux b/stdlib/source/lux/tool/compiler/phase/generation/php/reference.lux index 8f5313421..77b9bec74 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/php/reference.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/php/reference.lux @@ -1,6 +1,6 @@ (.module: [lux #* - [host + [target ["_" php (#+ Expression)]]] [// [// diff --git a/stdlib/source/lux/tool/compiler/phase/generation/php/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/php/runtime.lux index 8d3a2138a..7281a0c0e 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/php/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/php/runtime.lux @@ -16,7 +16,7 @@ ["." macro ["." code] [syntax (#+ syntax:)]] - [host + [target ["_" php (#+ Expression Var Global Computation Literal Statement)]]] ["." /// ["//." // diff --git a/stdlib/source/lux/tool/compiler/phase/generation/php/structure.lux b/stdlib/source/lux/tool/compiler/phase/generation/php/structure.lux index 7bc675d7e..8ea387fa2 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/php/structure.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/php/structure.lux @@ -2,7 +2,7 @@ [lux #* [abstract ["." monad (#+ do)]] - [host + [target ["_" php (#+ Expression)]]] ["." // #_ ["#." runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/case.lux index dc908eae7..3e07a6730 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/python/case.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/python/case.lux @@ -10,7 +10,7 @@ [collection ["." list ("#@." functor fold)] ["." set]]] - [host + [target ["_" python (#+ Expression SVar Statement)]]] ["." // #_ ["#." runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/extension/common.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/extension/common.lux index 1113ec3b6..7e1b4d2c1 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/python/extension/common.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/python/extension/common.lux @@ -1,5 +1,6 @@ (.module: [lux #* + [host (#+ import:)] [abstract ["." monad (#+ do)]] [control @@ -8,7 +9,7 @@ ["." product] [collection ["." dictionary]]] - [host (#+ import:) + [target ["_" python (#+ Expression)]]] ["." /// #_ ["#." runtime (#+ Operation Phase Handler Bundle)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/function.lux index 2631f629c..0cbcdde37 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/python/function.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/python/function.lux @@ -10,7 +10,7 @@ format] [collection ["." list ("#@." functor fold)]]] - [host + [target ["_" python (#+ Expression Statement)]]] ["." // #_ [runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/loop.lux index 9dae1b6dc..a58f02141 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/python/loop.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/python/loop.lux @@ -8,7 +8,7 @@ format] [collection ["." list ("#@." functor)]]] - [host + [target ["_" python (#+ Expression)]]] ["." // #_ [runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/primitive.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/primitive.lux index 33b9b7781..da651ad8b 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/python/primitive.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/python/primitive.lux @@ -5,7 +5,7 @@ [data [number ["." frac]]] - [host + [target ["_" python (#+ Expression)]]] ["." // #_ ["#." runtime]]) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/reference.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/reference.lux index acc09c784..c3daa9d37 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/python/reference.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/python/reference.lux @@ -1,10 +1,9 @@ (.module: [lux #* - [host + [target ["_" python (#+ Expression)]]] - [// - [// - ["." reference]]]) + [/// + ["." reference]]) (def: #export system (reference.system (: (-> Text (Expression Any)) _.var) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux index b2135a625..e325b1fca 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux @@ -16,7 +16,7 @@ ["." macro ["." code] [syntax (#+ syntax:)]] - [host + [target ["_" python (#+ Expression SVar Computation Literal Statement)]]] ["." /// ["//." // diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/structure.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/structure.lux index bcae96966..954efde26 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/python/structure.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/python/structure.lux @@ -2,13 +2,13 @@ [lux #* [abstract ["." monad (#+ do)]] - [host + [target ["_" python (#+ Expression)]]] ["." // #_ ["#." runtime (#+ Operation Phase)] ["#." primitive] - ["#//" /// - ["#/" // #_ + ["//#" /// + ["/#" // #_ [analysis (#+ Variant Tuple)] ["#." synthesis (#+ Synthesis)]]]]) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/ruby/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/ruby/case.lux index 18979b0fa..614925cd6 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/ruby/case.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/ruby/case.lux @@ -10,7 +10,7 @@ [collection ["." list ("#@." functor fold)] ["." set]]] - [host + [target ["_" ruby (#+ Expression Statement)]]] ["." // #_ ["#." runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/ruby/extension/common.lux b/stdlib/source/lux/tool/compiler/phase/generation/ruby/extension/common.lux index eda6782b3..cb72ecca0 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/ruby/extension/common.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/ruby/extension/common.lux @@ -1,5 +1,6 @@ (.module: [lux #* + [host (#+ import:)] [abstract ["." monad (#+ do)]] [control @@ -9,7 +10,7 @@ ["." text] [collection ["." dictionary]]] - [host (#+ import:) + [target ["_" ruby (#+ Expression)]]] ["." /// #_ ["#." runtime (#+ Operation Phase Handler Bundle)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/ruby/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/ruby/function.lux index be12aa2e2..52ef8fd1a 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/ruby/function.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/ruby/function.lux @@ -10,7 +10,7 @@ format] [collection ["." list ("#@." functor fold)]]] - [host + [target ["_" ruby (#+ Expression Statement)]]] ["." // #_ [runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/ruby/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/ruby/loop.lux index 91eb3eeb2..b7774d396 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/ruby/loop.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/ruby/loop.lux @@ -8,7 +8,7 @@ format] [collection ["." list ("#@." functor)]]] - [host + [target ["_" ruby (#+ Expression)]]] ["." // #_ [runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/ruby/primitive.lux b/stdlib/source/lux/tool/compiler/phase/generation/ruby/primitive.lux index 3fa59aaf4..b437230ee 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/ruby/primitive.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/ruby/primitive.lux @@ -5,7 +5,7 @@ [data [number ["." frac]]] - [host + [target ["_" ruby (#+ Literal)]]] ["." // #_ ["#." runtime]]) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/ruby/reference.lux b/stdlib/source/lux/tool/compiler/phase/generation/ruby/reference.lux index a5dcc1302..3a8e7e635 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/ruby/reference.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/ruby/reference.lux @@ -1,10 +1,9 @@ (.module: [lux #* - [host + [target ["_" ruby (#+ Expression)]]] - [// - [// - ["." reference]]]) + [/// + ["." reference]]) (def: #export system (reference.system (: (-> Text (Expression Any)) _.global) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/ruby/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/ruby/runtime.lux index b63571ddc..99c6ef38a 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/ruby/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/ruby/runtime.lux @@ -16,7 +16,7 @@ ["." macro ["." code] [syntax (#+ syntax:)]] - [host + [target ["_" ruby (#+ Expression LVar Computation Literal Statement)]]] ["." /// ["//." // diff --git a/stdlib/source/lux/tool/compiler/phase/generation/ruby/structure.lux b/stdlib/source/lux/tool/compiler/phase/generation/ruby/structure.lux index b3d3046c8..a929f736c 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/ruby/structure.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/ruby/structure.lux @@ -2,7 +2,7 @@ [lux #* [abstract ["." monad (#+ do)]] - [host + [target ["_" ruby (#+ Expression)]]] ["." // #_ ["#." runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.lux index d68abbdd7..d4cd440fb 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.lux @@ -10,7 +10,7 @@ format] [collection ["." list ("#;." functor fold)]]] - [host + [target ["_" scheme (#+ Expression Computation Var)]]] ["." // #_ ["#." runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.lux index 31c101fdf..f33cb9599 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.lux @@ -1,5 +1,6 @@ (.module: [lux #* + [host (#+ import:)] [abstract ["." monad (#+ do)]] [control @@ -18,7 +19,7 @@ ["." macro (#+ with-gensyms) ["." code] [syntax (#+ syntax:)]] - [host (#+ import:) + [target ["_" scheme (#+ Expression Computation)]]] ["." /// #_ ["#." runtime (#+ Operation Phase Handler Bundle)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.lux index 28bfd36ba..36de9712e 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.lux @@ -10,7 +10,7 @@ format] [collection ["." list ("#;." functor)]]] - [host + [target ["_" scheme (#+ Expression Computation Var)]]] ["." // #_ ["#." runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.lux index 6922806e2..086d53fe3 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.lux @@ -8,7 +8,7 @@ format] [collection ["." list ("#;." functor)]]] - [host + [target ["_" scheme (#+ Computation Var)]]] ["." // #_ [runtime (#+ Operation Phase)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/primitive.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/primitive.lux index 5405e4c55..4bfa67161 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/primitive.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/primitive.lux @@ -1,6 +1,6 @@ (.module: [lux (#- i64) - [host + [target ["_" scheme (#+ Expression)]]]) (template [<name> <type> <code>] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.lux index b531c38f7..b9add2e48 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.lux @@ -1,6 +1,6 @@ (.module: [lux #* - [host + [target ["_" scheme (#+ Expression)]]] [/// ["." reference]]) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux index c22906d2d..3fe02a55d 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux @@ -15,7 +15,7 @@ [macro ["." code] [syntax (#+ syntax:)]] - [host + [target ["_" scheme (#+ Expression Computation Var)]]] ["." /// ["#/" // diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.lux index e44ab508b..e101effeb 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.lux @@ -2,7 +2,7 @@ [lux #* [abstract ["." monad (#+ do)]] - [host + [target ["_" scheme (#+ Expression)]]] [// ["." runtime (#+ Operation Phase)] diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux index 5c5051a2c..a881dae3f 100644 --- a/stdlib/source/test/lux.lux +++ b/stdlib/source/test/lux.lux @@ -35,7 +35,7 @@ [format [css (#+)] [markdown (#+)]]] - [host + [target [js (#+)] [python (#+)] [lua (#+)] @@ -122,7 +122,8 @@ ["#." tool] ["#." type] ["#." world] - ["#." host + ["#." host] + ["#." target #_ ["#/." jvm]]] )) @@ -343,9 +344,9 @@ /tool.test /type.test /world.test + /host.test ($_ _.and - /host.test - /host/jvm.test) + /target/jvm.test) ))) (program: args diff --git a/stdlib/source/test/lux/host/jvm.old.lux b/stdlib/source/test/lux/target/jvm.old.lux index 47c6f35d9..47c6f35d9 100644 --- a/stdlib/source/test/lux/host/jvm.old.lux +++ b/stdlib/source/test/lux/target/jvm.old.lux |