diff --git a/documentation/bookmark/physics/anti_gravity.md b/documentation/bookmark/physics/anti_gravity.md new file mode 100644 index 0000000000..b2b071fd9a --- /dev/null +++ b/documentation/bookmark/physics/anti_gravity.md @@ -0,0 +1,5 @@ +# Reference + +0. [The Man Who Built UFOs For The CIA (Not Bob Lazar!)](https://www.youtube.com/watch?v=RTEWLSTyUic) +0. [The Dark History of Anti-Gravity (Quantum Gravity Exposed)](https://www.youtube.com/watch?v=eBA3RUxkZdc) + diff --git a/lux-c++/source/program.lux b/lux-c++/source/program.lux index 04315d9414..7e852d2687 100644 --- a/lux-c++/source/program.lux +++ b/lux-c++/source/program.lux @@ -34,42 +34,42 @@ ["[0]" file] ["[0]" environment]] [meta - ["[0]" static] - [macro - ["^" pattern] - ["[0]" template]] - [compiler - [target - ["_" c++ (.only) - [":" type]]] - [language - [lux - [program (.only Program)] - [translation (.only Host)] - [analysis - [macro (.only Expander)]] - ["[0]" phase (.only Operation Phase) - ["[0]" extension (.only Extender Handler) - ... ["[0]" analysis - ... ["[1]" js]] - ["[0]" translation - ["[1]" c++]]] - [translation - ["[0]" reference] - ["/" c++ (.only) - ["[1][0]" runtime] - ["[1][0]" primitive] - ["[1][0]" reference]]]]]] - [default - ["[0]" platform (.only Platform)]] - [meta - ["[0]" cli] - ["[0]" context] - [archive (.only Archive) - ["[0]" unit] - ["[0]" module]] - ["[0]" packager - ["[1]" script]]]]]]] + ["[0]" static]] + [macro + ["^" pattern] + ["[0]" template]] + [compiler + [target + ["_" c++ (.only) + [":" type]]] + [language + [lux + [program (.only Program)] + [translation (.only Host)] + [analysis + [macro (.only Expander)]] + ["[0]" phase (.only Operation Phase) + ["[0]" extension (.only Extender Handler) + ... ["[0]" analysis + ... ["[1]" js]] + ["[0]" translation + ["[1]" c++]]] + [translation + ["[0]" reference] + ["/" c++ (.only) + ["[1][0]" runtime] + ["[1][0]" primitive] + ["[1][0]" reference]]]]]] + [default + ["[0]" platform (.only Platform)]] + [meta + ["[0]" cli] + ["[0]" context] + [archive (.only Archive) + ["[0]" unit] + ["[0]" module]] + ["[0]" packager + ["[1]" script]]]]]] [program ["[0]" compositor]]) diff --git a/lux-cl/source/program.lux b/lux-cl/source/program.lux index 2c2fedc3b1..9cfa4eabee 100644 --- a/lux-cl/source/program.lux +++ b/lux-cl/source/program.lux @@ -17,7 +17,7 @@ [concurrency ["[0]" future (.only Future)]] [data - ["[0]" text (.use "[1]#[0]" hash) + ["[0]" text (.only \n) (.use "[1]#[0]" hash) ["%" \\injection] ["[0]" encoding]] [collection @@ -416,7 +416,7 @@ (-> (_.Expression Any) (_.Expression Any) (_.Expression Any)) (_.manual (text (_.code pre) - text.new_line + \n (_.code post)))) (the (scope body) diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux index 00fc46db4b..12b1c37326 100644 --- a/lux-js/source/program.lux +++ b/lux-js/source/program.lux @@ -36,38 +36,37 @@ [macro ["^" pattern] ["[0]" template]] - [meta - [compiler - [reference - [register (.only Register)]] - [target - ["_" js]] - [language - [lux - [program (.only Program)] - [translation (.only Host)] - [analysis - [macro (.only Expander)]] - ["[0]" phase (.only Operation Phase) - ["[0]" extension (.only Extender Handler) - ["[0]" analysis - ["[1]" js]] - ["[0]" translation - ["[1]" js]]] - [translation - ["[0]" reference] - ["[0]" js (.only) - ["[0]" runtime] - ["[1]/[0]" reference]]]]]] - [default - ["[0]" platform (.only Platform)]] - [meta - ["[0]" cli] - ["[0]" context] - [archive (.only Archive) - ["[0]" unit]] - ["[0]" packager - ["[1]" script]]]]]]] + [compiler + [reference + [register (.only Register)]] + [target + ["_" js]] + [language + [lux + [program (.only Program)] + [translation (.only Host)] + [analysis + [macro (.only Expander)]] + ["[0]" phase (.only Operation Phase) + ["[0]" extension (.only Extender Handler) + ["[0]" analysis + ["[1]" js]] + ["[0]" translation + ["[1]" js]]] + [translation + ["[0]" reference] + ["[0]" js (.only) + ["[0]" runtime] + ["[1]/[0]" reference]]]]]] + [default + ["[0]" platform (.only Platform)]] + [meta + ["[0]" cli] + ["[0]" context] + [archive (.only Archive) + ["[0]" unit]] + ["[0]" packager + ["[1]" script]]]]]] [program ["/" compositor]]) diff --git a/lux-jvm/source/program.lux b/lux-jvm/source/program.lux index fd264a5799..f2894df03c 100644 --- a/lux-jvm/source/program.lux +++ b/lux-jvm/source/program.lux @@ -17,40 +17,39 @@ ["[0]" product] [collection [array (.only Array)]]] - [meta - [compiler - [target - ["[0]" jvm - [bytecode (.only Bytecode)] - ["[1]/[0]" type - ["[1]/[0]" box]]]] - [default - ["[0]" platform (.only Platform)]] - [meta - [archive (.only Archive)] - ["[0]" context] - ["[0]" cli] - ["[0]" packager - ["[1]" jvm]]] - [language - [lux - [translation (.only Operation)] - [analysis - [macro (.only Expander)]] - ["[0]" phase (.only) - ["[0]" extension (.only) - ["[0]" analysis - ["[1]" jvm]] - ["[0]" translation - ["[1]" jvm]] - ["[0]" declaration - ["[1]" jvm]]] - [translation - ["/" jvm (.only) - ["[1][0]" runtime (.only Anchor Definition)] - ["[1][0]" host] - ["[1][0]" program] - ["[1][0]" reference]]]]]]]] + [compiler + [target + ["[0]" jvm + [bytecode (.only Bytecode)] + ["[1]/[0]" type + ["[1]/[0]" box]]]] + [default + ["[0]" platform (.only Platform)]] + [meta + [archive (.only Archive)] + ["[0]" context] + ["[0]" cli] + ["[0]" packager + ["[1]" jvm]]] + [language + [lux + [translation (.only Operation)] + [analysis + [macro (.only Expander)]] + ["[0]" phase (.only) + ["[0]" extension (.only) + ["[0]" analysis + ["[1]" jvm]] + ["[0]" translation + ["[1]" jvm]] + ["[0]" declaration + ["[1]" jvm]]] + [translation + ["/" jvm (.only) + ["[1][0]" runtime (.only Anchor Definition)] + ["[1][0]" host] + ["[1][0]" program] + ["[1][0]" reference]]]]]]] ["[0]" world ["[0]" file] ["[0]" environment]]]] diff --git a/lux-lua/source/program.lux b/lux-lua/source/program.lux index 050e1675b0..5589b3b194 100644 --- a/lux-lua/source/program.lux +++ b/lux-lua/source/program.lux @@ -35,37 +35,37 @@ ["[0]" template]] [meta ["[0]" static] - ["[0]" code] - ["[0]" compiler - [target - ["_" lua]] - [reference - [register (.only Register)]] - [language - [lux - [program (.only Program)] - [translation (.only Host)] - [analysis - [macro (.only Expander)]] - ["[0]" phase (.only Operation Phase) - ["[0]" extension (.only Extender Handler) - ["[0]" analysis - ["[1]" lua]] - ["[0]" translation - ["[1]" lua]]] - [translation - ["[0]" reference] - ["[0]" lua (.only) - ["[0]" runtime] - ["[1]/[0]" reference]]]]]] - [default - ["[0]" platform (.only Platform)]] - [meta - ["[0]" cli] - ["[0]" context] - [archive (.only Archive)] - ["[0]" packager - ["[1]" script]]]]] + ["[0]" code]] + ["[0]" compiler + [target + ["_" lua]] + [reference + [register (.only Register)]] + [language + [lux + [program (.only Program)] + [translation (.only Host)] + [analysis + [macro (.only Expander)]] + ["[0]" phase (.only Operation Phase) + ["[0]" extension (.only Extender Handler) + ["[0]" analysis + ["[1]" lua]] + ["[0]" translation + ["[1]" lua]]] + [translation + ["[0]" reference] + ["[0]" lua (.only) + ["[0]" runtime] + ["[1]/[0]" reference]]]]]] + [default + ["[0]" platform (.only Platform)]] + [meta + ["[0]" cli] + ["[0]" context] + [archive (.only Archive)] + ["[0]" packager + ["[1]" script]]]] ["[0]" world ["[0]" file] ["[1]/[0]" environment]]]] diff --git a/lux-python/source/program.lux b/lux-python/source/program.lux index ef9cfa60de..7c867bb5d8 100644 --- a/lux-python/source/program.lux +++ b/lux-python/source/program.lux @@ -36,39 +36,39 @@ ["[0]" expansion]] [meta ["[0]" static] - ["[0]" code] - ["[0]" compiler - [reference - [register (.only Register)]] - [target - ["_" python]] - [language - [lux - [program (.only Program)] - [translation (.only Host)] - ["[0]" synthesis] - [analysis - [macro (.only Expander)]] - ["[0]" phase (.only Operation Phase) (.use "[1]#[0]" monad) - ["[0]" extension (.only Extender Handler) - ["[0]" analysis - ["[1]" python]] - ["[0]" translation - ["[1]" python]]] - [translation - ["[0]" reference] - ["[0]" python (.only) - ["[0]" runtime] - ["[1]/[0]" reference]]]]]] - [default - ["[0]" platform (.only Platform)]] - [meta - ["[0]" context] - ["[0]" cli] - [archive (.only Archive) - ["[0]" unit]] - ["[0]" packager - ["[1]" script]]]]] + ["[0]" code]] + ["[0]" compiler + [reference + [register (.only Register)]] + [target + ["_" python]] + [language + [lux + [program (.only Program)] + [translation (.only Host)] + ["[0]" synthesis] + [analysis + [macro (.only Expander)]] + ["[0]" phase (.only Operation Phase) (.use "[1]#[0]" monad) + ["[0]" extension (.only Extender Handler) + ["[0]" analysis + ["[1]" python]] + ["[0]" translation + ["[1]" python]]] + [translation + ["[0]" reference] + ["[0]" python (.only) + ["[0]" runtime] + ["[1]/[0]" reference]]]]]] + [default + ["[0]" platform (.only Platform)]] + [meta + ["[0]" context] + ["[0]" cli] + [archive (.only Archive) + ["[0]" unit]] + ["[0]" packager + ["[1]" script]]]] ["[0]" world ["[0]" file] ["[1]/[0]" environment]]]] diff --git a/lux-ruby/source/program.lux b/lux-ruby/source/program.lux index 1d7fcdfcba..6dffb40068 100644 --- a/lux-ruby/source/program.lux +++ b/lux-ruby/source/program.lux @@ -32,38 +32,37 @@ [macro ["^" pattern] ["[0]" template]] - [meta - ["[0]" compiler - [reference - [register (.only Register)]] - [target - ["_" ruby]] - [language - [lux - [program (.only Program)] - [translation (.only Host)] - ["[0]" synthesis] - [analysis - [macro (.only Expander)]] - ["[0]" phase (.only Operation Phase) (.use "[1]#[0]" monad) - ["[0]" extension (.only Extender Handler) - ["[0]" analysis - ["[1]" ruby]] - ["[0]" translation - ["[1]" ruby]]] - [translation - ["[0]" reference] - ["[0]" ruby (.only) - ["[0]" runtime] - ["[1]/[0]" reference]]]]]] - [default - ["[0]" platform (.only Platform)]] - [meta - [archive (.only Archive)] - ["[0]" context] - ["[0]" cli] - ["[0]" packager - ["[1]" ruby]]]]] + ["[0]" compiler + [reference + [register (.only Register)]] + [target + ["_" ruby]] + [language + [lux + [program (.only Program)] + [translation (.only Host)] + ["[0]" synthesis] + [analysis + [macro (.only Expander)]] + ["[0]" phase (.only Operation Phase) (.use "[1]#[0]" monad) + ["[0]" extension (.only Extender Handler) + ["[0]" analysis + ["[1]" ruby]] + ["[0]" translation + ["[1]" ruby]]] + [translation + ["[0]" reference] + ["[0]" ruby (.only) + ["[0]" runtime] + ["[1]/[0]" reference]]]]]] + [default + ["[0]" platform (.only Platform)]] + [meta + [archive (.only Archive)] + ["[0]" context] + ["[0]" cli] + ["[0]" packager + ["[1]" ruby]]]] ["[0]" world ["[0]" file] ["[1]/[0]" environment]]]] diff --git a/stdlib/source/documentation/lux/meta/macro/syntax.lux b/stdlib/source/documentation/lux/meta/macro/syntax.lux index 06f5afa433..fc11187db5 100644 --- a/stdlib/source/documentation/lux/meta/macro/syntax.lux +++ b/stdlib/source/documentation/lux/meta/macro/syntax.lux @@ -38,11 +38,11 @@ interfaces (tuple (some (super_class_decl^ imports class_vars))) constructor_args (constructor_args^ imports class_vars) methods (some (overriden_method_def^ imports))]) - (let [def_code (all text#composite "anon-class:" - (spaced (list (super_class_decl$ (maybe.else object_super_class super)) - (with_brackets (spaced (list#each super_class_decl$ interfaces))) - (with_brackets (spaced (list#each constructor_arg$ constructor_args))) - (with_brackets (spaced (list#each (method_def$ id) methods))))))] + (let [def_code (text "anon-class:" + (spaced (list (super_class_decl$ (maybe.else object_super_class super)) + (with_brackets (spaced (list#each super_class_decl$ interfaces))) + (with_brackets (spaced (list#each constructor_arg$ constructor_args))) + (with_brackets (spaced (list#each (method_def$ id) methods))))))] (in (list (` ((, (code.text def_code)))))))))))) (all list#composite diff --git a/stdlib/source/experiment/tool/interpreter.lux b/stdlib/source/experiment/tool/interpreter.lux index 873c849ab4..bb2601efde 100644 --- a/stdlib/source/experiment/tool/interpreter.lux +++ b/stdlib/source/experiment/tool/interpreter.lux @@ -10,7 +10,7 @@ ["[0]" try (.only Try)] ["ex" exception (.only Exception)]] [data - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]]] [type (.only sharing) ["[0]" check]] @@ -44,7 +44,7 @@ (the (add_line line [where offset input]) (-> Text Source Source) - [where offset (text input text.new_line line)]) + [where offset (text input \n line)]) (the exit_command Text @@ -52,10 +52,10 @@ (the welcome_message Text - (text text.new_line - "Welcome to the interpreter!" text.new_line - "Type '" ..exit_command "' to leave." text.new_line - text.new_line)) + (text \n + "Welcome to the interpreter!" \n + "Type '" ..exit_command "' to leave." \n + \n)) (the farewell_message Text diff --git a/stdlib/source/library/lux/meta/compiler.lux b/stdlib/source/library/lux/compiler.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler.lux rename to stdlib/source/library/lux/compiler.lux diff --git a/stdlib/source/library/lux/meta/compiler/arity.lux b/stdlib/source/library/lux/compiler/arity.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/arity.lux rename to stdlib/source/library/lux/compiler/arity.lux diff --git a/stdlib/source/library/lux/meta/compiler/default/init.lux b/stdlib/source/library/lux/compiler/default/init.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/default/init.lux rename to stdlib/source/library/lux/compiler/default/init.lux diff --git a/stdlib/source/library/lux/meta/compiler/default/platform.lux b/stdlib/source/library/lux/compiler/default/platform.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/default/platform.lux rename to stdlib/source/library/lux/compiler/default/platform.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux.lux b/stdlib/source/library/lux/compiler/language/lux.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux.lux rename to stdlib/source/library/lux/compiler/language/lux.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis.lux b/stdlib/source/library/lux/compiler/language/lux/analysis.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/analysis.lux rename to stdlib/source/library/lux/compiler/language/lux/analysis.lux index b8090ccbef..56fd9aabda 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/analysis.lux +++ b/stdlib/source/library/lux/compiler/language/lux/analysis.lux @@ -17,7 +17,7 @@ ["[0]" function] [data ["[0]" product] - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" stack (.use "[1]#[0]" functor mix)]]] @@ -324,7 +324,7 @@ (the (located provenance error) (-> Provenance Text Text) - (.text (provenance.as_text provenance) text.new_line + (.text (provenance.as_text provenance) \n error)) (the .public (failure error) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/complex.lux b/stdlib/source/library/lux/compiler/language/lux/analysis/complex.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/analysis/complex.lux rename to stdlib/source/library/lux/compiler/language/lux/analysis/complex.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/coverage.lux b/stdlib/source/library/lux/compiler/language/lux/analysis/coverage.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/analysis/coverage.lux rename to stdlib/source/library/lux/compiler/language/lux/analysis/coverage.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/evaluation.lux b/stdlib/source/library/lux/compiler/language/lux/analysis/evaluation.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/analysis/evaluation.lux rename to stdlib/source/library/lux/compiler/language/lux/analysis/evaluation.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/inference.lux b/stdlib/source/library/lux/compiler/language/lux/analysis/inference.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/analysis/inference.lux rename to stdlib/source/library/lux/compiler/language/lux/analysis/inference.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/macro.lux b/stdlib/source/library/lux/compiler/language/lux/analysis/macro.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/analysis/macro.lux rename to stdlib/source/library/lux/compiler/language/lux/analysis/macro.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/module.lux b/stdlib/source/library/lux/compiler/language/lux/analysis/module.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/analysis/module.lux rename to stdlib/source/library/lux/compiler/language/lux/analysis/module.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/pattern.lux b/stdlib/source/library/lux/compiler/language/lux/analysis/pattern.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/analysis/pattern.lux rename to stdlib/source/library/lux/compiler/language/lux/analysis/pattern.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/scope.lux b/stdlib/source/library/lux/compiler/language/lux/analysis/scope.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/analysis/scope.lux rename to stdlib/source/library/lux/compiler/language/lux/analysis/scope.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/simple.lux b/stdlib/source/library/lux/compiler/language/lux/analysis/simple.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/analysis/simple.lux rename to stdlib/source/library/lux/compiler/language/lux/analysis/simple.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/type.lux b/stdlib/source/library/lux/compiler/language/lux/analysis/type.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/analysis/type.lux rename to stdlib/source/library/lux/compiler/language/lux/analysis/type.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/declaration.lux b/stdlib/source/library/lux/compiler/language/lux/declaration.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/declaration.lux rename to stdlib/source/library/lux/compiler/language/lux/declaration.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase.lux b/stdlib/source/library/lux/compiler/language/lux/phase.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase.lux rename to stdlib/source/library/lux/compiler/language/lux/phase.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis.lux b/stdlib/source/library/lux/compiler/language/lux/phase/analysis.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/analysis.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/library/lux/compiler/language/lux/phase/analysis/complex.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/complex.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/analysis/complex.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/library/lux/compiler/language/lux/phase/analysis/function.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/function.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/analysis/function.lux index b923b23171..24a7fe4590 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/function.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/analysis/function.lux @@ -12,7 +12,7 @@ ["[0]" exception (.only Exception)]] [data ["[0]" product] - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" stack (.use "[1]#[0]" monoid monad)]]] @@ -51,7 +51,7 @@ stack.enumeration (stack#each (.function (_ [idx argC]) (text (%.natural idx) " " (code.relative module argC)))) - (text.interposed text.new_line))]))) + (text.interposed \n))]))) (the .public (function analyse function_name arg_name archive body) (-> Phase Text Text diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/reference.lux b/stdlib/source/library/lux/compiler/language/lux/phase/analysis/reference.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/reference.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/analysis/reference.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/simple.lux b/stdlib/source/library/lux/compiler/language/lux/phase/analysis/simple.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/simple.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/analysis/simple.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/when.lux b/stdlib/source/library/lux/compiler/language/lux/phase/analysis/when.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/when.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/analysis/when.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/declaration.lux b/stdlib/source/library/lux/compiler/language/lux/phase/declaration.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/declaration.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/declaration.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/common_lisp.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/common_lisp.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/common_lisp.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/common_lisp.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/js.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/js.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/js.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/js.lux index 2526a67b94..f810868276 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/js.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/js.lux @@ -16,11 +16,11 @@ ["[0]" type (.only) ["[0]" check]] ["[0]" meta (.only) - [compiler - [target - ["_" js]]] ["[0]" code - ["<[1]>" \\projection]]]]] + ["<[1]>" \\projection]]] + [compiler + [target + ["_" js]]]]] [// ["/" lux (.only custom)] [/// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/jvm.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/jvm.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/jvm.lux index f8842bc074..c6075a83ea 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/jvm.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/jvm.lux @@ -43,33 +43,33 @@ ["[0]" meta (.only) ["[0]" module] ["[0]" code (.only) - ["<[1]>" \\projection (.only Projection)]] - [compiler - [target - ["[0]" jvm - ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)] - ["[0]!" reflection] - ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] - ["[0]" attribute] - ["[0]" field] - ["[0]" version] - ["[0]" method] - ["[0]" class] - [constant - ["[0]" pool (.only Resource)]] - [encoding - [name - ["[0]" external] - ["[0]" internal]]] - ["[1]" type (.only Type Argument Typed) - ["[0]" category (.only Void Value Return Primitive Object Class Array Var Parameter Method)] - ["[0]" box] - ["[0]" reflection] - ["[0]" descriptor] - ["[0]" signature] - ["[0]" projection] - ["[0]" alias (.only Aliasing)] - ["[0]T" lux (.only Mapping)]]]]]]]] + ["<[1]>" \\projection (.only Projection)]]] + [compiler + [target + ["[0]" jvm + ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)] + ["[0]!" reflection] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] + ["[0]" attribute] + ["[0]" field] + ["[0]" version] + ["[0]" method] + ["[0]" class] + [constant + ["[0]" pool (.only Resource)]] + [encoding + [name + ["[0]" external] + ["[0]" internal]]] + ["[1]" type (.only Type Argument Typed) + ["[0]" category (.only Void Value Return Primitive Object Class Array Var Parameter Method)] + ["[0]" box] + ["[0]" reflection] + ["[0]" descriptor] + ["[0]" signature] + ["[0]" projection] + ["[0]" alias (.only Aliasing)] + ["[0]T" lux (.only Mapping)]]]]]]] ["[0]" // ["[1][0]" lux (.only custom install)] ["/[1]" // (.only) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lua.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/lua.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lua.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/lua.lux index ce82351c37..c4bec85a25 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lua.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/lua.lux @@ -19,10 +19,10 @@ ["[0]" check]] ["[0]" meta (.only) ["[0]" code - ["<[1]>" \\projection]] - [compiler - [target - ["_" lua]]]]]] + ["<[1]>" \\projection]]] + [compiler + [target + ["_" lua]]]]] [// ["/" lux (.only custom)] [/// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/lux.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/lux.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/php.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/php.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/php.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/php.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/python.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/python.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/python.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/python.lux index f850b397d8..b15e30effa 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/python.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/python.lux @@ -16,11 +16,11 @@ ["[0]" type (.only) ["[0]" check]] ["[0]" meta (.only) - [compiler - [target - ["_" python]]] ["[0]" code - ["<[1]>" \\projection]]]]] + ["<[1]>" \\projection]]] + [compiler + [target + ["_" python]]]]] ["[0]" // ["/" lux (.only custom)] ["/[1]" // (.only) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/r.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/r.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/r.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/r.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/ruby.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/ruby.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/ruby.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/ruby.lux index d9ebadd7c4..92ca7414a8 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/ruby.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/ruby.lux @@ -16,11 +16,11 @@ ["[0]" type (.only) ["[0]" check]] ["[0]" meta (.only) - [compiler - [target - ["_" ruby]]] ["[0]" code - ["<[1]>" \\projection]]]]] + ["<[1]>" \\projection]]] + [compiler + [target + ["_" ruby]]]]] [// ["/" lux (.only custom)] [/// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/declaration/jvm.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/declaration/jvm.lux similarity index 95% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/declaration/jvm.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/declaration/jvm.lux index ed8cd26b11..ec00114553 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/declaration/jvm.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/declaration/jvm.lux @@ -36,61 +36,61 @@ ["[0]" check (.only Check)]] [meta ["[0]" code - ["<[1]>" \\projection (.only Projection)]] - [compiler - [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 - [name - ["[0]" external] - ["[0]" internal]]] - ["[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]" projection]]]] - [reference - [register (.only Register)]] - [meta - [archive (.only Archive) - ["[0]" artifact] - ["[0]" unit]] - ["[0]" cache - [dependency - ["[1]" artifact]]]] - [language - [lux - ["[0]" translation] - ["[0]" declaration (.only Handler Bundle)] - ["[0]" analysis (.only) - ["[0]A" type] - ["[0]A" scope]] - ["[0]" synthesis (.only) - ["<[1]>" \\projection]] - ["[0]" phase (.only) + ["<[1]>" \\projection (.only Projection)]]] + [compiler + [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 + [name + ["[0]" external] + ["[0]" internal]]] + ["[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]" projection]]]] + [reference + [register (.only Register)]] + [meta + [archive (.only Archive) + ["[0]" artifact] + ["[0]" unit]] + ["[0]" cache + [dependency + ["[1]" artifact]]]] + [language + [lux + ["[0]" translation] + ["[0]" declaration (.only Handler Bundle)] + ["[0]" analysis (.only) + ["[0]A" type] + ["[0]A" scope]] + ["[0]" synthesis (.only) + ["<[1]>" \\projection]] + ["[0]" phase (.only) + [translation + [jvm + ["[0]" runtime (.only Anchor Definition Extender)] + ["[0]" value]]] + ["[0]" extension (.only) + [analysis + ["[0]" jvm]] [translation [jvm - ["[0]" runtime (.only Anchor Definition Extender)] - ["[0]" value]]] - ["[0]" extension (.only) - [analysis - ["[0]" jvm]] - [translation - [jvm - ["[0]" host]]] - [declaration - ["/" lux]]]]]]]]]]) + ["[0]" host]]] + [declaration + ["/" lux]]]]]]]]]) (every Operation (declaration.Operation Anchor (Bytecode Any) Definition)) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/declaration/lux.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/declaration/lux.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/declaration/lux.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/declaration/lux.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/synthesis.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/synthesis.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/synthesis.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/synthesis.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/synthesis/lux.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/synthesis/lux.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/synthesis/lux.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/synthesis/lux.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/c++.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/c++.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/c++.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/c++.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/c++/common.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/c++/common.lux similarity index 97% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/c++/common.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/c++/common.lux index a6efa2d90e..990774ddd0 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/c++/common.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/c++/common.lux @@ -19,10 +19,9 @@ [math [number ["[0]" i32]]] - [meta - [compiler - [target - ["_" c++]]]]]] + [compiler + [target + ["_" c++]]]]] ["[0]" ///// ["[0]" extension] [translation diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/common_lisp.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/common_lisp.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/common_lisp.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/common_lisp.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/common_lisp/common.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/common_lisp/common.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/common_lisp/common.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/common_lisp/common.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/common_lisp/host.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/common_lisp/host.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/common_lisp/host.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/common_lisp/host.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/js.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/js.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/js.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/js.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/js/common.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/js/common.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/js/common.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/js/common.lux index a9bed5351e..f69b5c72d0 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/js/common.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/js/common.lux @@ -17,12 +17,11 @@ ["[0]" dictionary]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" js (.only Literal)]] - [meta - [archive (.only Archive)]]]]]] + [compiler + [target + ["_" js (.only Literal)]] + [meta + [archive (.only Archive)]]]]] [///// ["[0]" extension] [translation diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/js/host.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/js/host.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/js/host.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/js/host.lux index ae4c74dce2..73767e96c9 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/js/host.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/js/host.lux @@ -15,10 +15,9 @@ ["[0]" stack]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" js (.only Var Expression)]]]]]] + [compiler + [target + ["_" js (.only Var Expression)]]]]] [// [common (.only custom)] [//// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/jvm.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/jvm.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/jvm.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/jvm.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/jvm/common.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/jvm/common.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/jvm/common.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/jvm/common.lux index 33cb783da6..4a1fec070d 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/jvm/common.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/jvm/common.lux @@ -22,15 +22,14 @@ ["i[0]" /32]]]] [macro ["[0]" template]] - [meta - [compiler - [target - [jvm - ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad)] - [encoding - ["[0]" signed (.only S4)]] - ["[0]" type (.only Type) - [category (.only Primitive Class)]]]]]]]] + [compiler + [target + [jvm + ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad)] + [encoding + ["[0]" signed (.only S4)]] + ["[0]" type (.only Type) + [category (.only Primitive Class)]]]]]]] ["[0]" ///// ["[0]" extension] [translation diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/jvm/host.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/jvm/host.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/jvm/host.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/jvm/host.lux index c838501793..23437a1da5 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/jvm/host.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/jvm/host.lux @@ -33,27 +33,27 @@ ["[0]" template] ["[0]" expansion]] [meta - ["[0]" provenance] - [compiler - [target - [jvm - ["[0]" version] - ["[0]" modifier (.use "[1]#[0]" monoid)] - ["[0]" method (.only Method)] - ["[0]" class (.only Class)] - [constant - [pool (.only Resource)]] - [encoding - [name - ["[0]" internal]]] - ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad) - ["__" instruction (.only Primitive_Array_Type)]] - ["[0]" type (.only Type Typed Argument) - ["[0]" category (.only Void Value Return Primitive Object Array Var Parameter)] - ["[0]" box] - ["[0]" reflection] - ["[0]" signature] - ["[0]" projection]]]]]]]] + ["[0]" provenance]] + [compiler + [target + [jvm + ["[0]" version] + ["[0]" modifier (.use "[1]#[0]" monoid)] + ["[0]" method (.only Method)] + ["[0]" class (.only Class)] + [constant + [pool (.only Resource)]] + [encoding + [name + ["[0]" internal]]] + ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad) + ["__" instruction (.only Primitive_Array_Type)]] + ["[0]" type (.only Type Typed Argument) + ["[0]" category (.only Void Value Return Primitive Object Array Var Parameter)] + ["[0]" box] + ["[0]" reflection] + ["[0]" signature] + ["[0]" projection]]]]]]] ["[0]" // [common (.only custom)] ["///[1]" //// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/lua.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/lua.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua/common.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/lua/common.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua/common.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/lua/common.lux index 38656654d4..6f54734305 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua/common.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/lua/common.lux @@ -18,12 +18,11 @@ ["[0]" stack (.use "[1]#[0]" functor mix)]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" lua]] - [meta - [archive (.only Archive)]]]]]] + [compiler + [target + ["_" lua]] + [meta + [archive (.only Archive)]]]]] [///// ["[0]" extension] [translation diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua/host.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/lua/host.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua/host.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/lua/host.lux index 12283d567b..8f566ecbde 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua/host.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/lua/host.lux @@ -15,10 +15,9 @@ ["[0]" stack]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" lua (.only Var Expression)]]]]]] + [compiler + [target + ["_" lua (.only Var Expression)]]]]] ["[0]" // ["[1][0]" common (.only custom)] ["///[1]" //// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/php.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/php.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php/common.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/php/common.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php/common.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/php/common.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php/host.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/php/host.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php/host.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/php/host.lux index 2a7e22b07c..c3163bfd78 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php/host.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/php/host.lux @@ -14,10 +14,9 @@ ["[0]" dictionary]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" php (.only Var Expression)]]]]]] + [compiler + [target + ["_" php (.only Var Expression)]]]]] ["[0]" // ["[1][0]" common (.only custom)] ["//[1]" /// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/python.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/python.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python/common.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/python/common.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python/common.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/python/common.lux index 0658d39cf6..de6c47900a 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python/common.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/python/common.lux @@ -18,12 +18,11 @@ ["[0]" stack (.use "[1]#[0]" functor mix)]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" python]] - [meta - [archive (.only Archive)]]]]]] + [compiler + [target + ["_" python]] + [meta + [archive (.only Archive)]]]]] [///// ["[0]" extension] [translation diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python/host.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/python/host.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python/host.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/python/host.lux index b09ff4f3e6..8d7f02e8e4 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python/host.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/python/host.lux @@ -15,10 +15,9 @@ ["[0]" stack]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" python (.only Expression SVar)]]]]]] + [compiler + [target + ["_" python (.only Expression SVar)]]]]] [// [common (.only custom)] [//// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/r.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/r.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/r.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/r.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/r/common.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/r/common.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/r/common.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/r/common.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/r/host.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/r/host.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/r/host.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/r/host.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/ruby.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/ruby.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby/common.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/ruby/common.lux similarity index 97% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby/common.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/ruby/common.lux index 2e45fea86d..4c5cbf80f3 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby/common.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/ruby/common.lux @@ -13,19 +13,18 @@ ["[0]" function] [data ["[0]" product] - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" dictionary] ["[0]" stack (.use "[1]#[0]" functor mix)]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" ruby]] - [meta - [archive (.only Archive)]]]]]] + [compiler + [target + ["_" ruby]] + [meta + [archive (.only Archive)]]]]] [///// ["[0]" extension] [translation @@ -260,15 +259,15 @@ (the (io//log! messageG) (Unary _.Expression) - (|> (_.print/2 messageG (_.string text.new_line)) + (|> (_.print/2 messageG (_.string \n)) (_.or //runtime.unit))) (the io//error! (Unary _.Expression) - (let [stack_trace (_.do "join" (stack (_.string text.new_line)) + (let [stack_trace (_.do "join" (stack (_.string \n)) {.#None} _.caller/0)] - (|>> (_.+ (_.string (text text.new_line text.new_line))) + (|>> (_.+ (_.string (text \n \n))) (_.+ stack_trace) _.raise))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby/host.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/ruby/host.lux similarity index 97% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby/host.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/ruby/host.lux index 82fa537f21..85f7dc3c71 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby/host.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/ruby/host.lux @@ -13,10 +13,9 @@ ["[0]" dictionary]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" ruby (.only Var Expression)]]]]]] + [compiler + [target + ["_" ruby (.only Var Expression)]]]]] [// [common (.only custom)] [//// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis.lux b/stdlib/source/library/lux/compiler/language/lux/phase/synthesis.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/synthesis.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/library/lux/compiler/language/lux/phase/synthesis/function.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/function.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/synthesis/function.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/loop.lux b/stdlib/source/library/lux/compiler/language/lux/phase/synthesis/loop.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/loop.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/synthesis/loop.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/library/lux/compiler/language/lux/phase/synthesis/variable.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/variable.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/synthesis/variable.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/when.lux b/stdlib/source/library/lux/compiler/language/lux/phase/synthesis/when.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/when.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/synthesis/when.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/c++.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/complex.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/complex.lux similarity index 94% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/complex.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/complex.lux index 9b4bab87fa..40050dc849 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/complex.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/complex.lux @@ -7,10 +7,9 @@ variant tuple) [abstract ["[0]" monad (.only do)]] - [meta - [compiler - [target - ["_" c++]]]]]] + [compiler + [target + ["_" c++]]]]] [// ["[0]" runtime] [//// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/function.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/function.lux similarity index 96% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/function.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/function.lux index 3991d23dc9..a72b445a2d 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/function.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/function.lux @@ -9,11 +9,10 @@ [data [collection ["[0]" stack (.use "[1]#[0]" functor mix)]]] - [meta - [compiler - [target - ["_" c++ (.only) - ["[0]" type]]]]]]] + [compiler + [target + ["_" c++ (.only) + ["[0]" type]]]]]] ["[0]" // ["[0]" runtime] ["[0]" reference] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/loop.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/loop.lux similarity index 94% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/loop.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/loop.lux index 0b34401948..4d3e3e1d41 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/loop.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/loop.lux @@ -6,10 +6,9 @@ [lux (.except) [abstract [monad (.only do)]] - [meta - [compiler - [target - ["_" c++]]]]]] + [compiler + [target + ["_" c++]]]]] [// ["[0]" runtime] [statement diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/primitive.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/primitive.lux similarity index 94% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/primitive.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/primitive.lux index 1d0c47ba85..7257d11286 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/primitive.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/primitive.lux @@ -6,10 +6,9 @@ [lux (.except i64 text) [data ["[0]" text]] - [meta - [compiler - [target - ["_" c++]]]]]] + [compiler + [target + ["_" c++]]]]] [// ["[0]" runtime] ["[0]" type]]) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/reference.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/reference.lux similarity index 95% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/reference.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/reference.lux index 8ad5120d90..b3d86017fa 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/reference.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/reference.lux @@ -14,10 +14,9 @@ ["%" \\injection]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" c++]]]]]] + [compiler + [target + ["_" c++]]]]] [// ["/" runtime (.only Operation)] [// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/runtime.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/runtime.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/runtime.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/runtime.lux index b970a154a1..da10752f27 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/runtime.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/runtime.lux @@ -22,11 +22,11 @@ ["[0]" expansion] ["[0]" template]] ["[0]" meta (.use "[1]#[0]" functor) - ["[0]" code] - [compiler - [target - ["_" c++ (.only) - ["[0]" type]]]]]]] + ["[0]" code]] + [compiler + [target + ["_" c++ (.only) + ["[0]" type]]]]]] ["[0]" // ["[1][0]" type]] [///// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/statement.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/statement.lux similarity index 94% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/statement.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/statement.lux index 2e369a69d3..1c50090f52 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/statement.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/statement.lux @@ -4,10 +4,9 @@ (.using [library [lux (.except) - [meta - [compiler - [target - ["_" c++]]]]]] + [compiler + [target + ["_" c++]]]]] [/ ["[0]" when] ["[0]" loop]] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/statement/loop.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/statement/loop.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/statement/loop.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/statement/loop.lux index 1438e25d90..21b0e6e013 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/statement/loop.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/statement/loop.lux @@ -14,10 +14,9 @@ [math [number ["n" natural]]] - [meta - [compiler - [target - ["_" c++]]]]]] + [compiler + [target + ["_" c++]]]]] [/// ["[0]" runtime] ["[0]" reference] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/statement/when.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/statement/when.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/statement/when.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/statement/when.lux index 4e11e38d89..d2159ee27f 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/statement/when.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/statement/when.lux @@ -13,11 +13,10 @@ ["%" \\injection]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" c++ (.only) - ["[0]" type]]]]]]] + [compiler + [target + ["_" c++ (.only) + ["[0]" type]]]]]] ["[0]" /// ["[1][0]" type] ["[0]" runtime (.only Operation Phase Phase')] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/type.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/type.lux similarity index 86% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/type.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/type.lux index 2a07f4048d..b3ac96b3e2 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/type.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/type.lux @@ -4,11 +4,10 @@ (.using [library [lux (.except i64 char) - [meta - [compiler - [target - ["_" c++ (.only) - ["[0]" type]]]]]]]) + [compiler + [target + ["_" c++ (.only) + ["[0]" type]]]]]]) (the .public bit _.Type diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/when.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/when.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/when.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/when.lux index c438971d3d..fd5c847e78 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/c++/when.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/c++/when.lux @@ -12,10 +12,10 @@ ["[0]" stack (.use "[1]#[0]" mix)] ["[0]" set]]] [meta - ["[0]" provenance] - [compiler - [target - ["_" c++]]]]]] + ["[0]" provenance]] + [compiler + [target + ["_" c++]]]]] ["[0]" // ["[1][0]" type] ["[0]" runtime (.only Operation Phase)] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/extension.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/extension.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/extension.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/extension.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/extension/common.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/extension/common.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/extension/common.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/extension/common.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/function.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/function.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/function.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/function.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/loop.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/loop.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/loop.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/loop.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/primitive.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/primitive.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/primitive.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/primitive.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/reference.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/reference.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/reference.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/reference.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/runtime.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/runtime.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/runtime.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/runtime.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/structure.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/structure.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/structure.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/structure.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/when.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/when.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/when.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/common_lisp/when.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/extension.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/extension.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/extension.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/extension.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/js.lux index 313479f1d1..ec5c18a689 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js.lux @@ -10,10 +10,9 @@ ["[0]" exception]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" js]]]]]] + [compiler + [target + ["_" js]]]]] ["[0]" / [runtime (.only Phase Phase!)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/function.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js/function.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/function.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/js/function.lux index 8d646a0fab..d8ae24b52f 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/function.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js/function.lux @@ -14,10 +14,9 @@ [math [number ["n" natural]]] - [meta - [compiler - [target - ["_" js (.only Computation Var)]]]]]] + [compiler + [target + ["_" js (.only Computation Var)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Phase! Expression)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/loop.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js/loop.lux similarity index 97% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/loop.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/js/loop.lux index d5bdd05a74..4e8cceb77b 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/loop.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js/loop.lux @@ -15,10 +15,9 @@ [math [number ["n" natural]]] - [meta - [compiler - [target - ["_" js (.only Computation Var)]]]]]] + [compiler + [target + ["_" js (.only Computation Var)]]]]] ["[0]" // [runtime (.only Operation Phase Phase! Expression Statement)] ["[1][0]" when] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/primitive.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js/primitive.lux similarity index 87% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/primitive.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/js/primitive.lux index f0d522fa0e..d486372062 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/primitive.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js/primitive.lux @@ -4,10 +4,9 @@ (.using [library [lux (.except i64 text) - [meta - [compiler - [target - ["_" js (.only Computation)]]]]]] + [compiler + [target + ["_" js (.only Computation)]]]]] ["[0]" // ["[1][0]" runtime]]) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/reference.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js/reference.lux similarity index 83% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/reference.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/js/reference.lux index e55b41cff5..3e799f5442 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/reference.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js/reference.lux @@ -4,10 +4,9 @@ (.using [library [lux (.except) - [meta - [compiler - [target - ["_" js (.only Expression)]]]]]] + [compiler + [target + ["_" js (.only Expression)]]]]] [/// [reference (.only System)]]) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/runtime.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js/runtime.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/runtime.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/js/runtime.lux index 9316d29d54..e2371dcbfb 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/runtime.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js/runtime.lux @@ -28,10 +28,10 @@ ["[0]" template]] ["[0]" meta (.only) ["[0]" code (.only) - ["<[1]>" \\projection]] - [compiler - [target - ["_" js (.only Var Computation)]]]]]] + ["<[1]>" \\projection]]] + [compiler + [target + ["_" js (.only Var Computation)]]]]] ["[0]" /// ["[1][0]" reference] ["//[1]" /// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/structure.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js/structure.lux similarity index 95% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/structure.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/js/structure.lux index 6808a24973..6e34ebc286 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/structure.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js/structure.lux @@ -7,10 +7,9 @@ variant tuple) [abstract ["[0]" monad (.only do)]] - [meta - [compiler - [target - ["_" js]]]]]] + [compiler + [target + ["_" js]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Expression)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/when.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js/when.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/when.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/js/when.lux index f555c482bf..ac17e1cd4d 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/when.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/js/when.lux @@ -18,10 +18,9 @@ ["n" natural]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" js (.only Computation Var)]]]]]] + [compiler + [target + ["_" js (.only Computation Var)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Phase! Expression Statement)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm.lux similarity index 94% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm.lux index 71aef44315..1b81fc2e89 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm.lux @@ -16,16 +16,16 @@ ["[0]" template]] [type ["[0]" check]] - ["[0]" meta (.only) - [compiler - [target - [jvm - ["_" bytecode (.only Bytecode)]]] - [meta - ["[0]" archive (.only Archive)] - ["[0]" cache - [dependency - ["[1]/[0]" artifact]]]]]]]] + ["[0]" meta] + [compiler + [target + [jvm + ["_" bytecode (.only Bytecode)]]] + [meta + ["[0]" archive (.only Archive)] + ["[0]" cache + [dependency + ["[1]/[0]" artifact]]]]]]] ["[0]" / [runtime (.only Operation Phase Handler)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/complex.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/complex.lux similarity index 94% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/complex.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/complex.lux index c3aa41d6e5..2f3001c55f 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/complex.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/complex.lux @@ -16,14 +16,13 @@ [number [integer ["i[0]" /32]]]] - [meta - [compiler - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" type] - [encoding - ["[0]" signed]]]]]]]] + [compiler + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" type] + [encoding + ["[0]" signed]]]]]]] ["[0]" // ["[1][0]" type] ["[1][0]" runtime (.only Operation Phase Expression)] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function.lux similarity index 90% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function.lux index a455b778b8..bfcbbcb48c 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function.lux @@ -19,32 +19,31 @@ [math [number ["n" natural]]] - [meta - [compiler - [meta - ["[0]" archive (.only Archive)] - ["[0]" cache - [dependency - ["[1]/[0]" artifact]]]] - [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]" attribute] - ["[0]" type (.only Type) - ["[0]" category] - ["[0]" reflection]] - ["[0]" constant (.only) - [pool (.only Resource)]] - [encoding - ["[0]" unsigned] - [name - ["[0]" external] - ["[0]" internal]]]]]]]]] + [compiler + [meta + ["[0]" archive (.only Archive)] + ["[0]" cache + [dependency + ["[1]/[0]" artifact]]]] + [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]" attribute] + ["[0]" type (.only Type) + ["[0]" category] + ["[0]" reflection]] + ["[0]" constant (.only) + [pool (.only Resource)]] + [encoding + ["[0]" unsigned] + [name + ["[0]" external] + ["[0]" internal]]]]]]]] ["[0]" / ["[1][0]" abstract] [field diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/abstract.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/abstract.lux similarity index 78% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/abstract.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/abstract.lux index 53dd32f30e..83ffc85b1b 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/abstract.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/abstract.lux @@ -7,15 +7,14 @@ [data [text ["%" \\injection]]] - [meta - [compiler - [target - [jvm - ["[0]" type (.only Type) - [category (.only Method)]]]] - [meta - [archive - ["[0]" artifact]]]]]]] + [compiler + [target + [jvm + ["[0]" type (.only Type) + [category (.only Method)]]]] + [meta + [archive + ["[0]" artifact]]]]]] [// [field [constant diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/constant/arity.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/constant/arity.lux similarity index 87% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/constant/arity.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/constant/arity.lux index 5027d0055b..4a06f166e7 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/constant/arity.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/constant/arity.lux @@ -9,11 +9,10 @@ ["[0]" i64]]] [macro ["[0]" template]] - [meta - [compiler - [target - [jvm - ["[0]" type]]]]]]] + [compiler + [target + [jvm + ["[0]" type]]]]]] ["[0]" // [///////// [arity (.only Arity)]]]) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/variable.lux similarity index 81% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/variable.lux index f3e17e3c14..ffd9a4fb46 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/variable.lux @@ -8,17 +8,16 @@ [collection ["[0]" stack (.use "[1]#[0]" functor)] ["[0]" sequence]]] - [meta - [compiler - [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)]]]]]]]] + [compiler + [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/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/count.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/count.lux similarity index 79% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/count.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/count.lux index e68ba4de3b..878eb59f77 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/count.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/count.lux @@ -6,14 +6,13 @@ [lux (.except type) [control ["[0]" try]] - [meta - [compiler - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" type] - [encoding - ["[0]" signed]]]]]]]] + [compiler + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" type] + [encoding + ["[0]" signed]]]]]]] [/// [constant ["[0]" arity]] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/foreign.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/foreign.lux similarity index 81% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/foreign.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/foreign.lux index 7d58446edc..154db229da 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/foreign.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/foreign.lux @@ -7,16 +7,15 @@ [data [collection ["[0]" stack]]] - [meta - [compiler - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" field (.only Field)] - [constant - [pool (.only Resource)]] - [type (.only Type) - [category (.only Value Class)]]]]]]]] + [compiler + [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/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/partial.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/partial.lux similarity index 84% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/partial.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/partial.lux index 31994f9db9..3924df1845 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/partial.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/partial.lux @@ -12,16 +12,15 @@ [math [number ["n" natural]]] - [meta - [compiler - [target - [jvm - ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)] - ["[0]" field (.only Field)] - [type (.only Type) - [category (.only Class)]] - [constant - [pool (.only Resource)]]]]]]]] + [compiler + [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/meta/compiler/language/lux/phase/translation/jvm/function/method.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method.lux similarity index 69% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/method.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method.lux index a192853dbb..901373f7b5 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/method.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method.lux @@ -4,12 +4,11 @@ (.using [library [lux (.except) - [meta - [compiler - [target - [jvm - ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] - ["[0]" method (.only Method)]]]]]]]) + [compiler + [target + [jvm + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] + ["[0]" method (.only Method)]]]]]]) (the .public modifier (Modifier Method) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/apply.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method/apply.lux similarity index 96% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/apply.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method/apply.lux index 226fa6dd04..3aa1b49a7a 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/apply.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method/apply.lux @@ -17,18 +17,17 @@ ["i" integer] [integer ["i[0]" /32]]]] - [meta - [compiler - [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)]]]]]]]] + [compiler + [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/meta/compiler/language/lux/phase/translation/jvm/function/method/implementation.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method/implementation.lux similarity index 81% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/implementation.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method/implementation.lux index 286fc87a4f..1f7148d3a5 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/implementation.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method/implementation.lux @@ -11,17 +11,16 @@ [math [number ["n" natural]]] - [meta - [compiler - [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)]]]]]]]] + [compiler + [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/meta/compiler/language/lux/phase/translation/jvm/function/method/init.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method/init.lux similarity index 91% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/init.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method/init.lux index d2359ea921..7d5095c44f 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/init.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method/init.lux @@ -14,18 +14,17 @@ [math [number ["n" natural]]] - [meta - [compiler - [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)]]]]]]]] + [compiler + [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/meta/compiler/language/lux/phase/translation/jvm/function/method/reset.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method/reset.lux similarity index 85% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/reset.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method/reset.lux index 927e9a12c1..3a300afead 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/reset.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function/method/reset.lux @@ -7,16 +7,15 @@ [data [collection ["[0]" stack (.use "[1]#[0]" functor)]]] - [meta - [compiler - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" method (.only Method)] - [constant - [pool (.only Resource)]] - ["[0]" type (.only Type) - ["[0]" category (.only Class)]]]]]]]] + [compiler + [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]" init] ["/[1]" // diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/host.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/host.lux similarity index 93% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/host.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/host.lux index 88d00131a1..ace7445259 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/host.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/host.lux @@ -24,25 +24,24 @@ ["[0]" array] ["[0]" dictionary (.only Dictionary)] ["[0]" sequence]]] - [meta - [compiler - [meta - [archive - ["[0]" unit]]] - [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)] - [encoding - [name - ["[0]" internal]]] - ["[0]" type (.only) - ["[0]" descriptor]]]]]]]] + [compiler + [meta + [archive + ["[0]" unit]]] + [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)] + [encoding + [name + ["[0]" internal]]] + ["[0]" type (.only) + ["[0]" descriptor]]]]]]] ["[0]" // ["[1][0]" runtime (.only Definition)] ["[1][0]" type] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/loop.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/loop.lux similarity index 96% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/loop.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/loop.lux index c6ceff6e10..a25635205f 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/loop.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/loop.lux @@ -14,11 +14,10 @@ [math [number ["n" natural]]] - [meta - [compiler - [target - [jvm - ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)]]]]]]] + [compiler + [target + [jvm + ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)]]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Expression)] ["[1][0]" value] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/primitive.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/primitive.lux similarity index 95% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/primitive.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/primitive.lux index 77ee1538b9..385e393a79 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/primitive.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/primitive.lux @@ -14,14 +14,13 @@ ["i" integer]]] [macro ["[0]" template]] - [meta - [compiler - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" type] - [encoding - ["[0]" signed]]]]]]]]) + [compiler + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" type] + [encoding + ["[0]" signed]]]]]]]) (the $Boolean (type.class (stack) "java.lang.Boolean")) (the $Long (type.class (stack) "java.lang.Long")) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/program.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/program.lux similarity index 88% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/program.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/program.lux index 01abcf580d..50462a4804 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/program.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/program.lux @@ -13,26 +13,25 @@ ["[0]" \\injection]] [collection ["[0]" sequence]]] - [meta - [compiler - [language - [lux - [program (.only Program)]]] - [meta - [archive - ["[0]" unit]]] - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] - ["[0]" method (.only Method)] - ["[0]" version] - ["[0]" class (.only Class)] - [encoding - [name - ["[0]" internal]]] - ["[0]" type (.only) - ["[0]" reflection]]]]]]]] + [compiler + [language + [lux + [program (.only Program)]]] + [meta + [archive + ["[0]" unit]]] + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] + ["[0]" method (.only Method)] + ["[0]" version] + ["[0]" class (.only Class)] + [encoding + [name + ["[0]" internal]]] + ["[0]" type (.only) + ["[0]" reflection]]]]]]] ["[0]" // (.only) ["[1][0]" runtime (.only Definition)] ["[1][0]" function/abstract]]) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/reference.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/reference.lux similarity index 93% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/reference.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/reference.lux index 41b0dabced..7a9e8c3883 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/reference.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/reference.lux @@ -11,14 +11,13 @@ ["%" \\injection]]] [macro ["[0]" template]] - [meta - [compiler - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" type] - [encoding - ["[0]" unsigned]]]]]]]] + [compiler + [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/meta/compiler/language/lux/phase/translation/jvm/runtime.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/runtime.lux similarity index 97% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/runtime.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/runtime.lux index ca706372ca..3e5d8cee92 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/runtime.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/runtime.lux @@ -27,24 +27,23 @@ ["i[0]" /32]]]] [macro ["[0]" template]] - [meta - [compiler - [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)] - [constant - [pool (.only Resource)]] - [encoding - [name - ["[0]" internal]]] - ["[0]" type (.only Type) - ["[0]" category] - ["[0]" reflection]]]]]]]] + [compiler + [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)] + [constant + [pool (.only Resource)]] + [encoding + [name + ["[0]" internal]]] + ["[0]" type (.only Type) + ["[0]" category] + ["[0]" reflection]]]]]]] ["[0]" // ["[1][0]" type] ["[1][0]" value] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/type.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/type.lux similarity index 90% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/type.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/type.lux index 0f7bb6ad80..72b90f3e9a 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/type.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/type.lux @@ -4,11 +4,10 @@ (.using [library [lux (.except text variant tuple stack) - [meta - [compiler - [target - [jvm - ["[0]" type]]]]]]]) + [compiler + [target + [jvm + ["[0]" type]]]]]]) (the .public decimal (type.class (.stack) "java.lang.Double")) (the .public text (type.class (.stack) "java.lang.String")) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/value.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/value.lux similarity index 90% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/value.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/value.lux index 205781fccc..fd25af5c4c 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/value.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/value.lux @@ -6,14 +6,13 @@ [lux (.except Type) [macro ["[0]" template]] - [meta - [compiler - [target - [jvm - ["_" bytecode (.only Bytecode)] - ["[0]" type (.only Type) - [category (.only Primitive)] - ["[0]" box]]]]]]]]) + [compiler + [target + [jvm + ["_" bytecode (.only Bytecode)] + ["[0]" type (.only Type) + [category (.only Primitive)] + ["[0]" box]]]]]]]) (the .public field "value") diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/when.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/when.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/when.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/when.lux index fffc8eb727..62c54f9829 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/when.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/when.lux @@ -18,13 +18,12 @@ ["i[0]" /32]]]] [macro ["[0]" template]] - [meta - [compiler - [target - [jvm - ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad)] - ["[0]" type (.only Type) - [category (.only Method)]]]]]]]] + [compiler + [target + [jvm + ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad)] + ["[0]" type (.only Type) + [category (.only Method)]]]]]]] ["[0]" // ["[1][0]" type] ["[1][0]" runtime (.only Operation Phase Expression)] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/lua.lux index f3b2c076db..d1f77a8b5f 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua.lux @@ -10,10 +10,9 @@ ["[0]" exception]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" lua]]]]]] + [compiler + [target + ["_" lua]]]]] ["[0]" / [runtime (.only Phase)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/function.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/function.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/function.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/function.lux index 7a2ce85f97..5dcd332df2 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/function.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/function.lux @@ -14,10 +14,9 @@ [math [number ["n" natural]]] - [meta - [compiler - [target - ["_" lua (.only Var)]]]]]] + [compiler + [target + ["_" lua (.only Var)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Phase! Expression)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/loop.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/loop.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/loop.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/loop.lux index 5889de6262..cd0f665b02 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/loop.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/loop.lux @@ -16,10 +16,9 @@ [math [number ["n" natural]]] - [meta - [compiler - [target - ["_" lua (.only Var Label)]]]]]] + [compiler + [target + ["_" lua (.only Var Label)]]]]] ["[0]" // [runtime (.only Operation Phase Phase! Expression Statement)] ["[1][0]" when] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/primitive.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/primitive.lux similarity index 87% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/primitive.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/primitive.lux index ce7f803d8f..0a1da1db75 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/primitive.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/primitive.lux @@ -6,10 +6,9 @@ [lux (.except i64 text) [macro ["[0]" template]] - [meta - [compiler - [target - ["_" lua (.only Literal)]]]]]]) + [compiler + [target + ["_" lua (.only Literal)]]]]]) (template.with [ ] [(the .public diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/reference.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/reference.lux similarity index 83% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/reference.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/reference.lux index 0fad3ad09d..d46eda8d46 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/reference.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/reference.lux @@ -4,10 +4,9 @@ (.using [library [lux (.except) - [meta - [compiler - [target - ["_" lua (.only Expression)]]]]]] + [compiler + [target + ["_" lua (.only Expression)]]]]] [/// [reference (.only System)]]) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/runtime.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/runtime.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/runtime.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/runtime.lux index 287274c4ea..5770db7a4c 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/runtime.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/runtime.lux @@ -28,10 +28,10 @@ ["[0]" template]] ["[0]" meta (.only) ["[0]" code (.only) - ["<[1]>" \\projection]] - [compiler - [target - ["_" lua (.only Location Var Computation Literal Label)]]]]]] + ["<[1]>" \\projection]]] + [compiler + [target + ["_" lua (.only Location Var Computation Literal Label)]]]]] ["[0]" /// ["[1][0]" reference] ["//[1]" /// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/structure.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/structure.lux similarity index 94% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/structure.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/structure.lux index a73577d9be..1a8611f587 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/structure.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/structure.lux @@ -7,10 +7,9 @@ tuple variant) [abstract ["[0]" monad (.only do)]] - [meta - [compiler - [target - ["_" lua]]]]]] + [compiler + [target + ["_" lua]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Expression)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/when.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/when.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/when.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/when.lux index 9e99c1379c..72f77f53fe 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/when.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/lua/when.lux @@ -14,10 +14,9 @@ ["[0]" set]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" lua (.only Var)]]]]]] + [compiler + [target + ["_" lua (.only Var)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Phase! Expression Statement)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/php.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/php.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/extension.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/php/extension.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/extension.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/php/extension.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/extension/common.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/php/extension/common.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/extension/common.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/php/extension/common.lux index 8d70483f99..a7d7e6af68 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/extension/common.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/php/extension/common.lux @@ -9,7 +9,7 @@ ["[0]" function] [data ["[0]" product] - ["[0]" text] + ["[0]" text (.only \n)] [collection ["[0]" dictionary]]] [meta @@ -96,7 +96,7 @@ Bundle (<| (bundle.prefix "io") (|> bundle.empty - (bundle.install "log" (unary (|>> (_.concat (_.string text.new_line)) _.print/1))) + (bundle.install "log" (unary (|>> (_.concat (_.string \n)) _.print/1))) (bundle.install "error" (unary ///runtime.io//throw!)) (bundle.install "exit" (unary _.exit/1)) (bundle.install "current-time" (nullary (|>> _.time/0 (_.* (_.int +1,000)))))))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/function.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/php/function.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/function.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/php/function.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/loop.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/php/loop.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/loop.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/php/loop.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/primitive.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/php/primitive.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/primitive.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/php/primitive.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/reference.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/php/reference.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/reference.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/php/reference.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/runtime.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/php/runtime.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/runtime.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/php/runtime.lux index 2f7f631af6..6873796b93 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/runtime.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/php/runtime.lux @@ -10,7 +10,7 @@ ["[0]" function] [data ["[0]" product] - ["[0]" text (.use "[1]#[0]" hash) + ["[0]" text (.only \n) (.use "[1]#[0]" hash) ["%" \\injection] [encoding ["[0]" utf8]]] @@ -139,7 +139,7 @@ (the (io//log! message) (all _.then (_.echo message) - (_.echo (_.string text.new_line)) + (_.echo (_.string \n)) (_.return ..unit))) (the (io//throw! message) @@ -588,8 +588,8 @@ (.the check_necessary_conditions! _.Statement (let [i64_support? (_.=== (_.int +8) (_.constant "PHP_INT_SIZE")) - i64_error (_.string (text "Cannot run program!" text.new_line - "Lux/PHP programs require 64-bit PHP builds!"))] + i64_error (_.string (text "Cannot run program!" + \n "Lux/PHP programs require 64-bit PHP builds!"))] (_.when (_.not i64_support?) (_.throw (_.new (_.constant "Exception") (stack i64_error)))))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/structure.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/php/structure.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/structure.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/php/structure.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/when.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/php/when.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/when.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/php/when.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/python.lux index b9a3487994..7ee1bdde81 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python.lux @@ -10,10 +10,9 @@ ["[0]" exception]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" python]]]]]] + [compiler + [target + ["_" python]]]]] ["[0]" / [runtime (.only Phase)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/function.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python/function.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/function.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/python/function.lux index 1122a0d2c2..e184e7b0d4 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/function.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python/function.lux @@ -13,10 +13,9 @@ [math [number ["n" natural]]] - [meta - [compiler - [target - ["_" python (.only SVar)]]]]]] + [compiler + [target + ["_" python (.only SVar)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Expression Phase!)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/loop.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python/loop.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/loop.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/python/loop.lux index 059a60290a..cc136f50cc 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/loop.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python/loop.lux @@ -14,10 +14,9 @@ [math [number ["n" natural]]] - [meta - [compiler - [target - ["_" python (.only SVar)]]]]]] + [compiler + [target + ["_" python (.only SVar)]]]]] ["[0]" // [runtime (.only Operation Phase Expression Phase! Statement)] ["[1][0]" when] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/primitive.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python/primitive.lux similarity index 87% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/primitive.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/python/primitive.lux index 06f4655a6a..a0e3c8f041 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/primitive.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python/primitive.lux @@ -6,10 +6,9 @@ [lux (.except i64 text) [macro ["[0]" template]] - [meta - [compiler - [target - ["_" python (.only Expression)]]]]]] + [compiler + [target + ["_" python (.only Expression)]]]]] ["[0]" // ["[1][0]" runtime]]) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/reference.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python/reference.lux similarity index 83% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/reference.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/python/reference.lux index 574364c4af..fae5ec466e 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/reference.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python/reference.lux @@ -4,10 +4,9 @@ (.using [library [lux (.except) - [meta - [compiler - [target - ["_" python (.only Expression)]]]]]] + [compiler + [target + ["_" python (.only Expression)]]]]] [/// [reference (.only System)]]) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/runtime.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python/runtime.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/runtime.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/python/runtime.lux index ca519979a0..eed85121b0 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/runtime.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python/runtime.lux @@ -30,10 +30,10 @@ ["[0]" meta (.only) ["[0]" version] ["[0]" code (.only) - ["<[1]>" \\projection]] - [compiler - [target - ["_" python (.only SVar Computation Literal)]]]]]] + ["<[1]>" \\projection]]] + [compiler + [target + ["_" python (.only SVar Computation Literal)]]]]] ["[0]" /// ["[1][0]" reference] ["//[1]" /// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/structure.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python/structure.lux similarity index 94% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/structure.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/python/structure.lux index d531665a42..e2446c4790 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/structure.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python/structure.lux @@ -7,10 +7,9 @@ variant tuple) [abstract ["[0]" monad (.only do)]] - [meta - [compiler - [target - ["_" python]]]]]] + [compiler + [target + ["_" python]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Expression)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/when.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python/when.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/when.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/python/when.lux index 46180a93c0..6ca154f7d0 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/when.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/python/when.lux @@ -19,10 +19,9 @@ ["i" integer]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" python (.only SVar)]]]]]] + [compiler + [target + ["_" python (.only SVar)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Expression Phase! Statement)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/r.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/r.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/function.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/r/function.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/function.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/r/function.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/loop.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/r/loop.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/loop.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/r/loop.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/primitive.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/r/primitive.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/primitive.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/r/primitive.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/reference.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/r/reference.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/reference.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/r/reference.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/runtime.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/r/runtime.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/runtime.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/r/runtime.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/structure.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/r/structure.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/structure.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/r/structure.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/when.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/r/when.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/when.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/r/when.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/reference.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/reference.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/reference.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/reference.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby.lux index 76743a71bd..d95f9d5174 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby.lux @@ -10,10 +10,9 @@ ["[0]" exception]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" ruby]]]]]] + [compiler + [target + ["_" ruby]]]]] ["[0]" / [runtime (.only Phase Phase!)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/function.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/function.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/function.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/function.lux index 79610f78b8..843530d8d5 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/function.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/function.lux @@ -10,10 +10,9 @@ ["[0]" product] [collection ["[0]" stack (.use "[1]#[0]" functor mix)]]] - [meta - [compiler - [target - ["_" ruby (.only LVar GVar)]]]]]] + [compiler + [target + ["_" ruby (.only LVar GVar)]]]]] ["[0]" // [runtime (.only Operation Phase Expression Phase!)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/loop.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/loop.lux similarity index 97% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/loop.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/loop.lux index 54fadf5454..4f03c33285 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/loop.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/loop.lux @@ -15,10 +15,9 @@ [math [number ["n" natural]]] - [meta - [compiler - [target - ["_" ruby (.only LVar)]]]]]] + [compiler + [target + ["_" ruby (.only LVar)]]]]] ["[0]" // [runtime (.only Operation Phase Expression Phase! Statement)] ["[1][0]" when] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/primitive.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/primitive.lux similarity index 87% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/primitive.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/primitive.lux index afccc7b300..d7b8fbc493 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/primitive.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/primitive.lux @@ -6,10 +6,9 @@ [lux (.except i64 text) [macro ["[0]" template]] - [meta - [compiler - [target - ["_" ruby (.only Literal)]]]]]]) + [compiler + [target + ["_" ruby (.only Literal)]]]]]) (template.with [ ] [(the .public diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/reference.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/reference.lux similarity index 83% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/reference.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/reference.lux index 1277934114..a7fa963a58 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/reference.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/reference.lux @@ -4,10 +4,9 @@ (.using [library [lux (.except) - [meta - [compiler - [target - ["_" ruby (.only Expression)]]]]]] + [compiler + [target + ["_" ruby (.only Expression)]]]]] [/// [reference (.only System)]]) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/runtime.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/runtime.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/runtime.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/runtime.lux index cfb593afa1..a0b516af7a 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/runtime.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/runtime.lux @@ -29,10 +29,10 @@ ["[0]" template]] ["[0]" meta (.only) ["[0]" code (.only) - ["<[1]>" \\projection]] - [compiler - [target - ["_" ruby (.only LVar Computation Literal)]]]]]] + ["<[1]>" \\projection]]] + [compiler + [target + ["_" ruby (.only LVar Computation Literal)]]]]] ["[0]" /// ["[1][0]" reference] ["//[1]" /// diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/structure.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/structure.lux similarity index 94% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/structure.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/structure.lux index da6f0fa80f..068427fd1b 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/structure.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/structure.lux @@ -7,10 +7,9 @@ variant tuple) [abstract ["[0]" monad (.only do)]] - [meta - [compiler - [target - ["_" ruby]]]]]] + [compiler + [target + ["_" ruby]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Expression)] ["[1][0]" primitive] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/when.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/when.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/when.lux rename to stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/when.lux index 07f741ec69..33e6a82ffb 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/when.lux +++ b/stdlib/source/library/lux/compiler/language/lux/phase/translation/ruby/when.lux @@ -20,10 +20,9 @@ ["i" integer]]] [macro ["[0]" template]] - [meta - [compiler - [target - ["_" ruby (.only LVar)]]]]]] + [compiler + [target + ["_" ruby (.only LVar)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Expression Phase! Statement)] ["[1][0]" reference] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/program.lux b/stdlib/source/library/lux/compiler/language/lux/program.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/program.lux rename to stdlib/source/library/lux/compiler/language/lux/program.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/syntax.lux b/stdlib/source/library/lux/compiler/language/lux/syntax.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/language/lux/syntax.lux rename to stdlib/source/library/lux/compiler/language/lux/syntax.lux index 3f6f3a8736..be0cd53a86 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/syntax.lux +++ b/stdlib/source/library/lux/compiler/language/lux/syntax.lux @@ -38,7 +38,7 @@ ["[0]" try] ["[0]" exception (.only Exception)]] [data - ["[0]" text (.only) + ["[0]" text (.only \n) [\\projection (.only Offset)] ["%" \\injection]] [collection @@ -225,7 +225,7 @@ [(,, (static ))] [text.space] - [text.new_line] [text.carriage_return] + [\n] [text.carriage_return] [name.delimiter] [..open_form] [..close_form] [..open_variant] [..close_variant] @@ -616,7 +616,7 @@ (the !guarantee_no_new_lines (template.macro (_ the_globals where offset content body) - [(when (.text_index# 0 (static text.new_line) content) + [(when (.text_index# 0 (static \n) content) {.#None} body @@ -686,7 +686,7 @@ (again (!horizontal the_globals where offset/0)) ... New line - [(,, (static text.new_line))] + [(,, (static \n))] (again (!vertical the_globals where offset/0)) @@ -701,7 +701,7 @@ ] ... It's either a Revolution, a name, or a comment. (expansion.let [ (!implicit_name the_globals [where offset/1 @code] where .#Name) - (when (.text_index# (after offset/1) (static text.new_line) @code) + (when (.text_index# (after offset/1) (static \n) @code) {.#Some end} (again (!vertical the_globals where end)) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/synthesis.lux b/stdlib/source/library/lux/compiler/language/lux/synthesis.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/synthesis.lux rename to stdlib/source/library/lux/compiler/language/lux/synthesis.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access.lux b/stdlib/source/library/lux/compiler/language/lux/synthesis/access.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access.lux rename to stdlib/source/library/lux/compiler/language/lux/synthesis/access.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access/member.lux b/stdlib/source/library/lux/compiler/language/lux/synthesis/access/member.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access/member.lux rename to stdlib/source/library/lux/compiler/language/lux/synthesis/access/member.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access/side.lux b/stdlib/source/library/lux/compiler/language/lux/synthesis/access/side.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access/side.lux rename to stdlib/source/library/lux/compiler/language/lux/synthesis/access/side.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/simple.lux b/stdlib/source/library/lux/compiler/language/lux/synthesis/simple.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/synthesis/simple.lux rename to stdlib/source/library/lux/compiler/language/lux/synthesis/simple.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/translation.lux b/stdlib/source/library/lux/compiler/language/lux/translation.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/translation.lux rename to stdlib/source/library/lux/compiler/language/lux/translation.lux diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/translation/script.lux b/stdlib/source/library/lux/compiler/language/lux/translation/script.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/language/lux/translation/script.lux rename to stdlib/source/library/lux/compiler/language/lux/translation/script.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta.lux b/stdlib/source/library/lux/compiler/meta.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta.lux rename to stdlib/source/library/lux/compiler/meta.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive.lux b/stdlib/source/library/lux/compiler/meta/archive.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/archive.lux rename to stdlib/source/library/lux/compiler/meta/archive.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/artifact.lux b/stdlib/source/library/lux/compiler/meta/archive/artifact.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/archive/artifact.lux rename to stdlib/source/library/lux/compiler/meta/archive/artifact.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/artifact/category.lux b/stdlib/source/library/lux/compiler/meta/archive/artifact/category.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/archive/artifact/category.lux rename to stdlib/source/library/lux/compiler/meta/archive/artifact/category.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/artifact/definition.lux b/stdlib/source/library/lux/compiler/meta/archive/artifact/definition.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/archive/artifact/definition.lux rename to stdlib/source/library/lux/compiler/meta/archive/artifact/definition.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/key.lux b/stdlib/source/library/lux/compiler/meta/archive/key.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/archive/key.lux rename to stdlib/source/library/lux/compiler/meta/archive/key.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/module.lux b/stdlib/source/library/lux/compiler/meta/archive/module.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/archive/module.lux rename to stdlib/source/library/lux/compiler/meta/archive/module.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/module/descriptor.lux b/stdlib/source/library/lux/compiler/meta/archive/module/descriptor.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/archive/module/descriptor.lux rename to stdlib/source/library/lux/compiler/meta/archive/module/descriptor.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/module/document.lux b/stdlib/source/library/lux/compiler/meta/archive/module/document.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/archive/module/document.lux rename to stdlib/source/library/lux/compiler/meta/archive/module/document.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/registry.lux b/stdlib/source/library/lux/compiler/meta/archive/registry.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/archive/registry.lux rename to stdlib/source/library/lux/compiler/meta/archive/registry.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/signature.lux b/stdlib/source/library/lux/compiler/meta/archive/signature.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/archive/signature.lux rename to stdlib/source/library/lux/compiler/meta/archive/signature.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/unit.lux b/stdlib/source/library/lux/compiler/meta/archive/unit.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/archive/unit.lux rename to stdlib/source/library/lux/compiler/meta/archive/unit.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/cache.lux b/stdlib/source/library/lux/compiler/meta/cache.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/cache.lux rename to stdlib/source/library/lux/compiler/meta/cache.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/cache/archive.lux b/stdlib/source/library/lux/compiler/meta/cache/archive.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/cache/archive.lux rename to stdlib/source/library/lux/compiler/meta/cache/archive.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/cache/artifact.lux b/stdlib/source/library/lux/compiler/meta/cache/artifact.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/cache/artifact.lux rename to stdlib/source/library/lux/compiler/meta/cache/artifact.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/cache/dependency/artifact.lux b/stdlib/source/library/lux/compiler/meta/cache/dependency/artifact.lux similarity index 94% rename from stdlib/source/library/lux/meta/compiler/meta/cache/dependency/artifact.lux rename to stdlib/source/library/lux/compiler/meta/cache/dependency/artifact.lux index f98db792e0..f7dbd31647 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/cache/dependency/artifact.lux +++ b/stdlib/source/library/lux/compiler/meta/cache/dependency/artifact.lux @@ -21,21 +21,21 @@ ["^" pattern] ["[0]" template]] [meta - ["[0]" name] - [compiler - ["[0]" reference (.only Constant)] - [language - [lux - ["[0]" phase] - ["[0]" synthesis (.only Path)] - ["[0]" translation (.only Operation)] - ["[0]" analysis - ["[1]/[0]" complex]]]] - [meta - ["[0]" archive (.only Archive) - ["[0]" artifact] - ["[0]" registry (.only Registry)] - ["[0]" unit]]]]]]]) + ["[0]" name]] + [compiler + ["[0]" reference (.only Constant)] + [language + [lux + ["[0]" phase] + ["[0]" synthesis (.only Path)] + ["[0]" translation (.only Operation)] + ["[0]" analysis + ["[1]/[0]" complex]]]]]]] + [//// + ["[0]" archive (.only Archive) + ["[0]" artifact] + ["[0]" registry (.only Registry)] + ["[0]" unit]]]) (the (path_references references) (-> (-> synthesis.Term (Stack Constant)) diff --git a/stdlib/source/library/lux/meta/compiler/meta/cache/dependency/module.lux b/stdlib/source/library/lux/compiler/meta/cache/dependency/module.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/cache/dependency/module.lux rename to stdlib/source/library/lux/compiler/meta/cache/dependency/module.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/cache/module.lux b/stdlib/source/library/lux/compiler/meta/cache/module.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/cache/module.lux rename to stdlib/source/library/lux/compiler/meta/cache/module.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/cache/purge.lux b/stdlib/source/library/lux/compiler/meta/cache/purge.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/cache/purge.lux rename to stdlib/source/library/lux/compiler/meta/cache/purge.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/cli.lux b/stdlib/source/library/lux/compiler/meta/cli.lux similarity index 94% rename from stdlib/source/library/lux/meta/compiler/meta/cli.lux rename to stdlib/source/library/lux/compiler/meta/cli.lux index d6b27f4c3d..4c54e67afa 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/cli.lux +++ b/stdlib/source/library/lux/compiler/meta/cli.lux @@ -16,18 +16,17 @@ ["^" pattern] ["[0]" template]] [meta - ["[0]" configuration (.only Configuration)] - [compiler - [meta - [archive - [module - ["[0]" descriptor]]]]]] + ["[0]" configuration (.only Configuration)]] ["[0]" program ["<[1]>" \\projection (.only Projection)]] [world [file (.only Path)]]]] ["[0]" / - ["[1][0]" compiler (.only Compiler)]]) + ["[1][0]" compiler (.only Compiler)] + [// + [archive + [module + ["[0]" descriptor]]]]]) (every .public Host_Dependency Path) diff --git a/stdlib/source/library/lux/meta/compiler/meta/cli/compiler.lux b/stdlib/source/library/lux/compiler/meta/cli/compiler.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/cli/compiler.lux rename to stdlib/source/library/lux/compiler/meta/cli/compiler.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/context.lux b/stdlib/source/library/lux/compiler/meta/context.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/context.lux rename to stdlib/source/library/lux/compiler/meta/context.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/export.lux b/stdlib/source/library/lux/compiler/meta/export.lux similarity index 96% rename from stdlib/source/library/lux/meta/compiler/meta/export.lux rename to stdlib/source/library/lux/compiler/meta/export.lux index d31663dc3a..797c91de0d 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/export.lux +++ b/stdlib/source/library/lux/compiler/meta/export.lux @@ -22,16 +22,14 @@ ["[0]" stack (.use "[1]#[0]" mix)]] [format ["[0]" tar]]] - [meta - [compiler - [meta - [cli (.only Source Export)] - ["[0]" io - ["[1]" context]]]]] [time ["[0]" instant]] [world - ["[0]" file]]]]) + ["[0]" file]]]] + [// + [cli (.only Source Export)] + ["[0]" io + ["[1]" context]]]) (the .public file "library.tar") diff --git a/stdlib/source/library/lux/meta/compiler/meta/import.lux b/stdlib/source/library/lux/compiler/meta/import.lux similarity index 96% rename from stdlib/source/library/lux/meta/compiler/meta/import.lux rename to stdlib/source/library/lux/compiler/meta/import.lux index 310c02890d..1a7bbf1515 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/import.lux +++ b/stdlib/source/library/lux/compiler/meta/import.lux @@ -23,12 +23,10 @@ ["[0]" sequence]] [format ["[0]" tar]]] - [meta - [compiler - [meta - [cli (.only Library Module)]]]] [world - ["[0]" file]]]]) + ["[0]" file]]]] + [// + [cli (.only Library Module)]]) (the Action (type (for_any (_ of) diff --git a/stdlib/source/library/lux/meta/compiler/meta/io.lux b/stdlib/source/library/lux/compiler/meta/io.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/io.lux rename to stdlib/source/library/lux/compiler/meta/io.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/io/archive.lux b/stdlib/source/library/lux/compiler/meta/io/archive.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/io/archive.lux rename to stdlib/source/library/lux/compiler/meta/io/archive.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/io/context.lux b/stdlib/source/library/lux/compiler/meta/io/context.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/io/context.lux rename to stdlib/source/library/lux/compiler/meta/io/context.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/packager.lux b/stdlib/source/library/lux/compiler/meta/packager.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/packager.lux rename to stdlib/source/library/lux/compiler/meta/packager.lux diff --git a/stdlib/source/library/lux/meta/compiler/meta/packager/jvm.lux b/stdlib/source/library/lux/compiler/meta/packager/jvm.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/meta/packager/jvm.lux rename to stdlib/source/library/lux/compiler/meta/packager/jvm.lux index b1110e89df..c5f1e9d426 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/packager/jvm.lux +++ b/stdlib/source/library/lux/compiler/meta/packager/jvm.lux @@ -22,13 +22,12 @@ [number ["n" natural] ["i" integer]]] - [meta - [compiler - [target - [jvm - [encoding - [name - ["[0]" internal]]]]]]] + [compiler + [target + [jvm + [encoding + [name + ["[0]" internal]]]]]] [world ["[0]" file]]]] ["[0]" // (.only Packager) diff --git a/stdlib/source/library/lux/meta/compiler/meta/packager/ruby.lux b/stdlib/source/library/lux/compiler/meta/packager/ruby.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/meta/packager/ruby.lux rename to stdlib/source/library/lux/compiler/meta/packager/ruby.lux index ee82715c94..3b532d6bd3 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/packager/ruby.lux +++ b/stdlib/source/library/lux/compiler/meta/packager/ruby.lux @@ -24,10 +24,9 @@ [number ["[0]" natural]]] [type (.only sharing)] - [meta - [compiler - [target - ["_" ruby]]]] + [compiler + [target + ["_" ruby]]] [world ["[0]" file]]]] ["[0]" // (.only Packager) diff --git a/stdlib/source/library/lux/meta/compiler/meta/packager/script.lux b/stdlib/source/library/lux/compiler/meta/packager/script.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/meta/packager/script.lux rename to stdlib/source/library/lux/compiler/meta/packager/script.lux diff --git a/stdlib/source/library/lux/meta/compiler/reference.lux b/stdlib/source/library/lux/compiler/reference.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/reference.lux rename to stdlib/source/library/lux/compiler/reference.lux diff --git a/stdlib/source/library/lux/meta/compiler/reference/register.lux b/stdlib/source/library/lux/compiler/reference/register.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/reference/register.lux rename to stdlib/source/library/lux/compiler/reference/register.lux diff --git a/stdlib/source/library/lux/meta/compiler/reference/variable.lux b/stdlib/source/library/lux/compiler/reference/variable.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/reference/variable.lux rename to stdlib/source/library/lux/compiler/reference/variable.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/c++.lux b/stdlib/source/library/lux/compiler/target/c++.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/c++.lux rename to stdlib/source/library/lux/compiler/target/c++.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/c++/type.lux b/stdlib/source/library/lux/compiler/target/c++/type.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/c++/type.lux rename to stdlib/source/library/lux/compiler/target/c++/type.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/common_lisp.lux b/stdlib/source/library/lux/compiler/target/common_lisp.lux similarity index 99% rename from stdlib/source/library/lux/meta/compiler/target/common_lisp.lux rename to stdlib/source/library/lux/compiler/target/common_lisp.lux index 55c21de88b..60a907085a 100644 --- a/stdlib/source/library/lux/meta/compiler/target/common_lisp.lux +++ b/stdlib/source/library/lux/compiler/target/common_lisp.lux @@ -133,7 +133,7 @@ [text.null "\0"] [text.back_space "\b"] [text.form_feed "\f"] - [text.new_line "\n"] + [text.\n "\n"] [text.carriage_return "\r"] [text.double_quote (text "\" text.double_quote)] )) diff --git a/stdlib/source/library/lux/meta/compiler/target/js.lux b/stdlib/source/library/lux/compiler/target/js.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/target/js.lux rename to stdlib/source/library/lux/compiler/target/js.lux index 0d21d408f8..a5d54078b9 100644 --- a/stdlib/source/library/lux/meta/compiler/target/js.lux +++ b/stdlib/source/library/lux/compiler/target/js.lux @@ -8,7 +8,7 @@ [control ["[0]" pipe]] [data - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" stack (.use "[1]#[0]" functor mix)]]] @@ -31,13 +31,13 @@ ... Added the carriage return for better Windows compatibility. (the \n+ Text - (text text.carriage_return text.new_line)) + (text text.carriage_return \n)) (the nested (-> Text Text) (|>> (text \n+) - (text.replaced text.new_line (text text.new_line text.tab)))) + (text.replaced \n (text \n text.tab)))) (nominal.every .public (Code brand) Text @@ -115,7 +115,7 @@ ["\0" text.null] ["\b" text.back_space] ["\f" text.form_feed] - ["\n" text.new_line] + ["\n" \n] ["\r" text.carriage_return] [(text "\" text.double_quote) text.double_quote] diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/attribute.lux b/stdlib/source/library/lux/compiler/target/jvm/attribute.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/attribute.lux rename to stdlib/source/library/lux/compiler/target/jvm/attribute.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/attribute/code.lux b/stdlib/source/library/lux/compiler/target/jvm/attribute/code.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/attribute/code.lux rename to stdlib/source/library/lux/compiler/target/jvm/attribute/code.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/attribute/code/exception.lux b/stdlib/source/library/lux/compiler/target/jvm/attribute/code/exception.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/attribute/code/exception.lux rename to stdlib/source/library/lux/compiler/target/jvm/attribute/code/exception.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/attribute/constant.lux b/stdlib/source/library/lux/compiler/target/jvm/attribute/constant.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/attribute/constant.lux rename to stdlib/source/library/lux/compiler/target/jvm/attribute/constant.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/attribute/line_number_table.lux b/stdlib/source/library/lux/compiler/target/jvm/attribute/line_number_table.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/attribute/line_number_table.lux rename to stdlib/source/library/lux/compiler/target/jvm/attribute/line_number_table.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/bytecode.lux b/stdlib/source/library/lux/compiler/target/jvm/bytecode.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/bytecode.lux rename to stdlib/source/library/lux/compiler/target/jvm/bytecode.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/address.lux b/stdlib/source/library/lux/compiler/target/jvm/bytecode/address.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/address.lux rename to stdlib/source/library/lux/compiler/target/jvm/bytecode/address.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/environment.lux b/stdlib/source/library/lux/compiler/target/jvm/bytecode/environment.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/environment.lux rename to stdlib/source/library/lux/compiler/target/jvm/bytecode/environment.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/environment/limit.lux b/stdlib/source/library/lux/compiler/target/jvm/bytecode/environment/limit.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/environment/limit.lux rename to stdlib/source/library/lux/compiler/target/jvm/bytecode/environment/limit.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/environment/limit/datum.lux b/stdlib/source/library/lux/compiler/target/jvm/bytecode/environment/limit/datum.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/environment/limit/datum.lux rename to stdlib/source/library/lux/compiler/target/jvm/bytecode/environment/limit/datum.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/environment/limit/registry.lux b/stdlib/source/library/lux/compiler/target/jvm/bytecode/environment/limit/registry.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/environment/limit/registry.lux rename to stdlib/source/library/lux/compiler/target/jvm/bytecode/environment/limit/registry.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/environment/limit/stack.lux b/stdlib/source/library/lux/compiler/target/jvm/bytecode/environment/limit/stack.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/environment/limit/stack.lux rename to stdlib/source/library/lux/compiler/target/jvm/bytecode/environment/limit/stack.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/compiler/target/jvm/bytecode/instruction.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/instruction.lux rename to stdlib/source/library/lux/compiler/target/jvm/bytecode/instruction.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/jump.lux b/stdlib/source/library/lux/compiler/target/jvm/bytecode/jump.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/bytecode/jump.lux rename to stdlib/source/library/lux/compiler/target/jvm/bytecode/jump.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/class.lux b/stdlib/source/library/lux/compiler/target/jvm/class.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/class.lux rename to stdlib/source/library/lux/compiler/target/jvm/class.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/constant.lux b/stdlib/source/library/lux/compiler/target/jvm/constant.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/constant.lux rename to stdlib/source/library/lux/compiler/target/jvm/constant.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/constant/class.lux b/stdlib/source/library/lux/compiler/target/jvm/constant/class.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/constant/class.lux rename to stdlib/source/library/lux/compiler/target/jvm/constant/class.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/constant/double.lux b/stdlib/source/library/lux/compiler/target/jvm/constant/double.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/constant/double.lux rename to stdlib/source/library/lux/compiler/target/jvm/constant/double.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/constant/float.lux b/stdlib/source/library/lux/compiler/target/jvm/constant/float.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/constant/float.lux rename to stdlib/source/library/lux/compiler/target/jvm/constant/float.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/constant/integer.lux b/stdlib/source/library/lux/compiler/target/jvm/constant/integer.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/constant/integer.lux rename to stdlib/source/library/lux/compiler/target/jvm/constant/integer.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/constant/long.lux b/stdlib/source/library/lux/compiler/target/jvm/constant/long.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/constant/long.lux rename to stdlib/source/library/lux/compiler/target/jvm/constant/long.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/constant/name_and_type.lux b/stdlib/source/library/lux/compiler/target/jvm/constant/name_and_type.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/constant/name_and_type.lux rename to stdlib/source/library/lux/compiler/target/jvm/constant/name_and_type.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/constant/pool.lux b/stdlib/source/library/lux/compiler/target/jvm/constant/pool.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/constant/pool.lux rename to stdlib/source/library/lux/compiler/target/jvm/constant/pool.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/constant/reference.lux b/stdlib/source/library/lux/compiler/target/jvm/constant/reference.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/constant/reference.lux rename to stdlib/source/library/lux/compiler/target/jvm/constant/reference.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/constant/string.lux b/stdlib/source/library/lux/compiler/target/jvm/constant/string.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/constant/string.lux rename to stdlib/source/library/lux/compiler/target/jvm/constant/string.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/constant/tag.lux b/stdlib/source/library/lux/compiler/target/jvm/constant/tag.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/constant/tag.lux rename to stdlib/source/library/lux/compiler/target/jvm/constant/tag.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/constant/utf8.lux b/stdlib/source/library/lux/compiler/target/jvm/constant/utf8.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/constant/utf8.lux rename to stdlib/source/library/lux/compiler/target/jvm/constant/utf8.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/encoding/name/external.lux b/stdlib/source/library/lux/compiler/target/jvm/encoding/name/external.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/encoding/name/external.lux rename to stdlib/source/library/lux/compiler/target/jvm/encoding/name/external.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/encoding/name/internal.lux b/stdlib/source/library/lux/compiler/target/jvm/encoding/name/internal.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/encoding/name/internal.lux rename to stdlib/source/library/lux/compiler/target/jvm/encoding/name/internal.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/encoding/signed.lux b/stdlib/source/library/lux/compiler/target/jvm/encoding/signed.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/encoding/signed.lux rename to stdlib/source/library/lux/compiler/target/jvm/encoding/signed.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/encoding/unsigned.lux b/stdlib/source/library/lux/compiler/target/jvm/encoding/unsigned.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/encoding/unsigned.lux rename to stdlib/source/library/lux/compiler/target/jvm/encoding/unsigned.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/field.lux b/stdlib/source/library/lux/compiler/target/jvm/field.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/field.lux rename to stdlib/source/library/lux/compiler/target/jvm/field.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/index.lux b/stdlib/source/library/lux/compiler/target/jvm/index.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/index.lux rename to stdlib/source/library/lux/compiler/target/jvm/index.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/loader.lux b/stdlib/source/library/lux/compiler/target/jvm/loader.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/loader.lux rename to stdlib/source/library/lux/compiler/target/jvm/loader.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/magic.lux b/stdlib/source/library/lux/compiler/target/jvm/magic.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/magic.lux rename to stdlib/source/library/lux/compiler/target/jvm/magic.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/method.lux b/stdlib/source/library/lux/compiler/target/jvm/method.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/method.lux rename to stdlib/source/library/lux/compiler/target/jvm/method.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/modifier.lux b/stdlib/source/library/lux/compiler/target/jvm/modifier.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/modifier.lux rename to stdlib/source/library/lux/compiler/target/jvm/modifier.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/modifier/inner.lux b/stdlib/source/library/lux/compiler/target/jvm/modifier/inner.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/modifier/inner.lux rename to stdlib/source/library/lux/compiler/target/jvm/modifier/inner.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/reflection.lux b/stdlib/source/library/lux/compiler/target/jvm/reflection.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/reflection.lux rename to stdlib/source/library/lux/compiler/target/jvm/reflection.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/type.lux b/stdlib/source/library/lux/compiler/target/jvm/type.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/type.lux rename to stdlib/source/library/lux/compiler/target/jvm/type.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/type/alias.lux b/stdlib/source/library/lux/compiler/target/jvm/type/alias.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/type/alias.lux rename to stdlib/source/library/lux/compiler/target/jvm/type/alias.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/type/box.lux b/stdlib/source/library/lux/compiler/target/jvm/type/box.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/type/box.lux rename to stdlib/source/library/lux/compiler/target/jvm/type/box.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/type/category.lux b/stdlib/source/library/lux/compiler/target/jvm/type/category.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/type/category.lux rename to stdlib/source/library/lux/compiler/target/jvm/type/category.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/type/descriptor.lux b/stdlib/source/library/lux/compiler/target/jvm/type/descriptor.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/type/descriptor.lux rename to stdlib/source/library/lux/compiler/target/jvm/type/descriptor.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/type/lux.lux b/stdlib/source/library/lux/compiler/target/jvm/type/lux.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/type/lux.lux rename to stdlib/source/library/lux/compiler/target/jvm/type/lux.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/type/projection.lux b/stdlib/source/library/lux/compiler/target/jvm/type/projection.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/type/projection.lux rename to stdlib/source/library/lux/compiler/target/jvm/type/projection.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/type/reflection.lux b/stdlib/source/library/lux/compiler/target/jvm/type/reflection.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/type/reflection.lux rename to stdlib/source/library/lux/compiler/target/jvm/type/reflection.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/type/signature.lux b/stdlib/source/library/lux/compiler/target/jvm/type/signature.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/type/signature.lux rename to stdlib/source/library/lux/compiler/target/jvm/type/signature.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/jvm/version.lux b/stdlib/source/library/lux/compiler/target/jvm/version.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/jvm/version.lux rename to stdlib/source/library/lux/compiler/target/jvm/version.lux diff --git a/stdlib/source/library/lux/meta/compiler/target/lua.lux b/stdlib/source/library/lux/compiler/target/lua.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/target/lua.lux rename to stdlib/source/library/lux/compiler/target/lua.lux index ee84154f88..9ef9b4ca36 100644 --- a/stdlib/source/library/lux/meta/compiler/target/lua.lux +++ b/stdlib/source/library/lux/compiler/target/lua.lux @@ -12,7 +12,7 @@ [control ["|" pipe]] [data - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" stack (.use "[1]#[0]" functor mix)]]] @@ -34,14 +34,14 @@ ... Added the carriage return for better Windows compatibility. (the \n+ Text - (text text.carriage_return text.new_line)) + (text text.carriage_return \n)) (the nested (-> Text Text) - (.let [nested_new_line (text text.new_line text.tab)] + (.let [nested_new_line (text \n text.tab)] (|>> (text \n+) - (text.replaced text.new_line nested_new_line)))) + (text.replaced \n nested_new_line)))) ... https://en.wikipedia.org/wiki/Delimiter (the input_delimiter ", ") @@ -146,7 +146,7 @@ [text.null "\0"] [text.back_space "\b"] [text.form_feed "\f"] - [text.new_line "\n"] + [\n "\n"] [text.carriage_return "\r"] [text.double_quote (text "\" text.double_quote)] )) diff --git a/stdlib/source/library/lux/meta/compiler/target/php.lux b/stdlib/source/library/lux/compiler/target/php.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/target/php.lux rename to stdlib/source/library/lux/compiler/target/php.lux index fe5ce7eff0..04ee33a4b9 100644 --- a/stdlib/source/library/lux/meta/compiler/target/php.lux +++ b/stdlib/source/library/lux/compiler/target/php.lux @@ -12,7 +12,7 @@ [control ["[0]" pipe]] [data - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" stack (.use "[1]#[0]" functor mix)]]] @@ -37,14 +37,14 @@ ... Added the carriage return for better Windows compatibility. (the \n+ Text - (text text.carriage_return text.new_line)) + (text text.carriage_return \n)) (the nested (-> Text Text) - (.let [nested_new_line (text text.new_line text.tab)] + (.let [nested_new_line (text \n text.tab)] (|>> (text \n+) - (text.replaced text.new_line nested_new_line)))) + (text.replaced \n nested_new_line)))) (the block (-> Text @@ -196,7 +196,7 @@ [text.null "\0"] [text.back_space "\b"] [text.form_feed "\f"] - [text.new_line "\n"] + [\n "\n"] [text.carriage_return "\r"] [text.double_quote (text "\" text.double_quote)] ["$" "\$"] diff --git a/stdlib/source/library/lux/meta/compiler/target/python.lux b/stdlib/source/library/lux/compiler/target/python.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/target/python.lux rename to stdlib/source/library/lux/compiler/target/python.lux index 073e99430c..eef07d43da 100644 --- a/stdlib/source/library/lux/meta/compiler/target/python.lux +++ b/stdlib/source/library/lux/compiler/target/python.lux @@ -12,7 +12,7 @@ [control ["[0]" pipe]] [data - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" stack (.use "[1]#[0]" functor mix)]]] @@ -42,14 +42,14 @@ ... Added the carriage return for better Windows compatibility. (the \n+ Text - (text text.carriage_return text.new_line)) + (text text.carriage_return \n)) (the nested (-> Text Text) - (.let [nested_new_line (text text.new_line text.tab)] + (.let [nested_new_line (text \n text.tab)] (|>> (text \n+) - (text.replaced text.new_line nested_new_line)))) + (text.replaced \n nested_new_line)))) (nominal.every .public (Code brand) Text @@ -171,7 +171,7 @@ [text.null "\0"] [text.back_space "\b"] [text.form_feed "\f"] - [text.new_line "\n"] + [\n "\n"] [text.carriage_return "\r"] [text.double_quote (text "\" text.double_quote)] )) diff --git a/stdlib/source/library/lux/meta/compiler/target/r.lux b/stdlib/source/library/lux/compiler/target/r.lux similarity index 98% rename from stdlib/source/library/lux/meta/compiler/target/r.lux rename to stdlib/source/library/lux/compiler/target/r.lux index 8c8f0363cb..8ae6830876 100644 --- a/stdlib/source/library/lux/meta/compiler/target/r.lux +++ b/stdlib/source/library/lux/compiler/target/r.lux @@ -10,7 +10,7 @@ ["[0]" maybe (.use "[1]#[0]" functor)]] ["[0]" function] [data - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" stack (.use "[1]#[0]" functor mix)]]] @@ -78,14 +78,14 @@ ... Added the carriage return for better Windows compatibility. (the \n+ Text - (text text.carriage_return text.new_line)) + (text text.carriage_return \n)) (the nested_new_line - (text text.new_line text.tab)) + (text \n text.tab)) (the nested (-> Text Text) - (|>> (text.replaced text.new_line ..nested_new_line) + (|>> (text.replaced \n ..nested_new_line) (text text.carriage_return ..nested_new_line))) (the (_block expression) @@ -152,7 +152,7 @@ [text.alarm "\a"] [text.back_space "\b"] [text.tab "\t"] - [text.new_line "\n"] + [\n "\n"] [text.carriage_return "\r"] [text.double_quote (text "\" text.double_quote)] )) diff --git a/stdlib/source/library/lux/meta/compiler/target/ruby.lux b/stdlib/source/library/lux/compiler/target/ruby.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/target/ruby.lux rename to stdlib/source/library/lux/compiler/target/ruby.lux diff --git a/stdlib/source/library/lux/meta/compiler/version.lux b/stdlib/source/library/lux/compiler/version.lux similarity index 100% rename from stdlib/source/library/lux/meta/compiler/version.lux rename to stdlib/source/library/lux/compiler/version.lux diff --git a/stdlib/source/library/lux/control/exception.lux b/stdlib/source/library/lux/control/exception.lux index 6c9cf6a3af..9104bdeb4f 100644 --- a/stdlib/source/library/lux/control/exception.lux +++ b/stdlib/source/library/lux/control/exception.lux @@ -11,7 +11,7 @@ ["[0]" maybe]] [data ["[0]" product] - ["[0]" text (.use "[1]#[0]" monoid)] + ["[0]" text (.only \n)] [collection ["[0]" stack (.use "[1]#[0]" functor mix)]]] [math @@ -116,7 +116,7 @@ (macro.with_names ['descriptor] (do meta.monad [[current_module _] module.current] - (let [descriptor (all text#composite "{" current_module "." name "}" text.new_line) + (let [descriptor (text "{" current_module "." name "}" \n) 'self (code.local name)] (in (stack (` (.the (, export_policy) (, 'self) @@ -139,7 +139,7 @@ (stack.repeated (n.+ (text.size header_delimiter) largest_header_size)) text.together - (text#composite text.new_line)) + (text \n)) on_entry (is (-> [Text Text] Text) (function (_ [header message]) (let [padding (|> " " @@ -147,15 +147,15 @@ largest_header_size)) text.together)] (|> message - (text.replaced text.new_line on_new_line) - (all text#composite padding header header_delimiter)))))] + (text.replaced \n on_new_line) + (text padding header header_delimiter)))))] (.when entries {.#Empty} "" {.#Top head tail} (stack#mix (function (_ post pre) - (all text#composite pre text.new_line (on_entry post))) + (text pre \n (on_entry post))) (on_entry head) tail)))) @@ -175,7 +175,7 @@ (.the delimiter Text - (let [gap (.text_composite# text.new_line text.new_line) + (let [gap (.text_composite# \n \n) horizontal_line (|> "-" (stack.repeated 64) text.together)] (.text_composite# gap horizontal_line diff --git a/stdlib/source/library/lux/control/region.lux b/stdlib/source/library/lux/control/region.lux index f2bccdb84e..3fc05b00bd 100644 --- a/stdlib/source/library/lux/control/region.lux +++ b/stdlib/source/library/lux/control/region.lux @@ -10,7 +10,7 @@ [control ["[0]" try (.only Try)]] [data - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" stack (.use "[1]#[0]" mix)]]]]] @@ -28,11 +28,10 @@ ... https://en.wikipedia.org/wiki/Delimiter (the delimiter Text - (text text.new_line - "-----------------------------------------" text.new_line - "-----------------------------------------" text.new_line - "-----------------------------------------" text.new_line - text.new_line)) + (text \n "-----------------------------------------" + \n "-----------------------------------------" + \n "-----------------------------------------" + \n \n)) (exception.the .public (clean_up_error [error output]) (for_any (_ a) (Exception [Text (Try a)])) diff --git a/stdlib/source/library/lux/data/collection/list.lux b/stdlib/source/library/lux/data/collection/list.lux new file mode 100644 index 0000000000..9fa796d7ca --- /dev/null +++ b/stdlib/source/library/lux/data/collection/list.lux @@ -0,0 +1,128 @@ +... This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +... If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/. + +(.using + [library + [lux (.except) + [abstract + [equivalence (.only Equivalence)] + [hash (.only Hash)] + [monoid (.only Monoid)] + [functor (.only Functor)] + [monad (.only Monad)]] + [algorithm + [mix (.only Mix)]] + [control + ["[0]" try (.only Try)]] + [function + [predicate (.only Predicate)]] + [data + [collection + ["[0]" stack (.use "[1]#[0]" functor)]]] + [math + [number + ["n" natural]]] + [type + [variance (.only)]]]] + [// + [array + ["/" \\unsafe]]]) + +(every .public (List of) + (/.Array of)) + +(the .public list + (let [natural (is (-> Natural + Code) + (|>> {.#Natural} + [(.in_module# .prelude provenance#dummy)]))] + (macro (_ elements lux) + {try.#Success [lux + (stack (` (|> (/.empty (, (natural (stack.size elements)))) + (,* (stack#each (function (_ [index value]) + (` (/.has! (, (natural index)) + (, value)))) + (stack.enumeration elements))))))]}))) + +(the .public size + (for_any (_ of) + (-> (List of) + Natural)) + (|>> /.size)) + +(the .public (equivalence //) + (for_any (_ of) + (-> (Equivalence of) + (Equivalence (List of)))) + (implementation + (the (= that this) + (/.= // that this)))) + +(the .public (hash //) + (for_any (_ of) + (-> (Hash of) + (Hash (List of)))) + (implementation + (the equivalence + (..equivalence (by // equivalence))) + + (the (hash it) + (/.mix (function (_ index member hash) + (n.+ (by // hash member) hash)) + 0 + it)))) + +(the .public empty + List + (/.empty 0)) + +(the .public monoid + (for_any (_ of) + (Monoid (List of))) + (implementation + (the identity ..empty) + + (the (composite left right) + (/.composite left right)))) + +(the .public mix + (Mix (for_any (_ of) + (List of))) + (implementation + (the (mix step init it) + (/.mix (function (_ index partial total) + (step partial total)) + init + it)))) + +(the .public functor + (Functor List) + (implementation + (the (each it input) + (/.each it input)))) + +(the .public monad + (Monad List) + (implementation + (the functor ..functor) + + (the in + (|>> ..list)) + + (the (conjoint it) + (/.mix (function (_ index right left) + (/.composite left right)) + ..empty + it)))) + +(the .public of_stack + (for_any (_ of) + (-> (Stack of) + (List of))) + (|>> /.of_stack)) + +(the .public (as_stack it) + (for_any (_ of) + (-> (List of) + (Stack of))) + (/.stack {.#None} it)) diff --git a/stdlib/source/library/lux/data/format/json.lux b/stdlib/source/library/lux/data/format/json.lux index 46511b6ca3..91a00f3e3d 100644 --- a/stdlib/source/library/lux/data/format/json.lux +++ b/stdlib/source/library/lux/data/format/json.lux @@ -21,7 +21,7 @@ [data ["[0]" bit] ["[0]" product] - ["[0]" text (.use "[1]#[0]" monoid) + ["[0]" text (.only \n) ["<[1]>" \\projection (.only Projection)] ["[0]" escape]] [collection @@ -169,10 +169,10 @@ {try.#Success value} failure - {try.#Failure (all text#composite "Missing field '" key "' on object.")}) + {try.#Failure (.text "Missing field '" key "' on object.")}) _ - {try.#Failure (all text#composite "Cannot get field '" key "' on a non-object.")})) + {try.#Failure (.text "Cannot get field '" key "' on a non-object.")})) (the .public (has key value json) (-> String JSON JSON @@ -182,7 +182,7 @@ {try.#Success {#Object (dictionary.has key value obj)}} _ - {try.#Failure (all text#composite "Cannot set field '" key "' on a non-object.")})) + {try.#Failure (.text "Cannot set field '" key "' on a non-object.")})) (template.with [ ] [(the .public ( key json) @@ -193,7 +193,7 @@ {try.#Success value} {try.#Success _} - {try.#Failure (all text#composite "Wrong value type at key: " key)} + {try.#Failure (.text "Wrong value type at key: " key)} {try.#Failure error} {try.#Failure error}))] @@ -312,11 +312,10 @@ (the (kv_as_text as_text [key value]) (-> (text.Injection JSON) (text.Injection [String JSON])) - (all text#composite - (..string_as_text key) - ..entry_delimiter - (as_text value) - )) + (.text (..string_as_text key) + ..entry_delimiter + (as_text value) + )) (the (object_as_text as_text) (-> (text.Injection JSON) @@ -393,8 +392,8 @@ [mark (.one_of "eE") signed?' (<>.parses? (.this "-")) offset (.many .decimal)] - (in (all text#composite mark (if signed?' "-" "") offset))))] - (when (decimal#of (all text#composite (if signed? "-" "") digits "." decimals exp)) + (in (.text mark (if signed?' "-" "") offset))))] + (when (decimal#of (.text (if signed? "-" "") digits "." decimals exp)) {try.#Success value} (in value) @@ -410,10 +409,10 @@ ["\t" text.tab] ["\b" text.back_space] - ["\n" text.new_line] + ["\n" \n] ["\r" text.carriage_return] ["\f" text.form_feed] - [(text#composite "\" text.double_quote) text.double_quote] + [(.text "\" text.double_quote) text.double_quote] ["\\" "\"] )) (<>.after (.this "\u") @@ -429,13 +428,13 @@ (<| (.enclosed [text.double_quote text.double_quote]) (loop (again [_ []])) (do [! <>.monad] - [characters (.some (.none_of (text#composite "\" text.double_quote))) + [characters (.some (.none_of (.text "\" text.double_quote))) stop .next]) (if (text.= "\" stop) (do ! [escaped ..escaped_string_of next_characters (again [])] - (in (all text#composite characters escaped next_characters))) + (in (.text characters escaped next_characters))) (in characters)))) (the (kv_of json_of) diff --git a/stdlib/source/library/lux/data/format/markdown.lux b/stdlib/source/library/lux/data/format/markdown.lux index 3bd1892a0c..1729d66d37 100644 --- a/stdlib/source/library/lux/data/format/markdown.lux +++ b/stdlib/source/library/lux/data/format/markdown.lux @@ -5,7 +5,7 @@ [library [lux (.except and quote text) [data - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" stack (.use "[1]#[0]" functor)]]] @@ -53,7 +53,7 @@ (|>> ..safe nominal.abstraction)) (the blank_line - (.text text.new_line text.new_line)) + (.text \n \n)) (template.with [ ] [(the .public ( content) @@ -81,7 +81,7 @@ (the .public break (Markdown Span) - (nominal.abstraction (.text " " text.new_line))) + (nominal.abstraction (.text " " \n))) (template.with [ ] [(the .public @@ -99,12 +99,12 @@ (-> Text (-> Text Text)) - (|>> (text.all_split_by text.new_line) + (|>> (text.all_split_by \n) (stack#each (function (_ line) (if (text.empty? line) line (.text with line)))) - (text.interposed text.new_line))) + (text.interposed \n))) (the indent (-> Text @@ -129,12 +129,12 @@ (|> detail nominal.representation ..indent - (text.enclosed [text.new_line text.new_line]) - (.text text.new_line)) + (text.enclosed [\n \n]) + (.text \n)) {.#None} "")))) - (text.interposed text.new_line) + (text.interposed \n) ..block)) (the .public bullet_list @@ -147,12 +147,12 @@ (|> detail nominal.representation ..indent - (text.enclosed [text.new_line text.new_line]) - (.text text.new_line)) + (text.enclosed [\n \n]) + (.text \n)) {.#None} "")))) - (text.interposed text.new_line) + (text.interposed \n) ..block)) ... A snippet of code. @@ -165,16 +165,16 @@ (the .public generic_code (-> Text (Markdown Block)) - (let [open (.text "```" text.new_line) - close (.text text.new_line "```")] + (let [open (.text "```" \n) + close (.text \n "```")] (|>> (text.enclosed [open close]) ..block))) ... A block of code of a specific language. (the .public (code language block) (-> Text Text (Markdown Block)) - (let [open (.text "```" language text.new_line) - close (.text text.new_line "```")] + (let [open (.text "```" language \n) + close (.text \n "```")] (|> block (text.enclosed [open close]) ..block))) diff --git a/stdlib/source/library/lux/data/format/xml.lux b/stdlib/source/library/lux/data/format/xml.lux index 4a97b6b6bc..af526b94c0 100644 --- a/stdlib/source/library/lux/data/format/xml.lux +++ b/stdlib/source/library/lux/data/format/xml.lux @@ -11,7 +11,7 @@ ["<>" projection (.use "[1]#[0]" monad)]] [data ["[0]" product] - ["[0]" text (.only \n) (.use "[1]#[0]" monoid) + ["[0]" text (.only \n) ["<[1]>" \\projection (.only Projection Slice)]] [collection ["[0]" stack (.use "[1]#[0]" functor)] @@ -80,7 +80,7 @@ (the xml_character^ (Projection Text) - (<>.either (.none_of (all text#composite "<>&" text.double_quote)) + (<>.either (.none_of (.text "<>&" text.double_quote)) xml_escape_character^)) (the xml_identifier @@ -136,9 +136,9 @@ ..spaced^ (<>.after (.this "/")) (.enclosed ["<" ">"]))] - (<>.assertion (all text#composite "Close tag does not match open tag." \n - "Expected: " (name#as expected) \n - " Actual: " (name#as actual) \n) + (<>.assertion (.text "Close tag does not match open tag." \n + "Expected: " (name#as expected) \n + " Actual: " (name#as actual) \n) (name.= expected actual)))) (the comment^ @@ -219,7 +219,7 @@ (-> Tag Text) (when namespace "" name - _ (all text#composite namespace ..namespace_delimiter name))) + _ (.text namespace ..namespace_delimiter name))) (the .public attribute (-> Attribute Text) @@ -229,12 +229,11 @@ Text (let [quote (is (-> Text Text) (function (_ value) - (all text#composite text.double_quote value text.double_quote)))] - (all text#composite - ""))) + (.text text.double_quote value text.double_quote)))] + (.text ""))) (the .public as_text (text.Injection XML) @@ -243,40 +242,38 @@ (|> attrs dictionary.entries (stack#each (function (_ [key value]) - (all text#composite (..attribute key) "=" text.double_quote (sanitize_value value) text.double_quote))) + (.text (..attribute key) "=" text.double_quote (sanitize_value value) text.double_quote))) (text.interposed " "))))] (function (_ input) - (all text#composite - ..xml_header text.new_line - (loop (again [prefix "" - input input]) - (when input - {#Text value} - (sanitize_value value) - - {#Node xml_tag xml_attrs (stack {#Text value})} - (let [tag (..tag xml_tag) - attrs (if (dictionary.empty? xml_attrs) - "" - (all text#composite " " (attributes xml_attrs)))] - (all text#composite - prefix "<" tag attrs ">" - (sanitize_value value) - "")) - - {#Node xml_tag xml_attrs xml_children} - (let [tag (..tag xml_tag) - attrs (if (dictionary.empty? xml_attrs) - "" - (all text#composite " " (attributes xml_attrs)))] - (if (stack.empty? xml_children) - (all text#composite prefix "<" tag attrs "/>") - (all text#composite prefix "<" tag attrs ">" - (|> xml_children - (stack#each (|>> (again (text#composite prefix text.tab)) (text#composite text.new_line))) - text.together) - text.new_line prefix ""))))) - )))) + (.text ..xml_header \n + (loop (again [prefix "" + input input]) + (when input + {#Text value} + (sanitize_value value) + + {#Node xml_tag xml_attrs (stack {#Text value})} + (let [tag (..tag xml_tag) + attrs (if (dictionary.empty? xml_attrs) + "" + (.text " " (attributes xml_attrs)))] + (.text prefix "<" tag attrs ">" + (sanitize_value value) + "")) + + {#Node xml_tag xml_attrs xml_children} + (let [tag (..tag xml_tag) + attrs (if (dictionary.empty? xml_attrs) + "" + (.text " " (attributes xml_attrs)))] + (if (stack.empty? xml_children) + (.text prefix "<" tag attrs "/>") + (.text prefix "<" tag attrs ">" + (|> xml_children + (stack#each (|>> (again (.text prefix text.tab)) (.text \n))) + text.together) + \n prefix ""))))) + )))) (the .public text (Format Text XML) diff --git a/stdlib/source/library/lux/debug.lux b/stdlib/source/library/lux/debug.lux index ea0b57478b..ebcb016ea2 100644 --- a/stdlib/source/library/lux/debug.lux +++ b/stdlib/source/library/lux/debug.lux @@ -17,7 +17,7 @@ ["[0]" function] [data ["[0]" bit] - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" array] @@ -42,12 +42,12 @@ ["[0]" binding (.only) ["[0]" local]] ["[0]" code (.only) - ["<[1]>" \\projection]] - [compiler - [language - [lux - [translation - ["[0]" script]]]]]]]]) + ["<[1]>" \\projection]]] + [compiler + [language + [lux + [translation + ["[0]" script]]]]]]]) (for .jvm (these (import java/lang/String @@ -643,7 +643,7 @@ (function.constant (exception.except ..unknown_local_binding [name])))) targets)))] (in (stack (` (..log! (.text_composite# - (, (code.text (.text (provenance.as_text provenance) text.new_line))) + (, (code.text (.text (provenance.as_text provenance) \n))) (exception.report (.stack (,* (|> targets (stack#each (function (_ [name injection]) diff --git a/stdlib/source/library/lux/documentation.lux b/stdlib/source/library/lux/documentation.lux index 8047f63f02..71e9df661d 100644 --- a/stdlib/source/library/lux/documentation.lux +++ b/stdlib/source/library/lux/documentation.lux @@ -43,15 +43,15 @@ [module ["[0]" import]] ["[0]" code (.only) - ["<[1]>" \\projection (.only Projection)]] - [compiler - [language - ["[0]" lux - ["[1]/[0]" syntax]]] - [meta - [archive - [module - ["[0]" descriptor]]]]]]]]) + ["<[1]>" \\projection (.only Projection)]]] + [compiler + [language + ["[0]" lux + ["[1]/[0]" syntax]]] + [meta + [archive + [module + ["[0]" descriptor]]]]]]]) (the |recursion_dummy| (template.macro (_) diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux index 9f8b288ab2..236b2809e1 100644 --- a/stdlib/source/library/lux/ffi.jvm.lux +++ b/stdlib/source/library/lux/ffi.jvm.lux @@ -37,21 +37,21 @@ ["[0]" module] ["[0]" binding] ["[0]" code (.only) - ["?[1]" \\projection(.only Projection)]] - [compiler - [target - ["[0]" jvm - [encoding - [name - ["[0]" external] - ["[0]" internal]]] - ["[1]" type (.only Type Argument Typed) - ["[0]" category (.only Void Value Return Method Primitive Object Class Array Var Parameter Declaration)] - ["[0]" box] - ["[0]" descriptor] - ["[0]" signature] - ["[0]" reflection] - ["[0]" projection]]]]]]]]) + ["?[1]" \\projection(.only Projection)]]] + [compiler + [target + ["[0]" jvm + [encoding + [name + ["[0]" external] + ["[0]" internal]]] + ["[1]" type (.only Type Argument Typed) + ["[0]" category (.only Void Value Return Method Primitive Object Class Array Var Parameter Declaration)] + ["[0]" box] + ["[0]" descriptor] + ["[0]" signature] + ["[0]" reflection] + ["[0]" projection]]]]]]]) (the internal (-> external.Name Text) diff --git a/stdlib/source/library/lux/ffi.lux b/stdlib/source/library/lux/ffi.lux index 27cfd4de36..0c84fa789c 100644 --- a/stdlib/source/library/lux/ffi.lux +++ b/stdlib/source/library/lux/ffi.lux @@ -27,25 +27,25 @@ ["[0]" meta (.only) ["[0]" provenance] ["[0]" code (.only) - ["<[1]>" \\projection (.only Projection)]] - [compiler - [target - ["[0]" js] - ["[0]" python]] - [arity (.only Arity)] - [reference (.only Reference) - [register (.only Register)]] - [language - [lux - ["[0]" analysis - ["[1]/[0]" simple] - [complex (.only Complex)] - [pattern (.only Pattern)]] - ["[0]" synthesis - ["[1]/[0]" simple] - [access (.only Access) - [side (.only Side)] - ["[1]/[0]" member]]]]]]]]]) + ["<[1]>" \\projection (.only Projection)]]] + [compiler + [target + ["[0]" js] + ["[0]" python]] + [arity (.only Arity)] + [reference (.only Reference) + [register (.only Register)]] + [language + [lux + ["[0]" analysis + ["[1]/[0]" simple] + [complex (.only Complex)] + [pattern (.only Pattern)]] + ["[0]" synthesis + ["[1]/[0]" simple] + [access (.only Access) + [side (.only Side)] + ["[1]/[0]" member]]]]]]]]) (for .js (these (every (Analysis_Branch of) [Pattern of]) diff --git a/stdlib/source/library/lux/function/polymorphism/aspect.lux b/stdlib/source/library/lux/function/polymorphism/aspect.lux index 23d4b09d8e..61f3e93c98 100644 --- a/stdlib/source/library/lux/function/polymorphism/aspect.lux +++ b/stdlib/source/library/lux/function/polymorphism/aspect.lux @@ -30,15 +30,15 @@ ["[0]" module] ["[0]" name] ["[0]" code (.only) - ["?[1]" \\projection]] - [compiler - [language - [lux - ["[0]" phase] - ["[0]" declaration] - ["[0]" analysis (.only) - ["[0]A" module] - ["[0]" type]]]]]]]] + ["?[1]" \\projection]]] + [compiler + [language + [lux + ["[0]" phase] + ["[0]" declaration] + ["[0]" analysis (.only) + ["[0]A" module] + ["[0]" type]]]]]]] ["[0]" /// (.only) [predicate (.only Predicate)]]) diff --git a/stdlib/source/library/lux/macro.lux b/stdlib/source/library/lux/macro.lux index 807bc432ba..c0ff0345e9 100644 --- a/stdlib/source/library/lux/macro.lux +++ b/stdlib/source/library/lux/macro.lux @@ -7,7 +7,7 @@ [abstract ["[0]" monad (.only do)]] [data - ["[0]" text (.use "[1]#[0]" monoid)] + ["[0]" text] [collection ["[0]" stack (.use "[1]#[0]" monad)]]] [math @@ -26,7 +26,7 @@ [id meta.seed] (in (|> id (by natural.base_10 as) - (all text#composite "__gensym__" prefix) + (text "__gensym__" prefix) [""] code.name)))) (the (local ast) @@ -37,7 +37,7 @@ (by meta.monad in name) _ - (meta.failure (text#composite "Code is not a local name: " (code.absolute ast))))) + (meta.failure (text "Code is not a local name: " (code.absolute ast))))) (the .public with_names (.macro (_ tokens) diff --git a/stdlib/source/library/lux/macro/expansion.lux b/stdlib/source/library/lux/macro/expansion.lux index 549fabc07b..4daa5fd049 100644 --- a/stdlib/source/library/lux/macro/expansion.lux +++ b/stdlib/source/library/lux/macro/expansion.lux @@ -133,13 +133,12 @@ (do meta.monad [provenance meta.provenance output ( token) - .let [_ (.log!# (all text#composite - (name#as macro_name) " " (provenance.as_text provenance) - (|> output - (stack#each (|>> code.absolute - (all text#composite text.\n text.\t))) - text.together) - text.\n))]] + .let [_ (.log!# (text (name#as macro_name) " " (provenance.as_text provenance) + (|> output + (stack#each (|>> code.absolute + (text text.\n text.\t))) + text.together) + text.\n))]] (in (if omit? (stack) output))) diff --git a/stdlib/source/library/lux/macro/syntax.lux b/stdlib/source/library/lux/macro/syntax.lux index 63d83b889c..efccf6381f 100644 --- a/stdlib/source/library/lux/macro/syntax.lux +++ b/stdlib/source/library/lux/macro/syntax.lux @@ -10,7 +10,7 @@ [control ["[0]" try]] [data - ["[0]" text (.use "[1]#[0]" monoid)] + ["[0]" text (.only \n)] [collection ["[0]" stack]]] ["[0]" meta (.only) @@ -27,9 +27,8 @@ (function (_ tokens) (when (projection tokens) {try.#Failure error} - {try.#Failure (all text#composite - "Failed to parse: " (code.absolute binding) text.new_line - error)} + {try.#Failure (text "Failed to parse: " (code.absolute binding) \n + error)} success success))) @@ -102,7 +101,7 @@ ((, 'body) (, 'state)) {try.#Failure (, 'error)} - {try.#Failure (text.interposed text.new_line (stack "Invalid syntax:" (, 'error)))}))))))) + {try.#Failure (text.interposed \n (stack "Invalid syntax:" (, 'error)))}))))))) {try.#Failure error} (meta.failure .wrong_syntax)))) diff --git a/stdlib/source/library/lux/math.lux b/stdlib/source/library/lux/math.lux index 894e342b2e..576167a603 100644 --- a/stdlib/source/library/lux/math.lux +++ b/stdlib/source/library/lux/math.lux @@ -23,15 +23,15 @@ [extension (.only analysis)] ["[0]" provenance] ["[0]" code - ["<[1]>" \\projection]] - [compiler - [language - [lux - ["[0]" phase (.use "[1]#[0]" monad)] - ["[0]" analysis (.only Operation Phase) - ["[0]A" type]]]] - [meta - [archive (.only Archive)]]]]]] + ["<[1]>" \\projection]]] + [compiler + [language + [lux + ["[0]" phase (.use "[1]#[0]" monad)] + ["[0]" analysis (.only Operation Phase) + ["[0]A" type]]]] + [meta + [archive (.only Archive)]]]]] [/ ["[0]" random] [number diff --git a/stdlib/source/library/lux/math/arithmetic/modular.lux b/stdlib/source/library/lux/math/arithmetic/modular.lux index dd5a2541d3..c3d46dd772 100644 --- a/stdlib/source/library/lux/math/arithmetic/modular.lux +++ b/stdlib/source/library/lux/math/arithmetic/modular.lux @@ -16,7 +16,7 @@ ["[0]" exception (.only Exception)]] [data ["[0]" product] - ["[0]" text (.use "[1]#[0]" monoid) + ["[0]" text (.only) ["<[1]>" \\projection (.only Projection)]]] [math [number @@ -80,10 +80,9 @@ (implementation (the (as modular) (let [[_ value] (nominal.representation modular)] - (all text#composite - (i#as value) - ..delimiter - (i#as (/.divisor expected))))) + (.text (i#as value) + ..delimiter + (i#as (/.divisor expected))))) (the of (.value diff --git a/stdlib/source/library/lux/math/number/fraction.lux b/stdlib/source/library/lux/math/number/fraction.lux index b567c76b4d..5e5201e744 100644 --- a/stdlib/source/library/lux/math/number/fraction.lux +++ b/stdlib/source/library/lux/math/number/fraction.lux @@ -18,7 +18,7 @@ [function [predicate (.only Predicate)]] [data - ["[0]" text (.use "[1]#[0]" monoid)]] + ["[0]" text]] [macro ["[0]" syntax] ["[0]" template]] @@ -205,10 +205,9 @@ (the .public (as_text (open "/[0]")) (text.Injection It) - (all text#composite - (//#as /#numerator) - ..delimiter - (//#as /#denominator))) + (.text (//#as /#numerator) + ..delimiter + (//#as /#denominator))) (the .public text (Format Text It) @@ -225,7 +224,7 @@ #denominator denominator]))) {.#None} - {.#Left (text#composite "Invalid syntax for fraction: " input)})))) + {.#Left (.text "Invalid syntax for fraction: " input)})))) (template.with [,name ] [(the .public (,name left right) diff --git a/stdlib/source/library/lux/math/number/rational.lux b/stdlib/source/library/lux/math/number/rational.lux index cb963143ba..23a1931fe9 100644 --- a/stdlib/source/library/lux/math/number/rational.lux +++ b/stdlib/source/library/lux/math/number/rational.lux @@ -19,7 +19,7 @@ [predicate (.only Predicate)]] [data ["[0]" product] - ["[0]" text (.use "[1]#[0]" monoid)]] + ["[0]" text]] [macro ["[0]" syntax] ["[0]" template]] @@ -217,10 +217,9 @@ (the .public (as_text (open "/[0]")) (text.Injection It) - (all text#composite - (//#as /#numerator) - ..delimiter - (natural#as /#denominator))) + (.text (//#as /#numerator) + ..delimiter + (natural#as /#denominator))) (the .public text (Format Text It) @@ -237,7 +236,7 @@ #denominator denominator]))) {.#None} - {try.#Failure (text#composite "Invalid syntax for rational: " input)})))) + {try.#Failure (.text "Invalid syntax for rational: " input)})))) (template.with [,name ] [(the .public (,name left right) diff --git a/stdlib/source/library/lux/math/random.lux b/stdlib/source/library/lux/math/random.lux index e1e01ae8ed..757592033a 100644 --- a/stdlib/source/library/lux/math/random.lux +++ b/stdlib/source/library/lux/math/random.lux @@ -14,7 +14,7 @@ ["[0]" state (.only State)] ["[0]" try (.only Try)]] [data - ["[0]" text (.use "[1]#[0]" monoid) + ["[0]" text (.only) [character (.only Character)] ["[0]" unicode ["[1]" set]]] @@ -149,7 +149,7 @@ (do ..monad [x character_gen xs (text character_gen (-- size))] - (in (text#composite (text.of_character x) xs))))) + (in (.text (text.of_character x) xs))))) (template.with [ ] [(the .public diff --git a/stdlib/source/library/lux/meta/binding.lux b/stdlib/source/library/lux/meta/binding.lux index 36b0e24296..abcb0b82d2 100644 --- a/stdlib/source/library/lux/meta/binding.lux +++ b/stdlib/source/library/lux/meta/binding.lux @@ -11,7 +11,7 @@ ["[0]" try (.only Try)]] [data ["[0]" product] - ["[0]" text (.use "[1]#[0]" monoid order)] + ["[0]" text (.only \n) (.use "[1]#[0]" order)] [collection ["[0]" stack (.use "[1]#[0]" functor) ["[0]" property]]]] @@ -85,7 +85,7 @@ ... https://en.wikipedia.org/wiki/Delimiter (the listing_delimiter Text - (all text#composite text.new_line " ")) + (text \n " ")) (the module_listing (-> (Stack module.Name) @@ -117,46 +117,44 @@ (its .#modules) (stack#each product.left) ..module_listing)] - {try.#Failure (all text#composite - " All known modules: " all_known_modules text.new_line - (when (property.value current_module (its .#modules lux)) - {try.#Success this_module} - (let [candidates (|> lux - (its .#modules) - (stack#each (function (_ [module_name module]) - (|> module - (its .#definitions) - (stack.all (function (_ [def_name [exported? global]]) - (`` (when global - { _} - (if (.and exported? - (text.= normal_proper def_name)) - {.#Some (name#as [module_name def_name])} - {.#None}) - - _ - {.#None}))))))) - stack.together - (stack.sorted text#<) - (text.interposed ..listing_delimiter)) - imports (|> this_module - (its .#imports) - ..module_listing) - aliases (|> this_module - (its .#module_aliases) - (stack#each (function (_ [alias real]) (all text#composite alias " => " real))) - (stack.sorted text#<) - (text.interposed ..listing_delimiter))] - (all text#composite - " Aliases: " aliases text.new_line - " Imports: " imports text.new_line - " Candidates: " candidates text.new_line)) - - failure - "") - " Current module: " current_module text.new_line - "Unknown definition: " (name#as name) text.new_line - )})))))] + {try.#Failure (text " All known modules: " all_known_modules \n + (when (property.value current_module (its .#modules lux)) + {try.#Success this_module} + (let [candidates (|> lux + (its .#modules) + (stack#each (function (_ [module_name module]) + (|> module + (its .#definitions) + (stack.all (function (_ [def_name [exported? global]]) + (`` (when global + { _} + (if (.and exported? + (text.= normal_proper def_name)) + {.#Some (name#as [module_name def_name])} + {.#None}) + + _ + {.#None}))))))) + stack.together + (stack.sorted text#<) + (text.interposed ..listing_delimiter)) + imports (|> this_module + (its .#imports) + ..module_listing) + aliases (|> this_module + (its .#module_aliases) + (stack#each (function (_ [alias real]) (text alias " => " real))) + (stack.sorted text#<) + (text.interposed ..listing_delimiter))] + (text " Aliases: " aliases \n + " Imports: " imports \n + " Candidates: " candidates \n)) + + failure + "") + " Current module: " current_module \n + "Unknown definition: " (name#as name) \n + )})))))] [definition .#Definition] [default' .#Default] @@ -176,18 +174,17 @@ (if (.or exported? (text.= expected actual)) (in it) - (//.failure (all text#composite "Definition is not an export: " (name#as name)))) + (//.failure (text "Definition is not an export: " (name#as name)))) {.#Alias it} (if (.or exported? (text.= expected actual)) (export it) - (//.failure (all text#composite "Alias is not an export: " (name#as name)))) + (//.failure (text "Alias is not an export: " (name#as name)))) {.#Default _} - (//.failure (all text#composite - "Defaults are not considered exports: " - (name#as name)))))) + (//.failure (text "Defaults are not considered exports: " + (name#as name)))))) (the .public (default name) (-> Name @@ -197,14 +194,12 @@ [exported? definition] (..default' name)] (when definition {.#Definition _} - (//.failure (all text#composite - "Definitions are not considered defaults: " - (name#as name))) + (//.failure (text "Definitions are not considered defaults: " + (name#as name))) {.#Alias de_aliased} - (//.failure (all text#composite - "Aliases are not considered defaults: " - (name#as name))) + (//.failure (text "Aliases are not considered defaults: " + (name#as name))) {.#Default it} (if exported? @@ -214,7 +209,7 @@ [actual _] module.current] (if (text.= expected actual) (in it) - (//.failure (all text#composite "Default is not an export: " (name#as name))))))))) + (//.failure (text "Default is not an export: " (name#as name))))))))) (the .public (alias name) (-> Name @@ -242,9 +237,8 @@ (clean_type def_type) {.#Default _} - (//.failure (all text#composite - "Defaults are not considered definitions: " - (name#as name)))))) + (//.failure (text "Defaults are not considered definitions: " + (name#as name)))))) (the .public (type name) (-> Name @@ -273,10 +267,10 @@ (type_code .Type) (type_code def_type))) (in (as Type def_value)) - (//.failure (all text#composite "Definition is not a type: " (name#as name))))) + (//.failure (text "Definition is not a type: " (name#as name))))) {.#Default _} - (//.failure (all text#composite "Default is not a type: " (name#as name)))))) + (//.failure (text "Default is not a type: " (name#as name)))))) (the .public (globals module) (-> module.Name @@ -287,7 +281,7 @@ {try.#Success [lux (its .#definitions module)]} failure - {try.#Failure (all text#composite "Unknown module: " module)}))) + {try.#Failure (text "Unknown module: " module)}))) (the .public (definitions module) (-> module.Name diff --git a/stdlib/source/library/lux/meta/binding/local.lux b/stdlib/source/library/lux/meta/binding/local.lux index f593651c40..e22dbe81f0 100644 --- a/stdlib/source/library/lux/meta/binding/local.lux +++ b/stdlib/source/library/lux/meta/binding/local.lux @@ -11,7 +11,7 @@ ["[0]" try]] [data ["[0]" product] - ["[0]" text (.use "[1]#[0]" monoid)] + ["[0]" text] [collection ["[0]" stack (.use "[1]#[0]" functor)]]] [math @@ -92,7 +92,7 @@ ((clean_type type) lux) {.#None} - {try.#Failure (.all text#composite "Unknown variable: " name)})))) + {try.#Failure (text "Unknown variable: " name)})))) (the .public no_environment Error diff --git a/stdlib/source/library/lux/meta/code.lux b/stdlib/source/library/lux/meta/code.lux index 9cedf2b0bd..e65b4379fd 100644 --- a/stdlib/source/library/lux/meta/code.lux +++ b/stdlib/source/library/lux/meta/code.lux @@ -9,7 +9,7 @@ [data ["[0]" product] ["[0]" bit] - ["[0]" text (.use "[1]#[0]" monoid)] + ["[0]" text] [collection ["[0]" stack (.use "[1]#[0]" functor mix)]]] [math @@ -112,16 +112,15 @@ (,, (with_template' [ ] [[_ { members}] - (all text#composite - - (stack#mix (function (_ next prev) - (let [next (absolute next)] - (if (text.= "" prev) - next - (all text#composite prev " " next)))) - "" - members) - )] + (.text + (stack#mix (function (_ next prev) + (let [next (absolute next)] + (if (text.= "" prev) + next + (.text prev " " next)))) + "" + members) + )] [.#Form "(" ")"] [.#Variant "{" "}"] @@ -148,16 +147,15 @@ (,, (with_template' [ ] [[_ { members}] - (all text#composite - - (stack#mix (function (_ next prev) - (let [next (relative module next)] - (if (text.= "" prev) - next - (all text#composite prev " " next)))) - "" - members) - )] + (.text + (stack#mix (function (_ next prev) + (let [next (relative module next)] + (if (text.= "" prev) + next + (.text prev " " next)))) + "" + members) + )] ["(" ")" .#Form] ["{" "}" .#Variant] diff --git a/stdlib/source/library/lux/meta/extension.lux b/stdlib/source/library/lux/meta/extension.lux index cbf8c313d4..3855c9d869 100644 --- a/stdlib/source/library/lux/meta/extension.lux +++ b/stdlib/source/library/lux/meta/extension.lux @@ -16,40 +16,40 @@ ["[0]" template]] [meta ["[0]" code (.only) - ["" \\projection (.only Projection)]] - [compiler - [target - (.,, (.for .jvm - [jvm - ["_" bytecode (.only Bytecode)]] + ["" \\projection (.only Projection)]]] + [compiler + [target + (.,, (.for .jvm + [jvm + ["_" bytecode (.only Bytecode)]] - ... else - [/]))] - [language - [lux - ["[0]" phase] - ["[0]" analysis (.only) - ["" \\projection]] - ["[0]" synthesis (.only) - ["" \\projection]] - ["[0]" translation] - ["[0]" declaration] - [phase - [translation - (.,, (.for .jvm - ["[0]" jvm - ["[1]" runtime]] + ... else + [/]))] + [language + [lux + ["[0]" phase] + ["[0]" analysis (.only) + ["" \\projection]] + ["[0]" synthesis (.only) + ["" \\projection]] + ["[0]" translation] + ["[0]" declaration] + [phase + [translation + (.,, (.for .jvm + ["[0]" jvm + ["[1]" runtime]] - ... else - [/])) - ["[0]" js - ["[1]" runtime]] - ["[0]" lua - ["[1]" runtime]] - ["[0]" python - ["[1]" runtime]] - ["[0]" ruby - ["[1]" runtime]]]]]]]]]])) + ... else + [/])) + ["[0]" js + ["[1]" runtime]] + ["[0]" lua + ["[1]" runtime]] + ["[0]" python + ["[1]" runtime]] + ["[0]" ruby + ["[1]" runtime]]]]]]]]])) (template.with [ ] [(the .public diff --git a/stdlib/source/library/lux/meta/module.lux b/stdlib/source/library/lux/meta/module.lux index f8b155634e..a722c4e2fa 100644 --- a/stdlib/source/library/lux/meta/module.lux +++ b/stdlib/source/library/lux/meta/module.lux @@ -9,7 +9,7 @@ [control ["[0]" try]] [data - ["[0]" text (.use "[1]#[0]" monoid)] + ["[0]" text] [collection [stack ["[0]" property]]]]]] @@ -32,7 +32,7 @@ {try.#Success [lux module]} failure - {try.#Failure (.all text#composite "Unknown module: " name)}))) + {try.#Failure (text "Unknown module: " name)}))) (the .public no_current Error diff --git a/stdlib/source/library/lux/meta/name.lux b/stdlib/source/library/lux/meta/name.lux index a4d665e4c6..33c3eb62b6 100644 --- a/stdlib/source/library/lux/meta/name.lux +++ b/stdlib/source/library/lux/meta/name.lux @@ -10,7 +10,7 @@ [format (.only Format)] ["[0]" order (.only Order)]] [data - ["[0]" text (.use "[1]#[0]" monoid)] + ["[0]" text] ["[0]" product]]]]) (the with_template' (.in_module# .prelude .with_template)) @@ -63,7 +63,7 @@ proper _ - (all text#composite module ..delimiter proper))) + (text module ..delimiter proper))) (the (of input) (when (text.all_split_by ..delimiter input) @@ -74,7 +74,7 @@ {.#Right [module proper]} _ - {.#Left (text#composite "Invalid format for Name: " input)})))) + {.#Left (text "Invalid format for Name: " input)})))) (the .public (relative expected) (-> Text @@ -86,14 +86,13 @@ proper .prelude - (all text#composite ..delimiter proper) + (text ..delimiter proper) _ - (all text#composite - (if (text.= expected module) - ..delimiter - module) - ..delimiter proper))) + (text (if (text.= expected module) + ..delimiter + module) + ..delimiter proper))) (the (of input) (when (text.all_split_by ..delimiter input) @@ -110,7 +109,7 @@ {.#Right [expected proper]} _ - {.#Left (text#composite "Invalid format for Name: " input)})))) + {.#Left (text "Invalid format for Name: " input)})))) (the do (.in_module# .prelude .do)) diff --git a/stdlib/source/library/lux/meta/version.lux b/stdlib/source/library/lux/meta/version.lux index aacdf5bada..5a3caacf64 100644 --- a/stdlib/source/library/lux/meta/version.lux +++ b/stdlib/source/library/lux/meta/version.lux @@ -17,9 +17,9 @@ ["[0]" syntax]] ["[0]" meta (.only) ["[0]" code (.only) - ["<[1]>" \\projection]] - [compiler - [version (.only Version)]]]]]) + ["<[1]>" \\projection]]] + [compiler + [version (.only Version)]]]]) (the .public latest Version diff --git a/stdlib/source/library/lux/test/property.lux b/stdlib/source/library/lux/test/property.lux index 149dff8772..75fc280ba4 100644 --- a/stdlib/source/library/lux/test/property.lux +++ b/stdlib/source/library/lux/test/property.lux @@ -19,7 +19,7 @@ ["[0]" state]] [data ["[0]" product] - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" stack (.use "[1]#[0]" functor mix)] @@ -104,7 +104,7 @@ ... https://en.wikipedia.org/wiki/Delimiter (the delimiter - text.new_line) + \n) (the (times_failure seed documentation) (-> Seed Text @@ -224,9 +224,9 @@ post (future.soon instant.now) .let [duration (instant.span pre post) report (text documentation - text.new_line text.new_line + \n \n (..description duration tally) - text.new_line)] + \n)] _ (expansion.let [ (in {try.#Success (debug.log! report)})] (.for .js (when console.default {.#None} diff --git a/stdlib/source/library/lux/test/unit.lux b/stdlib/source/library/lux/test/unit.lux index f419c694ad..e7c23cc796 100644 --- a/stdlib/source/library/lux/test/unit.lux +++ b/stdlib/source/library/lux/test/unit.lux @@ -15,7 +15,7 @@ [color ["[0]" terminal]] [data - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" stack (.use "[1]#[0]" functor mix)] @@ -39,7 +39,7 @@ ... https://en.wikipedia.org/wiki/Delimiter (the delimiter - text.new_line) + \n) (the .public (and left right) (-> Test Test Test) diff --git a/stdlib/source/library/lux/time.lux b/stdlib/source/library/lux/time.lux index ea4deb0c6a..c979eb825f 100644 --- a/stdlib/source/library/lux/time.lux +++ b/stdlib/source/library/lux/time.lux @@ -16,7 +16,7 @@ ["[0]" try (.only Try)] ["[0]" exception (.only Exception)]] [data - ["[0]" text (.use "[1]#[0]" monoid) + ["[0]" text (.only) ["<[1]>" \\projection (.only Projection)]]] [math ["[0]" random (.only Random)] @@ -174,10 +174,10 @@ (the (millis_text millis) (-> Natural Text) (if (n.= 0 millis) "" - (n.< 10 millis) (all text#composite ".00" (n#as millis)) - (n.< 100 millis) (all text#composite ".0" (n#as millis)) + (n.< 10 millis) (.text ".00" (n#as millis)) + (n.< 100 millis) (.text ".0" (n#as millis)) ... (n.< 1,000 millis) - (all text#composite "." (n#as millis)))) + (.text "." (n#as millis)))) (every .public Clock (Record @@ -215,12 +215,11 @@ (text.Injection Time) (let [(open "_[0]") (..clock time) segment (by (n.padded 2 n.base_10) as)] - (all text#composite - (segment _#hour) - ..delimiter (segment _#minute) - ..delimiter (segment _#second) - (..millis_text _#milli_second) - ))) + (.text (segment _#hour) + ..delimiter (segment _#minute) + ..delimiter (segment _#second) + (..millis_text _#milli_second) + ))) (the .public text (Format Text Time) diff --git a/stdlib/source/library/lux/time/date.lux b/stdlib/source/library/lux/time/date.lux index bc81ad5108..420e17371e 100644 --- a/stdlib/source/library/lux/time/date.lux +++ b/stdlib/source/library/lux/time/date.lux @@ -16,7 +16,7 @@ ["[0]" try (.only Try)] ["[0]" exception (.only Exception)]] [data - ["[0]" text (.use "[1]#[0]" monoid) + ["[0]" text (.only) ["<[1]>" \\projection (.only Projection)]] [collection ["[0]" stack (.use "[1]#[0]" mix)] @@ -194,10 +194,9 @@ (the .public (as_text value) (text.Injection Date) (let [segment (by (n.padded 2 n.base_10) as)] - (all text#composite - (by year.text as (..year value)) - ..delimiter (segment (|> value ..month month.number)) - ..delimiter (segment (..day_of_month value))))) + (.text (by year.text as (..year value)) + ..delimiter (segment (|> value ..month month.number)) + ..delimiter (segment (..day_of_month value))))) (the .public text (Format Text Date) diff --git a/stdlib/source/library/lux/time/duration.lux b/stdlib/source/library/lux/time/duration.lux index 1d4fc6d5a5..3a8d987aaf 100644 --- a/stdlib/source/library/lux/time/duration.lux +++ b/stdlib/source/library/lux/time/duration.lux @@ -15,7 +15,7 @@ [control ["[0]" try]] [data - ["[0]" text (.use "[1]#[0]" monoid) + ["[0]" text (.only) ["<[1]>" \\projection (.only Projection)]]] [math ["[0]" random (.only Random)] @@ -152,10 +152,9 @@ (the .public (as_text duration) (if (by ..equivalence = ..empty duration) - (all text#composite - ..positive_sign - (natural#as 0) - ..milli_second_suffix) + (.text ..positive_sign + (natural#as 0) + ..milli_second_suffix) (let [signed? (negative? duration) [days time_left] [(ticks day duration) (framed day duration)] days (if signed? @@ -168,14 +167,13 @@ [minutes time_left] [(ticks minute time_left) (framed minute time_left)] [seconds time_left] [(ticks second time_left) (framed second time_left)] millis (..millis time_left)] - (all text#composite - (if signed? ..negative_sign ..positive_sign) - (if (i.= +0 days) "" (text#composite (natural#as (.natural days)) ..day_suffix)) - (if (i.= +0 hours) "" (text#composite (natural#as (.natural hours)) ..hour_suffix)) - (if (i.= +0 minutes) "" (text#composite (natural#as (.natural minutes)) ..minute_suffix)) - (if (i.= +0 seconds) "" (text#composite (natural#as (.natural seconds)) ..second_suffix)) - (if (i.= +0 millis) "" (text#composite (natural#as (.natural millis)) ..milli_second_suffix)) - )))) + (.text (if signed? ..negative_sign ..positive_sign) + (if (i.= +0 days) "" (.text (natural#as (.natural days)) ..day_suffix)) + (if (i.= +0 hours) "" (.text (natural#as (.natural hours)) ..hour_suffix)) + (if (i.= +0 minutes) "" (.text (natural#as (.natural minutes)) ..minute_suffix)) + (if (i.= +0 seconds) "" (.text (natural#as (.natural seconds)) ..second_suffix)) + (if (i.= +0 millis) "" (.text (natural#as (.natural millis)) ..milli_second_suffix)) + )))) (the .public of_text (Projection Duration) diff --git a/stdlib/source/library/lux/time/instant.lux b/stdlib/source/library/lux/time/instant.lux index a44028b3cd..ab68f5986d 100644 --- a/stdlib/source/library/lux/time/instant.lux +++ b/stdlib/source/library/lux/time/instant.lux @@ -17,7 +17,7 @@ ["[0]" maybe] ["[0]" try]] [data - ["[0]" text (.use "[1]#[0]" monoid) + ["[0]" text (.only) ["<[1]>" \\projection (.only Projection)]]] [math ["[0]" random (.only Random)] @@ -177,9 +177,8 @@ (text.Injection Instant) (let [[date time] (..date_time instant) time (..clock_time time)] - (all text#composite - (by date.text as date) ..date_suffix - (by //.text as time) ..time_suffix))) + (.text (by date.text as date) ..date_suffix + (by //.text as time) ..time_suffix))) (the .public of_text (Projection Instant) diff --git a/stdlib/source/library/lux/time/year.lux b/stdlib/source/library/lux/time/year.lux index ae57800824..ecaa38cc30 100644 --- a/stdlib/source/library/lux/time/year.lux +++ b/stdlib/source/library/lux/time/year.lux @@ -16,7 +16,7 @@ [function [predicate (.only Predicate)]] [data - ["[0]" text (.use "[1]#[0]" monoid) + ["[0]" text (.only) ["<[1]>" \\projection (.only Projection)]]] [math ["[0]" random (.only Random)] @@ -199,7 +199,7 @@ (do [! <>.monad] [sign (<>.or (.this "-") (in [])) digits (.many .decimal) - raw_year (<>.of i.base_10 (in (text#composite "+" digits)))] + raw_year (<>.of i.base_10 (in (.text "+" digits)))] (<>.of_try (..year (when sign {.#Left _} (i.* -1 raw_year) {.#Right _} raw_year))))) diff --git a/stdlib/source/library/lux/type.lux b/stdlib/source/library/lux/type.lux index f33cfbc7b2..7ac07e91de 100644 --- a/stdlib/source/library/lux/type.lux +++ b/stdlib/source/library/lux/type.lux @@ -16,7 +16,7 @@ ["[0]" predicate (.only Predicate)]] [data ["[0]" product] - ["[0]" text (.use "[1]#[0]" monoid)] + ["[0]" text (.only \n) (.use "[1]#[0]" monoid)] [collection ["[0]" array] ["[0]" stack (.use "[1]#[0]" monad monoid mix)]]] @@ -97,53 +97,52 @@ Text) (when type {.#Nominal name params} - (all text#composite - "(Nominal " - (text.enclosed' text.double_quote name) - (|> params - (stack#each (|>> (as_text' name_format) (text#composite " "))) - (stack#mix (function.flipped text#composite) "")) - ")") + (text "(Nominal " + (text.enclosed' text.double_quote name) + (|> params + (stack#each (|>> (as_text' name_format) (text " "))) + (stack#mix (function.flipped text#composite) "")) + ")") (,, (with_template' [ ] [{ _} - (all text#composite - (|> ( type) - (stack#each (as_text' name_format)) - stack.reversed - (stack.interposed " ") - (stack#mix text#composite "")) - )] + (text + (|> ( type) + (stack#each (as_text' name_format)) + stack.reversed + (stack.interposed " ") + (stack#mix text#composite "")) + )] [.#Sum "(Or " ")" flat_variant] [.#Product "[" "]" flat_tuple])) {.#Function input output} (.let [[ins out] (flat_function type)] - (all text#composite "(-> " - (|> ins - (stack#each (as_text' name_format)) - stack.reversed - (stack.interposed " ") - (stack#mix text#composite "")) - " " (as_text' name_format out) ")")) + (text "(-> " + (|> ins + (stack#each (as_text' name_format)) + stack.reversed + (stack.interposed " ") + (stack#mix text#composite "")) + " " (as_text' name_format out) ")")) {.#Parameter idx} (n#as idx) {.#Variable id} - (all text#composite "-" (n#as id)) + (text "-" (n#as id)) {.#Opaque id} - (all text#composite "+" (n#as id)) + (text "+" (n#as id)) {.#Reification param fun} (.let [[type_func type_args] (flat_application type)] - (all text#composite "(" (as_text' name_format type_func) " " (|> type_args (stack#each (as_text' name_format)) stack.reversed (stack.interposed " ") (stack#mix text#composite "")) ")")) + (text "(" (as_text' name_format type_func) " " (|> type_args (stack#each (as_text' name_format)) stack.reversed (stack.interposed " ") (stack#mix text#composite "")) ")")) (,, (with_template' [ ] [{ env body} - (all text#composite "(" " {" (|> env (stack#each (as_text' name_format)) (text.interposed " ")) "} " (as_text' name_format body) ")")] + (text "(" " {" (|> env (stack#each (as_text' name_format)) (text.interposed " ")) "} " (as_text' name_format body) ")")] [.#Universal "All"] [.#Existential "Ex"])) @@ -192,16 +191,14 @@ [.#Existential])) {.#Parameter idx} - (try.else (halt! (all text#composite - "Unknown type parameter" text.new_line - " Index: " (n#as idx) text.new_line - "Environment: " (|> env - stack.enumeration - (stack#each (.function (_ [index type]) - (all text#composite - (n#as index) - " " (..absolute_text type)))) - (text.interposed (text#composite text.new_line " "))))) + (try.else (halt! (text "Unknown type parameter" \n + " Index: " (n#as idx) \n + "Environment: " (|> env + stack.enumeration + (stack#each (.function (_ [index type]) + (text (n#as index) + " " (..absolute_text type)))) + (text.interposed (text \n " "))))) (stack.item idx env)) _ @@ -473,16 +470,14 @@ [provenance meta.provenance valueT (binding.type valueN) .let [[@ _ _] provenance - _ (.log!# (all text#composite - (by name.absolute as (name ..log!)) " " (provenance.as_text provenance) text.new_line - "Expression: " (when valueC - {.#Some valueC} - (code.absolute valueC) - - {.#None} - (by name.absolute as valueN)) - text.new_line - " Type: " (..relative_text @ valueT)))]] + _ (.log!# (text (by name.absolute as (name ..log!)) " " (provenance.as_text provenance) + \n "Expression: " (when valueC + {.#Some valueC} + (code.absolute valueC) + + {.#None} + (by name.absolute as valueN)) + \n " Type: " (..relative_text @ valueT)))]] (in (stack (code.name valueN)))) {.#Right valueC} diff --git a/stdlib/source/library/lux/type/record.lux b/stdlib/source/library/lux/type/record.lux index 52d60ee4da..d4e2349460 100644 --- a/stdlib/source/library/lux/type/record.lux +++ b/stdlib/source/library/lux/type/record.lux @@ -13,7 +13,7 @@ ["[0]" predicate (.only Predicate)]] [data ["[0]" product] - ["[0]" text (.use "[1]#[0]" monoid)] + ["[0]" text] [collection ["[0]" stack (.use "[1]#[0]" functor)]]] [math @@ -54,12 +54,12 @@ (in it) {.#None} - (meta.failure (all text#composite "Cannot apply type " - (//.relative_text here it) - " to parameters: " - (|> parameters - (stack#each (//.relative_text here)) - (text.interposed ", "))))) + (meta.failure (text "Cannot apply type " + (//.relative_text here it) + " to parameters: " + (|> parameters + (stack#each (//.relative_text here)) + (text.interposed ", "))))) it (when context {.#None} (in it) @@ -73,10 +73,10 @@ (in it) {try.#Failure _} - (meta.failure (all text#composite "Invalid label " - (by (name.relative here) as full_label) - " for type " - (//.relative_text here it)))))] + (meta.failure (text "Invalid label " + (by (name.relative here) as full_label) + " for type " + (//.relative_text here it)))))] (in (stack (//.code it)))))) (the as_type diff --git a/stdlib/source/library/lux/web/css.lux b/stdlib/source/library/lux/web/css.lux index 47270fd771..9eb540b26b 100644 --- a/stdlib/source/library/lux/web/css.lux +++ b/stdlib/source/library/lux/web/css.lux @@ -7,7 +7,7 @@ [control ["[0]" maybe]] [data - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection] ["[0]" encoding (.only Encoding)]] [collection @@ -97,7 +97,7 @@ ... https://en.wikipedia.org/wiki/Delimiter (the delimiter - text.new_line) + \n) (every .public Frame (Record diff --git a/stdlib/source/library/lux/web/html.lux b/stdlib/source/library/lux/web/html.lux index 564393f682..2a389a7939 100644 --- a/stdlib/source/library/lux/web/html.lux +++ b/stdlib/source/library/lux/web/html.lux @@ -20,10 +20,9 @@ ["[0]" template]] [type ["[0]" nominal]] - [meta - [compiler - [target - ["[0]" js]]]] + [compiler + [target + ["[0]" js]]] [world [net (.only URL)]]]] [/ diff --git a/stdlib/source/library/lux/world/console.lux b/stdlib/source/library/lux/world/console.lux index 7ad0286041..9170cdb4b1 100644 --- a/stdlib/source/library/lux/world/console.lux +++ b/stdlib/source/library/lux/world/console.lux @@ -16,7 +16,7 @@ ["[0]" exception] ["[0]" io (.only IO io) (.use "[1]#[0]" functor)]] [data - ["[0]" text (.only) + ["[0]" text (.only \n) [character (.only Character)] ["%" \\injection]]] [macro @@ -172,7 +172,7 @@ (the .public (write_line message console) (for_any (_ !) (-> Text (Console !) (! (Try Any)))) - (by console write (text message text.new_line))) + (by console write (text message \n))) (every .public (Memory s) (Interface diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux index aa571f9320..0fb3eb6b64 100644 --- a/stdlib/source/program/aedifex.lux +++ b/stdlib/source/program/aedifex.lux @@ -29,11 +29,6 @@ ["[0]" stack (.use "[1]#[0]" functor)]]] [macro ["[0]" template]] - [meta - [compiler - [language - [lux - ["[0]" syntax]]]]] [world ["[0]" shell (.only Exit Shell)] ["[0]" console (.only Console)] diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index 184c10108e..b15258f7d7 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -29,13 +29,13 @@ [macro ["[0]" template]] [meta - ["[0]" configuration] - [compiler - [meta - [cli - ["[0]" compiler]] - ["[0]" packager (.only) - ["[0]_[1]" ruby]]]]] + ["[0]" configuration]] + [compiler + [meta + [cli + ["[0]" compiler]] + ["[0]" packager (.only) + ["[0]_[1]" ruby]]]] [world ["[0]" environment (.only Environment)] ["[0]" file (.only Path)] diff --git a/stdlib/source/program/aedifex/command/deploy/release.lux b/stdlib/source/program/aedifex/command/deploy/release.lux index 8920f0c4ba..958620777f 100644 --- a/stdlib/source/program/aedifex/command/deploy/release.lux +++ b/stdlib/source/program/aedifex/command/deploy/release.lux @@ -29,14 +29,13 @@ ["[0]" xml]]] [macro ["[0]" template]] - [meta - [compiler - [meta - ["[0]" export] - ["[0]" archive] - ["[0]" context] - ["[0]" packager - ["[1]" jvm]]]]] + [compiler + [meta + ["[0]" export] + ["[0]" archive] + ["[0]" context] + ["[0]" packager + ["[1]" jvm]]]] [world ["[0]" environment [/ (.only Environment)] diff --git a/stdlib/source/program/aedifex/command/deploy/snapshot.lux b/stdlib/source/program/aedifex/command/deploy/snapshot.lux index 87489aed28..d967f9b284 100644 --- a/stdlib/source/program/aedifex/command/deploy/snapshot.lux +++ b/stdlib/source/program/aedifex/command/deploy/snapshot.lux @@ -21,10 +21,9 @@ [format ["[0]" tar] ["[0]" xml]]] - [meta - [compiler - [meta - ["[0]" export]]]] + [compiler + [meta + ["[0]" export]]] [world [console (.only Console)] ["[0]" file]]]] diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux index 0f7506c3e2..e88be439ac 100644 --- a/stdlib/source/program/aedifex/command/install.lux +++ b/stdlib/source/program/aedifex/command/install.lux @@ -23,10 +23,9 @@ [format ["[0]" tar] ["[0]" xml]]] - [meta - [compiler - [meta - ["[0]" export]]]] + [compiler + [meta + ["[0]" export]]] [world ["[0]" file] ["[0]" console (.only Console)]]]] diff --git a/stdlib/source/program/aedifex/command/version.lux b/stdlib/source/program/aedifex/command/version.lux index 269901a968..d74a78a364 100644 --- a/stdlib/source/program/aedifex/command/version.lux +++ b/stdlib/source/program/aedifex/command/version.lux @@ -9,9 +9,9 @@ [control [try (.only Try)]] ["[0]" meta - ["[1]/[0]" version] - [compiler - ["[0]" version]]] + ["[1]/[0]" version]] + [compiler + ["[0]" version]] [world ["[0]" console (.only Console)]]]] [/// diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 6ab6cd58e8..a851934987 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -20,7 +20,7 @@ ["[0]" predicate (.only Predicate)]] [data ["[0]" binary (.only Binary)] - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection] [encoding ["[0]" utf8]]] @@ -175,7 +175,7 @@ " " (///artifact.as_text artifact) " " " " (%.text (by repository description)) - text.new_line)))] + \n)))] ["?" announce_fetching "Fetching" "from"] ["O" announce_success "Found" "at"] diff --git a/stdlib/source/program/aedifex/injection.lux b/stdlib/source/program/aedifex/injection.lux index b5bb0c70a6..bdbefe1ae3 100644 --- a/stdlib/source/program/aedifex/injection.lux +++ b/stdlib/source/program/aedifex/injection.lux @@ -13,11 +13,11 @@ [macro ["[0]" template]] [meta - ["[0]" code] - [compiler - [meta - [cli - [compiler (.only Compiler)]]]]]]] + ["[0]" code]] + [compiler + [meta + [cli + [compiler (.only Compiler)]]]]]] ["[0]" // ["/" profile] ["[1][0]" runtime (.only Runtime)] diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux index 65da251971..17eab17243 100644 --- a/stdlib/source/program/aedifex/input.lux +++ b/stdlib/source/program/aedifex/input.lux @@ -22,11 +22,11 @@ [meta ["[0]" provenance] ["[0]" code (.only) - ["<[1]>" \\projection]] - [compiler - [language - [lux - ["[0]" syntax]]]]] + ["<[1]>" \\projection]]] + [compiler + [language + [lux + ["[0]" syntax]]]] [world ["[0]" file]]]] ["[0]" // diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux index 02130b546b..27fad47581 100644 --- a/stdlib/source/program/aedifex/profile.lux +++ b/stdlib/source/program/aedifex/profile.lux @@ -22,14 +22,14 @@ [macro ["[0]" template]] [meta - ["[0]" name] - [compiler - [meta - ["[0]" cli - ["[0]" compiler (.only Compiler)]] - [archive - [module - [descriptor (.only Module)]]]]]] + ["[0]" name]] + [compiler + [meta + ["[0]" cli + ["[0]" compiler (.only Compiler)]] + [archive + [module + [descriptor (.only Module)]]]]] [world [net (.only URL)] [file (.only Path)]]]] diff --git a/stdlib/source/program/aedifex/projection.lux b/stdlib/source/program/aedifex/projection.lux index 8c7d296fcc..c2e86921e3 100644 --- a/stdlib/source/program/aedifex/projection.lux +++ b/stdlib/source/program/aedifex/projection.lux @@ -18,11 +18,11 @@ ["[0]" property]]]] [meta ["[0]" code (.only) - ["<[1]>" \\projection (.only Projection)]] - [compiler - [meta - [cli - [compiler (.only Compiler)]]]]] + ["<[1]>" \\projection (.only Projection)]]] + [compiler + [meta + [cli + [compiler (.only Compiler)]]]] [world [net (.only URL)]]]] ["[0]" // diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux index 7fdcb8eb78..81d482a1c7 100644 --- a/stdlib/source/program/aedifex/repository/remote.lux +++ b/stdlib/source/program/aedifex/repository/remote.lux @@ -19,9 +19,9 @@ [macro ["[0]" template]] ["[0]" meta - ["[1]/[0]" version] - [compiler - ["[0]" version]]] + ["[1]/[0]" version]] + [compiler + ["[0]" version]] [world [net (.only URL) [uri (.only URI)] diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux index e8084d50fa..79e6ca70d4 100644 --- a/stdlib/source/program/compositor.lux +++ b/stdlib/source/program/compositor.lux @@ -18,7 +18,7 @@ [data [binary (.only Binary)] ["[0]" product] - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" dictionary (.only Dictionary)] @@ -30,38 +30,35 @@ [macro ["[0]" expansion] ["[0]" template]] - [meta - ["[0]" compiler - [default - ["[0]" platform (.only Platform)]] - [language - ["$" lux (.only) - ["[1]/[0]" program (.only Program)] - ["[0]" syntax] - ["[0]" translation] - ["[0]" declaration] - ["[0]" analysis (.only) - [macro (.only Expander)]] - ["[0]" phase (.only) - [extension (.only Extender) - ["[0]E" analysis] - ["[0]E" synthesis]]]]] - [meta - [packager (.only Packager)] - ["[0]" context (.only Context)] - ["[0]" cli (.only Service)] - ["[0]" import] - ["[0]" export] - ["[0]" cache (.only) - ["[1]/[0]" archive]] - [archive (.only Archive) - ["[0]" unit] - [module - [descriptor (.only Module)]]] - [io - ["ioW" archive]]]] - ... ["[0]" interpreter] - ] + ["[0]" compiler + [default + ["[0]" platform (.only Platform)]] + [language + ["$" lux (.only) + ["[1]/[0]" program (.only Program)] + ["[0]" syntax] + ["[0]" translation] + ["[0]" declaration] + ["[0]" analysis (.only) + [macro (.only Expander)]] + ["[0]" phase (.only) + [extension (.only Extender) + ["[0]E" analysis] + ["[0]E" synthesis]]]]] + [meta + [packager (.only Packager)] + ["[0]" context (.only Context)] + ["[0]" cli (.only Service)] + ["[0]" import] + ["[0]" export] + ["[0]" cache (.only) + ["[1]/[0]" archive]] + [archive (.only Archive) + ["[0]" unit] + [module + [descriptor (.only Module)]]] + [io + ["ioW" archive]]]] [time ["[0]" instant] ["[0]" duration]] @@ -79,9 +76,9 @@ [?output action] (when ?output {try.#Failure error} - (let [report (text text.new_line - failure_description text.new_line - error text.new_line)] + (let [report (text \n failure_description + \n error + \n)] (do ! [_ (expansion.let [ (in {try.#Success (debug.log! report)})] (for .js (is (Future (Try Any)) diff --git a/stdlib/source/projection/lux/meta/compiler/language/lux/analysis.lux b/stdlib/source/projection/lux/compiler/language/lux/analysis.lux similarity index 97% rename from stdlib/source/projection/lux/meta/compiler/language/lux/analysis.lux rename to stdlib/source/projection/lux/compiler/language/lux/analysis.lux index e47462b895..c4c90eaa62 100644 --- a/stdlib/source/projection/lux/meta/compiler/language/lux/analysis.lux +++ b/stdlib/source/projection/lux/compiler/language/lux/analysis.lux @@ -26,11 +26,11 @@ [macro ["[0]" template]] [meta - ["[0]" name] - [compiler - [arity (.only Arity)] - [reference (.only) - [variable (.only)]]]]]] + ["[0]" name]] + [compiler + [arity (.only Arity)] + [reference (.only) + [variable (.only)]]]]] ["/" \\library (.only Environment)]) (the (remaining_inputs asts) diff --git a/stdlib/source/projection/lux/meta/compiler/language/lux/synthesis.lux b/stdlib/source/projection/lux/compiler/language/lux/synthesis.lux similarity index 96% rename from stdlib/source/projection/lux/meta/compiler/language/lux/synthesis.lux rename to stdlib/source/projection/lux/compiler/language/lux/synthesis.lux index 4652644ea2..737241b257 100644 --- a/stdlib/source/projection/lux/meta/compiler/language/lux/synthesis.lux +++ b/stdlib/source/projection/lux/compiler/language/lux/synthesis.lux @@ -24,14 +24,14 @@ [macro ["[0]" template]] [meta - ["[0]" name] - [compiler - [arity (.only Arity)] - [reference - [register (.only Register)]] - [language - [lux - [analysis (.only Environment)]]]]]]] + ["[0]" name]] + [compiler + [arity (.only Arity)] + [reference + [register (.only Register)]] + [language + [lux + [analysis (.only Environment)]]]]]] [\\library ["[0]" / (.only Abstraction)]]) diff --git a/stdlib/source/projection/lux/meta/code.lux b/stdlib/source/projection/lux/meta/code.lux index 75db4d8668..715c56f419 100644 --- a/stdlib/source/projection/lux/meta/code.lux +++ b/stdlib/source/projection/lux/meta/code.lux @@ -11,7 +11,7 @@ ["[0]" try (.only Try)]] [data ["[0]" bit] - ["[0]" text (.use "[1]#[0]" monoid)] + ["[0]" text (.only \n)] [collection ["[0]" stack (.use "[1]#[0]" functor)]]] [math @@ -45,7 +45,7 @@ (-> (Stack Code) Text) (|>> (stack#each code.absolute) (text.interposed " ") - (all text#composite text.new_line "Remaining input: "))) + (.text \n "Remaining input: "))) (the .public empty Error @@ -73,7 +73,7 @@ {try.#Success [tokens next]}))) (with_template' [ ] - [(expansion.let [ (these {try.#Failure (all text#composite "Cannot parse " (remaining_inputs tokens))})] + [(expansion.let [ (these {try.#Failure (.text "Cannot parse " (remaining_inputs tokens))})] (these (the .public (Projection ) (function (_ tokens) @@ -112,13 +112,13 @@ {.#Top [token tokens']} (if (code.= code token) {try.#Success [tokens' []]} - {try.#Failure (all text#composite "Expected a " (code.absolute code) " but instead got " (code.absolute token) - (remaining_inputs tokens))}) + {try.#Failure (.text "Expected a " (code.absolute code) " but instead got " (code.absolute token) + (remaining_inputs tokens))}) _ {try.#Failure ..empty}))) -(expansion.let [ (these {try.#Failure (all text#composite "Cannot parse local name" (remaining_inputs tokens))})] +(expansion.let [ (these {try.#Failure (.text "Cannot parse local name" (remaining_inputs tokens))})] (these (the .public local (Projection Text) (function (_ tokens) @@ -141,7 +141,7 @@ _ ))))) -(expansion.let [ (these {try.#Failure (all text#composite "Cannot parse local name" (remaining_inputs tokens))})] +(expansion.let [ (these {try.#Failure (.text "Cannot parse local name" (remaining_inputs tokens))})] (these (the .public global (Projection Name) (function (_ tokens) @@ -179,10 +179,10 @@ {.#Top [[_ { members}] tokens']} (when (p members) {try.#Success [{.#Empty} x]} {try.#Success [tokens' x]} - _ {try.#Failure (all text#composite "Projection was expected to fully consume " (remaining_inputs tokens))}) + _ {try.#Failure (.text "Projection was expected to fully consume " (remaining_inputs tokens))}) _ - {try.#Failure (all text#composite "Cannot parse " (remaining_inputs tokens))})))] + {try.#Failure (.text "Cannot parse " (remaining_inputs tokens))})))] [form .#Form "form"] [variant .#Variant "variant"] @@ -194,14 +194,17 @@ (function (_ tokens) (when tokens {.#Empty} {try.#Success [tokens []]} - _ {try.#Failure (all text#composite "Expected list of tokens to be empty!" (remaining_inputs tokens))}))) + _ {try.#Failure (.text "Expected list of tokens to be empty!" (remaining_inputs tokens))}))) (the .public end? (Projection Bit) (function (_ tokens) {try.#Success [tokens (when tokens - {.#Empty} true - _ false)]})) + {.#Empty} + true + + _ + false)]})) (the .public (value projection inputs) (for_any (_ a) (-> (Projection a) (Stack Code) (Try a))) @@ -218,7 +221,7 @@ {try.#Failure (|> unconsumed (stack#each code.absolute) (text.interposed ", ") - (text#composite "Unconsumed inputs: "))}))) + (.text "Unconsumed inputs: "))}))) (the .public (locally inputs projection) (for_any (_ a) (-> (Stack Code) (Projection a) (Projection a))) @@ -236,5 +239,5 @@ it (//.or projection ..any)] (when it - {.#Left _} (//.failure (text#composite "Did NOT expect to parse code: " (code.absolute sample))) + {.#Left _} (//.failure (.text "Did NOT expect to parse code: " (code.absolute sample))) {.#Right output} (in output)))) diff --git a/stdlib/source/projection/lux/type.lux b/stdlib/source/projection/lux/type.lux index a41aecaded..ccb1ea95ba 100644 --- a/stdlib/source/projection/lux/type.lux +++ b/stdlib/source/projection/lux/type.lux @@ -12,7 +12,7 @@ ["[0]" exception (.only Exception)]] ["[0]" function] [data - ["[0]" text (.use "[1]#[0]" monoid) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" stack (.use "[1]#[0]" functor)] @@ -78,7 +78,7 @@ (Exception (Stack Type)) (exception.report (stack ["Types" (|> remaining - (stack#each (|>> /.as_text (text text.new_line "* "))) + (stack#each (|>> /.as_text (text \n "* "))) (text.interposed ""))]))) (every .public Env @@ -161,7 +161,7 @@ (the (label idx) (-> Natural Code) - (code.local (all text#composite "label" text.tab (n#as idx)))) + (code.local (text "label" text.tab (n#as idx)))) (the .public (with_extension type poly) (for_any (_ a) (-> Type (Projection a) (Projection [Code a]))) diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux index 905599c359..9c4d9c9d02 100644 --- a/stdlib/source/test/aedifex/command/deploy.lux +++ b/stdlib/source/test/aedifex/command/deploy.lux @@ -26,10 +26,9 @@ ["[0]" set]]] [math ["[0]" random]] - [meta - [compiler - [meta - ["[0]" export]]]] + [compiler + [meta + ["[0]" export]]] [world ["[0]" file] ["[0]" shell (.only Process Shell)] diff --git a/stdlib/source/test/aedifex/command/version.lux b/stdlib/source/test/aedifex/command/version.lux index fd82144045..027cac2d99 100644 --- a/stdlib/source/test/aedifex/command/version.lux +++ b/stdlib/source/test/aedifex/command/version.lux @@ -13,14 +13,14 @@ [concurrency ["[0]" future (.only Future)]] [data - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]]] [math ["[0]" random]] [meta - ["lux_[0]" version] - [compiler - ["[0]" version]]] + ["lux_[0]" version]] + [compiler + ["[0]" version]] [world ["[0]" console (.only Console Memory)]] [test @@ -48,7 +48,7 @@ (if open? (<| (try.of_maybe "") (do maybe.monad - [[output state] (text.split_by text.new_line state)] + [[output state] (text.split_by \n state)] (in [[open? state] output]))) (exception.except ..console_is_closed! []))) (the (on_write input [open? state]) diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux index 3bc4f1f0ad..ab32159b88 100644 --- a/stdlib/source/test/aedifex/profile.lux +++ b/stdlib/source/test/aedifex/profile.lux @@ -22,12 +22,11 @@ ["[0]" random (.only Random) (.use "[1]#[0]" monad)] [number ["n" natural]]] - [meta - [compiler - [meta - [cli - ["[0]" compiler (.only) - ["$[1]" \\test]]]]]] + [compiler + [meta + [cli + ["[0]" compiler (.only) + ["$[1]" \\test]]]]] [program ["cli" \\projection]] [test diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux index eb6cfe4235..f69f76bf08 100644 --- a/stdlib/source/test/lux.lux +++ b/stdlib/source/test/lux.lux @@ -76,6 +76,7 @@ ["[1][0]" type] ["[1][0]" macro] ["[1][0]" meta] + ["[1][0]" compiler] ["[1][0]" program] ["[1][0]" test] @@ -1416,6 +1417,7 @@ /type.test /macro.test /meta.test + /compiler.test /program.test /test.test diff --git a/stdlib/source/test/lux/meta/compiler.lux b/stdlib/source/test/lux/compiler.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler.lux rename to stdlib/source/test/lux/compiler.lux diff --git a/stdlib/source/test/lux/meta/compiler/arity.lux b/stdlib/source/test/lux/compiler/arity.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/arity.lux rename to stdlib/source/test/lux/compiler/arity.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux.lux b/stdlib/source/test/lux/compiler/language/lux.lux similarity index 96% rename from stdlib/source/test/lux/meta/compiler/language/lux.lux rename to stdlib/source/test/lux/compiler/language/lux.lux index d0248d17dc..c378a99cd7 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux.lux +++ b/stdlib/source/test/lux/compiler/language/lux.lux @@ -28,12 +28,12 @@ [meta ["[0]" version] ["[0]" name (.only) - ["[1]T" \\test]] - [compiler - [meta - [archive - ["[0]" key] - ["[0]" signature]]]]] + ["[1]T" \\test]]] + [compiler + [meta + [archive + ["[0]" key] + ["[0]" signature]]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/analysis.lux b/stdlib/source/test/lux/compiler/language/lux/analysis.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/analysis.lux rename to stdlib/source/test/lux/compiler/language/lux/analysis.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/analysis/complex.lux b/stdlib/source/test/lux/compiler/language/lux/analysis/complex.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/analysis/complex.lux rename to stdlib/source/test/lux/compiler/language/lux/analysis/complex.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/analysis/coverage.lux b/stdlib/source/test/lux/compiler/language/lux/analysis/coverage.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/analysis/coverage.lux rename to stdlib/source/test/lux/compiler/language/lux/analysis/coverage.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/analysis/inference.lux b/stdlib/source/test/lux/compiler/language/lux/analysis/inference.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/analysis/inference.lux rename to stdlib/source/test/lux/compiler/language/lux/analysis/inference.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/analysis/macro.lux b/stdlib/source/test/lux/compiler/language/lux/analysis/macro.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/analysis/macro.lux rename to stdlib/source/test/lux/compiler/language/lux/analysis/macro.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/analysis/module.lux b/stdlib/source/test/lux/compiler/language/lux/analysis/module.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/analysis/module.lux rename to stdlib/source/test/lux/compiler/language/lux/analysis/module.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/analysis/pattern.lux b/stdlib/source/test/lux/compiler/language/lux/analysis/pattern.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/analysis/pattern.lux rename to stdlib/source/test/lux/compiler/language/lux/analysis/pattern.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/analysis/scope.lux b/stdlib/source/test/lux/compiler/language/lux/analysis/scope.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/analysis/scope.lux rename to stdlib/source/test/lux/compiler/language/lux/analysis/scope.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/analysis/simple.lux b/stdlib/source/test/lux/compiler/language/lux/analysis/simple.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/analysis/simple.lux rename to stdlib/source/test/lux/compiler/language/lux/analysis/simple.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/analysis/type.lux b/stdlib/source/test/lux/compiler/language/lux/analysis/type.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/analysis/type.lux rename to stdlib/source/test/lux/compiler/language/lux/analysis/type.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase.lux b/stdlib/source/test/lux/compiler/language/lux/phase.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase.lux rename to stdlib/source/test/lux/compiler/language/lux/phase.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis.lux b/stdlib/source/test/lux/compiler/language/lux/phase/analysis.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/analysis.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/test/lux/compiler/language/lux/phase/analysis/complex.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/complex.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/analysis/complex.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/test/lux/compiler/language/lux/phase/analysis/function.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/function.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/analysis/function.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/reference.lux b/stdlib/source/test/lux/compiler/language/lux/phase/analysis/reference.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/reference.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/analysis/reference.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/simple.lux b/stdlib/source/test/lux/compiler/language/lux/phase/analysis/simple.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/simple.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/analysis/simple.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/when.lux b/stdlib/source/test/lux/compiler/language/lux/phase/analysis/when.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/when.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/analysis/when.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/extension.lux b/stdlib/source/test/lux/compiler/language/lux/phase/extension.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/extension.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/extension.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/test/lux/compiler/language/lux/phase/extension/analysis/lux.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/extension/analysis/lux.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/synthesis.lux b/stdlib/source/test/lux/compiler/language/lux/phase/synthesis.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/synthesis.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/synthesis.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/test/lux/compiler/language/lux/phase/synthesis/function.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/synthesis/function.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/synthesis/function.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/synthesis/loop.lux b/stdlib/source/test/lux/compiler/language/lux/phase/synthesis/loop.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/synthesis/loop.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/synthesis/loop.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/synthesis/primitive.lux b/stdlib/source/test/lux/compiler/language/lux/phase/synthesis/primitive.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/synthesis/primitive.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/synthesis/primitive.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/synthesis/structure.lux b/stdlib/source/test/lux/compiler/language/lux/phase/synthesis/structure.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/synthesis/structure.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/synthesis/structure.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/test/lux/compiler/language/lux/phase/synthesis/variable.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/synthesis/variable.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/synthesis/variable.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/synthesis/when.lux b/stdlib/source/test/lux/compiler/language/lux/phase/synthesis/when.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/synthesis/when.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/synthesis/when.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/complex.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/complex.lux similarity index 97% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/complex.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/complex.lux index 1104a22f0a..af82c6f516 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/complex.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/complex.lux @@ -19,13 +19,13 @@ [macro ["[0]" template]] [meta - ["[0]" provenance] - [compiler - [language - [lux - ["[0]" synthesis]]] - [meta - ["[0]" archive]]]] + ["[0]" provenance]] + [compiler + [language + [lux + ["[0]" synthesis]]] + [meta + ["[0]" archive]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function.lux similarity index 99% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function.lux index 12b49520a5..4add470d7a 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function.lux @@ -18,10 +18,9 @@ [number ["n" natural] ["[0]" i64]]] - [meta - [compiler - [meta - ["[0]" archive]]]] + [compiler + [meta + ["[0]" archive]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/abstract.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/abstract.lux similarity index 95% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/abstract.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/abstract.lux index 0b9c3b42c7..1e8f1b2264 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/abstract.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/abstract.lux @@ -14,15 +14,14 @@ ["[0]" random (.only Random)] [number ["n" natural]]] - [meta - [compiler - [target - [jvm - ["[0]" reflection] - ["[0]" type (.only) - ["[1]/[0]" reflection]]]] - [meta - ["[0]" archive]]]] + [compiler + [target + [jvm + ["[0]" reflection] + ["[0]" type (.only) + ["[1]/[0]" reflection]]]] + [meta + ["[0]" archive]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/constant/arity.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/field/constant/arity.lux similarity index 90% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/constant/arity.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/field/constant/arity.lux index e7e2479c67..ccd45f8cab 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/constant/arity.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/field/constant/arity.lux @@ -10,12 +10,11 @@ ["[0]" random (.only Random)] [number ["n" natural]]] - [meta - [compiler - [target - [jvm - [type - ["[0]" projection]]]]]] + [compiler + [target + [jvm + [type + ["[0]" projection]]]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/field/variable.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/field/variable.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/count.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/count.lux similarity index 97% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/count.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/count.lux index 9407ed4db2..79d3814f8e 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/count.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/count.lux @@ -18,14 +18,13 @@ ["[0]" random (.only Random)] [number ["n" natural]]] - [meta - [compiler - [target - [jvm - ["!" bytecode] - ["[0]" type]]] - [meta - ["[0]" archive]]]] + [compiler + [target + [jvm + ["!" bytecode] + ["[0]" type]]] + [meta + ["[0]" archive]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/foreign.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/foreign.lux similarity index 98% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/foreign.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/foreign.lux index 665643c5d8..ecc0415b30 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/foreign.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/foreign.lux @@ -13,10 +13,9 @@ ["[0]" random (.only Random)] [number ["[0]" i64]]] - [meta - [compiler - [meta - ["[0]" archive]]]] + [compiler + [meta + ["[0]" archive]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/partial.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/partial.lux similarity index 97% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/partial.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/partial.lux index e4f2145917..c5b455e626 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/field/variable/partial.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/field/variable/partial.lux @@ -13,10 +13,9 @@ ["[0]" random (.only Random)] [number ["[0]" i64]]] - [meta - [compiler - [meta - ["[0]" archive]]]] + [compiler + [meta + ["[0]" archive]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/method.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/method.lux similarity index 88% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/method.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/method.lux index 4f52c5571d..8cd628f78e 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/method.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/method.lux @@ -8,12 +8,11 @@ [monad (.only do)]] [math ["[0]" random (.only Random)]] - [meta - [compiler - [target - [jvm - ["[0]" modifier (.only Modifier)] - ["[0]" method (.only Method)]]]]] + [compiler + [target + [jvm + ["[0]" modifier (.only Modifier)] + ["[0]" method (.only Method)]]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/apply.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/method/apply.lux similarity index 97% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/apply.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/method/apply.lux index 02e037873a..6a130aa61d 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/apply.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/method/apply.lux @@ -13,10 +13,9 @@ ["[0]" random (.only Random)] [number ["[0]" i64]]] - [meta - [compiler - [meta - ["[0]" archive]]]] + [compiler + [meta + ["[0]" archive]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/implementation.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/method/implementation.lux similarity index 94% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/implementation.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/method/implementation.lux index 67f4905676..c2fed4bbb9 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/implementation.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/method/implementation.lux @@ -15,16 +15,15 @@ [number ["n" natural] ["[0]" i64]]] - [meta - [compiler - [target - [jvm - ["[0]" modifier (.only Modifier)] - ["[0]" method (.only Method)] - ["[0]" type] - ["!" bytecode]]] - [meta - ["[0]" archive]]]] + [compiler + [target + [jvm + ["[0]" modifier (.only Modifier)] + ["[0]" method (.only Method)] + ["[0]" type] + ["!" bytecode]]] + [meta + ["[0]" archive]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/init.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/method/init.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/init.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/method/init.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/reset.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/method/reset.lux similarity index 95% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/reset.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/method/reset.lux index cf50c5791f..3bf7a91259 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/function/method/reset.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/function/method/reset.lux @@ -15,16 +15,15 @@ [number ["n" natural] ["[0]" i64]]] - [meta - [compiler - [target - [jvm - ["[0]" modifier (.only Modifier)] - ["[0]" method (.only Method)] - ["[0]" type] - ["!" bytecode]]] - [meta - ["[0]" archive]]]] + [compiler + [target + [jvm + ["[0]" modifier (.only Modifier)] + ["[0]" method (.only Method)] + ["[0]" type] + ["!" bytecode]]] + [meta + ["[0]" archive]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/host.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/host.lux similarity index 97% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/host.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/host.lux index 1d373afaa1..6f428b27bd 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/host.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/host.lux @@ -14,11 +14,10 @@ ["[0]" text]] [math ["[0]" random (.only Random)]] - [meta - [compiler - [target - [jvm - ["[0]" bytecode]]]]] + [compiler + [target + [jvm + ["[0]" bytecode]]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/loop.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/loop.lux similarity index 98% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/loop.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/loop.lux index 293db04b79..6c818fde73 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/loop.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/loop.lux @@ -13,10 +13,9 @@ ["[0]" random (.only Random)] [number ["[0]" i64]]] - [meta - [compiler - [meta - ["[0]" archive]]]] + [compiler + [meta + ["[0]" archive]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/primitive.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/primitive.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/primitive.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/primitive.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/reference.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/reference.lux similarity index 98% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/reference.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/reference.lux index 072eed3045..fdf9942b1b 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/reference.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/reference.lux @@ -17,10 +17,9 @@ [number ["n" natural] ["[0]" i64]]] - [meta - [compiler - [meta - ["[0]" archive]]]] + [compiler + [meta + ["[0]" archive]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/runtime.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/runtime.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/runtime.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/runtime.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/type.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/type.lux similarity index 89% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/type.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/type.lux index f23aedeed0..521333b1c6 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/type.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/type.lux @@ -8,12 +8,11 @@ [monad (.only do)]] [math ["[0]" random (.only Random)]] - [meta - [compiler - [target - [jvm - ["[0]" type (.only Type) - [category (.only Primitive Array Class)]]]]]] + [compiler + [target + [jvm + ["[0]" type (.only Type) + [category (.only Primitive Array Class)]]]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/value.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/value.lux similarity index 96% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/value.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/value.lux index 9fd8e37910..e74cca79ad 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/value.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/value.lux @@ -19,12 +19,11 @@ ["[0]" decimal]]] [macro ["[0]" template]] - [meta - [compiler - [target - [jvm - ["//" bytecode] - ["[0]" type]]]]] + [compiler + [target + [jvm + ["//" bytecode] + ["[0]" type]]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/when.lux b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/when.lux similarity index 99% rename from stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/when.lux rename to stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/when.lux index 45797b123e..a76ce3ecb8 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/translation/jvm/when.lux +++ b/stdlib/source/test/lux/compiler/language/lux/phase/translation/jvm/when.lux @@ -17,10 +17,9 @@ [number ["n" natural] ["[0]" i64]]] - [meta - [compiler - [meta - ["[0]" archive]]]] + [compiler + [meta + ["[0]" archive]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/syntax.lux b/stdlib/source/test/lux/compiler/language/lux/syntax.lux similarity index 98% rename from stdlib/source/test/lux/meta/compiler/language/lux/syntax.lux rename to stdlib/source/test/lux/compiler/language/lux/syntax.lux index 30683d2725..b0af9b4865 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/syntax.lux +++ b/stdlib/source/test/lux/compiler/language/lux/syntax.lux @@ -7,7 +7,7 @@ [abstract [monad (.only do)]] [data - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]] [collection ["[0]" dictionary]]] @@ -214,7 +214,7 @@ (the comment_text^ (Random Text) - (let [character_gen (|> random.natural (random.only (|>> (n.= (`` (character (,, (static text.new_line))))) not)))] + (let [character_gen (|> random.natural (random.only (|>> (n.= (`` (character (,, (static \n))))) not)))] (do random.monad [size (|> random.natural (random#each (n.% 20)))] (random.text character_gen size)))) @@ -223,7 +223,7 @@ (Random Text) (do random.monad [comment comment_text^] - (in (text "... " comment text.new_line)))) + (in (text "... " comment \n)))) (the comments Test diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/synthesis.lux b/stdlib/source/test/lux/compiler/language/lux/synthesis.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/synthesis.lux rename to stdlib/source/test/lux/compiler/language/lux/synthesis.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/synthesis/access.lux b/stdlib/source/test/lux/compiler/language/lux/synthesis/access.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/synthesis/access.lux rename to stdlib/source/test/lux/compiler/language/lux/synthesis/access.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/synthesis/access/member.lux b/stdlib/source/test/lux/compiler/language/lux/synthesis/access/member.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/synthesis/access/member.lux rename to stdlib/source/test/lux/compiler/language/lux/synthesis/access/member.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/synthesis/access/side.lux b/stdlib/source/test/lux/compiler/language/lux/synthesis/access/side.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/synthesis/access/side.lux rename to stdlib/source/test/lux/compiler/language/lux/synthesis/access/side.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/synthesis/simple.lux b/stdlib/source/test/lux/compiler/language/lux/synthesis/simple.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/synthesis/simple.lux rename to stdlib/source/test/lux/compiler/language/lux/synthesis/simple.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/translation.lux b/stdlib/source/test/lux/compiler/language/lux/translation.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/translation.lux rename to stdlib/source/test/lux/compiler/language/lux/translation.lux diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/translation/script.lux b/stdlib/source/test/lux/compiler/language/lux/translation/script.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/language/lux/translation/script.lux rename to stdlib/source/test/lux/compiler/language/lux/translation/script.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta.lux b/stdlib/source/test/lux/compiler/meta.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta.lux rename to stdlib/source/test/lux/compiler/meta.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/archive.lux b/stdlib/source/test/lux/compiler/meta/archive.lux similarity index 99% rename from stdlib/source/test/lux/meta/compiler/meta/archive.lux rename to stdlib/source/test/lux/compiler/meta/archive.lux index b9a1853449..013f862540 100644 --- a/stdlib/source/test/lux/meta/compiler/meta/archive.lux +++ b/stdlib/source/test/lux/compiler/meta/archive.lux @@ -21,6 +21,9 @@ ["[0]" random (.only Random)] [number ["n" natural]]] + [meta + ["[0]" configuration + ["[1]T" \\test]]] [test ["_" property (.only Test)]]]] [\\library @@ -37,9 +40,7 @@ ["[1][0]" artifact] ["[1][0]" registry] ["[1][0]" module] - ["[1][0]" unit] - [//// - ["[1][0]" configuration]]]) + ["[1][0]" unit]]) (the .public (descriptor module hash) (-> /descriptor.Module Natural /descriptor.Descriptor) @@ -60,7 +61,7 @@ content/0 random.natural content/1 (random.only (|>> (n.= content/0) not) random.natural) hash random.natural - configuration ($/configuration.random 1) + configuration (configurationT.random 1) .let [key (/key.key signature content/0)]] (all _.and (_.coverage [/.has /.find] diff --git a/stdlib/source/test/lux/meta/compiler/meta/archive/artifact.lux b/stdlib/source/test/lux/compiler/meta/archive/artifact.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/archive/artifact.lux rename to stdlib/source/test/lux/compiler/meta/archive/artifact.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/archive/artifact/category.lux b/stdlib/source/test/lux/compiler/meta/archive/artifact/category.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/archive/artifact/category.lux rename to stdlib/source/test/lux/compiler/meta/archive/artifact/category.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/archive/artifact/definition.lux b/stdlib/source/test/lux/compiler/meta/archive/artifact/definition.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/archive/artifact/definition.lux rename to stdlib/source/test/lux/compiler/meta/archive/artifact/definition.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/archive/key.lux b/stdlib/source/test/lux/compiler/meta/archive/key.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/archive/key.lux rename to stdlib/source/test/lux/compiler/meta/archive/key.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/archive/module.lux b/stdlib/source/test/lux/compiler/meta/archive/module.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/archive/module.lux rename to stdlib/source/test/lux/compiler/meta/archive/module.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/archive/module/descriptor.lux b/stdlib/source/test/lux/compiler/meta/archive/module/descriptor.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/archive/module/descriptor.lux rename to stdlib/source/test/lux/compiler/meta/archive/module/descriptor.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/archive/module/document.lux b/stdlib/source/test/lux/compiler/meta/archive/module/document.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/archive/module/document.lux rename to stdlib/source/test/lux/compiler/meta/archive/module/document.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/archive/registry.lux b/stdlib/source/test/lux/compiler/meta/archive/registry.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/archive/registry.lux rename to stdlib/source/test/lux/compiler/meta/archive/registry.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/archive/signature.lux b/stdlib/source/test/lux/compiler/meta/archive/signature.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/archive/signature.lux rename to stdlib/source/test/lux/compiler/meta/archive/signature.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/archive/unit.lux b/stdlib/source/test/lux/compiler/meta/archive/unit.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/archive/unit.lux rename to stdlib/source/test/lux/compiler/meta/archive/unit.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/cache.lux b/stdlib/source/test/lux/compiler/meta/cache.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/cache.lux rename to stdlib/source/test/lux/compiler/meta/cache.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/cache/archive.lux b/stdlib/source/test/lux/compiler/meta/cache/archive.lux similarity index 96% rename from stdlib/source/test/lux/meta/compiler/meta/cache/archive.lux rename to stdlib/source/test/lux/compiler/meta/cache/archive.lux index a0ac3b9e42..4e65a1d005 100644 --- a/stdlib/source/test/lux/meta/compiler/meta/cache/archive.lux +++ b/stdlib/source/test/lux/compiler/meta/cache/archive.lux @@ -18,6 +18,9 @@ ["[0]" random] [number ["n" natural]]] + [meta + ["[0]" configuration + ["[1]T" \\test]]] [world ["[0]" file]] [test @@ -36,9 +39,7 @@ ["$" // [// ["[1][0]" archive (.only) - ["[2][0]" signature]] - [/// - ["[1][0]" configuration]]]]) + ["[2][0]" signature]]]]) (the .public test Test @@ -52,7 +53,7 @@ content/1 (random.only (|>> (n.= content/0) not) random.natural) hash random.natural signature $signature.random - configuration ($configuration.random 1) + configuration (configurationT.random 1) .let [key (key.key signature content/0) [archive expected] (|> (do try.monad [[@module/0 archive] (archive.reserve module/0 archive.empty) diff --git a/stdlib/source/test/lux/meta/compiler/meta/cache/artifact.lux b/stdlib/source/test/lux/compiler/meta/cache/artifact.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/cache/artifact.lux rename to stdlib/source/test/lux/compiler/meta/cache/artifact.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/cache/dependency/module.lux b/stdlib/source/test/lux/compiler/meta/cache/dependency/module.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/cache/dependency/module.lux rename to stdlib/source/test/lux/compiler/meta/cache/dependency/module.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/cache/module.lux b/stdlib/source/test/lux/compiler/meta/cache/module.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/cache/module.lux rename to stdlib/source/test/lux/compiler/meta/cache/module.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/cache/purge.lux b/stdlib/source/test/lux/compiler/meta/cache/purge.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/cache/purge.lux rename to stdlib/source/test/lux/compiler/meta/cache/purge.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/cli.lux b/stdlib/source/test/lux/compiler/meta/cli.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/cli.lux rename to stdlib/source/test/lux/compiler/meta/cli.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/cli/compiler.lux b/stdlib/source/test/lux/compiler/meta/cli/compiler.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/cli/compiler.lux rename to stdlib/source/test/lux/compiler/meta/cli/compiler.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/context.lux b/stdlib/source/test/lux/compiler/meta/context.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/context.lux rename to stdlib/source/test/lux/compiler/meta/context.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/export.lux b/stdlib/source/test/lux/compiler/meta/export.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/export.lux rename to stdlib/source/test/lux/compiler/meta/export.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/import.lux b/stdlib/source/test/lux/compiler/meta/import.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/import.lux rename to stdlib/source/test/lux/compiler/meta/import.lux diff --git a/stdlib/source/test/lux/meta/compiler/meta/io.lux b/stdlib/source/test/lux/compiler/meta/io.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/meta/io.lux rename to stdlib/source/test/lux/compiler/meta/io.lux diff --git a/stdlib/source/test/lux/meta/compiler/reference.lux b/stdlib/source/test/lux/compiler/reference.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/reference.lux rename to stdlib/source/test/lux/compiler/reference.lux diff --git a/stdlib/source/test/lux/meta/compiler/reference/register.lux b/stdlib/source/test/lux/compiler/reference/register.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/reference/register.lux rename to stdlib/source/test/lux/compiler/reference/register.lux diff --git a/stdlib/source/test/lux/meta/compiler/reference/variable.lux b/stdlib/source/test/lux/compiler/reference/variable.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/reference/variable.lux rename to stdlib/source/test/lux/compiler/reference/variable.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/js.lux b/stdlib/source/test/lux/compiler/target/js.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/js.lux rename to stdlib/source/test/lux/compiler/target/js.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm.lux b/stdlib/source/test/lux/compiler/target/jvm.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm.lux rename to stdlib/source/test/lux/compiler/target/jvm.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/bytecode/environment/limit.lux b/stdlib/source/test/lux/compiler/target/jvm/bytecode/environment/limit.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/bytecode/environment/limit.lux rename to stdlib/source/test/lux/compiler/target/jvm/bytecode/environment/limit.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/bytecode/environment/limit/datum.lux b/stdlib/source/test/lux/compiler/target/jvm/bytecode/environment/limit/datum.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/bytecode/environment/limit/datum.lux rename to stdlib/source/test/lux/compiler/target/jvm/bytecode/environment/limit/datum.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/bytecode/environment/limit/registry.lux b/stdlib/source/test/lux/compiler/target/jvm/bytecode/environment/limit/registry.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/bytecode/environment/limit/registry.lux rename to stdlib/source/test/lux/compiler/target/jvm/bytecode/environment/limit/registry.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/bytecode/environment/limit/stack.lux b/stdlib/source/test/lux/compiler/target/jvm/bytecode/environment/limit/stack.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/bytecode/environment/limit/stack.lux rename to stdlib/source/test/lux/compiler/target/jvm/bytecode/environment/limit/stack.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/bytecode/jump.lux b/stdlib/source/test/lux/compiler/target/jvm/bytecode/jump.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/bytecode/jump.lux rename to stdlib/source/test/lux/compiler/target/jvm/bytecode/jump.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/constant.lux b/stdlib/source/test/lux/compiler/target/jvm/constant.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/constant.lux rename to stdlib/source/test/lux/compiler/target/jvm/constant.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/constant/class.lux b/stdlib/source/test/lux/compiler/target/jvm/constant/class.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/constant/class.lux rename to stdlib/source/test/lux/compiler/target/jvm/constant/class.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/constant/double.lux b/stdlib/source/test/lux/compiler/target/jvm/constant/double.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/constant/double.lux rename to stdlib/source/test/lux/compiler/target/jvm/constant/double.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/constant/float.lux b/stdlib/source/test/lux/compiler/target/jvm/constant/float.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/constant/float.lux rename to stdlib/source/test/lux/compiler/target/jvm/constant/float.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/constant/integer.lux b/stdlib/source/test/lux/compiler/target/jvm/constant/integer.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/constant/integer.lux rename to stdlib/source/test/lux/compiler/target/jvm/constant/integer.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/constant/long.lux b/stdlib/source/test/lux/compiler/target/jvm/constant/long.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/constant/long.lux rename to stdlib/source/test/lux/compiler/target/jvm/constant/long.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/constant/name_and_type.lux b/stdlib/source/test/lux/compiler/target/jvm/constant/name_and_type.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/constant/name_and_type.lux rename to stdlib/source/test/lux/compiler/target/jvm/constant/name_and_type.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/constant/pool.lux b/stdlib/source/test/lux/compiler/target/jvm/constant/pool.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/constant/pool.lux rename to stdlib/source/test/lux/compiler/target/jvm/constant/pool.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/constant/reference.lux b/stdlib/source/test/lux/compiler/target/jvm/constant/reference.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/constant/reference.lux rename to stdlib/source/test/lux/compiler/target/jvm/constant/reference.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/constant/string.lux b/stdlib/source/test/lux/compiler/target/jvm/constant/string.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/constant/string.lux rename to stdlib/source/test/lux/compiler/target/jvm/constant/string.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/constant/tag.lux b/stdlib/source/test/lux/compiler/target/jvm/constant/tag.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/constant/tag.lux rename to stdlib/source/test/lux/compiler/target/jvm/constant/tag.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/constant/utf8.lux b/stdlib/source/test/lux/compiler/target/jvm/constant/utf8.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/constant/utf8.lux rename to stdlib/source/test/lux/compiler/target/jvm/constant/utf8.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/encoding/name/external.lux b/stdlib/source/test/lux/compiler/target/jvm/encoding/name/external.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/encoding/name/external.lux rename to stdlib/source/test/lux/compiler/target/jvm/encoding/name/external.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/encoding/name/internal.lux b/stdlib/source/test/lux/compiler/target/jvm/encoding/name/internal.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/encoding/name/internal.lux rename to stdlib/source/test/lux/compiler/target/jvm/encoding/name/internal.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/encoding/signed.lux b/stdlib/source/test/lux/compiler/target/jvm/encoding/signed.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/encoding/signed.lux rename to stdlib/source/test/lux/compiler/target/jvm/encoding/signed.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/encoding/unsigned.lux b/stdlib/source/test/lux/compiler/target/jvm/encoding/unsigned.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/encoding/unsigned.lux rename to stdlib/source/test/lux/compiler/target/jvm/encoding/unsigned.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/index.lux b/stdlib/source/test/lux/compiler/target/jvm/index.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/index.lux rename to stdlib/source/test/lux/compiler/target/jvm/index.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/magic.lux b/stdlib/source/test/lux/compiler/target/jvm/magic.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/magic.lux rename to stdlib/source/test/lux/compiler/target/jvm/magic.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/type.lux b/stdlib/source/test/lux/compiler/target/jvm/type.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/type.lux rename to stdlib/source/test/lux/compiler/target/jvm/type.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/type/box.lux b/stdlib/source/test/lux/compiler/target/jvm/type/box.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/type/box.lux rename to stdlib/source/test/lux/compiler/target/jvm/type/box.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/type/category.lux b/stdlib/source/test/lux/compiler/target/jvm/type/category.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/type/category.lux rename to stdlib/source/test/lux/compiler/target/jvm/type/category.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/type/descriptor.lux b/stdlib/source/test/lux/compiler/target/jvm/type/descriptor.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/type/descriptor.lux rename to stdlib/source/test/lux/compiler/target/jvm/type/descriptor.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/type/projection.lux b/stdlib/source/test/lux/compiler/target/jvm/type/projection.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/type/projection.lux rename to stdlib/source/test/lux/compiler/target/jvm/type/projection.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/type/reflection.lux b/stdlib/source/test/lux/compiler/target/jvm/type/reflection.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/type/reflection.lux rename to stdlib/source/test/lux/compiler/target/jvm/type/reflection.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/type/signature.lux b/stdlib/source/test/lux/compiler/target/jvm/type/signature.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/type/signature.lux rename to stdlib/source/test/lux/compiler/target/jvm/type/signature.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/jvm/version.lux b/stdlib/source/test/lux/compiler/target/jvm/version.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/jvm/version.lux rename to stdlib/source/test/lux/compiler/target/jvm/version.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/lua.lux b/stdlib/source/test/lux/compiler/target/lua.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/lua.lux rename to stdlib/source/test/lux/compiler/target/lua.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/python.lux b/stdlib/source/test/lux/compiler/target/python.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/python.lux rename to stdlib/source/test/lux/compiler/target/python.lux diff --git a/stdlib/source/test/lux/meta/compiler/target/ruby.lux b/stdlib/source/test/lux/compiler/target/ruby.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/target/ruby.lux rename to stdlib/source/test/lux/compiler/target/ruby.lux diff --git a/stdlib/source/test/lux/meta/compiler/version.lux b/stdlib/source/test/lux/compiler/version.lux similarity index 100% rename from stdlib/source/test/lux/meta/compiler/version.lux rename to stdlib/source/test/lux/compiler/version.lux diff --git a/stdlib/source/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux new file mode 100644 index 0000000000..21a6ccc229 --- /dev/null +++ b/stdlib/source/test/lux/data/collection/list.lux @@ -0,0 +1,24 @@ +... This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +... If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/. + +(.using + [library + [lux (.except) + [abstract + [monad (.only do)]] + [math + ["[0]" random]] + [test + ["_" property (.only Test)]]]] + [\\library + ["[0]" /]]) + +(the .public test + Test + (<| (_.covering /._) + (do [! random.monad] + []) + (all _.and + (_.coverage [] + false) + ))) diff --git a/stdlib/source/test/lux/data/collection/tree/finger.lux b/stdlib/source/test/lux/data/collection/tree/finger.lux index a7afbfa07d..dde1f4a794 100644 --- a/stdlib/source/test/lux/data/collection/tree/finger.lux +++ b/stdlib/source/test/lux/data/collection/tree/finger.lux @@ -9,7 +9,7 @@ [control ["[0]" maybe (.use "[1]#[0]" functor)]] [data - ["[0]" text (.use "[1]#[0]" monoid)] + ["[0]" text] [collection ["[0]" stack (.use "[1]#[0]" mix)]]] [math @@ -48,7 +48,7 @@ (_.coverage [/.tag] (and (text.= tag_left (/.tag (by ..builder leaf tag_left expected_left))) - (text.= (text#composite tag_left tag_right) + (text.= (text tag_left tag_right) (/.tag (by ..builder branch (by ..builder leaf tag_left expected_left) (by ..builder leaf tag_right expected_right)))))) diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux index 06c4a3d7e1..22a94780e5 100644 --- a/stdlib/source/test/lux/ffi.jvm.lux +++ b/stdlib/source/test/lux/ffi.jvm.lux @@ -32,11 +32,11 @@ ["[0]" meta (.only) ["[0]" static] ["[0]" code (.only) - ["<[1]>" \\projection]] - [compiler - [target - ["[0]" jvm - ["[1]" type]]]]] + ["<[1]>" \\projection]]] + [compiler + [target + ["[0]" jvm + ["[1]" type]]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/meta.lux b/stdlib/source/test/lux/meta.lux index f1bfcbaebe..027139755b 100644 --- a/stdlib/source/test/lux/meta.lux +++ b/stdlib/source/test/lux/meta.lux @@ -35,7 +35,6 @@ ["[1][0]" static] ["[1][0]" extension] ["[1][0]" global] - ["[1][0]" compiler] ["[1][0]" label] ["[1][0]" binding] ["[1][0]" module (.only) @@ -420,7 +419,6 @@ /static.test /extension.test /global.test - /compiler.test /label.test /binding.test /module.test diff --git a/stdlib/source/test/lux/meta/code.lux b/stdlib/source/test/lux/meta/code.lux index 55f2f4ce28..1b1c2d4075 100644 --- a/stdlib/source/test/lux/meta/code.lux +++ b/stdlib/source/test/lux/meta/code.lux @@ -31,11 +31,11 @@ [meta ["[0]" name] ["[0]" provenance] - ["[0]" static] - [compiler - [language - [lux - ["[0]" syntax]]]]] + ["[0]" static]] + [compiler + [language + [lux + ["[0]" syntax]]]] [test ["_" property (.only Test)]]]] ["[0]" \\projection] diff --git a/stdlib/source/test/lux/meta/extension.lux b/stdlib/source/test/lux/meta/extension.lux index 5e23f9b5e7..e3f0d2d0cf 100644 --- a/stdlib/source/test/lux/meta/extension.lux +++ b/stdlib/source/test/lux/meta/extension.lux @@ -28,40 +28,40 @@ ["[0]" meta (.only) ["[0]" provenance] ["[0]" code - ["<[1]>" \\projection]] - [compiler - [target - ["[0]" js] - ["[0]" python] - ["[0]" lua] - ["[0]" ruby] - ["[0]" php] - (.,, (.for .jvm (.,, (.these ["[0]" jvm - ["[1]" bytecode] - ["[0]" class] - ["[0]" version] - [encoding - [name - ["[0]" internal]]]])) - (.,, (.these))))] - [meta - [archive - ["[0]" unit]]] - [language - [lux - ["[0]" phase] - ["[0]" translation] - ["[0]" declaration] - ["[0]" analysis (.only) - ["[0]" type] - ["<[1]>" \\projection]] - ["[0]" synthesis (.only) - ["<[1]>" \\projection]] - [phase - [translation - (.,, (.for .jvm (.,, (.these ["[0]" jvm - ["[1]/[0]" runtime]])) - (.,, (.these))))]]]]]] + ["<[1]>" \\projection]]] + [compiler + [target + ["[0]" js] + ["[0]" python] + ["[0]" lua] + ["[0]" ruby] + ["[0]" php] + (.,, (.for .jvm (.,, (.these ["[0]" jvm + ["[1]" bytecode] + ["[0]" class] + ["[0]" version] + [encoding + [name + ["[0]" internal]]]])) + (.,, (.these))))] + [meta + [archive + ["[0]" unit]]] + [language + [lux + ["[0]" phase] + ["[0]" translation] + ["[0]" declaration] + ["[0]" analysis (.only) + ["[0]" type] + ["<[1]>" \\projection]] + ["[0]" synthesis (.only) + ["<[1]>" \\projection]] + [phase + [translation + (.,, (.for .jvm (.,, (.these ["[0]" jvm + ["[1]/[0]" runtime]])) + (.,, (.these))))]]]]] [test ["_" property (.only Test)]]]] [\\library diff --git a/stdlib/source/test/lux/world/console.lux b/stdlib/source/test/lux/world/console.lux index faed2867d7..008ecea5c0 100644 --- a/stdlib/source/test/lux/world/console.lux +++ b/stdlib/source/test/lux/world/console.lux @@ -13,7 +13,7 @@ ["[0]" try (.only Try)] ["[0]" exception]] [data - ["[0]" text (.only) + ["[0]" text (.only \n) ["%" \\injection]]] [math ["[0]" random]] @@ -30,7 +30,7 @@ [message (random.alphabetic 10)] (in (do future.monad [console (future.soon console) - ?write (by console write (text message text.new_line)) + ?write (by console write (text message \n)) ?read (by console read []) ?read_line (by console read_line []) ?close/good (by console close []) @@ -80,7 +80,7 @@ (the (on_read_line [dead? content]) (do try.monad - [[line content] (try.of_maybe "" (text.split_by text.new_line content))] + [[line content] (try.of_maybe "" (text.split_by \n content))] (if dead? (exception.except ..dead []) (in [[dead? content] line]))))