diff options
| author | Eduardo Julian | 2022-07-03 03:12:11 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2022-07-03 03:12:11 -0400 |
| commit | 700628f36e1ac846f007cec855b0f9ecdbb66c80 (patch) | |
| tree | 6a8a259c854c429d650fe8b7c4bf2b224c47be97 | |
| parent | 9e7ddacf853efd7a18c1911d2f287d483b083229 (diff) | |
Moved "lux/target" to "lux/meta/target".
257 files changed, 906 insertions, 814 deletions
diff --git a/lux-jvm/source/program.lux b/lux-jvm/source/program.lux index 8d9dcdb1c..528482b77 100644 --- a/lux-jvm/source/program.lux +++ b/lux-jvm/source/program.lux @@ -2,7 +2,6 @@ [library [lux (.except Definition) [program (.only program:)] - ["@" target] ["[0]" ffi (.only import)] [abstract [monad (.only do)]] @@ -17,14 +16,15 @@ ["%" \\format (.only format)]] [collection [array (.only Array)]]] + [meta + ["@" target (.only) + ["[0]" jvm + [bytecode (.only Bytecode)] + ["[1]/[0]" type + ["[1]/[0]" box]]]]] ["[0]" world ["[0]" file] - ["[1]/[0]" program]] - [target - ["[0]" jvm - [bytecode (.only Bytecode)] - ["[1]/[0]" type - ["[1]/[0]" box]]]] + ["[1]/[0]" environment]] [tool [compiler (.only) ["[0]" phase] @@ -158,7 +158,7 @@ (def (declare_success! _) (-> Any (Async Any)) - (async.future (at world/program.default exit +0))) + (async.future (at world/environment.default exit +0))) (def (lux_compiler it) (-> Any platform.Custom) diff --git a/stdlib/source/documentation/lux/target.lux b/stdlib/source/documentation/lux/meta/target.lux index a10a6e3f5..a10a6e3f5 100644 --- a/stdlib/source/documentation/lux/target.lux +++ b/stdlib/source/documentation/lux/meta/target.lux diff --git a/stdlib/source/documentation/lux/target/js.lux b/stdlib/source/documentation/lux/meta/target/js.lux index 68f67d560..68f67d560 100644 --- a/stdlib/source/documentation/lux/target/js.lux +++ b/stdlib/source/documentation/lux/meta/target/js.lux diff --git a/stdlib/source/documentation/lux/target/jvm/type.lux b/stdlib/source/documentation/lux/meta/target/jvm/type.lux index 39bded852..39bded852 100644 --- a/stdlib/source/documentation/lux/target/jvm/type.lux +++ b/stdlib/source/documentation/lux/meta/target/jvm/type.lux diff --git a/stdlib/source/documentation/lux/target/jvm/type/alias.lux b/stdlib/source/documentation/lux/meta/target/jvm/type/alias.lux index d8e17f39a..d8e17f39a 100644 --- a/stdlib/source/documentation/lux/target/jvm/type/alias.lux +++ b/stdlib/source/documentation/lux/meta/target/jvm/type/alias.lux diff --git a/stdlib/source/documentation/lux/target/jvm/type/box.lux b/stdlib/source/documentation/lux/meta/target/jvm/type/box.lux index 1f393eb2e..1f393eb2e 100644 --- a/stdlib/source/documentation/lux/target/jvm/type/box.lux +++ b/stdlib/source/documentation/lux/meta/target/jvm/type/box.lux diff --git a/stdlib/source/documentation/lux/target/jvm/type/category.lux b/stdlib/source/documentation/lux/meta/target/jvm/type/category.lux index 123041fcb..123041fcb 100644 --- a/stdlib/source/documentation/lux/target/jvm/type/category.lux +++ b/stdlib/source/documentation/lux/meta/target/jvm/type/category.lux diff --git a/stdlib/source/documentation/lux/target/jvm/type/descriptor.lux b/stdlib/source/documentation/lux/meta/target/jvm/type/descriptor.lux index 8a484151c..8a484151c 100644 --- a/stdlib/source/documentation/lux/target/jvm/type/descriptor.lux +++ b/stdlib/source/documentation/lux/meta/target/jvm/type/descriptor.lux diff --git a/stdlib/source/documentation/lux/target/jvm/type/lux.lux b/stdlib/source/documentation/lux/meta/target/jvm/type/lux.lux index 408b5c6f4..408b5c6f4 100644 --- a/stdlib/source/documentation/lux/target/jvm/type/lux.lux +++ b/stdlib/source/documentation/lux/meta/target/jvm/type/lux.lux diff --git a/stdlib/source/documentation/lux/target/jvm/type/parser.lux b/stdlib/source/documentation/lux/meta/target/jvm/type/parser.lux index 81e9d4bee..81e9d4bee 100644 --- a/stdlib/source/documentation/lux/target/jvm/type/parser.lux +++ b/stdlib/source/documentation/lux/meta/target/jvm/type/parser.lux diff --git a/stdlib/source/documentation/lux/target/jvm/type/reflection.lux b/stdlib/source/documentation/lux/meta/target/jvm/type/reflection.lux index 64ecb135c..64ecb135c 100644 --- a/stdlib/source/documentation/lux/target/jvm/type/reflection.lux +++ b/stdlib/source/documentation/lux/meta/target/jvm/type/reflection.lux diff --git a/stdlib/source/documentation/lux/target/jvm/type/signature.lux b/stdlib/source/documentation/lux/meta/target/jvm/type/signature.lux index 8991f34ee..8991f34ee 100644 --- a/stdlib/source/documentation/lux/target/jvm/type/signature.lux +++ b/stdlib/source/documentation/lux/meta/target/jvm/type/signature.lux diff --git a/stdlib/source/documentation/lux/target/lua.lux b/stdlib/source/documentation/lux/meta/target/lua.lux index dbbd515a5..dbbd515a5 100644 --- a/stdlib/source/documentation/lux/target/lua.lux +++ b/stdlib/source/documentation/lux/meta/target/lua.lux diff --git a/stdlib/source/documentation/lux/target/python.lux b/stdlib/source/documentation/lux/meta/target/python.lux index c531707ae..c531707ae 100644 --- a/stdlib/source/documentation/lux/target/python.lux +++ b/stdlib/source/documentation/lux/meta/target/python.lux diff --git a/stdlib/source/documentation/lux/target/ruby.lux b/stdlib/source/documentation/lux/meta/target/ruby.lux index a678fe81b..a678fe81b 100644 --- a/stdlib/source/documentation/lux/target/ruby.lux +++ b/stdlib/source/documentation/lux/meta/target/ruby.lux diff --git a/stdlib/source/library/lux/abstract/apply.lux b/stdlib/source/library/lux/abstract/apply.lux index 708441991..05827b9a9 100644 --- a/stdlib/source/library/lux/abstract/apply.lux +++ b/stdlib/source/library/lux/abstract/apply.lux @@ -1,7 +1,8 @@ (.require [library [lux (.except) - ["@" target]]] + [meta + ["@" target]]]] [// [monad (.only Monad do)] ["[0]" functor (.only Functor)]]) diff --git a/stdlib/source/library/lux/control/concurrency/atom.lux b/stdlib/source/library/lux/control/concurrency/atom.lux index 4ba43632f..2a7fec64c 100644 --- a/stdlib/source/library/lux/control/concurrency/atom.lux +++ b/stdlib/source/library/lux/control/concurrency/atom.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] ["[0]" ffi] [abstract [monad (.only do)]] @@ -14,6 +13,7 @@ ["[0]" array ["[1]" \\unsafe]]]] [meta + ["@" target] [type [primitive (.except)] ["[0]" variance (.only Mutable)]]]]]) diff --git a/stdlib/source/library/lux/control/concurrency/thread.lux b/stdlib/source/library/lux/control/concurrency/thread.lux index a9563b79d..5fb0f883b 100644 --- a/stdlib/source/library/lux/control/concurrency/thread.lux +++ b/stdlib/source/library/lux/control/concurrency/thread.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] ["[0]" ffi] [abstract ["[0]" monad (.only do)]] @@ -18,6 +17,7 @@ ["n" nat] ["f" frac]]] [meta + ["@" target] ["[0]" configuration]] [time ["[0]" instant]]]] diff --git a/stdlib/source/library/lux/control/reader.lux b/stdlib/source/library/lux/control/reader.lux index aa15befa8..5a657143e 100644 --- a/stdlib/source/library/lux/control/reader.lux +++ b/stdlib/source/library/lux/control/reader.lux @@ -1,11 +1,12 @@ (.require [library [lux (.except local with) - ["@" target] [abstract [apply (.only Apply)] ["[0]" functor (.only Functor)] - ["[0]" monad (.only Monad do)]]]]) + ["[0]" monad (.only Monad do)]] + [meta + ["@" target]]]]) (type .public (Reader r a) (-> r a)) diff --git a/stdlib/source/library/lux/control/thread.lux b/stdlib/source/library/lux/control/thread.lux index 0b43c9344..665db5232 100644 --- a/stdlib/source/library/lux/control/thread.lux +++ b/stdlib/source/library/lux/control/thread.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] [abstract [functor (.only Functor)] [apply (.only Apply)] @@ -13,6 +12,7 @@ ["[0]" array ["[1]" \\unsafe (.only Array)]]]] [meta + ["@" target] [type [primitive (.except)] ["[0]" variance (.only Mutable)]]]]]) diff --git a/stdlib/source/library/lux/control/try.lux b/stdlib/source/library/lux/control/try.lux index fe17409a2..ca2010ce8 100644 --- a/stdlib/source/library/lux/control/try.lux +++ b/stdlib/source/library/lux/control/try.lux @@ -1,13 +1,13 @@ (.require [library [lux (.except with) - ["@" target] [abstract [apply (.only Apply)] [equivalence (.only Equivalence)] ["[0]" functor (.only Functor)] ["[0]" monad (.only Monad do)]] [meta + ["@" target] ["[0]" location]]]]) (type .public (Try a) diff --git a/stdlib/source/library/lux/control/writer.lux b/stdlib/source/library/lux/control/writer.lux index c1c52b904..f55b31354 100644 --- a/stdlib/source/library/lux/control/writer.lux +++ b/stdlib/source/library/lux/control/writer.lux @@ -1,12 +1,13 @@ (.require [library [lux (.except with) - ["@" target] [abstract [monoid (.only Monoid)] [apply (.only Apply)] ["[0]" functor (.only Functor)] - ["[0]" monad (.only Monad do)]]]]) + ["[0]" monad (.only Monad do)]] + [meta + ["@" target]]]]) (type .public (Writer log value) (Record diff --git a/stdlib/source/library/lux/data/collection/list.lux b/stdlib/source/library/lux/data/collection/list.lux index c6e0f8587..dca6d6ec4 100644 --- a/stdlib/source/library/lux/data/collection/list.lux +++ b/stdlib/source/library/lux/data/collection/list.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except revised all only with) - ["@" target] [abstract [monoid (.only Monoid)] [apply (.only Apply)] @@ -19,7 +18,9 @@ ["[0]" product]] [math [number - ["n" nat]]]]]) + ["n" nat]]] + [meta + ["@" target]]]]) ... (type (List a) ... #End diff --git a/stdlib/source/library/lux/data/collection/sequence.lux b/stdlib/source/library/lux/data/collection/sequence.lux index e24e762d2..2b2f92b94 100644 --- a/stdlib/source/library/lux/data/collection/sequence.lux +++ b/stdlib/source/library/lux/data/collection/sequence.lux @@ -4,7 +4,6 @@ (.require [library [lux (.except list has revised only) - ["@" target] [abstract [functor (.only Functor)] [apply (.only Apply)] @@ -30,6 +29,7 @@ ["n" nat] ["[0]" i64]]] [meta + ["@" target] ["[0]" code (.only) ["<[1]>" \\parser (.only Parser)]] [macro diff --git a/stdlib/source/library/lux/data/collection/tree/zipper.lux b/stdlib/source/library/lux/data/collection/tree/zipper.lux index 2ddc54d22..1e403280e 100644 --- a/stdlib/source/library/lux/data/collection/tree/zipper.lux +++ b/stdlib/source/library/lux/data/collection/tree/zipper.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except left right) - ["@" target] [abstract [functor (.only Functor)] [comonad (.only CoMonad)] @@ -14,7 +13,9 @@ [text ["%" \\format (.only format)]] [collection - ["[0]" list (.use "[1]#[0]" functor monoid)]]]]] + ["[0]" list (.use "[1]#[0]" functor monoid)]]] + [meta + ["@" target]]]] ["[0]" // (.only Tree) (.use "[1]#[0]" functor)]) (type (Family Zipper a) diff --git a/stdlib/source/library/lux/data/format/css/class.lux b/stdlib/source/library/lux/data/format/css/class.lux index b7bc2409e..c0bdf1dd5 100644 --- a/stdlib/source/library/lux/data/format/css/class.lux +++ b/stdlib/source/library/lux/data/format/css/class.lux @@ -1,13 +1,12 @@ (.require [library [lux (.except) - ["[0]" meta] [abstract [monad (.only do)]] [data ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)]]] - [meta + ["[0]" meta (.only) ["[0]" code] [macro [syntax (.only syntax)]] diff --git a/stdlib/source/library/lux/data/format/css/id.lux b/stdlib/source/library/lux/data/format/css/id.lux index 637e9915e..dc8cc80dc 100644 --- a/stdlib/source/library/lux/data/format/css/id.lux +++ b/stdlib/source/library/lux/data/format/css/id.lux @@ -1,13 +1,12 @@ (.require [library [lux (.except) - ["[0]" meta] [abstract [monad (.only do)]] [data ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)]]] - [meta + ["[0]" meta (.only) ["[0]" code] [macro [syntax (.only syntax)]] diff --git a/stdlib/source/library/lux/data/format/html.lux b/stdlib/source/library/lux/data/format/html.lux index 0bdc6984b..15d20bb2d 100644 --- a/stdlib/source/library/lux/data/format/html.lux +++ b/stdlib/source/library/lux/data/format/html.lux @@ -13,10 +13,10 @@ [meta [macro ["[0]" template]] + [target + ["[0]" js]] [type [primitive (.except)]]] - [target - ["[0]" js]] [world [net (.only URL)]]]] [// diff --git a/stdlib/source/library/lux/data/format/tar.lux b/stdlib/source/library/lux/data/format/tar.lux index e5924fa6e..8689701a7 100644 --- a/stdlib/source/library/lux/data/format/tar.lux +++ b/stdlib/source/library/lux/data/format/tar.lux @@ -237,17 +237,20 @@ (def (un_padded string) (-> Binary Binary) (case (binary!.size string) - 0 string - size (loop (again [end (-- size)]) - (case end - 0 (at utf8.codec encoded "") - _ (let [last_char (binary!.bits_8 end string)] - (`` (case (.nat last_char) - (char (,, (static ..null))) - (again (-- end)) - - _ - (binary!.slice 0 (++ end) string)))))))) + 0 + string + + size + (loop (again [end (-- size)]) + (case end + 0 (at utf8.codec encoded "") + _ (let [last_char (binary!.bits_8 end string)] + (`` (case (.nat last_char) + (char (,, (static ..null))) + (again (-- end)) + + _ + (binary!.slice 0 (++ end) string)))))))) (with_template [<type> <representation> <size> <exception> <in> <out> <format> <parser> <none>] [(primitive .public <type> diff --git a/stdlib/source/library/lux/data/text.lux b/stdlib/source/library/lux/data/text.lux index 826afbb44..8b0547523 100644 --- a/stdlib/source/library/lux/data/text.lux +++ b/stdlib/source/library/lux/data/text.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except char) - ["@" target] [abstract [hash (.only Hash)] [monoid (.only Monoid)] @@ -19,6 +18,7 @@ ["n" nat] ["[0]" i64]]] [meta + ["@" target] [macro ["^" pattern]]]]]) diff --git a/stdlib/source/library/lux/data/text/buffer.lux b/stdlib/source/library/lux/data/text/buffer.lux index e8b4e496f..e9c7a0ec3 100644 --- a/stdlib/source/library/lux/data/text/buffer.lux +++ b/stdlib/source/library/lux/data/text/buffer.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] ["[0]" ffi (.only import)] [control ["[0]" function]] @@ -16,6 +15,7 @@ [number ["n" nat]]] [meta + ["@" target] [type [primitive (.except)]]]]] ["[0]" //]) diff --git a/stdlib/source/library/lux/data/text/encoding/utf8.lux b/stdlib/source/library/lux/data/text/encoding/utf8.lux index 4a90d20e4..d90d52a2a 100644 --- a/stdlib/source/library/lux/data/text/encoding/utf8.lux +++ b/stdlib/source/library/lux/data/text/encoding/utf8.lux @@ -1,14 +1,15 @@ (.require [library [lux (.except) - ["@" target] ["[0]" ffi] [abstract [codec (.only Codec)]] [control ["[0]" try (.only Try)]] [data - ["[0]" binary (.only Binary)]]]] + ["[0]" binary (.only Binary)]] + [meta + ["@" target]]]] ["[0]" //]) (with_expansions [<jvm> (these (ffi.import java/lang/String diff --git a/stdlib/source/library/lux/debug.lux b/stdlib/source/library/lux/debug.lux index 2b27378b6..8031919ca 100644 --- a/stdlib/source/library/lux/debug.lux +++ b/stdlib/source/library/lux/debug.lux @@ -1,9 +1,7 @@ (.require [library [lux (.except private) - ["@" target] ["[0]" ffi (.only import)] - ["[0]" meta] [abstract ["[0]" monad (.only do)]] [control @@ -27,7 +25,8 @@ [ratio (.only Ratio)] ["n" nat] ["i" int]]] - [meta + ["[0]" meta (.only) + ["@" target] ["[0]" code (.only) ["<[1]>" \\parser]] [macro diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux index 40db8e0c3..43fcd5c3c 100644 --- a/stdlib/source/library/lux/ffi.jvm.lux +++ b/stdlib/source/library/lux/ffi.jvm.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except Primitive Type int char is as type) - ["[0]" meta (.use "[1]#[0]" monad)] [abstract ["[0]" monad (.only do)]] [control @@ -22,7 +21,7 @@ [math [number ["n" nat]]] - [meta + ["[0]" meta (.use "[1]#[0]" monad) ["[0]" code (.only) ["<[1]>" \\parser(.only Parser)]] [macro (.only with_symbols) @@ -31,18 +30,18 @@ ["[0]" template] ["[0]" context]] ["[0]" type (.use "[1]#[0]" equivalence) - ["[0]" check]]] - [target - ["[0]" jvm - [encoding - ["[0]" name (.only External)]] - ["[1]" type (.only Type Argument Typed) - ["[0]" category (.only Void Value' Value Return' Return Method Primitive Object Class Array Var Parameter Declaration)] - ["[0]" box] - ["[0]" descriptor] - ["[0]" signature] - ["[0]" reflection] - ["[0]" parser]]]]]]) + ["[0]" check]] + [target + ["[0]" jvm + [encoding + ["[0]" name (.only External)]] + ["[1]" type (.only Type Argument Typed) + ["[0]" category (.only Void Value' Value Return' Return Method Primitive Object Class Array Var Parameter Declaration)] + ["[0]" box] + ["[0]" descriptor] + ["[0]" signature] + ["[0]" reflection] + ["[0]" parser]]]]]]]) (def internal (-> External Text) diff --git a/stdlib/source/library/lux/ffi.lux b/stdlib/source/library/lux/ffi.lux index f145b56cb..fdbdde871 100644 --- a/stdlib/source/library/lux/ffi.lux +++ b/stdlib/source/library/lux/ffi.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except Symbol Alias Global global function type_of undefined) - ["[0]" meta] [abstract ["[0]" monad (.only do)]] [control @@ -15,16 +14,16 @@ ["%" \\format]] [collection ["[0]" list (.use "[1]#[0]" monad mix)]]] - [meta + ["[0]" meta (.only) ["[0]" code (.only) ["<[1]>" \\parser (.only Parser)]] ["[0]" macro (.only with_symbols) [syntax (.only syntax)] ["[0]" template]] [type - [primitive (.except)]]] - ["@" target (.only) - ["[0]" js]]]]) + [primitive (.except)]] + ["@" target (.only) + ["[0]" js]]]]]) (with_expansions [<constant> (for @.js "js constant" @.python "python constant" diff --git a/stdlib/source/library/lux/ffi.php.lux b/stdlib/source/library/lux/ffi.php.lux index 87279aaf1..ecc9a836d 100644 --- a/stdlib/source/library/lux/ffi.php.lux +++ b/stdlib/source/library/lux/ffi.php.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except Alias) - ["@" target] [abstract [monad (.only do)]] [control @@ -15,6 +14,7 @@ [collection ["[0]" list (.use "[1]#[0]" functor)]]] ["[0]" meta (.only) + ["@" target] [type abstract] ["[0]" code (.only) diff --git a/stdlib/source/library/lux/ffi.scm.lux b/stdlib/source/library/lux/ffi.scm.lux index 7ba628f1d..602b72ea3 100644 --- a/stdlib/source/library/lux/ffi.scm.lux +++ b/stdlib/source/library/lux/ffi.scm.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except Alias) - ["@" target] [abstract [monad (.only do)]] [control @@ -15,6 +14,7 @@ [collection ["[0]" list (.use "[1]#[0]" functor)]]] ["[0]" meta (.only) + ["@" target] [type abstract] ["[0]" code (.only) diff --git a/stdlib/source/library/lux/ffi/export.js.lux b/stdlib/source/library/lux/ffi/export.js.lux index 67f97651d..d8f26b60d 100644 --- a/stdlib/source/library/lux/ffi/export.js.lux +++ b/stdlib/source/library/lux/ffi/export.js.lux @@ -19,9 +19,9 @@ ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) - [syntax (.only syntax)]]] - [target - ["/" js]] + [syntax (.only syntax)]] + [target + ["/" js]]] [tool [compiler ["[0]" phase] diff --git a/stdlib/source/library/lux/ffi/export.lua.lux b/stdlib/source/library/lux/ffi/export.lua.lux index 3d1b6e068..7f527112f 100644 --- a/stdlib/source/library/lux/ffi/export.lua.lux +++ b/stdlib/source/library/lux/ffi/export.lua.lux @@ -19,9 +19,9 @@ ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) - [syntax (.only syntax)]]] - [target - ["/" lua]] + [syntax (.only syntax)]] + [target + ["/" lua]]] [tool [compiler ["[0]" phase] diff --git a/stdlib/source/library/lux/ffi/export.py.lux b/stdlib/source/library/lux/ffi/export.py.lux index bbcc9c295..1ec506690 100644 --- a/stdlib/source/library/lux/ffi/export.py.lux +++ b/stdlib/source/library/lux/ffi/export.py.lux @@ -19,9 +19,9 @@ ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) - [syntax (.only syntax)]]] - [target - ["/" python]] + [syntax (.only syntax)]] + [target + ["/" python]]] [tool [compiler ["[0]" phase] diff --git a/stdlib/source/library/lux/ffi/export.rb.lux b/stdlib/source/library/lux/ffi/export.rb.lux index 56d67edca..674482154 100644 --- a/stdlib/source/library/lux/ffi/export.rb.lux +++ b/stdlib/source/library/lux/ffi/export.rb.lux @@ -21,9 +21,9 @@ ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) - [syntax (.only syntax)]]] - [target - ["/" ruby]] + [syntax (.only syntax)]] + [target + ["/" ruby]]] [tool [compiler ["[0]" phase] diff --git a/stdlib/source/library/lux/math.lux b/stdlib/source/library/lux/math.lux index eac02fe80..c01471596 100644 --- a/stdlib/source/library/lux/math.lux +++ b/stdlib/source/library/lux/math.lux @@ -2,7 +2,6 @@ [library [lux (.except) [extension (.only analysis)] - ["@" target] ["[0]" static] [abstract ["[0]" monad (.only do)]] @@ -16,6 +15,7 @@ [collection ["[0]" list (.use "[1]#[0]" mix)]]] [meta + ["@" target] ["[0]" code ["<[1]>" \\parser]] [macro diff --git a/stdlib/source/library/lux/math/number/frac.lux b/stdlib/source/library/lux/math/number/frac.lux index 4601d9ffa..fb2f1b85f 100644 --- a/stdlib/source/library/lux/math/number/frac.lux +++ b/stdlib/source/library/lux/math/number/frac.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except nat int rev) - ["@" target] [abstract [hash (.only Hash)] [monoid (.only Monoid)] @@ -17,6 +16,7 @@ [data ["[0]" text]] [meta + ["@" target] [macro ["^" pattern]]]]] ["[0]" // diff --git a/stdlib/source/library/lux/target.lux b/stdlib/source/library/lux/meta/target.lux index 11094325d..11094325d 100644 --- a/stdlib/source/library/lux/target.lux +++ b/stdlib/source/library/lux/meta/target.lux diff --git a/stdlib/source/library/lux/target/common_lisp.lux b/stdlib/source/library/lux/meta/target/common_lisp.lux index b7ce2a7fb..b7ce2a7fb 100644 --- a/stdlib/source/library/lux/target/common_lisp.lux +++ b/stdlib/source/library/lux/meta/target/common_lisp.lux diff --git a/stdlib/source/library/lux/target/js.lux b/stdlib/source/library/lux/meta/target/js.lux index e5a1ce144..e5a1ce144 100644 --- a/stdlib/source/library/lux/target/js.lux +++ b/stdlib/source/library/lux/meta/target/js.lux diff --git a/stdlib/source/library/lux/target/jvm/attribute.lux b/stdlib/source/library/lux/meta/target/jvm/attribute.lux index 0b0af146e..0b0af146e 100644 --- a/stdlib/source/library/lux/target/jvm/attribute.lux +++ b/stdlib/source/library/lux/meta/target/jvm/attribute.lux diff --git a/stdlib/source/library/lux/target/jvm/attribute/code.lux b/stdlib/source/library/lux/meta/target/jvm/attribute/code.lux index a350fde0f..a350fde0f 100644 --- a/stdlib/source/library/lux/target/jvm/attribute/code.lux +++ b/stdlib/source/library/lux/meta/target/jvm/attribute/code.lux diff --git a/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux b/stdlib/source/library/lux/meta/target/jvm/attribute/code/exception.lux index 08c7cc129..08c7cc129 100644 --- a/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux +++ b/stdlib/source/library/lux/meta/target/jvm/attribute/code/exception.lux diff --git a/stdlib/source/library/lux/target/jvm/attribute/constant.lux b/stdlib/source/library/lux/meta/target/jvm/attribute/constant.lux index 830632337..830632337 100644 --- a/stdlib/source/library/lux/target/jvm/attribute/constant.lux +++ b/stdlib/source/library/lux/meta/target/jvm/attribute/constant.lux diff --git a/stdlib/source/library/lux/target/jvm/bytecode.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode.lux index 906216326..906216326 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode.lux diff --git a/stdlib/source/library/lux/target/jvm/bytecode/address.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/address.lux index 66b50f65a..66b50f65a 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/address.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/address.lux diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment.lux index fcb4540c7..fcb4540c7 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment.lux diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit.lux index ce5801345..ce5801345 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit.lux diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/registry.lux index 3f16fa4a2..3f16fa4a2 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/registry.lux diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/stack.lux index 7c7e0472e..7c7e0472e 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/stack.lux diff --git a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/instruction.lux index 9dc19ed00..9dc19ed00 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/instruction.lux diff --git a/stdlib/source/library/lux/target/jvm/bytecode/jump.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/jump.lux index 13c5f8f07..13c5f8f07 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/jump.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/jump.lux diff --git a/stdlib/source/library/lux/target/jvm/class.lux b/stdlib/source/library/lux/meta/target/jvm/class.lux index bd9fdd41b..bd9fdd41b 100644 --- a/stdlib/source/library/lux/target/jvm/class.lux +++ b/stdlib/source/library/lux/meta/target/jvm/class.lux diff --git a/stdlib/source/library/lux/target/jvm/constant.lux b/stdlib/source/library/lux/meta/target/jvm/constant.lux index e80bef65b..a56a74c11 100644 --- a/stdlib/source/library/lux/target/jvm/constant.lux +++ b/stdlib/source/library/lux/meta/target/jvm/constant.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] ["[0]" ffi (.only import)] [abstract [monad (.only do)] @@ -19,6 +18,7 @@ ["[0]" int] ["[0]" frac]]] [meta + ["@" target] [macro ["^" pattern] ["[0]" template]] diff --git a/stdlib/source/library/lux/target/jvm/constant/pool.lux b/stdlib/source/library/lux/meta/target/jvm/constant/pool.lux index d3a8c2546..d3a8c2546 100644 --- a/stdlib/source/library/lux/target/jvm/constant/pool.lux +++ b/stdlib/source/library/lux/meta/target/jvm/constant/pool.lux diff --git a/stdlib/source/library/lux/target/jvm/constant/tag.lux b/stdlib/source/library/lux/meta/target/jvm/constant/tag.lux index bcd1d4209..bcd1d4209 100644 --- a/stdlib/source/library/lux/target/jvm/constant/tag.lux +++ b/stdlib/source/library/lux/meta/target/jvm/constant/tag.lux diff --git a/stdlib/source/library/lux/target/jvm/encoding/name.lux b/stdlib/source/library/lux/meta/target/jvm/encoding/name.lux index 7516cdc46..7516cdc46 100644 --- a/stdlib/source/library/lux/target/jvm/encoding/name.lux +++ b/stdlib/source/library/lux/meta/target/jvm/encoding/name.lux diff --git a/stdlib/source/library/lux/target/jvm/encoding/signed.lux b/stdlib/source/library/lux/meta/target/jvm/encoding/signed.lux index 91d7c15c6..91d7c15c6 100644 --- a/stdlib/source/library/lux/target/jvm/encoding/signed.lux +++ b/stdlib/source/library/lux/meta/target/jvm/encoding/signed.lux diff --git a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux b/stdlib/source/library/lux/meta/target/jvm/encoding/unsigned.lux index 858d06d80..858d06d80 100644 --- a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux +++ b/stdlib/source/library/lux/meta/target/jvm/encoding/unsigned.lux diff --git a/stdlib/source/library/lux/target/jvm/field.lux b/stdlib/source/library/lux/meta/target/jvm/field.lux index e0561b457..e0561b457 100644 --- a/stdlib/source/library/lux/target/jvm/field.lux +++ b/stdlib/source/library/lux/meta/target/jvm/field.lux diff --git a/stdlib/source/library/lux/target/jvm/index.lux b/stdlib/source/library/lux/meta/target/jvm/index.lux index 05489792b..05489792b 100644 --- a/stdlib/source/library/lux/target/jvm/index.lux +++ b/stdlib/source/library/lux/meta/target/jvm/index.lux diff --git a/stdlib/source/library/lux/target/jvm/loader.lux b/stdlib/source/library/lux/meta/target/jvm/loader.lux index cdbfd1c56..cb423bba7 100644 --- a/stdlib/source/library/lux/target/jvm/loader.lux +++ b/stdlib/source/library/lux/meta/target/jvm/loader.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] ["[0]" ffi (.only import object do_to)] [abstract [monad (.only do)]] @@ -17,7 +16,9 @@ ["%" \\format (.only format)]] [collection ["[0]" array] - ["[0]" dictionary (.only Dictionary)]]]]]) + ["[0]" dictionary (.only Dictionary)]]] + [meta + ["@" target]]]]) (type .public Library (Atom (Dictionary Text Binary))) diff --git a/stdlib/source/library/lux/target/jvm/magic.lux b/stdlib/source/library/lux/meta/target/jvm/magic.lux index e5fc0a09d..e5fc0a09d 100644 --- a/stdlib/source/library/lux/target/jvm/magic.lux +++ b/stdlib/source/library/lux/meta/target/jvm/magic.lux diff --git a/stdlib/source/library/lux/target/jvm/method.lux b/stdlib/source/library/lux/meta/target/jvm/method.lux index 3db1be9bc..3db1be9bc 100644 --- a/stdlib/source/library/lux/target/jvm/method.lux +++ b/stdlib/source/library/lux/meta/target/jvm/method.lux diff --git a/stdlib/source/library/lux/target/jvm/modifier.lux b/stdlib/source/library/lux/meta/target/jvm/modifier.lux index 35b9894be..35b9894be 100644 --- a/stdlib/source/library/lux/target/jvm/modifier.lux +++ b/stdlib/source/library/lux/meta/target/jvm/modifier.lux diff --git a/stdlib/source/library/lux/target/jvm/modifier/inner.lux b/stdlib/source/library/lux/meta/target/jvm/modifier/inner.lux index c61569575..c61569575 100644 --- a/stdlib/source/library/lux/target/jvm/modifier/inner.lux +++ b/stdlib/source/library/lux/meta/target/jvm/modifier/inner.lux diff --git a/stdlib/source/library/lux/target/jvm/reflection.lux b/stdlib/source/library/lux/meta/target/jvm/reflection.lux index 2f7ca93ae..3c5145a9d 100644 --- a/stdlib/source/library/lux/target/jvm/reflection.lux +++ b/stdlib/source/library/lux/meta/target/jvm/reflection.lux @@ -2,7 +2,6 @@ [library [lux (.except Primitive parameter type) ["[0]" ffi (.only import)] - ["[0]" type] [abstract ["[0]" monad (.only do)]] [control @@ -20,6 +19,7 @@ [number ["n" nat]]] [meta + ["[0]" type] [macro ["^" pattern]]]]] ["[0]" // diff --git a/stdlib/source/library/lux/target/jvm/type.lux b/stdlib/source/library/lux/meta/target/jvm/type.lux index f9944b0eb..f9944b0eb 100644 --- a/stdlib/source/library/lux/target/jvm/type.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type.lux diff --git a/stdlib/source/library/lux/target/jvm/type/alias.lux b/stdlib/source/library/lux/meta/target/jvm/type/alias.lux index 8d9ddc7f4..8d9ddc7f4 100644 --- a/stdlib/source/library/lux/target/jvm/type/alias.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/alias.lux diff --git a/stdlib/source/library/lux/target/jvm/type/box.lux b/stdlib/source/library/lux/meta/target/jvm/type/box.lux index 367efa5ed..367efa5ed 100644 --- a/stdlib/source/library/lux/target/jvm/type/box.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/box.lux diff --git a/stdlib/source/library/lux/target/jvm/type/category.lux b/stdlib/source/library/lux/meta/target/jvm/type/category.lux index 7cae42458..7cae42458 100644 --- a/stdlib/source/library/lux/target/jvm/type/category.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/category.lux diff --git a/stdlib/source/library/lux/target/jvm/type/descriptor.lux b/stdlib/source/library/lux/meta/target/jvm/type/descriptor.lux index a3635d767..a3635d767 100644 --- a/stdlib/source/library/lux/target/jvm/type/descriptor.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/descriptor.lux diff --git a/stdlib/source/library/lux/target/jvm/type/lux.lux b/stdlib/source/library/lux/meta/target/jvm/type/lux.lux index 10160204c..a8629d236 100644 --- a/stdlib/source/library/lux/target/jvm/type/lux.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/lux.lux @@ -4,9 +4,9 @@ [abstract ["[0]" monad (.only do)]] [control + ["<>" parser (.use "[1]#[0]" monad)] ["[0]" try] - ["[0]" exception (.only exception)] - ["<>" parser (.use "[1]#[0]" monad)]] + ["[0]" exception (.only exception)]] [data ["[0]" product] ["[0]" text (.use "[1]#[0]" equivalence) diff --git a/stdlib/source/library/lux/target/jvm/type/parser.lux b/stdlib/source/library/lux/meta/target/jvm/type/parser.lux index 15a46e8ec..15a46e8ec 100644 --- a/stdlib/source/library/lux/target/jvm/type/parser.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/parser.lux diff --git a/stdlib/source/library/lux/target/jvm/type/reflection.lux b/stdlib/source/library/lux/meta/target/jvm/type/reflection.lux index 4ea86a811..4ea86a811 100644 --- a/stdlib/source/library/lux/target/jvm/type/reflection.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/reflection.lux diff --git a/stdlib/source/library/lux/target/jvm/type/signature.lux b/stdlib/source/library/lux/meta/target/jvm/type/signature.lux index 6afc33607..6afc33607 100644 --- a/stdlib/source/library/lux/target/jvm/type/signature.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/signature.lux diff --git a/stdlib/source/library/lux/target/jvm/version.lux b/stdlib/source/library/lux/meta/target/jvm/version.lux index 8e8b82dcc..8e8b82dcc 100644 --- a/stdlib/source/library/lux/target/jvm/version.lux +++ b/stdlib/source/library/lux/meta/target/jvm/version.lux diff --git a/stdlib/source/library/lux/target/lua.lux b/stdlib/source/library/lux/meta/target/lua.lux index bb8d9bc84..1ea2f196c 100644 --- a/stdlib/source/library/lux/target/lua.lux +++ b/stdlib/source/library/lux/meta/target/lua.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except Location Code Label int if function or and not let local comment the) - ["@" target] [abstract [equivalence (.only Equivalence)] [hash (.only Hash)] @@ -19,6 +18,7 @@ ["i" int] ["f" frac]]] [meta + ["@" target] ["[0]" code (.only) ["<[1]>" \\parser]] [macro diff --git a/stdlib/source/library/lux/target/php.lux b/stdlib/source/library/lux/meta/target/php.lux index 0369549f3..cb7870fd2 100644 --- a/stdlib/source/library/lux/target/php.lux +++ b/stdlib/source/library/lux/meta/target/php.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except Location Code Global Label static int if cond or and not comment for try global the parameter) - ["@" target] [abstract [equivalence (.only Equivalence)] [hash (.only Hash)] @@ -18,6 +17,7 @@ ["n" nat] ["f" frac]]] [meta + ["@" target] ["[0]" code (.only) ["<[1]>" \\parser]] [macro diff --git a/stdlib/source/library/lux/target/python.lux b/stdlib/source/library/lux/meta/target/python.lux index b02449eb7..b3c874f26 100644 --- a/stdlib/source/library/lux/target/python.lux +++ b/stdlib/source/library/lux/meta/target/python.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except Location Code not or and list if int comment exec try the is def) - ["@" target] ["[0]" ffi] [abstract [equivalence (.only Equivalence)] @@ -19,6 +18,7 @@ ["n" nat] ["f" frac]]] [meta + ["@" target] ["[0]" code (.only) ["<[1]>" \\parser]] [macro diff --git a/stdlib/source/library/lux/target/r.lux b/stdlib/source/library/lux/meta/target/r.lux index f425f584b..f425f584b 100644 --- a/stdlib/source/library/lux/target/r.lux +++ b/stdlib/source/library/lux/meta/target/r.lux diff --git a/stdlib/source/library/lux/target/ruby.lux b/stdlib/source/library/lux/meta/target/ruby.lux index 1d7662bae..179d0182c 100644 --- a/stdlib/source/library/lux/target/ruby.lux +++ b/stdlib/source/library/lux/meta/target/ruby.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except Location Code static int if function or and not comment local global symbol the) - ["@" target] [abstract [equivalence (.only Equivalence)] [hash (.only Hash)] @@ -18,6 +17,7 @@ ["n" nat] ["f" frac]]] [meta + ["@" target] ["[0]" code (.only) ["<[1]>" \\parser]] [macro diff --git a/stdlib/source/library/lux/target/scheme.lux b/stdlib/source/library/lux/meta/target/scheme.lux index e8e39d40e..86b9c5921 100644 --- a/stdlib/source/library/lux/target/scheme.lux +++ b/stdlib/source/library/lux/meta/target/scheme.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except Code int or and if cond let symbol) - ["@" target] [abstract [equivalence (.only Equivalence)] [hash (.only Hash)]] @@ -17,6 +16,7 @@ ["n" nat] ["f" frac]]] [meta + ["@" target] [macro ["[0]" template]] [type diff --git a/stdlib/source/library/lux/meta/type.lux b/stdlib/source/library/lux/meta/type.lux index e71bafc42..4d4293e6d 100644 --- a/stdlib/source/library/lux/meta/type.lux +++ b/stdlib/source/library/lux/meta/type.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except function as let) - ["@" target] [abstract [equivalence (.only Equivalence)] [monad (.only Monad do)]] @@ -19,6 +18,7 @@ [number ["n" nat (.use "[1]#[0]" decimal)]]] ["[0]" meta (.only) + ["@" target] ["[0]" location] ["[0]" symbol (.use "[1]#[0]" equivalence codec)] ["[0]" code (.only) diff --git a/stdlib/source/library/lux/meta/type/check.lux b/stdlib/source/library/lux/meta/type/check.lux index a08d36625..2e06e8635 100644 --- a/stdlib/source/library/lux/meta/type/check.lux +++ b/stdlib/source/library/lux/meta/type/check.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except try except with) - ["@" target] [abstract [functor (.only Functor)] [apply (.only Apply)] @@ -20,6 +19,7 @@ [number ["n" nat (.use "[1]#[0]" decimal)]]] [meta + ["@" target] [macro ["^" pattern]]]]] ["[0]" // (.use "[1]#[0]" equivalence)]) diff --git a/stdlib/source/library/lux/program.lux b/stdlib/source/library/lux/program.lux index 02c0c6179..f7fd562eb 100644 --- a/stdlib/source/library/lux/program.lux +++ b/stdlib/source/library/lux/program.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] [abstract [monad (.only do)]] [control @@ -10,6 +9,7 @@ [concurrency ["[0]" thread]]] [meta + ["@" target] ["[0]" code (.only) ["<[1]>" \\parser]] [macro (.only with_symbols) diff --git a/stdlib/source/library/lux/test.lux b/stdlib/source/library/lux/test.lux index 352207e47..fbdc4635e 100644 --- a/stdlib/source/library/lux/test.lux +++ b/stdlib/source/library/lux/test.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except and for) - ["@" target] ["[0]" debug] [abstract ["[0]" monad (.only do)]] @@ -30,6 +29,7 @@ ["n" nat] ["f" frac]]] ["[0]" meta (.only) + ["@" target] ["[0]" symbol] ["[0]" code (.only) ["<[1]>" \\parser]] diff --git a/stdlib/source/library/lux/time/instant.lux b/stdlib/source/library/lux/time/instant.lux index dfc84617e..2f08a6833 100644 --- a/stdlib/source/library/lux/time/instant.lux +++ b/stdlib/source/library/lux/time/instant.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] [abstract [equivalence (.only Equivalence)] [order (.only Order)] @@ -21,6 +20,7 @@ ["i" int] ["f" frac]]] [meta + ["@" target] [type [primitive (.except)]]]]] ["[0]" // (.only Time) diff --git a/stdlib/source/library/lux/tool/compiler/default/init.lux b/stdlib/source/library/lux/tool/compiler/default/init.lux index 7d015fd6b..6d6704655 100644 --- a/stdlib/source/library/lux/tool/compiler/default/init.lux +++ b/stdlib/source/library/lux/tool/compiler/default/init.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target (.only Target)] [abstract ["[0]" monad (.only do)]] [control @@ -18,6 +17,7 @@ ["[0]" set] ["[0]" sequence (.use "[1]#[0]" functor)]]] ["[0]" meta (.only) + ["@" target (.only Target)] ["[0]" configuration (.only Configuration)] ["[0]" version]] [world diff --git a/stdlib/source/library/lux/tool/compiler/default/platform.lux b/stdlib/source/library/lux/tool/compiler/default/platform.lux index af29859b7..cdea7252d 100644 --- a/stdlib/source/library/lux/tool/compiler/default/platform.lux +++ b/stdlib/source/library/lux/tool/compiler/default/platform.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] ["[0]" debug] ["[0]" static] [abstract @@ -27,6 +26,7 @@ ["[0]" set (.only Set)] ["[0]" list (.use "[1]#[0]" monoid functor mix)]]] ["[0]" meta (.only) + ["@" target] ["[0]" configuration (.only Configuration)] [type (.only sharing) ["[0]" check]]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux index f91c4a145..4bfa2da6a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["[0]" meta] [abstract ["[0]" monad (.only do)]] [control @@ -17,7 +16,7 @@ [math [number ["n" nat]]] - [meta + ["[0]" meta (.only) [macro ["^" pattern] ["[0]" template]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux index 028f9ea0e..e1fe38771 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux @@ -12,12 +12,12 @@ ["[0]" dictionary] ["[0]" list]]] [meta - ["[0]" type (.only) - ["[0]" check]] + ["@" target (.only) + ["_" js]] ["[0]" code - ["<[1]>" \\parser (.only Parser)]]] - ["@" target (.only) - ["_" js]]]] + ["<[1]>" \\parser (.only Parser)]] + ["[0]" type (.only) + ["[0]" check]]]]] [// ["/" lux (.only custom)] [// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux index eb88d937f..338029e94 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux @@ -34,31 +34,31 @@ [macro ["^" pattern] ["[0]" template]] + [target + ["[0]" jvm + ["[0]!" reflection] + ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] + ["[0]" attribute] + ["[0]" field] + ["[0]" version] + ["[0]" method] + ["[0]" class] + ["[0]" constant (.only) + ["[0]" pool (.only Resource)]] + [encoding + ["[0]" name (.only External)]] + ["[1]" type (.only Type Argument Typed) (.use "[1]#[0]" equivalence) + ["[0]" category (.only Void Value' Value Return' Return Primitive Object Class Array Var Parameter Method)] + ["[0]" box] + ["[0]" reflection] + ["[0]" descriptor] + ["[0]" signature] + ["[0]" parser] + ["[0]" alias (.only Aliasing)] + ["[0]T" lux (.only Mapping)]]]] ["[0]" type (.only) - ["[0]" check (.only Check) (.use "[1]#[0]" monad)]]] - [target - ["[0]" jvm - ["[0]!" reflection] - ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)] - ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] - ["[0]" attribute] - ["[0]" field] - ["[0]" version] - ["[0]" method] - ["[0]" class] - ["[0]" constant (.only) - ["[0]" pool (.only Resource)]] - [encoding - ["[0]" name (.only External)]] - ["[1]" type (.only Type Argument Typed) (.use "[1]#[0]" equivalence) - ["[0]" category (.only Void Value' Value Return' Return Primitive Object Class Array Var Parameter Method)] - ["[0]" box] - ["[0]" reflection] - ["[0]" descriptor] - ["[0]" signature] - ["[0]" parser] - ["[0]" alias (.only Aliasing)] - ["[0]T" lux (.only Mapping)]]]]]] + ["[0]" check (.only Check) (.use "[1]#[0]" monad)]]]]] ["[0]" // ["[1][0]" lux (.only custom)] ["/[1]" // (.only) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux index 914d3de39..803e0f40f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux @@ -12,12 +12,12 @@ ["[0]" dictionary] ["[0]" list]]] [meta + ["@" target (.only) + ["_" lua]] ["[0]" code ["<[1]>" \\parser (.only Parser)]] ["[0]" type (.only) - ["[0]" check]]] - ["@" target (.only) - ["_" lua]]]] + ["[0]" check]]]]] [// ["/" lux (.only custom)] [// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux index 005ecde81..b053b850c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux @@ -17,14 +17,13 @@ [math [number ["n" nat]]] - [meta + ["[0]" meta (.only) ["[0]" code ["<[1]>" \\parser (.only Parser)]] [macro ["^" pattern]] [type - ["[0]" check]]] - ["[0]" meta]]] + ["[0]" check]]]]] ["[0]" /// (.only) ["[1][0]" bundle] ["/[1]" // diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux index 972bd8b90..b5a632992 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux @@ -12,12 +12,12 @@ ["[0]" dictionary] ["[0]" list]]] [meta + ["@" target (.only) + ["_" php]] ["[0]" code ["<[1]>" \\parser (.only Parser)]] ["[0]" type (.only) - ["[0]" check]]] - ["@" target (.only) - ["_" php]]]] + ["[0]" check]]]]] [// ["/" lux (.only custom)] [// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux index 29b8d1015..1f7316fbd 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux @@ -12,12 +12,12 @@ ["[0]" dictionary] ["[0]" list]]] [meta + ["@" target (.only) + ["_" python]] ["[0]" code ["<[1]>" \\parser (.only Parser)]] ["[0]" type (.only) - ["[0]" check]]] - ["@" target (.only) - ["_" python]]]] + ["[0]" check]]]]] [// ["/" lux (.only custom)] [// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux index a1e27d28e..6dc3f4c09 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux @@ -12,12 +12,12 @@ ["[0]" dictionary] ["[0]" list]]] [meta + ["@" target + ["_" r]] ["[0]" code ["<[1]>" \\parser (.only Parser)]] ["[0]" type (.only) - ["[0]" check]]] - ["@" target - ["_" r]]]] + ["[0]" check]]]]] [// ["/" lux (.only custom)] [// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux index 0bd416eed..60c77b4e7 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux @@ -12,12 +12,12 @@ ["[0]" dictionary] ["[0]" list]]] [meta + ["@" target (.only) + ["_" ruby]] ["[0]" code ["<[1]>" \\parser (.only Parser)]] ["[0]" type (.only) - ["[0]" check]]] - ["@" target (.only) - ["_" ruby]]]] + ["[0]" check]]]]] [// ["/" lux (.only custom)] [// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux index 0ea42268f..089e5ae69 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux @@ -12,12 +12,12 @@ ["[0]" dictionary] ["[0]" list]]] [meta + ["@" target (.only) + ["_" scheme]] ["[0]" code ["<[1]>" \\parser (.only Parser)]] ["[0]" type (.only) - ["[0]" check]]] - ["@" target (.only) - ["_" scheme]]]] + ["[0]" check]]]]] [// ["/" lux (.only custom)] [// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/jvm.lux index 8cb1f6b1c..9362749d9 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/jvm.lux @@ -30,27 +30,29 @@ ["<[1]>" \\parser (.only Parser)]] [macro ["^" pattern] - ["[0]" template]]] - [target - [jvm - ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)] - ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] - ["[0]" attribute] - ["[0]" field] - ["[0]" version] - ["[0]" method (.only Method)] - ["[0]" class] - ["[0]" constant (.only) - ["[0]" pool (.only Resource)]] - [encoding - ["[0]" name (.only External)]] - ["[0]" type (.only Type Constraint Argument Typed) - [category (.only Void Value Return Primitive Object Class Array Var Parameter)] - ["[0]T" lux (.only Mapping)] - ["[0]" signature] - ["[0]" reflection] - ["[0]" descriptor (.only Descriptor)] - ["[0]" parser]]]] + ["[0]" template]] + [type + ["[0]" check (.only Check)]] + [target + [jvm + ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] + ["[0]" attribute] + ["[0]" field] + ["[0]" version] + ["[0]" method (.only Method)] + ["[0]" class] + ["[0]" constant (.only) + ["[0]" pool (.only Resource)]] + [encoding + ["[0]" name (.only External)]] + ["[0]" type (.only Type Constraint Argument Typed) + [category (.only Void Value Return Primitive Object Class Array Var Parameter)] + ["[0]T" lux (.only Mapping)] + ["[0]" signature] + ["[0]" reflection] + ["[0]" descriptor (.only Descriptor)] + ["[0]" parser]]]]] [tool [compiler ["[0]" phase] @@ -85,9 +87,7 @@ [jvm ["[0]" host]]] [declaration - ["/" lux]]]]]]]] - [type - ["[0]" check (.only Check)]]]]) + ["/" lux]]]]]]]]]]) (type Operation (declaration.Operation Anchor (Bytecode Any) Definition)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/lux.lux index c992c73a8..0262cf5eb 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/lux.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/lux.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] [abstract ["[0]" monad (.only do)]] [control @@ -24,12 +23,13 @@ [number ["n" nat]]] ["[0]" meta (.only) + ["@" target] ["[0]" code ["<[1]>" \\parser (.only Parser)]] [macro - ["^" pattern]]] - ["[0]" type (.only sharing) (.use "[1]#[0]" equivalence) - ["[0]" check]]]] + ["^" pattern]] + ["[0]" type (.only sharing) (.use "[1]#[0]" equivalence) + ["[0]" check]]]]] ["[0]" /// (.only Extender) ["[1][0]" bundle] ["[1][0]" analysis] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux index 62bd29a68..41b1165c9 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux @@ -18,8 +18,9 @@ [math [number ["f" frac]]] - ["@" target (.only) - ["_" common_lisp (.only Expression)]]]] + [meta + ["@" target (.only) + ["_" common_lisp (.only Expression)]]]]] ["[0]" //// ["/" bundle] ["/[1]" // diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux index 582107b3c..772660310 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux @@ -15,10 +15,10 @@ [number ["f" frac]]] [meta + ["@" target (.only) + ["_" js (.only Literal Expression Statement)]] [macro - ["^" pattern]]] - ["@" target (.only) - ["_" js (.only Literal Expression Statement)]]]] + ["^" pattern]]]]] ["[0]" //// ["/" bundle] ["/[1]" // diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux index 164544520..b15b0ae3f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux @@ -10,8 +10,9 @@ [collection ["[0]" dictionary] ["[0]" list]]] - [target - ["_" js (.only Var Expression)]]]] + [meta + [target + ["_" js (.only Var Expression)]]]]] ["[0]" // ["[1][0]" common (.only custom)] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux index 53c38e858..9520433e1 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux @@ -15,13 +15,14 @@ [number ["f" frac] ["[0]" i32]]] - [target - [jvm - ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad)] - [encoding - ["[0]" signed (.only S4)]] - ["[0]" type (.only Type) - [category (.only Primitive Class)]]]]]] + [meta + [target + [jvm + ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad)] + [encoding + ["[0]" signed (.only S4)]] + ["[0]" type (.only Type) + [category (.only Primitive Class)]]]]]]] ["[0]" ///// [generation [extension (.only Nullary Unary Binary Trinary Variadic diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux index 0d0a38730..668af9d43 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux @@ -26,25 +26,25 @@ [meta [macro ["^" pattern] - ["[0]" template]]] - [target - [jvm - ["[0]" version] - ["[0]" modifier (.use "[1]#[0]" monoid)] - ["[0]" method (.only Method)] - ["[0]" class (.only Class)] - [constant - [pool (.only Resource)]] - [encoding - ["[0]" name]] - ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad) - ["__" instruction (.only Primitive_Array_Type)]] - ["[0]" type (.only Type Typed Argument) - ["[0]" category (.only Void Value' Value Return' Return Primitive Object Array Var Parameter)] - ["[0]" box] - ["[0]" reflection] - ["[0]" signature] - ["[0]" parser]]]]]] + ["[0]" template]] + [target + [jvm + ["[0]" version] + ["[0]" modifier (.use "[1]#[0]" monoid)] + ["[0]" method (.only Method)] + ["[0]" class (.only Class)] + [constant + [pool (.only Resource)]] + [encoding + ["[0]" name]] + ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad) + ["__" instruction (.only Primitive_Array_Type)]] + ["[0]" type (.only Type Typed Argument) + ["[0]" category (.only Void Value' Value Return' Return Primitive Object Array Var Parameter)] + ["[0]" box] + ["[0]" reflection] + ["[0]" signature] + ["[0]" parser]]]]]]] ["[0]" // [common (.only custom)] ["///[1]" //// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux index 00cd16e75..8fdfccda4 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux @@ -19,9 +19,9 @@ ["f" frac]]] [meta [macro - ["^" pattern]]] - ["@" target (.only) - ["_" lua (.only Expression Statement)]]]] + ["^" pattern]] + ["@" target (.only) + ["_" lua (.only Expression Statement)]]]]] ["[0]" //// ["/" bundle] ["/[1]" // diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux index 6546b3d1c..603d2efb2 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux @@ -12,8 +12,9 @@ ["[0]" list]] [text ["%" \\format (.only format)]]] - [target - ["_" lua (.only Var Expression)]]]] + [meta + [target + ["_" lua (.only Var Expression)]]]]] ["[0]" // ["[1][0]" common (.only custom)] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux index 073eac767..8fcabe6e4 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux @@ -18,8 +18,9 @@ [math [number ["f" frac]]] - ["@" target (.only) - ["_" php (.only Expression)]]]] + [meta + ["@" target (.only) + ["_" php (.only Expression)]]]]] ["[0]" //// ["/" bundle] ["/[1]" // diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux index 80e7f0f66..855f5754d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux @@ -12,8 +12,9 @@ ["[0]" list]] [text ["%" \\format (.only format)]]] - [target - ["_" php (.only Var Expression)]]]] + [meta + [target + ["_" php (.only Var Expression)]]]]] ["[0]" // ["[1][0]" common (.only custom)] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux index 6d42c51e7..b4a6a8f0c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux @@ -19,9 +19,9 @@ ["f" frac]]] [meta [macro - ["^" pattern]]] - [target - ["_" python (.only Expression Statement)]]]] + ["^" pattern]] + [target + ["_" python (.only Expression Statement)]]]]] ["[0]" //// ["/" bundle] ["/[1]" // diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux index 16d98cda5..3354e69db 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux @@ -12,8 +12,9 @@ [collection ["[0]" dictionary] ["[0]" list]]] - [target - ["_" python (.only Expression SVar)]]]] + [meta + [target + ["_" python (.only Expression SVar)]]]]] ["[0]" // ["[1][0]" common (.only custom)] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux index a03635054..b2dbae1f3 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux @@ -18,8 +18,9 @@ [math [number ["f" frac]]] - ["@" target (.only) - ["_" r (.only Expression)]]]] + [meta + ["@" target (.only) + ["_" r (.only Expression)]]]]] ["[0]" //// ["/" bundle] ["/[1]" // diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux index 8939e5c6c..31a2e612f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux @@ -12,8 +12,9 @@ ["[0]" list]] [text ["%" \\format (.only format)]]] - [target - ["_" r (.only Var Expression)]]]] + [meta + [target + ["_" r (.only Var Expression)]]]]] ["[0]" // ["[1][0]" common (.only custom)] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux index 944bcec7c..dca8af12f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux @@ -19,9 +19,9 @@ ["f" frac]]] [meta [macro - ["^" pattern]]] - [target - ["_" ruby (.only Expression Statement)]]]] + ["^" pattern]] + [target + ["_" ruby (.only Expression Statement)]]]]] ["[0]" //// ["/" bundle] ["/[1]" // diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux index f5ee0933c..bbff556ec 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux @@ -12,8 +12,9 @@ ["[0]" list]] [text ["%" \\format (.only format)]]] - [target - ["_" ruby (.only Var Expression)]]]] + [meta + [target + ["_" ruby (.only Var Expression)]]]]] ["[0]" // ["[1][0]" common (.only custom)] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux index c46114d06..2b8bbcba8 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux @@ -18,8 +18,9 @@ [math [number ["f" frac]]] - ["@" target - ["_" scheme (.only Expression)]]]] + [meta + ["@" target + ["_" scheme (.only Expression)]]]]] ["[0]" //// ["/" bundle] ["/[1]" // diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux index 9d8242967..d48dc1e11 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux @@ -12,8 +12,9 @@ ["[0]" list]] [text ["%" \\format (.only format)]]] - [target - ["_" scheme (.only Var Expression)]]]] + [meta + [target + ["_" scheme (.only Var Expression)]]]]] ["[0]" // ["[1][0]" common (.only custom)] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux index c00fab798..cd5ef69ad 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux @@ -14,9 +14,9 @@ ["n" nat]]] [meta [macro - ["^" pattern]]] - [target - ["_" common_lisp (.only Expression Var/1)]]]] + ["^" pattern]] + [target + ["_" common_lisp (.only Expression Var/1)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux index 773a50b72..bb57efc5b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux @@ -11,8 +11,9 @@ ["f" frac]] [collection ["[0]" dictionary]]] - [target - ["_" common_lisp (.only Expression)]]]] + [meta + [target + ["_" common_lisp (.only Expression)]]]]] ["[0]" /// ["[1][0]" runtime (.only Operation Phase Handler Bundle)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux index e04607dd1..6b6fd617d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux @@ -11,8 +11,9 @@ ["%" \\format (.only format)]] [collection ["[0]" list (.use "[1]#[0]" functor)]]] - [target - ["_" common_lisp (.only Expression Var/1)]]]] + [meta + [target + ["_" common_lisp (.only Expression Var/1)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux index 6ab3d1e38..ad1f110de 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux @@ -12,8 +12,9 @@ [math [number ["n" nat]]] - [target - ["_" common_lisp (.only Expression)]]]] + [meta + [target + ["_" common_lisp (.only Expression)]]]]] ["[0]" // [runtime (.only Operation Phase Generator)] ["[1][0]" case] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux index 463cefc17..a85bbb625 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except i64) - [target - ["_" common_lisp (.only Expression)]]]]) + [meta + [target + ["_" common_lisp (.only Expression)]]]]]) (def .public bit (-> Bit (Expression Any)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux index 7475687e5..4f70ce907 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except) - [target - ["_" common_lisp (.only Expression)]]]] + [meta + [target + ["_" common_lisp (.only Expression)]]]]] [/// [reference (.only System)]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux index a945e79be..77f1e5cfd 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux @@ -21,9 +21,9 @@ ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) - [syntax (.only syntax)]]] - ["@" target - ["_" common_lisp (.only Expression Computation Literal)]]]] + [syntax (.only syntax)]] + ["@" target + ["_" common_lisp (.only Expression Computation Literal)]]]]] ["[0]" /// ["[1][0]" reference] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux index 3796405b1..af4d6023b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux @@ -3,8 +3,9 @@ [lux (.except) [abstract ["[0]" monad (.only do)]] - [target - ["_" common_lisp (.only Expression)]]]] + [meta + [target + ["_" common_lisp (.only Expression)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux index bf12be34e..864edbf16 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux @@ -7,9 +7,9 @@ ["[0]" exception (.only exception)]] [meta [macro - ["^" pattern]]] - [target - ["_" js]]]] + ["^" pattern]] + [target + ["_" js]]]]] ["[0]" / [runtime (.only Phase Phase!)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux index e93ef8b99..f8b30c1f9 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux @@ -14,9 +14,9 @@ ["n" nat]]] [meta [macro - ["^" pattern]]] - [target - ["_" js (.only Expression Computation Var Statement)]]]] + ["^" pattern]] + [target + ["_" js (.only Expression Computation Var Statement)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Phase! Generator Generator!)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux index 6121a5b53..5d5cf5e13 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux @@ -9,8 +9,9 @@ ["%" \\format (.only format)]] [collection ["[0]" list (.use "[1]#[0]" functor mix)]]] - [target - ["_" js (.only Expression Computation Var Statement)]]]] + [meta + [target + ["_" js (.only Expression Computation Var Statement)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Phase! Generator)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux index 124c94a02..bac543584 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux @@ -12,8 +12,9 @@ [math [number ["n" nat]]] - [target - ["_" js (.only Computation Var Expression Statement)]]]] + [meta + [target + ["_" js (.only Computation Var Expression Statement)]]]]] ["[0]" // [runtime (.only Operation Phase Phase! Generator Generator!)] ["[1][0]" case] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux index 67cf1d9df..509108682 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except i64) - [target - ["_" js (.only Computation)]]]] + [meta + [target + ["_" js (.only Computation)]]]]] ["[0]" // ["[1][0]" runtime]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/reference.lux index 665f83695..95393bf91 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/reference.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except) - [target - ["_" js (.only Expression)]]]] + [meta + [target + ["_" js (.only Expression)]]]]] [/// [reference (.only System)]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux index da52044a7..270ff3256 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux @@ -22,9 +22,9 @@ ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) - [syntax (.only syntax)]]] - [target - ["_" js (.only Expression Var Computation Statement)]]]] + [syntax (.only syntax)]] + [target + ["_" js (.only Expression Var Computation Statement)]]]]] ["[0]" /// ["[1][0]" reference] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/structure.lux index abdb1e9b6..e5a492e37 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/structure.lux @@ -3,8 +3,9 @@ [lux (.except Variant Tuple) [abstract ["[0]" monad (.only do)]] - [target - ["_" js (.only Expression)]]]] + [meta + [target + ["_" js (.only Expression)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux index 2903069f8..f5d258fbb 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux @@ -16,15 +16,15 @@ ["[0]" i32]]] [meta [macro - ["^" pattern]]] - [target - [jvm - ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad) - [environment - [limit - ["[0]" stack]]]] - ["[0]" type (.only Type) - [category (.only Method)]]]]]] + ["^" pattern]] + [target + [jvm + ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad) + [environment + [limit + ["[0]" stack]]]] + ["[0]" type (.only Type) + [category (.only Method)]]]]]]] ["[0]" // ["[1][0]" type] ["[1][0]" runtime (.only Operation Phase Generator)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux index 13d5eb827..9bc52e436 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux @@ -14,22 +14,23 @@ [number ["n" nat] ["[0]" i32]]] - [target - [jvm - ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad)] - ["[0]" version] - ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] - ["[0]" field (.only Field)] - ["[0]" method (.only Method)] - ["[0]" class (.only Class)] - ["[0]" type (.only Type) - [category (.only Return' Value')] - ["[0]" reflection]] - ["[0]" constant (.only) - [pool (.only Resource)]] - [encoding - ["[0]" name (.only External Internal)] - ["[0]" unsigned]]]] + [meta + [target + [jvm + ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad)] + ["[0]" version] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] + ["[0]" field (.only Field)] + ["[0]" method (.only Method)] + ["[0]" class (.only Class)] + ["[0]" type (.only Type) + [category (.only Return' Value')] + ["[0]" reflection]] + ["[0]" constant (.only) + [pool (.only Resource)]] + [encoding + ["[0]" name (.only External Internal)] + ["[0]" unsigned]]]]] [tool [compiler [meta diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux index 8ca23c0f4..ea783b42a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux @@ -4,10 +4,11 @@ [data [text ["%" \\format]]] - [target - [jvm - ["[0]" type (.only Type) - [category (.only Method)]]]]]] + [meta + [target + [jvm + ["[0]" type (.only Type) + [category (.only Method)]]]]]]] [// [field [constant diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux index 8e171cfd2..31fb77c7b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux @@ -4,14 +4,15 @@ [data [collection ["[0]" sequence]]] - [target - [jvm - ["[0]" field (.only Field)] - ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] - [type (.only Type) - [category (.only Value)]] - [constant - [pool (.only Resource)]]]]]]) + [meta + [target + [jvm + ["[0]" field (.only Field)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] + [type (.only Type) + [category (.only Value)]] + [constant + [pool (.only Resource)]]]]]]]) (def modifier (Modifier Field) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux index 51ee2f466..0f7856172 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux @@ -1,11 +1,12 @@ (.require [library [lux (.except type) - [target - [jvm - ["[0]" type] - [constant - [pool (.only Resource)]]]]]] + [meta + [target + [jvm + ["[0]" type] + [constant + [pool (.only Resource)]]]]]]] ["[0]" // [///////// [arity (.only Arity)]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux index 08a3c9df8..539f43afe 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux @@ -5,15 +5,16 @@ [collection ["[0]" list (.use "[1]#[0]" functor)] ["[0]" sequence]]] - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] - ["[0]" field (.only Field)] - [type (.only Type) - [category (.only Value Class)]] - [constant - [pool (.only Resource)]]]]]] + [meta + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] + ["[0]" field (.only Field)] + [type (.only Type) + [category (.only Value Class)]] + [constant + [pool (.only Resource)]]]]]]] ["[0]" //// ["[1][0]" type] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/count.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/count.lux index aed904262..c58fad6cf 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/count.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/count.lux @@ -3,13 +3,14 @@ [lux (.except type) [control ["[0]" try]] - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" type] - [encoding - [name (.only External)] - ["[0]" signed]]]]]] + [meta + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" type] + [encoding + [name (.only External)] + ["[0]" signed]]]]]]] ["[0]" //// ["[1][0]" abstract]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux index 9ad94ea7e..b8f01c6f1 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux @@ -4,14 +4,15 @@ [data [collection ["[0]" list]]] - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" field (.only Field)] - [constant - [pool (.only Resource)]] - [type (.only Type) - [category (.only Value Class)]]]]]] + [meta + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" field (.only Field)] + [constant + [pool (.only Resource)]] + [type (.only Type) + [category (.only Value Class)]]]]]]] ["[0]" // (.only) ["///[1]" //// ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux index 4f0e6c222..7310e30ce 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux @@ -9,14 +9,15 @@ [math [number ["n" nat]]] - [target - [jvm - ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)] - ["[0]" field (.only Field)] - [type (.only Type) - [category (.only Class)]] - [constant - [pool (.only Resource)]]]]]] + [meta + [target + [jvm + ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)] + ["[0]" field (.only Field)] + [type (.only Type) + [category (.only Class)]] + [constant + [pool (.only Resource)]]]]]]] ["[0]" // (.only) ["[1][0]" count] ["/[1]" // diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux index 5b6aa435c..b00454753 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux @@ -1,10 +1,11 @@ (.require [library [lux (.except) - [target - [jvm - ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] - ["[0]" method (.only Method)]]]]]) + [meta + [target + [jvm + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] + ["[0]" method (.only Method)]]]]]]) (def .public modifier (Modifier Method) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux index 6bf5d7dec..10de5d326 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux @@ -13,16 +13,17 @@ ["n" nat] ["i" int] ["[0]" i32]]] - [target - [jvm - ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad)] - ["[0]" method (.only Method)] - [constant - [pool (.only Resource)]] - [encoding - ["[0]" signed]] - ["[0]" type (.only Type) - ["[0]" category (.only Class)]]]]]] + [meta + [target + [jvm + ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad)] + ["[0]" method (.only Method)] + [constant + [pool (.only Resource)]] + [encoding + ["[0]" signed]] + ["[0]" type (.only Type) + ["[0]" category (.only Class)]]]]]]] ["[0]" // (.only) ["[1][0]" reset] ["[1][0]" implementation] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux index 438f9f68d..65f3ef2bb 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux @@ -7,15 +7,16 @@ [math [number ["n" nat]]] - [target - [jvm - ["_" bytecode (.only Label Bytecode)] - ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] - ["[0]" method (.only Method)] - [constant - [pool (.only Resource)]] - ["[0]" type (.only Type) - ["[0]" category (.only Class)]]]]]] + [meta + [target + [jvm + ["_" bytecode (.only Label Bytecode)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] + ["[0]" method (.only Method)] + [constant + [pool (.only Resource)]] + ["[0]" type (.only Type) + ["[0]" category (.only Class)]]]]]]] ["[0]" // (.only) ["//[1]" /// ["[0]" runtime] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux index d60aad8a3..2e551f44d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux @@ -11,16 +11,17 @@ [math [number ["n" nat]]] - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" method (.only Method)] - [encoding - ["[0]" signed]] - [constant - [pool (.only Resource)]] - ["[0]" type (.only Type) - ["[0]" category (.only Class Value)]]]]]] + [meta + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" method (.only Method)] + [encoding + ["[0]" signed]] + [constant + [pool (.only Resource)]] + ["[0]" type (.only Type) + ["[0]" category (.only Class Value)]]]]]]] ["[0]" // (.only) ["[1][0]" implementation] ["/[1]" // diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux index f61d67d93..e2eda6c01 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux @@ -9,15 +9,16 @@ [math [number ["n" nat]]] - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" field (.only Field)] - ["[0]" method (.only Method)] - ["[0]" constant (.only) - [pool (.only Resource)]] - [type (.only Type) - ["[0]" category (.only Class Value Return)]]]] + [meta + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" field (.only Field)] + ["[0]" method (.only Method)] + ["[0]" constant (.only) + [pool (.only Resource)]] + [type (.only Type) + ["[0]" category (.only Class Value Return)]]]]] [tool [compiler [meta diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux index f38edc961..bfbacf886 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux @@ -4,14 +4,15 @@ [data [collection ["[0]" list (.use "[1]#[0]" functor)]]] - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" method (.only Method)] - [constant - [pool (.only Resource)]] - ["[0]" type (.only Type) - ["[0]" category (.only Class)]]]]]] + [meta + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" method (.only Method)] + [constant + [pool (.only Resource)]] + ["[0]" type (.only Type) + ["[0]" category (.only Class)]]]]]]] ["[0]" // (.only) ["[1][0]" new] ["/[1]" // diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux index 493b47a6e..1212056f5 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux @@ -21,19 +21,20 @@ ["[0]" array] ["[0]" dictionary (.only Dictionary)] ["[0]" sequence]]] - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" loader (.only Library)] - ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] - ["[0]" field (.only Field)] - ["[0]" method (.only Method)] - ["[0]" version] - ["[0]" class (.only Class)] - ["[0]" encoding - ["[1]/[0]" name]] - ["[0]" type (.only) - ["[0]" descriptor]]]] + [meta + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" loader (.only Library)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] + ["[0]" field (.only Field)] + ["[0]" method (.only Method)] + ["[0]" version] + ["[0]" class (.only Class)] + ["[0]" encoding + ["[1]/[0]" name]] + ["[0]" type (.only) + ["[0]" descriptor]]]]] [tool [compiler [meta diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux index 8758e7b06..d7b73995e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux @@ -12,9 +12,10 @@ [math [number ["n" nat]]] - [target - [jvm - ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)]]]]] + [meta + [target + [jvm + ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)]]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" value] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux index 100d864ab..ad5a79db9 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux @@ -11,13 +11,13 @@ ["i" int]]] [meta [macro - ["^" pattern]]] - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" type] - [encoding - ["[0]" signed]]]]]] + ["^" pattern]] + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" type] + [encoding + ["[0]" signed]]]]]]] ["[0]" // ["[1][0]" runtime]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux index f902c5261..bbded6297 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux @@ -10,17 +10,18 @@ ["[0]" \\format]] [collection ["[0]" sequence]]] - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] - ["[0]" method (.only Method)] - ["[0]" version] - ["[0]" class (.only Class)] - [encoding - ["[0]" name]] - ["[0]" type (.only) - ["[0]" reflection]]]] + [meta + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] + ["[0]" method (.only Method)] + ["[0]" version] + ["[0]" class (.only Class)] + [encoding + ["[0]" name]] + ["[0]" type (.only) + ["[0]" reflection]]]]] [tool [compiler [language diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux index b7428004d..a6f209206 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux @@ -6,12 +6,13 @@ [data [text ["%" \\format (.only format)]]] - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" type] - [encoding - ["[0]" unsigned]]]]]] + [meta + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" type] + [encoding + ["[0]" unsigned]]]]]]] ["[0]" // ["[1][0]" runtime (.only Operation)] ["[1][0]" value] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux index 7f11b6f25..a728d2b2e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux @@ -21,22 +21,22 @@ ["[0]" i32] ["[0]" i64]]] [meta - ["[0]" version]] - [target - ["[0]" jvm - ["_" bytecode (.only Label Bytecode)] - ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] - ["[0]" field (.only Field)] - ["[0]" method (.only Method)] - ["[1]/[0]" version] - ["[0]" class (.only Class)] - ["[0]" constant (.only) - [pool (.only Resource)]] - [encoding - ["[0]" name]] - ["[0]" type (.only Type) - ["[0]" category (.only Return' Value')] - ["[0]" reflection]]]]]] + ["[0]" version] + [target + ["[0]" jvm + ["_" bytecode (.only Label Bytecode)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] + ["[0]" field (.only Field)] + ["[0]" method (.only Method)] + ["[1]/[0]" version] + ["[0]" class (.only Class)] + ["[0]" constant (.only) + [pool (.only Resource)]] + [encoding + ["[0]" name]] + ["[0]" type (.only Type) + ["[0]" category (.only Return' Value')] + ["[0]" reflection]]]]]]] ["[0]" // ["[1][0]" type] ["[1][0]" value] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux index 2fa2147b5..54958837b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux @@ -11,12 +11,13 @@ [math [number ["[0]" i32]]] - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" type] - [encoding - ["[0]" signed]]]]]] + [meta + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" type] + [encoding + ["[0]" signed]]]]]]] ["[0]" // ["[1][0]" type] ["[1][0]" runtime (.only Operation Phase Generator)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/type.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/type.lux index 7dfbaf164..c178701b3 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/type.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/type.lux @@ -1,9 +1,10 @@ (.require - [library - [lux (.except) + [library + [lux (.except) + [meta [target [jvm - ["[0]" type]]]]]) + ["[0]" type]]]]]]) (def .public frac (type.class "java.lang.Double" (list))) (def .public text (type.class "java.lang.String" (list))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux index d44068070..3d914a0e7 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux @@ -1,12 +1,13 @@ (.require [library [lux (.except Type Primitive) - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" type (.only Type) (.use "[1]#[0]" equivalence) - [category (.only Primitive)] - ["[0]" box]]]]]]) + [meta + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" type (.only Type) (.use "[1]#[0]" equivalence) + [category (.only Primitive)] + ["[0]" box]]]]]]]) (def .public field "value") diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux index fbfb53b71..2e27b6973 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux @@ -7,9 +7,9 @@ ["[0]" exception (.only exception)]] [meta [macro - ["^" pattern]]] - [target - ["_" lua]]]] + ["^" pattern]] + [target + ["_" lua]]]]] ["[0]" / [runtime (.only Phase)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux index 9e0103911..5924848e8 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux @@ -11,9 +11,9 @@ ["[0]" set]]] [meta [macro - ["^" pattern]]] - [target - ["_" lua (.only Expression Var Statement)]]]] + ["^" pattern]] + [target + ["_" lua (.only Expression Var Statement)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Phase! Generator Generator!)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux index d23070fc8..77f3d2caf 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux @@ -9,8 +9,9 @@ ["%" \\format (.only format)]] [collection ["[0]" list (.use "[1]#[0]" functor mix)]]] - [target - ["_" lua (.only Var Expression Label Statement)]]]] + [meta + [target + ["_" lua (.only Var Expression Label Statement)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Phase! Generator)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux index 5c44eb15b..bef9f9893 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux @@ -13,8 +13,9 @@ [math [number ["n" nat]]] - [target - ["_" lua (.only Var Expression Label Statement)]]]] + [meta + [target + ["_" lua (.only Var Expression Label Statement)]]]]] ["[0]" // [runtime (.only Operation Phase Phase! Generator Generator!)] ["[1][0]" case] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux index 0b5be3e97..48c05d948 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except i64) - [target - ["_" lua (.only Literal)]]]]) + [meta + [target + ["_" lua (.only Literal)]]]]]) (with_template [<name> <type> <implementation>] [(def .public <name> diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux index 8ebc27887..f7309bb8c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except) - [target - ["_" lua (.only Expression)]]]] + [meta + [target + ["_" lua (.only Expression)]]]]] [/// [reference (.only System)]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux index 7d2fff7cd..8a124aadc 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux @@ -22,9 +22,9 @@ ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) - [syntax (.only syntax)]]] - ["@" target (.only) - ["_" lua (.only Expression Location Var Computation Literal Label Statement)]]]] + [syntax (.only syntax)]] + ["@" target (.only) + ["_" lua (.only Expression Location Var Computation Literal Label Statement)]]]]] ["[0]" /// ["[1][0]" reference] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux index dd87319b7..e3b0c8c66 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux @@ -3,8 +3,9 @@ [lux (.except Tuple Variant) [abstract ["[0]" monad (.only do)]] - [target - ["_" lua (.only Expression)]]]] + [meta + [target + ["_" lua (.only Expression)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux index 55c495cee..293366280 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux @@ -7,9 +7,9 @@ ["[0]" exception (.only exception)]] [meta [macro - ["^" pattern]]] - [target - ["_" php]]]] + ["^" pattern]] + [target + ["_" php]]]]] ["[0]" / [runtime (.only Phase Phase!)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux index 00094289c..816b77d0f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux @@ -15,9 +15,9 @@ ["i" int]]] [meta [macro - ["^" pattern]]] - [target - ["_" php (.only Expression Var Statement)]]]] + ["^" pattern]] + [target + ["_" php (.only Expression Var Statement)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Phase! Generator Generator!)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux index 5ad80978c..26e582da3 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux @@ -12,8 +12,9 @@ ["f" frac]] [collection ["[0]" dictionary]]] - [target - ["_" php (.only Expression)]]]] + [meta + [target + ["_" php (.only Expression)]]]]] ["[0]" /// ["[1][0]" runtime (.only Operation Phase Handler Bundle)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux index d353cb535..b2ca21671 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux @@ -11,8 +11,9 @@ ["%" \\format (.only format)]] [collection ["[0]" list (.use "[1]#[0]" functor mix)]]] - [target - ["_" php (.only Var Global Expression Argument Label Statement)]]]] + [meta + [target + ["_" php (.only Var Global Expression Argument Label Statement)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Phase! Generator)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux index 009dd0271..5c3682738 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux @@ -13,8 +13,9 @@ [math [number ["n" nat]]] - [target - ["_" php (.only Var Expression Label Statement)]]]] + [meta + [target + ["_" php (.only Var Expression Label Statement)]]]]] ["[0]" // [runtime (.only Operation Phase Phase! Generator Generator!)] ["[1][0]" case] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux index 8a8b6e9b8..eaf53dada 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux @@ -4,8 +4,9 @@ [math [number ["[0]" frac]]] - [target - ["_" php (.only Literal Expression)]]]] + [meta + [target + ["_" php (.only Literal Expression)]]]]] ["[0]" // ["[1][0]" runtime]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/reference.lux index 28164075c..2dbdfad8a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/reference.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except) - [target - ["_" php (.only Expression)]]]] + [meta + [target + ["_" php (.only Expression)]]]]] [/// [reference (.only System)]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux index 755efeded..bff0a6cf0 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux @@ -22,9 +22,9 @@ ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) - [syntax (.only syntax)]]] - ["@" target (.only) - ["_" php (.only Expression Label Constant Var Computation Literal Statement)]]]] + [syntax (.only syntax)]] + ["@" target (.only) + ["_" php (.only Expression Label Constant Var Computation Literal Statement)]]]]] ["[0]" /// ["[1][0]" reference] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux index ef9fdee7e..cd48b763b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux @@ -7,9 +7,9 @@ ["[0]" exception (.only exception)]] [meta [macro - ["^" pattern]]] - [target - ["_" python]]]] + ["^" pattern]] + [target + ["_" python]]]]] ["[0]" / [runtime (.only Phase)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux index 02a90bd13..090c2587e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux @@ -15,9 +15,9 @@ ["i" int]]] [meta [macro - ["^" pattern]]] - [target - ["_" python (.only Expression SVar Statement)]]]] + ["^" pattern]] + [target + ["_" python (.only Expression SVar Statement)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator Phase! Generator!)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux index e7ee5d68f..1d1021d11 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux @@ -9,8 +9,9 @@ ["%" \\format (.only format)]] [collection ["[0]" list (.use "[1]#[0]" functor mix)]]] - [target - ["_" python (.only SVar Expression Statement)]]]] + [meta + [target + ["_" python (.only SVar Expression Statement)]]]]] ["[0]" // [runtime (.only Operation Phase Generator Phase! Generator!)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux index 6ac83864b..d767eeeeb 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux @@ -13,8 +13,9 @@ [math [number ["n" nat]]] - [target - ["_" python (.only Expression SVar Statement)]]]] + [meta + [target + ["_" python (.only Expression SVar Statement)]]]]] ["[0]" // [runtime (.only Operation Phase Generator Phase! Generator!)] ["[1][0]" case] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux index 14ced2e59..b50c2c965 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except i64) - [target - ["_" python (.only Expression)]]]] + [meta + [target + ["_" python (.only Expression)]]]]] ["[0]" // ["[1][0]" runtime]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/reference.lux index 673eb78cf..9b105605e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/reference.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except) - [target - ["_" python (.only Expression)]]]] + [meta + [target + ["_" python (.only Expression)]]]]] [/// [reference (.only System)]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux index b90fd1962..d045b7d8e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux @@ -24,9 +24,9 @@ ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) - [syntax (.only syntax)]]] - ["@" target (.only) - ["_" python (.only Expression SVar Computation Literal Statement)]]]] + [syntax (.only syntax)]] + ["@" target (.only) + ["_" python (.only Expression SVar Computation Literal Statement)]]]]] ["[0]" /// ["[1][0]" reference] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/structure.lux index 76dcc39ec..428320d23 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/structure.lux @@ -3,8 +3,9 @@ [lux (.except Variant Tuple) [abstract ["[0]" monad (.only do)]] - [target - ["_" python (.only Expression)]]]] + [meta + [target + ["_" python (.only Expression)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux index 6028a0ac3..7741ccce0 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux @@ -5,9 +5,9 @@ [monad (.only do)]] [meta [macro - ["^" pattern]]] - [target - ["_" r]]]] + ["^" pattern]] + [target + ["_" r]]]]] ["[0]" / [runtime (.only Phase)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux index 472f361b6..cc47ed212 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux @@ -16,9 +16,9 @@ [meta [macro ["^" pattern] - ["[0]" template]]] - [target - ["_" r (.only Expression SVar)]]]] + ["[0]" template]] + [target + ["_" r (.only Expression SVar)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux index eecc00423..80f8ac48c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux @@ -11,8 +11,9 @@ ["%" \\format (.only format)]] [collection ["[0]" list (.use "[1]#[0]" functor mix)]]] - [target - ["_" r (.only Expression SVar)]]]] + [meta + [target + ["_" r (.only Expression SVar)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux index 10994fbca..35477e3f7 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux @@ -13,8 +13,9 @@ [math [number ["n" nat]]] - [target - ["_" r]]]] + [meta + [target + ["_" r]]]]] ["[0]" // [runtime (.only Operation Phase Generator)] ["[1][0]" case] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux index 07ed2ccc8..ffd4625bb 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except i64) - [target - ["_" r (.only Expression)]]]] + [meta + [target + ["_" r (.only Expression)]]]]] ["[0]" // ["[1][0]" runtime]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/reference.lux index 5097a3c80..b80350acf 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/reference.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except) - [target - ["_" r (.only Expression)]]]] + [meta + [target + ["_" r (.only Expression)]]]]] [/// [reference (.only System)]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux index 47cc25566..c23b725d5 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux @@ -24,9 +24,9 @@ ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) - [syntax (.only syntax)]]] - ["@" target (.only) - ["_" r (.only SVar Expression)]]]] + [syntax (.only syntax)]] + ["@" target (.only) + ["_" r (.only SVar Expression)]]]]] ["[0]" /// ["[1][0]" reference] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/structure.lux index 70ff1a0f8..b381f8d63 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/structure.lux @@ -6,8 +6,9 @@ [data [collection ["[0]" list]]] - [target - ["_" r (.only Expression)]]]] + [meta + [target + ["_" r (.only Expression)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux index 97dbdfe82..bc1c562c2 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux @@ -1,11 +1,11 @@ (.require [library [lux (.except local) - ["@" target] [data [text ["%" \\format (.only format)]]] [meta + ["@" target] ["[0]" version]]]] ["[0]" //// ["[1][0]" generation] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux index ed6f6710e..f3e5aed3c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux @@ -7,9 +7,9 @@ ["[0]" exception (.only exception)]] [meta [macro - ["^" pattern]]] - [target - ["_" ruby]]]] + ["^" pattern]] + [target + ["_" ruby]]]]] ["[0]" / [runtime (.only Phase Phase!)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux index f76b378c8..88a7e039e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux @@ -15,9 +15,9 @@ ["i" int]]] [meta [macro - ["^" pattern]]] - [target - ["_" ruby (.only Expression LVar Statement)]]]] + ["^" pattern]] + [target + ["_" ruby (.only Expression LVar Statement)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator Phase! Generator!)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux index b22497918..51cf79c55 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux @@ -9,8 +9,9 @@ ["%" \\format (.only format)]] [collection ["[0]" list (.use "[1]#[0]" functor mix)]]] - [target - ["_" ruby (.only LVar GVar Expression Statement)]]]] + [meta + [target + ["_" ruby (.only LVar GVar Expression Statement)]]]]] ["[0]" // [runtime (.only Operation Phase Generator Phase! Generator!)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux index 46b743b34..1a82b9e18 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux @@ -13,8 +13,9 @@ [math [number ["n" nat]]] - [target - ["_" ruby (.only Expression LVar Statement)]]]] + [meta + [target + ["_" ruby (.only Expression LVar Statement)]]]]] ["[0]" // [runtime (.only Operation Phase Generator Phase! Generator!)] ["[1][0]" case] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux index 609e7683c..06b100bc5 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except i64) - [target - ["_" ruby (.only Literal)]]]]) + [meta + [target + ["_" ruby (.only Literal)]]]]]) (with_template [<type> <name> <implementation>] [(def .public <name> diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux index d0d6399dc..28629dc19 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except) - [target - ["_" ruby (.only Expression)]]]] + [meta + [target + ["_" ruby (.only Expression)]]]]] [/// [reference (.only System)]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux index 32eb33c53..194b97c7e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux @@ -23,9 +23,9 @@ ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) - [syntax (.only syntax)]]] - ["@" target (.only) - ["_" ruby (.only Expression LVar Computation Literal Statement)]]]] + [syntax (.only syntax)]] + ["@" target (.only) + ["_" ruby (.only Expression LVar Computation Literal Statement)]]]]] ["[0]" /// ["[1][0]" reference] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux index 2438ada4a..5947bc8c4 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux @@ -3,8 +3,9 @@ [lux (.except Variant Tuple) [abstract ["[0]" monad (.only do)]] - [target - ["_" ruby (.only Expression)]]]] + [meta + [target + ["_" ruby (.only Expression)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux index 2dba1f481..cdedd1a3d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux @@ -5,9 +5,9 @@ [monad (.only do)]] [meta [macro - ["^" pattern]]] - [target - ["_" scheme]]]] + ["^" pattern]] + [target + ["_" scheme]]]]] ["[0]" / [runtime (.only Phase)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux index d35d72f9f..a1f679836 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux @@ -16,9 +16,9 @@ [meta [macro ["^" pattern] - ["[0]" template]]] - [target - ["_" scheme (.only Expression Computation Var)]]]] + ["[0]" template]] + [target + ["_" scheme (.only Expression Computation Var)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux index 80d6b5111..0c86e0ee3 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux @@ -15,9 +15,9 @@ ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only with_symbols) - [syntax (.only syntax)]]] - [target - ["_" scheme (.only Expression Computation)]]]] + [syntax (.only syntax)]] + [target + ["_" scheme (.only Expression Computation)]]]]] ["[0]" /// ["[1][0]" runtime (.only Operation Phase Handler Bundle)] ["[1]//" /// (.only) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux index 00ebc8b7d..cbddbab59 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux @@ -11,8 +11,9 @@ ["%" \\format (.only format)]] [collection ["[0]" list (.use "[1]#[0]" functor)]]] - [target - ["_" scheme (.only Expression Computation Var)]]]] + [meta + [target + ["_" scheme (.only Expression Computation Var)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux index 04fe3dfde..d8cf4511e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux @@ -13,8 +13,9 @@ [math [number ["n" nat]]] - [target - ["_" scheme]]]] + [meta + [target + ["_" scheme]]]]] ["[0]" // [runtime (.only Operation Phase Generator)] ["[1][0]" case] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux index b670b2868..707968187 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except i64) - [target - ["_" scheme (.only Expression)]]]]) + [meta + [target + ["_" scheme (.only Expression)]]]]]) (with_template [<name> <type> <code>] [(def .public <name> diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux index 84dac3329..94bbd7702 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux @@ -1,8 +1,9 @@ (.require [library [lux (.except) - [target - ["_" scheme (.only Expression)]]]] + [meta + [target + ["_" scheme (.only Expression)]]]]] [/// [reference (.only System)]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux index a54248283..31803cfab 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux @@ -22,9 +22,9 @@ ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) - [syntax (.only syntax)]]] - ["@" target (.only) - ["_" scheme (.only Expression Computation Var)]]]] + [syntax (.only syntax)]] + ["@" target (.only) + ["_" scheme (.only Expression Computation Var)]]]]] ["[0]" /// ["[1][0]" reference] ["//[1]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux index d736f2371..e98aa8ff4 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux @@ -6,8 +6,9 @@ [data [collection ["[0]" list]]] - [target - ["_" scheme (.only Expression)]]]] + [meta + [target + ["_" scheme (.only Expression)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux index e5304ee2e..922ab5495 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux @@ -27,7 +27,6 @@ (.require [library [lux (.except prelude) - ["@" target] [abstract [monad (.only do)]] [control @@ -42,6 +41,7 @@ ["[0]" list] ["[0]" dictionary (.only Dictionary)]]] [meta + ["@" target] ["[0]" symbol] ["[0]" code ["<[1]>" \\parser]] diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux index 216a07d76..7afeba197 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - [target (.only Target)] [control [try (.only Try)] [concurrency @@ -10,6 +9,8 @@ [binary (.only Binary)] [text ["%" \\format (.only format)]]] + [meta + [target (.only Target)]] [world ["[0]" file]]]] ["[0]" // diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/module.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/module.lux index 5900e0362..0e605d2e6 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/module.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/module.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] [abstract ["[0]" monad (.only Monad do)]] [control @@ -16,6 +15,8 @@ [collection ["[0]" list (.use "[1]#[0]" functor)] ["[0]" dictionary (.only Dictionary)]]] + [meta + ["@" target]] [world ["[0]" file]]]] ["[0]" // (.only) diff --git a/stdlib/source/library/lux/tool/compiler/meta/context.lux b/stdlib/source/library/lux/tool/compiler/meta/context.lux index 126533891..668d828e2 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/context.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/context.lux @@ -1,7 +1,8 @@ (.require [library [lux (.except) - ["@" target (.only Target)] + [meta + ["@" target (.only Target)]] [world [file (.only Path)]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux index 032eaaf66..cf8d212f8 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target (.only Target)] [abstract ["[0]" monad (.only Monad do)]] [control @@ -21,6 +20,7 @@ ["[0]" dictionary (.only Dictionary)] ["[0]" sequence (.only Sequence)]]] [meta + ["@" target (.only Target)] ["[0]" configuration (.only Configuration)] ["[0]" version] [macro diff --git a/stdlib/source/library/lux/tool/compiler/meta/io/context.lux b/stdlib/source/library/lux/tool/compiler/meta/io/context.lux index c62eb8345..3bf9f0397 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/io/context.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/io/context.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except Module Code) - ["@" target] [abstract ["[0]" monad (.only Monad do)]] [control @@ -21,6 +20,8 @@ [collection ["[0]" dictionary (.only Dictionary)] ["[0]" list]]] + [meta + ["@" target]] [world ["[0]" file]]]] ["[0]" // (.only Context Code) diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux index 2ff0b2d95..63e347408 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux @@ -20,10 +20,11 @@ [number ["n" nat] ["i" int]]] - [target - [jvm - [encoding - ["[0]" name]]]] + [meta + [target + [jvm + [encoding + ["[0]" name]]]]] [world ["[0]" file]]]] ["[0]" // (.only Packager) diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux index ee78db247..39bc028af 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux @@ -21,8 +21,9 @@ [math [number ["[0]" nat]]] - [target - ["_" ruby]] + [meta + [target + ["_" ruby]]] [world ["[0]" file]]]] ["[0]" // (.only Packager) diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux index 8d0f233b4..b98361ff0 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux @@ -20,8 +20,9 @@ ["[0]" set]] [format ["[0]" tar]]] - [target - ["_" scheme]] + [meta + [target + ["_" scheme]]] [time ["[0]" instant (.only Instant)]] [world diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux index 92975f25e..84f1d9a42 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - [type (.only sharing)] [abstract ["[0]" monad (.only Monad do)]] [control @@ -16,7 +15,9 @@ [collection ["[0]" sequence] ["[0]" set (.only Set)] - ["[0]" list (.use "[1]#[0]" functor)]]]]] + ["[0]" list (.use "[1]#[0]" functor)]]] + [meta + [type (.only sharing)]]]] ["[0]" // (.only Packager) [// ["[0]" archive (.only Output) diff --git a/stdlib/source/library/lux/world/console.lux b/stdlib/source/library/lux/world/console.lux index 943c16c23..b1ae1618c 100644 --- a/stdlib/source/library/lux/world/console.lux +++ b/stdlib/source/library/lux/world/console.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] ["[0]" ffi (.only import)] [abstract [monad (.only do)]] @@ -15,7 +14,9 @@ ["[0]" atom]]] [data ["[0]" text (.only Char) - ["%" \\format (.only format)]]]]]) + ["%" \\format (.only format)]]] + [meta + ["@" target]]]]) (type .public (Console !) (Interface diff --git a/stdlib/source/library/lux/world/environment.lux b/stdlib/source/library/lux/world/environment.lux index ce76fc208..c7343cb56 100644 --- a/stdlib/source/library/lux/world/environment.lux +++ b/stdlib/source/library/lux/world/environment.lux @@ -1,7 +1,6 @@ (.`` (.`` (.require [library [lux (.except) - ["@" target] [abstract ["[0]" monad (.only Monad do)]] [control @@ -29,6 +28,7 @@ [number ["i" int]]] [meta + ["@" target] ["[0]" macro (.only) ["[0]" template]]]]] ["[0]" \\parser] diff --git a/stdlib/source/library/lux/world/file.lux b/stdlib/source/library/lux/world/file.lux index 303782ac7..09334d194 100644 --- a/stdlib/source/library/lux/world/file.lux +++ b/stdlib/source/library/lux/world/file.lux @@ -1,7 +1,6 @@ (.`` (.`` (.require [library [lux (.except open) - ["@" target] [abstract ["[0]" monad (.only Monad do)]] [control @@ -33,6 +32,7 @@ ["i" int] ["f" frac]]] [meta + ["@" target] [macro ["[0]" template]]] [time diff --git a/stdlib/source/library/lux/world/file/watch.lux b/stdlib/source/library/lux/world/file/watch.lux index aee589f28..300267cf2 100644 --- a/stdlib/source/library/lux/world/file/watch.lux +++ b/stdlib/source/library/lux/world/file/watch.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except all and) - ["@" target] ["[0]" ffi (.only import)] [abstract ["[0]" monad (.only do)]] @@ -30,6 +29,7 @@ [time ["[0]" instant (.only Instant) (.use "[1]#[0]" equivalence)]] [meta + ["@" target] [type [primitive (.only primitive representation abstraction)]]]]] ["[0]" //]) diff --git a/stdlib/source/library/lux/world/net/http/client.lux b/stdlib/source/library/lux/world/net/http/client.lux index 6a999716d..dc3ea4219 100644 --- a/stdlib/source/library/lux/world/net/http/client.lux +++ b/stdlib/source/library/lux/world/net/http/client.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] ["[0]" ffi] [abstract ["[0]" monad (.only do)]] @@ -22,6 +21,7 @@ ["n" nat] ["i" int]]] [meta + ["@" target] ["[0]" code (.only) ["<[1]>" \\parser]] [macro diff --git a/stdlib/source/library/lux/world/shell.lux b/stdlib/source/library/lux/world/shell.lux index c218f3bf5..4e9bd0d37 100644 --- a/stdlib/source/library/lux/world/shell.lux +++ b/stdlib/source/library/lux/world/shell.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] ["[0]" ffi (.only import)] [abstract [monad (.only do)]] @@ -27,7 +26,9 @@ ["[0]" dictionary]]] [math [number (.only hex) - ["n" nat]]]]] + ["n" nat]]] + [meta + ["@" target]]]] [// [file (.only Path)] [environment diff --git a/stdlib/source/program/aedifex/artifact/time.lux b/stdlib/source/program/aedifex/artifact/time.lux index 61b2e8667..59e0ee3d1 100644 --- a/stdlib/source/program/aedifex/artifact/time.lux +++ b/stdlib/source/program/aedifex/artifact/time.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["[0]" time] [abstract [equivalence (.only Equivalence)] [monad (.only do)]] @@ -13,7 +12,7 @@ ["[0]" text ["%" \\format (.only Format)] ["<[1]>" \\parser (.only Parser)]]] - [time + ["[0]" time (.only) ["[0]" instant (.only Instant)]]]] ["[0]" / ["[1][0]" date] diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index eaefb1831..2d48fe6b1 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except all) - ["@" target] ["[0]" debug] ["[0]" ffi (.only import)] [abstract @@ -32,6 +31,8 @@ [number ["n" nat] ["[0]" i64]]] + [meta + ["@" target]] [world [console (.only Console)] [net (.only URL) diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux index 69b8d5c98..c87dcabaf 100644 --- a/stdlib/source/program/aedifex/pom.lux +++ b/stdlib/source/program/aedifex/pom.lux @@ -4,11 +4,11 @@ [abstract [monad (.only do)]] [control + ["<>" parser] ["[0]" pipe] ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" try (.only Try)] - ["[0]" exception] - ["<>" parser]] + ["[0]" exception]] [data ["[0]" text] [format diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux index 354a1198f..c6d1f3540 100644 --- a/stdlib/source/program/compositor.lux +++ b/stdlib/source/program/compositor.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except Module) - ["@" target] ["[0]" debug] [abstract ["[0]" monad (.only do)]] @@ -19,13 +18,14 @@ [collection ["[0]" dictionary (.only Dictionary)]]] [meta - [type (.only sharing)]] + [type (.only sharing)] + ["@" target]] [time ["[0]" instant]] ["[0]" world ["[0]" file] ["[0]" console] - ["[1]/[0]" program]] + ["[1]/[0]" environment]] [tool ["[0]" compiler ["[0]" phase] @@ -79,7 +79,7 @@ (console.write_line report console))) (is (Async (Try Any)) <else>)))] - (io.run! (at world/program.default exit +1)))) + (io.run! (at world/environment.default exit +1)))) {try.#Success output} (in output)))) diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux index a857eee53..9e5adf134 100644 --- a/stdlib/source/test/lux.lux +++ b/stdlib/source/test/lux.lux @@ -3,7 +3,6 @@ ["/" lux (.except) [program (.only program:)] ["_" test (.only Test)] - ["@" target] ["[0]" static] [abstract [monad (.only do)]] @@ -32,6 +31,7 @@ ["f" frac] ["[0]" i64]]] ["[0]" meta (.use "[1]#[0]" monad) + ["@" target] ["[0]" location (.use "[1]#[0]" equivalence)] ["[0]" code (.use "[1]#[0]" equivalence) ["<[1]>" \\parser]] @@ -61,14 +61,6 @@ ["[1][0]" ffi] ["[1][0]" extension] - ["[1][0]" target (.only) - (.,, (.for "{old}" (.,, (.these ["[1]/[0]" jvm])) - "JVM" (.,, (.these ["[1]/[0]" jvm])) - "JavaScript" (.,, (.these ["[1]/[0]" js])) - "Lua" (.,, (.these ["[1]/[0]" lua])) - "Python" (.,, (.these ["[1]/[0]" python])) - "Ruby" (.,, (.these ["[1]/[0]" ruby])) - (.,, (.these))))] ]))) (def for_bit @@ -986,7 +978,7 @@ ... (/.case [..#left expected_nat ..#right expected_int] ... (!pair 0 +0) ... true - + ... _ ... false)) (_.coverage [/.let] @@ -1229,14 +1221,6 @@ /ffi.test (,, (for @.old (,, (these)) (,, (these /extension.test)))) - - /target.test - (,, (for @.jvm (,, (these /target/jvm.test)) - @.old (,, (these /target/jvm.test)) - @.js (,, (these /target/js.test)) - @.lua (,, (these /target/lua.test)) - @.python (,, (these /target/python.test)) - @.ruby (,, (these /target/ruby.test)))) )))))) (program: args diff --git a/stdlib/source/test/lux/abstract/apply.lux b/stdlib/source/test/lux/abstract/apply.lux index b120b3484..416285780 100644 --- a/stdlib/source/test/lux/abstract/apply.lux +++ b/stdlib/source/test/lux/abstract/apply.lux @@ -1,6 +1,7 @@ (.require [library [lux (.except) + ["_" test (.only Test)] [abstract [monad (.only do)]] [control @@ -11,8 +12,7 @@ [math ["[0]" random] [number - ["n" nat]]] - ["_" test (.only Test)]]] + ["n" nat]]]]] [\\library ["[0]" / (.only Apply)]]) diff --git a/stdlib/source/test/lux/abstract/comonad.lux b/stdlib/source/test/lux/abstract/comonad.lux index 701ec93db..2d23f8d2c 100644 --- a/stdlib/source/test/lux/abstract/comonad.lux +++ b/stdlib/source/test/lux/abstract/comonad.lux @@ -1,6 +1,7 @@ (.require [library [lux (.except) + ["_" test (.only Test)] [abstract [monad (.only do)]] [data @@ -8,8 +9,7 @@ [math ["[0]" random] [number - ["n" nat]]] - ["_" test (.only Test)]]] + ["n" nat]]]]] [\\library ["[0]" /]]) diff --git a/stdlib/source/test/lux/abstract/equivalence.lux b/stdlib/source/test/lux/abstract/equivalence.lux index 96a7b3863..0ea65a1ca 100644 --- a/stdlib/source/test/lux/abstract/equivalence.lux +++ b/stdlib/source/test/lux/abstract/equivalence.lux @@ -2,7 +2,6 @@ [library [lux (.except Variant Record) ["_" test (.only Test)] - ["@" target] [abstract [monad (.only do)] [\\specification @@ -19,7 +18,9 @@ ["[0]" random (.only Random)] [number ["n" nat] - ["i" int]]]]] + ["i" int]]] + [meta + ["@" target]]]] ["[0]" \\polytypic] ["[0]" \\specification] [\\library diff --git a/stdlib/source/test/lux/abstract/functor.lux b/stdlib/source/test/lux/abstract/functor.lux index 548acee7a..4811f0f61 100644 --- a/stdlib/source/test/lux/abstract/functor.lux +++ b/stdlib/source/test/lux/abstract/functor.lux @@ -2,7 +2,6 @@ [library [lux (.except) ["_" test (.only Test)] - ["@" target] [abstract [monad (.only do)]] [control @@ -15,7 +14,9 @@ [math ["[0]" random] [number - ["n" nat]]]]] + ["n" nat]]] + [meta + ["@" target]]]] ["[0]" \\polytypic] [\\library ["[0]" / (.only Functor)]]) diff --git a/stdlib/source/test/lux/control/concurrency/async.lux b/stdlib/source/test/lux/control/concurrency/async.lux index c6b1eb864..e5d175486 100644 --- a/stdlib/source/test/lux/control/concurrency/async.lux +++ b/stdlib/source/test/lux/control/concurrency/async.lux @@ -2,7 +2,6 @@ [library [lux (.except) ["_" test (.only Test)] - ["@" target] [abstract [monad (.only do)] [\\specification @@ -11,15 +10,17 @@ ["$[0]" monad]]] [control ["[0]" io]] - [time - ["[0]" instant] - ["[0]" duration]] [math ["[0]" random] [number ["n" nat] ["i" int] - ["[0]" i64]]]]] + ["[0]" i64]]] + [meta + ["@" target]] + [time + ["[0]" instant] + ["[0]" duration]]]] [\\library ["[0]" / (.only) [// diff --git a/stdlib/source/test/lux/control/concurrency/semaphore.lux b/stdlib/source/test/lux/control/concurrency/semaphore.lux index 4bae6dd3f..ac4bd63b3 100644 --- a/stdlib/source/test/lux/control/concurrency/semaphore.lux +++ b/stdlib/source/test/lux/control/concurrency/semaphore.lux @@ -2,7 +2,6 @@ [library [lux (.except) ["_" test (.only Test)] - ["@" target] [abstract ["[0]" monad (.only do)] ["[0]" enum]] @@ -25,6 +24,7 @@ ["n" nat] ["[0]" i64]]] [meta + ["@" target] [type ["[0]" refinement]]]]] [\\library diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux index 8eb35a192..bda5d1aba 100644 --- a/stdlib/source/test/lux/data/format/json.lux +++ b/stdlib/source/test/lux/data/format/json.lux @@ -2,7 +2,6 @@ [library [lux (.except Variant Record) ["_" test (.only Test)] - ["@" target] [abstract [codec (.except)] [monad (.only do)] @@ -32,19 +31,20 @@ [number ["n" nat] ["[0]" frac]]] - [time - ["[0]" date] - ["[0]" instant - ["[0]/[1]" \\test]] - ["[0]" duration - ["[0]/[1]" \\test]]] ["[0]" meta (.only) + ["@" target] ["[0]" code] ["[0]" macro (.only) ["^" pattern] ["[0]" syntax (.only syntax)]] [type - ["[0]" unit]]]]] + ["[0]" unit]]] + [time + ["[0]" date] + ["[0]" instant + ["[0]/[1]" \\test]] + ["[0]" duration + ["[0]/[1]" \\test]]]]] ["[0]" \\polytypic] ["[0]" \\parser] [\\library diff --git a/stdlib/source/test/lux/debug.lux b/stdlib/source/test/lux/debug.lux index 5214ede51..ccf72208a 100644 --- a/stdlib/source/test/lux/debug.lux +++ b/stdlib/source/test/lux/debug.lux @@ -2,7 +2,6 @@ [library [lux (.except) ["_" test (.only Test)] - ["@" target] [abstract [monad (.only do)]] [control @@ -21,6 +20,7 @@ [number [ratio (.only Ratio)]]] [meta + ["@" target] ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) diff --git a/stdlib/source/test/lux/extension.lux b/stdlib/source/test/lux/extension.lux index 1ee8a623a..662feb16a 100644 --- a/stdlib/source/test/lux/extension.lux +++ b/stdlib/source/test/lux/extension.lux @@ -1,21 +1,8 @@ (.`` (.`` (.require [library [lux (.except) + ["_" test (.only Test)] ["[0]" debug] - ["@" target (.only) - ["[0]" js] - ["[0]" python] - ["[0]" lua] - ["[0]" ruby] - ["[0]" php] - ["[0]" scheme] - ["[0]" jvm - (.,, (.for "JVM" (.,, (.these ["[1]" bytecode] - ["[0]" class] - ["[0]" version] - [encoding - ["[0]" name]])) - (.,, (.these))))]] [abstract ["[0]" monad (.only do)]] [control @@ -38,7 +25,21 @@ ["[0]" code ["<[1]>" \\parser]] [macro - ["[0]" template]]] + ["[0]" template]] + ["@" target (.only) + ["[0]" js] + ["[0]" python] + ["[0]" lua] + ["[0]" ruby] + ["[0]" php] + ["[0]" scheme] + ["[0]" jvm + (.,, (.for "JVM" (.,, (.these ["[1]" bytecode] + ["[0]" class] + ["[0]" version] + [encoding + ["[0]" name]])) + (.,, (.these))))]]] [tool [compiler ["[0]" phase] @@ -58,8 +59,7 @@ [generation (.,, (.for "JVM" (.,, (.these ["[0]" jvm ["[1]/[0]" runtime]])) - (.,, (.these))))]]]]]] - ["_" test (.only Test)]]] + (.,, (.these))))]]]]]]]] [\\library ["[0]" / (.only analysis synthesis generation declaration)]]))) diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux index 55ca861be..755312f27 100644 --- a/stdlib/source/test/lux/ffi.jvm.lux +++ b/stdlib/source/test/lux/ffi.jvm.lux @@ -30,10 +30,10 @@ ["<[1]>" \\parser]] ["[0]" macro (.only) [syntax (.only syntax)] - ["[0]" template]]] - [target - ["[0]" jvm - ["[1]" type (.use "[1]#[0]" equivalence)]]]]] + ["[0]" template]] + [target + ["[0]" jvm + ["[1]" type (.use "[1]#[0]" equivalence)]]]]]] [\\library ["[0]" /]] ["$[0]" / diff --git a/stdlib/source/test/lux/math/number/frac.lux b/stdlib/source/test/lux/math/number/frac.lux index bf89cddbd..cf3a973de 100644 --- a/stdlib/source/test/lux/math/number/frac.lux +++ b/stdlib/source/test/lux/math/number/frac.lux @@ -2,7 +2,6 @@ [library [lux (.except) ["_" test (.only Test)] - ["@" target] ["[0]" ffi] [abstract [monad (.only do)] @@ -17,6 +16,7 @@ [math ["[0]" random (.only Random)]] [meta + ["@" target] [macro ["[0]" template]]]]] [\\library diff --git a/stdlib/source/test/lux/meta.lux b/stdlib/source/test/lux/meta.lux index ea47a6fc7..8ae07efb8 100644 --- a/stdlib/source/test/lux/meta.lux +++ b/stdlib/source/test/lux/meta.lux @@ -1,45 +1,54 @@ -(.require - [library - [lux (.except) - ["_" test (.only Test)] - [abstract - [equivalence (.only Equivalence)] - [monad (.only do)] - [\\specification - ["$[0]" functor (.only Injection Comparison)] - ["$[0]" apply] - ["$[0]" monad]]] - [control - ["[0]" maybe] - ["[0]" try (.only Try) (.use "[1]#[0]" functor)]] - [data - ["[0]" product] - ["[0]" bit (.use "[1]#[0]" equivalence)] - ["[0]" text (.use "[1]#[0]" equivalence) - ["%" \\format (.only format)]] - [collection - ["[0]" list (.use "[1]#[0]" functor monoid)] - ["[0]" set]]] - [math - ["[0]" random (.only Random)] - [number - ["n" nat]]] - [meta - ["[0]" location] - ["[0]" symbol (.use "[1]#[0]" equivalence)] - [macro - ["^" pattern]]]]] - [\\library - ["[0]" / (.only) - ["[0]" type (.use "[1]#[0]" equivalence)]]] - ["[0]" / - ["[1][0]" code] - ["[1][0]" location] - ["[1][0]" symbol] - ["[1][0]" configuration] - ["[1][0]" version] - ["[1][0]" type] - ["[1][0]" macro]]) +(.`` (.`` (.require + [library + [lux (.except) + ["_" test (.only Test)] + [abstract + [equivalence (.only Equivalence)] + [monad (.only do)] + [\\specification + ["$[0]" functor (.only Injection Comparison)] + ["$[0]" apply] + ["$[0]" monad]]] + [control + ["[0]" maybe] + ["[0]" try (.only Try) (.use "[1]#[0]" functor)]] + [data + ["[0]" product] + ["[0]" bit (.use "[1]#[0]" equivalence)] + ["[0]" text (.use "[1]#[0]" equivalence) + ["%" \\format (.only format)]] + [collection + ["[0]" list (.use "[1]#[0]" functor monoid)] + ["[0]" set]]] + [math + ["[0]" random (.only Random)] + [number + ["n" nat]]] + [meta + ["@" target] + ["[0]" location] + ["[0]" symbol (.use "[1]#[0]" equivalence)] + [macro + ["^" pattern]]]]] + [\\library + ["[0]" / (.only) + ["[0]" type (.use "[1]#[0]" equivalence)]]] + ["[0]" / + ["[1][0]" code] + ["[1][0]" location] + ["[1][0]" symbol] + ["[1][0]" configuration] + ["[1][0]" version] + ["[1][0]" type] + ["[1][0]" macro] + ["[1][0]" target (.only) + (.,, (.for "{old}" (.,, (.these ["[1]/[0]" jvm])) + "JVM" (.,, (.these ["[1]/[0]" jvm])) + "JavaScript" (.,, (.these ["[1]/[0]" js])) + "Lua" (.,, (.these ["[1]/[0]" lua])) + "Python" (.,, (.these ["[1]/[0]" python])) + "Ruby" (.,, (.these ["[1]/[0]" ruby])) + (.,, (.these))))]]))) (def !expect (template (_ <pattern> <value>) @@ -945,85 +954,92 @@ _ false))) -(def .public test - Test - (<| (_.covering /._) - (_.for [.Meta .Lux]) - (all _.and - (do [! random.monad] - [target (random.upper_case 1) - version (random.upper_case 1) - source_code (random.upper_case 1) - expected_current_module (random.upper_case 1) - expected_type (at ! each (function (_ name) - {.#Primitive name (list)}) - (random.upper_case 1)) - expected_seed random.nat - expected random.nat - dummy (random.only (|>> (n.= expected) not) random.nat) - expected_location ..random_location - .let [expected_lux [.#info [.#target target - .#version version - .#mode {.#Build} - .#configuration (list)] - .#source [expected_location 0 source_code] - .#location expected_location - .#current_module {.#Some expected_current_module} - .#modules (list) - .#scopes (list) - .#type_context [.#ex_counter 0 - .#var_counter 0 - .#var_bindings (list)] - .#expected {.#Some expected_type} - .#seed expected_seed - .#scope_type_vars (list) - .#extensions [] - .#eval (as (-> Type Code (Meta Any)) []) - .#host []]]] - (all _.and - (_.for [/.functor] - ($functor.spec ..injection (..comparison expected_lux) /.functor)) - (_.for [/.apply] - ($apply.spec ..injection (..comparison expected_lux) /.apply)) - (_.for [/.monad] - ($monad.spec ..injection (..comparison expected_lux) /.monad)) +(`` (`` (def .public test + Test + (<| (_.covering /._) + (_.for [.Meta .Lux]) + (all _.and + (do [! random.monad] + [target (random.upper_case 1) + version (random.upper_case 1) + source_code (random.upper_case 1) + expected_current_module (random.upper_case 1) + expected_type (at ! each (function (_ name) + {.#Primitive name (list)}) + (random.upper_case 1)) + expected_seed random.nat + expected random.nat + dummy (random.only (|>> (n.= expected) not) random.nat) + expected_location ..random_location + .let [expected_lux [.#info [.#target target + .#version version + .#mode {.#Build} + .#configuration (list)] + .#source [expected_location 0 source_code] + .#location expected_location + .#current_module {.#Some expected_current_module} + .#modules (list) + .#scopes (list) + .#type_context [.#ex_counter 0 + .#var_counter 0 + .#var_bindings (list)] + .#expected {.#Some expected_type} + .#seed expected_seed + .#scope_type_vars (list) + .#extensions [] + .#eval (as (-> Type Code (Meta Any)) []) + .#host []]]] + (all _.and + (_.for [/.functor] + ($functor.spec ..injection (..comparison expected_lux) /.functor)) + (_.for [/.apply] + ($apply.spec ..injection (..comparison expected_lux) /.apply)) + (_.for [/.monad] + ($monad.spec ..injection (..comparison expected_lux) /.monad)) - (do random.monad - [expected_value random.nat - expected_error (random.upper_case 1)] - (_.coverage [/.lifted] - (and (|> expected_error - {try.#Failure} - (is (Try Nat)) - /.lifted - (/.result expected_lux) - (!expect (^.multi {try.#Failure actual} - (text#= (location.with expected_location expected_error) - actual)))) - (|> expected_value - {try.#Success} - (is (Try Nat)) - /.lifted - (/.result expected_lux) - (!expect (^.multi {try.#Success actual} - (same? expected_value actual))))))) - - ..compiler_related - ..error_handling - ..module_related - ..context_related - ..definition_related - ..search_related - ..locals_related - (_.for [.Label] - ..label_related) - )) - - /code.test - /location.test - /symbol.test - /configuration.test - /version.test - /type.test - /macro.test - ))) + (do random.monad + [expected_value random.nat + expected_error (random.upper_case 1)] + (_.coverage [/.lifted] + (and (|> expected_error + {try.#Failure} + (is (Try Nat)) + /.lifted + (/.result expected_lux) + (!expect (^.multi {try.#Failure actual} + (text#= (location.with expected_location expected_error) + actual)))) + (|> expected_value + {try.#Success} + (is (Try Nat)) + /.lifted + (/.result expected_lux) + (!expect (^.multi {try.#Success actual} + (same? expected_value actual))))))) + + ..compiler_related + ..error_handling + ..module_related + ..context_related + ..definition_related + ..search_related + ..locals_related + (_.for [.Label] + ..label_related) + )) + + /code.test + /location.test + /symbol.test + /configuration.test + /version.test + /type.test + /macro.test + /target.test + (,, (for @.jvm (,, (these /target/jvm.test)) + @.old (,, (these /target/jvm.test)) + @.js (,, (these /target/js.test)) + @.lua (,, (these /target/lua.test)) + @.python (,, (these /target/python.test)) + @.ruby (,, (these /target/ruby.test)))) + ))))) diff --git a/stdlib/source/test/lux/target.lux b/stdlib/source/test/lux/meta/target.lux index f0010eb83..f0010eb83 100644 --- a/stdlib/source/test/lux/target.lux +++ b/stdlib/source/test/lux/meta/target.lux diff --git a/stdlib/source/test/lux/target/js.lux b/stdlib/source/test/lux/meta/target/js.lux index 0288ca3b1..0288ca3b1 100644 --- a/stdlib/source/test/lux/target/js.lux +++ b/stdlib/source/test/lux/meta/target/js.lux diff --git a/stdlib/source/test/lux/target/jvm.lux b/stdlib/source/test/lux/meta/target/jvm.lux index afda8957c..d526d3917 100644 --- a/stdlib/source/test/lux/target/jvm.lux +++ b/stdlib/source/test/lux/meta/target/jvm.lux @@ -2,7 +2,6 @@ [library [lux (.except Type Primitive Label int) ["_" test (.only Test)] - ["@" target] ["[0]" ffi (.only import)] [abstract ["[0]" monad (.only do)]] @@ -32,7 +31,9 @@ ["i" int] ["f" frac] ["[0]" i32 (.only I32)] - ["[0]" i64]]]]] + ["[0]" i64]]] + [meta + ["@" target]]]] [\\library ["[0]" / ["[1][0]" loader (.only Library)] diff --git a/stdlib/source/test/lux/target/lua.lux b/stdlib/source/test/lux/meta/target/lua.lux index 129748613..129748613 100644 --- a/stdlib/source/test/lux/target/lua.lux +++ b/stdlib/source/test/lux/meta/target/lua.lux diff --git a/stdlib/source/test/lux/target/python.lux b/stdlib/source/test/lux/meta/target/python.lux index ac1d84974..ac1d84974 100644 --- a/stdlib/source/test/lux/target/python.lux +++ b/stdlib/source/test/lux/meta/target/python.lux diff --git a/stdlib/source/test/lux/target/ruby.lux b/stdlib/source/test/lux/meta/target/ruby.lux index d8c7d1605..d8c7d1605 100644 --- a/stdlib/source/test/lux/target/ruby.lux +++ b/stdlib/source/test/lux/meta/target/ruby.lux diff --git a/stdlib/source/test/lux/static.lux b/stdlib/source/test/lux/static.lux index d67af6a0b..aa67ab7a2 100644 --- a/stdlib/source/test/lux/static.lux +++ b/stdlib/source/test/lux/static.lux @@ -2,7 +2,6 @@ [library [lux (.except) ["_" test (.only Test)] - ["@" target] [data ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]] @@ -16,6 +15,7 @@ ["r" rev] ["f" frac]]] ["[0]" meta (.only) + ["@" target] ["[0]" code]]]] [\\library ["[0]" /]]) diff --git a/stdlib/source/unsafe/lux/data/binary.lux b/stdlib/source/unsafe/lux/data/binary.lux index 5453bbc6b..e90aa4b39 100644 --- a/stdlib/source/unsafe/lux/data/binary.lux +++ b/stdlib/source/unsafe/lux/data/binary.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except) - ["@" target] ["[0]" ffi] [control [function @@ -12,7 +11,9 @@ ["[1]" \\unsafe]]]] [math [number (.only hex) - ["[0]" i64]]]]]) + ["[0]" i64]]] + [meta + ["@" target]]]]) (with_expansions [<jvm> (these (type .public Binary (ffi.type [byte])) diff --git a/stdlib/source/unsafe/lux/data/collection/array.lux b/stdlib/source/unsafe/lux/data/collection/array.lux index cd901c24c..7ed5bd838 100644 --- a/stdlib/source/unsafe/lux/data/collection/array.lux +++ b/stdlib/source/unsafe/lux/data/collection/array.lux @@ -1,13 +1,13 @@ (.require [library [lux (.except list type) - ["@" target] [abstract ["[0]" functor]] [data [collection ["[0]" list]]] [meta + ["@" target] [type ["[0]" variance]]]]]) |