diff options
| author | Eduardo Julian | 2022-06-16 21:37:38 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2022-06-16 21:37:38 -0400 |
| commit | 7249707e7c09be68dfb7507ba363efd3300a0141 (patch) | |
| tree | 1fb4764458da16353315ea7e267f997c9be70f49 /stdlib/source/library | |
| parent | e00e0b5f1e5fb509cf8f32424397110f524b8148 (diff) | |
De-sigil-ification: suffix : [Part 14]
Diffstat (limited to 'stdlib/source/library')
464 files changed, 951 insertions, 951 deletions
diff --git a/stdlib/source/library/lux.lux b/stdlib/source/library/lux.lux index 28507c829..41f6ab0ed 100644 --- a/stdlib/source/library/lux.lux +++ b/stdlib/source/library/lux.lux @@ -4182,7 +4182,7 @@ _ (failure (all text#composite - "Can only 'open:' structs: " (symbol#encoded implementation) + "Can only 'use' structs: " (symbol#encoded implementation) " : " (type#encoded interface)))))) (def (localized module global) @@ -4194,7 +4194,7 @@ _ global)) -(def .public open: +(def .public use (macro (_ tokens) (case (..parsed (all ..andP (..maybeP (all ..andP @@ -4240,7 +4240,7 @@ implementations)) .let [[pre_defs implementations] pre_defs,implementations]] (in (|> pre_defs - {#Item (` (..open: + {#Item (` (..use (~ (text$ current_module)) (~ (text$ imported_module)) (~ (text$ import_alias)) @@ -4250,7 +4250,7 @@ {.#None} - (failure (..wrong_syntax_error (symbol ..open:)))))) + (failure (..wrong_syntax_error (symbol ..use)))))) (def (imported_by? import_name module_name) (-> Text Text (Meta Bit)) @@ -5021,7 +5021,7 @@ (` ((~ (symbol$ macro)) (~+ parameters)))) referrals))))) -(def .public using +(def .public require (macro (_ _imports) (do meta#monad [current_module ..current_module_name diff --git a/stdlib/source/library/lux/abstract/algebra.lux b/stdlib/source/library/lux/abstract/algebra.lux index 4daff502e..bee4b3941 100644 --- a/stdlib/source/library/lux/abstract/algebra.lux +++ b/stdlib/source/library/lux/abstract/algebra.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control diff --git a/stdlib/source/library/lux/abstract/apply.lux b/stdlib/source/library/lux/abstract/apply.lux index 35320cbd4..6c92b02f0 100644 --- a/stdlib/source/library/lux/abstract/apply.lux +++ b/stdlib/source/library/lux/abstract/apply.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target]]] diff --git a/stdlib/source/library/lux/abstract/codec.lux b/stdlib/source/library/lux/abstract/codec.lux index 1af71150f..abb67a5af 100644 --- a/stdlib/source/library/lux/abstract/codec.lux +++ b/stdlib/source/library/lux/abstract/codec.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control diff --git a/stdlib/source/library/lux/abstract/comonad.lux b/stdlib/source/library/lux/abstract/comonad.lux index 405acfbf1..3a9de9e14 100644 --- a/stdlib/source/library/lux/abstract/comonad.lux +++ b/stdlib/source/library/lux/abstract/comonad.lux @@ -1,9 +1,9 @@ -(.using +(.require [library [lux (.except) [data [collection - ["[0]" list (.open: "[1]#[0]" mix)]]] + ["[0]" list (.use "[1]#[0]" mix)]]] [math [number ["n" nat]]] diff --git a/stdlib/source/library/lux/abstract/comonad/free.lux b/stdlib/source/library/lux/abstract/comonad/free.lux index 2e7e7cf1c..740a405b6 100644 --- a/stdlib/source/library/lux/abstract/comonad/free.lux +++ b/stdlib/source/library/lux/abstract/comonad/free.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except)]] [// (.only CoMonad) diff --git a/stdlib/source/library/lux/abstract/enum.lux b/stdlib/source/library/lux/abstract/enum.lux index 58e127f7d..709b02a35 100644 --- a/stdlib/source/library/lux/abstract/enum.lux +++ b/stdlib/source/library/lux/abstract/enum.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except)]] [// diff --git a/stdlib/source/library/lux/abstract/equivalence.lux b/stdlib/source/library/lux/abstract/equivalence.lux index fcd0f41cd..2fc81201b 100644 --- a/stdlib/source/library/lux/abstract/equivalence.lux +++ b/stdlib/source/library/lux/abstract/equivalence.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except)]] [// diff --git a/stdlib/source/library/lux/abstract/functor.lux b/stdlib/source/library/lux/abstract/functor.lux index 43bfa28d9..8d9167fc8 100644 --- a/stdlib/source/library/lux/abstract/functor.lux +++ b/stdlib/source/library/lux/abstract/functor.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Or And)]]) diff --git a/stdlib/source/library/lux/abstract/functor/contravariant.lux b/stdlib/source/library/lux/abstract/functor/contravariant.lux index 84c16bd01..01e482ae3 100644 --- a/stdlib/source/library/lux/abstract/functor/contravariant.lux +++ b/stdlib/source/library/lux/abstract/functor/contravariant.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except)]]) diff --git a/stdlib/source/library/lux/abstract/hash.lux b/stdlib/source/library/lux/abstract/hash.lux index ef5df6022..0c9b9a9eb 100644 --- a/stdlib/source/library/lux/abstract/hash.lux +++ b/stdlib/source/library/lux/abstract/hash.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except)]] [// diff --git a/stdlib/source/library/lux/abstract/interval.lux b/stdlib/source/library/lux/abstract/interval.lux index 0a538e925..34f5a0da4 100644 --- a/stdlib/source/library/lux/abstract/interval.lux +++ b/stdlib/source/library/lux/abstract/interval.lux @@ -1,5 +1,5 @@ ... https://en.wikipedia.org/wiki/Interval_(mathematics) -(.using +(.require [library [lux (.except)]] [// diff --git a/stdlib/source/library/lux/abstract/mix.lux b/stdlib/source/library/lux/abstract/mix.lux index ea317146b..b64a96fd2 100644 --- a/stdlib/source/library/lux/abstract/mix.lux +++ b/stdlib/source/library/lux/abstract/mix.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except)]] [// diff --git a/stdlib/source/library/lux/abstract/monad.lux b/stdlib/source/library/lux/abstract/monad.lux index ecd4e1ac4..737ee2678 100644 --- a/stdlib/source/library/lux/abstract/monad.lux +++ b/stdlib/source/library/lux/abstract/monad.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except all only) [meta diff --git a/stdlib/source/library/lux/abstract/monad/free.lux b/stdlib/source/library/lux/abstract/monad/free.lux index f4e440054..614834c70 100644 --- a/stdlib/source/library/lux/abstract/monad/free.lux +++ b/stdlib/source/library/lux/abstract/monad/free.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except)]] [/// diff --git a/stdlib/source/library/lux/abstract/monad/indexed.lux b/stdlib/source/library/lux/abstract/monad/indexed.lux index 30d3b403f..dc4e93177 100644 --- a/stdlib/source/library/lux/abstract/monad/indexed.lux +++ b/stdlib/source/library/lux/abstract/monad/indexed.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except global) [control @@ -6,7 +6,7 @@ ["<[0]>" code (.only Parser)]]] [data [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] ["[0]" macro (.only) [syntax (.only syntax)] ["[0]" code]]]] diff --git a/stdlib/source/library/lux/abstract/monoid.lux b/stdlib/source/library/lux/abstract/monoid.lux index f5afe510a..cf5ea3704 100644 --- a/stdlib/source/library/lux/abstract/monoid.lux +++ b/stdlib/source/library/lux/abstract/monoid.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except and)]]) diff --git a/stdlib/source/library/lux/abstract/order.lux b/stdlib/source/library/lux/abstract/order.lux index 71e546ed4..251683060 100644 --- a/stdlib/source/library/lux/abstract/order.lux +++ b/stdlib/source/library/lux/abstract/order.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control diff --git a/stdlib/source/library/lux/abstract/predicate.lux b/stdlib/source/library/lux/abstract/predicate.lux index 8becf51cd..358e5493a 100644 --- a/stdlib/source/library/lux/abstract/predicate.lux +++ b/stdlib/source/library/lux/abstract/predicate.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except all or and) [control diff --git a/stdlib/source/library/lux/control/concatenative.lux b/stdlib/source/library/lux/control/concatenative.lux index 2fe9f788f..8af49edd4 100644 --- a/stdlib/source/library/lux/control/concatenative.lux +++ b/stdlib/source/library/lux/control/concatenative.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Alias if loop left right) ["[0]" meta] @@ -6,13 +6,13 @@ [abstract ["[0]" monad]] [control - ["[0]" maybe (.open: "[1]#[0]" monad)]] + ["[0]" maybe (.use "[1]#[0]" monad)]] [data ["[0]" product] ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" mix functor)]]] + ["[0]" list (.use "[1]#[0]" mix functor)]]] ["[0]" macro (.only with_symbols) [syntax (.only syntax)] ["[0]" code] @@ -24,7 +24,7 @@ ["r" rev] ["f" frac]]]]] [// - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<[0]>" code (.only Parser)]]]) (type: Stack diff --git a/stdlib/source/library/lux/control/concurrency/actor.lux b/stdlib/source/library/lux/control/concurrency/actor.lux index e67bb3f2b..7184a105e 100644 --- a/stdlib/source/library/lux/control/concurrency/actor.lux +++ b/stdlib/source/library/lux/control/concurrency/actor.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/control/concurrency/async.lux b/stdlib/source/library/lux/control/concurrency/async.lux index 11020adad..f87dd4d05 100644 --- a/stdlib/source/library/lux/control/concurrency/async.lux +++ b/stdlib/source/library/lux/control/concurrency/async.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except and or) [abstract @@ -9,7 +9,7 @@ ["[0]" pipe] ["[0]" function] ["[0]" io (.only IO io)] - ["[0]" maybe (.open: "[1]#[0]" functor)]] + ["[0]" maybe (.use "[1]#[0]" functor)]] [data ["[0]" product]] [macro diff --git a/stdlib/source/library/lux/control/concurrency/atom.lux b/stdlib/source/library/lux/control/concurrency/atom.lux index e98479e10..6c40e9d7e 100644 --- a/stdlib/source/library/lux/control/concurrency/atom.lux +++ b/stdlib/source/library/lux/control/concurrency/atom.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] @@ -7,7 +7,7 @@ [monad (.only do)]] [control ["[0]" function] - ["[0]" io (.only IO) (.open: "[1]#[0]" functor)]] + ["[0]" io (.only IO) (.use "[1]#[0]" functor)]] [data ["[0]" product] [collection diff --git a/stdlib/source/library/lux/control/concurrency/frp.lux b/stdlib/source/library/lux/control/concurrency/frp.lux index 16ef2927c..0839a267d 100644 --- a/stdlib/source/library/lux/control/concurrency/frp.lux +++ b/stdlib/source/library/lux/control/concurrency/frp.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except list only) [abstract @@ -7,7 +7,7 @@ [apply (.only Apply)] ["[0]" monad (.only Monad do)]] [control - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" try (.only Try)] ["[0]" exception (.only exception:)] ["[0]" io (.only IO io)]] @@ -15,7 +15,7 @@ ["[0]" variance (.only Mutable)]]]] [// ["[0]" atom (.only Atom)] - ["[0]" async (.only Async Async') (.open: "[1]#[0]" monad)]]) + ["[0]" async (.only Async Async') (.use "[1]#[0]" monad)]]) (type: .public (Channel'' a) (Async (Maybe [a (Channel'' a)]))) diff --git a/stdlib/source/library/lux/control/concurrency/semaphore.lux b/stdlib/source/library/lux/control/concurrency/semaphore.lux index fbfacf228..d08c90100 100644 --- a/stdlib/source/library/lux/control/concurrency/semaphore.lux +++ b/stdlib/source/library/lux/control/concurrency/semaphore.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/control/concurrency/stm.lux b/stdlib/source/library/lux/control/concurrency/stm.lux index 87dd101c9..a1e50a983 100644 --- a/stdlib/source/library/lux/control/concurrency/stm.lux +++ b/stdlib/source/library/lux/control/concurrency/stm.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/control/concurrency/thread.lux b/stdlib/source/library/lux/control/concurrency/thread.lux index 030e0c053..515447e22 100644 --- a/stdlib/source/library/lux/control/concurrency/thread.lux +++ b/stdlib/source/library/lux/control/concurrency/thread.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] diff --git a/stdlib/source/library/lux/control/continuation.lux b/stdlib/source/library/lux/control/continuation.lux index 5c3ac3e9c..5aa7f47a3 100644 --- a/stdlib/source/library/lux/control/continuation.lux +++ b/stdlib/source/library/lux/control/continuation.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/control/exception.lux b/stdlib/source/library/lux/control/exception.lux index f80419c98..d9f2f0fcf 100644 --- a/stdlib/source/library/lux/control/exception.lux +++ b/stdlib/source/library/lux/control/exception.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except except with) ["[0]" macro] @@ -7,13 +7,13 @@ [monad (.only do)]] [control ["[0]" maybe] - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<[0]>" code (.only Parser)]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" monoid)] + ["[0]" text (.use "[1]#[0]" monoid)] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro ["[0]" code] [syntax (.only syntax) @@ -22,7 +22,7 @@ ["|[1]_[0]|" variable]]]] [math [number - ["n" nat (.open: "[1]#[0]" decimal)]]]]] + ["n" nat (.use "[1]#[0]" decimal)]]]]] [// ["//" try (.only Try)]]) diff --git a/stdlib/source/library/lux/control/function.lux b/stdlib/source/library/lux/control/function.lux index bbf4969b3..dbbab1922 100644 --- a/stdlib/source/library/lux/control/function.lux +++ b/stdlib/source/library/lux/control/function.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/control/function/contract.lux b/stdlib/source/library/lux/control/function/contract.lux index 4bae3020d..7304423cc 100644 --- a/stdlib/source/library/lux/control/function/contract.lux +++ b/stdlib/source/library/lux/control/function/contract.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control diff --git a/stdlib/source/library/lux/control/function/inline.lux b/stdlib/source/library/lux/control/function/inline.lux index 9481dd27c..10141088d 100644 --- a/stdlib/source/library/lux/control/function/inline.lux +++ b/stdlib/source/library/lux/control/function/inline.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] @@ -9,7 +9,7 @@ ["<[0]>" code (.only Parser)]]] [data [collection - ["[0]" list (.open: "[1]#[0]" monad)]]] + ["[0]" list (.use "[1]#[0]" monad)]]] ["[0]" macro (.only) ["[0]" code] [syntax (.only syntax) diff --git a/stdlib/source/library/lux/control/function/memo.lux b/stdlib/source/library/lux/control/function/memo.lux index 60c464887..d3ff5744b 100644 --- a/stdlib/source/library/lux/control/function/memo.lux +++ b/stdlib/source/library/lux/control/function/memo.lux @@ -1,7 +1,7 @@ ... Inspired by; ... "The Different Aspects of Monads and Mixins" by Bruno C. d. S. Oliveira -(.using +(.require [library [lux (.except open) ["[0]" type] diff --git a/stdlib/source/library/lux/control/function/mixin.lux b/stdlib/source/library/lux/control/function/mixin.lux index 44796c733..0ec280143 100644 --- a/stdlib/source/library/lux/control/function/mixin.lux +++ b/stdlib/source/library/lux/control/function/mixin.lux @@ -1,7 +1,7 @@ ... Inspired by; ... "The Different Aspects of Monads and Mixins" by Bruno C. d. S. Oliveira -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/control/function/mutual.lux b/stdlib/source/library/lux/control/function/mutual.lux index d0b03aa08..2af557492 100644 --- a/stdlib/source/library/lux/control/function/mutual.lux +++ b/stdlib/source/library/lux/control/function/mutual.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Definition let def macro) ["[0]" meta] @@ -7,14 +7,14 @@ [control ["[0]" try (.only Try)] ["[0]" exception (.only exception:)] - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<[0]>" code (.only Parser)]]] [data ["[0]" product] [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] [dictionary ["[0]" plist (.only PList)]]]] ["[0]" macro (.only) diff --git a/stdlib/source/library/lux/control/io.lux b/stdlib/source/library/lux/control/io.lux index fecb0ee7b..5ae034638 100644 --- a/stdlib/source/library/lux/control/io.lux +++ b/stdlib/source/library/lux/control/io.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/control/lazy.lux b/stdlib/source/library/lux/control/lazy.lux index 50f18e0dd..95299e5f0 100644 --- a/stdlib/source/library/lux/control/lazy.lux +++ b/stdlib/source/library/lux/control/lazy.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/control/maybe.lux b/stdlib/source/library/lux/control/maybe.lux index b138ab65c..9241da0c8 100644 --- a/stdlib/source/library/lux/control/maybe.lux +++ b/stdlib/source/library/lux/control/maybe.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except list with) [abstract diff --git a/stdlib/source/library/lux/control/parser.lux b/stdlib/source/library/lux/control/parser.lux index 1c402df83..07bef823a 100644 --- a/stdlib/source/library/lux/control/parser.lux +++ b/stdlib/source/library/lux/control/parser.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except or and not only) [abstract @@ -11,7 +11,7 @@ [data ["[0]" product] [collection - ["[0]" list (.open: "[1]#[0]" functor monoid)]]] + ["[0]" list (.use "[1]#[0]" functor monoid)]]] [math [number ["n" nat]]]]]) diff --git a/stdlib/source/library/lux/control/parser/cli.lux b/stdlib/source/library/lux/control/parser/cli.lux index b00698644..90a0d80c2 100644 --- a/stdlib/source/library/lux/control/parser/cli.lux +++ b/stdlib/source/library/lux/control/parser/cli.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except parameter) [abstract @@ -6,7 +6,7 @@ [control ["[0]" try (.only Try)]] [data - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]]]]] ["[0]" //]) diff --git a/stdlib/source/library/lux/control/parser/code.lux b/stdlib/source/library/lux/control/parser/code.lux index 337201593..184d4d97a 100644 --- a/stdlib/source/library/lux/control/parser/code.lux +++ b/stdlib/source/library/lux/control/parser/code.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except nat int rev local not symbol local global) [abstract @@ -7,11 +7,11 @@ ["[0]" try (.only Try)]] [data ["[0]" bit] - ["[0]" text (.open: "[1]#[0]" monoid)] + ["[0]" text (.use "[1]#[0]" monoid)] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [macro - ["[0]" code (.open: "[1]#[0]" equivalence)]] + ["[0]" code (.use "[1]#[0]" equivalence)]] [math [number ["[0]" nat] diff --git a/stdlib/source/library/lux/control/parser/environment.lux b/stdlib/source/library/lux/control/parser/environment.lux index 601cd9a5d..99f1405db 100644 --- a/stdlib/source/library/lux/control/parser/environment.lux +++ b/stdlib/source/library/lux/control/parser/environment.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control diff --git a/stdlib/source/library/lux/control/parser/tree.lux b/stdlib/source/library/lux/control/parser/tree.lux index b7a37f0ef..5aaba56ed 100644 --- a/stdlib/source/library/lux/control/parser/tree.lux +++ b/stdlib/source/library/lux/control/parser/tree.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except left right) [abstract diff --git a/stdlib/source/library/lux/control/parser/type.lux b/stdlib/source/library/lux/control/parser/type.lux index cff760d80..999c44325 100644 --- a/stdlib/source/library/lux/control/parser/type.lux +++ b/stdlib/source/library/lux/control/parser/type.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except function local parameter) [abstract @@ -8,18 +8,18 @@ ["[0]" exception (.only exception:)] ["[0]" function]] [data - ["[0]" text (.open: "[1]#[0]" monoid) + ["[0]" text (.use "[1]#[0]" monoid) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" dictionary (.only Dictionary)]]] [macro ["^" pattern] ["[0]" code]] [math [number - ["n" nat (.open: "[1]#[0]" decimal)]]] - ["[0]" type (.open: "[1]#[0]" equivalence) + ["n" nat (.use "[1]#[0]" decimal)]]] + ["[0]" type (.use "[1]#[0]" equivalence) ["[0]" check]]]] ["[0]" //]) diff --git a/stdlib/source/library/lux/control/pipe.lux b/stdlib/source/library/lux/control/pipe.lux index 7f7762924..eff3b6dce 100644 --- a/stdlib/source/library/lux/control/pipe.lux +++ b/stdlib/source/library/lux/control/pipe.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except let cond if exec case) [abstract @@ -10,7 +10,7 @@ [data ["[0]" identity] [collection - ["[0]" list (.open: "[1]#[0]" monad)]]] + ["[0]" list (.use "[1]#[0]" monad)]]] [macro (.only with_symbols) [syntax (.only syntax)] ["[0]" code]] diff --git a/stdlib/source/library/lux/control/reader.lux b/stdlib/source/library/lux/control/reader.lux index 923b10562..12f30ce22 100644 --- a/stdlib/source/library/lux/control/reader.lux +++ b/stdlib/source/library/lux/control/reader.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except local with) ["@" target] diff --git a/stdlib/source/library/lux/control/region.lux b/stdlib/source/library/lux/control/region.lux index 2c91dbbb8..66bb3b721 100644 --- a/stdlib/source/library/lux/control/region.lux +++ b/stdlib/source/library/lux/control/region.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except except) [abstract @@ -11,7 +11,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" mix)]]]]] + ["[0]" list (.use "[1]#[0]" mix)]]]]] [// ["[0]" exception (.only Exception exception:)]]) diff --git a/stdlib/source/library/lux/control/remember.lux b/stdlib/source/library/lux/control/remember.lux index 1110c57bf..c33f6d38b 100644 --- a/stdlib/source/library/lux/control/remember.lux +++ b/stdlib/source/library/lux/control/remember.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -7,14 +7,14 @@ ["[0]" io] ["[0]" try] ["[0]" exception (.only exception:)] - ["<>" parser (.open: "[1]#[0]" functor) + ["<>" parser (.use "[1]#[0]" functor) ["<c>" code (.only Parser)]]] [data ["[0]" text ["%" \\format (.only format)]]] [time ["[0]" instant] - ["[0]" date (.only Date) (.open: "[1]#[0]" order)]] + ["[0]" date (.only Date) (.use "[1]#[0]" order)]] ["[0]" meta] [macro ["[0]" code] diff --git a/stdlib/source/library/lux/control/security/capability.lux b/stdlib/source/library/lux/control/security/capability.lux index 6df5eaf19..24cb094d7 100644 --- a/stdlib/source/library/lux/control/security/capability.lux +++ b/stdlib/source/library/lux/control/security/capability.lux @@ -1,6 +1,6 @@ -(.using +(.require [library - [lux (.except) + [lux (.except use) [abstract [monad (.only do)]] [control @@ -13,7 +13,7 @@ [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [type [primitive (.except)]] ["[0]" meta] diff --git a/stdlib/source/library/lux/control/security/policy.lux b/stdlib/source/library/lux/control/security/policy.lux index fe683cf05..923d28db1 100644 --- a/stdlib/source/library/lux/control/security/policy.lux +++ b/stdlib/source/library/lux/control/security/policy.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/control/state.lux b/stdlib/source/library/lux/control/state.lux index 484592e71..205638278 100644 --- a/stdlib/source/library/lux/control/state.lux +++ b/stdlib/source/library/lux/control/state.lux @@ -1,6 +1,6 @@ -(.using +(.require [library - [lux (.except local with) + [lux (.except local with use) [abstract [functor (.only Functor)] [apply (.only Apply)] diff --git a/stdlib/source/library/lux/control/thread.lux b/stdlib/source/library/lux/control/thread.lux index 4dbe81f34..506270888 100644 --- a/stdlib/source/library/lux/control/thread.lux +++ b/stdlib/source/library/lux/control/thread.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] diff --git a/stdlib/source/library/lux/control/try.lux b/stdlib/source/library/lux/control/try.lux index 23d3cf178..e18c3eb65 100644 --- a/stdlib/source/library/lux/control/try.lux +++ b/stdlib/source/library/lux/control/try.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except with) ["@" target] diff --git a/stdlib/source/library/lux/control/writer.lux b/stdlib/source/library/lux/control/writer.lux index 6df2cf695..bfad2a3e9 100644 --- a/stdlib/source/library/lux/control/writer.lux +++ b/stdlib/source/library/lux/control/writer.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except with) ["@" target] diff --git a/stdlib/source/library/lux/data/binary.lux b/stdlib/source/library/lux/data/binary.lux index 102440856..1c0f45a84 100644 --- a/stdlib/source/library/lux/data/binary.lux +++ b/stdlib/source/library/lux/data/binary.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" ffi] diff --git a/stdlib/source/library/lux/data/bit.lux b/stdlib/source/library/lux/data/bit.lux index 369c9002c..dcb0ad6bb 100644 --- a/stdlib/source/library/lux/data/bit.lux +++ b/stdlib/source/library/lux/data/bit.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/data/collection/array.lux b/stdlib/source/library/lux/data/collection/array.lux index 0d02cef25..f259d5c87 100644 --- a/stdlib/source/library/lux/data/collection/array.lux +++ b/stdlib/source/library/lux/data/collection/array.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except list) [abstract diff --git a/stdlib/source/library/lux/data/collection/bits.lux b/stdlib/source/library/lux/data/collection/bits.lux index 8c524156e..c7da7a117 100644 --- a/stdlib/source/library/lux/data/collection/bits.lux +++ b/stdlib/source/library/lux/data/collection/bits.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except not and or) [abstract @@ -8,7 +8,7 @@ ["[0]" maybe]] [data [collection - ["[0]" array (.only Array) (.open: "[1]#[0]" mix)]]] + ["[0]" array (.only Array) (.use "[1]#[0]" mix)]]] [math [number ["n" nat] diff --git a/stdlib/source/library/lux/data/collection/dictionary.lux b/stdlib/source/library/lux/data/collection/dictionary.lux index a9f167556..a7dc74404 100644 --- a/stdlib/source/library/lux/data/collection/dictionary.lux +++ b/stdlib/source/library/lux/data/collection/dictionary.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except has revised) [abstract @@ -13,7 +13,7 @@ [data ["[0]" product] [collection - ["[0]" list (.open: "[1]#[0]" mix functor monoid)] + ["[0]" list (.use "[1]#[0]" mix functor monoid)] ["[0]" array ["[1]" \\unsafe (.only Array)]]]] [macro diff --git a/stdlib/source/library/lux/data/collection/dictionary/ordered.lux b/stdlib/source/library/lux/data/collection/dictionary/ordered.lux index 8592aaeec..00ef47da9 100644 --- a/stdlib/source/library/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/library/lux/data/collection/dictionary/ordered.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except has revised) [abstract @@ -10,7 +10,7 @@ [data ["p" product] [collection - ["[0]" list (.open: "[1]#[0]" monoid mix)]]] + ["[0]" list (.use "[1]#[0]" monoid mix)]]] [macro ["^" pattern]] [math diff --git a/stdlib/source/library/lux/data/collection/dictionary/plist.lux b/stdlib/source/library/lux/data/collection/dictionary/plist.lux index 3dd3521c4..ed02d287c 100644 --- a/stdlib/source/library/lux/data/collection/dictionary/plist.lux +++ b/stdlib/source/library/lux/data/collection/dictionary/plist.lux @@ -1,16 +1,16 @@ -(.using +(.require [library [lux (.except has revised) [abstract [equivalence (.only Equivalence)] [monoid (.only Monoid)]] [control - ["[0]" maybe (.open: "[1]#[0]" functor)]] + ["[0]" maybe (.use "[1]#[0]" functor)]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" equivalence)] + ["[0]" text (.use "[1]#[0]" equivalence)] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [math [number ["n" nat]]]]]) diff --git a/stdlib/source/library/lux/data/collection/list.lux b/stdlib/source/library/lux/data/collection/list.lux index 6be267e78..929a6373b 100644 --- a/stdlib/source/library/lux/data/collection/list.lux +++ b/stdlib/source/library/lux/data/collection/list.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except revised all only with) ["@" target] @@ -347,7 +347,7 @@ {.#Item x xs'} {.#Item x (composite xs' ys)})))) -(open: "[0]" ..monoid) +(use "[0]" ..monoid) (def .public functor (Functor List) @@ -360,7 +360,7 @@ {.#Item a ma'} {.#Item (f a) (each f ma')})))) -(open: "[0]" ..functor) +(use "[0]" ..functor) (def .public apply (Apply List) diff --git a/stdlib/source/library/lux/data/collection/queue.lux b/stdlib/source/library/lux/data/collection/queue.lux index 54c1024b6..fd85c71c0 100644 --- a/stdlib/source/library/lux/data/collection/queue.lux +++ b/stdlib/source/library/lux/data/collection/queue.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except list) [abstract @@ -6,7 +6,7 @@ [functor (.only Functor)]] [data [collection - ["[0]" list (.open: "[1]#[0]" monoid functor)]]] + ["[0]" list (.use "[1]#[0]" monoid functor)]]] [math [number ["n" nat]]]]]) diff --git a/stdlib/source/library/lux/data/collection/queue/priority.lux b/stdlib/source/library/lux/data/collection/queue/priority.lux index 30cc94613..0ee30e78d 100644 --- a/stdlib/source/library/lux/data/collection/queue/priority.lux +++ b/stdlib/source/library/lux/data/collection/queue/priority.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -12,7 +12,7 @@ ["[1]" finger (.only Tree)]]]] [math [number - ["n" nat (.open: "[1]#[0]" interval)]]] + ["n" nat (.use "[1]#[0]" interval)]]] [type (.only by_example) [primitive (.only primitive abstraction representation)]]]]) diff --git a/stdlib/source/library/lux/data/collection/sequence.lux b/stdlib/source/library/lux/data/collection/sequence.lux index da7ea73c1..a33351aee 100644 --- a/stdlib/source/library/lux/data/collection/sequence.lux +++ b/stdlib/source/library/lux/data/collection/sequence.lux @@ -1,7 +1,7 @@ ... https://hypirion.com/musings/understanding-persistent-vector-pt-1 ... https://hypirion.com/musings/understanding-persistent-vector-pt-2 ... https://hypirion.com/musings/understanding-persistent-vector-pt-3 -(.using +(.require [library [lux (.except list has revised only) ["@" target] @@ -14,7 +14,7 @@ [mix (.only Mix)] [predicate (.only Predicate)]] [control - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" try (.only Try)] ["[0]" exception (.only exception:)] ["<>" parser (.only) @@ -22,7 +22,7 @@ [data ["[0]" product] [collection - ["[0]" list (.open: "[1]#[0]" mix functor monoid)] + ["[0]" list (.use "[1]#[0]" mix functor monoid)] ["[0]" array ["[1]" \\unsafe (.only Array)]]]] [macro diff --git a/stdlib/source/library/lux/data/collection/set.lux b/stdlib/source/library/lux/data/collection/set.lux index fd2e32815..b669331f2 100644 --- a/stdlib/source/library/lux/data/collection/set.lux +++ b/stdlib/source/library/lux/data/collection/set.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except has list) [abstract @@ -8,7 +8,7 @@ [monoid (.only Monoid)]] [data [collection - ["[0]" list (.open: "[1]#[0]" mix)]]] + ["[0]" list (.use "[1]#[0]" mix)]]] [macro ["^" pattern]] [math diff --git a/stdlib/source/library/lux/data/collection/set/multi.lux b/stdlib/source/library/lux/data/collection/set/multi.lux index 72e1e1620..82c89f817 100644 --- a/stdlib/source/library/lux/data/collection/set/multi.lux +++ b/stdlib/source/library/lux/data/collection/set/multi.lux @@ -1,5 +1,5 @@ ... https://en.wikipedia.org/wiki/Multiset -(.using +(.require [library [lux (.except has list) [abstract @@ -17,7 +17,7 @@ ["[0]" primitive (.only primitive abstraction representation)]]]] ["[0]" // (.only) [// - ["[0]" list (.open: "[1]#[0]" mix monoid)] + ["[0]" list (.use "[1]#[0]" mix monoid)] ["[0]" dictionary (.only Dictionary)]]]) (primitive .public (Set a) diff --git a/stdlib/source/library/lux/data/collection/set/ordered.lux b/stdlib/source/library/lux/data/collection/set/ordered.lux index 5cdd23dec..f24c059bd 100644 --- a/stdlib/source/library/lux/data/collection/set/ordered.lux +++ b/stdlib/source/library/lux/data/collection/set/ordered.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except has list) [abstract @@ -6,7 +6,7 @@ [order (.only Order)]] [data [collection - ["[0]" list (.open: "[1]#[0]" mix)] + ["[0]" list (.use "[1]#[0]" mix)] [dictionary ["/" ordered]]]] [type diff --git a/stdlib/source/library/lux/data/collection/stack.lux b/stdlib/source/library/lux/data/collection/stack.lux index 5a7f19904..726cdada0 100644 --- a/stdlib/source/library/lux/data/collection/stack.lux +++ b/stdlib/source/library/lux/data/collection/stack.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/data/collection/stream.lux b/stdlib/source/library/lux/data/collection/stream.lux index 29b789e09..ab3a72eb1 100644 --- a/stdlib/source/library/lux/data/collection/stream.lux +++ b/stdlib/source/library/lux/data/collection/stream.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except pattern only) [abstract @@ -11,7 +11,7 @@ [data ["[0]" bit] [collection - ["[0]" list (.open: "[1]#[0]" monad)]]] + ["[0]" list (.use "[1]#[0]" monad)]]] [macro (.only with_symbols) [syntax (.only syntax)] ["[0]" code]] diff --git a/stdlib/source/library/lux/data/collection/tree.lux b/stdlib/source/library/lux/data/collection/tree.lux index d1f9d46ba..d96d31371 100644 --- a/stdlib/source/library/lux/data/collection/tree.lux +++ b/stdlib/source/library/lux/data/collection/tree.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -11,7 +11,7 @@ ["<[0]>" code (.only Parser)]]] [data [collection - ["[0]" list (.open: "[1]#[0]" monad mix)]]] + ["[0]" list (.use "[1]#[0]" monad mix)]]] [macro [syntax (.only syntax)] ["[0]" code]]]]) diff --git a/stdlib/source/library/lux/data/collection/tree/finger.lux b/stdlib/source/library/lux/data/collection/tree/finger.lux index 3046509d3..0b890f766 100644 --- a/stdlib/source/library/lux/data/collection/tree/finger.lux +++ b/stdlib/source/library/lux/data/collection/tree/finger.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -6,7 +6,7 @@ ["[0]" monoid (.only Monoid)]] [data [collection - ["[0]" list (.open: "[1]#[0]" monoid)]]] + ["[0]" list (.use "[1]#[0]" monoid)]]] [type [primitive (.only primitive abstraction representation)]]]]) diff --git a/stdlib/source/library/lux/data/collection/tree/zipper.lux b/stdlib/source/library/lux/data/collection/tree/zipper.lux index e6bb39ba6..b2ef4f056 100644 --- a/stdlib/source/library/lux/data/collection/tree/zipper.lux +++ b/stdlib/source/library/lux/data/collection/tree/zipper.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except left right) ["@" target] @@ -8,14 +8,14 @@ [monad (.only do)] [equivalence (.only Equivalence)]] [control - ["[0]" maybe (.open: "[1]#[0]" monad)]] + ["[0]" maybe (.use "[1]#[0]" monad)]] [data ["[0]" product] [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor monoid)]]]]] - ["[0]" // (.only Tree) (.open: "[1]#[0]" functor)]) + ["[0]" list (.use "[1]#[0]" functor monoid)]]]]] + ["[0]" // (.only Tree) (.use "[1]#[0]" functor)]) (type: (Family Zipper a) (Record diff --git a/stdlib/source/library/lux/data/color.lux b/stdlib/source/library/lux/data/color.lux index 519b0f020..06a488328 100644 --- a/stdlib/source/library/lux/data/color.lux +++ b/stdlib/source/library/lux/data/color.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -7,13 +7,13 @@ ["[0]" hash (.only Hash)]] [data [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [math [number ["n" nat] ["f" frac] ["[0]" int] - ["[0]" rev (.open: "[1]#[0]" interval)] + ["[0]" rev (.use "[1]#[0]" interval)] ["[0]" i64]]] [type [primitive (.except)]]]]) diff --git a/stdlib/source/library/lux/data/color/named.lux b/stdlib/source/library/lux/data/color/named.lux index 43633595d..df8d311cf 100644 --- a/stdlib/source/library/lux/data/color/named.lux +++ b/stdlib/source/library/lux/data/color/named.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [math diff --git a/stdlib/source/library/lux/data/format/css.lux b/stdlib/source/library/lux/data/format/css.lux index dca23f87c..e0564ae8d 100644 --- a/stdlib/source/library/lux/data/format/css.lux +++ b/stdlib/source/library/lux/data/format/css.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except and) [control @@ -8,7 +8,7 @@ ["%" \\format (.only format)] ["[0]" encoding (.only Encoding)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [math [number ["[0]" nat]]] diff --git a/stdlib/source/library/lux/data/format/css/class.lux b/stdlib/source/library/lux/data/format/css/class.lux index 6a867e331..a2aa3d00d 100644 --- a/stdlib/source/library/lux/data/format/css/class.lux +++ b/stdlib/source/library/lux/data/format/css/class.lux @@ -1,11 +1,11 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] [abstract [monad (.only do)]] [data - ["[0]" text (.open: "[1]#[0]" hash) + ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)]]] [macro [syntax (.only syntax)] diff --git a/stdlib/source/library/lux/data/format/css/font.lux b/stdlib/source/library/lux/data/format/css/font.lux index 3c06ac129..caba8fee8 100644 --- a/stdlib/source/library/lux/data/format/css/font.lux +++ b/stdlib/source/library/lux/data/format/css/font.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [type diff --git a/stdlib/source/library/lux/data/format/css/id.lux b/stdlib/source/library/lux/data/format/css/id.lux index 96a9ef1d2..7d833ca6c 100644 --- a/stdlib/source/library/lux/data/format/css/id.lux +++ b/stdlib/source/library/lux/data/format/css/id.lux @@ -1,11 +1,11 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] [abstract [monad (.only do)]] [data - ["[0]" text (.open: "[1]#[0]" hash) + ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)]]] [macro [syntax (.only syntax)] diff --git a/stdlib/source/library/lux/data/format/css/property.lux b/stdlib/source/library/lux/data/format/css/property.lux index 5fa507633..6d4413240 100644 --- a/stdlib/source/library/lux/data/format/css/property.lux +++ b/stdlib/source/library/lux/data/format/css/property.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except All Location) [control diff --git a/stdlib/source/library/lux/data/format/css/query.lux b/stdlib/source/library/lux/data/format/css/query.lux index 6af2f5539..cce106c61 100644 --- a/stdlib/source/library/lux/data/format/css/query.lux +++ b/stdlib/source/library/lux/data/format/css/query.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except and or not) [control diff --git a/stdlib/source/library/lux/data/format/css/selector.lux b/stdlib/source/library/lux/data/format/css/selector.lux index ee3291e33..787dbd21f 100644 --- a/stdlib/source/library/lux/data/format/css/selector.lux +++ b/stdlib/source/library/lux/data/format/css/selector.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Label or and for same? not) ["[0]" locale (.only Locale)] diff --git a/stdlib/source/library/lux/data/format/css/style.lux b/stdlib/source/library/lux/data/format/css/style.lux index 50df42453..1f055636f 100644 --- a/stdlib/source/library/lux/data/format/css/style.lux +++ b/stdlib/source/library/lux/data/format/css/style.lux @@ -1,11 +1,11 @@ -(.using +(.require [library [lux (.except) [data [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" mix)]]] + ["[0]" list (.use "[1]#[0]" mix)]]] [type [primitive (.except)]]]] ["[0]" // diff --git a/stdlib/source/library/lux/data/format/css/value.lux b/stdlib/source/library/lux/data/format/css/value.lux index 79afc29d6..5fb2cfb53 100644 --- a/stdlib/source/library/lux/data/format/css/value.lux +++ b/stdlib/source/library/lux/data/format/css/value.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Label All Location and static false true) [control @@ -11,7 +11,7 @@ ["[0]" text ["%" \\format (.only Format format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [macro [syntax (.only syntax)] ["[0]" template] diff --git a/stdlib/source/library/lux/data/format/html.lux b/stdlib/source/library/lux/data/format/html.lux index 7a9d61adc..87f56a8cd 100644 --- a/stdlib/source/library/lux/data/format/html.lux +++ b/stdlib/source/library/lux/data/format/html.lux @@ -1,15 +1,15 @@ -(.using +(.require [library [lux (.except Meta Source comment and template) [control ["[0]" function] - ["[0]" maybe (.open: "[1]#[0]" functor)]] + ["[0]" maybe (.use "[1]#[0]" functor)]] [data ["[0]" product] ["[0]" text ["%" \\format (.only Format format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro ["[0]" template]] [target diff --git a/stdlib/source/library/lux/data/format/json.lux b/stdlib/source/library/lux/data/format/json.lux index af8a52bb4..52afae21d 100644 --- a/stdlib/source/library/lux/data/format/json.lux +++ b/stdlib/source/library/lux/data/format/json.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except has) ["[0]" meta (.only monad)] @@ -11,16 +11,16 @@ ["[0]" pipe] ["[0]" maybe] ["[0]" try (.only Try)] - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<[0]>" code]]] [data ["[0]" bit] ["[0]" product] - ["[0]" text (.open: "[1]#[0]" equivalence monoid) + ["[0]" text (.use "[1]#[0]" equivalence monoid) ["<[1]>" \\parser (.only Parser)]] [collection - ["[0]" list (.open: "[1]#[0]" mix functor)] - ["[0]" sequence (.only Sequence sequence) (.open: "[1]#[0]" monad)] + ["[0]" list (.use "[1]#[0]" mix functor)] + ["[0]" sequence (.only Sequence sequence) (.use "[1]#[0]" monad)] ["[0]" dictionary (.only Dictionary)]]] [macro [syntax (.only syntax)] @@ -29,7 +29,7 @@ [math [number ["n" nat] - ["f" frac (.open: "[1]#[0]" decimal)]]]]]) + ["f" frac (.use "[1]#[0]" decimal)]]]]]) (with_template [<name> <type>] [(type: .public <name> diff --git a/stdlib/source/library/lux/data/format/markdown.lux b/stdlib/source/library/lux/data/format/markdown.lux index f328045dc..7833443d8 100644 --- a/stdlib/source/library/lux/data/format/markdown.lux +++ b/stdlib/source/library/lux/data/format/markdown.lux @@ -1,11 +1,11 @@ -(.using +(.require [library [lux (.except and) [data ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [type [primitive (.except)]] [world diff --git a/stdlib/source/library/lux/data/format/tar.lux b/stdlib/source/library/lux/data/format/tar.lux index 4fd668306..ac6644919 100644 --- a/stdlib/source/library/lux/data/format/tar.lux +++ b/stdlib/source/library/lux/data/format/tar.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Mode and) [ffi (.only)] @@ -13,15 +13,15 @@ ["[0]" product] ["[0]" binary (.only Binary) ["[1]!" \\unsafe] - ["[0]" \\format (.only Writer) (.open: "[1]#[0]" monoid)] + ["[0]" \\format (.only Writer) (.use "[1]#[0]" monoid)] ["<[1]>" \\parser (.only Parser)]] ["[0]" text (.only Char) ["%" \\format (.only format)] [encoding ["[0]" utf8]]] [collection - ["[0]" list (.open: "[1]#[0]" mix)] - ["[0]" sequence (.only Sequence) (.open: "[1]#[0]" mix)] + ["[0]" list (.use "[1]#[0]" mix)] + ["[0]" sequence (.only Sequence) (.use "[1]#[0]" mix)] [array [\\unsafe (.only)]]]] [macro diff --git a/stdlib/source/library/lux/data/format/xml.lux b/stdlib/source/library/lux/data/format/xml.lux index 41ec13be0..2ca45753c 100644 --- a/stdlib/source/library/lux/data/format/xml.lux +++ b/stdlib/source/library/lux/data/format/xml.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except symbol) [abstract @@ -7,20 +7,20 @@ [codec (.only Codec)]] [control [try (.only Try)] - ["<>" parser (.open: "[1]#[0]" monad)]] + ["<>" parser (.use "[1]#[0]" monad)]] [data ["[0]" product] - ["[0]" text (.only \n) (.open: "[1]#[0]" equivalence monoid) + ["[0]" text (.only \n) (.use "[1]#[0]" equivalence monoid) ["<[1]>" \\parser (.only Parser Slice)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" dictionary (.only Dictionary)]]] [math [number ["n" nat] ["[0]" int]]] [meta - ["[0]" symbol (.open: "[1]#[0]" equivalence codec)]]]]) + ["[0]" symbol (.use "[1]#[0]" equivalence codec)]]]]) (type: .public Tag Symbol) diff --git a/stdlib/source/library/lux/data/identity.lux b/stdlib/source/library/lux/data/identity.lux index 30d890dff..7b6c754ea 100644 --- a/stdlib/source/library/lux/data/identity.lux +++ b/stdlib/source/library/lux/data/identity.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/data/product.lux b/stdlib/source/library/lux/data/product.lux index 6e8767e04..6c1143dc2 100644 --- a/stdlib/source/library/lux/data/product.lux +++ b/stdlib/source/library/lux/data/product.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except left right) [abstract diff --git a/stdlib/source/library/lux/data/store.lux b/stdlib/source/library/lux/data/store.lux index 8e4c0746d..16aa25395 100644 --- a/stdlib/source/library/lux/data/store.lux +++ b/stdlib/source/library/lux/data/store.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/data/sum.lux b/stdlib/source/library/lux/data/sum.lux index ce03e75d6..03e26b25d 100644 --- a/stdlib/source/library/lux/data/sum.lux +++ b/stdlib/source/library/lux/data/sum.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except left right) [abstract diff --git a/stdlib/source/library/lux/data/text.lux b/stdlib/source/library/lux/data/text.lux index 9c2649f55..49b905eac 100644 --- a/stdlib/source/library/lux/data/text.lux +++ b/stdlib/source/library/lux/data/text.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except char) ["@" target] @@ -13,7 +13,7 @@ ["[0]" maybe]] [data [collection - ["[0]" list (.open: "[1]#[0]" mix)]]] + ["[0]" list (.use "[1]#[0]" mix)]]] [macro ["^" pattern]] [math diff --git a/stdlib/source/library/lux/data/text/buffer.lux b/stdlib/source/library/lux/data/text/buffer.lux index 82404b2dd..fbb58c96f 100644 --- a/stdlib/source/library/lux/data/text/buffer.lux +++ b/stdlib/source/library/lux/data/text/buffer.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] @@ -11,7 +11,7 @@ ["%" \\format (.only format)]] [collection ["[0]" array] - ["[0]" sequence (.only Sequence) (.open: "[1]#[0]" mix)]]] + ["[0]" sequence (.only Sequence) (.use "[1]#[0]" mix)]]] [math [number ["n" nat]]] diff --git a/stdlib/source/library/lux/data/text/encoding.lux b/stdlib/source/library/lux/data/text/encoding.lux index 16a0a2891..836fc8a49 100644 --- a/stdlib/source/library/lux/data/text/encoding.lux +++ b/stdlib/source/library/lux/data/text/encoding.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [macro diff --git a/stdlib/source/library/lux/data/text/encoding/utf8.lux b/stdlib/source/library/lux/data/text/encoding/utf8.lux index 8c7e5ef26..4a90d20e4 100644 --- a/stdlib/source/library/lux/data/text/encoding/utf8.lux +++ b/stdlib/source/library/lux/data/text/encoding/utf8.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] diff --git a/stdlib/source/library/lux/data/text/escape.lux b/stdlib/source/library/lux/data/text/escape.lux index f2c21a26e..616dba61d 100644 --- a/stdlib/source/library/lux/data/text/escape.lux +++ b/stdlib/source/library/lux/data/text/escape.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] diff --git a/stdlib/source/library/lux/data/text/regex.lux b/stdlib/source/library/lux/data/text/regex.lux index 6648375ba..017e29493 100644 --- a/stdlib/source/library/lux/data/text/regex.lux +++ b/stdlib/source/library/lux/data/text/regex.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except pattern) ["[0]" meta] @@ -8,21 +8,21 @@ ["[0]" maybe] ["[0]" try] ["[0]" exception (.only exception:)] - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<[0]>" code]]] [data ["[0]" product] ["[0]" text ["<[1]>" \\parser (.only Parser)]] [collection - ["[0]" list (.open: "[1]#[0]" mix monad)]]] + ["[0]" list (.use "[1]#[0]" mix monad)]]] [macro (.only with_symbols) [syntax (.only syntax)] ["^" pattern] ["[0]" code]] [math [number (.only hex) - ["n" nat (.open: "[1]#[0]" decimal)]]]]] + ["n" nat (.use "[1]#[0]" decimal)]]]]] ["[0]" // (.only) ["%" \\format (.only format)]]) diff --git a/stdlib/source/library/lux/data/text/unicode/block.lux b/stdlib/source/library/lux/data/text/unicode/block.lux index db55002a9..c08d296e4 100644 --- a/stdlib/source/library/lux/data/text/unicode/block.lux +++ b/stdlib/source/library/lux/data/text/unicode/block.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -8,7 +8,7 @@ ["[0]" interval (.only Interval)]] [math [number (.only hex) - ["n" nat (.open: "[1]#[0]" interval)] + ["n" nat (.use "[1]#[0]" interval)] ["[0]" i64]]] [type [primitive (.except)]]]] diff --git a/stdlib/source/library/lux/data/text/unicode/set.lux b/stdlib/source/library/lux/data/text/unicode/set.lux index 1abe5427f..961b597ef 100644 --- a/stdlib/source/library/lux/data/text/unicode/set.lux +++ b/stdlib/source/library/lux/data/text/unicode/set.lux @@ -1,12 +1,12 @@ -(.using +(.require [library [lux (.except) [abstract [equivalence (.only Equivalence)]] [data [collection - ["[0]" list (.open: "[1]#[0]" mix functor)] - ["[0]" set (.open: "[1]#[0]" equivalence)] + ["[0]" list (.use "[1]#[0]" mix functor)] + ["[0]" set (.use "[1]#[0]" equivalence)] ["[0]" tree ["[1]" finger (.only Tree)]]]] [type (.only by_example) diff --git a/stdlib/source/library/lux/data/trace.lux b/stdlib/source/library/lux/data/trace.lux index 87032785f..a4a778c56 100644 --- a/stdlib/source/library/lux/data/trace.lux +++ b/stdlib/source/library/lux/data/trace.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/debug.lux b/stdlib/source/library/lux/debug.lux index a4cbd9b25..885208a95 100644 --- a/stdlib/source/library/lux/debug.lux +++ b/stdlib/source/library/lux/debug.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except type private) ["@" target] @@ -23,7 +23,7 @@ ["[0]" json]] [collection ["[0]" array] - ["[0]" list (.open: "[1]#[0]" monad)] + ["[0]" list (.use "[1]#[0]" monad)] ["[0]" dictionary]]] [macro ["^" pattern] diff --git a/stdlib/source/library/lux/documentation.lux b/stdlib/source/library/lux/documentation.lux index 3c5ad2e10..6988ec0c3 100644 --- a/stdlib/source/library/lux/documentation.lux +++ b/stdlib/source/library/lux/documentation.lux @@ -1,22 +1,22 @@ -(.using +(.require [library [lux (.except Definition Module type) ["[0]" meta] - ["[0]" type (.open: "[1]#[0]" equivalence)] + ["[0]" type (.use "[1]#[0]" equivalence)] [abstract [monad (.only do)] ["[0]" enum]] [control - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" exception (.only exception:)] - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<[0]>" code (.only Parser)]]] [data ["[0]" product] - ["[0]" text (.only \n) (.open: "[1]#[0]" order) + ["[0]" text (.only \n) (.use "[1]#[0]" order) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" monad mix monoid)] + ["[0]" list (.use "[1]#[0]" monad mix monoid)] ["[0]" set (.only Set)] ["[0]" stream (.only Stream)]] [format diff --git a/stdlib/source/library/lux/extension.lux b/stdlib/source/library/lux/extension.lux index 1cbaf8642..aaffcd362 100644 --- a/stdlib/source/library/lux/extension.lux +++ b/stdlib/source/library/lux/extension.lux @@ -1,15 +1,15 @@ -(.using +(.require [library [lux (.except) [abstract ["[0]" monad]] [control - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<c>" code (.only Parser)]]] [data ["[0]" product] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [macro (.only with_symbols) [syntax (.only syntax)] ["[0]" code]] diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux index 49042f104..670f7b3a1 100644 --- a/stdlib/source/library/lux/ffi.jvm.lux +++ b/stdlib/source/library/lux/ffi.jvm.lux @@ -1,7 +1,7 @@ -(.using +(.require [library [lux (.except Primitive Type type int char is as) - ["[0]" meta (.open: "[1]#[0]" monad)] + ["[0]" meta (.use "[1]#[0]" monad)] [abstract ["[0]" monad (.only do)]] [control @@ -9,15 +9,15 @@ ["[0]" maybe] ["[0]" try (.only Try)] ["[0]" exception (.only Exception exception:)] - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<[0]>" code (.only Parser)]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]] [collection ["[0]" array] - ["[0]" list (.open: "[1]#[0]" monad mix monoid)] + ["[0]" list (.use "[1]#[0]" monad mix monoid)] ["[0]" dictionary (.only Dictionary)]]] [macro (.only with_symbols) [syntax (.only syntax)] @@ -36,7 +36,7 @@ ["[0]" signature] ["[0]" reflection] ["[0]" parser]]]] - ["[0]" type (.open: "[1]#[0]" equivalence) + ["[0]" type (.use "[1]#[0]" equivalence) ["[0]" check]]]]) (def internal diff --git a/stdlib/source/library/lux/ffi.lux b/stdlib/source/library/lux/ffi.lux index d63363c38..480582285 100644 --- a/stdlib/source/library/lux/ffi.lux +++ b/stdlib/source/library/lux/ffi.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Symbol Alias Global global function type_of undefined) ["[0]" meta] @@ -6,16 +6,16 @@ ["[0]" monad (.only do)]] [control ["[0]" io] - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" try] - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<[0]>" code (.only Parser)]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format]] [collection - ["[0]" list (.open: "[1]#[0]" monad mix)]]] + ["[0]" list (.use "[1]#[0]" monad mix)]]] ["[0]" macro (.only with_symbols) [syntax (.only syntax)] ["[0]" code] diff --git a/stdlib/source/library/lux/ffi.old.lux b/stdlib/source/library/lux/ffi.old.lux index c7d8c3dd2..cc5e342b1 100644 --- a/stdlib/source/library/lux/ffi.old.lux +++ b/stdlib/source/library/lux/ffi.old.lux @@ -1,7 +1,7 @@ -(.using +(.require [library [lux (.except is as type) - ["[0]" type (.open: "[1]#[0]" equivalence)] + ["[0]" type (.use "[1]#[0]" equivalence)] [abstract ["[0]" monad (.only Monad do)] ["[0]" enum]] @@ -14,12 +14,12 @@ ["<[0]>" code (.only Parser)]]] [data ["[0]" product] - ["[0]" bit (.open: "[1]#[0]" codec)] - ["[0]" text (.open: "[1]#[0]" equivalence monoid) + ["[0]" bit (.use "[1]#[0]" codec)] + ["[0]" text (.use "[1]#[0]" equivalence monoid) ["%" \\format (.only format)]] [collection ["[0]" array (.only Array)] - ["[0]" list (.open: "[1]#[0]" monad mix monoid)]]] + ["[0]" list (.use "[1]#[0]" monad mix monoid)]]] ["[0]" macro (.only with_symbols) [syntax (.only syntax)] ["^" pattern] diff --git a/stdlib/source/library/lux/ffi.php.lux b/stdlib/source/library/lux/ffi.php.lux index 36f828a48..7993d5875 100644 --- a/stdlib/source/library/lux/ffi.php.lux +++ b/stdlib/source/library/lux/ffi.php.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Alias) ["@" target] @@ -8,14 +8,14 @@ [control ["[0]" io] ["[0]" maybe] - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<[0]>" code (.only Parser)]]] [data ["[0]" product] ["[0]" text ["%" \\format]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [type abstract] [macro (.only with_symbols) diff --git a/stdlib/source/library/lux/ffi.scm.lux b/stdlib/source/library/lux/ffi.scm.lux index 0b4918927..df00ad166 100644 --- a/stdlib/source/library/lux/ffi.scm.lux +++ b/stdlib/source/library/lux/ffi.scm.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Alias) ["@" target] @@ -8,14 +8,14 @@ [control ["[0]" io] ["[0]" maybe] - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<[0]>" code (.only Parser)]]] [data ["[0]" product] ["[0]" text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [type abstract] [macro (.only with_symbols) diff --git a/stdlib/source/library/lux/ffi/export.js.lux b/stdlib/source/library/lux/ffi/export.js.lux index 001e58022..2f635e20b 100644 --- a/stdlib/source/library/lux/ffi/export.js.lux +++ b/stdlib/source/library/lux/ffi/export.js.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [extension (.only directive)] @@ -13,7 +13,7 @@ [text ["%" \\format]] [collection - ["[0]" list (.open: "[1]#[0]" monad mix)] + ["[0]" list (.use "[1]#[0]" monad mix)] ["[0]" set]]] ["[0]" macro (.only) [syntax (.only syntax)] diff --git a/stdlib/source/library/lux/ffi/export.jvm.lux b/stdlib/source/library/lux/ffi/export.jvm.lux index 402c8b8da..970ae5481 100644 --- a/stdlib/source/library/lux/ffi/export.jvm.lux +++ b/stdlib/source/library/lux/ffi/export.jvm.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except function) [control @@ -6,7 +6,7 @@ ["<[0]>" code (.only Parser)]]] [data [collection - ["[0]" list (.open: "[1]#[0]" monad)]]] + ["[0]" list (.use "[1]#[0]" monad)]]] [macro [syntax (.only syntax)] ["[0]" code]]]] diff --git a/stdlib/source/library/lux/ffi/export.lua.lux b/stdlib/source/library/lux/ffi/export.lua.lux index 2f4f8345e..6cfe5b891 100644 --- a/stdlib/source/library/lux/ffi/export.lua.lux +++ b/stdlib/source/library/lux/ffi/export.lua.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [extension (.only directive)] @@ -13,7 +13,7 @@ [text ["%" \\format]] [collection - ["[0]" list (.open: "[1]#[0]" monad mix)] + ["[0]" list (.use "[1]#[0]" monad mix)] ["[0]" set]]] ["[0]" macro (.only) [syntax (.only syntax)] diff --git a/stdlib/source/library/lux/ffi/export.py.lux b/stdlib/source/library/lux/ffi/export.py.lux index 4ffa40ba8..1a4b3e054 100644 --- a/stdlib/source/library/lux/ffi/export.py.lux +++ b/stdlib/source/library/lux/ffi/export.py.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [extension (.only directive)] @@ -13,7 +13,7 @@ [text ["%" \\format]] [collection - ["[0]" list (.open: "[1]#[0]" monad mix)] + ["[0]" list (.use "[1]#[0]" monad mix)] ["[0]" set]]] ["[0]" macro (.only) [syntax (.only syntax)] diff --git a/stdlib/source/library/lux/ffi/export.rb.lux b/stdlib/source/library/lux/ffi/export.rb.lux index 633164c92..3c867d4cb 100644 --- a/stdlib/source/library/lux/ffi/export.rb.lux +++ b/stdlib/source/library/lux/ffi/export.rb.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except global) [extension (.only directive)] @@ -15,7 +15,7 @@ ["%" \\format] ["<[1]>" \\parser (.only Parser)]] [collection - ["[0]" list (.open: "[1]#[0]" monad mix)] + ["[0]" list (.use "[1]#[0]" monad mix)] ["[0]" set]]] ["[0]" macro (.only) [syntax (.only syntax)] diff --git a/stdlib/source/library/lux/ffi/node_js.js.lux b/stdlib/source/library/lux/ffi/node_js.js.lux index fb507fca0..1f3f2fb4a 100644 --- a/stdlib/source/library/lux/ffi/node_js.js.lux +++ b/stdlib/source/library/lux/ffi/node_js.js.lux @@ -1,10 +1,10 @@ -(.using +(.require [library [lux (.except) ["[0]" ffi] [control ["[0]" function] - ["[0]" maybe (.open: "[1]#[0]" monoid functor)]]]]) + ["[0]" maybe (.use "[1]#[0]" monoid functor)]]]]) (with_template [<name> <path>] [(def <name> diff --git a/stdlib/source/library/lux/locale.lux b/stdlib/source/library/lux/locale.lux index 7b90f5386..d1c97493d 100644 --- a/stdlib/source/library/lux/locale.lux +++ b/stdlib/source/library/lux/locale.lux @@ -1,11 +1,11 @@ -(.using +(.require [library [lux (.except) [abstract [equivalence (.only Equivalence)] ["[0]" hash (.only Hash)]] [control - ["[0]" maybe (.open: "[1]#[0]" functor)]] + ["[0]" maybe (.use "[1]#[0]" functor)]] [data ["[0]" text (.only) ["%" \\format (.only format)] diff --git a/stdlib/source/library/lux/locale/language.lux b/stdlib/source/library/lux/locale/language.lux index 0e6379d57..bab86a699 100644 --- a/stdlib/source/library/lux/locale/language.lux +++ b/stdlib/source/library/lux/locale/language.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/locale/territory.lux b/stdlib/source/library/lux/locale/territory.lux index 9dfed05f9..9688d691d 100644 --- a/stdlib/source/library/lux/locale/territory.lux +++ b/stdlib/source/library/lux/locale/territory.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/macro.lux b/stdlib/source/library/lux/macro.lux index 35d94cb88..e14bf061b 100644 --- a/stdlib/source/library/lux/macro.lux +++ b/stdlib/source/library/lux/macro.lux @@ -1,12 +1,12 @@ -(.using +(.require [library [lux (.except local symbol function macro) [abstract ["[0]" monad (.only do)]] [data - ["[0]" text (.open: "[1]#[0]" monoid)] + ["[0]" text (.use "[1]#[0]" monoid)] [collection - ["[0]" list (.open: "[1]#[0]" monoid monad)]]] + ["[0]" list (.use "[1]#[0]" monoid monad)]]] [math [number ["[0]" nat] @@ -16,7 +16,7 @@ ["[0]" // ["[1]" meta (.only) ["[0]" location] - ["[0]" symbol (.open: "[1]#[0]" codec)]]]]) + ["[0]" symbol (.use "[1]#[0]" codec)]]]]) (def .public (single_expansion syntax) (-> Code (Meta (List Code))) diff --git a/stdlib/source/library/lux/macro/code.lux b/stdlib/source/library/lux/macro/code.lux index 53b0d826e..23e873e87 100644 --- a/stdlib/source/library/lux/macro/code.lux +++ b/stdlib/source/library/lux/macro/code.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except nat int rev local global symbol) [abstract @@ -6,9 +6,9 @@ [data ["[0]" product] ["[0]" bit] - ["[0]" text (.open: "[1]#[0]" monoid equivalence)] + ["[0]" text (.use "[1]#[0]" monoid equivalence)] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro ["^" pattern]] [math diff --git a/stdlib/source/library/lux/macro/local.lux b/stdlib/source/library/lux/macro/local.lux index 3538cc454..234820376 100644 --- a/stdlib/source/library/lux/macro/local.lux +++ b/stdlib/source/library/lux/macro/local.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except with let) ["[0]" meta] @@ -13,7 +13,7 @@ ["[0]" product] ["[0]" text] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] [dictionary ["[0]" plist (.only PList)]]]]]] ["[0]" // (.only) diff --git a/stdlib/source/library/lux/macro/pattern.lux b/stdlib/source/library/lux/macro/pattern.lux index 7408d86e2..65b469e2d 100644 --- a/stdlib/source/library/lux/macro/pattern.lux +++ b/stdlib/source/library/lux/macro/pattern.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except or let with_template |> `)]]) diff --git a/stdlib/source/library/lux/macro/syntax.lux b/stdlib/source/library/lux/macro/syntax.lux index 94ea416fe..897b778e5 100644 --- a/stdlib/source/library/lux/macro/syntax.lux +++ b/stdlib/source/library/lux/macro/syntax.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] @@ -10,7 +10,7 @@ ["<>" parser (.only) ["</>" code (.only Parser)]]] [data - ["[0]" text (.open: "[1]#[0]" monoid)] + ["[0]" text (.use "[1]#[0]" monoid)] [collection ["[0]" list]]] [math diff --git a/stdlib/source/library/lux/macro/syntax/check.lux b/stdlib/source/library/lux/macro/syntax/check.lux index 774c59e17..4e6d62b18 100644 --- a/stdlib/source/library/lux/macro/syntax/check.lux +++ b/stdlib/source/library/lux/macro/syntax/check.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] diff --git a/stdlib/source/library/lux/macro/syntax/declaration.lux b/stdlib/source/library/lux/macro/syntax/declaration.lux index d5e7ab443..070c1d9c9 100644 --- a/stdlib/source/library/lux/macro/syntax/declaration.lux +++ b/stdlib/source/library/lux/macro/syntax/declaration.lux @@ -1,16 +1,16 @@ -(.using +(.require [library [lux (.except) [abstract [equivalence (.only Equivalence)]] [control - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<[0]>" code (.only Parser)]]] [data ["[0]" product] ["[0]" text] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [macro ["[0]" code]]]]) diff --git a/stdlib/source/library/lux/macro/syntax/definition.lux b/stdlib/source/library/lux/macro/syntax/definition.lux index 02df002bb..030d1bc76 100644 --- a/stdlib/source/library/lux/macro/syntax/definition.lux +++ b/stdlib/source/library/lux/macro/syntax/definition.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Definition) [abstract diff --git a/stdlib/source/library/lux/macro/syntax/export.lux b/stdlib/source/library/lux/macro/syntax/export.lux index 0aedf4a21..1a80d36c1 100644 --- a/stdlib/source/library/lux/macro/syntax/export.lux +++ b/stdlib/source/library/lux/macro/syntax/export.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/macro/syntax/input.lux b/stdlib/source/library/lux/macro/syntax/input.lux index bc6622bc6..f7708aadf 100644 --- a/stdlib/source/library/lux/macro/syntax/input.lux +++ b/stdlib/source/library/lux/macro/syntax/input.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -9,7 +9,7 @@ [data ["[0]" product] [collection - ["[0]" list (.open: "[1]#[0]" monad)]]] + ["[0]" list (.use "[1]#[0]" monad)]]] [macro ["[0]" code]]]]) diff --git a/stdlib/source/library/lux/macro/syntax/type/variable.lux b/stdlib/source/library/lux/macro/syntax/type/variable.lux index fb0f0db06..284699679 100644 --- a/stdlib/source/library/lux/macro/syntax/type/variable.lux +++ b/stdlib/source/library/lux/macro/syntax/type/variable.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/macro/template.lux b/stdlib/source/library/lux/macro/template.lux index 750f4fb8b..be87a83bb 100644 --- a/stdlib/source/library/lux/macro/template.lux +++ b/stdlib/source/library/lux/macro/template.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except let local symbol macro) ["[0]" meta] @@ -7,22 +7,22 @@ [control ["[0]" try (.only Try)] ["[0]" exception (.only exception:)] - ["<>" parser (.open: "[1]#[0]" functor) + ["<>" parser (.use "[1]#[0]" functor) ["<[0]>" code (.only Parser)]]] [data - ["[0]" bit (.open: "[1]#[0]" codec)] + ["[0]" bit (.use "[1]#[0]" codec)] ["[0]" text] [collection - ["[0]" list (.open: "[1]#[0]" monad)] + ["[0]" list (.use "[1]#[0]" monad)] ["[0]" dictionary (.only Dictionary)]]] [macro ["^" pattern]] [math [number - ["[0]" nat (.open: "[1]#[0]" decimal)] - ["[0]" int (.open: "[1]#[0]" decimal)] - ["[0]" rev (.open: "[1]#[0]" decimal)] - ["[0]" frac (.open: "[1]#[0]" decimal)]]]]] + ["[0]" nat (.use "[1]#[0]" decimal)] + ["[0]" int (.use "[1]#[0]" decimal)] + ["[0]" rev (.use "[1]#[0]" decimal)] + ["[0]" frac (.use "[1]#[0]" decimal)]]]]] ["[0]" // (.only) [syntax (.only syntax)] ["[0]" code] diff --git a/stdlib/source/library/lux/math.lux b/stdlib/source/library/lux/math.lux index 913a5c1b0..6feb0ce11 100644 --- a/stdlib/source/library/lux/math.lux +++ b/stdlib/source/library/lux/math.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [extension (.only analysis)] @@ -15,13 +15,13 @@ [text ["%" \\format]] [collection - ["[0]" list (.open: "[1]#[0]" mix)]]] + ["[0]" list (.use "[1]#[0]" mix)]]] [macro [syntax (.only syntax)] ["[0]" template]] [tool [compiler - ["[0]" phase (.open: "[1]#[0]" monad)] + ["[0]" phase (.use "[1]#[0]" monad)] [language [lux ["[0]" analysis (.only Analysis Operation Phase) diff --git a/stdlib/source/library/lux/math/infix.lux b/stdlib/source/library/lux/math/infix.lux index 2a6456e4f..e8d5339a3 100644 --- a/stdlib/source/library/lux/math/infix.lux +++ b/stdlib/source/library/lux/math/infix.lux @@ -1,15 +1,15 @@ -(.using +(.require [library [lux (.except) [abstract [monad (.only do)]] [control - ["<>" parser (.open: "[1]#[0]" functor) + ["<>" parser (.use "[1]#[0]" functor) ["<[0]>" code (.only Parser)]]] [data ["[0]" product] [collection - ["[0]" list (.open: "[1]#[0]" mix)]]] + ["[0]" list (.use "[1]#[0]" mix)]]] [macro [syntax (.only syntax)] ["[0]" code]] diff --git a/stdlib/source/library/lux/math/logic/continuous.lux b/stdlib/source/library/lux/math/logic/continuous.lux index 738497496..fdcfc51f3 100644 --- a/stdlib/source/library/lux/math/logic/continuous.lux +++ b/stdlib/source/library/lux/math/logic/continuous.lux @@ -1,12 +1,12 @@ ... https://en.wikipedia.org/wiki/Many-valued_logic -(.using +(.require [library [lux (.except false true or and not) [abstract [monoid (.only Monoid)]] [math [number - ["/" rev (.open: "[1]#[0]" interval)]]]]]) + ["/" rev (.use "[1]#[0]" interval)]]]]]) (def .public false Rev /#bottom) (def .public true Rev /#top) diff --git a/stdlib/source/library/lux/math/logic/fuzzy.lux b/stdlib/source/library/lux/math/logic/fuzzy.lux index 6d337604e..a3295acd7 100644 --- a/stdlib/source/library/lux/math/logic/fuzzy.lux +++ b/stdlib/source/library/lux/math/logic/fuzzy.lux @@ -1,5 +1,5 @@ ... https://en.wikipedia.org/wiki/Fuzzy_logic -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/math/modular.lux b/stdlib/source/library/lux/math/modular.lux index 183679ce8..b8b2a3adf 100644 --- a/stdlib/source/library/lux/math/modular.lux +++ b/stdlib/source/library/lux/math/modular.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -14,13 +14,13 @@ ["<[0]>" code]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" monoid) + ["[0]" text (.use "[1]#[0]" monoid) ["<[1]>" \\parser (.only Parser)]]] [macro ["[0]" code]] [math [number - ["i" int (.open: "[1]#[0]" decimal)]]] + ["i" int (.use "[1]#[0]" decimal)]]] [type [primitive (.except)]]]] ["[0]" // diff --git a/stdlib/source/library/lux/math/modulus.lux b/stdlib/source/library/lux/math/modulus.lux index 3f976476a..d6fb7577e 100644 --- a/stdlib/source/library/lux/math/modulus.lux +++ b/stdlib/source/library/lux/math/modulus.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] diff --git a/stdlib/source/library/lux/math/number.lux b/stdlib/source/library/lux/math/number.lux index 4e1beb005..3cb0e401d 100644 --- a/stdlib/source/library/lux/math/number.lux +++ b/stdlib/source/library/lux/math/number.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/math/number/complex.lux b/stdlib/source/library/lux/math/number/complex.lux index 58a8cd4be..816b0d19e 100644 --- a/stdlib/source/library/lux/math/number/complex.lux +++ b/stdlib/source/library/lux/math/number/complex.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -9,7 +9,7 @@ ["<[0]>" code]]] [data [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [macro [syntax (.only syntax)]] [math diff --git a/stdlib/source/library/lux/math/number/frac.lux b/stdlib/source/library/lux/math/number/frac.lux index c3203335a..79dc77d92 100644 --- a/stdlib/source/library/lux/math/number/frac.lux +++ b/stdlib/source/library/lux/math/number/frac.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except nat int rev) ["@" target] diff --git a/stdlib/source/library/lux/math/number/i16.lux b/stdlib/source/library/lux/math/number/i16.lux index 7f1cfda9b..613bf9b3f 100644 --- a/stdlib/source/library/lux/math/number/i16.lux +++ b/stdlib/source/library/lux/math/number/i16.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except i64) [abstract diff --git a/stdlib/source/library/lux/math/number/i32.lux b/stdlib/source/library/lux/math/number/i32.lux index 65958842e..90bbf7c59 100644 --- a/stdlib/source/library/lux/math/number/i32.lux +++ b/stdlib/source/library/lux/math/number/i32.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except i64) [type (.only by_example)] diff --git a/stdlib/source/library/lux/math/number/i64.lux b/stdlib/source/library/lux/math/number/i64.lux index c476676a5..24d968f6a 100644 --- a/stdlib/source/library/lux/math/number/i64.lux +++ b/stdlib/source/library/lux/math/number/i64.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except and or not false true) [abstract diff --git a/stdlib/source/library/lux/math/number/i8.lux b/stdlib/source/library/lux/math/number/i8.lux index 6c13fc7ab..5b77180f7 100644 --- a/stdlib/source/library/lux/math/number/i8.lux +++ b/stdlib/source/library/lux/math/number/i8.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except i64) [type (.only by_example)] diff --git a/stdlib/source/library/lux/math/number/int.lux b/stdlib/source/library/lux/math/number/int.lux index 2f13df457..94ea3965e 100644 --- a/stdlib/source/library/lux/math/number/int.lux +++ b/stdlib/source/library/lux/math/number/int.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/math/number/nat.lux b/stdlib/source/library/lux/math/number/nat.lux index 53828d2fa..51d2c68b8 100644 --- a/stdlib/source/library/lux/math/number/nat.lux +++ b/stdlib/source/library/lux/math/number/nat.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/math/number/ratio.lux b/stdlib/source/library/lux/math/number/ratio.lux index c4fe7a26d..a682665b0 100644 --- a/stdlib/source/library/lux/math/number/ratio.lux +++ b/stdlib/source/library/lux/math/number/ratio.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except nat) [abstract @@ -15,12 +15,12 @@ ["<[0]>" code (.only Parser)]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" monoid)]] + ["[0]" text (.use "[1]#[0]" monoid)]] [macro [syntax (.only syntax)] ["[0]" code]]]] [// - ["n" nat (.open: "[1]#[0]" decimal)]]) + ["n" nat (.use "[1]#[0]" decimal)]]) (type: .public Ratio (Record diff --git a/stdlib/source/library/lux/math/number/rev.lux b/stdlib/source/library/lux/math/number/rev.lux index d74da6b2e..a03b60b2e 100644 --- a/stdlib/source/library/lux/math/number/rev.lux +++ b/stdlib/source/library/lux/math/number/rev.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/math/random.lux b/stdlib/source/library/lux/math/random.lux index c7e6d0663..66f80ef25 100644 --- a/stdlib/source/library/lux/math/random.lux +++ b/stdlib/source/library/lux/math/random.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except or and list i64 nat int rev char only) [abstract @@ -7,11 +7,11 @@ [apply (.only Apply)] ["[0]" monad (.only Monad do)]] [data - ["[0]" text (.only Char) (.open: "[1]#[0]" monoid) + ["[0]" text (.only Char) (.use "[1]#[0]" monoid) ["[0]" unicode ["[1]" set]]] [collection - ["[0]" list (.open: "[1]#[0]" mix)] + ["[0]" list (.use "[1]#[0]" mix)] ["[0]" array (.only Array)] ["[0]" dictionary (.only Dictionary)] ["[0]" queue (.only Queue)] diff --git a/stdlib/source/library/lux/meta.lux b/stdlib/source/library/lux/meta.lux index 3c0e85615..6987ae558 100644 --- a/stdlib/source/library/lux/meta.lux +++ b/stdlib/source/library/lux/meta.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except type try macro) [abstract @@ -10,9 +10,9 @@ ["[0]" try (.only Try)]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" monoid order)] + ["[0]" text (.use "[1]#[0]" monoid order)] [collection - ["[0]" list (.open: "[1]#[0]" monoid monad)] + ["[0]" list (.use "[1]#[0]" monoid monad)] [dictionary ["[0]" plist]]]] [macro @@ -23,7 +23,7 @@ ["n" nat] ["i" int]]] [meta - ["[0]" symbol (.open: "[1]#[0]" codec equivalence)]]]] + ["[0]" symbol (.use "[1]#[0]" codec equivalence)]]]] [/ ["[0]" location]]) diff --git a/stdlib/source/library/lux/meta/configuration.lux b/stdlib/source/library/lux/meta/configuration.lux index 9d30b3590..5176ba34c 100644 --- a/stdlib/source/library/lux/meta/configuration.lux +++ b/stdlib/source/library/lux/meta/configuration.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except for) ["[0]" meta] @@ -7,16 +7,16 @@ [monoid (.only Monoid)] [monad (.only do)]] [control - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" exception (.only exception:)] ["<>" parser (.only) ["<[0]>" code]]] [data - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format] ["<[1]>" \\parser (.only Parser)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] [dictionary ["/" plist]]]] [macro diff --git a/stdlib/source/library/lux/meta/location.lux b/stdlib/source/library/lux/meta/location.lux index acb911ab8..061140a94 100644 --- a/stdlib/source/library/lux/meta/location.lux +++ b/stdlib/source/library/lux/meta/location.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except with) [abstract diff --git a/stdlib/source/library/lux/meta/symbol.lux b/stdlib/source/library/lux/meta/symbol.lux index fba56c993..4d393f491 100644 --- a/stdlib/source/library/lux/meta/symbol.lux +++ b/stdlib/source/library/lux/meta/symbol.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -7,7 +7,7 @@ [order (.only Order)] [codec (.only Codec)]] [data - ["[0]" text (.open: "[1]#[0]" equivalence monoid)] + ["[0]" text (.use "[1]#[0]" equivalence monoid)] ["[0]" product]]]]) ... (type: Symbol diff --git a/stdlib/source/library/lux/meta/version.lux b/stdlib/source/library/lux/meta/version.lux index e90c95a53..12789a755 100644 --- a/stdlib/source/library/lux/meta/version.lux +++ b/stdlib/source/library/lux/meta/version.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except for) ["[0]" meta] @@ -9,9 +9,9 @@ ["<>" parser (.only) ["<[0]>" code]]] [data - ["[0]" text (.open: "[1]#[0]" equivalence)] + ["[0]" text (.use "[1]#[0]" equivalence)] [collection - ["[0]" list (.open: "[1]#[0]" mix)]]] + ["[0]" list (.use "[1]#[0]" mix)]]] [macro [syntax (.only syntax)] ["[0]" code]] diff --git a/stdlib/source/library/lux/program.lux b/stdlib/source/library/lux/program.lux index 1e4622bcc..77cdb67fd 100644 --- a/stdlib/source/library/lux/program.lux +++ b/stdlib/source/library/lux/program.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] diff --git a/stdlib/source/library/lux/static.lux b/stdlib/source/library/lux/static.lux index 4fd6c1674..071452a67 100644 --- a/stdlib/source/library/lux/static.lux +++ b/stdlib/source/library/lux/static.lux @@ -1,7 +1,7 @@ -(.using +(.require [library [lux (.except nat int rev if cond) - ["[0]" meta (.open: "[1]#[0]" functor)] + ["[0]" meta (.use "[1]#[0]" functor)] [abstract [monad (.only do)]] [control @@ -9,7 +9,7 @@ ["<[0]>" code]]] [data [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro [syntax (.only syntax)] ["[0]" code]] diff --git a/stdlib/source/library/lux/target.lux b/stdlib/source/library/lux/target.lux index cee1e3084..b3b1b37c9 100644 --- a/stdlib/source/library/lux/target.lux +++ b/stdlib/source/library/lux/target.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except)]]) diff --git a/stdlib/source/library/lux/target/common_lisp.lux b/stdlib/source/library/lux/target/common_lisp.lux index b0107d234..ec18f3c38 100644 --- a/stdlib/source/library/lux/target/common_lisp.lux +++ b/stdlib/source/library/lux/target/common_lisp.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Code int if cond or and comment let symbol) [control @@ -7,7 +7,7 @@ ["[0]" text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" monad monoid)]]] + ["[0]" list (.use "[1]#[0]" monad monoid)]]] [macro ["[0]" template]] [math diff --git a/stdlib/source/library/lux/target/js.lux b/stdlib/source/library/lux/target/js.lux index 5b057a697..453d9e9fc 100644 --- a/stdlib/source/library/lux/target/js.lux +++ b/stdlib/source/library/lux/target/js.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Location Code Label or and function if undefined for comment not int try ++ -- the type_of at) [control @@ -7,7 +7,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro ["[0]" template]] [math diff --git a/stdlib/source/library/lux/target/jvm.lux b/stdlib/source/library/lux/target/jvm.lux index 24135ce07..e5909d3ba 100644 --- a/stdlib/source/library/lux/target/jvm.lux +++ b/stdlib/source/library/lux/target/jvm.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type Primitive Label) [data diff --git a/stdlib/source/library/lux/target/jvm/attribute.lux b/stdlib/source/library/lux/target/jvm/attribute.lux index eb6fd8566..a1796629b 100644 --- a/stdlib/source/library/lux/target/jvm/attribute.lux +++ b/stdlib/source/library/lux/target/jvm/attribute.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Info Code Type) [abstract @@ -24,7 +24,7 @@ [encoding ["[1][0]" unsigned (.only U2 U4)]] ["[1][0]" constant (.only UTF8 Class Value) - ["[2][0]" pool (.only Pool Resource) (.open: "[1]#[0]" monad)]]] + ["[2][0]" pool (.only Pool Resource) (.use "[1]#[0]" monad)]]] ["[0]" / ["[1][0]" constant (.only Constant)] ["[1][0]" code]]) diff --git a/stdlib/source/library/lux/target/jvm/attribute/code.lux b/stdlib/source/library/lux/target/jvm/attribute/code.lux index 835b6726a..24bb2bdd1 100644 --- a/stdlib/source/library/lux/target/jvm/attribute/code.lux +++ b/stdlib/source/library/lux/target/jvm/attribute/code.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Code) [abstract @@ -7,9 +7,9 @@ ["[0]" product] ["[0]" binary (.only Binary)] ["[0]" binary - ["[1]F" \\format (.only Writer) (.open: "[1]#[0]" monoid)]] + ["[1]F" \\format (.only Writer) (.use "[1]#[0]" monoid)]] [collection - ["[0]" sequence (.only Sequence) (.open: "[1]#[0]" functor mix)]]] + ["[0]" sequence (.only Sequence) (.use "[1]#[0]" functor mix)]]] [math [number ["n" nat]]]]] diff --git a/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux b/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux index f71d52cfd..ee7d960cb 100644 --- a/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux +++ b/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/target/jvm/attribute/constant.lux b/stdlib/source/library/lux/target/jvm/attribute/constant.lux index 34c8582ca..799124c9a 100644 --- a/stdlib/source/library/lux/target/jvm/attribute/constant.lux +++ b/stdlib/source/library/lux/target/jvm/attribute/constant.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/target/jvm/bytecode.lux b/stdlib/source/library/lux/target/jvm/bytecode.lux index 99901a4a3..5d74511b8 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type Label int try except) ["[0]" ffi (.only import)] @@ -10,14 +10,14 @@ ["[0]" writer (.only Writer)] ["[0]" state (.only +State)] ["[0]" maybe] - ["[0]" try (.only Try) (.open: "[1]#[0]" monad)] + ["[0]" try (.only Try) (.use "[1]#[0]" monad)] ["[0]" exception (.only exception:)]] [data ["[0]" product] [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" dictionary (.only Dictionary)] ["[0]" sequence (.only Sequence)]]] [macro @@ -31,7 +31,7 @@ ["[0]" / ["[1][0]" address (.only Address)] ["[1][0]" jump (.only Jump Big_Jump)] - ["_" instruction (.only Primitive_Array_Type Instruction Estimator) (.open: "[1]#[0]" monoid)] + ["_" instruction (.only Primitive_Array_Type Instruction Estimator) (.use "[1]#[0]" monoid)] ["[1][0]" environment (.only Environment) [limit ["/[0]" registry (.only Register Registry)] diff --git a/stdlib/source/library/lux/target/jvm/bytecode/address.lux b/stdlib/source/library/lux/target/jvm/bytecode/address.lux index 5c2dd04d2..58a9d411e 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/address.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/address.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment.lux index 14e8d5543..b3f322519 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/environment.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type static has) [abstract diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux index 261e9a5ce..3cda1e1f1 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type static) [abstract @@ -9,7 +9,7 @@ [data ["[0]" product] [binary - ["[0]" \\format (.only Writer) (.open: "[1]#[0]" monoid)]]] + ["[0]" \\format (.only Writer) (.use "[1]#[0]" monoid)]]] [math [number ["n" nat]]]]] diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux index 3aae9a289..88b3e4dec 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux @@ -1,15 +1,15 @@ -(.using +(.require [library [lux (.except Type for static has) [abstract ["[0]" equivalence (.only Equivalence)]] [control - ["[0]" try (.only Try) (.open: "[1]#[0]" functor)]] + ["[0]" try (.only Try) (.use "[1]#[0]" functor)]] [data [binary [\\format (.only Writer)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [math [number ["n" nat]]] diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux index 59c3c50ce..5d485efb2 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux index ca4dfcff6..060e751a5 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [ffi (.only)] diff --git a/stdlib/source/library/lux/target/jvm/bytecode/jump.lux b/stdlib/source/library/lux/target/jvm/bytecode/jump.lux index 676930f65..d2931b2c8 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/jump.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/jump.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/target/jvm/class.lux b/stdlib/source/library/lux/target/jvm/class.lux index cbbc47502..8bb2ea186 100644 --- a/stdlib/source/library/lux/target/jvm/class.lux +++ b/stdlib/source/library/lux/target/jvm/class.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type public private) [abstract @@ -10,7 +10,7 @@ [data ["[0]" product] ["[0]" binary - ["[1]F" \\format (.only Writer) (.open: "[1]#[0]" monoid)]] + ["[1]F" \\format (.only Writer) (.use "[1]#[0]" monoid)]] [collection ["[0]" sequence (.only Sequence)]]]]] ["[0]" // diff --git a/stdlib/source/library/lux/target/jvm/constant.lux b/stdlib/source/library/lux/target/jvm/constant.lux index ebeccfaa4..54b1d15d5 100644 --- a/stdlib/source/library/lux/target/jvm/constant.lux +++ b/stdlib/source/library/lux/target/jvm/constant.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] @@ -11,7 +11,7 @@ ["[0]" product] ["[0]" text] ["[0]" binary - ["[1]F" \\format (.only Writer) (.open: "[1]#[0]" monoid)]]] + ["[1]F" \\format (.only Writer) (.use "[1]#[0]" monoid)]]] [macro ["^" pattern] ["[0]" template]] diff --git a/stdlib/source/library/lux/target/jvm/constant/pool.lux b/stdlib/source/library/lux/target/jvm/constant/pool.lux index 787af5c99..bbfc2be17 100644 --- a/stdlib/source/library/lux/target/jvm/constant/pool.lux +++ b/stdlib/source/library/lux/target/jvm/constant/pool.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" ffi] @@ -14,9 +14,9 @@ ["[0]" product] ["[0]" text] [binary - ["[0]" \\format (.only Writer) (.open: "specification#[0]" monoid)]] + ["[0]" \\format (.only Writer) (.use "specification#[0]" monoid)]] [collection - ["[0]" sequence (.only Sequence) (.open: "[1]#[0]" mix)]]] + ["[0]" sequence (.only Sequence) (.use "[1]#[0]" mix)]]] [math [number ["[0]" int] diff --git a/stdlib/source/library/lux/target/jvm/constant/tag.lux b/stdlib/source/library/lux/target/jvm/constant/tag.lux index 58684f493..060628096 100644 --- a/stdlib/source/library/lux/target/jvm/constant/tag.lux +++ b/stdlib/source/library/lux/target/jvm/constant/tag.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -12,7 +12,7 @@ [primitive (.except)]]]] ["[0]" /// [encoding - ["[1][0]" unsigned (.only U1) (.open: "u1//[0]" equivalence)]]]) + ["[1][0]" unsigned (.only U1) (.use "u1//[0]" equivalence)]]]) (primitive .public Tag U1 diff --git a/stdlib/source/library/lux/target/jvm/encoding/name.lux b/stdlib/source/library/lux/target/jvm/encoding/name.lux index 068c11a36..558dfcad5 100644 --- a/stdlib/source/library/lux/target/jvm/encoding/name.lux +++ b/stdlib/source/library/lux/target/jvm/encoding/name.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/target/jvm/encoding/signed.lux b/stdlib/source/library/lux/target/jvm/encoding/signed.lux index b00ff6ba3..b25fc4412 100644 --- a/stdlib/source/library/lux/target/jvm/encoding/signed.lux +++ b/stdlib/source/library/lux/target/jvm/encoding/signed.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except int) [abstract diff --git a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux index 0d2a16d52..33477f551 100644 --- a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux +++ b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except nat) [abstract diff --git a/stdlib/source/library/lux/target/jvm/field.lux b/stdlib/source/library/lux/target/jvm/field.lux index fa84b191b..d8d6ab791 100644 --- a/stdlib/source/library/lux/target/jvm/field.lux +++ b/stdlib/source/library/lux/target/jvm/field.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type static public private) [abstract @@ -7,7 +7,7 @@ [data ["[0]" product] ["[0]" binary - ["[1]F" \\format (.only Writer) (.open: "[1]#[0]" monoid)]] + ["[1]F" \\format (.only Writer) (.use "[1]#[0]" monoid)]] [collection ["[0]" sequence (.only Sequence)]]]]] ["[0]" // diff --git a/stdlib/source/library/lux/target/jvm/index.lux b/stdlib/source/library/lux/target/jvm/index.lux index f21318b91..e54447e78 100644 --- a/stdlib/source/library/lux/target/jvm/index.lux +++ b/stdlib/source/library/lux/target/jvm/index.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/target/jvm/loader.lux b/stdlib/source/library/lux/target/jvm/loader.lux index a16372f06..0ce3ffe3f 100644 --- a/stdlib/source/library/lux/target/jvm/loader.lux +++ b/stdlib/source/library/lux/target/jvm/loader.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] diff --git a/stdlib/source/library/lux/target/jvm/magic.lux b/stdlib/source/library/lux/target/jvm/magic.lux index a4064361e..b59147f41 100644 --- a/stdlib/source/library/lux/target/jvm/magic.lux +++ b/stdlib/source/library/lux/target/jvm/magic.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control diff --git a/stdlib/source/library/lux/target/jvm/method.lux b/stdlib/source/library/lux/target/jvm/method.lux index 082ede18b..9632c28a0 100644 --- a/stdlib/source/library/lux/target/jvm/method.lux +++ b/stdlib/source/library/lux/target/jvm/method.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type static public private) [abstract @@ -9,7 +9,7 @@ [data ["[0]" product] [binary - ["[0]" \\format (.only Writer) (.open: "[1]#[0]" monoid)]] + ["[0]" \\format (.only Writer) (.use "[1]#[0]" monoid)]] [collection ["[0]" sequence (.only Sequence)] ["[0]" list]]]]] diff --git a/stdlib/source/library/lux/target/jvm/modifier.lux b/stdlib/source/library/lux/target/jvm/modifier.lux index 1034f5cab..058027fab 100644 --- a/stdlib/source/library/lux/target/jvm/modifier.lux +++ b/stdlib/source/library/lux/target/jvm/modifier.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/target/jvm/modifier/inner.lux b/stdlib/source/library/lux/target/jvm/modifier/inner.lux index 693946b75..1537dbe10 100644 --- a/stdlib/source/library/lux/target/jvm/modifier/inner.lux +++ b/stdlib/source/library/lux/target/jvm/modifier/inner.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except static) [type diff --git a/stdlib/source/library/lux/target/jvm/reflection.lux b/stdlib/source/library/lux/target/jvm/reflection.lux index e09c3d85a..262ad8145 100644 --- a/stdlib/source/library/lux/target/jvm/reflection.lux +++ b/stdlib/source/library/lux/target/jvm/reflection.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Primitive type parameter) ["[0]" ffi (.only import)] @@ -6,14 +6,14 @@ [abstract ["[0]" monad (.only do)]] [control - ["[0]" try (.only Try) (.open: "[1]#[0]" functor)] + ["[0]" try (.only Try) (.use "[1]#[0]" functor)] ["[0]" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)] ["<t>" \\parser]] [collection - ["[0]" list (.open: "[1]#[0]" mix functor)] + ["[0]" list (.use "[1]#[0]" mix functor)] ["[0]" array] ["[0]" dictionary]]] [macro diff --git a/stdlib/source/library/lux/target/jvm/type.lux b/stdlib/source/library/lux/target/jvm/type.lux index 3734c5e99..f2ae2d59d 100644 --- a/stdlib/source/library/lux/target/jvm/type.lux +++ b/stdlib/source/library/lux/target/jvm/type.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Primitive Type int char) [abstract @@ -10,7 +10,7 @@ ["[0]" text (.only) ["%" \\format (.only Format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [math [number ["n" nat]]] diff --git a/stdlib/source/library/lux/target/jvm/type/alias.lux b/stdlib/source/library/lux/target/jvm/type/alias.lux index 0ec86571b..9eb7986d2 100644 --- a/stdlib/source/library/lux/target/jvm/type/alias.lux +++ b/stdlib/source/library/lux/target/jvm/type/alias.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type Primitive int char type parameter) [abstract diff --git a/stdlib/source/library/lux/target/jvm/type/box.lux b/stdlib/source/library/lux/target/jvm/type/box.lux index 051f45391..367efa5ed 100644 --- a/stdlib/source/library/lux/target/jvm/type/box.lux +++ b/stdlib/source/library/lux/target/jvm/type/box.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except int char)]] [/// diff --git a/stdlib/source/library/lux/target/jvm/type/category.lux b/stdlib/source/library/lux/target/jvm/type/category.lux index c9115e3b4..772503318 100644 --- a/stdlib/source/library/lux/target/jvm/type/category.lux +++ b/stdlib/source/library/lux/target/jvm/type/category.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Primitive) [macro diff --git a/stdlib/source/library/lux/target/jvm/type/descriptor.lux b/stdlib/source/library/lux/target/jvm/type/descriptor.lux index 3de5b4483..332a1c128 100644 --- a/stdlib/source/library/lux/target/jvm/type/descriptor.lux +++ b/stdlib/source/library/lux/target/jvm/type/descriptor.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Primitive int char) [abstract @@ -6,10 +6,10 @@ [control ["[0]" maybe]] [data - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [math [number ["n" nat]]] diff --git a/stdlib/source/library/lux/target/jvm/type/lux.lux b/stdlib/source/library/lux/target/jvm/type/lux.lux index 3490eaed9..8ae726f26 100644 --- a/stdlib/source/library/lux/target/jvm/type/lux.lux +++ b/stdlib/source/library/lux/target/jvm/type/lux.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Primitive int char type parameter) [abstract @@ -6,10 +6,10 @@ [control ["[0]" try] ["[0]" exception (.only exception:)] - ["<>" parser (.open: "[1]#[0]" monad)]] + ["<>" parser (.use "[1]#[0]" monad)]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)] ["<[1]>" \\parser (.only Parser)]] [collection @@ -17,7 +17,7 @@ ["[0]" dictionary (.only Dictionary)]]] [type [primitive (.except)] - ["[0]" check (.only Check) (.open: "[1]#[0]" monad)]]]] + ["[0]" check (.only Check) (.use "[1]#[0]" monad)]]]] ["[0]" // (.only) [category (.only Void Value Return Method Primitive Object Class Array Var Parameter)] ["[1][0]" descriptor] diff --git a/stdlib/source/library/lux/target/jvm/type/parser.lux b/stdlib/source/library/lux/target/jvm/type/parser.lux index 9eb9db150..15a46e8ec 100644 --- a/stdlib/source/library/lux/target/jvm/type/parser.lux +++ b/stdlib/source/library/lux/target/jvm/type/parser.lux @@ -1,10 +1,10 @@ -(.using +(.require [library [lux (.except Type Primitive int char parameter) [abstract [monad (.only do)]] [control - ["<>" parser (.open: "[1]#[0]" monad)] + ["<>" parser (.use "[1]#[0]" monad)] ["[0]" try] ["[0]" function]] [data diff --git a/stdlib/source/library/lux/target/jvm/type/reflection.lux b/stdlib/source/library/lux/target/jvm/type/reflection.lux index cfd7be86b..cac395b22 100644 --- a/stdlib/source/library/lux/target/jvm/type/reflection.lux +++ b/stdlib/source/library/lux/target/jvm/type/reflection.lux @@ -1,10 +1,10 @@ -(.using +(.require [library [lux (.except Primitive int char) [abstract [equivalence (.only Equivalence)]] [data - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]]] [type [primitive (.except)]]]] diff --git a/stdlib/source/library/lux/target/jvm/type/signature.lux b/stdlib/source/library/lux/target/jvm/type/signature.lux index 288b0a75e..cbde0203a 100644 --- a/stdlib/source/library/lux/target/jvm/type/signature.lux +++ b/stdlib/source/library/lux/target/jvm/type/signature.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Primitive int char) [abstract @@ -7,10 +7,10 @@ [control ["[0]" pipe]] [data - ["[0]" text (.open: "[1]#[0]" hash) + ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [type [primitive (.except)]]]] ["[0]" // diff --git a/stdlib/source/library/lux/target/jvm/version.lux b/stdlib/source/library/lux/target/jvm/version.lux index 9b23f8fff..5d23d62c1 100644 --- a/stdlib/source/library/lux/target/jvm/version.lux +++ b/stdlib/source/library/lux/target/jvm/version.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control diff --git a/stdlib/source/library/lux/target/lua.lux b/stdlib/source/library/lux/target/lua.lux index 7ac944f82..0aed4c5f4 100644 --- a/stdlib/source/library/lux/target/lua.lux +++ b/stdlib/source/library/lux/target/lua.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Location Code Label int if function or and not let local comment the) ["@" target] @@ -14,7 +14,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro [syntax (.only syntax)] ["[0]" template] diff --git a/stdlib/source/library/lux/target/php.lux b/stdlib/source/library/lux/target/php.lux index c7ec0f9f5..9924b5229 100644 --- a/stdlib/source/library/lux/target/php.lux +++ b/stdlib/source/library/lux/target/php.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Location Code Global Label static int if cond or and not comment for try global the parameter) ["@" target] @@ -14,7 +14,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro [syntax (.only syntax)] ["[0]" template] diff --git a/stdlib/source/library/lux/target/python.lux b/stdlib/source/library/lux/target/python.lux index 54a9dbd9c..3a737f2df 100644 --- a/stdlib/source/library/lux/target/python.lux +++ b/stdlib/source/library/lux/target/python.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Location Code not or and list if int comment exec try the is def) ["@" target] @@ -15,7 +15,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro [syntax (.only syntax)] ["[0]" template] diff --git a/stdlib/source/library/lux/target/r.lux b/stdlib/source/library/lux/target/r.lux index f31a950fe..6ec894694 100644 --- a/stdlib/source/library/lux/target/r.lux +++ b/stdlib/source/library/lux/target/r.lux @@ -1,17 +1,17 @@ -(.using +(.require [library [lux (.except Code or and list if function cond not int) [control ["[0]" pipe] ["[0]" function] - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] [parser ["<[0]>" code]]] [data ["[0]" text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro [syntax (.only syntax)] ["[0]" template] diff --git a/stdlib/source/library/lux/target/ruby.lux b/stdlib/source/library/lux/target/ruby.lux index d196e2308..0750ed717 100644 --- a/stdlib/source/library/lux/target/ruby.lux +++ b/stdlib/source/library/lux/target/ruby.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Location Code static int if function or and not comment local global symbol the) ["@" target] @@ -14,7 +14,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro [syntax (.only syntax)] ["[0]" template] diff --git a/stdlib/source/library/lux/target/scheme.lux b/stdlib/source/library/lux/target/scheme.lux index c3d1722b1..5657061a3 100644 --- a/stdlib/source/library/lux/target/scheme.lux +++ b/stdlib/source/library/lux/target/scheme.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Code int or and if cond let symbol) ["@" target] @@ -11,7 +11,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor monoid)]]] + ["[0]" list (.use "[1]#[0]" functor monoid)]]] [macro ["[0]" template]] [math diff --git a/stdlib/source/library/lux/test.lux b/stdlib/source/library/lux/test.lux index 071798222..e562a5d12 100644 --- a/stdlib/source/library/lux/test.lux +++ b/stdlib/source/library/lux/test.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except and for) ["@" target] @@ -13,7 +13,7 @@ ["[0]" io] [concurrency ["[0]" atom (.only Atom)] - ["[0]" async (.only Async) (.open: "[1]#[0]" monad)]] + ["[0]" async (.only Async) (.use "[1]#[0]" monad)]] ["<>" parser (.only) ["<[0]>" code]]] [data @@ -21,7 +21,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" set (.only Set)] ["[0]" dictionary ["[1]" ordered (.only Dictionary)]]]] @@ -29,7 +29,7 @@ ["[0]" instant] ["[0]" duration (.only Duration)]] [math - ["[0]" random (.only Random) (.open: "[1]#[0]" monad)] + ["[0]" random (.only Random) (.use "[1]#[0]" monad)] [number (.only hex) ["n" nat] ["f" frac]]] diff --git a/stdlib/source/library/lux/time.lux b/stdlib/source/library/lux/time.lux index f7a4ddee9..63dd2bbaf 100644 --- a/stdlib/source/library/lux/time.lux +++ b/stdlib/source/library/lux/time.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -13,11 +13,11 @@ ["[0]" try (.only Try)] ["[0]" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" monoid) + ["[0]" text (.use "[1]#[0]" monoid) ["<[1]>" \\parser (.only Parser)]]] [math [number - ["n" nat (.open: "[1]#[0]" decimal)]]] + ["n" nat (.use "[1]#[0]" decimal)]]] [type [primitive (.except)]]]] [/ diff --git a/stdlib/source/library/lux/time/date.lux b/stdlib/source/library/lux/time/date.lux index 5a28fc3a0..fcc1bdc79 100644 --- a/stdlib/source/library/lux/time/date.lux +++ b/stdlib/source/library/lux/time/date.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -13,14 +13,14 @@ ["[0]" try (.only Try)] ["[0]" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" monoid) + ["[0]" text (.use "[1]#[0]" monoid) ["<[1]>" \\parser (.only Parser)]] [collection - ["[0]" list (.open: "[1]#[0]" mix)] + ["[0]" list (.use "[1]#[0]" mix)] ["[0]" dictionary (.only Dictionary)]]] [math [number - ["n" nat (.open: "[1]#[0]" decimal)] + ["n" nat (.use "[1]#[0]" decimal)] ["i" int]]] [type [primitive (.except)]]]] diff --git a/stdlib/source/library/lux/time/day.lux b/stdlib/source/library/lux/time/day.lux index e95975e6e..8436187da 100644 --- a/stdlib/source/library/lux/time/day.lux +++ b/stdlib/source/library/lux/time/day.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except nat) [abstract @@ -11,7 +11,7 @@ ["[0]" try (.only Try)] ["[0]" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" monoid)]] + ["[0]" text (.use "[1]#[0]" monoid)]] [macro ["^" pattern] ["[0]" template]] diff --git a/stdlib/source/library/lux/time/duration.lux b/stdlib/source/library/lux/time/duration.lux index 020ba0275..b8ed4f776 100644 --- a/stdlib/source/library/lux/time/duration.lux +++ b/stdlib/source/library/lux/time/duration.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -12,12 +12,12 @@ ["<>" parser (.only)] ["[0]" try]] [data - ["[0]" text (.open: "[1]#[0]" monoid) + ["[0]" text (.use "[1]#[0]" monoid) ["<[1]>" \\parser (.only Parser)]]] [math [number ["i" int] - ["[0]" nat (.open: "[1]#[0]" decimal)]]] + ["[0]" nat (.use "[1]#[0]" decimal)]]] [type [primitive (.except)]]]] ["[0]" // diff --git a/stdlib/source/library/lux/time/instant.lux b/stdlib/source/library/lux/time/instant.lux index 5f11765f0..cf0c7f1db 100644 --- a/stdlib/source/library/lux/time/instant.lux +++ b/stdlib/source/library/lux/time/instant.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] @@ -15,7 +15,7 @@ ["[0]" try] ["[0]" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" monoid) + ["[0]" text (.use "[1]#[0]" monoid) ["<[1]>" \\parser (.only Parser)]]] [math [number diff --git a/stdlib/source/library/lux/time/month.lux b/stdlib/source/library/lux/time/month.lux index 148da6b30..e9b6d5578 100644 --- a/stdlib/source/library/lux/time/month.lux +++ b/stdlib/source/library/lux/time/month.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -11,7 +11,7 @@ ["[0]" try (.only Try)] ["[0]" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" monoid)]] + ["[0]" text (.use "[1]#[0]" monoid)]] [macro ["^" pattern] ["[0]" template]] diff --git a/stdlib/source/library/lux/time/year.lux b/stdlib/source/library/lux/time/year.lux index 70e93aa19..db1f73958 100644 --- a/stdlib/source/library/lux/time/year.lux +++ b/stdlib/source/library/lux/time/year.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -11,12 +11,12 @@ ["[0]" try (.only Try)] ["[0]" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" monoid) + ["[0]" text (.use "[1]#[0]" monoid) ["<[1]>" \\parser (.only Parser)]]] [math [number - ["n" nat (.open: "[1]#[0]" decimal)] - ["i" int (.open: "[1]#[0]" decimal)]]] + ["n" nat (.use "[1]#[0]" decimal)] + ["i" int (.use "[1]#[0]" decimal)]]] [type [primitive (.except)]]]]) diff --git a/stdlib/source/library/lux/tool/compiler.lux b/stdlib/source/library/lux/tool/compiler.lux index 2912dc635..2da6a3a44 100644 --- a/stdlib/source/library/lux/tool/compiler.lux +++ b/stdlib/source/library/lux/tool/compiler.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Module Code) [control diff --git a/stdlib/source/library/lux/tool/compiler/arity.lux b/stdlib/source/library/lux/tool/compiler/arity.lux index 14e73f0c1..28078039c 100644 --- a/stdlib/source/library/lux/tool/compiler/arity.lux +++ b/stdlib/source/library/lux/tool/compiler/arity.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [math diff --git a/stdlib/source/library/lux/tool/compiler/default/init.lux b/stdlib/source/library/lux/tool/compiler/default/init.lux index 8ad59fc2e..1e37db22b 100644 --- a/stdlib/source/library/lux/tool/compiler/default/init.lux +++ b/stdlib/source/library/lux/tool/compiler/default/init.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target (.only Target)] @@ -11,13 +11,13 @@ [data [binary (.only Binary)] ["[0]" product] - ["[0]" text (.open: "[1]#[0]" hash) + ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" dictionary] ["[0]" set] - ["[0]" sequence (.open: "[1]#[0]" functor)]]] + ["[0]" sequence (.use "[1]#[0]" functor)]]] [meta ["[0]" configuration (.only Configuration)] ["[0]" version]] diff --git a/stdlib/source/library/lux/tool/compiler/default/platform.lux b/stdlib/source/library/lux/tool/compiler/default/platform.lux index 07a7b4c0f..7b8115a43 100644 --- a/stdlib/source/library/lux/tool/compiler/default/platform.lux +++ b/stdlib/source/library/lux/tool/compiler/default/platform.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] @@ -9,23 +9,23 @@ [control ["[0]" function] ["[0]" maybe] - ["[0]" try (.only Try) (.open: "[1]#[0]" monad)] + ["[0]" try (.only Try) (.use "[1]#[0]" monad)] ["[0]" exception (.only exception:)] [concurrency - ["[0]" async (.only Async Resolver) (.open: "[1]#[0]" monad)] + ["[0]" async (.only Async Resolver) (.use "[1]#[0]" monad)] ["[0]" stm (.only Var STM)]]] [data ["[0]" bit] ["[0]" product] ["[0]" binary (.only Binary) ["_" \\format (.only Writer)]] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]] [collection ["[0]" dictionary (.only Dictionary)] - ["[0]" sequence (.only Sequence) (.open: "[1]#[0]" mix)] + ["[0]" sequence (.only Sequence) (.use "[1]#[0]" mix)] ["[0]" set (.only Set)] - ["[0]" list (.open: "[1]#[0]" monoid functor mix)]]] + ["[0]" list (.use "[1]#[0]" monoid functor mix)]]] ["[0]" meta (.only) ["[0]" configuration (.only Configuration)]] [type (.only sharing) @@ -626,7 +626,7 @@ product.left)) ... TODO: Come up with a less hacky way to prevent duplicate imports. - ... This currently assumes that all imports will be specified once in a single .using form. + ... This currently assumes that all imports will be specified once in a single .require form. ... This might not be the case in the future. (def (with_new_dependencies new_dependencies all_dependencies) (-> (List descriptor.Module) (Set descriptor.Module) [(Set descriptor.Module) (Set descriptor.Module)]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux.lux index 7f601efff..b9d334818 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux index 0a1b71dab..a74058ebb 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Tuple Variant nat int rev case local except) [abstract @@ -14,11 +14,11 @@ ["<[0]>" code]]] [data ["[0]" product] - ["[0]" bit (.open: "[1]#[0]" equivalence)] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" bit (.use "[1]#[0]" equivalence)] + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only Format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro [syntax (.only syntax)]] [math diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/complex.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/complex.lux index bca0b70e3..8c3fbea81 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/complex.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/complex.lux @@ -1,15 +1,15 @@ -(.using +(.require [library [lux (.except Tuple Variant) [abstract [equivalence (.only Equivalence)] [hash (.only Hash)]] [data - ["[0]" bit (.open: "[1]#[0]" equivalence)] + ["[0]" bit (.use "[1]#[0]" equivalence)] ["[0]" text (.only) ["%" \\format (.only Format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [math [number ["n" nat]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux index a54acd867..2d3d15ef0 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux @@ -1,27 +1,27 @@ -(.using +(.require [library [lux (.except Variant) [abstract [equivalence (.except)] ["[0]" monad (.only do)]] [control - ["[0]" maybe (.open: "[1]#[0]" monoid monad)] + ["[0]" maybe (.use "[1]#[0]" monoid monad)] ["[0]" try (.only Try)] ["[0]" exception (.only exception:)]] [data - ["[0]" bit (.open: "[1]#[0]" equivalence)] + ["[0]" bit (.use "[1]#[0]" equivalence)] ["[0]" text (.only) ["%" \\format]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" dictionary (.only Dictionary)] - ["[0]" set (.only Set) (.open: "[1]#[0]" equivalence)]]] + ["[0]" set (.only Set) (.use "[1]#[0]" equivalence)]]] [macro ["^" pattern] ["[0]" template]] [math [number - ["n" nat (.open: "[1]#[0]" interval)] + ["n" nat (.use "[1]#[0]" interval)] ["i" int] ["r" rev] ["f" frac]]]]] @@ -118,7 +118,7 @@ _ #0)))) -(open: "/#[0]" ..equivalence) +(use "/#[0]" ..equivalence) (def .public (format value) (%.Format Coverage) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/evaluation.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/evaluation.lux index 69efc223d..d0bb26946 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/evaluation.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/evaluation.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [type (.only sharing)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux index cecf9c460..f177b638e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] @@ -13,7 +13,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor monoid)]]] + ["[0]" list (.use "[1]#[0]" functor monoid)]]] [macro ["^" pattern] ["[0]" template]] @@ -28,7 +28,7 @@ [phase ["[0]" extension]] [/// - ["[0]" phase (.open: "[1]#[0]" monad)] + ["[0]" phase (.use "[1]#[0]" monad)] [meta [archive (.only Archive)]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/macro.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/macro.lux index e66c897e9..50fdf139b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/macro.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/macro.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/module.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/module.lux index a2f23afd5..eb893d890 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/module.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/module.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Label with) [abstract @@ -8,10 +8,10 @@ ["[0]" try] ["[0]" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" mix functor)] + ["[0]" list (.use "[1]#[0]" mix functor)] [dictionary ["[0]" plist]]]] ["[0]" meta]]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/pattern.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/pattern.lux index 841a39b77..f198494ad 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/pattern.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/pattern.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except nat int rev) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/scope.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/scope.lux index 7491c9f00..03edb5564 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/scope.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/scope.lux @@ -1,17 +1,17 @@ -(.using +(.require [library [lux (.except local with) [abstract [monad (.only do)]] [control - ["[0]" maybe (.open: "[1]#[0]" monad)] + ["[0]" maybe (.use "[1]#[0]" monad)] ["[0]" try] ["[0]" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" equivalence)] + ["[0]" text (.use "[1]#[0]" equivalence)] ["[0]" product] [collection - ["[0]" list (.open: "[1]#[0]" functor mix monoid)] + ["[0]" list (.use "[1]#[0]" functor mix monoid)] [dictionary ["[0]" plist]]]]]] ["/" // (.only Environment Operation Phase) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/simple.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/simple.lux index 25ba7b1bd..3a4e21bdf 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/simple.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/simple.lux @@ -1,11 +1,11 @@ -(.using +(.require [library [lux (.except) [abstract [equivalence (.only Equivalence)]] [data - ["[0]" bit (.open: "[1]#[0]" equivalence)] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" bit (.use "[1]#[0]" equivalence)] + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only Format)]]] [macro ["^" pattern]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux index 007289a0a..182199934 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/directive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/directive.lux index 2682f80d8..091ac3b6c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/directive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/directive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Module) [abstract @@ -7,7 +7,7 @@ ["[0]" try]] [data [collection - ["[0]" list (.open: "[1]#[0]" monoid)]]]]] + ["[0]" list (.use "[1]#[0]" monoid)]]]]] [// ["[0]" analysis] ["[0]" synthesis] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux b/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux index 8bc9502fc..6a73833fa 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except symbol) [abstract @@ -10,11 +10,11 @@ [data [binary (.only Binary)] ["[0]" product] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]] [collection ["[0]" sequence (.only Sequence)] - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" set (.only Set)]]] [macro ["^" pattern] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux index 1c621d0ff..025c953c3 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux index 728eb24ec..8e3fff991 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except case) ["[0]" meta] @@ -13,7 +13,7 @@ [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" mix monoid monad)]]] + ["[0]" list (.use "[1]#[0]" mix monoid monad)]]] [math [number ["n" nat]]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux index e0c2a8b41..b0c35fb9f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] @@ -11,10 +11,10 @@ ["[0]" state]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" monad)] + ["[0]" list (.use "[1]#[0]" monad)] ["[0]" dictionary (.only Dictionary)]]] [macro ["[0]" code]] @@ -35,7 +35,7 @@ ["[1][0]" type] ["[1][0]" inference]] [/// - ["[1]" phase (.open: "[1]#[0]" monad)] + ["[1]" phase (.use "[1]#[0]" monad)] [meta [archive (.only Archive)]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux index 3b3a319d3..0592768b2 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except function) ["[0]" meta] @@ -13,7 +13,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" monoid monad)]]] + ["[0]" list (.use "[1]#[0]" monoid monad)]]] [math [number ["n" nat]]] @@ -27,7 +27,7 @@ ["[1][0]" inference] ["[1][0]" scope]] [/// - ["[1]" phase (.open: "[1]#[0]" functor)] + ["[1]" phase (.use "[1]#[0]" functor)] [reference (.only) [variable (.only)]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux index cb4011c73..a46905cf1 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] @@ -7,7 +7,7 @@ [control ["[0]" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]]] [macro ["^" pattern]]]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/simple.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/simple.lux index 416780c05..c20161ec3 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/simple.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/simple.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except nat int rev) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/directive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/directive.lux index 6669776fa..4cb90a248 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/directive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/directive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] @@ -11,7 +11,7 @@ [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" mix monoid)]]]]] + ["[0]" list (.use "[1]#[0]" mix monoid)]]]]] ["[0]" // ["[1][0]" extension] ["[1][0]" analysis] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux index 2f7e4ad0f..6844779c4 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except with) [abstract @@ -11,7 +11,7 @@ ["[0]" exception (.only exception:)]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" order) + ["[0]" text (.use "[1]#[0]" order) ["%" \\format (.only Format format)]] [collection ["[0]" list] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux index e11214c8b..2a887e12d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/common_lisp.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/common_lisp.lux index 962ad9aea..5e7529857 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/common_lisp.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/common_lisp.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" ffi] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux index 71082e284..605c39956 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" ffi] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux index 645d0366c..2200e481c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type Module Primitive type char int) ["[0]" ffi (.only import)] @@ -8,8 +8,8 @@ ["[0]" predicate]] [control ["[0]" pipe] - ["[0]" maybe (.open: "[1]#[0]" functor)] - ["[0]" try (.only Try) (.open: "[1]#[0]" monad)] + ["[0]" maybe (.use "[1]#[0]" functor)] + ["[0]" try (.only Try) (.use "[1]#[0]" monad)] ["[0]" exception (.only exception:)] ["<>" parser (.only) ["<[0]>" code (.only Parser)]]] @@ -17,11 +17,11 @@ [binary (.only Binary) ["[0]" \\format]] ["[0]" product] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)] ["<[1]>" \\parser]] [collection - ["[0]" list (.open: "[1]#[0]" mix monad monoid)] + ["[0]" list (.use "[1]#[0]" mix monad monoid)] ["[0]" array] ["[0]" dictionary (.only Dictionary)] ["[0]" sequence]]] @@ -35,8 +35,8 @@ [target ["[0]" jvm ["[0]!" reflection] - ["_" bytecode (.only Bytecode) (.open: "[1]#[0]" monad)] - ["[0]" modifier (.only Modifier) (.open: "[1]#[0]" monoid)] + ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] ["[0]" attribute] ["[0]" field] ["[0]" version] @@ -46,7 +46,7 @@ ["[0]" pool (.only Resource)]] [encoding ["[0]" name (.only External)]] - ["[1]" type (.only Type Argument Typed) (.open: "[1]#[0]" equivalence) + ["[1]" type (.only Type Argument Typed) (.use "[1]#[0]" equivalence) ["[0]" category (.only Void Value' Value Return' Return Primitive Object Class Array Var Parameter Method)] ["[0]" box] ["[0]" reflection] @@ -56,7 +56,7 @@ ["[0]" alias (.only Aliasing)] ["[0]T" lux (.only Mapping)]]]] ["[0]" type (.only) - ["[0]" check (.only Check) (.open: "[1]#[0]" monad)]]]] + ["[0]" check (.only Check) (.use "[1]#[0]" monad)]]]] ["[0]" // ["[1][0]" lux (.only custom)] ["/[1]" // (.only) @@ -77,7 +77,7 @@ ["[0]A" type] ["[0]" scope]] [/// - ["[0]" phase (.open: "[1]#[0]" monad)] + ["[0]" phase (.use "[1]#[0]" monad)] ["[0]" reference (.only) ["[0]" variable]] [meta diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux index 3b58108c8..2cd5b0a68 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" ffi] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux index f201ff72b..400a7a5e7 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -13,7 +13,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" dictionary (.only Dictionary)]]] [macro ["^" pattern]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux index d2f402d79..04896e028 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" ffi] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux index 96d175553..cc77fa604 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" ffi] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux index 5e2f27c47..c499e23d8 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" ffi] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux index c75faf63a..57f47077e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" ffi] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux index b76766cf7..bb57f5668 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" ffi] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/bundle.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/bundle.lux index 1e2674dc4..1436c1002 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/bundle.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/bundle.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -7,7 +7,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" dictionary (.only Dictionary)]]]]] [// (.only Handler Bundle)]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux index 960e51493..21f260fb8 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type Definition Primitive) ["[0]" ffi (.only import)] @@ -6,9 +6,9 @@ ["[0]" monad (.only do)]] [control ["[0]" pipe] - ["[0]" try (.only Try) (.open: "[1]#[0]" functor)] + ["[0]" try (.only Try) (.use "[1]#[0]" functor)] ["[0]" exception] - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<[0]>" code (.only Parser)]]] [data ["[0]" product] @@ -18,7 +18,7 @@ ["%" \\format (.only format)] ["<[1]>" \\parser]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" dictionary] ["[0]" sequence] ["[0]" set (.only Set)]]] @@ -31,8 +31,8 @@ ["[0]" i32]]] [target [jvm - ["_" bytecode (.only Bytecode) (.open: "[1]#[0]" monad)] - ["[0]" modifier (.only Modifier) (.open: "[1]#[0]" monoid)] + ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] ["[0]" attribute] ["[0]" field] ["[0]" version] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux index a8117080a..0b905495a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] @@ -7,7 +7,7 @@ ["[0]" monad (.only do)]] [control [io (.only IO)] - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" try] ["[0]" exception (.only exception:)] ["<>" parser (.only) @@ -20,7 +20,7 @@ [collection ["[0]" dictionary] ["[0]" array] - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" set (.only Set)]]] [macro ["^" pattern] @@ -28,7 +28,7 @@ [math [number ["n" nat]]] - ["[0]" type (.only sharing) (.open: "[1]#[0]" equivalence) + ["[0]" type (.only sharing) (.use "[1]#[0]" equivalence) ["[0]" check]]]] ["[0]" /// (.only Extender) ["[1][0]" bundle] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux index 246b7455e..94afa28d6 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux index 51ed09e66..62bd29a68 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -14,7 +14,7 @@ [collection ["[0]" dictionary] ["[0]" set] - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [math [number ["f" frac]]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux index a68ac7532..987668fa2 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except)]] [//// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux index e3b3165e9..9dde05bab 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux index 8f07958c0..150ff7dee 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -9,7 +9,7 @@ [data ["[0]" product] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" dictionary]]] [macro ["^" pattern]] @@ -37,7 +37,7 @@ ["[0]" synthesis (.only %synthesis) ["<s>" \\parser (.only Parser)]] [/// - ["[1]" phase (.open: "[1]#[0]" monad)]]]]]) + ["[1]" phase (.use "[1]#[0]" monad)]]]]]) (def .public (custom [parser handler]) (All (_ s) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux index 5d15df243..164544520 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux index 8f05447f9..6bed843bd 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux index febd59454..8daa095ba 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type Label Primitive) [abstract @@ -10,7 +10,7 @@ [data ["[0]" product] [collection - ["[0]" list (.open: "[1]#[0]" monad)] + ["[0]" list (.use "[1]#[0]" monad)] ["[0]" dictionary]]] [math [number @@ -18,7 +18,7 @@ ["[0]" i32]]] [target [jvm - ["_" bytecode (.only Label Bytecode) (.open: "[1]#[0]" monad)] + ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad)] [encoding ["[0]" signed (.only S4)]] ["[0]" type (.only Type) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux index a13cef376..772a680e6 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux @@ -1,21 +1,21 @@ -(.using +(.require [library [lux (.except Type Primitive) [abstract ["[0]" monad (.only do)]] [control ["<>" parser] - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" exception (.only exception:)]] [data ["[0]" product] [binary ["[0]" \\format]] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format] ["<[1]>" \\parser]] [collection - ["[0]" list (.open: "[1]#[0]" monad mix monoid)] + ["[0]" list (.use "[1]#[0]" monad mix monoid)] ["[0]" dictionary (.only Dictionary)] ["[0]" set (.only Set)] ["[0]" sequence]]] @@ -29,14 +29,14 @@ [target [jvm ["[0]" version] - ["[0]" modifier (.open: "[1]#[0]" monoid)] + ["[0]" modifier (.use "[1]#[0]" monoid)] ["[0]" method (.only Method)] ["[0]" class (.only Class)] [constant [pool (.only Resource)]] [encoding ["[0]" name]] - ["_" bytecode (.only Bytecode) (.open: "[1]#[0]" monad) + ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad) ["__" instruction (.only Primitive_Array_Type)]] ["[0]" type (.only Type Typed Argument) ["[0]" category (.only Void Value' Value Return' Return Primitive Object Array Var Parameter)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux index 8860a5568..35d3f07b8 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux index 14c293e39..560f6c1ae 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -13,7 +13,7 @@ ["%" \\format (.only format)]] [collection ["[0]" dictionary] - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro ["^" pattern]] [math @@ -41,7 +41,7 @@ ["[0]" synthesis (.only %synthesis) ["<s>" \\parser (.only Parser)]] [/// - ["[1]" phase (.open: "[1]#[0]" monad)]]]]]) + ["[1]" phase (.use "[1]#[0]" monad)]]]]]) (def .public (custom [parser handler]) (All (_ s) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux index 6d8a3bf73..6546b3d1c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux index 4d9c8ab95..2a76ad856 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux index 02ecee4d4..d908ed1a3 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -14,7 +14,7 @@ [collection ["[0]" dictionary] ["[0]" set] - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [math [number ["f" frac]]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux index d63c2c626..80e7f0f66 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux index bb9e2638d..8adf1ec86 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux index 3335bf992..f36712cd4 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -13,7 +13,7 @@ ["%" \\format (.only format)]] [collection ["[0]" dictionary] - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro ["^" pattern]] [math @@ -43,7 +43,7 @@ ["[0]" synthesis (.only %synthesis) ["<[1]>" \\parser (.only Parser)]] [/// - ["[1]" phase (.open: "[1]#[0]" monad)]]]]]) + ["[1]" phase (.use "[1]#[0]" monad)]]]]]) (def .public (statement expression archive synthesis) Phase! diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux index 1c1f170ce..16d98cda5 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux index 487b9958b..1a9b58970 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux index cdcfb555b..a03635054 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -14,7 +14,7 @@ [collection ["[0]" dictionary] ["[0]" set] - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [math [number ["f" frac]]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux index 3fa89672c..8939e5c6c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux index 180444525..3852ff8b4 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux index 0537a3539..a9681db10 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -13,7 +13,7 @@ ["%" \\format (.only format)]] [collection ["[0]" dictionary] - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro ["^" pattern]] [math @@ -41,7 +41,7 @@ ["[0]" synthesis (.only %synthesis) ["<s>" \\parser (.only Parser)]] [/// - ["[1]" phase (.open: "[1]#[0]" monad)]]]]]) + ["[1]" phase (.use "[1]#[0]" monad)]]]]]) (def .public (custom [parser handler]) (All (_ s) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux index ce451a263..f5ee0933c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux index fdca305d2..e2a5ce49f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux index 20d9da33e..c46114d06 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -14,7 +14,7 @@ [collection ["[0]" dictionary] ["[0]" set] - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [math [number ["f" frac]]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux index a3989de9f..9d8242967 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/synthesis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/synthesis.lux index fcfa9b7ea..54b8a874b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/synthesis.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/synthesis.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except)]] [// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux index e31b13851..9087341e0 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -21,7 +21,7 @@ [analysis (.only)] ["[1][0]" synthesis] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [reference (.only) [variable (.only)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux index 671b46045..333171c4a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except case let if) [abstract @@ -9,7 +9,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix monoid)] + ["[0]" list (.use "[1]#[0]" functor mix monoid)] ["[0]" set]]] [macro ["^" pattern]] @@ -33,7 +33,7 @@ ["//[1]" /// [reference ["[1][0]" variable (.only Register)]] - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [meta [archive (.only Archive)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension.lux index eac649c9c..1d1c8473f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux index e0e2a756d..773a50b72 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux index 9029be0ed..e04607dd1 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except function) [abstract @@ -10,7 +10,7 @@ [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [target ["_" common_lisp (.only Expression Var/1)]]]] ["[0]" // @@ -25,7 +25,7 @@ ["[1][0]" generation (.only Context)] ["//[1]" /// [arity (.only Arity)] - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [reference [variable (.only Register Variable)]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux index f71d3e18b..6ab3d1e38 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Scope) [abstract @@ -8,7 +8,7 @@ [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [math [number ["n" nat]]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux index 419179137..463cefc17 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except i64) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux index 7b2dcab79..7475687e5 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux index a924fbe8f..20b1afabf 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Location) ["[0]" meta] @@ -10,11 +10,11 @@ ["<[0]>" code]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" hash) + ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)] ["[0]" encoding]] [collection - ["[0]" list (.open: "[1]#[0]" functor monoid)] + ["[0]" list (.use "[1]#[0]" functor monoid)] ["[0]" sequence]]] ["[0]" macro (.only) [syntax (.only syntax)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux index 05ed5efea..3796405b1 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -12,7 +12,7 @@ [analysis (.only Variant Tuple)] ["[1][0]" synthesis (.only Synthesis)] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)]]]]) + ["[1][0]" phase (.use "[1]#[0]" monad)]]]]) (def .public (tuple expression archive elemsS+) (Generator (Tuple Synthesis)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux index 680957008..6dde26d12 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -8,7 +8,7 @@ ["<[0]>" code]]] [data [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] ["[0]" meta] ["[0]" macro (.only with_symbols) ["[0]" code] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux index 5d6b92824..657e876ea 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -28,7 +28,7 @@ [analysis (.only)] ["[0]" synthesis] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [reference (.only) [variable (.only)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux index 2e48dea7c..ce5b1a3f8 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except case exec let if) [abstract @@ -8,7 +8,7 @@ [data ["[0]" text] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [macro ["^" pattern]] [math @@ -32,7 +32,7 @@ ["//[1]" /// [reference [variable (.only Register)]] - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [meta [archive (.only Archive)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux index c7c5226ac..6121a5b53 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except function) [abstract @@ -8,7 +8,7 @@ [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [target ["_" js (.only Expression Computation Var Statement)]]]] ["[0]" // @@ -23,7 +23,7 @@ ["[1][0]" generation] ["//[1]" /// [arity (.only Arity)] - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [reference [variable (.only Register Variable)]] [meta diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux index eb9d60063..98411011a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Scope) [abstract @@ -8,7 +8,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [math [number ["n" nat]]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux index 19dd18af2..67cf1d9df 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except i64) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/reference.lux index 6cca81aeb..665f83695 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/reference.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux index 41da758da..fc779ff8c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except i64 left right) ["[0]" meta] @@ -10,12 +10,12 @@ ["<[0]>" code]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" hash) + ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)] [encoding ["[0]" utf8]]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" sequence]]] ["[0]" macro (.only) [syntax (.only syntax)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/structure.lux index 9fdbc4592..abdb1e9b6 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/structure.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Variant Tuple) [abstract @@ -13,7 +13,7 @@ [analysis [complex (.only Variant Tuple)]] ["//[1]" /// (.only) - ["[1][0]" phase (.open: "[1]#[0]" monad)]]]]) + ["[1][0]" phase (.use "[1]#[0]" monad)]]]]) (def .public (tuple generate archive elemsS+) (Generator (Tuple Synthesis)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm.lux index 0a8c1c026..e5994dc9f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -19,7 +19,7 @@ ["[0]" synthesis] [/// ["[0]" reference] - ["[1]" phase (.open: "[1]#[0]" monad)]]]]]) + ["[1]" phase (.use "[1]#[0]" monad)]]]]]) (def .public (generate archive synthesis) Phase diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux index 0ae4da146..ad49fa9e5 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type Label if let exec case int) [abstract @@ -7,8 +7,8 @@ ["[0]" function]] [data [collection - ["[0]" list (.open: "[1]#[0]" mix)]] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" list (.use "[1]#[0]" mix)]] + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]]] [macro ["^" pattern]] @@ -18,7 +18,7 @@ ["[0]" i32]]] [target [jvm - ["_" bytecode (.only Label Bytecode) (.open: "[1]#[0]" monad) + ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad) [environment [limit ["[0]" stack]]]] @@ -35,7 +35,7 @@ [access ["[0]" member (.only Member)]]] [/// - ["[0]" phase (.open: "operation#[0]" monad)] + ["[0]" phase (.use "operation#[0]" monad)] [reference [variable (.only Register)]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux index 5f07e5300..b983c3b7d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux index a4147be81..3f2474f4e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type Label with) [abstract @@ -8,7 +8,7 @@ [binary ["[0]" \\format]] [collection - ["[0]" list (.open: "[1]#[0]" monoid functor)] + ["[0]" list (.use "[1]#[0]" monoid functor)] ["[0]" sequence]]] [math [number @@ -16,9 +16,9 @@ ["[0]" i32]]] [target [jvm - ["_" bytecode (.only Label Bytecode) (.open: "[1]#[0]" monad)] + ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad)] ["[0]" version] - ["[0]" modifier (.only Modifier) (.open: "[1]#[0]" monoid)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] ["[0]" field (.only Field)] ["[0]" method (.only Method)] ["[0]" class (.only Class)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux index cf462455e..8ca23c0f4 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux index dcbaef747..684c05c2e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type type) [data @@ -7,7 +7,7 @@ [target [jvm ["[0]" field (.only Field)] - ["[0]" modifier (.only Modifier) (.open: "[1]#[0]" monoid)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] [type (.only Type) [category (.only Value)]] [constant diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux index 3892b9ef0..51ee2f466 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except type) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux index 0ae3854a7..16a7e67a3 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux @@ -1,13 +1,13 @@ -(.using +(.require [library [lux (.except Type type) [data [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" sequence]]] [target [jvm - ["[0]" modifier (.only Modifier) (.open: "[1]#[0]" monoid)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] ["[0]" field (.only Field)] ["_" bytecode (.only Bytecode)] [type (.only Type) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/count.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/count.lux index e84776579..aed904262 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/count.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/count.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except type) [control diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux index f403f723c..9ad94ea7e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux index 36d83b0f1..95b3fb619 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux @@ -1,18 +1,18 @@ -(.using +(.require [library [lux (.except Type) [abstract ["[0]" monad]] [data [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [math [number ["n" nat]]] [target [jvm ["[0]" field (.only Field)] - ["_" bytecode (.only Bytecode) (.open: "[1]#[0]" monad)] + ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)] [type (.only Type) [category (.only Class)]] [constant diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux index 3e8e0e065..5b6aa435c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux @@ -1,9 +1,9 @@ -(.using +(.require [library [lux (.except) [target [jvm - ["[0]" modifier (.only Modifier) (.open: "[1]#[0]" monoid)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] ["[0]" method (.only Method)]]]]]) (def .public modifier diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux index 8b03c7ae8..b31f0233b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type Label type) [abstract @@ -7,7 +7,7 @@ ["[0]" try]] [data [collection - ["[0]" list (.open: "[1]#[0]" monoid functor)]]] + ["[0]" list (.use "[1]#[0]" monoid functor)]]] [math [number ["n" nat] @@ -15,7 +15,7 @@ ["[0]" i32]]] [target [jvm - ["_" bytecode (.only Label Bytecode) (.open: "[1]#[0]" monad)] + ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad)] ["[0]" method (.only Method)] [constant [pool (.only Resource)]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux index 84ad5a397..86965220b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type Label type) [data @@ -9,7 +9,7 @@ ["n" nat]]] [target [jvm - ["[0]" modifier (.only Modifier) (.open: "[1]#[0]" monoid)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] ["[0]" method (.only Method)] ["_" bytecode (.only Label Bytecode)] [constant diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux index 934e7c561..d60aad8a3 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type type) [abstract @@ -7,7 +7,7 @@ ["[0]" try]] [data [collection - ["[0]" list (.open: "[1]#[0]" monoid functor)]]] + ["[0]" list (.use "[1]#[0]" monoid functor)]]] [math [number ["n" nat]]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux index 7cfe7943e..e8ce71290 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type type) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux index 16909a692..faff66f47 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux @@ -1,9 +1,9 @@ -(.using +(.require [library [lux (.except Type type) [data [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [target [jvm ["[0]" method (.only Method)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux index 2196d5c3e..4dd8d10c4 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Definition) ["[0]" ffi (.only import do_to object)] @@ -15,7 +15,7 @@ [binary (.only Binary) ["[0]" \\format]] ["[0]" product] - ["[0]" text (.open: "[1]#[0]" hash) + ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)]] [collection ["[0]" array] @@ -25,7 +25,7 @@ [jvm ["_" bytecode (.only Bytecode)] ["[0]" loader (.only Library)] - ["[0]" modifier (.only Modifier) (.open: "[1]#[0]" monoid)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] ["[0]" field (.only Field)] ["[0]" method (.only Method)] ["[0]" version] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux index 741098438..f95ac11cc 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -8,13 +8,13 @@ [data ["[0]" product] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [math [number ["n" nat]]] [target [jvm - ["_" bytecode (.only Bytecode) (.open: "[1]#[0]" monad)]]]]] + ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)]]]]] ["[0]" // ["[1][0]" runtime (.only Operation Phase Generator)] ["[1][0]" value] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux index 772482ec8..ad9b0e720 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except i64) ["[0]" ffi (.only import)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux index 8a374a859..2a89c066d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Definition) [abstract @@ -13,7 +13,7 @@ [target [jvm ["_" bytecode (.only Bytecode)] - ["[0]" modifier (.only Modifier) (.open: "[1]#[0]" monoid)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] ["[0]" method (.only Method)] ["[0]" version] ["[0]" class (.only Class)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux index fe905d1bc..b7428004d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -20,7 +20,7 @@ [// ["[0]" generation] [/// - ["[1]" phase (.open: "operation#[0]" monad)] + ["[1]" phase (.use "operation#[0]" monad)] [reference ["[0]" variable (.only Register Variable)]] [meta diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux index b52d18de3..fc28510ff 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Type Definition Label case false true try) [abstract @@ -11,7 +11,7 @@ [binary (.only Binary) ["[0]" \\format]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" sequence]] [text ["%" \\format (.only format)]]] @@ -25,7 +25,7 @@ [target ["[0]" jvm ["_" bytecode (.only Label Bytecode)] - ["[0]" modifier (.only Modifier) (.open: "[1]#[0]" monoid)] + ["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)] ["[0]" field (.only Field)] ["[0]" method (.only Method)] ["[1]/[0]" version] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux index ec2c60d9f..2fa2147b5 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Variant Tuple) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/type.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/type.lux index 974fa4925..7dfbaf164 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/type.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/type.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux index d4f8b9a93..8421401c5 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux @@ -1,10 +1,10 @@ -(.using +(.require [library [lux (.except Type Primitive type) [target [jvm ["_" bytecode (.only Bytecode)] - ["[0]" type (.only Type) (.open: "[1]#[0]" equivalence) + ["[0]" type (.only Type) (.use "[1]#[0]" equivalence) [category (.only Primitive)] ["[0]" box]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux index f0965920a..686747752 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -28,7 +28,7 @@ [analysis (.only)] ["[0]" synthesis] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [reference (.only) [variable (.only)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux index 418694f74..5d87b83d7 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except case exec let if) [abstract @@ -7,7 +7,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" set]]] [macro ["^" pattern]] @@ -30,7 +30,7 @@ ["//[1]" /// [reference ["[1][0]" variable (.only Register)]] - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [meta [archive (.only Archive)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux index 3454cfe52..d23070fc8 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Label function) [abstract @@ -8,7 +8,7 @@ [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [target ["_" lua (.only Var Expression Label Statement)]]]] ["[0]" // @@ -23,7 +23,7 @@ ["[1][0]" generation] ["//[1]" /// [arity (.only Arity)] - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [meta [archive ["[0]" unit]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux index 4878f0b72..53ab302e9 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Label Scope) [abstract @@ -8,7 +8,7 @@ [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" set]]] [math [number diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux index d6104a879..0b5be3e97 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except i64) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux index 47df3bed5..8ebc27887 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux index a287bf380..e23a2c50d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Label Location left right) ["[0]" meta] @@ -10,12 +10,12 @@ ["<[0]>" code]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" hash) + ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)] [encoding ["[0]" utf8]]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" sequence]]] ["[0]" macro (.only) [syntax (.only syntax)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux index 128bedbbe..dd87319b7 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Tuple Variant) [abstract @@ -13,7 +13,7 @@ [analysis [complex (.only Variant Tuple)]] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)]]]]) + ["[1][0]" phase (.use "[1]#[0]" monad)]]]]) (def .public (tuple phase archive elemsS+) (Generator (Tuple Synthesis)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux index 5a1e5294c..f70ea250f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -25,7 +25,7 @@ [analysis (.only)] ["[1][0]" synthesis] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [reference (.only) [variable (.only)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux index da294881a..8fdaeabc9 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except case let if) [abstract @@ -8,7 +8,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" set]]] [macro ["^" pattern]] @@ -32,7 +32,7 @@ ["//[1]" /// [reference ["[1][0]" variable (.only Register)]] - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [meta [archive (.only Archive)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension.lux index eac649c9c..1d1c8473f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux index fd5202409..5ad80978c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux index 5a07d5032..d353cb535 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Global function) [abstract @@ -10,7 +10,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [target ["_" php (.only Var Global Expression Argument Label Statement)]]]] ["[0]" // @@ -25,7 +25,7 @@ ["[1][0]" generation (.only Context)] ["//[1]" /// [arity (.only Arity)] - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [reference [variable (.only Register Variable)]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux index c495d5a12..4a80287a7 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Scope) [abstract @@ -8,7 +8,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" set (.only Set)]]] [math [number diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux index b88e520c8..8a8b6e9b8 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except i64) [math diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/reference.lux index 8d723c451..28164075c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/reference.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux index 425dee836..27e557f1f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Location) ["[0]" meta] @@ -10,12 +10,12 @@ ["<[0]>" code]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" hash) + ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)] [encoding ["[0]" utf8]]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" sequence]]] ["[0]" macro (.only) [syntax (.only syntax)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/structure.lux index 2cc580fe5..749ba0f5d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/structure.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -15,7 +15,7 @@ [analysis (.only Variant Tuple)] ["[1][0]" synthesis (.only Synthesis)] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)]]]]) + ["[1][0]" phase (.use "[1]#[0]" monad)]]]]) (def .public (tuple expression archive elemsS+) (Generator (Tuple Synthesis)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux index f51b79f96..eba1868c0 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -28,7 +28,7 @@ [analysis (.only)] ["[1][0]" synthesis] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [reference (.only) [variable (.only)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux index 48ab895d4..9b7ad5575 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except case exec let if symbol) [abstract @@ -7,7 +7,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" set]]] [macro ["^" pattern]] @@ -34,7 +34,7 @@ ["//[1]" /// [reference ["[1][0]" variable (.only Register)]] - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [meta [archive (.only Archive)] ["[0]" cache diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux index ca93b78d7..efbc2ca8c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except function) [abstract @@ -8,7 +8,7 @@ [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [target ["_" python (.only SVar Expression Statement)]]]] ["[0]" // diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux index def965231..6ef7dd75d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Scope) [abstract @@ -8,7 +8,7 @@ [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" set]]] [math [number diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux index 7e565f3fe..14ced2e59 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except i64) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/reference.lux index 8786e5309..673eb78cf 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/reference.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux index 5c984981b..41fbd5f78 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except ++ left right) [abstract @@ -9,12 +9,12 @@ ["<[0]>" code]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" hash) + ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)] [encoding ["[0]" utf8]]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" sequence]]] ["[0]" macro (.only) [syntax (.only syntax)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/structure.lux index cd9fe5bee..76dcc39ec 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/structure.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Variant Tuple) [abstract @@ -13,7 +13,7 @@ [complex (.only Variant Tuple)]] ["[1][0]" synthesis (.only Synthesis)] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)]]]]) + ["[1][0]" phase (.use "[1]#[0]" monad)]]]]) (def .public (tuple generate archive elemsS+) (Generator (Tuple Synthesis)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux index b73d54264..cb2ccd087 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -23,7 +23,7 @@ [analysis (.only)] ["[1][0]" synthesis] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [reference (.only) [variable (.only)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux index ff52e460e..ac0a29c7e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except case let if) [abstract @@ -8,7 +8,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" set]]] [macro ["^" pattern] @@ -33,7 +33,7 @@ ["//[1]" /// [reference ["[1][0]" variable (.only Register)]] - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [meta [archive (.only Archive)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux index d0933505c..eecc00423 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except function) [abstract @@ -10,7 +10,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [target ["_" r (.only Expression SVar)]]]] ["[0]" // @@ -25,7 +25,7 @@ ["[1][0]" generation (.only Context)] ["//[1]" /// [arity (.only Arity)] - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [reference [variable (.only Register Variable)]] [meta diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux index a3b660bd8..10994fbca 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Scope) [abstract @@ -8,7 +8,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" set (.only Set)]]] [math [number diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux index 1bbd9332c..07ed2ccc8 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except i64) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux index 62d2f235b..32bc797c5 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux @@ -1,4 +1,4 @@ -(.using +(.require lux (lux (control [library [monad (.only do)]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux index fcc48447c..0201e556d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux @@ -1,4 +1,4 @@ -(.using +(.require lux (lux (control [library [monad (.only do)]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/reference.lux index 4cc1f49ba..5097a3c80 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/reference.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux index ff87c9113..ea448fa0a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Location ++ i64) ["[0]" meta] @@ -10,12 +10,12 @@ ["<[0]>" code]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" hash) + ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)] [encoding ["[0]" utf8]]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" sequence]]] ["[0]" macro (.only) [syntax (.only syntax)] @@ -23,7 +23,7 @@ [math [number (.only hex) ["n" nat] - ["i" int (.open: "[1]#[0]" interval)] + ["i" int (.use "[1]#[0]" interval)] ["[0]" i64]]] ["@" target (.only) ["_" r (.only SVar Expression)]]]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/structure.lux index 5e376dd1f..70ff1a0f8 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/structure.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -15,7 +15,7 @@ [analysis (.only Variant Tuple)] ["[1][0]" synthesis (.only Synthesis)] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)]]]]) + ["[1][0]" phase (.use "[1]#[0]" monad)]]]]) (def .public (tuple expression archive elemsS+) (Generator (Tuple Synthesis)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux index 5ee5957eb..62f559549 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except local) ["@" target] @@ -10,7 +10,7 @@ ["[0]" //// ["[1][0]" generation] ["//[1]" /// - ["[0]" phase (.open: "[1]#[0]" monad)] + ["[0]" phase (.use "[1]#[0]" monad)] ["[0]" reference (.only Reference) ["[0]" variable (.only Register Variable)]] [meta diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux index 8cc7466cc..e64b543c1 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -28,7 +28,7 @@ [analysis (.only)] ["[1][0]" synthesis] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [reference (.only) [variable (.only)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux index bd9e27049..9e85dd63f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except case exec let if symbol) [abstract @@ -9,7 +9,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" set]]] [macro ["^" pattern]] @@ -36,7 +36,7 @@ ["//[1]" /// [reference ["[1][0]" variable (.only Register)]] - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [meta [archive (.only Archive)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux index 67fd28d7b..b22497918 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except function) [abstract @@ -8,7 +8,7 @@ [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] [target ["_" ruby (.only LVar GVar Expression Statement)]]]] ["[0]" // diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux index 693f5a46d..46b743b34 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Scope symbol) [abstract @@ -8,7 +8,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" set]]] [math [number diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux index eebaa01d5..609e7683c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except i64) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux index b29560a21..d0d6399dc 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux index 7d5b9d6b4..f1af54d33 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except i64 left right) ["[0]" meta] @@ -10,12 +10,12 @@ ["<[0]>" code]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" hash) + ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)] [encoding ["[0]" utf8]]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" sequence]]] ["[0]" macro (.only) [syntax (.only syntax)] @@ -23,7 +23,7 @@ [math [number (.only hex) ["[0]" i64] - ["[0]" int (.open: "[1]#[0]" interval)]]] + ["[0]" int (.use "[1]#[0]" interval)]]] ["@" target (.only) ["_" ruby (.only Expression LVar Computation Literal Statement)]]]] ["[0]" /// diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux index 3cdbd9591..2438ada4a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Variant Tuple) [abstract @@ -13,7 +13,7 @@ [complex (.only Variant Tuple)]] ["[1][0]" synthesis (.only Synthesis)] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)]]]]) + ["[1][0]" phase (.use "[1]#[0]" monad)]]]]) (def .public (tuple generate archive elemsS+) (Generator (Tuple Synthesis)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux index b6a3a5842..35c505b59 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -23,7 +23,7 @@ [analysis (.only)] ["[1][0]" synthesis] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [reference (.only) [variable (.only)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux index f492d94df..5f07b07e7 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except case let if) [abstract @@ -8,7 +8,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" set]]] [macro ["^" pattern] @@ -33,7 +33,7 @@ ["//[1]" /// [reference ["[1][0]" variable (.only Register)]] - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [meta [archive (.only Archive)]]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension.lux index eac649c9c..1d1c8473f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux index 815a712b3..50cdca756 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -13,7 +13,7 @@ [number (.only hex) ["f" frac]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["dict" dictionary (.only Dictionary)]]] ["[0]" macro (.only with_symbols) ["[0]" code] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux index 8f07bec50..00ebc8b7d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except function) [abstract @@ -10,7 +10,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [target ["_" scheme (.only Expression Computation Var)]]]] ["[0]" // @@ -25,7 +25,7 @@ ["[1][0]" generation (.only Context)] ["//[1]" /// [arity (.only Arity)] - ["[1][0]" phase (.open: "[1]#[0]" monad)] + ["[1][0]" phase (.use "[1]#[0]" monad)] [reference [variable (.only Register Variable)]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux index cd2ebc5af..04fe3dfde 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Scope) [abstract @@ -8,7 +8,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" set (.only Set)]]] [math [number diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux index cba7e79d6..b670b2868 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except i64) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux index cef4fe09f..84dac3329 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [target diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux index 8d145794e..746cf6aff 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Location) ["[0]" meta] @@ -10,12 +10,12 @@ ["<[0]>" code]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" hash) + ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)] [encoding ["[0]" utf8]]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" sequence]]] ["[0]" macro (.only) [syntax (.only syntax)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux index fec696893..d736f2371 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -15,7 +15,7 @@ [analysis (.only Variant Tuple)] ["[1][0]" synthesis (.only Synthesis)] ["//[1]" /// - ["[1][0]" phase (.open: "[1]#[0]" monad)]]]]) + ["[1][0]" phase (.use "[1]#[0]" monad)]]]]) (def .public (tuple expression archive elemsS+) (Generator (Tuple Synthesis)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux index 3e7102696..69c424b5b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -8,7 +8,7 @@ ["[0]" try]] [data [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" dictionary (.only Dictionary)]]] [macro ["^" pattern]]]] @@ -25,7 +25,7 @@ ["[2][0]" simple] ["[2][0]" complex]] [/// - ["[0]" phase (.open: "[1]#[0]" monad)] + ["[0]" phase (.use "[1]#[0]" monad)] [reference (.only) [variable (.only)]]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux index 4f772b16c..a2a43f7d5 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -8,10 +8,10 @@ ["[0]" pipe]] [data ["[0]" product] - ["[0]" bit (.open: "[1]#[0]" equivalence)] - ["[0]" text (.open: "[1]#[0]" equivalence)] + ["[0]" bit (.use "[1]#[0]" equivalence)] + ["[0]" text (.use "[1]#[0]" equivalence)] [collection - ["[0]" list (.open: "[1]#[0]" functor mix monoid)] + ["[0]" list (.use "[1]#[0]" functor mix monoid)] ["[0]" set (.only Set)]]] [macro ["^" pattern]] @@ -31,7 +31,7 @@ ["[2][0]" side] ["[2][0]" member (.only Member)]]] [/// - ["[1]" phase (.open: "[1]#[0]" monad)] + ["[1]" phase (.use "[1]#[0]" monad)] ["[1][0]" reference (.only) ["[1]/[0]" variable (.only Register Variable)]] [meta diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux index 89af418b6..1ab4fbd2b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -6,13 +6,13 @@ ["[0]" enum]] [control ["[0]" pipe] - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" exception (.only exception:)]] [data [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor monoid)]]] + ["[0]" list (.use "[1]#[0]" functor monoid)]]] [macro ["^" pattern]] [math @@ -26,7 +26,7 @@ ["/" synthesis (.only Path Abstraction Synthesis Operation Phase)] [/// [arity (.only Arity)] - ["[0]" phase (.open: "[1]#[0]" monad)] + ["[0]" phase (.use "[1]#[0]" monad)] ["[1][0]" reference (.only) ["[1]/[0]" variable (.only Register Variable)]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux index f3c5fb252..e31a5ca84 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux @@ -1,10 +1,10 @@ -(.using +(.require [library [lux (.except) [abstract ["[0]" monad (.only do)]] [control - ["[0]" maybe (.open: "[1]#[0]" monad)]] + ["[0]" maybe (.use "[1]#[0]" monad)]] [data [collection ["[0]" list]]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux index 1ca58edd0..29837c146 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux @@ -1,10 +1,10 @@ -(.using +(.require [library [lux (.except) [abstract ["[0]" monad (.only do)]] [control - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" try (.only Try)] ["[0]" exception (.only exception:)]] [data @@ -13,7 +13,7 @@ ["%" \\format]] [collection ["[0]" dictionary (.only Dictionary)] - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" set]]] [macro ["^" pattern]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/program.lux b/stdlib/source/library/lux/tool/compiler/language/lux/program.lux index 625448c47..34b894a90 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/program.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/program.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -12,7 +12,7 @@ [text ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]]]] + ["[0]" list (.use "[1]#[0]" functor)]]]]] [//// [meta ["[0]" archive (.only Archive) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux index 054c8eeb2..840502786 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux @@ -24,7 +24,7 @@ ... Lux Code nodes/tokens are annotated with location meta-data ... [file-name, line, column] to keep track of their provenance and ... location, which is helpful for documentation and debugging. -(.using +(.require [library [lux (.except prelude) ["@" target] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux index 722029eb2..74a7e41a1 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Scope i64) [abstract @@ -11,11 +11,11 @@ [data ["[0]" sum] ["[0]" product] - ["[0]" bit (.open: "[1]#[0]" equivalence)] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" bit (.use "[1]#[0]" equivalence)] + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only Format format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" dictionary (.only Dictionary)]]] [macro ["^" pattern]] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access.lux index 76c9a0400..179a48ca8 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/member.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/member.lux index ec159b99a..2618b1421 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/member.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/member.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/side.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/side.lux index df1bda351..0e1f79079 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/side.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/side.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/simple.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/simple.lux index 3774c0319..ce183bf7a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/simple.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/simple.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -7,14 +7,14 @@ [control ["[0]" pipe]] [data - ["[0]" bit (.open: "[1]#[0]" equivalence)] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" bit (.use "[1]#[0]" equivalence)] + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format]]] [macro ["^" pattern]] [math [number - ["[0]" i64 (.open: "[1]#[0]" equivalence)] + ["[0]" i64 (.use "[1]#[0]" equivalence)] ["n" nat] ["i" int] ["f" frac]]]]]) diff --git a/stdlib/source/library/lux/tool/compiler/meta.lux b/stdlib/source/library/lux/tool/compiler/meta.lux index ef6e71986..00e782b29 100644 --- a/stdlib/source/library/lux/tool/compiler/meta.lux +++ b/stdlib/source/library/lux/tool/compiler/meta.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except)]] [// diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/archive.lux index b3b213099..4bdbb734f 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Module has) [abstract @@ -18,13 +18,13 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" dictionary (.only Dictionary)] ["[0]" set] ["[0]" sequence (.only Sequence)]]] [math [number - ["n" nat (.open: "[1]#[0]" equivalence)]]] + ["n" nat (.use "[1]#[0]" equivalence)]]] [type [primitive (.except)]]]] [/ diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/artifact.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/artifact.lux index 252776c37..77a4410d1 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/artifact.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/artifact.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/artifact/category.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/artifact/category.lux index d9801694c..43ae87386 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/artifact/category.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/artifact/category.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Definition) [abstract @@ -7,7 +7,7 @@ ["[0]" maybe]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" equivalence)]] + ["[0]" text (.use "[1]#[0]" equivalence)]] [macro ["^" pattern]] [math diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/key.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/key.lux index 0e35d6528..0e26e7718 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/key.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/key.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [type diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/module.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/module.lux index 4e2757bb8..76822e0e1 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/module.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/module.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Module)]] [/ diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/module/descriptor.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/module/descriptor.lux index 92e8dcc60..b3fc0fb09 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/module/descriptor.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/module/descriptor.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Module) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/module/document.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/module/document.lux index fe4977e8d..d7ccc2a33 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/module/document.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/module/document.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -16,7 +16,7 @@ [type (.only sharing) [primitive (.except)]]]] [/// - ["[0]" signature (.only Signature) (.open: "[1]#[0]" equivalence)] + ["[0]" signature (.only Signature) (.use "[1]#[0]" equivalence)] ["[0]" key (.only Key)]]) (exception: .public (invalid_signature [expected Signature diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux index 9f23cad2e..7949df255 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract @@ -6,7 +6,7 @@ [control ["<>" parser] ["[0]" pipe] - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" exception (.only exception:)]] [data ["[0]" product] @@ -18,7 +18,7 @@ [collection [set (.only Set)] ["[0]" list] - ["[0]" sequence (.only Sequence) (.open: "[1]#[0]" functor mix)] + ["[0]" sequence (.only Sequence) (.use "[1]#[0]" functor mix)] ["[0]" dictionary (.only Dictionary)]]] [macro ["^" pattern]] diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/signature.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/signature.lux index 075e12c77..beb776044 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/signature.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/signature.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/unit.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/unit.lux index 937f87043..175dda1d4 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/unit.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/unit.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache.lux b/stdlib/source/library/lux/tool/compiler/meta/cache.lux index 0ebd1e7d5..fb4085f0e 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/archive.lux index 8876e3e77..4174ebbe6 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/archive.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/archive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux index 69c131082..216a07d76 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [target (.only Target)] diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux index 5640bdd7e..4a1572890 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux @@ -1,5 +1,5 @@ ... https://en.wikipedia.org/wiki/Tree_shaking -(.using +(.require [library [lux (.except all) [abstract @@ -8,7 +8,7 @@ [data ["[0]" product] [collection - ["[0]" list (.open: "[1]#[0]" monoid mix monad)] + ["[0]" list (.use "[1]#[0]" monoid mix monad)] ["[0]" set (.only Set)] ["[0]" dictionary (.only Dictionary)] ["[0]" sequence]]] diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/module.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/module.lux index bdb09274d..8b3dbdcfc 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/module.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/module.lux @@ -1,10 +1,10 @@ -(.using +(.require [library [lux (.except) [abstract ["[0]" monad (.only do)]] [control - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" try (.only Try)] ["[0]" state] [function @@ -13,7 +13,7 @@ ["[0]" text (.only) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" dictionary (.only Dictionary)] ["[0]" set (.only Set)]]]]] [//// diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/module.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/module.lux index ea6c1a660..b261c7c04 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/module.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/module.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] @@ -11,10 +11,10 @@ [data [binary (.only Binary)] ["[0]" product] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" dictionary (.only Dictionary)]]] [world ["[0]" file]]]] diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/purge.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/purge.lux index d538861e6..afa78e37d 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/purge.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/purge.lux @@ -1,17 +1,17 @@ -(.using +(.require [library [lux (.except) [abstract [predicate (.only Predicate)] ["[0]" monad (.only Monad do)]] [control - ["[0]" try (.only Try) (.open: "[1]#[0]" functor)] + ["[0]" try (.only Try) (.use "[1]#[0]" functor)] [concurrency ["[0]" async (.only Async)]]] [data - ["[0]" text (.open: "[1]#[0]" equivalence)] + ["[0]" text (.use "[1]#[0]" equivalence)] [collection - ["[0]" list (.open: "[1]#[0]" mix functor)] + ["[0]" list (.use "[1]#[0]" mix functor)] ["[0]" dictionary (.only Dictionary)] ["[0]" set]]] [math diff --git a/stdlib/source/library/lux/tool/compiler/meta/cli.lux b/stdlib/source/library/lux/tool/compiler/meta/cli.lux index 76c30f475..3c502b3c7 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cli.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cli.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Module Source) [abstract @@ -14,7 +14,7 @@ ["%" \\format] ["<[1]>" \\parser]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [macro ["^" pattern]] [math diff --git a/stdlib/source/library/lux/tool/compiler/meta/cli/compiler.lux b/stdlib/source/library/lux/tool/compiler/meta/cli/compiler.lux index e8c4196dd..7e3a4a569 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cli/compiler.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cli/compiler.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except parameter) [abstract @@ -12,7 +12,7 @@ ["%" \\format] ["<[1]>" \\parser (.only Parser)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [math [number (.only hex)]] [meta diff --git a/stdlib/source/library/lux/tool/compiler/meta/context.lux b/stdlib/source/library/lux/tool/compiler/meta/context.lux index a2126c773..17258fa87 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/context.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/context.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target (.only Target)] diff --git a/stdlib/source/library/lux/tool/compiler/meta/export.lux b/stdlib/source/library/lux/tool/compiler/meta/export.lux index aab3dae55..4b0621fb9 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/export.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/export.lux @@ -1,12 +1,12 @@ -(.using +(.require [library [lux (.except Source) [abstract ["[0]" monad (.only do)]] [control - ["[0]" try (.only Try) (.open: "[1]#[0]" monad)] + ["[0]" try (.only Try) (.use "[1]#[0]" monad)] [concurrency - ["[0]" async (.only Async) (.open: "[1]#[0]" functor)]]] + ["[0]" async (.only Async) (.use "[1]#[0]" functor)]]] [data ["[0]" text (.only) ["%" \\format (.only format)]] diff --git a/stdlib/source/library/lux/tool/compiler/meta/import.lux b/stdlib/source/library/lux/tool/compiler/meta/import.lux index d653afbac..562904334 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/import.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/import.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Module) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/meta/io.lux b/stdlib/source/library/lux/tool/compiler/meta/io.lux index 374e71ef3..9274c9c1c 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/io.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/io.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Code) [data diff --git a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux index 2cef8ada4..2ee82990e 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target (.only Target)] @@ -8,16 +8,16 @@ ["<>" parser] ["[0]" try (.only Try)] [concurrency - ["[0]" async (.only Async) (.open: "[1]#[0]" monad)]]] + ["[0]" async (.only Async) (.use "[1]#[0]" monad)]]] [data ["[0]" product] ["[0]" binary (.only Binary) ["<[1]>" \\parser (.only Parser)]] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]] [collection [set (.only Set)] - ["[0]" list (.open: "[1]#[0]" mix)] + ["[0]" list (.use "[1]#[0]" mix)] ["[0]" dictionary (.only Dictionary)] ["[0]" sequence (.only Sequence)]]] [macro diff --git a/stdlib/source/library/lux/tool/compiler/meta/io/context.lux b/stdlib/source/library/lux/tool/compiler/meta/io/context.lux index e79b60e7b..9909f8a5d 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/io/context.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/io/context.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Module Code) ["@" target] @@ -10,10 +10,10 @@ ["[0]" try (.only Try)] ["[0]" exception (.only exception:)] [concurrency - ["[0]" async (.only Async) (.open: "[1]#[0]" monad)]]] + ["[0]" async (.only Async) (.use "[1]#[0]" monad)]]] [data [binary (.only Binary)] - ["[0]" text (.open: "[1]#[0]" hash) + ["[0]" text (.use "[1]#[0]" hash) ["%" \\format (.only format)] [encoding ["[0]" utf8]]] diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager.lux b/stdlib/source/library/lux/tool/compiler/meta/packager.lux index 759cb26a5..59d28df77 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control @@ -9,7 +9,7 @@ [collection [dictionary (.only Dictionary)] ["[0]" sequence] - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [world ["[0]" file]]]] [// diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux index ddc522426..2ff0b2d95 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux @@ -1,11 +1,11 @@ -(.using +(.require [library [lux (.except Module Definition) ["[0]" ffi (.only import do_to)] [abstract ["[0]" monad (.only Monad do)]] [control - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" try (.only Try)]] [data ["[0]" binary (.only Binary)] @@ -13,7 +13,7 @@ ["%" \\format (.only format)]] [collection ["[0]" sequence] - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" dictionary] ["[0]" set (.only Set)]]] [math diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux index cc5938094..c59a31672 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [type (.only sharing)] @@ -15,7 +15,7 @@ ["[0]" utf8]]] [collection ["[0]" sequence] - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" dictionary (.only Dictionary)] ["[0]" set (.only Set)]]] [math diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux index 70f595ff4..a574aab07 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Module) [type (.only sharing)] @@ -15,7 +15,7 @@ ["[0]" encoding]] [collection ["[0]" sequence] - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" dictionary (.only Dictionary)] ["[0]" set]] [format diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux index d68c344e5..042b0fcdb 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [type (.only sharing)] @@ -16,7 +16,7 @@ [collection ["[0]" sequence] ["[0]" set (.only Set)] - ["[0]" list (.open: "[1]#[0]" functor)]]]]] + ["[0]" list (.use "[1]#[0]" functor)]]]]] ["[0]" // (.only Packager) [// ["[0]" archive (.only Output) diff --git a/stdlib/source/library/lux/tool/compiler/phase.lux b/stdlib/source/library/lux/tool/compiler/phase.lux index c2aa03feb..f27b3a5e3 100644 --- a/stdlib/source/library/lux/tool/compiler/phase.lux +++ b/stdlib/source/library/lux/tool/compiler/phase.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except except with) [abstract @@ -6,7 +6,7 @@ [monad (.only Monad do)]] [control ["[0]" state] - ["[0]" try (.only Try) (.open: "[1]#[0]" functor)] + ["[0]" try (.only Try) (.use "[1]#[0]" functor)] ["[0]" exception (.only Exception)] ["[0]" io]] [data diff --git a/stdlib/source/library/lux/tool/compiler/reference.lux b/stdlib/source/library/lux/tool/compiler/reference.lux index 9701fbf11..116d4bf62 100644 --- a/stdlib/source/library/lux/tool/compiler/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/reference.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except local) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/reference/variable.lux b/stdlib/source/library/lux/tool/compiler/reference/variable.lux index 7dd3cdc4c..bb93abe4b 100644 --- a/stdlib/source/library/lux/tool/compiler/reference/variable.lux +++ b/stdlib/source/library/lux/tool/compiler/reference/variable.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/tool/compiler/version.lux b/stdlib/source/library/lux/tool/compiler/version.lux index 1c8b12785..2fd579803 100644 --- a/stdlib/source/library/lux/tool/compiler/version.lux +++ b/stdlib/source/library/lux/tool/compiler/version.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/tool/interpreter.lux b/stdlib/source/library/lux/tool/interpreter.lux index da8c16991..ffad15a59 100644 --- a/stdlib/source/library/lux/tool/interpreter.lux +++ b/stdlib/source/library/lux/tool/interpreter.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control @@ -6,7 +6,7 @@ ["[0]" try (.only Try)] ["ex" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]]] [type (.only sharing) ["[0]" check]] diff --git a/stdlib/source/library/lux/tool/mediator.lux b/stdlib/source/library/lux/tool/mediator.lux index 296639661..2d41358ad 100644 --- a/stdlib/source/library/lux/tool/mediator.lux +++ b/stdlib/source/library/lux/tool/mediator.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Source Module) [world diff --git a/stdlib/source/library/lux/type.lux b/stdlib/source/library/lux/type.lux index 933d0e03c..5fd9c1cc7 100644 --- a/stdlib/source/library/lux/type.lux +++ b/stdlib/source/library/lux/type.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except function as let) ["@" target] @@ -13,20 +13,20 @@ ["<[0]>" code (.only Parser)]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" monoid equivalence)] + ["[0]" text (.use "[1]#[0]" monoid equivalence)] [collection ["[0]" array] - ["[0]" list (.open: "[1]#[0]" monad monoid mix)]]] + ["[0]" list (.use "[1]#[0]" monad monoid mix)]]] ["[0]" macro (.only) [syntax (.only syntax)] ["^" pattern] ["[0]" code]] [math [number - ["n" nat (.open: "[1]#[0]" decimal)]]] + ["n" nat (.use "[1]#[0]" decimal)]]] ["[0]" meta (.only) ["[0]" location] - ["[0]" symbol (.open: "[1]#[0]" equivalence codec)]]]]) + ["[0]" symbol (.use "[1]#[0]" equivalence codec)]]]]) (with_template [<name> <tag>] [(def .public (<name> type) diff --git a/stdlib/source/library/lux/type/check.lux b/stdlib/source/library/lux/type/check.lux index 7241146ec..0c91e0c24 100644 --- a/stdlib/source/library/lux/type/check.lux +++ b/stdlib/source/library/lux/type/check.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except try except with) ["@" target] @@ -12,16 +12,16 @@ ["[0]" exception (.only Exception exception:)]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" monoid equivalence)] + ["[0]" text (.use "[1]#[0]" monoid equivalence)] [collection - ["[0]" list (.open: "[1]#[0]" mix)] + ["[0]" list (.use "[1]#[0]" mix)] ["[0]" set (.only Set)]]] [macro ["^" pattern]] [math [number - ["n" nat (.open: "[1]#[0]" decimal)]]]]] - ["[0]" // (.open: "[1]#[0]" equivalence)]) + ["n" nat (.use "[1]#[0]" decimal)]]]]] + ["[0]" // (.use "[1]#[0]" equivalence)]) (def !n#= (template (_ reference subject) @@ -132,7 +132,7 @@ ))) )) -(open: "check#[0]" ..monad) +(use "check#[0]" ..monad) (def (var::new id plist) (-> Var Type_Vars Type_Vars) diff --git a/stdlib/source/library/lux/type/dynamic.lux b/stdlib/source/library/lux/type/dynamic.lux index 169e16464..9c41cffff 100644 --- a/stdlib/source/library/lux/type/dynamic.lux +++ b/stdlib/source/library/lux/type/dynamic.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except static) ["[0]" debug] diff --git a/stdlib/source/library/lux/type/implicit.lux b/stdlib/source/library/lux/type/implicit.lux index fb06527c8..733760bf5 100644 --- a/stdlib/source/library/lux/type/implicit.lux +++ b/stdlib/source/library/lux/type/implicit.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except with) [abstract @@ -11,10 +11,10 @@ ["<[0]>" code (.only Parser)]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" monad mix)] + ["[0]" list (.use "[1]#[0]" monad mix)] ["[0]" dictionary (.only Dictionary)]]] ["[0]" macro (.only) ["[0]" code] @@ -23,7 +23,7 @@ ["[0]" number (.only) ["n" nat]]] ["[0]" meta] - ["[0]" type (.open: "[1]#[0]" equivalence) + ["[0]" type (.use "[1]#[0]" equivalence) ["[0]" check (.only Check)]]]]) (def (type_var id env) diff --git a/stdlib/source/library/lux/type/poly.lux b/stdlib/source/library/lux/type/poly.lux index 997c7b65f..1555bfe9a 100644 --- a/stdlib/source/library/lux/type/poly.lux +++ b/stdlib/source/library/lux/type/poly.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] @@ -7,14 +7,14 @@ ["[0]" monad (.only do)]] [control ["[0]" maybe] - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<[0]>" type (.only Env)] ["<[0]>" code (.only Parser)]]] [data ["[0]" product] ["[0]" text] [collection - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" dictionary]]] [macro (.only with_symbols) [syntax (.only syntax)] diff --git a/stdlib/source/library/lux/type/primitive.lux b/stdlib/source/library/lux/type/primitive.lux index 274e07b32..52655b950 100644 --- a/stdlib/source/library/lux/type/primitive.lux +++ b/stdlib/source/library/lux/type/primitive.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] @@ -6,19 +6,19 @@ [monad (.only Monad do)]] [control ["[0]" exception (.only exception:)] - ["<>" parser (.open: "[1]#[0]" monad) + ["<>" parser (.use "[1]#[0]" monad) ["<[0]>" code (.only Parser)]]] [data - ["[0]" text (.open: "[1]#[0]" equivalence monoid)] + ["[0]" text (.use "[1]#[0]" equivalence monoid)] [collection - ["[0]" list (.open: "[1]#[0]" functor monoid)]]] + ["[0]" list (.use "[1]#[0]" functor monoid)]]] [macro ["^" pattern] ["[0]" code] [syntax (.only syntax) ["|[0]|" export]]] [meta - ["[0]" symbol (.open: "[1]#[0]" codec)]]]] + ["[0]" symbol (.use "[1]#[0]" codec)]]]] ["[0]" //]) (type: Stack diff --git a/stdlib/source/library/lux/type/quotient.lux b/stdlib/source/library/lux/type/quotient.lux index 355e14d0e..bec09aeeb 100644 --- a/stdlib/source/library/lux/type/quotient.lux +++ b/stdlib/source/library/lux/type/quotient.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except type) [abstract diff --git a/stdlib/source/library/lux/type/refinement.lux b/stdlib/source/library/lux/type/refinement.lux index 5b1cec8db..4292f771c 100644 --- a/stdlib/source/library/lux/type/refinement.lux +++ b/stdlib/source/library/lux/type/refinement.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except type only) [abstract diff --git a/stdlib/source/library/lux/type/resource.lux b/stdlib/source/library/lux/type/resource.lux index c906fc13e..dd1421e6a 100644 --- a/stdlib/source/library/lux/type/resource.lux +++ b/stdlib/source/library/lux/type/resource.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["[0]" meta] @@ -16,7 +16,7 @@ [collection ["[0]" set] ["[0]" sequence (.only Sequence)] - ["[0]" list (.open: "[1]#[0]" functor mix)]]] + ["[0]" list (.use "[1]#[0]" functor mix)]]] ["[0]" macro (.only) [syntax (.only syntax)]] [math diff --git a/stdlib/source/library/lux/type/unit.lux b/stdlib/source/library/lux/type/unit.lux index ba76121f0..1b63245bf 100644 --- a/stdlib/source/library/lux/type/unit.lux +++ b/stdlib/source/library/lux/type/unit.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except type) [abstract diff --git a/stdlib/source/library/lux/type/unit/scale.lux b/stdlib/source/library/lux/type/unit/scale.lux index efca489a0..c4aa8cbba 100644 --- a/stdlib/source/library/lux/type/unit/scale.lux +++ b/stdlib/source/library/lux/type/unit/scale.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except type) [control diff --git a/stdlib/source/library/lux/type/variance.lux b/stdlib/source/library/lux/type/variance.lux index 53797fc61..68c9b4af3 100644 --- a/stdlib/source/library/lux/type/variance.lux +++ b/stdlib/source/library/lux/type/variance.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [meta diff --git a/stdlib/source/library/lux/world/console.lux b/stdlib/source/library/lux/world/console.lux index b5cc2db91..3017f0ba0 100644 --- a/stdlib/source/library/lux/world/console.lux +++ b/stdlib/source/library/lux/world/console.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] @@ -7,11 +7,11 @@ [monad (.only do)]] [control ["[0]" maybe] - ["[0]" try (.only Try) (.open: "[1]#[0]" functor)] + ["[0]" try (.only Try) (.use "[1]#[0]" functor)] ["[0]" exception (.only exception:)] - ["[0]" io (.only IO io) (.open: "[1]#[0]" functor)] + ["[0]" io (.only IO io) (.use "[1]#[0]" functor)] [concurrency - ["[0]" async (.only Async) (.open: "[1]#[0]" monad)] + ["[0]" async (.only Async) (.use "[1]#[0]" monad)] ["[0]" atom]]] [data ["[0]" text (.only Char) diff --git a/stdlib/source/library/lux/world/db/jdbc.lux b/stdlib/source/library/lux/world/db/jdbc.lux index 243ced2bf..dca7d1581 100644 --- a/stdlib/source/library/lux/world/db/jdbc.lux +++ b/stdlib/source/library/lux/world/db/jdbc.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except and int) [control @@ -8,7 +8,7 @@ ["[0]" try (.only Try)] ["ex" exception] [concurrency - ["[0]" async (.only Async) (.open: "[1]#[0]" monad)]] + ["[0]" async (.only Async) (.use "[1]#[0]" monad)]] [security ["!" capability (.only capability:)]]] [data diff --git a/stdlib/source/library/lux/world/db/jdbc/input.lux b/stdlib/source/library/lux/world/db/jdbc/input.lux index c0e48dec4..d691dd330 100644 --- a/stdlib/source/library/lux/world/db/jdbc/input.lux +++ b/stdlib/source/library/lux/world/db/jdbc/input.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except and int) [ffi (.only import)] diff --git a/stdlib/source/library/lux/world/db/jdbc/output.lux b/stdlib/source/library/lux/world/db/jdbc/output.lux index a844ac78a..1cfd859e2 100644 --- a/stdlib/source/library/lux/world/db/jdbc/output.lux +++ b/stdlib/source/library/lux/world/db/jdbc/output.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except and int) [ffi (.only import)] diff --git a/stdlib/source/library/lux/world/db/sql.lux b/stdlib/source/library/lux/world/db/sql.lux index 5dd75c61e..90b27d4e6 100644 --- a/stdlib/source/library/lux/world/db/sql.lux +++ b/stdlib/source/library/lux/world/db/sql.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Source Definition function and or not type int) [control @@ -6,10 +6,10 @@ [data [number ["i" int]] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]] [collection - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] [macro ["[0]" template]] [type diff --git a/stdlib/source/library/lux/world/file.lux b/stdlib/source/library/lux/world/file.lux index 17bc128e1..f67b82bc7 100644 --- a/stdlib/source/library/lux/world/file.lux +++ b/stdlib/source/library/lux/world/file.lux @@ -1,4 +1,4 @@ -(.`` (.`` (.using +(.`` (.`` (.require [library [lux (.except open) ["@" target] @@ -6,23 +6,23 @@ ["[0]" monad (.only Monad do)]] [control ["[0]" pipe] - ["[0]" maybe (.open: "[1]#[0]" functor)] - ["[0]" try (.only Try) (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] + ["[0]" try (.only Try) (.use "[1]#[0]" functor)] ["[0]" exception (.only exception:)] - ["[0]" io (.only IO) (.open: "[1]#[0]" functor)] + ["[0]" io (.only IO) (.use "[1]#[0]" functor)] ["[0]" function] [concurrency ["[0]" async (.only Async)] ["[0]" stm (.only Var STM)]]] [data - ["[0]" bit (.open: "[1]#[0]" equivalence)] + ["[0]" bit (.use "[1]#[0]" equivalence)] ["[0]" product] ["[0]" binary (.only Binary)] - ["[0]" text (.open: "[1]#[0]" equivalence) + ["[0]" text (.use "[1]#[0]" equivalence) ["%" \\format (.only format)]] [collection ["[0]" array (.only Array)] - ["[0]" list (.open: "[1]#[0]" functor)] + ["[0]" list (.use "[1]#[0]" functor)] ["[0]" dictionary (.only Dictionary)]]] ["[0]" ffi (.only) (.~~ (.for "JavaScript" (.~~ (.these ["[0]" node_js])) diff --git a/stdlib/source/library/lux/world/file/watch.lux b/stdlib/source/library/lux/world/file/watch.lux index d756ed11c..0b2ae94fe 100644 --- a/stdlib/source/library/lux/world/file/watch.lux +++ b/stdlib/source/library/lux/world/file/watch.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except all) ["@" target] @@ -20,14 +20,14 @@ ["%" \\format (.only format)]] [collection ["[0]" dictionary (.only Dictionary)] - ["[0]" list (.open: "[1]#[0]" functor monoid mix)] + ["[0]" list (.use "[1]#[0]" functor monoid mix)] ["[0]" set] ["[0]" array]]] [math [number ["n" nat]]] [time - ["[0]" instant (.only Instant) (.open: "[1]#[0]" equivalence)]] + ["[0]" instant (.only Instant) (.use "[1]#[0]" equivalence)]] [type [primitive (.only primitive representation abstraction)]]]] ["[0]" //]) diff --git a/stdlib/source/library/lux/world/input/keyboard.lux b/stdlib/source/library/lux/world/input/keyboard.lux index baaac2289..8adc006d5 100644 --- a/stdlib/source/library/lux/world/input/keyboard.lux +++ b/stdlib/source/library/lux/world/input/keyboard.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except left right)]]) diff --git a/stdlib/source/library/lux/world/net.lux b/stdlib/source/library/lux/world/net.lux index 1cc6b09a6..2daa67ac6 100644 --- a/stdlib/source/library/lux/world/net.lux +++ b/stdlib/source/library/lux/world/net.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except Location)]]) diff --git a/stdlib/source/library/lux/world/net/http.lux b/stdlib/source/library/lux/world/net/http.lux index a39c3d371..8bb920891 100644 --- a/stdlib/source/library/lux/world/net/http.lux +++ b/stdlib/source/library/lux/world/net/http.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control diff --git a/stdlib/source/library/lux/world/net/http/client.lux b/stdlib/source/library/lux/world/net/http/client.lux index c23b58b95..333e4ed5a 100644 --- a/stdlib/source/library/lux/world/net/http/client.lux +++ b/stdlib/source/library/lux/world/net/http/client.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] @@ -8,7 +8,7 @@ [control ["[0]" pipe] ["[0]" io (.only IO)] - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" try (.only Try)] [concurrency ["[0]" async (.only Async)]] diff --git a/stdlib/source/library/lux/world/net/http/cookie.lux b/stdlib/source/library/lux/world/net/http/cookie.lux index 26ef5688a..c73ffb833 100644 --- a/stdlib/source/library/lux/world/net/http/cookie.lux +++ b/stdlib/source/library/lux/world/net/http/cookie.lux @@ -1,10 +1,10 @@ -(.using +(.require [library [lux (.except) [control [monad (.only do)] ["[0]" try (.only Try)] - ["p" parser (.open: "[1]#[0]" monad) + ["p" parser (.use "[1]#[0]" monad) ["l" text (.only Parser)]]] [data [number diff --git a/stdlib/source/library/lux/world/net/http/header.lux b/stdlib/source/library/lux/world/net/http/header.lux index a8bc408a0..21b00565a 100644 --- a/stdlib/source/library/lux/world/net/http/header.lux +++ b/stdlib/source/library/lux/world/net/http/header.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control diff --git a/stdlib/source/library/lux/world/net/http/mime.lux b/stdlib/source/library/lux/world/net/http/mime.lux index ff449a568..76a1fe51f 100644 --- a/stdlib/source/library/lux/world/net/http/mime.lux +++ b/stdlib/source/library/lux/world/net/http/mime.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [data diff --git a/stdlib/source/library/lux/world/net/http/query.lux b/stdlib/source/library/lux/world/net/http/query.lux index 72f5c345d..2541a9c6d 100644 --- a/stdlib/source/library/lux/world/net/http/query.lux +++ b/stdlib/source/library/lux/world/net/http/query.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control diff --git a/stdlib/source/library/lux/world/net/http/request.lux b/stdlib/source/library/lux/world/net/http/request.lux index 13c57ed23..e4c1eebb9 100644 --- a/stdlib/source/library/lux/world/net/http/request.lux +++ b/stdlib/source/library/lux/world/net/http/request.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [control @@ -19,7 +19,7 @@ ["[0]" json (.only JSON) ["<[1]>" \\parser]]] [collection - ["[0]" list (.open: "[1]#[0]" functor mix)] + ["[0]" list (.use "[1]#[0]" functor mix)] ["[0]" dictionary]]] [macro ["^" pattern]] diff --git a/stdlib/source/library/lux/world/net/http/response.lux b/stdlib/source/library/lux/world/net/http/response.lux index 277f21202..68e9fe674 100644 --- a/stdlib/source/library/lux/world/net/http/response.lux +++ b/stdlib/source/library/lux/world/net/http/response.lux @@ -1,10 +1,10 @@ -(.using +(.require [library [lux (.except static) [control [concurrency ["[0]" async] - ["[0]" frp (.open: "[1]#[0]" monad)]]] + ["[0]" frp (.use "[1]#[0]" monad)]]] [data ["[0]" text ["[0]" encoding]] @@ -12,7 +12,7 @@ ["[0]" html] ["[0]" css (.only CSS)] ["[0]" context] - ["[0]" json (.only JSON) (.open: "[1]#[0]" codec)]]] + ["[0]" json (.only JSON) (.use "[1]#[0]" codec)]]] ["[0]" io] [world ["[0]" binary (.only Binary)]]]] diff --git a/stdlib/source/library/lux/world/net/http/route.lux b/stdlib/source/library/lux/world/net/http/route.lux index d9f63d9ad..e4454432e 100644 --- a/stdlib/source/library/lux/world/net/http/route.lux +++ b/stdlib/source/library/lux/world/net/http/route.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except or) [control diff --git a/stdlib/source/library/lux/world/net/http/status.lux b/stdlib/source/library/lux/world/net/http/status.lux index dc2ff105f..3a6b2fc67 100644 --- a/stdlib/source/library/lux/world/net/http/status.lux +++ b/stdlib/source/library/lux/world/net/http/status.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except)]] [// (.only Status)]) diff --git a/stdlib/source/library/lux/world/net/http/version.lux b/stdlib/source/library/lux/world/net/http/version.lux index 0cb62b627..aeaba736b 100644 --- a/stdlib/source/library/lux/world/net/http/version.lux +++ b/stdlib/source/library/lux/world/net/http/version.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except)]] [// (.only Version)]) diff --git a/stdlib/source/library/lux/world/net/uri.lux b/stdlib/source/library/lux/world/net/uri.lux index ec7c8b984..ad7b61677 100644 --- a/stdlib/source/library/lux/world/net/uri.lux +++ b/stdlib/source/library/lux/world/net/uri.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except)]]) diff --git a/stdlib/source/library/lux/world/output/video/resolution.lux b/stdlib/source/library/lux/world/output/video/resolution.lux index ebe60cf6d..1e2f58ced 100644 --- a/stdlib/source/library/lux/world/output/video/resolution.lux +++ b/stdlib/source/library/lux/world/output/video/resolution.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) [abstract diff --git a/stdlib/source/library/lux/world/program.lux b/stdlib/source/library/lux/world/program.lux index f45930389..3ac117ce2 100644 --- a/stdlib/source/library/lux/world/program.lux +++ b/stdlib/source/library/lux/world/program.lux @@ -1,4 +1,4 @@ -(.`` (.`` (.using +(.`` (.`` (.require [library [lux (.except) ["@" target] @@ -7,7 +7,7 @@ [control ["[0]" function] ["[0]" io (.only IO)] - ["[0]" maybe (.open: "[1]#[0]" functor)] + ["[0]" maybe (.use "[1]#[0]" functor)] ["[0]" try (.only Try)] ["[0]" exception (.only exception:)] [concurrency @@ -16,13 +16,13 @@ [parser ["[0]" environment (.only Environment)]]] [data - ["[0]" bit (.open: "[1]#[0]" equivalence)] + ["[0]" bit (.use "[1]#[0]" equivalence)] ["[0]" text (.only) ["%" \\format (.only format)]] [collection ["[0]" array (.only Array)] ["[0]" dictionary (.only Dictionary)] - ["[0]" list (.open: "[1]#[0]" functor)]]] + ["[0]" list (.use "[1]#[0]" functor)]]] ["[0]" ffi (.only import) (.~~ (.for "JavaScript" (.~~ (.these ["[0]" node_js])) "{old}" (.~~ (.these ["node_js" //math])) diff --git a/stdlib/source/library/lux/world/shell.lux b/stdlib/source/library/lux/world/shell.lux index 22ef8464b..57f622a46 100644 --- a/stdlib/source/library/lux/world/shell.lux +++ b/stdlib/source/library/lux/world/shell.lux @@ -1,4 +1,4 @@ -(.using +(.require [library [lux (.except) ["@" target] @@ -25,7 +25,7 @@ ["[0]" utf8]]] [collection ["[0]" array (.only Array)] - ["[0]" list (.open: "[1]#[0]" mix functor)] + ["[0]" list (.use "[1]#[0]" mix functor)] ["[0]" dictionary]]] [math [number (.only hex) |