diff options
author | Eduardo Julian | 2018-07-11 19:47:40 -0400 |
---|---|---|
committer | Eduardo Julian | 2018-07-11 19:47:40 -0400 |
commit | fdfd7036806fe62ffaf054b61fbf16bbfb002b7c (patch) | |
tree | 21a0b03e30df303e111cc8e353dec9865b704917 | |
parent | e7fc42bbc7d0b56384864a6fcd1b1e0bf8cd880b (diff) |
- Improvements to import syntax [part 2].
Diffstat (limited to '')
250 files changed, 3248 insertions, 2624 deletions
diff --git a/stdlib/source/lux.lux b/stdlib/source/lux.lux index 6d1f9e106..6e9604376 100644 --- a/stdlib/source/lux.lux +++ b/stdlib/source/lux.lux @@ -431,6 +431,11 @@ ([_ ident] (_ann (#Symbol ident)))) [dummy-cursor (#Record #Nil)]) +("lux def" local-symbol$ + ("lux check" (#Function Text Code) + ([_ ident] (_ann (#Symbol ["" ident])))) + [dummy-cursor (#Record #Nil)]) + ("lux def" tag$ ("lux check" (#Function Ident Code) ([_ ident] (_ann (#Tag ident)))) @@ -4079,39 +4084,6 @@ (fail "only/exclude requires symbols.")))) defs)) -(def: (parse-alias tokens) - (-> (List Code) (Meta [(Maybe Text) (List Code)])) - (case tokens - (^ (list& [_ (#Tag "" "as")] [_ (#Symbol "" alias)] tokens')) - (return [(#Some alias) tokens']) - - _ - (return [#None tokens]))) - -(def: (parse-referrals tokens) - (-> (List Code) (Meta [Referrals (List Code)])) - (case tokens - (^ (list& [_ (#Tag ["" "refer"])] referral tokens')) - (case referral - [_ (#Tag "" "all")] - (return [#All tokens']) - - (^ [_ (#Form (list& [_ (#Tag ["" "only"])] defs))]) - (do Monad<Meta> - [defs' (extract-defs defs)] - (return [(#Only defs') tokens'])) - - (^ [_ (#Form (list& [_ (#Tag ["" "exclude"])] defs))]) - (do Monad<Meta> - [defs' (extract-defs defs)] - (return [(#Exclude defs') tokens'])) - - _ - (fail "Incorrect syntax for referral.")) - - _ - (return [#Nothing tokens]))) - (def: (parse-short-referrals tokens) (-> (List Code) (Meta [Referrals (List Code)])) (case tokens @@ -4134,53 +4106,6 @@ _ (return [#Nothing tokens]))) -(def: (extract-symbol syntax) - (-> Code (Meta Ident)) - (case syntax - [_ (#Symbol ident)] - (return ident) - - _ - (fail "Not a symbol."))) - -(def: (parse-openings tokens) - (-> (List Code) (Meta [(List Openings) (List Code)])) - (case tokens - (^ (list& [_ (#Tag "" "open")] [_ (#Form parts)] tokens')) - (if (|> parts - (list/map (: (-> Code Bool) - (function (_ part) - (case part - (^or [_ (#Text _)] [_ (#Symbol _)]) - true - - _ - false)))) - (list/fold (function (_ r l) (and l r)) true)) - (let [openings (list/fold (: (-> Code (List Openings) (List Openings)) - (function (_ part openings) - (case part - [_ (#Text prefix)] - (list& [prefix (list)] openings) - - [_ (#Symbol ["" struct-name])] - (case openings - #Nil - (list ["" (list struct-name)]) - - (#Cons [prefix structs] openings') - (#Cons [prefix (#Cons struct-name structs)] openings')) - - _ - openings))) - (: (List Openings) (list)) - parts)] - (return [openings tokens'])) - (fail "Expected all parts of opening form to be of either prefix (text) or struct (symbol).")) - - _ - (return [(list) tokens]))) - (def: (parse-short-openings parts) (-> (List Code) (Meta [(List Openings) (List Code)])) (case parts @@ -4275,54 +4200,53 @@ (: (-> Code (Meta (List Importation))) (function (_ token) (case token - [_ (#Symbol "" m-name)] + [_ (#Symbol ["" m-name])] (do Monad<Meta> [m-name (clean-module relative-root m-name)] - (wrap (list [m-name #None {#refer-defs #All - #refer-open (list)}]))) + (wrap (list {#import-name m-name + #import-alias #None + #import-refer {#refer-defs #All + #refer-open (list)}}))) - (^ [_ (#Form (list& [_ (#Symbol "" m-name)] extra))]) + (^ [_ (#Tuple (list [_ (#Symbol ["" m-name])]))]) (do Monad<Meta> - [m-name (clean-module relative-root m-name) - alias+extra (parse-alias extra) - #let [[alias extra] alias+extra] - referral+extra (parse-referrals extra) - #let [[referral extra] referral+extra] - openings+extra (parse-openings extra) - #let [[openings extra] openings+extra] - sub-imports (parse-imports relative-root extra) - #let [sub-imports (decorate-sub-importations m-name sub-imports)]] - (wrap (case [referral alias openings] - [#Nothing #None #Nil] sub-imports - _ (list& {#import-name m-name - #import-alias alias - #import-refer {#refer-defs referral - #refer-open openings}} - sub-imports)))) - - (^ [_ (#Tuple (list& [_ (#Text alias)] [_ (#Symbol "" m-name)] extra))]) + [import-name (clean-module relative-root m-name)] + (wrap (list {#import-name import-name + #import-alias (#Some m-name) + #import-refer {#refer-defs #Nothing + #refer-open (list)}}))) + + (^ [_ (#Tuple (list& [_ (#Text alias)] [_ (#Symbol ["" m-name])] extra))]) (do Monad<Meta> - [m-name (clean-module relative-root m-name) + [import-name (clean-module relative-root m-name) referral+extra (parse-short-referrals extra) #let [[referral extra] referral+extra] openings+extra (parse-short-openings extra) - #let [[openings extra] openings+extra]] - (wrap (list {#import-name m-name - #import-alias (#Some (replace-all "." m-name alias)) - #import-refer {#refer-defs referral - #refer-open openings}}))) - - (^ [_ (#Tuple (list& [_ (#Symbol "" raw-m-name)] extra))]) + #let [[openings extra] openings+extra] + sub-imports (parse-imports relative-root extra) + #let [sub-imports (decorate-sub-importations import-name sub-imports)]] + (wrap (list& {#import-name import-name + #import-alias (#Some (replace-all "." m-name alias)) + #import-refer {#refer-defs referral + #refer-open openings}} + sub-imports))) + + (^ [_ (#Tuple (list& [_ (#Symbol ["" m-name])] extra))]) (do Monad<Meta> - [m-name (clean-module relative-root raw-m-name) + [import-name (clean-module relative-root m-name) referral+extra (parse-short-referrals extra) #let [[referral extra] referral+extra] openings+extra (parse-short-openings extra) - #let [[openings extra] openings+extra]] - (wrap (list {#import-name m-name - #import-alias (#Some raw-m-name) - #import-refer {#refer-defs referral - #refer-open openings}}))) + #let [[openings extra] openings+extra] + sub-imports (parse-imports relative-root extra) + #let [sub-imports (decorate-sub-importations import-name sub-imports)]] + (wrap (case [referral openings] + [#Nothing #Nil] sub-imports + _ (list& {#import-name import-name + #import-alias (#Some m-name) + #import-refer {#refer-defs referral + #refer-open openings}} + sub-imports)))) _ (do Monad<Meta> @@ -4804,9 +4728,9 @@ (def: (read-refer module-name options) (-> Text (List Code) (Meta Refer)) (do Monad<Meta> - [referral+options (parse-referrals options) + [referral+options (parse-short-referrals options) #let [[referral options] referral+options] - openings+options (parse-openings options) + openings+options (parse-short-openings options) #let [[openings options] openings+options] current-module current-module-name #let [test-referrals (: (-> Text (List Text) (List Text) (Meta (List Any))) @@ -4891,27 +4815,25 @@ (def: (refer-to-code module-name [r-defs r-opens]) (-> Text Refer Code) - (let [=defs (: (List Code) - (case r-defs - #All - (list (' #refer) (' #all)) - - (#Only defs) - (list (' #refer) (`' (#only (~+ (list/map (|>> [""] symbol$) - defs))))) - - (#Exclude defs) - (list (' #refer) (`' (#exclude (~+ (list/map (|>> [""] symbol$) - defs))))) - - #Nothing - (list))) - =opens (join-map (function (_ [prefix structs]) - (list& (text$ prefix) (list/map (|>> [""] symbol$) structs))) - r-opens)] + (let [localizations (: (List Code) + (case r-defs + #All + (list (' #*)) + + (#Only defs) + (list (form$ (list& (' #+) (list/map local-symbol$ defs)))) + + (#Exclude defs) + (list (form$ (list& (' #-) (list/map local-symbol$ defs)))) + + #Nothing + (list))) + openings (list/map (function (_ [prefix structs]) + (form$ (list& (text$ prefix) (list/map local-symbol$ structs)))) + r-opens)] (` (..refer (~ (text$ module-name)) - (~+ =defs) - (~' #open) ((~+ =opens)))))) + (~+ localizations) + (~+ openings))))) (macro: #export (module: tokens) {#.doc "Module-definition macro. diff --git a/stdlib/source/lux/cli.lux b/stdlib/source/lux/cli.lux index 0f7659fff..5b4b9b6bc 100644 --- a/stdlib/source/lux/cli.lux +++ b/stdlib/source/lux/cli.lux @@ -1,15 +1,17 @@ (.module: - lux - (lux (control monad - ["p" parser]) - (data (collection [list ("list/" Monoid<List> Monad<List>)]) - [text ("text/" Equivalence<Text>)] - text/format - ["E" error]) - [io] - [macro (#+ with-gensyms)] - (macro [code] - ["s" syntax (#+ syntax: Syntax)]))) + [lux #* + [control + monad + ["p" parser]] + [data + [collection [list ("list/" Monoid<List> Monad<List>)]] + [text ("text/" Equivalence<Text>) + format] + ["E" error]] + [io] + [macro (#+ with-gensyms) + [code] + ["s" syntax (#+ syntax: Syntax)]]]) ## [Types] (type: #export (CLI a) diff --git a/stdlib/source/lux/concurrency/actor.lux b/stdlib/source/lux/concurrency/actor.lux index 792b65dfc..81e873def 100644 --- a/stdlib/source/lux/concurrency/actor.lux +++ b/stdlib/source/lux/concurrency/actor.lux @@ -1,23 +1,28 @@ (.module: {#.doc "The actor model of concurrency."} - lux - (lux (control monad - ["p" parser] - ["ex" exception (#+ exception:)]) - [io (#- run) ("io/" Monad<IO>)] - (data [product] - ["e" error] - text/format - (collection [list ("list/" Monoid<List> Monad<List> Fold<List>)])) - [macro (#+ with-gensyms Monad<Meta>)] - (macro [code] - ["s" syntax (#+ syntax: Syntax)] - (syntax ["cs" common] - (common ["csr" reader] - ["csw" writer]))) - (type abstract)) - (// [atom (#+ Atom atom)] - [promise (#+ Promise promise) ("promise/" Monad<Promise>)] - [task (#+ Task)])) + [lux #* + [control monad + ["p" parser] + ["ex" exception (#+ exception:)]] + [io (#- run) ("io/" Monad<IO>)] + [data + [product] + ["e" error] + text/format + [collection [list ("list/" Monoid<List> Monad<List> Fold<List>)]]] + [macro (#+ with-gensyms Monad<Meta>) + [code] + ["s" syntax (#+ syntax: Syntax)] + [syntax + ["cs" common] + [common + ["csr" reader] + ["csw" writer]]]] + [type + abstract]] + [// + [atom (#+ Atom atom)] + [promise (#+ Promise promise) ("promise/" Monad<Promise>)] + [task (#+ Task)]]) (exception: #export poisoned) diff --git a/stdlib/source/lux/concurrency/atom.lux b/stdlib/source/lux/concurrency/atom.lux index 49e16340f..8cfc117e4 100644 --- a/stdlib/source/lux/concurrency/atom.lux +++ b/stdlib/source/lux/concurrency/atom.lux @@ -1,7 +1,7 @@ (.module: - lux - (lux [function] - [io (#- run)])) + [lux #* + [function] + [io (#- run)]]) (type: #export (Atom a) {#.doc "Atomic references that are safe to mutate concurrently."} diff --git a/stdlib/source/lux/concurrency/frp.lux b/stdlib/source/lux/concurrency/frp.lux index 0ecaf9266..b75e85939 100644 --- a/stdlib/source/lux/concurrency/frp.lux +++ b/stdlib/source/lux/concurrency/frp.lux @@ -1,13 +1,15 @@ (.module: - lux - (lux (control [functor (#+ Functor)] - [apply (#+ Apply)] - [monad (#+ do Monad)]) - [io (#+ IO io)] - (data (collection [list ("list/" Monoid<List>)])) - (type abstract)) - (// [atom (#+ Atom atom)] - [promise (#+ Promise)])) + [lux #* + [control + [functor (#+ Functor)] + [apply (#+ Apply)] + [monad (#+ do Monad)]] + [io (#+ IO io)] + [data [collection [list ("list/" Monoid<List>)]]] + [type abstract]] + [// + [atom (#+ Atom atom)] + [promise (#+ Promise)]]) ## [Types] (abstract: #export (Channel a) diff --git a/stdlib/source/lux/concurrency/promise.lux b/stdlib/source/lux/concurrency/promise.lux index aa0473dc9..c76c4c013 100644 --- a/stdlib/source/lux/concurrency/promise.lux +++ b/stdlib/source/lux/concurrency/promise.lux @@ -1,13 +1,14 @@ (.module: - lux - (lux [io (#+ IO io)] - [function] - (control [functor (#+ Functor)] - [apply (#+ Apply)] - [monad (#+ do Monad)]) - (data [product]) - (concurrency [atom (#+ Atom atom)]) - (type abstract))) + [lux #* + [io (#+ IO io)] + [function] + [control + [functor (#+ Functor)] + [apply (#+ Apply)] + [monad (#+ do Monad)]] + [data [product]] + [concurrency [atom (#+ Atom atom)]] + [type abstract]]) (def: #export parallelism Nat diff --git a/stdlib/source/lux/concurrency/semaphore.lux b/stdlib/source/lux/concurrency/semaphore.lux index b237caa2b..0c01e9389 100644 --- a/stdlib/source/lux/concurrency/semaphore.lux +++ b/stdlib/source/lux/concurrency/semaphore.lux @@ -1,11 +1,13 @@ (.module: - lux - (lux (control [monad (#+ do)]) - (concurrency [atom (#+ Atom)] - [promise (#+ Promise)]) - [io (#+ IO)] - (type abstract - [refinement]))) + [lux #* + [control [monad (#+ do)]] + [concurrency + [atom (#+ Atom)] + [promise (#+ Promise)]] + [io (#+ IO)] + [type + abstract + [refinement]]]) (type: State {#open-positions Nat diff --git a/stdlib/source/lux/concurrency/stm.lux b/stdlib/source/lux/concurrency/stm.lux index 1478c55e3..e3c797b2d 100644 --- a/stdlib/source/lux/concurrency/stm.lux +++ b/stdlib/source/lux/concurrency/stm.lux @@ -1,16 +1,19 @@ (.module: - lux - (lux (control [functor (#+ Functor)] - [apply (#+ Apply)] - [monad (#+ do Monad)]) - [io (#+ IO io)] - (data [product] - [maybe] - (collection [list ("list/" Functor<List> Fold<List>)])) - (concurrency [atom (#+ Atom atom)] - [promise (#+ Promise promise)] - [frp ("frp/" Functor<Channel>)]) - (type abstract))) + [lux #* + [control + [functor (#+ Functor)] + [apply (#+ Apply)] + [monad (#+ do Monad)]] + [io (#+ IO io)] + [data + [product] + [maybe] + [collection [list ("list/" Functor<List> Fold<List>)]]] + [concurrency + [atom (#+ Atom atom)] + [promise (#+ Promise promise)] + [frp ("frp/" Functor<Channel>)]] + [type abstract]]) (abstract: #export (Var a) {#.doc "A mutable cell containing a value, and observers that will be alerted of any change to it."} diff --git a/stdlib/source/lux/concurrency/task.lux b/stdlib/source/lux/concurrency/task.lux index 3b3b6793c..f3043ce9b 100644 --- a/stdlib/source/lux/concurrency/task.lux +++ b/stdlib/source/lux/concurrency/task.lux @@ -1,14 +1,14 @@ (.module: - lux - (lux (data ["E" error]) - (control ["F" functor] - ["A" apply] - monad - ["ex" exception (#+ Exception)]) - (concurrency ["P" promise]) - [macro] - (macro ["s" syntax (#+ syntax: Syntax)]) - )) + [lux #* + [data ["E" error]] + [control + ["F" functor] + ["A" apply] + monad + ["ex" exception (#+ Exception)]] + [concurrency ["P" promise]] + ["." macro ["s" syntax (#+ syntax: Syntax)]] + ]) (type: #export (Task a) (P.Promise (E.Error a))) diff --git a/stdlib/source/lux/control/algebra.lux b/stdlib/source/lux/control/algebra.lux index 0f9df072d..2813ed0e7 100644 --- a/stdlib/source/lux/control/algebra.lux +++ b/stdlib/source/lux/control/algebra.lux @@ -1,6 +1,7 @@ (.module: - lux - (lux (control functor))) + [lux #* + [control + functor]]) ## Types (type: #export (Algebra f a) diff --git a/stdlib/source/lux/control/apply.lux b/stdlib/source/lux/control/apply.lux index 95f2de15e..9e5f1b6ae 100644 --- a/stdlib/source/lux/control/apply.lux +++ b/stdlib/source/lux/control/apply.lux @@ -1,7 +1,8 @@ (.module: lux - (// [functor (#+ Functor)] - [monad (#+ Monad)])) + [// + [functor (#+ Functor)] + [monad (#+ Monad)]]) (signature: #export (Apply f) {#.doc "Applicative functors."} diff --git a/stdlib/source/lux/control/codec.lux b/stdlib/source/lux/control/codec.lux index b219c8522..5e274e766 100644 --- a/stdlib/source/lux/control/codec.lux +++ b/stdlib/source/lux/control/codec.lux @@ -1,7 +1,7 @@ (.module: - lux - (lux (control monad) - (data ["e" error]))) + [lux #* + [control monad] + [data ["e" error]]]) ## [Signatures] (signature: #export (Codec m a) diff --git a/stdlib/source/lux/control/comonad.lux b/stdlib/source/lux/control/comonad.lux index a154a89a2..937a121b1 100644 --- a/stdlib/source/lux/control/comonad.lux +++ b/stdlib/source/lux/control/comonad.lux @@ -1,7 +1,10 @@ (.module: - lux - (lux (data (collection [list ("list/" Fold<List>)]))) - ["F" //functor]) + [lux #* + [data + [collection + [list ("list/" Fold<List>)]]]] + [// + ["F" functor]]) ## [Signatures] (signature: #export (CoMonad w) diff --git a/stdlib/source/lux/control/concatenative.lux b/stdlib/source/lux/control/concatenative.lux index 449449b97..af86fc527 100644 --- a/stdlib/source/lux/control/concatenative.lux +++ b/stdlib/source/lux/control/concatenative.lux @@ -1,20 +1,25 @@ -(.module: [lux (#- if loop when - n/+ n/- n/* n// n/% n/= n/< n/<= n/> n/>= - i/+ i/- i/* i// i/% i/= i/< i/<= i/> i/>= - r/+ r/- r/* r// r/% r/= r/< r/<= r/> r/>= - f/+ f/- f/* f// f/% f/= f/< f/<= f/> f/>=)] - (lux (control ["p" parser ("parser/" Monad<Parser>)] - [monad]) - (data [text] - text/format - [maybe ("maybe/" Monad<Maybe>)] - (collection [list ("list/" Fold<List> Functor<List>)])) - [macro (#+ with-gensyms Monad<Meta>)] - (macro [code] - ["s" syntax (#+ syntax:)] - (syntax ["cs" common] - (common ["csr" reader] - ["csw" writer]))))) +(.module: + [lux (#- if loop when + n/+ n/- n/* n// n/% n/= n/< n/<= n/> n/>= + i/+ i/- i/* i// i/% i/= i/< i/<= i/> i/>= + r/+ r/- r/* r// r/% r/= r/< r/<= r/> r/>= + f/+ f/- f/* f// f/% f/= f/< f/<= f/> f/>=) + [control + ["p" parser ("parser/" Monad<Parser>)] + [monad]] + [data + [text] + text/format + [maybe ("maybe/" Monad<Maybe>)] + [collection [list ("list/" Fold<List> Functor<List>)]]] + [macro (#+ with-gensyms Monad<Meta>) + [code] + ["s" syntax (#+ syntax:)] + [syntax + ["cs" common] + [common + ["csr" reader] + ["csw" writer]]]]]) ## [Syntax] (type: Alias [Text Code]) diff --git a/stdlib/source/lux/control/continuation.lux b/stdlib/source/lux/control/continuation.lux index fb330967a..beaab50fb 100644 --- a/stdlib/source/lux/control/continuation.lux +++ b/stdlib/source/lux/control/continuation.lux @@ -1,12 +1,13 @@ (.module: - lux - (lux (control [functor (#+ Functor)] - [apply (#+ Apply)] - monad) - function - [macro (#+ with-gensyms)] - (macro [code] - [syntax (#+ syntax:)]))) + [lux #* + [control + [functor (#+ Functor)] + [apply (#+ Apply)] + monad] + function + [macro (#+ with-gensyms) + [code] + [syntax (#+ syntax:)]]]) (type: #export (Cont i o) {#.doc "Continuations."} diff --git a/stdlib/source/lux/control/contract.lux b/stdlib/source/lux/control/contract.lux index dbe92ad76..1b4939cb6 100644 --- a/stdlib/source/lux/control/contract.lux +++ b/stdlib/source/lux/control/contract.lux @@ -1,10 +1,11 @@ (.module: - lux - (lux (control monad) - (data text/format) - [macro] - (macro [code] - ["s" syntax (#+ syntax:)]))) + [lux #* + [control + monad] + [data + text/format] + [macro (#+) [code] + ["s" syntax (#+ syntax:)]]]) (def: #export (assert! message test) (-> Text Bool []) diff --git a/stdlib/source/lux/control/enum.lux b/stdlib/source/lux/control/enum.lux index b2b2f090c..b153beede 100644 --- a/stdlib/source/lux/control/enum.lux +++ b/stdlib/source/lux/control/enum.lux @@ -1,5 +1,7 @@ -(.module: lux - (lux/control [order])) +(.module: + [lux #* + [control + ["." order]]]) ## [Signatures] (signature: #export (Enum e) diff --git a/stdlib/source/lux/control/exception.lux b/stdlib/source/lux/control/exception.lux index ab1b27e94..41dd22b88 100644 --- a/stdlib/source/lux/control/exception.lux +++ b/stdlib/source/lux/control/exception.lux @@ -1,18 +1,22 @@ (.module: {#.doc "Exception-handling functionality built on top of the Error type."} - lux - (lux (control [monad (#+ do)] - ["p" parser]) - (data ["/" error (#+ Error)] - [maybe] - [product] - [text ("text/" Monoid<Text>)] - (collection [list ("list/" Functor<List> Fold<List>)])) - [macro] - (macro [code] - ["s" syntax (#+ syntax: Syntax)] - (syntax ["cs" common] - (common ["csr" reader] - ["csw" writer]))))) + [lux #* + [control + [monad (#+ do)] + ["p" parser]] + [data + ["/" error (#+ Error)] + [maybe] + [product] + [text ("text/" Monoid<Text>)] + [collection [list ("list/" Functor<List> Fold<List>)]]] + ["." macro + [code] + ["s" syntax (#+ syntax: Syntax)] + [syntax + ["cs" common] + [common + ["csr" reader] + ["csw" writer]]]]]) ## [Types] (type: #export (Exception a) diff --git a/stdlib/source/lux/control/hash.lux b/stdlib/source/lux/control/hash.lux index f1ecfd01d..aa668c7c7 100644 --- a/stdlib/source/lux/control/hash.lux +++ b/stdlib/source/lux/control/hash.lux @@ -1,6 +1,6 @@ (.module: lux - (// [equivalence (#+ Equivalence)])) + [// [equivalence (#+ Equivalence)]]) ## [Signatures] (signature: #export (Hash a) diff --git a/stdlib/source/lux/control/interval.lux b/stdlib/source/lux/control/interval.lux index ddb505f6f..ae8c6ce30 100644 --- a/stdlib/source/lux/control/interval.lux +++ b/stdlib/source/lux/control/interval.lux @@ -1,8 +1,9 @@ (.module: - lux - (lux (control [equivalence (#+ Equivalence)] - [order] - [enum (#+ Enum)]))) + [lux #* + [control + [equivalence (#+ Equivalence)] + ["." order] + [enum (#+ Enum)]]]) ## Signatures (signature: #export (Interval a) diff --git a/stdlib/source/lux/control/monad.lux b/stdlib/source/lux/control/monad.lux index 7db3cfd79..997bb2117 100644 --- a/stdlib/source/lux/control/monad.lux +++ b/stdlib/source/lux/control/monad.lux @@ -1,6 +1,6 @@ (.module: lux - (// [functor (#+ Functor)])) + [// [functor (#+ Functor)]]) ## [Utils] (def: (list/fold f init xs) diff --git a/stdlib/source/lux/control/monad/free.lux b/stdlib/source/lux/control/monad/free.lux index 41a2bdfd1..b30de7b1f 100644 --- a/stdlib/source/lux/control/monad/free.lux +++ b/stdlib/source/lux/control/monad/free.lux @@ -1,8 +1,9 @@ (.module: lux - (/// [functor (#+ Functor)] - [apply (#+ Apply)] - [monad (#+ Monad)])) + [/// + [functor (#+ Functor)] + [apply (#+ Apply)] + [monad (#+ Monad)]]) (type: #export (Free F a) {#.doc "The Free Monad."} diff --git a/stdlib/source/lux/control/monad/indexed.lux b/stdlib/source/lux/control/monad/indexed.lux index cbed38690..9e0cd9fd4 100644 --- a/stdlib/source/lux/control/monad/indexed.lux +++ b/stdlib/source/lux/control/monad/indexed.lux @@ -1,10 +1,13 @@ (.module: - lux - (lux (control [monad] - ["p" parser]) - (data (collection [list ("list/" Functor<List> Fold<List>)])) - [macro] - (macro ["s" syntax (#+ Syntax syntax:)]))) + [lux #* + [control + [monad] + ["p" parser]] + [data + [collection + [list ("list/" Functor<List> Fold<List>)]]] + ["." macro + ["s" syntax (#+ Syntax syntax:)]]]) (signature: #export (IxMonad m) (: (All [p a] diff --git a/stdlib/source/lux/control/monoid.lux b/stdlib/source/lux/control/monoid.lux index 550b9c25f..b841043ab 100644 --- a/stdlib/source/lux/control/monoid.lux +++ b/stdlib/source/lux/control/monoid.lux @@ -1,5 +1,6 @@ -(.module: lux - (// [fold (#+ Fold)])) +(.module: + lux + [// [fold (#+ Fold)]]) (signature: #export (Monoid a) {#.doc "A way to compose values. diff --git a/stdlib/source/lux/control/order.lux b/stdlib/source/lux/control/order.lux index edd25aca0..6a801392d 100644 --- a/stdlib/source/lux/control/order.lux +++ b/stdlib/source/lux/control/order.lux @@ -1,7 +1,7 @@ (.module: - lux - (lux function) - (// [equivalence (#+ Equivalence)])) + [lux #* + function] + [// [equivalence (#+ Equivalence)]]) ## [Signatures] (signature: #export (Order a) diff --git a/stdlib/source/lux/control/parser.lux b/stdlib/source/lux/control/parser.lux index e25115d80..4c5e827f9 100644 --- a/stdlib/source/lux/control/parser.lux +++ b/stdlib/source/lux/control/parser.lux @@ -1,12 +1,14 @@ (.module: - [lux (#- not)] - (lux (control [functor (#+ Functor)] - [apply (#+ Apply)] - [monad (#+ do Monad)] - [codec]) - (data (collection [list ("list/" Functor<List> Monoid<List>)]) - [product] - ["e" error (#+ Error)]))) + [lux (#- not) + [control + [functor (#+ Functor)] + [apply (#+ Apply)] + [monad (#+ do Monad)] + [codec]] + [data + [collection [list ("list/" Functor<List> Monoid<List>)]] + [product] + ["e" error (#+ Error)]]]) (type: #export (Parser s a) {#.doc "A generic parser."} diff --git a/stdlib/source/lux/control/pipe.lux b/stdlib/source/lux/control/pipe.lux index 82c2b5a2c..97e38b365 100644 --- a/stdlib/source/lux/control/pipe.lux +++ b/stdlib/source/lux/control/pipe.lux @@ -1,13 +1,15 @@ (.module: {#.doc "Composable extensions to the piping macros (|> and <|) that enhance them with various abilities."} - lux - (lux (control [monad (#+ do)] - ["p" parser]) - (data ["e" error] - (collection [list ("list/" Fold<List> Monad<List>)])) - [macro (#+ with-gensyms)] - (macro ["s" syntax (#+ syntax: Syntax)] - [code]) - )) + [lux #* + [control + [monad (#+ do)] + ["p" parser]] + [data + ["e" error] + [collection [list ("list/" Fold<List> Monad<List>)]]] + [macro (#+ with-gensyms) + ["s" syntax (#+ syntax: Syntax)] + [code]] + ]) ## [Syntax] (def: body^ diff --git a/stdlib/source/lux/control/predicate.lux b/stdlib/source/lux/control/predicate.lux index b8595afe5..9af533a8f 100644 --- a/stdlib/source/lux/control/predicate.lux +++ b/stdlib/source/lux/control/predicate.lux @@ -1,8 +1,8 @@ (.module: - lux - (lux (control [monoid (#+ Monoid)]) - (data (collection [set (#+ Set)])) - [function])) + [lux #* + [control [monoid (#+ Monoid)]] + [data [collection [set (#+ Set)]]] + [function]]) (type: #export (Predicate a) (-> a Bool)) diff --git a/stdlib/source/lux/control/reader.lux b/stdlib/source/lux/control/reader.lux index 0e4e4684b..dfe8724e0 100644 --- a/stdlib/source/lux/control/reader.lux +++ b/stdlib/source/lux/control/reader.lux @@ -1,8 +1,9 @@ (.module: - lux - (lux (control ["F" functor] - ["A" apply] - [monad (#+ do Monad)]))) + [lux #* + [control + ["F" functor] + ["A" apply] + [monad (#+ do Monad)]]]) ## [Types] (type: #export (Reader r a) diff --git a/stdlib/source/lux/control/region.lux b/stdlib/source/lux/control/region.lux index 089bf9587..d83f82279 100644 --- a/stdlib/source/lux/control/region.lux +++ b/stdlib/source/lux/control/region.lux @@ -1,12 +1,14 @@ (.module: - lux - (lux (control [functor (#+ Functor)] - [apply (#+ Apply)] - [monad (#+ Monad do)] - ["ex" exception (#+ Exception exception:)]) - (data ["e" error (#+ Error)] - text/format - (collection [list ("list/" Fold<List>)])))) + [lux #* + [control + [functor (#+ Functor)] + [apply (#+ Apply)] + [monad (#+ Monad do)] + ["ex" exception (#+ Exception exception:)]] + [data + ["e" error (#+ Error)] + text/format + [collection [list ("list/" Fold<List>)]]]]) (type: (Cleaner r m) (-> r (m (Error Any)))) diff --git a/stdlib/source/lux/control/state.lux b/stdlib/source/lux/control/state.lux index b96f174aa..03965f498 100644 --- a/stdlib/source/lux/control/state.lux +++ b/stdlib/source/lux/control/state.lux @@ -1,8 +1,9 @@ (.module: - lux - (lux (control ["F" functor] - ["A" apply] - [monad (#+ do Monad)]))) + [lux #* + [control + ["F" functor] + ["A" apply] + [monad (#+ do Monad)]]]) ## [Types] (type: #export (State s a) diff --git a/stdlib/source/lux/control/thread.lux b/stdlib/source/lux/control/thread.lux index d8e995371..b7aac24d7 100644 --- a/stdlib/source/lux/control/thread.lux +++ b/stdlib/source/lux/control/thread.lux @@ -1,9 +1,10 @@ (.module: - lux - (lux (control [functor (#+ Functor)] - [apply (#+ Apply)] - [monad (#+ Monad do)]) - [io (#+ IO)])) + [lux #* + [control + [functor (#+ Functor)] + [apply (#+ Apply)] + [monad (#+ Monad do)]] + [io (#+ IO)]]) (type: #export (Thread ! a) (-> ! a)) diff --git a/stdlib/source/lux/control/writer.lux b/stdlib/source/lux/control/writer.lux index 07d94ac25..25e665b73 100644 --- a/stdlib/source/lux/control/writer.lux +++ b/stdlib/source/lux/control/writer.lux @@ -1,9 +1,10 @@ (.module: - lux - (lux/control monoid - ["F" functor] - ["A" apply] - [monad (#+ do Monad)])) + [lux #* + [control + monoid + ["F" functor] + ["A" apply] + [monad (#+ do Monad)]]]) (type: #export (Writer l a) {#.doc "Represents a value with an associated 'log' value to record arbitrary information."} diff --git a/stdlib/source/lux/data/bool.lux b/stdlib/source/lux/data/bool.lux index 09aa2686b..b75663ad5 100644 --- a/stdlib/source/lux/data/bool.lux +++ b/stdlib/source/lux/data/bool.lux @@ -1,10 +1,11 @@ (.module: - lux - (lux (control [monoid (#+ Monoid)] - [equivalence (#+ Equivalence)] - hash - [codec (#+ Codec)]) - function)) + [lux #* + [control + [monoid (#+ Monoid)] + [equivalence (#+ Equivalence)] + hash + [codec (#+ Codec)]] + function]) ## [Structures] (structure: #export _ (Equivalence Bool) diff --git a/stdlib/source/lux/data/collection/array.lux b/stdlib/source/lux/data/collection/array.lux index fa261318f..684988954 100644 --- a/stdlib/source/lux/data/collection/array.lux +++ b/stdlib/source/lux/data/collection/array.lux @@ -1,12 +1,14 @@ (.module: - lux - (lux (control [monoid (#+ Monoid)] - [functor (#+ Functor)] - [equivalence (#+ Equivalence)] - fold) - (data (collection [list ("list/" Fold<List>)]) - [product]) - )) + [lux #* + [control + [monoid (#+ Monoid)] + [functor (#+ Functor)] + [equivalence (#+ Equivalence)] + fold] + [data + [collection [list ("list/" Fold<List>)]] + [product]] + ]) (def: #export (new size) (All [a] (-> Nat (Array a))) diff --git a/stdlib/source/lux/data/collection/bits.lux b/stdlib/source/lux/data/collection/bits.lux index 74a3e4189..78d5b4b7d 100644 --- a/stdlib/source/lux/data/collection/bits.lux +++ b/stdlib/source/lux/data/collection/bits.lux @@ -1,11 +1,13 @@ (.module: - [lux (#- not and or)] - (lux (control [equivalence (#+ Equivalence)] - pipe) - (data [maybe] - [bit] - (collection [array ("array/" Fold<Array>)]) - text/format))) + [lux (#- not and or) + [control + [equivalence (#+ Equivalence)] + pipe] + [data + [maybe] + [bit] + [text format] + [collection [array ("array/" Fold<Array>)]]]]) (type: #export Chunk I64) diff --git a/stdlib/source/lux/data/collection/dictionary.lux b/stdlib/source/lux/data/collection/dictionary.lux index 6712b57fb..a3e4be1d6 100644 --- a/stdlib/source/lux/data/collection/dictionary.lux +++ b/stdlib/source/lux/data/collection/dictionary.lux @@ -1,14 +1,17 @@ (.module: - lux - (lux (control hash - [equivalence (#+ Equivalence)]) - (data [maybe] - (collection [list ("list/" Fold<List> Functor<List> Monoid<List>)] - [array ("array/" Functor<Array> Fold<Array>)]) - [bit] - [product] - [number]) - )) + [lux #* + [control + hash + [equivalence (#+ Equivalence)]] + [data + [maybe] + [bit] + [product] + [number] + [collection + [list ("list/" Fold<List> Functor<List> Monoid<List>)] + [array ("array/" Functor<Array> Fold<Array>)]]] + ]) ## This implementation of Hash Array Mapped Trie (HAMT) is based on ## Clojure's PersistentHashMap implementation. diff --git a/stdlib/source/lux/data/collection/dictionary/ordered.lux b/stdlib/source/lux/data/collection/dictionary/ordered.lux index 6c0b645fc..963f178b3 100644 --- a/stdlib/source/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/lux/data/collection/dictionary/ordered.lux @@ -1,14 +1,16 @@ (.module: - lux - (lux (control [monad (#+ do Monad)] - equivalence - [order (#+ Order)]) - (data (collection [list ("list/" Monoid<List> Fold<List>)]) - ["p" product] - [maybe]) - [macro] - (macro [code] - ["s" syntax (#+ syntax: Syntax)]))) + [lux #* + [control + [monad (#+ do Monad)] + equivalence + [order (#+ Order)]] + [data + ["p" product] + [maybe] + [collection [list ("list/" Monoid<List> Fold<List>)]]] + ["." macro + [code] + ["s" syntax (#+ syntax: Syntax)]]]) (def: error-message Text "Invariant violation") diff --git a/stdlib/source/lux/data/collection/dictionary/plist.lux b/stdlib/source/lux/data/collection/dictionary/plist.lux index 6ef26d51d..f1a6dff7e 100644 --- a/stdlib/source/lux/data/collection/dictionary/plist.lux +++ b/stdlib/source/lux/data/collection/dictionary/plist.lux @@ -1,6 +1,7 @@ (.module: - lux - (lux (data [text ("text/" Equivalence<Text>)]))) + [lux #* + [data + [text ("text/" Equivalence<Text>)]]]) (type: #export (PList a) (List [Text a])) diff --git a/stdlib/source/lux/data/collection/list.lux b/stdlib/source/lux/data/collection/list.lux index 549074d99..7ea58354e 100644 --- a/stdlib/source/lux/data/collection/list.lux +++ b/stdlib/source/lux/data/collection/list.lux @@ -1,14 +1,16 @@ (.module: - lux - (lux (control [monoid (#+ Monoid)] - [functor (#+ Functor)] - [apply (#+ Apply)] - [monad (#+ do Monad)] - [equivalence (#+ Equivalence)] - [fold]) - (data [number ("nat/" Codec<Text,Nat>)] - bool - [product]))) + [lux #* + [control + [monoid (#+ Monoid)] + [functor (#+ Functor)] + [apply (#+ Apply)] + [monad (#+ do Monad)] + [equivalence (#+ Equivalence)] + [fold]] + [data + [number ("nat/" Codec<Text,Nat>)] + bool + [product]]]) ## [Types] ## (type: (List a) diff --git a/stdlib/source/lux/data/collection/queue.lux b/stdlib/source/lux/data/collection/queue.lux index bbb2c8721..cf3587ece 100644 --- a/stdlib/source/lux/data/collection/queue.lux +++ b/stdlib/source/lux/data/collection/queue.lux @@ -1,8 +1,9 @@ (.module: - lux - (lux (control [equivalence (#+ Equivalence)] - ["F" functor]) - (data (collection [list ("list/" Monoid<List> Functor<List>)])))) + [lux #* + [control + [equivalence (#+ Equivalence)] + ["F" functor]] + [data [collection [list ("list/" Monoid<List> Functor<List>)]]]]) (type: #export (Queue a) {#front (List a) diff --git a/stdlib/source/lux/data/collection/queue/priority.lux b/stdlib/source/lux/data/collection/queue/priority.lux index ba087428c..6765c6708 100644 --- a/stdlib/source/lux/data/collection/queue/priority.lux +++ b/stdlib/source/lux/data/collection/queue/priority.lux @@ -1,10 +1,12 @@ (.module: - lux - (lux (control [equivalence (#+ Equivalence)] - [monad (#+ do Monad)]) - (data (collection (tree [finger (#+ Tree)])) - [number ("nat/" Interval<Nat>)] - [maybe]))) + [lux #* + [control + [equivalence (#+ Equivalence)] + [monad (#+ do Monad)]] + [data + [number ("nat/" Interval<Nat>)] + [maybe] + [collection [tree [finger (#+ Tree)]]]]]) (type: #export Priority Nat) diff --git a/stdlib/source/lux/data/collection/row.lux b/stdlib/source/lux/data/collection/row.lux index a32b08aae..1dce1d4c5 100644 --- a/stdlib/source/lux/data/collection/row.lux +++ b/stdlib/source/lux/data/collection/row.lux @@ -1,21 +1,24 @@ (.module: - lux - (lux (control [functor (#+ Functor)] - [apply (#+ Apply)] - [monad (#+ do Monad)] - [equivalence (#+ Equivalence)] - monoid - fold - ["p" parser]) - (data [maybe] - (collection [list ("list/" Fold<List> Functor<List> Monoid<List>)] - [array ("array/" Functor<Array> Fold<Array>)]) - [bit] - [product]) - [macro (#+ with-gensyms)] - (macro [code] - ["s" syntax (#+ syntax: Syntax)]) - )) + [lux #* + [control + [functor (#+ Functor)] + [apply (#+ Apply)] + [monad (#+ do Monad)] + [equivalence (#+ Equivalence)] + monoid + fold + ["p" parser]] + [data + [maybe] + [bit] + [product] + [collection + [list ("list/" Fold<List> Functor<List> Monoid<List>)] + [array ("array/" Functor<Array> Fold<Array>)]]] + [macro (#+ with-gensyms) + [code] + ["s" syntax (#+ syntax: Syntax)]] + ]) ## [Utils] (type: (Node a) diff --git a/stdlib/source/lux/data/collection/sequence.lux b/stdlib/source/lux/data/collection/sequence.lux index a148d745c..dc8f4a802 100644 --- a/stdlib/source/lux/data/collection/sequence.lux +++ b/stdlib/source/lux/data/collection/sequence.lux @@ -1,15 +1,17 @@ (.module: - lux - (lux (control functor - monad - comonad - [continuation (#+ pending Cont)] - ["p" parser]) - [macro (#+ with-gensyms)] - (macro [code] - ["s" syntax (#+ syntax: Syntax)]) - (data (collection [list ("list/" Monad<List>)]) - bool))) + [lux #* + [control + functor + monad + comonad + [continuation (#+ pending Cont)] + ["p" parser]] + [macro (#+ with-gensyms) + [code] + ["s" syntax (#+ syntax: Syntax)]] + [data + bool + [collection [list ("list/" Monad<List>)]]]]) ## [Types] (type: #export (Sequence a) diff --git a/stdlib/source/lux/data/collection/set.lux b/stdlib/source/lux/data/collection/set.lux index 39585982a..5fa774e9e 100644 --- a/stdlib/source/lux/data/collection/set.lux +++ b/stdlib/source/lux/data/collection/set.lux @@ -1,10 +1,13 @@ (.module: - lux - (lux (control [equivalence (#+ Equivalence)] - [hash (#+ Hash)]) - (data (collection ["dict" dictionary (#+ Dictionary)] - [list ("list/" Fold<List>)])) - (type abstract))) + [lux #* + [control + [equivalence (#+ Equivalence)] + [hash (#+ Hash)]] + [data + [collection + ["dict" dictionary (#+ Dictionary)] + [list ("list/" Fold<List>)]]] + [type abstract]]) (abstract: #export (Set a) {} diff --git a/stdlib/source/lux/data/collection/set/multi.lux b/stdlib/source/lux/data/collection/set/multi.lux index 0695bd0ff..5aff87021 100644 --- a/stdlib/source/lux/data/collection/set/multi.lux +++ b/stdlib/source/lux/data/collection/set/multi.lux @@ -1,14 +1,16 @@ ## https://en.wikipedia.org/wiki/Multiset (.module: - lux - (lux (control [equivalence (#+ Equivalence)] - [hash (#+ Hash)]) - [function] - (language [type (#+ :share)]) - (type abstract)) - (//// [maybe]) - (/// [list ("list/" Fold<List>)] - [dictionary (#+ Dictionary)]) + [lux #* + [control + [equivalence (#+ Equivalence)] + [hash (#+ Hash)]] + [function] + [language [type (#+ :share)]] + [type abstract]] + [//// [maybe]] + [/// + [list ("list/" Fold<List>)] + [dictionary (#+ Dictionary)]] [//]) (abstract: #export (Set a) diff --git a/stdlib/source/lux/data/collection/set/ordered.lux b/stdlib/source/lux/data/collection/set/ordered.lux index 5ec88fb4a..7e43d2a4e 100644 --- a/stdlib/source/lux/data/collection/set/ordered.lux +++ b/stdlib/source/lux/data/collection/set/ordered.lux @@ -1,10 +1,13 @@ (.module: - lux - (lux (control [equivalence (#+ Equivalence)] - [order (#+ Order)]) - (data (collection [list ("list/" Fold<List>)] - (dictionary ["//" ordered]))) - (type abstract))) + [lux #* + [control + [equivalence (#+ Equivalence)] + [order (#+ Order)]] + [data + [collection + [list ("list/" Fold<List>)] + [dictionary ["//" ordered]]]] + [type abstract]]) (abstract: #export (Set a) {} diff --git a/stdlib/source/lux/data/collection/stack.lux b/stdlib/source/lux/data/collection/stack.lux index c0e1af182..409993ef1 100644 --- a/stdlib/source/lux/data/collection/stack.lux +++ b/stdlib/source/lux/data/collection/stack.lux @@ -1,6 +1,8 @@ (.module: - lux - (lux (data (collection [list])))) + [lux #* + [data + [collection + [list]]]]) ## [Types] (type: #export (Stack a) diff --git a/stdlib/source/lux/data/collection/tree/finger.lux b/stdlib/source/lux/data/collection/tree/finger.lux index ea1ff0eee..1ce6d63fc 100644 --- a/stdlib/source/lux/data/collection/tree/finger.lux +++ b/stdlib/source/lux/data/collection/tree/finger.lux @@ -1,7 +1,7 @@ (.module: - lux - (lux (control ["m" monoid]) - (data text/format))) + [lux #* + [control ["m" monoid]] + [data [text format]]]) (type: #export (Node m a) (#Leaf m a) diff --git a/stdlib/source/lux/data/collection/tree/rose.lux b/stdlib/source/lux/data/collection/tree/rose.lux index 72b2bf340..86f1fc49f 100644 --- a/stdlib/source/lux/data/collection/tree/rose.lux +++ b/stdlib/source/lux/data/collection/tree/rose.lux @@ -1,14 +1,15 @@ (.module: - lux - (lux (control functor - [monad (#+ do Monad)] - equivalence - ["p" parser] - fold) - (data (collection [list ("list/" Monad<List> Fold<List>)])) - [macro] - (macro [code] - ["s" syntax (#+ syntax: Syntax)]))) + [lux #* + [control + functor + [monad (#+ do Monad)] + equivalence + ["p" parser] + fold] + [data [collection [list ("list/" Monad<List> Fold<List>)]]] + ["." macro + [code] + ["s" syntax (#+ syntax: Syntax)]]]) ## [Types] (type: #export (Tree a) diff --git a/stdlib/source/lux/data/collection/tree/rose/parser.lux b/stdlib/source/lux/data/collection/tree/rose/parser.lux index 3696266dd..a2dd954b9 100644 --- a/stdlib/source/lux/data/collection/tree/rose/parser.lux +++ b/stdlib/source/lux/data/collection/tree/rose/parser.lux @@ -1,10 +1,12 @@ (.module: - lux - (lux (control ["p" parser] - ["ex" exception (#+ exception:)]) - (data ["E" error])) - [// (#+ Tree)] - (// [zipper (#+ Zipper)])) + [lux #* + [control + ["p" parser] + ["ex" exception (#+ exception:)]] + [data + ["E" error]]] + [// (#+ Tree) + [zipper (#+ Zipper)]]) (type: #export (Parser t a) (p.Parser (Zipper t) a)) diff --git a/stdlib/source/lux/data/collection/tree/rose/zipper.lux b/stdlib/source/lux/data/collection/tree/rose/zipper.lux index 8c8d67007..f9a33ce0e 100644 --- a/stdlib/source/lux/data/collection/tree/rose/zipper.lux +++ b/stdlib/source/lux/data/collection/tree/rose/zipper.lux @@ -1,14 +1,17 @@ (.module: - lux - (lux (control functor - comonad) - (data (collection [list ("list/" Functor<List> Fold<List> Monoid<List>)] - (tree [rose (#+ Tree) ("tree/" Functor<Tree>)]) - [stack (#+ Stack)]) - [maybe ("maybe/" Monad<Maybe>)]) - [macro] - (macro [code] - ["s" syntax (#+ syntax: Syntax)]))) + [lux #* + [control + functor + comonad] + [data + [collection + [list ("list/" Functor<List> Fold<List> Monoid<List>)] + [tree [rose (#+ Tree) ("tree/" Functor<Tree>)]] + [stack (#+ Stack)]] + [maybe ("maybe/" Monad<Maybe>)]] + ["." macro + [code] + ["s" syntax (#+ syntax: Syntax)]]]) ## Adapted from the clojure.zip namespace in the Clojure standard library. diff --git a/stdlib/source/lux/data/color.lux b/stdlib/source/lux/data/color.lux index 9312429b8..a7b9fa0c3 100644 --- a/stdlib/source/lux/data/color.lux +++ b/stdlib/source/lux/data/color.lux @@ -1,9 +1,9 @@ (.module: - lux - (lux (control ["eq" equivalence]) - (data (collection [list ("list/" Functor<List>)])) - [math] - (type abstract))) + [lux #* + [control ["eq" equivalence]] + [data [collection [list ("list/" Functor<List>)]]] + [math] + [type abstract]]) (def: rgb Nat +256) (def: top Nat (dec rgb)) diff --git a/stdlib/source/lux/data/env.lux b/stdlib/source/lux/data/env.lux index 68d0affc0..134220215 100644 --- a/stdlib/source/lux/data/env.lux +++ b/stdlib/source/lux/data/env.lux @@ -1,7 +1,7 @@ (.module: - lux - (lux (control ["F" functor] - comonad))) + [lux #* + [control ["F" functor] + comonad]]) (type: #export (Env e a) {#env e diff --git a/stdlib/source/lux/data/error.lux b/stdlib/source/lux/data/error.lux index 456df0b0c..0baeecc73 100644 --- a/stdlib/source/lux/data/error.lux +++ b/stdlib/source/lux/data/error.lux @@ -1,8 +1,9 @@ (.module: - lux - (lux (control ["F" functor] - ["A" apply] - ["M" monad (#+ do Monad)]))) + [lux #* + [control + ["F" functor] + ["A" apply] + ["M" monad (#+ do Monad)]]]) ## [Types] (type: #export (Error a) diff --git a/stdlib/source/lux/data/format/binary.lux b/stdlib/source/lux/data/format/binary.lux index 8cc389e5e..4503f21dd 100644 --- a/stdlib/source/lux/data/format/binary.lux +++ b/stdlib/source/lux/data/format/binary.lux @@ -1,14 +1,17 @@ (.module: - [lux (#- nat int rev list type)] - (lux (control [monad (#+ do Monad)] - ["p" parser] - ["ex" exception (#+ exception:)] - [equivalence (#+ Equivalence)]) - (data [error] - (text [encoding] - [format (#+ %n)]) - [number]) - (world [blob (#+ Blob)]))) + [lux (#- nat int rev list type) + [control + [monad (#+ do Monad)] + ["p" parser] + ["ex" exception (#+ exception:)] + [equivalence (#+ Equivalence)]] + [data + [error] + [text + [encoding] + [format (#+ %n)]] + [number]] + [world [blob (#+ Blob)]]]) ## Exceptions (exception: #export (blob-was-not-fully-read {length Nat} {read Nat}) diff --git a/stdlib/source/lux/data/format/context.lux b/stdlib/source/lux/data/format/context.lux index 176fed9f8..0cc7d0da8 100644 --- a/stdlib/source/lux/data/format/context.lux +++ b/stdlib/source/lux/data/format/context.lux @@ -1,10 +1,12 @@ (.module: - lux - (lux (control ["p" parser] - ["ex" exception (#+ exception:)] - [monad (#+ do)]) - (data ["E" error] - (collection ["dict" dictionary (#+ Dictionary)])))) + [lux #* + [control + ["p" parser] + ["ex" exception (#+ exception:)] + [monad (#+ do)]] + [data + ["E" error] + [collection ["dict" dictionary (#+ Dictionary)]]]]) (exception: #export (unknown-property {property Text}) property) diff --git a/stdlib/source/lux/data/format/css.lux b/stdlib/source/lux/data/format/css.lux index 3ef030241..6afbe164e 100644 --- a/stdlib/source/lux/data/format/css.lux +++ b/stdlib/source/lux/data/format/css.lux @@ -1,10 +1,11 @@ (.module: - lux - (lux (data [color (#+ Color)] - [number] - [text] - text/format - (collection [list ("list/" Functor<List> Monoid<List>)])))) + [lux #* + [data + [color (#+ Color)] + [number] + ["." text + format] + [collection [list ("list/" Functor<List> Monoid<List>)]]]]) (type: #export Selector Text) diff --git a/stdlib/source/lux/data/format/html.lux b/stdlib/source/lux/data/format/html.lux index c3821027d..b63993b3b 100644 --- a/stdlib/source/lux/data/format/html.lux +++ b/stdlib/source/lux/data/format/html.lux @@ -1,8 +1,9 @@ (.module: - [lux (#- comment)] - (lux (data [text] - text/format - (collection [list ("list/" Functor<List>)])))) + [lux (#- comment) + [data + ["." text + format] + [collection [list ("list/" Functor<List>)]]]]) (type: #export Attributes {#.doc "Attributes for an HTML tag."} diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/lux/data/format/json.lux index cd7b82be0..0316b5a9b 100644 --- a/stdlib/source/lux/data/format/json.lux +++ b/stdlib/source/lux/data/format/json.lux @@ -1,25 +1,28 @@ (.module: {#.doc "Functionality for reading and writing values in the JSON format. For more information, please see: http://www.json.org/"} - [lux (#- Array)] - (lux (control [monad (#+ do Monad)] - [equivalence (#+ Equivalence)] - codec - ["p" parser ("parser/" Monad<Parser>)]) - (data [bool] - [text ("text/" Equivalence<Text> Monoid<Text>)] - (text ["l" lexer]) - [number ("frac/" Codec<Text,Frac>) ("nat/" Codec<Text,Nat>)] - [maybe] - ["e" error] - [sum] - [product] - (collection [list ("list/" Fold<List> Monad<List>)] - [row (#+ Row row) ("row/" Monad<Row>)] - ["dict" dictionary (#+ Dictionary)])) - [macro (#+ Monad<Meta> with-gensyms)] - (macro ["s" syntax (#+ syntax:)] - [code]))) + [lux (#- Array) + [control + [monad (#+ do Monad)] + [equivalence (#+ Equivalence)] + codec + ["p" parser ("parser/" Monad<Parser>)]] + [data + [bool] + [text ("text/" Equivalence<Text> Monoid<Text>) + ["l" lexer]] + [number ("frac/" Codec<Text,Frac>) ("nat/" Codec<Text,Nat>)] + [maybe] + ["e" error] + [sum] + [product] + [collection + [list ("list/" Fold<List> Monad<List>)] + [row (#+ Row row) ("row/" Monad<Row>)] + ["dict" dictionary (#+ Dictionary)]]] + [macro (#+ Monad<Meta> with-gensyms) + ["s" syntax (#+ syntax:)] + [code]]]) (do-template [<name> <type>] [(type: #export <name> <type>)] diff --git a/stdlib/source/lux/data/format/xml.lux b/stdlib/source/lux/data/format/xml.lux index 76b4b1710..fcdca14c8 100644 --- a/stdlib/source/lux/data/format/xml.lux +++ b/stdlib/source/lux/data/format/xml.lux @@ -1,18 +1,21 @@ (.module: {#.doc "Functionality for reading, generating and processing values in the XML format."} - lux - (lux (control monad - [equivalence (#+ Equivalence)] - codec - ["p" parser ("parser/" Monad<Parser>)] - ["ex" exception (#+ exception:)]) - (data [text ("text/" Equivalence<Text> Monoid<Text>)] - (text ["l" lexer]) - [number] - ["E" error] - [product] - [ident ("ident/" Equivalence<Ident> Codec<Text,Ident>)] - (collection [list ("list/" Monad<List>)] - ["d" dictionary])))) + [lux #* + [control + monad + [equivalence (#+ Equivalence)] + codec + ["p" parser ("parser/" Monad<Parser>)] + ["ex" exception (#+ exception:)]] + [data + [text ("text/" Equivalence<Text> Monoid<Text>) + ["l" lexer]] + [number] + ["E" error] + [product] + [ident ("ident/" Equivalence<Ident> Codec<Text,Ident>)] + [collection + [list ("list/" Monad<List>)] + ["d" dictionary]]]]) (type: #export Tag Ident) (type: #export Attrs (d.Dictionary Ident Text)) diff --git a/stdlib/source/lux/data/ident.lux b/stdlib/source/lux/data/ident.lux index ce2c08042..545b22a65 100644 --- a/stdlib/source/lux/data/ident.lux +++ b/stdlib/source/lux/data/ident.lux @@ -1,9 +1,10 @@ (.module: - lux - (lux (control [equivalence (#+ Equivalence)] - [codec (#+ Codec)] - hash) - (data [text ("text/" Monoid<Text> Equivalence<Text>)]))) + [lux #* + [control + [equivalence (#+ Equivalence)] + [codec (#+ Codec)] + hash] + [data [text ("text/" Monoid<Text> Equivalence<Text>)]]]) ## [Types] ## (type: Ident diff --git a/stdlib/source/lux/data/identity.lux b/stdlib/source/lux/data/identity.lux index 969b89e4d..7a41cb69f 100644 --- a/stdlib/source/lux/data/identity.lux +++ b/stdlib/source/lux/data/identity.lux @@ -1,9 +1,10 @@ (.module: - lux - (lux/control ["F" functor] - ["A" apply] - (monad #as M #refer #all) - (comonad #as CM #refer #all))) + [lux #* + [control + ["F" functor] + ["A" apply] + ["M" monad #*] + ["CM" comonad #*]]]) ## [Types] (type: #export (Identity a) diff --git a/stdlib/source/lux/data/lazy.lux b/stdlib/source/lux/data/lazy.lux index efe202e21..df48114d8 100644 --- a/stdlib/source/lux/data/lazy.lux +++ b/stdlib/source/lux/data/lazy.lux @@ -1,13 +1,14 @@ (.module: - lux - (lux [io] - (control [functor (#+ Functor)] - [apply (#+ Apply)] - [monad (#+ Monad do)]) - (concurrency [atom]) - [macro (#+ with-gensyms)] - (macro ["s" syntax (#+ syntax:)]) - (type abstract))) + [lux #* + [io] + [control + [functor (#+ Functor)] + [apply (#+ Apply)] + [monad (#+ Monad do)]] + [concurrency [atom]] + [macro (#+ with-gensyms) + ["s" syntax (#+ syntax:)]] + [type abstract]]) (abstract: #export (Lazy a) (-> [] a) diff --git a/stdlib/source/lux/data/maybe.lux b/stdlib/source/lux/data/maybe.lux index c3da0c2a9..90712968b 100644 --- a/stdlib/source/lux/data/maybe.lux +++ b/stdlib/source/lux/data/maybe.lux @@ -1,10 +1,11 @@ (.module: - lux - (lux (control ["m" monoid] - ["F" functor] - ["A" apply] - [monad (#+ do Monad)] - [equivalence (#+ Equivalence)]))) + [lux #* + [control + ["m" monoid] + ["F" functor] + ["A" apply] + [monad (#+ do Monad)] + [equivalence (#+ Equivalence)]]]) ## [Types] ## (type: (Maybe a) diff --git a/stdlib/source/lux/data/number.lux b/stdlib/source/lux/data/number.lux index d598fbe41..615565c16 100644 --- a/stdlib/source/lux/data/number.lux +++ b/stdlib/source/lux/data/number.lux @@ -1,16 +1,18 @@ (.module: {#.doc "Implementations of common structures for Lux's primitive number types."} - lux - (lux (control number - [monoid (#+ Monoid)] - [equivalence (#+ Equivalence)] - hash - [order] - enum - interval - [codec (#+ Codec)]) - (data ["e" error] - [maybe] - [bit]))) + [lux #* + [control + number + [monoid (#+ Monoid)] + [equivalence (#+ Equivalence)] + hash + [order] + enum + interval + [codec (#+ Codec)]] + [data + ["e" error] + [maybe] + [bit]]]) ## [Structures] (do-template [<type> <test>] diff --git a/stdlib/source/lux/data/number/complex.lux b/stdlib/source/lux/data/number/complex.lux index 58818de8c..134801015 100644 --- a/stdlib/source/lux/data/number/complex.lux +++ b/stdlib/source/lux/data/number/complex.lux @@ -1,18 +1,20 @@ (.module: {#.doc "Complex arithmetic."} - lux - (lux [math] - (control [equivalence (#+ Equivalence)] - number - codec - ["M" monad (#+ do Monad)] - ["p" parser]) - (data [number ("frac/" Number<Frac>)] - [text ("text/" Monoid<Text>)] - [maybe] - (collection [list ("list/" Functor<List>)])) - [macro] - (macro [code] - ["s" syntax (#+ syntax: Syntax)]))) + [lux #* + [math] + [control + [equivalence (#+ Equivalence)] + number + codec + ["M" monad (#+ do Monad)] + ["p" parser]] + [data + [number ("frac/" Number<Frac>)] + [text ("text/" Monoid<Text>)] + [maybe] + [collection [list ("list/" Functor<List>)]]] + ["." macro + [code] + ["s" syntax (#+ syntax: Syntax)]]]) (type: #export Complex {#real Frac diff --git a/stdlib/source/lux/data/number/ratio.lux b/stdlib/source/lux/data/number/ratio.lux index b364dec92..b1aed0cba 100644 --- a/stdlib/source/lux/data/number/ratio.lux +++ b/stdlib/source/lux/data/number/ratio.lux @@ -1,21 +1,23 @@ (.module: {#.doc "Rational arithmetic."} - lux - (lux [math] - (control [equivalence (#+ Equivalence)] - [order] - number - codec - monad - ["p" parser]) - (data [number ("nat/" Codec<Text,Nat>)] - [text ("text/" Monoid<Text>)] - text/format - ["E" error] - [product] - [maybe]) - [macro] - (macro [code] - ["s" syntax (#+ syntax: Syntax)]))) + [lux #* + [math] + [control + [equivalence (#+ Equivalence)] + [order] + number + codec + monad + ["p" parser]] + [data + [number ("nat/" Codec<Text,Nat>)] + [text ("text/" Monoid<Text>) + format] + ["E" error] + [product] + [maybe]] + ["." macro + [code] + ["s" syntax (#+ syntax: Syntax)]]]) (type: #export Ratio {#numerator Nat diff --git a/stdlib/source/lux/data/store.lux b/stdlib/source/lux/data/store.lux index 96e4988b3..c1b974840 100644 --- a/stdlib/source/lux/data/store.lux +++ b/stdlib/source/lux/data/store.lux @@ -1,8 +1,9 @@ (.module: - lux - (lux (control ["F" functor] - comonad) - (type implicit))) + [lux #* + [control + ["F" functor] + comonad] + [type implicit]]) (type: #export (Store s a) {#cursor s diff --git a/stdlib/source/lux/data/tainted.lux b/stdlib/source/lux/data/tainted.lux index b3f883fdf..903b777d6 100644 --- a/stdlib/source/lux/data/tainted.lux +++ b/stdlib/source/lux/data/tainted.lux @@ -1,7 +1,9 @@ (.module: - lux - (lux (data [product]) - (type abstract))) + [lux #* + [data + [product]] + [type + abstract]]) (abstract: #export (Tainted a) a diff --git a/stdlib/source/lux/data/text.lux b/stdlib/source/lux/data/text.lux index 3ceceb171..a7fbd8a18 100644 --- a/stdlib/source/lux/data/text.lux +++ b/stdlib/source/lux/data/text.lux @@ -1,13 +1,15 @@ (.module: - lux - (lux (control [monoid (#+ Monoid)] - [equivalence (#+ Equivalence)] - [order] - [monad (#+ do Monad)] - [codec (#+ Codec)] - hash) - (data (collection [list]) - [maybe]))) + [lux #* + [control + [monoid (#+ Monoid)] + [equivalence (#+ Equivalence)] + [order] + [monad (#+ do Monad)] + [codec (#+ Codec)] + hash] + [data + [collection [list]] + [maybe]]]) ## [Functions] (def: #export (size x) diff --git a/stdlib/source/lux/data/text/buffer.lux b/stdlib/source/lux/data/text/buffer.lux index 5b8f8e56e..33708932e 100644 --- a/stdlib/source/lux/data/text/buffer.lux +++ b/stdlib/source/lux/data/text/buffer.lux @@ -1,11 +1,14 @@ (.module: - lux - (lux (data [product] - text/format - (collection [row (#+ Row) ("row/" Fold<Row>)])) - (language ["_" host]) - (type abstract) - [host (#+ import:)]) + [lux #* + [data + [product] + [text format] + [collection [row (#+ Row) ("row/" Fold<Row>)]]] + [language + ["_" host]] + [type + abstract] + [host (#+ import:)]] [//]) (`` (for {(~~ (static _.jvm)) diff --git a/stdlib/source/lux/data/text/encoding.lux b/stdlib/source/lux/data/text/encoding.lux index 7442faa68..2ea8e4a76 100644 --- a/stdlib/source/lux/data/text/encoding.lux +++ b/stdlib/source/lux/data/text/encoding.lux @@ -1,9 +1,9 @@ (.module: - lux - (lux (data [error (#+ Error)]) - (world [blob (#+ Blob)]) - (language ["_" host]) - [host (#+ import:)])) + [lux #* + [data [error (#+ Error)]] + [world [blob (#+ Blob)]] + [language ["_" host]] + [host (#+ import:)]]) (`` (for {(~~ (static _.jvm)) (as-is (def: utf8 Text "UTF-8") diff --git a/stdlib/source/lux/data/text/format.lux b/stdlib/source/lux/data/text/format.lux index 977592479..d32862024 100644 --- a/stdlib/source/lux/data/text/format.lux +++ b/stdlib/source/lux/data/text/format.lux @@ -1,23 +1,27 @@ (.module: - lux - (lux (control [monad (#+ do Monad)] - ["p" parser]) - (data [bool] - [number] - [text] - [ident] - (collection [list ("list/" Monad<List>)]) - (format [xml] - [json])) - (time [instant] - [duration] - [date]) - (math [modular]) - [macro] - (macro [code] - ["s" syntax (#+ syntax: Syntax)]) - (language [type]) - )) + [lux #* + [control + [monad (#+ do Monad)] + ["p" parser]] + [data + [bool] + [number] + [text] + [ident] + [collection [list ("list/" Monad<List>)]] + [format + [xml] + [json]]] + [time + [instant] + [duration] + [date]] + [math [modular]] + ["." macro + [code] + ["s" syntax (#+ syntax: Syntax)]] + [language [type]] + ]) ## [Syntax] (syntax: #export (format {fragments (p.many s.any)}) diff --git a/stdlib/source/lux/data/text/lexer.lux b/stdlib/source/lux/data/text/lexer.lux index c45361800..13c49ef8f 100644 --- a/stdlib/source/lux/data/text/lexer.lux +++ b/stdlib/source/lux/data/text/lexer.lux @@ -1,13 +1,15 @@ (.module: - [lux (#- not)] - (lux (control [monad (#+ do Monad)] - ["p" parser]) - (data [text ("text/" Monoid<Text>)] - [product] - [maybe] - ["e" error] - (collection [list])) - (macro [code]))) + [lux (#- not) + [control + [monad (#+ do Monad)] + ["p" parser]] + [data + [text ("text/" Monoid<Text>)] + [product] + [maybe] + ["e" error] + [collection [list]]] + [macro [code]]]) (type: Offset Nat) diff --git a/stdlib/source/lux/data/text/regex.lux b/stdlib/source/lux/data/text/regex.lux index 6a71ca24d..8b35b770c 100644 --- a/stdlib/source/lux/data/text/regex.lux +++ b/stdlib/source/lux/data/text/regex.lux @@ -1,18 +1,20 @@ (.module: - lux - (lux (control monad - ["p" parser ("parser/" Monad<Parser>)]) - (data [text] - ["l" text/lexer] - text/format - [number ("int/" Codec<Text,Int>)] - [product] - ["e" error] - [maybe] - (collection [list ("list/" Fold<List> Monad<List>)])) - [macro (#+ with-gensyms)] - (macro [code] - ["s" syntax (#+ syntax:)]))) + [lux #* + [control + monad + ["p" parser ("parser/" Monad<Parser>)]] + [data + [number ("int/" Codec<Text,Int>)] + [product] + ["e" error] + [maybe] + ["." text + ["l" lexer] + format] + [collection [list ("list/" Fold<List> Monad<List>)]]] + [macro (#+ with-gensyms) + [code] + ["s" syntax (#+ syntax:)]]]) ## [Utils] (def: regex-char^ diff --git a/stdlib/source/lux/data/text/unicode.lux b/stdlib/source/lux/data/text/unicode.lux index 5c946c84f..10b9692ee 100644 --- a/stdlib/source/lux/data/text/unicode.lux +++ b/stdlib/source/lux/data/text/unicode.lux @@ -1,11 +1,14 @@ (.module: - lux - (lux (control [interval (#+ Interval)] - [monoid (#+ Monoid)]) - (data [number (#+ hex) ("nat/" Interval<Nat>)] - (collection [list] - (tree [finger (#+ Tree)]))) - (type abstract))) + [lux #* + [control + [interval (#+ Interval)] + [monoid (#+ Monoid)]] + [data + [number (#+ hex) ("nat/" Interval<Nat>)] + [collection + [list] + [tree [finger (#+ Tree)]]]] + [type abstract]]) (type: #export Char Nat) diff --git a/stdlib/source/lux/data/trace.lux b/stdlib/source/lux/data/trace.lux index f86219be7..a0c366199 100644 --- a/stdlib/source/lux/data/trace.lux +++ b/stdlib/source/lux/data/trace.lux @@ -1,9 +1,10 @@ (.module: - lux - (lux (control [monoid (#+ Monoid)] - [functor (#+ Functor)] - comonad) - function)) + [lux #* + [control + [monoid (#+ Monoid)] + [functor (#+ Functor)] + comonad] + function]) (type: #export (Trace t a) {#monoid (Monoid t) diff --git a/stdlib/source/lux/function.lux b/stdlib/source/lux/function.lux index a492b3a44..f883e36df 100644 --- a/stdlib/source/lux/function.lux +++ b/stdlib/source/lux/function.lux @@ -1,6 +1,6 @@ (.module: - lux - (lux (control [monoid (#+ Monoid)]))) + [lux #* + [control [monoid (#+ Monoid)]]]) (def: #export (compose f g) {#.doc "Function composition."} diff --git a/stdlib/source/lux/host.js.lux b/stdlib/source/lux/host.js.lux index a9a486e29..b3758e3b5 100644 --- a/stdlib/source/lux/host.js.lux +++ b/stdlib/source/lux/host.js.lux @@ -1,12 +1,13 @@ (.module: - lux - (lux (control monad - ["p" parser]) - (data (collection [list #* ("list/" Fold<List>)])) - [macro (#+ with-gensyms)] - (macro [code] - ["s" syntax (#+ syntax: Syntax)]) - )) + [lux (#+) + [control + monad + ["p" parser]] + [data [collection [list #* ("list/" Fold<List>)]]] + [macro (#+ with-gensyms) + [code] + ["s" syntax (#+ syntax: Syntax)]] + ]) (do-template [<name> <type>] [(type: #export <name> (#.Primitive <type> #.Nil))] diff --git a/stdlib/source/lux/host.jvm.lux b/stdlib/source/lux/host.jvm.lux index 50ac06f0b..8639ea2c5 100644 --- a/stdlib/source/lux/host.jvm.lux +++ b/stdlib/source/lux/host.jvm.lux @@ -1,22 +1,24 @@ (.module: - [lux (#- type)] - (lux (control [monad (#+ do Monad)] - [enum] - ["p" parser]) - [io (#+ IO Monad<IO> io)] - function - (data (collection [list ("list/" Monad<List> Fold<List> Monoid<List>)]) - number - [maybe] - [product] - [text ("text/" Equivalence<Text> Monoid<Text>)] - text/format - [bool ("bool/" Codec<Text,Bool>)]) - [macro (#+ with-gensyms Functor<Meta> Monad<Meta>)] - (macro [code] - ["s" syntax (#+ syntax: Syntax)]) - (language [type ("type/" Equivalence<Type>)]) - )) + [lux (#- type) + [control + [monad (#+ do Monad)] + [enum] + ["p" parser]] + [io (#+ IO Monad<IO> io)] + function + [data + [collection [list ("list/" Monad<List> Fold<List> Monoid<List>)]] + number + [maybe] + [product] + [text ("text/" Equivalence<Text> Monoid<Text>) + format] + [bool ("bool/" Codec<Text,Bool>)]] + [macro (#+ with-gensyms Functor<Meta> Monad<Meta>) + [code] + ["s" syntax (#+ syntax: Syntax)]] + [language [type ("type/" Equivalence<Type>)]] + ]) (do-template [<name> <op> <from> <to>] [(def: #export (<name> value) diff --git a/stdlib/source/lux/io.lux b/stdlib/source/lux/io.lux index 7d8ed09ad..5ccd6788d 100644 --- a/stdlib/source/lux/io.lux +++ b/stdlib/source/lux/io.lux @@ -1,11 +1,13 @@ (.module: {#.doc "A method for abstracting I/O and effectful computations to make it safe while writing pure functional code."} - lux - (lux (control [functor (#+ Functor)] - [apply (#+ Apply)] - [monad (#+ do Monad)] - ["ex" exception (#+ Exception)]) - (data ["e" error (#+ Error)] - (collection [list])))) + [lux #* + [control + [functor (#+ Functor)] + [apply (#+ Apply)] + [monad (#+ do Monad)] + ["ex" exception (#+ Exception)]] + [data + ["e" error (#+ Error)] + [collection [list]]]]) (type: #export (IO a) {#.doc "A type that represents synchronous, effectful computations that may interact with the outside world."} diff --git a/stdlib/source/lux/language/compiler.lux b/stdlib/source/lux/language/compiler.lux index db2010e7f..d8b622c31 100644 --- a/stdlib/source/lux/language/compiler.lux +++ b/stdlib/source/lux/language/compiler.lux @@ -1,14 +1,16 @@ (.module: - lux - (lux (control [state] - ["ex" exception (#+ Exception exception:)] - [monad (#+ do)]) - (data [product] - [error (#+ Error)] - [text] - text/format) - [function] - (macro ["s" syntax (#+ syntax:)]))) + [lux #* + [control + [state] + ["ex" exception (#+ Exception exception:)] + [monad (#+ do)]] + [data + [product] + [error (#+ Error)] + ["." text + format]] + [function] + [macro ["s" syntax (#+ syntax:)]]]) (type: #export (Operation s o) (state.State' Error s o)) diff --git a/stdlib/source/lux/language/compiler/analysis.lux b/stdlib/source/lux/language/compiler/analysis.lux index c8dd643de..6956cd0b4 100644 --- a/stdlib/source/lux/language/compiler/analysis.lux +++ b/stdlib/source/lux/language/compiler/analysis.lux @@ -1,10 +1,11 @@ (.module: - [lux (#- nat int rev)] - (lux (data [product] - [error] - [text ("text/" Equivalence<Text>)] - (collection [list ("list/" Fold<List>)])) - [function]) + [lux (#- nat int rev) + [data + [product] + [error] + [text ("text/" Equivalence<Text>)] + [collection [list ("list/" Fold<List>)]]] + [function]] [///reference (#+ Register Variable Reference)] [//]) diff --git a/stdlib/source/lux/language/compiler/analysis/case.lux b/stdlib/source/lux/language/compiler/analysis/case.lux index 6644fdabe..d1ef6ece1 100644 --- a/stdlib/source/lux/language/compiler/analysis/case.lux +++ b/stdlib/source/lux/language/compiler/analysis/case.lux @@ -1,17 +1,21 @@ (.module: - [lux (#- case)] - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)]) - (data [product] - [error] - [maybe] - text/format - (collection [list ("list/" Fold<List> Monoid<List> Functor<List>)])) - [macro] - (macro [code])) - (//// [type] - (type ["tc" check]) - [scope]) + [lux (#- case) + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)]] + [data + [product] + [error] + [maybe] + [text + format] + [collection [list ("list/" Fold<List> Monoid<List> Functor<List>)]]] + ["." macro + [code]]] + [//// + ["." type + ["tc" check]] + [scope]] [///] [// (#+ Pattern Analysis Operation Compiler)] [//type] diff --git a/stdlib/source/lux/language/compiler/analysis/case/coverage.lux b/stdlib/source/lux/language/compiler/analysis/case/coverage.lux index c01a7303a..bce8512e5 100644 --- a/stdlib/source/lux/language/compiler/analysis/case/coverage.lux +++ b/stdlib/source/lux/language/compiler/analysis/case/coverage.lux @@ -1,15 +1,18 @@ (.module: - lux - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)] - equivalence) - (data [bool ("bool/" Equivalence<Bool>)] - [number] - ["e" error ("error/" Monad<Error>)] - [maybe] - text/format - (collection [list ("list/" Fold<List>)] - ["dict" dictionary (#+ Dictionary)]))) + [lux #* + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)] + equivalence] + [data + [bool ("bool/" Equivalence<Bool>)] + [number] + ["e" error ("error/" Monad<Error>)] + [maybe] + [text format] + [collection + [list ("list/" Fold<List>)] + ["dict" dictionary (#+ Dictionary)]]]] [//// ("operation/" Monad<Operation>)] [/// (#+ Pattern Variant Operation)]) diff --git a/stdlib/source/lux/language/compiler/analysis/expression.lux b/stdlib/source/lux/language/compiler/analysis/expression.lux index f9a44f2f2..f6ec5d11a 100644 --- a/stdlib/source/lux/language/compiler/analysis/expression.lux +++ b/stdlib/source/lux/language/compiler/analysis/expression.lux @@ -1,14 +1,18 @@ (.module: - lux - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)]) - (data ["e" error] - [product] - text/format) - [macro]) - [//// (#+ Eval)] - ## (//// [".L" macro] - ## [".L" extension]) + [lux #* + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)]] + [data + ["e" error] + [product] + [text + format]] + [macro]] + [//// (#+ Eval) + ## [".L" macro] + ## [".L" extension] + ] [///] [// (#+ Analysis Operation Compiler)] [//type] diff --git a/stdlib/source/lux/language/compiler/analysis/function.lux b/stdlib/source/lux/language/compiler/analysis/function.lux index 833e32eaf..95eacc47e 100644 --- a/stdlib/source/lux/language/compiler/analysis/function.lux +++ b/stdlib/source/lux/language/compiler/analysis/function.lux @@ -1,16 +1,19 @@ (.module: - [lux (#- function)] - (lux (control monad - ["ex" exception (#+ exception:)]) - (data [maybe] - [text] - text/format - (collection [list ("list/" Fold<List> Monoid<List> Monad<List>)])) - [macro] - (macro [code]) - (language [type] - (type ["tc" check]) - [".L" scope])) + [lux (#- function) + [control + monad + ["ex" exception (#+ exception:)]] + [data + [maybe] + ["." text + format] + [collection [list ("list/" Fold<List> Monoid<List> Monad<List>)]]] + ["." macro + [code]] + [language + ["." type + ["tc" check]] + [".L" scope]]] [///] [// (#+ Analysis Compiler)] [//type] diff --git a/stdlib/source/lux/language/compiler/analysis/inference.lux b/stdlib/source/lux/language/compiler/analysis/inference.lux index 187b6bb5c..1539e1a0d 100644 --- a/stdlib/source/lux/language/compiler/analysis/inference.lux +++ b/stdlib/source/lux/language/compiler/analysis/inference.lux @@ -1,14 +1,16 @@ (.module: - lux - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)]) - (data [maybe] - [text] - text/format - (collection [list ("list/" Functor<List>)])) - [macro]) - (//// [type] - (type ["tc" check])) + [lux #* + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)]] + [data + [maybe] + ["." text + format] + [collection [list ("list/" Functor<List>)]]] + [macro]] + [//// ["." type + ["tc" check]]] [/// ("operation/" Monad<Operation>)] [// (#+ Tag Analysis Operation Compiler)] [//type]) diff --git a/stdlib/source/lux/language/compiler/analysis/primitive.lux b/stdlib/source/lux/language/compiler/analysis/primitive.lux index 5fa4c1ba1..cbfef367f 100644 --- a/stdlib/source/lux/language/compiler/analysis/primitive.lux +++ b/stdlib/source/lux/language/compiler/analysis/primitive.lux @@ -1,9 +1,9 @@ (.module: - [lux (#- nat int rev)] - (lux (control monad) - [macro]) - [// (#+ Analysis)] - (// [".A" type])) + [lux (#- nat int rev) + [control monad] + [macro]] + [// (#+ Analysis) + [".A" type]]) ## [Analysers] (do-template [<name> <type> <tag>] diff --git a/stdlib/source/lux/language/compiler/analysis/reference.lux b/stdlib/source/lux/language/compiler/analysis/reference.lux index 4e73c410f..cdffd6870 100644 --- a/stdlib/source/lux/language/compiler/analysis/reference.lux +++ b/stdlib/source/lux/language/compiler/analysis/reference.lux @@ -1,12 +1,14 @@ (.module: - lux - (lux (control monad - ["ex" exception (#+ exception:)]) - [macro] - (macro [code]) - (language (type ["tc" check])) - (data [text ("text/" Equivalence<Text>)] - text/format)) + [lux #* + [control + monad + ["ex" exception (#+ exception:)]] + ["." macro + [code]] + [language [type ["tc" check]]] + [data + [text ("text/" Equivalence<Text>) + format]]] [///] [// (#+ Analysis Operation)] [//type] diff --git a/stdlib/source/lux/language/compiler/analysis/structure.lux b/stdlib/source/lux/language/compiler/analysis/structure.lux index 53ccecd50..e30d22bad 100644 --- a/stdlib/source/lux/language/compiler/analysis/structure.lux +++ b/stdlib/source/lux/language/compiler/analysis/structure.lux @@ -1,18 +1,21 @@ (.module: - lux - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)]) - (data [ident] - [number] - [product] - [maybe] - (collection [list ("list/" Functor<List>)] - ["dict" dictionary (#+ Dictionary)]) - text/format) - [macro] - (macro [code])) - (//// [type] - (type ["tc" check])) + [lux #* + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)]] + [data + [ident] + [number] + [product] + [maybe] + [text format] + [collection [list ("list/" Functor<List>)] + ["dict" dictionary (#+ Dictionary)]]] + ["." macro + [code]]] + [//// + ["." type + ["tc" check]]] [///] [// (#+ Tag Analysis Operation Compiler)] [//type] diff --git a/stdlib/source/lux/language/compiler/analysis/type.lux b/stdlib/source/lux/language/compiler/analysis/type.lux index 821da5557..0c73dedab 100644 --- a/stdlib/source/lux/language/compiler/analysis/type.lux +++ b/stdlib/source/lux/language/compiler/analysis/type.lux @@ -1,9 +1,9 @@ (.module: - lux - (lux (control [monad (#+ do)]) - (data [error]) - [macro] - (language (type ["tc" check]))) + [lux #* + [control [monad (#+ do)]] + [data [error]] + [macro] + [language [type ["tc" check]]]] [///] [// (#+ Operation)]) diff --git a/stdlib/source/lux/language/compiler/default/cache.lux b/stdlib/source/lux/language/compiler/default/cache.lux index 42b13ba86..f41cd0792 100644 --- a/stdlib/source/lux/language/compiler/default/cache.lux +++ b/stdlib/source/lux/language/compiler/default/cache.lux @@ -1,6 +1,6 @@ (.module: - lux - (lux (data (format [binary (#+ Binary)])))) + [lux #* + [data [format [binary (#+ Binary)]]]]) (def: definition (Binary Definition) diff --git a/stdlib/source/lux/language/compiler/default/repl/type.lux b/stdlib/source/lux/language/compiler/default/repl/type.lux index 30131d159..a9342ab6a 100644 --- a/stdlib/source/lux/language/compiler/default/repl/type.lux +++ b/stdlib/source/lux/language/compiler/default/repl/type.lux @@ -1,22 +1,27 @@ (.module: - lux - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)] - ["p" parser] - pipe) - (data [error (#+ Error)] - text/format - (format [xml (#+ XML)] - [json (#+ JSON)]) - (collection [list])) - (time [instant (#+ Instant)] - [duration (#+ Duration)] - [date (#+ Date)]) - [function] - [macro] - (macro [code] - [poly (#+ Poly)]) - (language [type]))) + [lux #* + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)] + ["p" parser] + pipe] + [data + [error (#+ Error)] + [text + format] + [format + [xml (#+ XML)] + [json (#+ JSON)]] + [collection [list]]] + [time + [instant (#+ Instant)] + [duration (#+ Duration)] + [date (#+ Date)]] + [function] + ["." macro + [code] + [poly (#+ Poly)]] + [language [type]]]) (exception: #export (cannot-represent-value {type Type}) (ex.report ["Type" (%type type)])) diff --git a/stdlib/source/lux/language/compiler/extension.lux b/stdlib/source/lux/language/compiler/extension.lux index 91b48dfb7..478c90564 100644 --- a/stdlib/source/lux/language/compiler/extension.lux +++ b/stdlib/source/lux/language/compiler/extension.lux @@ -1,10 +1,12 @@ (.module: - lux - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)]) - (data [error (#+ Error)] - [text] - (collection ["dict" dictionary (#+ Dictionary)]))) + [lux #* + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)]] + [data + [error (#+ Error)] + [text] + [collection ["dict" dictionary (#+ Dictionary)]]]] [// (#+ Operation Compiler)]) (type: #export (Extension i) diff --git a/stdlib/source/lux/language/compiler/extension/analysis.lux b/stdlib/source/lux/language/compiler/extension/analysis.lux index a34dcae77..ba37b4578 100644 --- a/stdlib/source/lux/language/compiler/extension/analysis.lux +++ b/stdlib/source/lux/language/compiler/extension/analysis.lux @@ -1,8 +1,10 @@ (.module: - lux - (lux (data [text] - (collection [list ("list/" Functor<List>)] - ["dict" dictionary (#+ Dictionary)]))) + [lux #* + [data + [text] + [collection + [list ("list/" Functor<List>)] + ["dict" dictionary (#+ Dictionary)]]]] [///analysis (#+ Analysis State)] [///synthesis (#+ Synthesis)] [//] diff --git a/stdlib/source/lux/language/compiler/extension/analysis/common.lux b/stdlib/source/lux/language/compiler/extension/analysis/common.lux index c099a9648..66189cec8 100644 --- a/stdlib/source/lux/language/compiler/extension/analysis/common.lux +++ b/stdlib/source/lux/language/compiler/extension/analysis/common.lux @@ -1,22 +1,26 @@ (.module: - lux - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)] - [thread (#+ Box)]) - (concurrency [atom (#+ Atom)]) - (data [text] - text/format - (collection [list ("list/" Functor<List>)] - [array] - ["dict" dictionary (#+ Dictionary)])) - [language] - (language (type ["tc" check])) - [io (#+ IO)]) + [lux #* + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)] + [thread (#+ Box)]] + [concurrency [atom (#+ Atom)]] + [data + ["." text + format] + [collection + [list ("list/" Functor<List>)] + [array] + ["dict" dictionary (#+ Dictionary)]]] + ["." language + [type ["tc" check]]] + [io (#+ IO)]] [////] - (//// [analysis (#+ Analysis)] - (analysis [".A" type] - [".A" case] - [".A" function])) + [//// + [analysis (#+ Analysis) + [".A" type] + [".A" case] + [".A" function]]] [///] [///bundle]) diff --git a/stdlib/source/lux/language/compiler/extension/analysis/host.jvm.lux b/stdlib/source/lux/language/compiler/extension/analysis/host.jvm.lux index 1985706c2..e13b32c08 100644 --- a/stdlib/source/lux/language/compiler/extension/analysis/host.jvm.lux +++ b/stdlib/source/lux/language/compiler/extension/analysis/host.jvm.lux @@ -1,29 +1,33 @@ (.module: - [lux (#- char int)] - (lux (control [monad (#+ do)] - ["p" parser] - ["ex" exception (#+ exception:)]) - (data ["e" error] - [maybe] - [product] - [bool ("bool/" Equivalence<Bool>)] - [text ("text/" Equivalence<Text>)] - (text format - ["l" lexer]) - (collection [list ("list/" Fold<List> Functor<List> Monoid<List>)] - [array] - ["dict" dictionary (#+ Dictionary)])) - [macro ("macro/" Monad<Meta>)] - (macro [code] - ["s" syntax]) - [language] - (language [type] - (type ["tc" check])) - [host]) + [lux (#- char int) + [control + [monad (#+ do)] + ["p" parser] + ["ex" exception (#+ exception:)]] + [data + ["e" error] + [maybe] + [product] + [bool ("bool/" Equivalence<Bool>)] + [text ("text/" Equivalence<Text>) + format + ["l" lexer]] + [collection + [list ("list/" Fold<List> Functor<List> Monoid<List>)] + [array] + ["dict" dictionary (#+ Dictionary)]]] + [macro ("macro/" Monad<Meta>) + [code] + ["s" syntax]] + ["." language + ["." type + ["tc" check]]] + [host]] ["/" //common] - (//// [".L" analysis (#+ Analysis)] - (analysis [".A" type] - [".A" inference])) + [//// + [".L" analysis (#+ Analysis) + [".A" type] + [".A" inference]]] [///] ) diff --git a/stdlib/source/lux/language/compiler/extension/bundle.lux b/stdlib/source/lux/language/compiler/extension/bundle.lux index 57bae70ed..315d05523 100644 --- a/stdlib/source/lux/language/compiler/extension/bundle.lux +++ b/stdlib/source/lux/language/compiler/extension/bundle.lux @@ -1,11 +1,14 @@ (.module: - lux - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)]) - (data [text] - text/format - (collection [list ("list/" Functor<List>)] - ["dict" dictionary (#+ Dictionary)]))) + [lux #* + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)]] + [data + ["." text + format] + [collection + [list ("list/" Functor<List>)] + ["dict" dictionary (#+ Dictionary)]]]] [//]) (exception: #export (incorrect-arity {name Text} {arity Nat} {args Nat}) diff --git a/stdlib/source/lux/language/compiler/extension/synthesis.lux b/stdlib/source/lux/language/compiler/extension/synthesis.lux index db1671c93..d907808a8 100644 --- a/stdlib/source/lux/language/compiler/extension/synthesis.lux +++ b/stdlib/source/lux/language/compiler/extension/synthesis.lux @@ -1,7 +1,8 @@ (.module: - lux - (lux (data [text] - (collection ["dict" dictionary (#+ Dictionary)]))) + [lux #* + [data + [text] + [collection ["dict" dictionary (#+ Dictionary)]]]] [//]) (def: #export defaults diff --git a/stdlib/source/lux/language/compiler/extension/translation.lux b/stdlib/source/lux/language/compiler/extension/translation.lux index 345333a8a..3a43e0dcb 100644 --- a/stdlib/source/lux/language/compiler/extension/translation.lux +++ b/stdlib/source/lux/language/compiler/extension/translation.lux @@ -1,7 +1,8 @@ (.module: - lux - (lux (data [text] - (collection ["dict" dictionary (#+ Dictionary)]))) + [lux #* + [data + [text] + [collection ["dict" dictionary (#+ Dictionary)]]]] [//]) (def: #export defaults diff --git a/stdlib/source/lux/language/compiler/meta/archive.lux b/stdlib/source/lux/language/compiler/meta/archive.lux index 4acb0b895..4a981007a 100644 --- a/stdlib/source/lux/language/compiler/meta/archive.lux +++ b/stdlib/source/lux/language/compiler/meta/archive.lux @@ -1,16 +1,18 @@ (.module: - lux - (lux (control ["ex" exception (#+ exception:)] - [equivalence (#+ Equivalence)] - [monad (#+ do)]) - (data [error (#+ Error)] - [ident] - [text] - text/format - (collection ["dict" dictionary (#+ Dictionary)])) - (language [type (#+ :share)]) - (type abstract) - (world [file (#+ File)])) + [lux #* + [control + ["ex" exception (#+ exception:)] + [equivalence (#+ Equivalence)] + [monad (#+ do)]] + [data + [error (#+ Error)] + [ident] + ["." text + format] + [collection ["dict" dictionary (#+ Dictionary)]]] + [language [type (#+ :share)]] + [type abstract] + [world [file (#+ File)]]] [//// (#+ Version)]) ## Key diff --git a/stdlib/source/lux/language/compiler/meta/cache.lux b/stdlib/source/lux/language/compiler/meta/cache.lux index e2de04813..753a66e89 100644 --- a/stdlib/source/lux/language/compiler/meta/cache.lux +++ b/stdlib/source/lux/language/compiler/meta/cache.lux @@ -1,19 +1,22 @@ (.module: - [lux (#- Module)] - (lux (control [monad (#+ Monad do)] - ["ex" exception (#+ exception:)] - pipe) - (data [bool ("bool/" Equivalence<Bool>)] - [maybe] - [error] - [product] - (format [binary (#+ Binary)]) - [text] - text/format - (collection [list ("list/" Functor<List> Fold<List>)] - ["dict" dictionary (#+ Dictionary)] - [set (#+ Set)])) - (world [file (#+ File System)])) + [lux (#- Module) + [control + [monad (#+ Monad do)] + ["ex" exception (#+ exception:)] + pipe] + [data + [bool ("bool/" Equivalence<Bool>)] + [maybe] + [error] + [product] + [format [binary (#+ Binary)]] + ["." text + format] + [collection + [list ("list/" Functor<List> Fold<List>)] + ["dict" dictionary (#+ Dictionary)] + [set (#+ Set)]]] + [world [file (#+ File System)]]] [//io (#+ Context Module)] [//io/context] [//io/archive] diff --git a/stdlib/source/lux/language/compiler/meta/cache/dependency.lux b/stdlib/source/lux/language/compiler/meta/cache/dependency.lux index be61f963f..b12a7e9fb 100644 --- a/stdlib/source/lux/language/compiler/meta/cache/dependency.lux +++ b/stdlib/source/lux/language/compiler/meta/cache/dependency.lux @@ -1,8 +1,10 @@ (.module: - [lux (#- Module)] - (lux (data [text] - (collection [list ("list/" Functor<List> Fold<List>)] - ["dict" dictionary (#+ Dictionary)]))) + [lux (#- Module) + [data + [text] + [collection + [list ("list/" Functor<List> Fold<List>)] + ["dict" dictionary (#+ Dictionary)]]]] [///io (#+ Module)] [///archive (#+ Archive)]) diff --git a/stdlib/source/lux/language/compiler/meta/io.lux b/stdlib/source/lux/language/compiler/meta/io.lux index e3d218b4c..3ba31fa82 100644 --- a/stdlib/source/lux/language/compiler/meta/io.lux +++ b/stdlib/source/lux/language/compiler/meta/io.lux @@ -1,13 +1,16 @@ (.module: - [lux (#- Module)] - (lux (control monad - ["ex" exception (#+ exception:)]) - (data [error] - [text] - (text format - [encoding])) - (world [file (#+ File System)] - [blob (#+ Blob)]))) + [lux (#- Module) + [control + monad + ["ex" exception (#+ exception:)]] + [data + [error] + ["." text + format + [encoding]]] + [world + [file (#+ File System)] + [blob (#+ Blob)]]]) (type: #export Context File) diff --git a/stdlib/source/lux/language/compiler/meta/io/archive.lux b/stdlib/source/lux/language/compiler/meta/io/archive.lux index 55216039f..e69f6eaf4 100644 --- a/stdlib/source/lux/language/compiler/meta/io/archive.lux +++ b/stdlib/source/lux/language/compiler/meta/io/archive.lux @@ -1,12 +1,15 @@ (.module: - [lux (#- Module)] - (lux (control monad - ["ex" exception (#+ exception:)]) - (data [error] - [text] - text/format) - (world [file (#+ File System)] - [blob (#+ Blob)])) + [lux (#- Module) + [control + monad + ["ex" exception (#+ exception:)]] + [data + [error] + ["." text + format]] + [world + [file (#+ File System)] + [blob (#+ Blob)]]] [/////host] [// (#+ Module)]) diff --git a/stdlib/source/lux/language/compiler/meta/io/context.lux b/stdlib/source/lux/language/compiler/meta/io/context.lux index 928784951..4658858ff 100644 --- a/stdlib/source/lux/language/compiler/meta/io/context.lux +++ b/stdlib/source/lux/language/compiler/meta/io/context.lux @@ -1,12 +1,16 @@ (.module: - [lux (#- Module Code)] - (lux (control monad - ["ex" exception (#+ Exception exception:)]) - (data [error] - (text format - [encoding])) - (world [file (#+ File System)] - [blob (#+ Blob)])) + [lux (#- Module Code) + [control + monad + ["ex" exception (#+ Exception exception:)]] + [data + [error] + [text + format + [encoding]]] + [world + [file (#+ File System)] + [blob (#+ Blob)]]] [/////host] [// (#+ Context Module)]) diff --git a/stdlib/source/lux/language/compiler/synthesis.lux b/stdlib/source/lux/language/compiler/synthesis.lux index 3a16d60a1..2e359d2ea 100644 --- a/stdlib/source/lux/language/compiler/synthesis.lux +++ b/stdlib/source/lux/language/compiler/synthesis.lux @@ -1,8 +1,9 @@ (.module: - [lux (#- i64 Scope)] - (lux (control [monad (#+ do)]) - (data [error (#+ Error)] - (collection ["dict" dictionary (#+ Dictionary)]))) + [lux (#- i64 Scope) + [control [monad (#+ do)]] + [data + [error (#+ Error)] + [collection ["dict" dictionary (#+ Dictionary)]]]] [///reference (#+ Register Variable Reference)] [// (#+ Operation Compiler)] [//analysis (#+ Environment Arity Analysis)]) diff --git a/stdlib/source/lux/language/compiler/synthesis/case.lux b/stdlib/source/lux/language/compiler/synthesis/case.lux index 10c41d428..7dd8b3157 100644 --- a/stdlib/source/lux/language/compiler/synthesis/case.lux +++ b/stdlib/source/lux/language/compiler/synthesis/case.lux @@ -1,14 +1,16 @@ (.module: - lux - (lux (control [equivalence (#+ Equivalence)] - pipe - [monad (#+ do)]) - (data [product] - [bool ("bool/" Equivalence<Bool>)] - [text ("text/" Equivalence<Text>)] - text/format - [number ("frac/" Equivalence<Frac>)] - (collection [list ("list/" Fold<List> Monoid<List>)]))) + [lux #* + [control + [equivalence (#+ Equivalence)] + pipe + [monad (#+ do)]] + [data + [product] + [bool ("bool/" Equivalence<Bool>)] + [text ("text/" Equivalence<Text>) + format] + [number ("frac/" Equivalence<Frac>)] + [collection [list ("list/" Fold<List> Monoid<List>)]]]] [///reference] [///compiler (#+ Operation) ("operation/" Monad<Operation>)] [///analysis (#+ Pattern Match Analysis)] diff --git a/stdlib/source/lux/language/compiler/synthesis/expression.lux b/stdlib/source/lux/language/compiler/synthesis/expression.lux index 33c64109d..ffc22d89a 100644 --- a/stdlib/source/lux/language/compiler/synthesis/expression.lux +++ b/stdlib/source/lux/language/compiler/synthesis/expression.lux @@ -1,10 +1,13 @@ (.module: - [lux (#- primitive)] - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)]) - (data [maybe] - (collection [list ("list/" Functor<List>)] - ["dict" dictionary (#+ Dictionary)]))) + [lux (#- primitive) + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)]] + [data + [maybe] + [collection + [list ("list/" Functor<List>)] + ["dict" dictionary (#+ Dictionary)]]]] [///reference] [///compiler ("operation/" Monad<Operation>)] [///analysis (#+ Analysis)] diff --git a/stdlib/source/lux/language/compiler/synthesis/function.lux b/stdlib/source/lux/language/compiler/synthesis/function.lux index 40e8f30c3..2b9cffd19 100644 --- a/stdlib/source/lux/language/compiler/synthesis/function.lux +++ b/stdlib/source/lux/language/compiler/synthesis/function.lux @@ -1,13 +1,16 @@ (.module: - [lux (#- function)] - (lux (control [monad (#+ do)] - [state] - pipe - ["ex" exception (#+ exception:)]) - (data [maybe ("maybe/" Monad<Maybe>)] - [error] - (collection [list ("list/" Functor<List> Monoid<List> Fold<List>)] - ["dict" dictionary (#+ Dictionary)]))) + [lux (#- function) + [control + [monad (#+ do)] + [state] + pipe + ["ex" exception (#+ exception:)]] + [data + [maybe ("maybe/" Monad<Maybe>)] + [error] + [collection + [list ("list/" Functor<List> Monoid<List> Fold<List>)] + ["dict" dictionary (#+ Dictionary)]]]] [///reference (#+ Variable)] [///compiler (#+ Operation)] [///analysis (#+ Environment Arity Analysis)] diff --git a/stdlib/source/lux/language/compiler/synthesis/loop.lux b/stdlib/source/lux/language/compiler/synthesis/loop.lux index 1a017b893..05af31a83 100644 --- a/stdlib/source/lux/language/compiler/synthesis/loop.lux +++ b/stdlib/source/lux/language/compiler/synthesis/loop.lux @@ -1,11 +1,14 @@ (.module: - [lux (#- loop)] - (lux (control [monad (#+ do)] - ["p" parser]) - (data [maybe ("maybe/" Monad<Maybe>)] - (collection [list ("list/" Functor<List>)])) - (macro [code] - [syntax])) + [lux (#- loop) + [control + [monad (#+ do)] + ["p" parser]] + [data + [maybe ("maybe/" Monad<Maybe>)] + [collection [list ("list/" Functor<List>)]]] + [macro + [code] + [syntax]]] [///] [///reference (#+ Register Variable)] [///analysis (#+ Environment)] diff --git a/stdlib/source/lux/language/compiler/translation.lux b/stdlib/source/lux/language/compiler/translation.lux index 19b7045ac..01dc584e6 100644 --- a/stdlib/source/lux/language/compiler/translation.lux +++ b/stdlib/source/lux/language/compiler/translation.lux @@ -1,14 +1,17 @@ (.module: - lux - (lux (control ["ex" exception (#+ exception:)] - [monad (#+ do)]) - (data [maybe ("maybe/" Functor<Maybe>)] - [error (#+ Error)] - [text] - text/format - (collection [row (#+ Row)] - ["dict" dictionary (#+ Dictionary)])) - (world [file (#+ File)])) + [lux #* + [control + ["ex" exception (#+ exception:)] + [monad (#+ do)]] + [data + [maybe ("maybe/" Functor<Maybe>)] + [error (#+ Error)] + ["." text + format] + [collection + [row (#+ Row)] + ["dict" dictionary (#+ Dictionary)]]] + [world [file (#+ File)]]] [// (#+ Operation Compiler)] [//synthesis (#+ Synthesis)]) diff --git a/stdlib/source/lux/language/compiler/translation/scheme/case.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/case.jvm.lux index d075c1138..4460a3102 100644 --- a/stdlib/source/lux/language/compiler/translation/scheme/case.jvm.lux +++ b/stdlib/source/lux/language/compiler/translation/scheme/case.jvm.lux @@ -1,16 +1,20 @@ (.module: - [lux (#- case let if)] - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)]) - (data [number] - [text] - text/format - (collection [list ("list/" Functor<List> Fold<List>)] - [set (#+ Set)]))) - (///// [reference (#+ Register)] - (host ["_" scheme (#+ Expression Computation Var)]) - [compiler ("operation/" Monad<Operation>)] - (compiler [synthesis (#+ Synthesis Path)])) + [lux (#- case let if) + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)]] + [data + [number] + ["." text + format] + [collection + [list ("list/" Functor<List> Fold<List>)] + [set (#+ Set)]]]] + [///// + [reference (#+ Register)] + [host ["_" scheme (#+ Expression Computation Var)]] + [compiler ("operation/" Monad<Operation>) + [synthesis (#+ Synthesis Path)]]] [//runtime (#+ Operation Translator)] [//reference]) diff --git a/stdlib/source/lux/language/compiler/translation/scheme/expression.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/expression.jvm.lux index 60fd99ea8..464f2c27d 100644 --- a/stdlib/source/lux/language/compiler/translation/scheme/expression.jvm.lux +++ b/stdlib/source/lux/language/compiler/translation/scheme/expression.jvm.lux @@ -1,9 +1,10 @@ (.module: - lux - (lux (control [monad (#+ do)])) - (///// [compiler] - (compiler [synthesis] - [extension])) + [lux #* + [control [monad (#+ do)]]] + [///// + ["." compiler + [synthesis] + [extension]]] [//runtime (#+ Translator)] [//primitive] [//structure] diff --git a/stdlib/source/lux/language/compiler/translation/scheme/extension.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/extension.jvm.lux index 770d365cf..a54d67425 100644 --- a/stdlib/source/lux/language/compiler/translation/scheme/extension.jvm.lux +++ b/stdlib/source/lux/language/compiler/translation/scheme/extension.jvm.lux @@ -1,14 +1,18 @@ (.module: - lux - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)]) - (data [maybe] - text/format - (collection ["dict" dictionary (#+ Dictionary)]))) - (///// [reference (#+ Register Variable)] - (host ["_" scheme (#+ Computation)]) - [compiler ("operation/" Monad<Operation>)] - (compiler [synthesis (#+ Synthesis)])) + [lux #* + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)]] + [data + [maybe] + [text + format] + [collection ["dict" dictionary (#+ Dictionary)]]]] + [///// + [reference (#+ Register Variable)] + [host ["_" scheme (#+ Computation)]] + [compiler ("operation/" Monad<Operation>) + [synthesis (#+ Synthesis)]]] [//runtime (#+ Operation Translator)] [/common] ## [/host] diff --git a/stdlib/source/lux/language/compiler/translation/scheme/extension/common.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/extension/common.jvm.lux index 79f39e9d4..377fed8f5 100644 --- a/stdlib/source/lux/language/compiler/translation/scheme/extension/common.jvm.lux +++ b/stdlib/source/lux/language/compiler/translation/scheme/extension/common.jvm.lux @@ -1,21 +1,25 @@ (.module: - lux - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)]) - (data ["e" error] - [product] - [text] - text/format - [number (#+ hex)] - (collection [list ("list/" Functor<List>)] - ["dict" dictionary (#+ Dictionary)])) - [macro (#+ with-gensyms)] - (macro [code] - ["s" syntax (#+ syntax:)]) - [host]) - (////// (host ["_" scheme (#+ Expression Computation)]) - [compiler] - (compiler [synthesis (#+ Synthesis)])) + [lux #* + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)]] + [data + ["e" error] + [product] + ["." text + format] + [number (#+ hex)] + [collection + [list ("list/" Functor<List>)] + ["dict" dictionary (#+ Dictionary)]]] + [macro (#+ with-gensyms) + [code] + ["s" syntax (#+ syntax:)]] + [host]] + [////// + [host ["_" scheme (#+ Expression Computation)]] + ["." compiler + [synthesis (#+ Synthesis)]]] [///runtime (#+ Operation Translator)]) ## [Types] diff --git a/stdlib/source/lux/language/compiler/translation/scheme/function.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/function.jvm.lux index acd639bdf..6afb04799 100644 --- a/stdlib/source/lux/language/compiler/translation/scheme/function.jvm.lux +++ b/stdlib/source/lux/language/compiler/translation/scheme/function.jvm.lux @@ -1,16 +1,20 @@ (.module: - [lux (#- function)] - (lux (control [monad (#+ do)] - pipe) - (data [product] - text/format - (collection [list ("list/" Functor<List>)]))) - (///// [reference (#+ Register Variable)] - [name] - (host ["_" scheme (#+ Expression Computation Var)]) - [compiler ("operation/" Monad<Operation>)] - (compiler [analysis (#+ Variant Tuple Environment Arity Abstraction Application Analysis)] - [synthesis (#+ Synthesis)])) + [lux (#- function) + [control + [monad (#+ do)] + pipe] + [data + [product] + [text + format] + [collection [list ("list/" Functor<List>)]]]] + [///// + [reference (#+ Register Variable)] + [name] + [host ["_" scheme (#+ Expression Computation Var)]] + [compiler ("operation/" Monad<Operation>) + [analysis (#+ Variant Tuple Environment Arity Abstraction Application Analysis)] + [synthesis (#+ Synthesis)]]] [///] [//runtime (#+ Operation Translator)] [//primitive] diff --git a/stdlib/source/lux/language/compiler/translation/scheme/loop.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/loop.jvm.lux index 4fb90a51e..227a2eda9 100644 --- a/stdlib/source/lux/language/compiler/translation/scheme/loop.jvm.lux +++ b/stdlib/source/lux/language/compiler/translation/scheme/loop.jvm.lux @@ -1,14 +1,18 @@ (.module: - [lux (#- Scope)] - (lux (control [monad (#+ do)]) - (data [product] - [text] - text/format - (collection [list ("list/" Functor<List>)])) - [macro]) - (///// (host ["_" scheme (#+ Computation Var)]) - [compiler] - (compiler [synthesis (#+ Scope Synthesis)])) + [lux (#- Scope) + [control + [monad (#+ do)]] + [data + [product] + ["." text + format] + [collection + [list ("list/" Functor<List>)]]] + [macro]] + [///// + [host ["_" scheme (#+ Computation Var)]] + ["." compiler + [synthesis (#+ Scope Synthesis)]]] [///] [//runtime (#+ Operation Translator)] [//reference]) diff --git a/stdlib/source/lux/language/compiler/translation/scheme/primitive.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/primitive.jvm.lux index 2546fd41c..fea12c6c3 100644 --- a/stdlib/source/lux/language/compiler/translation/scheme/primitive.jvm.lux +++ b/stdlib/source/lux/language/compiler/translation/scheme/primitive.jvm.lux @@ -1,8 +1,9 @@ (.module: [lux (#- i64)] [/// (#+ State)] - (///// [compiler ("operation/" Monad<Operation>)] - (host ["_" scheme (#+ Expression)])) + [///// + [compiler ("operation/" Monad<Operation>)] + [host ["_" scheme (#+ Expression)]]] [//runtime (#+ Operation)]) (def: #export bool diff --git a/stdlib/source/lux/language/compiler/translation/scheme/reference.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/reference.jvm.lux index 3babc137d..51dd2f515 100644 --- a/stdlib/source/lux/language/compiler/translation/scheme/reference.jvm.lux +++ b/stdlib/source/lux/language/compiler/translation/scheme/reference.jvm.lux @@ -1,13 +1,17 @@ (.module: - lux - (lux (control pipe) - (data text/format)) - (///// [reference (#+ Register Variable Reference)] - [name] - (host ["_" scheme (#+ Expression Var)]) - [compiler ("operation/" Monad<Operation>)] - (compiler [analysis (#+ Variant Tuple)] - [synthesis (#+ Synthesis)])) + [lux #* + [control + pipe] + [data + [text + format]]] + [///// + [reference (#+ Register Variable Reference)] + [name] + [host ["_" scheme (#+ Expression Var)]] + [compiler ("operation/" Monad<Operation>) + [analysis (#+ Variant Tuple)] + [synthesis (#+ Synthesis)]]] [//runtime (#+ Operation Translator)] [//primitive]) diff --git a/stdlib/source/lux/language/compiler/translation/scheme/runtime.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/runtime.jvm.lux index f068478d2..d2a72d140 100644 --- a/stdlib/source/lux/language/compiler/translation/scheme/runtime.jvm.lux +++ b/stdlib/source/lux/language/compiler/translation/scheme/runtime.jvm.lux @@ -1,19 +1,24 @@ (.module: - lux - (lux (control ["p" parser ("parser/" Monad<Parser>)] - [monad (#+ do)]) - (data [number (#+ hex)] - text/format - (collection [list ("list/" Monad<List>)])) - [function] - (macro [code] - ["s" syntax (#+ syntax:)])) + [lux #* + [control + ["p" parser ("parser/" Monad<Parser>)] + [monad (#+ do)]] + [data + [number (#+ hex)] + [text + format] + [collection [list ("list/" Monad<List>)]]] + [function] + [macro + [code] + ["s" syntax (#+ syntax:)]]] [/// (#+ State)] - (///// [name] - (host ["_" scheme (#+ Expression Computation Var)]) - [compiler] - (compiler [analysis (#+ Variant)] - [synthesis]))) + [///// + [name] + [host ["_" scheme (#+ Expression Computation Var)]] + ["." compiler + [analysis (#+ Variant)] + [synthesis]]]) (type: #export Operation (compiler.Operation (State Var Expression))) diff --git a/stdlib/source/lux/language/compiler/translation/scheme/structure.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/structure.jvm.lux index 4db023b38..ea5440d67 100644 --- a/stdlib/source/lux/language/compiler/translation/scheme/structure.jvm.lux +++ b/stdlib/source/lux/language/compiler/translation/scheme/structure.jvm.lux @@ -1,10 +1,12 @@ (.module: - lux - (lux (control [monad (#+ do)])) - (///// (host ["_" scheme (#+ Expression)]) - [compiler] - (compiler [analysis (#+ Variant Tuple)] - [synthesis (#+ Synthesis)])) + [lux #* + [control [monad (#+ do)]]] + [///// + [host + ["_" scheme (#+ Expression)]] + ["." compiler + [analysis (#+ Variant Tuple)] + [synthesis (#+ Synthesis)]]] [//runtime (#+ Operation Translator)] [//primitive]) diff --git a/stdlib/source/lux/language/host/scheme.lux b/stdlib/source/lux/language/host/scheme.lux index 445a373ac..f93f3b671 100644 --- a/stdlib/source/lux/language/host/scheme.lux +++ b/stdlib/source/lux/language/host/scheme.lux @@ -1,11 +1,14 @@ (.module: - [lux (#- Code' Code int or and if function cond when let)] - (lux (control pipe) - (data [text] - text/format - [number] - (collection [list ("list/" Functor<List> Fold<List>)])) - (type abstract))) + [lux (#- Code' Code int or and if function cond when let) + [control + pipe] + [data + [number] + ["." text + format] + [collection + [list ("list/" Functor<List> Fold<List>)]]] + [type abstract]]) (abstract: Global' {} Any) (abstract: Var' {} Any) diff --git a/stdlib/source/lux/language/module.lux b/stdlib/source/lux/language/module.lux index 051e7cd12..75a1ab302 100644 --- a/stdlib/source/lux/language/module.lux +++ b/stdlib/source/lux/language/module.lux @@ -1,16 +1,19 @@ (.module: - lux - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)] - pipe) - (data [text ("text/" Equivalence<Text>)] - text/format - ["e" error] - (collection [list ("list/" Fold<List> Functor<List>)] - (dictionary [plist]))) - [macro]) - [//compiler] - (//compiler [analysis])) + [lux #* + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)] + pipe] + [data + [text ("text/" Equivalence<Text>) + format] + ["e" error] + [collection + [list ("list/" Fold<List> Functor<List>)] + [dictionary [plist]]]] + [macro]] + ["." //compiler + [analysis]]) (type: #export Tag Text) diff --git a/stdlib/source/lux/language/name.lux b/stdlib/source/lux/language/name.lux index 1053eb76f..0b3dc7bdd 100644 --- a/stdlib/source/lux/language/name.lux +++ b/stdlib/source/lux/language/name.lux @@ -1,8 +1,9 @@ (.module: - lux - (lux (data [maybe] - [text] - text/format))) + [lux #* + [data + [maybe] + ["." text + format]]]) (def: (sanitize char) (-> Nat Text) diff --git a/stdlib/source/lux/language/reference.lux b/stdlib/source/lux/language/reference.lux index daa476553..0e66497a1 100644 --- a/stdlib/source/lux/language/reference.lux +++ b/stdlib/source/lux/language/reference.lux @@ -1,8 +1,9 @@ (.module: - lux - (lux (control [equivalence (#+ Equivalence)] - [hash (#+ Hash)] - pipe))) + [lux #* + [control + [equivalence (#+ Equivalence)] + [hash (#+ Hash)] + pipe]]) (type: #export Register Nat) diff --git a/stdlib/source/lux/language/scope.lux b/stdlib/source/lux/language/scope.lux index e6db7d4bf..1f0cbffc4 100644 --- a/stdlib/source/lux/language/scope.lux +++ b/stdlib/source/lux/language/scope.lux @@ -1,14 +1,17 @@ (.module: - lux - (lux (control monad) - (data [text ("text/" Equivalence<Text>)] - text/format - [maybe ("maybe/" Monad<Maybe>)] - [product] - ["e" error] - (collection [list ("list/" Functor<List> Fold<List> Monoid<List>)] - (dictionary [plist]))) - [macro]) + [lux #* + [control + monad] + [data + [text ("text/" Equivalence<Text>) + format] + [maybe ("maybe/" Monad<Maybe>)] + [product] + ["e" error] + [collection + [list ("list/" Functor<List> Fold<List> Monoid<List>)] + [dictionary [plist]]]] + [macro]] [//reference (#+ Register Variable)]) (type: Locals (Bindings Text [Type Register])) diff --git a/stdlib/source/lux/language/syntax.lux b/stdlib/source/lux/language/syntax.lux index 5c1d5e48c..e924694c3 100644 --- a/stdlib/source/lux/language/syntax.lux +++ b/stdlib/source/lux/language/syntax.lux @@ -25,19 +25,22 @@ ## (file-name, line, column) to keep track of their provenance and ## location, which is helpful for documentation and debugging. (.module: - [lux (#- nat int rev)] - (lux (control monad - ["p" parser ("parser/" Monad<Parser>)] - ["ex" exception (#+ exception:)]) - (data ["e" error] - [number] - [product] - [maybe] - [text] - (text ["l" lexer] - format) - (collection [row (#+ Row)] - ["dict" dictionary (#+ Dictionary)])))) + [lux (#- nat int rev) + [control + monad + ["p" parser ("parser/" Monad<Parser>)] + ["ex" exception (#+ exception:)]] + [data + ["e" error] + [number] + [product] + [maybe] + ["." text + ["l" lexer] + format] + [collection + [row (#+ Row)] + ["dict" dictionary (#+ Dictionary)]]]]) (type: #export Aliases (Dictionary Text Text)) diff --git a/stdlib/source/lux/language/type.lux b/stdlib/source/lux/language/type.lux index 2e8a33245..09c30fd03 100644 --- a/stdlib/source/lux/language/type.lux +++ b/stdlib/source/lux/language/type.lux @@ -1,17 +1,19 @@ (.module: {#.doc "Basic functionality for working with types."} - [lux (#- function)] - (lux (control [equivalence (#+ Equivalence)] - [monad (#+ do Monad)] - ["p" parser]) - (data [text ("text/" Monoid<Text> Equivalence<Text>)] - [ident ("ident/" Equivalence<Ident> Codec<Text,Ident>)] - [number ("nat/" Codec<Text,Nat>)] - [maybe] - (collection [list ("list/" Functor<List> Monoid<List> Fold<List>)])) - [macro] - (macro [code] - ["s" syntax (#+ Syntax syntax:)]) - )) + [lux (#- function) + [control + [equivalence (#+ Equivalence)] + [monad (#+ do Monad)] + ["p" parser]] + [data + [text ("text/" Monoid<Text> Equivalence<Text>)] + [ident ("ident/" Equivalence<Ident> Codec<Text,Ident>)] + [number ("nat/" Codec<Text,Nat>)] + [maybe] + [collection [list ("list/" Functor<List> Monoid<List> Fold<List>)]]] + ["." macro + [code] + ["s" syntax (#+ Syntax syntax:)]] + ]) ## [Utils] (def: (beta-reduce env type) diff --git a/stdlib/source/lux/language/type/check.lux b/stdlib/source/lux/language/type/check.lux index 197d32d0e..a85480074 100644 --- a/stdlib/source/lux/language/type/check.lux +++ b/stdlib/source/lux/language/type/check.lux @@ -1,18 +1,21 @@ (.module: {#.doc "Type-checking functionality."} - lux - (lux (control [functor (#+ Functor)] - [apply (#+ Apply)] - [monad (#+ do Monad)] - ["ex" exception (#+ exception:)]) - (data [text ("text/" Monoid<Text> Equivalence<Text>)] - [number ("nat/" Codec<Text,Nat>)] - [maybe] - [product] - (collection [list] - [set (#+ Set)]) - ["e" error]) - (language [type ("type/" Equivalence<Type>)]) - )) + [lux #* + [control + [functor (#+ Functor)] + [apply (#+ Apply)] + [monad (#+ do Monad)] + ["ex" exception (#+ exception:)]] + [data + [maybe] + [product] + [number ("nat/" Codec<Text,Nat>)] + [text ("text/" Monoid<Text> Equivalence<Text>)] + [collection + [list] + [set (#+ Set)]] + ["e" error]] + [language [type ("type/" Equivalence<Type>)]] + ]) (exception: #export (unknown-type-var {id Nat}) (nat/encode id)) diff --git a/stdlib/source/lux/macro.lux b/stdlib/source/lux/macro.lux index 70f9b5116..a39168fa7 100644 --- a/stdlib/source/lux/macro.lux +++ b/stdlib/source/lux/macro.lux @@ -1,16 +1,18 @@ (.module: {#.doc "Functions for extracting information from the state of the compiler."} - lux - (lux (control [functor (#+ Functor)] - [apply (#+ Apply)] - [monad (#+ do Monad)]) - (data [number ("nat/" Codec<Text,Nat>)] - [product] - [ident ("ident/" Codec<Text,Ident> Equivalence<Ident>)] - [maybe] - ["e" error] - [text ("text/" Monoid<Text> Equivalence<Text>)] - (collection [list ("list/" Monoid<List> Monad<List>)]))) - (/ [code])) + [lux #* + [control + [functor (#+ Functor)] + [apply (#+ Apply)] + [monad (#+ do Monad)]] + [data + [number ("nat/" Codec<Text,Nat>)] + [product] + [ident ("ident/" Codec<Text,Ident> Equivalence<Ident>)] + [maybe] + ["e" error] + [text ("text/" Monoid<Text> Equivalence<Text>)] + [collection [list ("list/" Monoid<List> Monad<List>)]]]] + [/ [code]]) ## (type: (Meta a) ## (-> Lux (e.Error [Lux a]))) diff --git a/stdlib/source/lux/macro/code.lux b/stdlib/source/lux/macro/code.lux index 47bbe24cc..d8763c3e5 100644 --- a/stdlib/source/lux/macro/code.lux +++ b/stdlib/source/lux/macro/code.lux @@ -1,12 +1,13 @@ (.module: - [lux (#- nat int rev)] - (lux (control [equivalence (#+ Equivalence)]) - (data bool - number - [text (#+ Equivalence<Text>) ("text/" Monoid<Text>)] - ident - (collection [list #* ("list/" Functor<List> Fold<List>)]) - ))) + [lux (#- nat int rev) + [control [equivalence (#+ Equivalence)]] + [data + bool + number + [text (#+ Equivalence<Text>) ("text/" Monoid<Text>)] + ident + [collection [list #* ("list/" Functor<List> Fold<List>)]] + ]]) ## [Types] ## (type: (Code' w) diff --git a/stdlib/source/lux/macro/poly.lux b/stdlib/source/lux/macro/poly.lux index dad765eff..8fec440cf 100644 --- a/stdlib/source/lux/macro/poly.lux +++ b/stdlib/source/lux/macro/poly.lux @@ -1,28 +1,34 @@ (.module: - [lux (#- function)] - (lux (control [monad (#+ do Monad)] - [equivalence] - ["p" parser] - ["ex" exception (#+ exception:)]) - [function] - (data [text ("text/" Monoid<Text>)] - (collection [list ("list/" Fold<List> Monad<List> Monoid<List>)] - ["dict" dictionary (#+ Dictionary)]) - [number ("nat/" Codec<Text,Nat>)] - [product] - [bool] - [maybe] - [ident ("ident/" Equivalence<Ident> Codec<Text,Ident>)] - ["e" error]) - [macro (#+ with-gensyms)] - (macro [code] - ["s" syntax (#+ syntax: Syntax)] - (syntax ["cs" common] - (common ["csr" reader] - ["csw" writer]))) - (language [type ("type/" Equivalence<Type>)] - (type [check])) - )) + [lux (#- function) + [control + [monad (#+ do Monad)] + [equivalence] + ["p" parser] + ["ex" exception (#+ exception:)]] + [function] + [data + [text ("text/" Monoid<Text>)] + [collection + [list ("list/" Fold<List> Monad<List> Monoid<List>)] + ["dict" dictionary (#+ Dictionary)]] + [number ("nat/" Codec<Text,Nat>)] + [product] + [bool] + [maybe] + [ident ("ident/" Equivalence<Ident> Codec<Text,Ident>)] + ["e" error]] + [macro (#+ with-gensyms) + [code] + ["s" syntax (#+ syntax: Syntax)] + [syntax + ["cs" common] + [common + ["csr" reader] + ["csw" writer]]]] + [language + [type ("type/" Equivalence<Type>) + [check]]] + ]) (type: #export Env (Dictionary Nat [Type Code])) diff --git a/stdlib/source/lux/macro/poly/equivalence.lux b/stdlib/source/lux/macro/poly/equivalence.lux index c8d079935..d3e28b5e7 100644 --- a/stdlib/source/lux/macro/poly/equivalence.lux +++ b/stdlib/source/lux/macro/poly/equivalence.lux @@ -1,32 +1,36 @@ (.module: - lux - (lux (control [monad (#+ do Monad)] - ["eq" equivalence] - ["p" parser]) - (data [text ("text/" Monoid<Text>)] - text/format - (collection [list ("list/" Monad<List>)] - [row] - [array] - [queue] - [set] - ["dict" dictionary (#+ Dictionary)] - (tree [rose])) - [number ("nat/" Codec<Text,Nat>)] - [product] - [bool] - [maybe]) - (time ["du" duration] - ["da" date] - ["i" instant]) - [macro] - (macro [code] - [syntax (#+ syntax: Syntax)] - (syntax [common]) - [poly (#+ poly:)]) - (type [unit]) - (language [type]) - )) + [lux #* + [control + [monad (#+ do Monad)] + ["eq" equivalence] + ["p" parser]] + [data + [text ("text/" Monoid<Text>) + format] + [collection + [list ("list/" Monad<List>)] + [row] + [array] + [queue] + [set] + ["dict" dictionary (#+ Dictionary)] + [tree [rose]]] + [number ("nat/" Codec<Text,Nat>)] + [product] + [bool] + [maybe]] + [time + ["du" duration] + ["da" date] + ["i" instant]] + ["." macro + [code] + [syntax (#+ syntax: Syntax) + [common]] + [poly (#+ poly:)]] + [type [unit]] + [language [type]] + ]) ## [Derivers] (poly: #export Equivalence<?> diff --git a/stdlib/source/lux/macro/poly/functor.lux b/stdlib/source/lux/macro/poly/functor.lux index dda9112da..5e509935d 100644 --- a/stdlib/source/lux/macro/poly/functor.lux +++ b/stdlib/source/lux/macro/poly/functor.lux @@ -1,19 +1,21 @@ (.module: - lux - (lux (control [monad (#+ do Monad)] - [functor] - ["p" parser]) - (data [text] - text/format - (collection [list ("list/" Monad<List> Monoid<List>)]) - [product]) - [macro] - (macro [code] - [syntax (#+ syntax: Syntax)] - (syntax [common]) - [poly (#+ poly:)]) - (language [type]) - )) + [lux #* + [control + [monad (#+ do Monad)] + [functor] + ["p" parser]] + [data + ["." text + format] + [collection [list ("list/" Monad<List> Monoid<List>)]] + [product]] + ["." macro + [code] + [syntax (#+ syntax: Syntax) + [common]] + [poly (#+ poly:)]] + [language [type]] + ]) (poly: #export Functor<?> (do @ diff --git a/stdlib/source/lux/macro/poly/json.lux b/stdlib/source/lux/macro/poly/json.lux index f27089c94..e6da2b602 100644 --- a/stdlib/source/lux/macro/poly/json.lux +++ b/stdlib/source/lux/macro/poly/json.lux @@ -1,33 +1,37 @@ (.module: {#.doc "Codecs for values in the JSON format."} - lux - (lux (control [monad (#+ do Monad)] - [equivalence (#+ Equivalence)] - codec - ["p" parser]) - (data [bool] - [bit] - [text ("text/" Equivalence<Text>)] - (text ["l" lexer] - format) - [number ("frac/" Codec<Text,Frac>) ("nat/" Codec<Text,Nat>)] - maybe - ["e" error] - [sum] - [product] - (collection [list ("list/" Fold<List> Monad<List>)] - [row (#+ Row row) ("row/" Monad<Row>)] - ["d" dictionary]) - (format ["//" json (#+ JSON)])) - (time ## ["i" instant] - ["du" duration] - ["da" date]) - [macro (#+ with-gensyms)] - (macro ["s" syntax (#+ syntax:)] - [code] - [poly (#+ poly:)]) - (type [unit]) - (language [type]) - )) + [lux #* + [control + [monad (#+ do Monad)] + [equivalence (#+ Equivalence)] + codec + ["p" parser]] + [data + [bool] + [bit] + [text ("text/" Equivalence<Text>) + ["l" lexer] + format] + [number ("frac/" Codec<Text,Frac>) ("nat/" Codec<Text,Nat>)] + maybe + ["e" error] + [sum] + [product] + [collection + [list ("list/" Fold<List> Monad<List>)] + [row (#+ Row row) ("row/" Monad<Row>)] + ["d" dictionary]] + [format ["//" json (#+ JSON)]]] + [time + ## ["i" instant] + ["du" duration] + ["da" date]] + [macro (#+ with-gensyms) + ["s" syntax (#+ syntax:)] + [code] + [poly (#+ poly:)]] + [type [unit]] + [language [type]] + ]) (def: tag (-> Nat Frac) diff --git a/stdlib/source/lux/macro/syntax.lux b/stdlib/source/lux/macro/syntax.lux index bb7c8aa3e..3b6623b3e 100644 --- a/stdlib/source/lux/macro/syntax.lux +++ b/stdlib/source/lux/macro/syntax.lux @@ -1,17 +1,19 @@ (.module: - [lux (#- nat int rev)] - (lux [macro (#+ with-gensyms)] - (control [monad (#+ do Monad)] - [equivalence (#+ Equivalence)] - ["p" parser]) - (data [bool] - [number] - [text ("text/" Monoid<Text>)] - [ident] - (collection [list ("list/" Functor<List>)]) - [maybe] - [error (#+ Error)])) - (// [code ("code/" Equivalence<Code>)])) + [lux (#- nat int rev) + [macro (#+ with-gensyms)] + [control + [monad (#+ do Monad)] + [equivalence (#+ Equivalence)] + ["p" parser]] + [data + [bool] + [number] + [text ("text/" Monoid<Text>)] + [ident] + [collection [list ("list/" Functor<List>)]] + [maybe] + [error (#+ Error)]]] + [// [code ("code/" Equivalence<Code>)]]) ## [Utils] (def: (join-pairs pairs) diff --git a/stdlib/source/lux/macro/syntax/common/reader.lux b/stdlib/source/lux/macro/syntax/common/reader.lux index a1b9ceb70..58a502c56 100644 --- a/stdlib/source/lux/macro/syntax/common/reader.lux +++ b/stdlib/source/lux/macro/syntax/common/reader.lux @@ -1,13 +1,15 @@ (.module: {#.doc "Commons syntax readers."} - lux - (lux (control monad - ["p" parser ("parser/" Monad<Parser>)]) - (data (collection [list]) - [ident ("ident/" Equivalence<Ident>)] - [product] - [maybe]) - [macro] - (macro ["s" syntax (#+ syntax: Syntax)])) + [lux #* + [control + monad + ["p" parser ("parser/" Monad<Parser>)]] + [data + [collection [list]] + [ident ("ident/" Equivalence<Ident>)] + [product] + [maybe]] + ["." macro + ["s" syntax (#+ syntax: Syntax)]]] [//]) ## Exports diff --git a/stdlib/source/lux/macro/syntax/common/writer.lux b/stdlib/source/lux/macro/syntax/common/writer.lux index 8bf1dadf7..d482bc2c3 100644 --- a/stdlib/source/lux/macro/syntax/common/writer.lux +++ b/stdlib/source/lux/macro/syntax/common/writer.lux @@ -1,9 +1,10 @@ (.module: {#.doc "Commons syntax writers."} - lux - (lux (data (collection [list ("list/" Functor<List>)]) - [product]) - (macro [code])) + [lux #* + [data + [collection [list ("list/" Functor<List>)]] + [product]] + [macro [code]]] [//]) (def: #export (export exported?) diff --git a/stdlib/source/lux/math.lux b/stdlib/source/lux/math.lux index ca2b30a85..c04f31c73 100644 --- a/stdlib/source/lux/math.lux +++ b/stdlib/source/lux/math.lux @@ -1,13 +1,15 @@ (.module: {#.doc "Common mathematical constants and functions."} - lux - (lux (control monad - ["p" parser ("parser/" Functor<Parser>)]) - (data [product] - [number] - (collection [list ("list/" Fold<List>)])) - [macro] - (macro ["s" syntax (#+ syntax: Syntax)] - [code]))) + [lux #* + [control + monad + ["p" parser ("parser/" Functor<Parser>)]] + [data + [product] + [number] + [collection [list ("list/" Fold<List>)]]] + ["." macro + ["s" syntax (#+ syntax: Syntax)] + [code]]]) ## [Values] (do-template [<name> <value> <doc>] diff --git a/stdlib/source/lux/math/logic/continuous.lux b/stdlib/source/lux/math/logic/continuous.lux index 36c3d158d..972bfac0e 100644 --- a/stdlib/source/lux/math/logic/continuous.lux +++ b/stdlib/source/lux/math/logic/continuous.lux @@ -1,6 +1,6 @@ (.module: - lux - (lux (data [number ("rev/" Interval<Rev>)]))) + [lux #* + [data [number ("rev/" Interval<Rev>)]]]) (def: #export ~true Rev rev/top) (def: #export ~false Rev rev/bottom) diff --git a/stdlib/source/lux/math/logic/fuzzy.lux b/stdlib/source/lux/math/logic/fuzzy.lux index 8d8c32eaf..4d0d7f860 100644 --- a/stdlib/source/lux/math/logic/fuzzy.lux +++ b/stdlib/source/lux/math/logic/fuzzy.lux @@ -1,8 +1,12 @@ (.module: - lux - (lux (data (collection [list] - [set (#+ Set)]))) - (// ["&" continuous])) + [lux #* + [control + [predicate #+ Predicate]] + [data + [collection + [list] + [set (#+ Set)]]]] + [// ["&" continuous]]) (type: #export (Fuzzy a) (-> a Rev)) @@ -35,7 +39,7 @@ (&.~not (membership elem sub))))) (def: #export (from-predicate predicate) - (All [a] (-> (-> a Bool) (Fuzzy a))) + (All [a] (-> (Predicate a) (Fuzzy a))) (function (_ elem) (if (predicate elem) &.~true @@ -106,7 +110,7 @@ &.~false)))) (def: #export (to-predicate treshold set) - (All [a] (-> Rev (Fuzzy a) (-> a Bool))) + (All [a] (-> Rev (Fuzzy a) (Predicate a))) (function (_ elem) (r/> treshold (set elem)))) diff --git a/stdlib/source/lux/math/modular.lux b/stdlib/source/lux/math/modular.lux index 197bd4d20..cef3cbf6f 100644 --- a/stdlib/source/lux/math/modular.lux +++ b/stdlib/source/lux/math/modular.lux @@ -1,17 +1,20 @@ (.module: - lux - (lux (control ["ex" exception (#+ exception:)] - ["p" parser] - [codec (#+ Codec)] - [monad (#+ do)]) - (data ["e" error (#+ Error)] - [number ("int/" Codec<Text,Int>)] - [text ("text/" Monoid<Text>)] - (text ["l" lexer (#+ Lexer)])) - (type abstract) - (macro [code] - ["s" syntax (#+ syntax:)]) - [math])) + [lux #* + [control + ["ex" exception (#+ exception:)] + ["p" parser] + [codec (#+ Codec)] + [monad (#+ do)]] + [data + ["e" error (#+ Error)] + [number ("int/" Codec<Text,Int>)] + [text ("text/" Monoid<Text>) + ["l" lexer (#+ Lexer)]]] + [type abstract] + [macro + [code] + ["s" syntax (#+ syntax:)]] + [math]]) (exception: #export zero-cannot-be-a-modulus) diff --git a/stdlib/source/lux/math/random.lux b/stdlib/source/lux/math/random.lux index 129f1b6e0..6366dde39 100644 --- a/stdlib/source/lux/math/random.lux +++ b/stdlib/source/lux/math/random.lux @@ -1,27 +1,30 @@ (.module: {#.doc "Pseudo-random number generation (PRNG) algorithms."} - [lux (#- list i64 nat int rev char)] - (lux (control [functor (#+ Functor)] - [apply (#+ Apply)] - [monad (#+ do Monad)] - hash) - (data [bit] - [text ("text/" Monoid<Text>)] - (text [unicode (#+ Char Segment)]) - [product] - [maybe] - [number (#+ hex)] - (number ["r" ratio] - ["c" complex]) - (collection [list ("list/" Fold<List>)] - [array] - ["dict" dictionary (#+ Dictionary)] - [queue (#+ Queue)] - [set (#+ Set)] - [stack (#+ Stack)] - [row (#+ Row)] - (tree [finger (#+ Tree)]))) - (type [refinement (#+ Refiner Refined)]) - )) + [lux (#- list i64 nat int rev char) + [control + [functor (#+ Functor)] + [apply (#+ Apply)] + [monad (#+ do Monad)] + hash] + [data + [bit] + [text ("text/" Monoid<Text>) + [unicode (#+ Char Segment)]] + [product] + [maybe] + [number (#+ hex) + ["r" ratio] + ["c" complex]] + [collection + [list ("list/" Fold<List>)] + [array] + ["dict" dictionary (#+ Dictionary)] + [queue (#+ Queue)] + [set (#+ Set)] + [stack (#+ Stack)] + [row (#+ Row)] + [tree [finger (#+ Tree)]]]] + [type [refinement (#+ Refiner Refined)]] + ]) (type: #export #rec PRNG {#.doc "An abstract way to represent any PRNG."} diff --git a/stdlib/source/lux/test.lux b/stdlib/source/lux/test.lux index c39f7f30d..00cbcca91 100644 --- a/stdlib/source/lux/test.lux +++ b/stdlib/source/lux/test.lux @@ -1,21 +1,24 @@ (.module: {#.doc "Tools for unit & property-based/generative testing."} - lux - (lux [macro (#+ with-gensyms)] - (macro ["s" syntax (#+ syntax: Syntax)] - [code]) - (control [monad (#+ do Monad)] - ["p" parser]) - (concurrency [promise (#+ Promise)]) - (data [product] - [maybe] - ["e" error] - [text] - text/format - (collection [list ("list/" Monad<List> Fold<List>)])) - [io (#+ IO io)] - (time [instant] - [duration]) - ["r" math/random])) + [lux #* + [macro (#+ with-gensyms) + ["s" syntax (#+ syntax: Syntax)] + [code]] + [control + [monad (#+ do Monad)] + ["p" parser]] + [concurrency [promise (#+ Promise)]] + [data + [product] + [maybe] + ["e" error] + ["." text + format] + [collection [list ("list/" Monad<List> Fold<List>)]]] + [io (#+ IO io)] + [time + [instant] + [duration]] + ["r" math/random]]) ## [Types] (type: #export Counters [Nat Nat]) diff --git a/stdlib/source/lux/time/date.lux b/stdlib/source/lux/time/date.lux index 0f123c2d7..068936f47 100644 --- a/stdlib/source/lux/time/date.lux +++ b/stdlib/source/lux/time/date.lux @@ -1,17 +1,19 @@ (.module: - lux - (lux (control equivalence - order - enum - codec - ["p" parser] - [monad (#+ do)]) - (data ["e" error] - [maybe] - [number ("int/" Codec<Text,Int>)] - [text ("text/" Monoid<Text>)] - (text ["l" lexer]) - (collection [row (#+ Row row)])))) + [lux #* + [control + equivalence + order + enum + codec + ["p" parser] + [monad (#+ do)]] + [data + ["e" error] + [maybe] + [number ("int/" Codec<Text,Int>)] + [text ("text/" Monoid<Text>) + ["l" lexer]] + [collection [row (#+ Row row)]]]]) (type: #export Year Int) diff --git a/stdlib/source/lux/time/duration.lux b/stdlib/source/lux/time/duration.lux index 3585c35b1..92e35a7fb 100644 --- a/stdlib/source/lux/time/duration.lux +++ b/stdlib/source/lux/time/duration.lux @@ -1,16 +1,18 @@ (.module: - lux - (lux (control equivalence - order - codec - [monoid (#+ Monoid)] - ["p" parser] - [monad (#+ do)]) - (data [number ("int/" Codec<Text,Int> Number<Int>)] - [text ("text/" Monoid<Text>)] - (text ["l" lexer]) - ["e" error]) - (type abstract))) + [lux #* + [control + equivalence + order + codec + [monoid (#+ Monoid)] + ["p" parser] + [monad (#+ do)]] + [data + [number ("int/" Codec<Text,Int> Number<Int>)] + [text ("text/" Monoid<Text>) + ["l" lexer]] + ["e" error]] + [type abstract]]) (abstract: #export Duration {#.doc "Durations have a resolution of milliseconds."} diff --git a/stdlib/source/lux/time/instant.lux b/stdlib/source/lux/time/instant.lux index 86c27f8f4..ce97cecea 100644 --- a/stdlib/source/lux/time/instant.lux +++ b/stdlib/source/lux/time/instant.lux @@ -1,22 +1,26 @@ (.module: - lux - (lux [io (#- run)] - (control equivalence - order - enum - codec - [monad (#+ do Monad)] - ["p" parser]) - (data [text ("text/" Monoid<Text>)] - (text ["l" lexer]) - [number ("int/" Codec<Text,Int>)] - ["e" error] - [maybe] - (collection [list ("list/" Fold<List>)] - [row (#+ Row row) ("row/" Functor<Row> Fold<Row>)])) - (type abstract)) - (// [duration ("duration/" Order<Duration>)] - [date])) + [lux #* + [io (#- run)] + [control + equivalence + order + enum + codec + [monad (#+ do Monad)] + ["p" parser]] + [data + [text ("text/" Monoid<Text>) + ["l" lexer]] + [number ("int/" Codec<Text,Int>)] + ["e" error] + [maybe] + [collection + [list ("list/" Fold<List>)] + [row (#+ Row row) ("row/" Functor<Row> Fold<Row>)]]] + [type abstract]] + [// + [duration ("duration/" Order<Duration>)] + [date]]) (abstract: #export Instant {#.doc "Instant is defined as milliseconds since the epoch."} diff --git a/stdlib/source/lux/type/abstract.lux b/stdlib/source/lux/type/abstract.lux index 76c8f78dd..53ae64051 100644 --- a/stdlib/source/lux/type/abstract.lux +++ b/stdlib/source/lux/type/abstract.lux @@ -1,17 +1,21 @@ (.module: - lux - (lux (control [monad (#+ do Monad)] - ["p" parser]) - (data [text ("text/" Equivalence<Text> Monoid<Text>)] - [error] - (collection [list ("list/" Functor<List> Monoid<List>)])) - [macro ("meta/" Monad<Meta>)] - (macro [code] - ["s" syntax (#+ syntax:)] - (syntax ["cs" common] - (common ["csr" reader] - ["csw" writer]))) - (language [type (#+ :cast)]))) + [lux #* + [control + [monad (#+ do Monad)] + ["p" parser]] + [data + [text ("text/" Equivalence<Text> Monoid<Text>)] + [error] + [collection [list ("list/" Functor<List> Monoid<List>)]]] + [macro ("meta/" Monad<Meta>) + [code] + ["s" syntax (#+ syntax:)] + [syntax + ["cs" common] + [common + ["csr" reader] + ["csw" writer]]]] + [language [type (#+ :cast)]]]) (def: (get k plist) (All [a] diff --git a/stdlib/source/lux/type/implicit.lux b/stdlib/source/lux/type/implicit.lux index 38ffde58e..e1d3a21f7 100644 --- a/stdlib/source/lux/type/implicit.lux +++ b/stdlib/source/lux/type/implicit.lux @@ -1,22 +1,24 @@ (.module: - lux - (lux (control [monad (#+ do Monad)] - ["eq" equivalence] - ["p" parser]) - (data [text ("text/" Equivalence<Text>)] - text/format - [number] - (collection [list ("list/" Monad<List> Fold<List>)] - ["dict" dictionary (#+ Dictionary)]) - [bool] - [product] - [maybe]) - [macro (#+ Monad<Meta>)] - (macro [code] - ["s" syntax (#+ syntax: Syntax)]) - (language [type] - (type ["tc" check (#+ Check)])) - )) + [lux #* + [control [monad (#+ do Monad)] + ["eq" equivalence] + ["p" parser]] + [data + [text ("text/" Equivalence<Text>) + format] + [number] + [collection [list ("list/" Monad<List> Fold<List>)] + ["dict" dictionary (#+ Dictionary)]] + [bool] + [product] + [maybe]] + [macro (#+ Monad<Meta>) + [code] + ["s" syntax (#+ syntax: Syntax)]] + [language + [type] + [type ["tc" check (#+ Check)]]] + ]) (def: (find-type-var id env) (-> Nat Type-Context (Meta Type)) diff --git a/stdlib/source/lux/type/object/interface.lux b/stdlib/source/lux/type/object/interface.lux index fe5b80b8b..c90965c2d 100644 --- a/stdlib/source/lux/type/object/interface.lux +++ b/stdlib/source/lux/type/object/interface.lux @@ -1,21 +1,26 @@ (.module: - lux - (lux (control [monad (#+ do Monad)] - ["p" parser ("parser/" Monad<Parser>)]) - (data [text] - text/format - [product] - [maybe] - [ident ("ident/" Equivalence<Ident>)] - (collection [list ("list/" Functor<List> Fold<List> Monoid<List>)] - [set (#+ Set)])) - [macro (#+ Monad<Meta>) ("meta/" Monad<Meta>)] - (macro [code] - ["s" syntax (#+ syntax:)] - (syntax ["cs" common] - (common ["csr" reader] - ["csw" writer]))) - (language [type]))) + [lux #* + [control + [monad (#+ do Monad)] + ["p" parser ("parser/" Monad<Parser>)]] + [data + [product] + [maybe] + [ident ("ident/" Equivalence<Ident>)] + ["." text + format] + [collection + [list ("list/" Functor<List> Fold<List> Monoid<List>)] + [set (#+ Set)]]] + [macro (#+ Monad<Meta>) ("meta/" Monad<Meta>) + [code] + ["s" syntax (#+ syntax:)] + [syntax + ["cs" common] + [common + ["csr" reader] + ["csw" writer]]]] + [language [type]]]) ## [Common] (type: Declaration diff --git a/stdlib/source/lux/type/object/protocol.lux b/stdlib/source/lux/type/object/protocol.lux index 1bd88a424..495aaebd4 100644 --- a/stdlib/source/lux/type/object/protocol.lux +++ b/stdlib/source/lux/type/object/protocol.lux @@ -1,15 +1,19 @@ (.module: - lux - (lux (control ["p" parser] - [monad (#+ do)]) - (data [sum] - (collection [list ("list/" Functor<List>)])) - [macro ("meta/" Monad<Meta>)] - (macro [code] - ["s" syntax (#+ syntax:)] - (syntax ["cs" common] - (common ["csr" reader] - ["csw" writer]))))) + [lux #* + [control + ["p" parser] + [monad (#+ do)]] + [data + [sum] + [collection [list ("list/" Functor<List>)]]] + [macro ("meta/" Monad<Meta>) + [code] + ["s" syntax (#+ syntax:)] + [syntax + ["cs" common] + [common + ["csr" reader] + ["csw" writer]]]]]) (type: #export (Method i o) (All [r] [i (-> o r)])) diff --git a/stdlib/source/lux/type/quotient.lux b/stdlib/source/lux/type/quotient.lux index 99e750a93..5fd91f5f0 100644 --- a/stdlib/source/lux/type/quotient.lux +++ b/stdlib/source/lux/type/quotient.lux @@ -1,13 +1,14 @@ (.module: - [lux (#- type)] - (lux (control [monad (#+ do)] - ["p" parser]) - (data ["e" error (#+ Error)]) - (language [type]) - (type abstract) - [macro] - (macro ["s" syntax (#+ syntax:)] - [poly]))) + [lux (#- type) + [control + [monad (#+ do)] + ["p" parser]] + [data ["e" error (#+ Error)]] + [language [type]] + [type abstract] + ["." macro + ["s" syntax (#+ syntax:)] + [poly]]]) (abstract: #export (Class t c q) {} diff --git a/stdlib/source/lux/type/refinement.lux b/stdlib/source/lux/type/refinement.lux index 4b14b5a36..79bd80d71 100644 --- a/stdlib/source/lux/type/refinement.lux +++ b/stdlib/source/lux/type/refinement.lux @@ -1,14 +1,15 @@ (.module: - [lux (#- type)] - (lux (control [predicate (#+ Predicate)] - [monad (#+ do)] - ["p" parser]) - (data ["e" error (#+ Error)]) - (language [type ("type/" Equivalence<Type>)]) - (type abstract) - [macro] - (macro ["s" syntax (#+ syntax:)] - [poly]))) + [lux (#- type) + [control + [predicate (#+ Predicate)] + [monad (#+ do)] + ["p" parser]] + [data ["e" error (#+ Error)]] + [language [type ("type/" Equivalence<Type>)]] + [type abstract] + ["." macro + ["s" syntax (#+ syntax:)] + [poly]]]) (abstract: #export (Refined t r) {#.doc "A refined type 'r' of base type 't' using a predicate."} diff --git a/stdlib/source/lux/type/resource.lux b/stdlib/source/lux/type/resource.lux index 674a00eec..89523997b 100644 --- a/stdlib/source/lux/type/resource.lux +++ b/stdlib/source/lux/type/resource.lux @@ -1,23 +1,26 @@ (.module: - lux - (lux (control ["p" parser] - ["ex" exception (#+ exception:)] - [monad (#+ Monad do)] - (monad [indexed (#+ IxMonad)])) - (data [identity (#+ Identity)] - [maybe] - [product] - [number] - text/format - (collection ["dict" dictionary (#+ Dictionary)] - [set] - [row (#+ Row)] - [list ("list/" Functor<List> Fold<List>)])) - (concurrency [promise (#+ Promise)]) - [macro] - (macro ["s" syntax (#+ Syntax syntax:)]) - (type abstract) - [io (#+ IO)])) + [lux #* + [control + ["p" parser] + ["ex" exception (#+ exception:)] + [monad (#+ Monad do) + [indexed (#+ IxMonad)]]] + [data + [identity (#+ Identity)] + [maybe] + [product] + [number] + [text + format] + [collection + ["dict" dictionary (#+ Dictionary)] + [set] + [row (#+ Row)] + [list ("list/" Functor<List> Fold<List>)]]] + [concurrency [promise (#+ Promise)]] + ["." macro ["s" syntax (#+ Syntax syntax:)]] + [type abstract] + [io (#+ IO)]]) (type: #export (Procedure monad input output value) (-> input (monad [output value]))) diff --git a/stdlib/source/lux/type/unit.lux b/stdlib/source/lux/type/unit.lux index 3668d492a..341e556d4 100644 --- a/stdlib/source/lux/type/unit.lux +++ b/stdlib/source/lux/type/unit.lux @@ -1,19 +1,26 @@ (.module: - lux - (lux (control [monad (#+ do Monad)] - ["p" parser "p/" Monad<Parser>] - [equivalence (#+ Equivalence)] - [order (#+ Order)] - [enum (#+ Enum)]) - (data text/format - (number ["r" ratio])) - [macro] - (macro [code] - ["s" syntax (#+ syntax:)] - (syntax ["cs" common] - (common ["csr" reader] - ["csw" writer]))) - (type abstract))) + [lux #* + [control + [monad (#+ do Monad)] + ["p" parser] + [equivalence (#+ Equivalence)] + [order (#+ Order)] + [enum (#+ Enum)]] + [data + [number + ["r" ratio]] + [text + format]] + ["." macro + [code] + ["s" syntax (#+ syntax:)] + [syntax + ["cs" common] + [common + ["csr" reader] + ["csw" writer]]]] + [type + abstract]]) (abstract: #export (Qty unit) {} diff --git a/stdlib/source/lux/world/blob.jvm.lux b/stdlib/source/lux/world/blob.jvm.lux index a9f640b37..d1ee258a3 100644 --- a/stdlib/source/lux/world/blob.jvm.lux +++ b/stdlib/source/lux/world/blob.jvm.lux @@ -1,13 +1,15 @@ (.module: - [lux (#- i64)] - (lux (control [monad (#+ do)] - ["ex" exception (#+ exception:)] - ["eq" equivalence]) - (data [bit] - [maybe] - [error (#+ Error)] - text/format) - [host (#+ import:)])) + [lux (#- i64) + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)] + ["eq" equivalence]] + [data + [bit] + [maybe] + [error (#+ Error)] + [text format]] + [host (#+ import:)]]) (exception: #export (index-out-of-bounds {description Text}) description) diff --git a/stdlib/source/lux/world/console.lux b/stdlib/source/lux/world/console.lux index 6ab7dd4a6..b66e83ad3 100644 --- a/stdlib/source/lux/world/console.lux +++ b/stdlib/source/lux/world/console.lux @@ -1,13 +1,15 @@ (.module: - lux - (lux (control [monad (#+ do)]) - (data ["e" error] - [text]) - (concurrency [promise] - [task (#+ Task)]) - (type (object interface)) - [io (#+ IO Process io)] - [host])) + [lux #* + [control [monad (#+ do)]] + [data + ["e" error] + [text]] + [concurrency + [promise] + [task (#+ Task)]] + [type [object interface]] + [io (#+ IO Process io)] + [host]]) (interface: #export Console (read-char [] (Task Text)) diff --git a/stdlib/source/lux/world/environment.jvm.lux b/stdlib/source/lux/world/environment.jvm.lux index f975a59d9..32af351d4 100644 --- a/stdlib/source/lux/world/environment.jvm.lux +++ b/stdlib/source/lux/world/environment.jvm.lux @@ -1,10 +1,11 @@ (.module: - lux - (lux (data [text] - (format [context (#+ Context)]) - (collection [dictionary])) - [io (#- run)] - [host])) + [lux #* + [data + [text] + [format [context (#+ Context)]] + [collection [dictionary]]] + [io (#- run)] + [host]]) (host.import: java/lang/String) diff --git a/stdlib/source/lux/world/file.lux b/stdlib/source/lux/world/file.lux index 8c71678cd..d62c77182 100644 --- a/stdlib/source/lux/world/file.lux +++ b/stdlib/source/lux/world/file.lux @@ -1,17 +1,20 @@ (.module: - lux - (lux (control [monad (#+ Monad do)] - ["ex" exception (#+ Exception exception:)] - pipe) - (data [error (#+ Error)] - text/format - (collection [array])) - (time [instant (#+ Instant)] - [duration]) - (world [blob (#+ Blob)]) - [io (#+ Process)] - [host (#+ import:)] - [language/host])) + [lux #* + [control + [monad (#+ Monad do)] + ["ex" exception (#+ Exception exception:)] + pipe] + [data + [error (#+ Error)] + text/format + [collection [array]]] + [time + [instant (#+ Instant)] + [duration]] + [world [blob (#+ Blob)]] + [io (#+ Process)] + [host (#+ import:)] + [language/host]]) (type: #export File Text) diff --git a/stdlib/source/lux/world/net/tcp.jvm.lux b/stdlib/source/lux/world/net/tcp.jvm.lux index 0c62844ce..30c3ef49b 100644 --- a/stdlib/source/lux/world/net/tcp.jvm.lux +++ b/stdlib/source/lux/world/net/tcp.jvm.lux @@ -1,14 +1,16 @@ (.module: - lux - (lux (control monad) - (concurrency [promise (#+ Promise promise)] - [task (#+ Task)] - [frp]) - (data ["e" error]) - (type abstract) - (world [blob (#+ Blob)]) - [io (#+ Process)] - [host]) + [lux #* + [control + monad] + [concurrency + [promise (#+ Promise promise)] + [task (#+ Task)] + [frp]] + [data ["e" error]] + [type abstract] + [world [blob (#+ Blob)]] + [io (#+ Process)] + [host]] [//]) (host.import: java/lang/AutoCloseable diff --git a/stdlib/source/lux/world/net/udp.jvm.lux b/stdlib/source/lux/world/net/udp.jvm.lux index f8ad6885b..9e61e55eb 100644 --- a/stdlib/source/lux/world/net/udp.jvm.lux +++ b/stdlib/source/lux/world/net/udp.jvm.lux @@ -1,16 +1,19 @@ (.module: - lux - (lux (control monad - ["ex" exception (#+ exception:)]) - (concurrency ["P" promise] - ["T" task]) - (data ["e" error] - [maybe] - (collection [array])) - (type abstract) - (world [blob (#+ Blob)]) - [io] - [host]) + [lux #* + [control + monad + ["ex" exception (#+ exception:)]] + [concurrency + ["P" promise] + ["T" task]] + [data + ["e" error] + [maybe] + [collection [array]]] + [type abstract] + [world [blob (#+ Blob)]] + [io] + [host]] [//]) (host.import: java/lang/AutoCloseable diff --git a/stdlib/test/test/lux.lux b/stdlib/test/test/lux.lux index 538a70b30..706e6e4bb 100644 --- a/stdlib/test/test/lux.lux +++ b/stdlib/test/test/lux.lux @@ -1,15 +1,17 @@ (.module: - lux - lux/test - (lux (control [monad (#+ do)]) - [math] - ["r" math/random] - (data [maybe] - [bit] - [text ("text/" Equivalence<Text>)] - text/format) - [macro] - (macro ["s" syntax (#+ syntax:)]))) + [lux #* + [control + [monad (#+ do)]] + [math] + ["r" math/random] + [data + [maybe] + [bit] + [text ("text/" Equivalence<Text>) + format]] + ["." macro + ["s" syntax (#+ syntax:)]] + test]) (context: "Value identity." (<| (times +100) diff --git a/stdlib/test/test/lux/cli.lux b/stdlib/test/test/lux/cli.lux index fc9ffa280..208b5b1b2 100644 --- a/stdlib/test/test/lux/cli.lux +++ b/stdlib/test/test/lux/cli.lux @@ -1,18 +1,20 @@ (.module: - lux - (lux [io] - (control ["M" monad (#+ do Monad)] - pipe - ["p" parser]) - (data [product] - [sum] - ["E" error] - [number] - [text ("text/" Equivalence<Text>)] - text/format - (collection [list])) - ["r" math/random] - ["/" cli]) + [lux #* + [io] + [control + ["M" monad (#+ do Monad)] + pipe + ["p" parser]] + [data + [product] + [sum] + ["E" error] + [number] + [text ("text/" Equivalence<Text>) + format] + [collection [list]]] + [math ["r" random]] + ["/" cli]] lux/test) (context: "CLI" diff --git a/stdlib/test/test/lux/concurrency/actor.lux b/stdlib/test/test/lux/concurrency/actor.lux index 7895350e6..1bb6b5b0b 100644 --- a/stdlib/test/test/lux/concurrency/actor.lux +++ b/stdlib/test/test/lux/concurrency/actor.lux @@ -1,14 +1,18 @@ (.module: - lux - (lux [io (#+ IO io)] - (control ["M" monad (#+ do Monad)] - ["ex" exception]) - (data [number] - text/format - ["e" error]) - (concurrency ["P" promise ("promise/" Monad<Promise>)] - ["T" task] - ["&" actor (#+ actor: message:)])) + [lux #* + [io (#+ IO io)] + [control + ["M" monad (#+ do Monad)] + ["ex" exception]] + [data + ["e" error] + [number] + [text + format]] + [concurrency + ["P" promise ("promise/" Monad<Promise>)] + ["T" task] + ["&" actor (#+ actor: message:)]]] lux/test) (actor: Counter diff --git a/stdlib/test/test/lux/concurrency/atom.lux b/stdlib/test/test/lux/concurrency/atom.lux index 36dc59074..77f52b94d 100644 --- a/stdlib/test/test/lux/concurrency/atom.lux +++ b/stdlib/test/test/lux/concurrency/atom.lux @@ -1,12 +1,16 @@ (.module: - lux - (lux [io] - (control ["M" monad (#+ do Monad)]) - (data [number] - (collection [list "" Functor<List>]) - text/format) - (concurrency ["&" atom]) - ["r" math/random]) + [lux #* + [io] + [control + ["M" monad (#+ do Monad)]] + [data + [number] + [text + format]] + [concurrency + ["&" atom]] + [math + ["r" random]]] lux/test) (context: "Atoms" diff --git a/stdlib/test/test/lux/concurrency/frp.lux b/stdlib/test/test/lux/concurrency/frp.lux index 637892e3b..0cb6b7831 100644 --- a/stdlib/test/test/lux/concurrency/frp.lux +++ b/stdlib/test/test/lux/concurrency/frp.lux @@ -1,13 +1,18 @@ (.module: - lux - (lux [io (#+ IO io)] - (control [monad (#+ do Monad)]) - (data [number] - text/format - (collection [list])) - (concurrency [promise ("promise/" Monad<Promise>)] - [frp (#+ Channel)] - [atom (#+ Atom atom)])) + [lux #* + [io (#+ IO io)] + [control + [monad (#+ do Monad)]] + [data + [number] + [text + format] + [collection + [list]]] + [concurrency + [promise ("promise/" Monad<Promise>)] + [frp (#+ Channel)] + [atom (#+ Atom atom)]]] lux/test) (def: (write! values channel) diff --git a/stdlib/test/test/lux/concurrency/promise.lux b/stdlib/test/test/lux/concurrency/promise.lux index b6540c145..f0b0bb865 100644 --- a/stdlib/test/test/lux/concurrency/promise.lux +++ b/stdlib/test/test/lux/concurrency/promise.lux @@ -1,12 +1,17 @@ (.module: - lux - (lux [io (#+ IO io)] - (control ["M" monad (#+ do Monad)] - pipe) - (data [number] - text/format) - (concurrency ["&" promise ("&/" Monad<Promise>)]) - ["r" math/random]) + [lux #* + [io (#+ IO io)] + [control + ["M" monad (#+ do Monad)] + pipe] + [data + [number] + [text + format]] + [concurrency + ["&" promise ("&/" Monad<Promise>)]] + [math + ["r" random]]] lux/test) (context: "Promises" diff --git a/stdlib/test/test/lux/concurrency/semaphore.lux b/stdlib/test/test/lux/concurrency/semaphore.lux index c09b48545..8a5c1cbce 100644 --- a/stdlib/test/test/lux/concurrency/semaphore.lux +++ b/stdlib/test/test/lux/concurrency/semaphore.lux @@ -1,15 +1,19 @@ (.module: - lux - (lux (control [monad (#+ do)]) - (data [maybe] - [text ("text/" Equivalence<Text> Monoid<Text>)] - text/format - (collection [list ("list/" Functor<List>)])) - (concurrency ["/" semaphore] - [promise (#+ Promise)] - [atom (#+ Atom)]) - [io] - ["r" math/random]) + [lux #* + [control + [monad (#+ do)]] + [data + [maybe] + [text ("text/" Equivalence<Text> Monoid<Text>) + format] + [collection [list ("list/" Functor<List>)]]] + [concurrency + ["/" semaphore] + [promise (#+ Promise)] + [atom (#+ Atom)]] + [io] + [math + ["r" random]]] lux/test) (def: (wait-many-times times semaphore) diff --git a/stdlib/test/test/lux/concurrency/stm.lux b/stdlib/test/test/lux/concurrency/stm.lux index c2d2dc8c0..1a254284f 100644 --- a/stdlib/test/test/lux/concurrency/stm.lux +++ b/stdlib/test/test/lux/concurrency/stm.lux @@ -1,16 +1,21 @@ (.module: - lux - (lux [io (#+ IO)] - (control ["M" monad (#+ do Monad)]) - (data [number] - [maybe] - (collection [list ("list/" Functor<List>)]) - text/format) - (concurrency [atom (#+ Atom atom)] - ["&" stm] - [promise] - [frp (#+ Channel)]) - ["r" math/random]) + [lux #* + [io (#+ IO)] + [control + ["M" monad (#+ do Monad)]] + [data + [number] + [maybe] + [text format] + [collection + [list ("list/" Functor<List>)]]] + [concurrency + [atom (#+ Atom atom)] + ["&" stm] + [promise] + [frp (#+ Channel)]] + [math + ["r" random]]] lux/test) (def: (read! channel) diff --git a/stdlib/test/test/lux/control/continuation.lux b/stdlib/test/test/lux/control/continuation.lux index cc8297cd7..9d5cad55b 100644 --- a/stdlib/test/test/lux/control/continuation.lux +++ b/stdlib/test/test/lux/control/continuation.lux @@ -1,10 +1,12 @@ (.module: - lux - (lux (control ["M" monad (#+ do Monad)] - ["&" continuation]) - (data [number] - (collection [list])) - ["r" math/random]) + [lux #* + [control + ["M" monad (#+ do Monad)] + ["&" continuation]] + [data + [number] + [collection [list]]] + ["r" math/random]] lux/test) (context: "Continuations" diff --git a/stdlib/test/test/lux/control/equivalence.lux b/stdlib/test/test/lux/control/equivalence.lux index 5fd317fe4..5206e892d 100644 --- a/stdlib/test/test/lux/control/equivalence.lux +++ b/stdlib/test/test/lux/control/equivalence.lux @@ -1,9 +1,11 @@ (.module: - lux - (lux (control ["/" equivalence] - [monad (#+ do)]) - (math ["r" random]) - test)) + [lux #* + [control + ["/" equivalence] + [monad (#+ do)]] + [math + ["r" random]] + test]) (def: #export (spec Equivalence<a> generator) (All [a] (-> (/.Equivalence a) (r.Random a) Test)) diff --git a/stdlib/test/test/lux/control/exception.lux b/stdlib/test/test/lux/control/exception.lux index dc768633c..85b331620 100644 --- a/stdlib/test/test/lux/control/exception.lux +++ b/stdlib/test/test/lux/control/exception.lux @@ -1,13 +1,16 @@ (.module: - lux - (lux [io] - (control ["M" monad (#+ do Monad)] - ["&" exception (#+ exception:)]) - (data ["E" error] - [text] - text/format - [number]) - ["r" math/random]) + [lux #* + [io] + [control + ["M" monad (#+ do Monad)] + ["&" exception (#+ exception:)]] + [data + ["E" error] + ["." text + format] + [number]] + [math + ["r" random]]] lux/test) (exception: some-exception) diff --git a/stdlib/test/test/lux/control/interval.lux b/stdlib/test/test/lux/control/interval.lux index c836dacda..89691a719 100644 --- a/stdlib/test/test/lux/control/interval.lux +++ b/stdlib/test/test/lux/control/interval.lux @@ -1,15 +1,20 @@ (.module: - lux lux/test - (lux (control ["M" monad (#+ do Monad)] - pipe - ["&" interval]) - [io] - ["r" math/random] - (data text/format - [number] - (collection ["S" set] - ["L" list])))) + [lux #* + [control + ["M" monad (#+ do Monad)] + pipe + ["&" interval]] + [io] + [math + ["r" random]] + [data + [number] + [text + format] + [collection + ["S" set] + ["L" list]]]]) (context: "Equivalence." (<| (times +100) diff --git a/stdlib/test/test/lux/control/parser.lux b/stdlib/test/test/lux/control/parser.lux index 805ec3126..a8ec24446 100644 --- a/stdlib/test/test/lux/control/parser.lux +++ b/stdlib/test/test/lux/control/parser.lux @@ -1,14 +1,17 @@ (.module: - lux - (lux [io] - (control ["M" monad (#+ do)] - [equivalence (#+ Equivalence)] - ["&" parser]) - (data [error (#+ Error)]) - ["r" math/random] - [macro] - (macro [code] - ["s" syntax (#+ syntax:)])) + [lux #* + [io] + [control + ["M" monad (#+ do)] + [equivalence (#+ Equivalence)] + ["&" parser]] + [data + [error (#+ Error)]] + [math + ["r" random]] + ["." macro + [code] + ["s" syntax (#+ syntax:)]]] lux/test) ## [Utils] diff --git a/stdlib/test/test/lux/control/pipe.lux b/stdlib/test/test/lux/control/pipe.lux index 317501109..6e232a255 100644 --- a/stdlib/test/test/lux/control/pipe.lux +++ b/stdlib/test/test/lux/control/pipe.lux @@ -1,14 +1,17 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - pipe) - (data text/format - [number] - [product] - identity - [text ("text/" Equivalence<Text>)]) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)] + pipe] + [data + [number] + [product] + identity + [text ("text/" Equivalence<Text>) + format]] + [math + ["r" random]]] lux/test) (context: "Pipes" diff --git a/stdlib/test/test/lux/control/reader.lux b/stdlib/test/test/lux/control/reader.lux index 5259d1e51..bc7905f37 100644 --- a/stdlib/test/test/lux/control/reader.lux +++ b/stdlib/test/test/lux/control/reader.lux @@ -1,9 +1,10 @@ (.module: - lux - (lux [io] - (control [monad (#+ do)] - pipe - ["&" reader])) + [lux #* + [io] + [control + [monad (#+ do)] + pipe + ["&" reader]]] lux/test) (context: "Readers" diff --git a/stdlib/test/test/lux/control/region.lux b/stdlib/test/test/lux/control/region.lux index abfe25985..606be66bf 100644 --- a/stdlib/test/test/lux/control/region.lux +++ b/stdlib/test/test/lux/control/region.lux @@ -1,13 +1,17 @@ (.module: - lux - (lux (control [monad (#+ do)] - ["/" region] - [thread (#+ Thread)] - ["ex" exception (#+ exception:)]) - (data ["e" error (#+ Error)] - (collection [list]) - text/format) - ["r" math/random]) + [lux #* + [control + [monad (#+ do)] + ["/" region] + [thread (#+ Thread)] + ["ex" exception (#+ exception:)]] + [data + ["e" error (#+ Error)] + [text + format] + [collection [list]]] + [math + ["r" random]]] lux/test) (exception: oops) diff --git a/stdlib/test/test/lux/control/state.lux b/stdlib/test/test/lux/control/state.lux index 59f424be3..9f352df48 100644 --- a/stdlib/test/test/lux/control/state.lux +++ b/stdlib/test/test/lux/control/state.lux @@ -1,11 +1,14 @@ (.module: - lux - (lux [io] - (control ["M" monad (#+ do Monad)] - pipe - ["&" state]) - (data [product]) - ["r" math/random]) + [lux #* + [io] + [control + ["M" monad (#+ do Monad)] + pipe + ["&" state]] + [data + [product]] + [math + ["r" random]]] lux/test) (def: (with-conditions [state output] computation) diff --git a/stdlib/test/test/lux/control/thread.lux b/stdlib/test/test/lux/control/thread.lux index f1e9673e3..8c7dcc592 100644 --- a/stdlib/test/test/lux/control/thread.lux +++ b/stdlib/test/test/lux/control/thread.lux @@ -1,7 +1,8 @@ (.module: - lux - (lux (control [monad (#+ do)] - ["/" thread]))) + [lux #* + [control + [monad (#+ do)] + ["/" thread]]]) (def: _test0_ Nat diff --git a/stdlib/test/test/lux/control/writer.lux b/stdlib/test/test/lux/control/writer.lux index 49d6341e7..6cf50d2bd 100644 --- a/stdlib/test/test/lux/control/writer.lux +++ b/stdlib/test/test/lux/control/writer.lux @@ -1,12 +1,14 @@ (.module: - lux - (lux [io] - (control ["M" monad (#+ do Monad)] - pipe - ["&" writer]) - (data [text ("text/" Equivalence<Text>)] - [number] - [product])) + [lux #* + [io] + [control + ["M" monad (#+ do Monad)] + pipe + ["&" writer]] + [data + [number] + [product] + [text ("text/" Equivalence<Text>)]]] lux/test) (context: "Writer." diff --git a/stdlib/test/test/lux/data/bit.lux b/stdlib/test/test/lux/data/bit.lux index 158c1d218..6d76ac4e2 100644 --- a/stdlib/test/test/lux/data/bit.lux +++ b/stdlib/test/test/lux/data/bit.lux @@ -1,10 +1,13 @@ (.module: - lux - (lux [io] - (control ["M" monad (#+ do Monad)]) - (data ["&" bit] - number) - ["r" math/random]) + [lux #* + [io] + [control + ["M" monad (#+ do Monad)]] + [data + ["&" bit] + number] + [math + ["r" random]]] lux/test) (context: "Bitwise operations." diff --git a/stdlib/test/test/lux/data/bool.lux b/stdlib/test/test/lux/data/bool.lux index fb5db77df..0413c2632 100644 --- a/stdlib/test/test/lux/data/bool.lux +++ b/stdlib/test/test/lux/data/bool.lux @@ -1,9 +1,12 @@ (.module: - lux - (lux (control ["M" monad (#+ do Monad)]) - [io] - (data bool) - ["r" math/random]) + [lux #* + [control + ["M" monad (#+ do Monad)]] + [io] + [data + bool] + [math + ["r" random]]] lux/test) (context: "Boolean operations." diff --git a/stdlib/test/test/lux/data/collection/array.lux b/stdlib/test/test/lux/data/collection/array.lux index 769a7a215..f0f72a14d 100644 --- a/stdlib/test/test/lux/data/collection/array.lux +++ b/stdlib/test/test/lux/data/collection/array.lux @@ -1,13 +1,17 @@ (.module: - lux - (lux (control [monad (#+ do Monad)] - pipe) - [io] - (data (collection ["@" array] - [list]) - [number] - [maybe]) - ["r" math/random]) + [lux #* + [control + [monad (#+ do Monad)] + pipe] + [io] + [data + [number] + [maybe] + [collection + ["@" array] + [list]]] + [math + ["r" random]]] lux/test) (def: bounded-size diff --git a/stdlib/test/test/lux/data/collection/bits.lux b/stdlib/test/test/lux/data/collection/bits.lux index 8e1d672d7..dd53f42eb 100644 --- a/stdlib/test/test/lux/data/collection/bits.lux +++ b/stdlib/test/test/lux/data/collection/bits.lux @@ -1,11 +1,15 @@ (.module: - lux - (lux (control [monad (#+ do)] - [predicate]) - (data (collection ["/" bits])) - ["r" math/random]) + [lux #* + [control + [monad (#+ do)] + [predicate]] + [data + [collection + ["/" bits]]] + [math + ["r" random]]] lux/test - (test (lux (control ["_eq" equivalence])))) + [test [lux [control ["_eq" equivalence]]]]) (def: (size min max) (-> Nat Nat (r.Random Nat)) diff --git a/stdlib/test/test/lux/data/collection/dictionary.lux b/stdlib/test/test/lux/data/collection/dictionary.lux index db8c6ef5a..b0ad15d7b 100644 --- a/stdlib/test/test/lux/data/collection/dictionary.lux +++ b/stdlib/test/test/lux/data/collection/dictionary.lux @@ -1,15 +1,18 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - ["eq" equivalence]) - (data [text] - text/format - [number] - [maybe] - (collection ["&" dictionary] - [list ("list/" Fold<List> Functor<List>)])) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)] + ["eq" equivalence]] + [data + [number] + [maybe] + ["." text + format] + [collection + ["&" dictionary] + [list ("list/" Fold<List> Functor<List>)]]] + ["r" math/random]] lux/test) (context: "Dictionaries." diff --git a/stdlib/test/test/lux/data/collection/dictionary/ordered.lux b/stdlib/test/test/lux/data/collection/dictionary/ordered.lux index 0c00a18be..4626886e9 100644 --- a/stdlib/test/test/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/test/test/lux/data/collection/dictionary/ordered.lux @@ -1,15 +1,19 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - [equivalence (#+ Equivalence)]) - (data [product] - [number] - (collection ["s" set] - ["dict" dictionary] - (dictionary ["&" ordered]) - [list ("list/" Functor<List>)])) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)] + [equivalence (#+ Equivalence)]] + [data + [product] + [number] + [collection + ["s" set] + ["dict" dictionary] + [dictionary ["&" ordered]] + [list ("list/" Functor<List>)]]] + [math + ["r" random]]] lux/test) (context: "Dictionary" diff --git a/stdlib/test/test/lux/data/collection/list.lux b/stdlib/test/test/lux/data/collection/list.lux index 940273ba1..f7e73ef9b 100644 --- a/stdlib/test/test/lux/data/collection/list.lux +++ b/stdlib/test/test/lux/data/collection/list.lux @@ -1,14 +1,17 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - pipe) - (data (collection ["&" list]) - [number] - [bool] - [product] - [maybe]) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)] + pipe] + [data [number] + [bool] + [product] + [maybe] + [collection + ["&" list]]] + [math + ["r" random]]] lux/test) (def: bounded-size diff --git a/stdlib/test/test/lux/data/collection/queue.lux b/stdlib/test/test/lux/data/collection/queue.lux index a28196c8a..ebb730d58 100644 --- a/stdlib/test/test/lux/data/collection/queue.lux +++ b/stdlib/test/test/lux/data/collection/queue.lux @@ -1,10 +1,14 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)]) - (data (collection ["&" queue]) - [number]) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)]] + [data + [number] + [collection + ["&" queue]]] + [math + ["r" random]]] lux/test) (context: "Queues" diff --git a/stdlib/test/test/lux/data/collection/queue/priority.lux b/stdlib/test/test/lux/data/collection/queue/priority.lux index a6f62a69b..d893fe960 100644 --- a/stdlib/test/test/lux/data/collection/queue/priority.lux +++ b/stdlib/test/test/lux/data/collection/queue/priority.lux @@ -1,11 +1,14 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)]) - (data (collection (queue ["&" priority])) - [number] - [maybe]) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)]] + [data + [number] + [maybe] + [collection [queue ["&" priority]]]] + [math + ["r" random]]] lux/test) (def: (gen-queue size) diff --git a/stdlib/test/test/lux/data/collection/row.lux b/stdlib/test/test/lux/data/collection/row.lux index 8833c75d3..f8850447a 100644 --- a/stdlib/test/test/lux/data/collection/row.lux +++ b/stdlib/test/test/lux/data/collection/row.lux @@ -1,12 +1,15 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)]) - (data (collection ["&" row] - [list ("list/" Fold<List>)]) - [number] - [maybe]) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)]] + [data + [number] + [maybe] + [collection ["&" row] + [list ("list/" Fold<List>)]]] + [math + ["r" random]]] lux/test) (context: "Rows" diff --git a/stdlib/test/test/lux/data/collection/sequence.lux b/stdlib/test/test/lux/data/collection/sequence.lux index 48048216f..16b98a90b 100644 --- a/stdlib/test/test/lux/data/collection/sequence.lux +++ b/stdlib/test/test/lux/data/collection/sequence.lux @@ -1,15 +1,18 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - comonad) - (data [maybe] - [text ("text/" Monoid<Text>)] - text/format - (collection [list] - ["&" sequence]) - [number ("nat/" Codec<Text,Nat>)]) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)] + comonad] + [data + [maybe] + [number ("nat/" Codec<Text,Nat>)] + [text ("text/" Monoid<Text>) + format] + [collection [list] + ["&" sequence]]] + [math + ["r" random]]] lux/test) (context: "Sequences" diff --git a/stdlib/test/test/lux/data/collection/set.lux b/stdlib/test/test/lux/data/collection/set.lux index 41aaa88ff..43bd48069 100644 --- a/stdlib/test/test/lux/data/collection/set.lux +++ b/stdlib/test/test/lux/data/collection/set.lux @@ -1,11 +1,14 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)]) - (data (collection ["&" set (#+ Set)] - [list]) - [number]) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)]] + [data + [number] + [collection ["&" set (#+ Set)] + [list]]] + [math + ["r" random]]] lux/test) (def: gen-nat diff --git a/stdlib/test/test/lux/data/collection/set/ordered.lux b/stdlib/test/test/lux/data/collection/set/ordered.lux index b99d5c225..97127a3f3 100644 --- a/stdlib/test/test/lux/data/collection/set/ordered.lux +++ b/stdlib/test/test/lux/data/collection/set/ordered.lux @@ -1,13 +1,18 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)]) - (data (collection [set] - (set ["&" ordered]) - [list]) - [number] - text/format) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)]] + [data + [number] + [text + format] + [collection + ["." set + ["&" ordered]] + [list]]] + [math + ["r" random]]] lux/test) (def: gen-nat diff --git a/stdlib/test/test/lux/data/collection/stack.lux b/stdlib/test/test/lux/data/collection/stack.lux index faebac246..06e8af547 100644 --- a/stdlib/test/test/lux/data/collection/stack.lux +++ b/stdlib/test/test/lux/data/collection/stack.lux @@ -1,9 +1,12 @@ (.module: - lux - (lux (control [monad (#+ do)]) - (data (collection ["&" stack]) - [maybe]) - ["r" math/random]) + [lux #* + [control + [monad (#+ do)]] + [data + [maybe] + [collection ["&" stack]]] + [math + ["r" random]]] lux/test) (def: gen-nat diff --git a/stdlib/test/test/lux/data/collection/tree/rose.lux b/stdlib/test/test/lux/data/collection/tree/rose.lux index 211e0eb12..ac340cd13 100644 --- a/stdlib/test/test/lux/data/collection/tree/rose.lux +++ b/stdlib/test/test/lux/data/collection/tree/rose.lux @@ -1,14 +1,18 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)]) - (data [product] - [number] - [text ("text/" Equivalence<Text>)] - text/format - (collection (tree ["&" rose]) - [list ("list/" Functor<List> Fold<List>)])) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)]] + [data + [product] + [number] + [text ("text/" Equivalence<Text>) + format] + [collection + [tree ["&" rose]] + [list ("list/" Functor<List> Fold<List>)]]] + [math + ["r" random]]] lux/test) (def: gen-tree diff --git a/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux b/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux index acd24c2c1..26311fbd1 100644 --- a/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux +++ b/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux @@ -1,16 +1,21 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - pipe) - (data (collection [list ("list/" Fold<List> Functor<List>)] - (tree [rose] - (rose ["&" zipper]))) - [text] - text/format - [number] - [maybe]) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)] + pipe] + [data + [number] + [maybe] + ["." text + format] + [collection + [list ("list/" Fold<List> Functor<List>)] + [tree + [rose] + [rose ["&" zipper]]]]] + [math + ["r" random]]] lux/test) (def: gen-tree diff --git a/stdlib/test/test/lux/data/color.lux b/stdlib/test/test/lux/data/color.lux index 35b0db7d4..797a0336b 100644 --- a/stdlib/test/test/lux/data/color.lux +++ b/stdlib/test/test/lux/data/color.lux @@ -1,11 +1,13 @@ (.module: - lux - (lux [io] - (control [monad (#+ do)]) - (data ["@" color] - [number ("frac/" Number<Frac>)]) - [math] - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do)]] + [data + ["@" color] + [number ("frac/" Number<Frac>)]] + ["." math + ["r" random]]] lux/test) (def: color diff --git a/stdlib/test/test/lux/data/error.lux b/stdlib/test/test/lux/data/error.lux index 733be1cc6..d86afc20b 100644 --- a/stdlib/test/test/lux/data/error.lux +++ b/stdlib/test/test/lux/data/error.lux @@ -1,10 +1,13 @@ (.module: - lux - (lux [io] - (control ["M" monad (#+ do Monad)] - pipe) - (data text/format - ["&" error])) + [lux #* + [io] + [control + ["M" monad (#+ do Monad)] + pipe] + [data + ["&" error] + [text + format]]] lux/test) (context: "Errors" diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux index 9929e1567..e3b3c6f66 100644 --- a/stdlib/test/test/lux/data/format/json.lux +++ b/stdlib/test/test/lux/data/format/json.lux @@ -1,36 +1,46 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - codec - [equivalence (#+ Equivalence)] - pipe - ["p" parser]) - (data [text] - text/format - ["e" error] - [bool] - [maybe] - [number] - (format ["@" json]) - (collection [row (#+ row)] - ["d" dictionary] - [list])) - [macro (#+ with-gensyms)] - (macro [code] - [syntax (#+ syntax:)] - [poly (#+ derived:)] - [poly/equivalence] - [poly/json]) - (type [unit]) - ["r" math/random] - (time ["ti" instant] - ["tda" date] - ["tdu" duration]) - test) - (test (lux (time ["_." instant] - ["_." duration] - ["_." date]))) + [lux #* + [io] + [control + [monad (#+ do Monad)] + codec + [equivalence (#+ Equivalence)] + pipe + ["p" parser]] + [data + ["e" error] + [bool] + [maybe] + [number] + ["." text + format] + [format + ["@" json]] + [collection + [row (#+ row)] + ["d" dictionary] + [list]]] + [macro (#+ with-gensyms) + [code] + [syntax (#+ syntax:)] + [poly (#+ derived:)] + [poly/equivalence] + [poly/json]] + [type + [unit]] + [math + ["r" random]] + [time + ["ti" instant] + ["tda" date] + ["tdu" duration]] + test] + [test + [lux + [time + ["_." instant] + ["_." duration] + ["_." date]]]] ) (def: gen-json diff --git a/stdlib/test/test/lux/data/format/xml.lux b/stdlib/test/test/lux/data/format/xml.lux index a96906f88..b757fe7e6 100644 --- a/stdlib/test/test/lux/data/format/xml.lux +++ b/stdlib/test/test/lux/data/format/xml.lux @@ -1,20 +1,24 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - ["p" parser] - pipe) - (data [text ("text/" Equivalence<Text>)] - text/format - [ident] - ["E" error] - [maybe] - (format ["&" xml]) - (collection ["dict" dictionary] - [list ("list/" Functor<List>)])) - ["r" math/random ("r/" Monad<Random>)] - test) - ) + [lux #* + [io] + [control + [monad (#+ do Monad)] + ["p" parser] + pipe] + [data + [ident] + ["E" error] + [maybe] + [text ("text/" Equivalence<Text>) + format] + [format + ["&" xml]] + [collection + ["dict" dictionary] + [list ("list/" Functor<List>)]]] + [math + ["r" random ("r/" Monad<Random>)]]] + lux/test) (def: char-range Text diff --git a/stdlib/test/test/lux/data/ident.lux b/stdlib/test/test/lux/data/ident.lux index 57a6e5f4d..0f8133721 100644 --- a/stdlib/test/test/lux/data/ident.lux +++ b/stdlib/test/test/lux/data/ident.lux @@ -1,12 +1,14 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - pipe) - (data ["&" ident] - [text ("text/" Equivalence<Text>)] - text/format) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)] + pipe] + [data + ["&" ident] + [text ("text/" Equivalence<Text>) + format]] + [math ["r" random]]] lux/test) (def: (gen-part size) diff --git a/stdlib/test/test/lux/data/identity.lux b/stdlib/test/test/lux/data/identity.lux index 7c82d700c..a57a05f4c 100644 --- a/stdlib/test/test/lux/data/identity.lux +++ b/stdlib/test/test/lux/data/identity.lux @@ -1,10 +1,12 @@ (.module: - lux - (lux [io] - (control ["M" monad (#+ do Monad)] - comonad) - (data ["&" identity] - [text ("text/" Monoid<Text> Equivalence<Text>)])) + [lux #* + [io] + [control + ["M" monad (#+ do Monad)] + comonad] + [data + ["&" identity] + [text ("text/" Monoid<Text> Equivalence<Text>)]]] lux/test) (context: "Identity" diff --git a/stdlib/test/test/lux/data/lazy.lux b/stdlib/test/test/lux/data/lazy.lux index e6a266b4a..895fa8b1c 100644 --- a/stdlib/test/test/lux/data/lazy.lux +++ b/stdlib/test/test/lux/data/lazy.lux @@ -1,9 +1,12 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)]) - (data ["&" lazy]) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)]] + [data + ["&" lazy]] + [math + ["r" random]]] lux/test) (context: "Lazy." diff --git a/stdlib/test/test/lux/data/maybe.lux b/stdlib/test/test/lux/data/maybe.lux index 19af6ac6a..4401748cd 100644 --- a/stdlib/test/test/lux/data/maybe.lux +++ b/stdlib/test/test/lux/data/maybe.lux @@ -1,11 +1,13 @@ (.module: - lux - (lux [io] - (control ["M" monad (#+ do Monad)] - pipe) - (data ["&" maybe] - [text ("text/" Monoid<Text>)] - [number])) + [lux #* + [io] + [control + ["M" monad (#+ do Monad)] + pipe] + [data + ["&" maybe] + [number] + [text ("text/" Monoid<Text>)]]] lux/test) (context: "Maybe" diff --git a/stdlib/test/test/lux/data/number.lux b/stdlib/test/test/lux/data/number.lux index e29521e87..cc286dcd5 100644 --- a/stdlib/test/test/lux/data/number.lux +++ b/stdlib/test/test/lux/data/number.lux @@ -1,12 +1,15 @@ (.module: - lux - (lux [io] - (control ["M" monad (#+ do Monad)] - pipe) - (data number - [text ("text/" Equivalence<Text>)] - text/format) - ["r" math/random]) + [lux #* + [io] + [control + ["M" monad (#+ do Monad)] + pipe] + [data + number + [text ("text/" Equivalence<Text>) + format]] + [math + ["r" random]]] lux/test) (do-template [category rand-gen <Equivalence> <Order>] diff --git a/stdlib/test/test/lux/data/number/complex.lux b/stdlib/test/test/lux/data/number/complex.lux index 11601933e..03ec307ff 100644 --- a/stdlib/test/test/lux/data/number/complex.lux +++ b/stdlib/test/test/lux/data/number/complex.lux @@ -1,15 +1,19 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - pipe) - (data [product] - [number ("frac/" Number<Frac>)] - ["&" number/complex] - text/format - (collection [list ("list/" Functor<List>)])) - [math] - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)] + pipe] + [data + [product] + [number ("frac/" Number<Frac>) + ["&" complex]] + [text + format] + [collection + [list ("list/" Functor<List>)]]] + ["." math + ["r" random]]] lux/test) (def: margin-of-error Frac 1.0e-9) diff --git a/stdlib/test/test/lux/data/number/ratio.lux b/stdlib/test/test/lux/data/number/ratio.lux index f0320a397..0235a78b7 100644 --- a/stdlib/test/test/lux/data/number/ratio.lux +++ b/stdlib/test/test/lux/data/number/ratio.lux @@ -1,10 +1,13 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - pipe) - (data ["&" number/ratio ("&/" Number<Ratio>)]) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)] + pipe] + [data + ["&" number/ratio ("&/" Number<Ratio>)]] + [math + ["r" random]]] lux/test) (def: gen-part diff --git a/stdlib/test/test/lux/data/product.lux b/stdlib/test/test/lux/data/product.lux index 309e8e311..440ccf62c 100644 --- a/stdlib/test/test/lux/data/product.lux +++ b/stdlib/test/test/lux/data/product.lux @@ -1,6 +1,7 @@ (.module: - lux - (lux (data ["@" product])) + [lux #* + [data + ["@" product]]] lux/test) (context: "Products" diff --git a/stdlib/test/test/lux/data/sum.lux b/stdlib/test/test/lux/data/sum.lux index 04b295ccf..0cc9e36af 100644 --- a/stdlib/test/test/lux/data/sum.lux +++ b/stdlib/test/test/lux/data/sum.lux @@ -1,9 +1,12 @@ (.module: - lux - (lux (control pipe) - (data sum - [text] - (collection [list]))) + [lux #* + [control + pipe] + [data + sum + [text] + [collection + [list]]]] lux/test) (context: "Sum operations" diff --git a/stdlib/test/test/lux/data/text.lux b/stdlib/test/test/lux/data/text.lux index edd3fa8a6..c75b1bacd 100644 --- a/stdlib/test/test/lux/data/text.lux +++ b/stdlib/test/test/lux/data/text.lux @@ -1,13 +1,17 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - pipe) - (data ["&" text] - text/format - [number] - (collection [list])) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)] + pipe] + [data + ["&" text + format] + [number] + [collection + [list]]] + [math + ["r" random]]] lux/test) (context: "Size" diff --git a/stdlib/test/test/lux/data/text/format.lux b/stdlib/test/test/lux/data/text/format.lux index 81304af36..0d328cb0e 100644 --- a/stdlib/test/test/lux/data/text/format.lux +++ b/stdlib/test/test/lux/data/text/format.lux @@ -1,10 +1,12 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)]) - (data text/format - [text] - [number])) + [lux #* + [io] + [control + [monad (#+ do Monad)]] + [data + ["." text + format] + [number]]] lux/test) (context: "Formatters" diff --git a/stdlib/test/test/lux/data/text/lexer.lux b/stdlib/test/test/lux/data/text/lexer.lux index 36b2eb1d9..25abe3ae4 100644 --- a/stdlib/test/test/lux/data/text/lexer.lux +++ b/stdlib/test/test/lux/data/text/lexer.lux @@ -1,15 +1,19 @@ (.module: - lux - (lux (control [monad (#+ do Monad)] - pipe - ["p" parser]) - [io] - (data ["E" error] - [text ("text/" Equivalence<Text>)] - text/format - ["&" text/lexer] - (collection [list])) - ["r" math/random]) + [lux #* + [control + [monad (#+ do Monad)] + pipe + ["p" parser]] + [io] + [data + ["E" error] + [text ("text/" Equivalence<Text>) + format + ["&" lexer]] + [collection + [list]]] + [math + ["r" random]]] lux/test) ## [Utils] diff --git a/stdlib/test/test/lux/data/text/regex.lux b/stdlib/test/test/lux/data/text/regex.lux index 581a9011f..16970af9c 100644 --- a/stdlib/test/test/lux/data/text/regex.lux +++ b/stdlib/test/test/lux/data/text/regex.lux @@ -1,18 +1,21 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - pipe - ["p" parser]) - (data [product] - [text ("text/" Equivalence<Text>)] - text/format - (text [lexer] - ["&" regex])) - [macro] - (macro [code] - ["s" syntax (#+ syntax:)]) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)] + pipe + ["p" parser]] + [data + [product] + [text ("text/" Equivalence<Text>) + format + [lexer] + ["&" regex]]] + ["." macro + [code] + ["s" syntax (#+ syntax:)]] + [math + ["r" random]]] lux/test) ## [Utils] diff --git a/stdlib/test/test/lux/host.js.lux b/stdlib/test/test/lux/host.js.lux index 8e301bdaa..cba72d0ae 100644 --- a/stdlib/test/test/lux/host.js.lux +++ b/stdlib/test/test/lux/host.js.lux @@ -1,10 +1,7 @@ (.module: - lux - (lux [io] - (control ["M" monad (#+ do Monad)]) - (data text/format) - ["&" host] - ["r" math/random]) + [lux #* + ["&" host] + [math ["r" random]]] lux/test) (context: "JavaScript operations" diff --git a/stdlib/test/test/lux/host.jvm.lux b/stdlib/test/test/lux/host.jvm.lux index 13728b438..d5469b9c2 100644 --- a/stdlib/test/test/lux/host.jvm.lux +++ b/stdlib/test/test/lux/host.jvm.lux @@ -1,14 +1,16 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - pipe) - (data text/format - [number] - [product] - [text ("text/" Equivalence<Text>)]) - ["&" host (#+ class: interface: object)] - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do Monad)] + pipe] + [data + [number] + [product] + [text ("text/" Equivalence<Text>) + format]] + ["&" host (#+ class: interface: object)] + ["r" math/random]] lux/test) (&.import: (java/util/concurrent/Callable a)) diff --git a/stdlib/test/test/lux/io.lux b/stdlib/test/test/lux/io.lux index 4257f8100..0fb9018a6 100644 --- a/stdlib/test/test/lux/io.lux +++ b/stdlib/test/test/lux/io.lux @@ -1,10 +1,12 @@ (.module: - lux - (lux ["&" io] - (control ["M" monad (#+ do Monad)]) - (data [text ("text/" Equivalence<Text>)] - text/format - [number])) + [lux #* + ["&" io] + [control + ["M" monad (#+ do Monad)]] + [data + [number] + [text ("text/" Equivalence<Text>) + format]]] lux/test) (context: "I/O" diff --git a/stdlib/test/test/lux/language/compiler/analysis/case.lux b/stdlib/test/test/lux/language/compiler/analysis/case.lux index a2d54df8a..66b1b0b12 100644 --- a/stdlib/test/test/lux/language/compiler/analysis/case.lux +++ b/stdlib/test/test/lux/language/compiler/analysis/case.lux @@ -1,25 +1,32 @@ (.module: - lux - (lux [io] - (control [monad (#+ do)] - pipe) - (data [product] - [maybe] - [text ("text/" Equivalence<Text>)] - (collection [list ("list/" Monad<List>)] - [set])) - ["r" math/random ("random/" Monad<Random>)] - [macro (#+ Monad<Meta>)] - (macro [code]) - (language [type] - (type ["tc" check]) - [".L" module] - (compiler [analysis] - (analysis [".A" type] - ["/" case]))) - test) - (// ["_." primitive] - ["_." structure])) + [lux #* + [io] + [control + [monad (#+ do)] + pipe] + [data + [product] + [maybe] + [text ("text/" Equivalence<Text>)] + [collection + [list ("list/" Monad<List>)] + [set]]] + [math + ["r" random ("random/" Monad<Random>)]] + [macro (#+ Monad<Meta>) + [code]] + [language + ["." type + ["tc" check]] + [".L" module] + [compiler + ["." analysis + [".A" type] + ["/" case]]]] + test] + [// + ["_." primitive] + ["_." structure]]) (def: (exhaustive-weaving branchings) (-> (List (List Code)) (List (List Code))) diff --git a/stdlib/test/test/lux/language/compiler/analysis/function.lux b/stdlib/test/test/lux/language/compiler/analysis/function.lux index 3de93fcc7..bc1a24811 100644 --- a/stdlib/test/test/lux/language/compiler/analysis/function.lux +++ b/stdlib/test/test/lux/language/compiler/analysis/function.lux @@ -1,28 +1,35 @@ (.module: - lux - (lux [io] - (control [monad (#+ do)] - pipe) - (data ["e" error] - [maybe] - [product] - [text ("text/" Equivalence<Text>)] - text/format - (collection [list ("list/" Functor<List>)])) - ["r" math/random] - [macro] - (macro [code]) - [language] - (language [type ("type/" Equivalence<Type>)] - [".L" reference] - (compiler [".L" init] - [".L" analysis (#+ Analysis)] - (analysis [".A" type] - [".A" expression] - ["/" function]))) - test) - (// ["_." primitive] - ["_." structure])) + [lux #* + [io] + [control + [monad (#+ do)] + pipe] + [data + ["e" error] + [maybe] + [product] + [text ("text/" Equivalence<Text>) + format] + [collection + [list ("list/" Functor<List>)]]] + [math + ["r" random]] + ["." macro + [code]] + [language] + [language + [type ("type/" Equivalence<Type>)] + [".L" reference] + [compiler + [".L" init] + [".L" analysis (#+ Analysis) + [".A" type] + [".A" expression] + ["/" function]]]] + test] + [// + ["_." primitive] + ["_." structure]]) (def: analyse (expressionA.analyser (:coerce language.Eval []))) diff --git a/stdlib/test/test/lux/language/compiler/analysis/primitive.lux b/stdlib/test/test/lux/language/compiler/analysis/primitive.lux index 1643786e3..ba841fbfe 100644 --- a/stdlib/test/test/lux/language/compiler/analysis/primitive.lux +++ b/stdlib/test/test/lux/language/compiler/analysis/primitive.lux @@ -1,21 +1,25 @@ (.module: - [lux (#- primitive)] - (lux [io] - (control [monad (#+ do)] - pipe - ["ex" exception (#+ exception:)]) - (data (text format) - ["e" error]) - ["r" math/random ("random/" Monad<Random>)] - [macro] - (macro [code]) - [language] - (language [".L" type ("type/" Equivalence<Type>)] - (compiler [".L" init] - [analysis (#+ Analysis)] - (analysis [".A" type] - [".A" expression]))) - test)) + [lux (#- primitive) + [io] + [control + [monad (#+ do)] + pipe + ["ex" exception (#+ exception:)]] + [data + ["e" error] + [text format]] + [math + ["r" random ("random/" Monad<Random>)]] + ["." macro + [code]] + ["." language + [".L" type ("type/" Equivalence<Type>)] + [compiler + [".L" init] + [analysis (#+ Analysis) + [".A" type] + [".A" expression]]]] + test]) (def: #export analyse (expressionA.analyser (:coerce language.Eval []))) diff --git a/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux b/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux index ea7d8bdc2..59d1d955a 100644 --- a/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux +++ b/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux @@ -1,23 +1,30 @@ (.module: - lux - (lux [io] - (control [monad (#+ do)] - pipe) - (concurrency [atom]) - (data text/format - ["e" error] - [product] - (collection [array])) - ["r" math/random] - [macro (#+ Monad<Meta>)] - (macro [code]) - [language] - (language [type ("type/" Equivalence<Type>)] - [".L" scope] - (compiler [".L" init] - (analysis [".A" type]))) - test) - (/// ["_." primitive])) + [lux #* + [io] + [control + [monad (#+ do)] + pipe] + [concurrency + [atom]] + [data + ["e" error] + [product] + [text format] + [collection [array]]] + [math + ["r" random]] + [macro (#+ Monad<Meta>) + [code]] + ["." language + [type ("type/" Equivalence<Type>)] + [".L" scope] + [compiler + [".L" init] + [analysis + [".A" type]]]] + test] + [/// + ["_." primitive]]) (do-template [<name> <success> <failure>] [(def: (<name> procedure params output-type) diff --git a/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux b/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux index d33af651d..02574a31a 100644 --- a/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux +++ b/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux @@ -1,27 +1,37 @@ (.module: - lux - (lux [io] - (control [monad (#+ do)] - pipe) - (concurrency [atom]) - (data ["e" error] - [product] - [maybe] - [text ("text/" Equivalence<Text>)] - text/format - (collection [array] - [list ("list/" Fold<List>)] - ["dict" dictionary])) - ["r" math/random "r/" Monad<Random>] - [macro (#+ Monad<Meta>)] - (macro [code]) - [language] - (language [type] - (compiler [".L" init] - (analysis [".A" type]) - (extension (analysis [".AE" host])))) - test) - (/// ["_." primitive])) + [lux #* + [io] + [control + [monad (#+ do)] + pipe] + [concurrency + [atom]] + [data + ["e" error] + [product] + [maybe] + [text ("text/" Equivalence<Text>) + format] + [collection + [array] + [list ("list/" Fold<List>)] + ["dict" dictionary]]] + [math + ["r" random "r/" Monad<Random>]] + [macro (#+ Monad<Meta>) + [code]] + ["." language + [type] + [compiler + [".L" init] + [analysis + [".A" type]] + [extension + [analysis + [".AE" host]]]]] + test] + [/// + ["_." primitive]]) (do-template [<name> <success> <failure>] [(def: (<name> procedure params output-type) diff --git a/stdlib/test/test/lux/language/compiler/analysis/reference.lux b/stdlib/test/test/lux/language/compiler/analysis/reference.lux index 413a8fb01..aaad40584 100644 --- a/stdlib/test/test/lux/language/compiler/analysis/reference.lux +++ b/stdlib/test/test/lux/language/compiler/analysis/reference.lux @@ -1,25 +1,30 @@ (.module: - lux - (lux [io] - (control [monad (#+ do)] - pipe) - (data ["e" error] - [ident ("ident/" Equivalence<Ident>)] - [text ("text/" Equivalence<Text>)]) - ["r" math/random] - [macro (#+ Monad<Meta>)] - (macro [code]) - [language] - (language [type ("type/" Equivalence<Type>)] - [".L" scope] - [".L" module] - [".L" reference] - (compiler [".L" init] - [".L" analysis] - (analysis [".A" type] - [".A" expression]))) - test) - (// ["_." primitive])) + [lux #* + [io] + [control + [monad (#+ do)] + pipe] + [data + ["e" error] + [ident ("ident/" Equivalence<Ident>)] + [text ("text/" Equivalence<Text>)]] + [math + ["r" random]] + [macro (#+ Monad<Meta>) [code]] + ["." language] + [language + [type ("type/" Equivalence<Type>)] + [".L" scope] + [".L" module] + [".L" reference] + [compiler + [".L" init] + [".L" analysis + [".A" type] + [".A" expression]]]] + test] + [// + ["_." primitive]]) (def: analyse (expressionA.analyser (:coerce language.Eval []))) diff --git a/stdlib/test/test/lux/language/compiler/analysis/structure.lux b/stdlib/test/test/lux/language/compiler/analysis/structure.lux index dca02794d..2777ad93b 100644 --- a/stdlib/test/test/lux/language/compiler/analysis/structure.lux +++ b/stdlib/test/test/lux/language/compiler/analysis/structure.lux @@ -1,30 +1,36 @@ (.module: - lux - (lux [io] - (control [monad (#+ do)] - pipe) - (data [bool ("bool/" Equivalence<Bool>)] - ["e" error] - [product] - [maybe] - [text] - text/format - (collection [list ("list/" Functor<List>)] - [set])) - ["r" math/random] - [macro] - (macro [code]) - [language] - (language [type ("type/" Equivalence<Type>)] - (type ["tc" check]) - [".L" module] - (compiler [".L" init] - [".L" analysis (#+ Analysis Variant Tag)] - (analysis [".A" type] - ["/" structure] - [".A" expression]))) - test) - (// ["_." primitive])) + [lux #* + [io] + [control + [monad (#+ do)] + pipe] + [data + [bool ("bool/" Equivalence<Bool>)] + ["e" error] + [product] + [maybe] + ["." text + format] + [collection + [list ("list/" Functor<List>)] + [set]]] + [math + ["r" random]] + ["." macro + [code]] + ["." language + [type ("type/" Equivalence<Type>) + ["tc" check]] + [".L" module] + [compiler + [".L" init] + [".L" analysis (#+ Analysis Variant Tag) + [".A" type] + ["/" structure] + [".A" expression]]]] + test] + [// + ["_." primitive]]) (def: analyse (expressionA.analyser (:coerce language.Eval []))) diff --git a/stdlib/test/test/lux/language/syntax.lux b/stdlib/test/test/lux/language/syntax.lux index 2a6e9ae5d..22420e3eb 100644 --- a/stdlib/test/test/lux/language/syntax.lux +++ b/stdlib/test/test/lux/language/syntax.lux @@ -1,18 +1,22 @@ (.module: - lux - (lux [io] - (control [monad (#+ do)]) - (data [number] - ["e" error] - [text] - (text format - ["l" lexer]) - (collection [list] - ["dict" dictionary (#+ Dictionary)])) - ["r" math/random ("r/" Monad<Random>)] - (macro [code]) - (language ["&" syntax]) - test)) + [lux #* + [io] + [control + [monad (#+ do)]] + [data + [number] + ["e" error] + ["." text + format + ["l" lexer]] + [collection + [list] + ["dict" dictionary (#+ Dictionary)]]] + [math + ["r" random ("r/" Monad<Random>)]] + [macro [code]] + [language ["&" syntax]] + test]) (def: default-cursor Cursor diff --git a/stdlib/test/test/lux/language/type.lux b/stdlib/test/test/lux/language/type.lux index ccc315487..7be06000b 100644 --- a/stdlib/test/test/lux/language/type.lux +++ b/stdlib/test/test/lux/language/type.lux @@ -1,13 +1,19 @@ (.module: - lux - (lux [io] - (control ["M" monad (#+ do Monad)] - pipe) - (data text/format - [maybe] - (collection [list])) - ["r" math/random] - (language ["&" type])) + [lux #* + [io] + [control + ["M" monad (#+ do Monad)] + pipe] + [data + [maybe] + [text + format] + [collection + [list]]] + [math + ["r" random]] + [language + ["&" type]]] lux/test) ## [Utils] diff --git a/stdlib/test/test/lux/language/type/check.lux b/stdlib/test/test/lux/language/type/check.lux index bc04f461b..8fe7f2bf6 100644 --- a/stdlib/test/test/lux/language/type/check.lux +++ b/stdlib/test/test/lux/language/type/check.lux @@ -1,18 +1,23 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - [pipe (#+ case>)]) - (data [product] - [maybe] - [number] - [text ("text/" Monoid<Text> Equivalence<Text>)] - text/format - (collection [list ("list/" Functor<List>)] - [set])) - ["r" math/random] - (language [type ("type/" Equivalence<Type>)] - (type ["@" check]))) + [lux #* + [io] + [control + [monad (#+ do Monad)] + [pipe (#+ case>)]] + [data + [product] + [maybe] + [number] + [text ("text/" Monoid<Text> Equivalence<Text>) + format] + [collection + [list ("list/" Functor<List>)] + [set]]] + [math + ["r" random]] + [language + [type ("type/" Equivalence<Type>) + ["@" check]]]] lux/test) ## [Utils] diff --git a/stdlib/test/test/lux/macro/code.lux b/stdlib/test/test/lux/macro/code.lux index d1c7eb318..6c5a28265 100644 --- a/stdlib/test/test/lux/macro/code.lux +++ b/stdlib/test/test/lux/macro/code.lux @@ -1,12 +1,14 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)]) - (data [text ("text/" Equivalence<Text>)] - text/format - [number]) - ["r" math/random] - (macro ["&" code])) + [lux #* + [io] + [control + [monad (#+ do Monad)]] + [data + [number] + [text ("text/" Equivalence<Text>) + format]] + [math ["r" random]] + [macro ["&" code]]] lux/test) (context: "Code" diff --git a/stdlib/test/test/lux/macro/poly/equivalence.lux b/stdlib/test/test/lux/macro/poly/equivalence.lux index 30b41c6b0..3ae57cd40 100644 --- a/stdlib/test/test/lux/macro/poly/equivalence.lux +++ b/stdlib/test/test/lux/macro/poly/equivalence.lux @@ -1,18 +1,21 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - [equivalence (#+ Equivalence)]) - (data text/format - [bool] - [number ("int/" Number<Int>)] - [text] - [maybe] - (collection [list])) - ["r" math/random] - [macro] - (macro [poly (#+ derived:)] - ["&" poly/equivalence])) + [lux #* + [io] + [control + [monad (#+ do Monad)] + [equivalence (#+ Equivalence)]] + [data + [bool] + [maybe] + [number ("int/" Number<Int>)] + ["." text + format] + [collection [list]]] + [math + ["r" random]] + ["." macro + [poly (#+ derived:)] + ["&" poly/equivalence]]] lux/test) ## [Utils] diff --git a/stdlib/test/test/lux/macro/poly/functor.lux b/stdlib/test/test/lux/macro/poly/functor.lux index 0b92743e2..6d335701e 100644 --- a/stdlib/test/test/lux/macro/poly/functor.lux +++ b/stdlib/test/test/lux/macro/poly/functor.lux @@ -1,9 +1,12 @@ (.module: - lux - (lux (control [state]) - (data [identity]) - (macro [poly (#+ derived:)] - ["&" poly/functor])) + [lux #* + [control + [state]] + [data + [identity]] + [macro + [poly (#+ derived:)] + ["&" poly/functor]]] lux/test) ## [Utils] diff --git a/stdlib/test/test/lux/macro/syntax.lux b/stdlib/test/test/lux/macro/syntax.lux index 2b1fa4962..8d2b5ff8c 100644 --- a/stdlib/test/test/lux/macro/syntax.lux +++ b/stdlib/test/test/lux/macro/syntax.lux @@ -1,19 +1,22 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - [equivalence (#+ Equivalence)] - ["p" parser]) - (data [text] - text/format - [number] - [bool] - [ident] - ["e" error]) - ["r" math/random] - [macro] - (macro [code] - ["s" syntax (#+ syntax: Syntax)])) + [lux #* + [io] + [control + [monad (#+ do Monad)] + [equivalence (#+ Equivalence)] + ["p" parser]] + [data + [bool] + [ident] + ["e" error] + [number] + ["." text + format]] + [math + ["r" random]] + ["." macro + [code] + ["s" syntax (#+ syntax: Syntax)]]] lux/test) ## [Utils] diff --git a/stdlib/test/test/lux/math.lux b/stdlib/test/test/lux/math.lux index 2d13430ed..ab12c4894 100644 --- a/stdlib/test/test/lux/math.lux +++ b/stdlib/test/test/lux/math.lux @@ -1,11 +1,13 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)]) - (data [bool ("bool/" Equivalence<Bool>)] - [number ("frac/" Number<Frac>)]) - ["r" math/random] - ["&" math]) + [lux #* + [io] + [control + [monad (#+ do Monad)]] + [data + [bool ("bool/" Equivalence<Bool>)] + [number ("frac/" Number<Frac>)]] + ["&" math + ["r" random]]] lux/test) (def: (within? margin-of-error standard value) diff --git a/stdlib/test/test/lux/math/logic/continuous.lux b/stdlib/test/test/lux/math/logic/continuous.lux index 8962fc0a2..4dc768cc2 100644 --- a/stdlib/test/test/lux/math/logic/continuous.lux +++ b/stdlib/test/test/lux/math/logic/continuous.lux @@ -1,9 +1,12 @@ (.module: - lux - (lux (control [monad (#+ do)]) - [io] - ["r" math/random] - ["&" math/logic/continuous]) + [lux #* + [control + [monad (#+ do)]] + [io] + [math + ["r" random] + [logic + ["&" continuous]]]] lux/test) (context: "Operations" diff --git a/stdlib/test/test/lux/math/logic/fuzzy.lux b/stdlib/test/test/lux/math/logic/fuzzy.lux index 2c88469ce..53e183b35 100644 --- a/stdlib/test/test/lux/math/logic/fuzzy.lux +++ b/stdlib/test/test/lux/math/logic/fuzzy.lux @@ -1,15 +1,21 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)]) - (data (collection [list] - [set]) - [bool ("bool/" Equivalence<Bool>)] - [number] - text/format) - ["r" math/random] - (math/logic ["&" fuzzy] - continuous)) + [lux #* + [io] + [control + [monad (#+ do Monad)]] + [data + [bool ("bool/" Equivalence<Bool>)] + [number] + [text + format] + [collection + [list] + [set]]] + [math + ["r" random] + [logic + ["&" fuzzy] + continuous]]] lux/test) (do-template [<desc> <hash> <gen> <triangle> <lt> <lte> <gt> <gte>] diff --git a/stdlib/test/test/lux/math/modular.lux b/stdlib/test/test/lux/math/modular.lux index afa6330d3..89e2e94a3 100644 --- a/stdlib/test/test/lux/math/modular.lux +++ b/stdlib/test/test/lux/math/modular.lux @@ -1,13 +1,17 @@ (.module: - lux - (lux (control [monad (#+ do)]) - (data [product] - [bool ("bool/" Equivalence<Bool>)] - ["e" error] - text/format) - (math ["r" random] - ["/" modular]) - (language [type ("type/" Equivalence<Type>)])) + [lux #* + [control + [monad (#+ do)]] + [data + [product] + [bool ("bool/" Equivalence<Bool>)] + ["e" error] + [text + format]] + [math + ["r" random] + ["/" modular]] + [language [type ("type/" Equivalence<Type>)]]] lux/test) (def: %3 (/.modulus 3)) diff --git a/stdlib/test/test/lux/math/random.lux b/stdlib/test/test/lux/math/random.lux index aa574511b..2785666e0 100644 --- a/stdlib/test/test/lux/math/random.lux +++ b/stdlib/test/test/lux/math/random.lux @@ -1,17 +1,20 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)]) - (data [number] - text/format - (collection [list] - [row] - [array] - [queue] - [stack] - [set] - ["dict" dictionary])) - (math ["r" random])) + [lux #* + [io] + [control + [monad (#+ do Monad)]] + [data + [number] + [text format] + [collection + [list] + [row] + [array] + [queue] + [stack] + [set] + ["dict" dictionary]]] + [math ["r" random]]] lux/test) (context: "Random." diff --git a/stdlib/test/test/lux/time/date.lux b/stdlib/test/test/lux/time/date.lux index 93238bc11..9f70e738f 100644 --- a/stdlib/test/test/lux/time/date.lux +++ b/stdlib/test/test/lux/time/date.lux @@ -1,14 +1,18 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - [pipe]) - (data [error]) - (math ["r" random ("random/" Monad<Random>)]) - (time ["@." instant] - ["@" date])) + [lux #* + [io] + [control + [monad (#+ do Monad)] + [pipe]] + [data + [error]] + [math + ["r" random ("random/" Monad<Random>)]] + [time + ["@." instant] + ["@" date]]] lux/test - (test (lux (time ["_." instant])))) + [test [lux [time ["_." instant]]]]) (def: month (r.Random @.Month) diff --git a/stdlib/test/test/lux/time/duration.lux b/stdlib/test/test/lux/time/duration.lux index a15738906..c5896b193 100644 --- a/stdlib/test/test/lux/time/duration.lux +++ b/stdlib/test/test/lux/time/duration.lux @@ -1,10 +1,14 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)]) - (data ["E" error]) - (math ["r" random]) - (time ["@" duration])) + [lux #* + [io] + [control + [monad (#+ do Monad)]] + [data + ["E" error]] + [math + ["r" random]] + [time + ["@" duration]]] lux/test) (def: #export duration diff --git a/stdlib/test/test/lux/time/instant.lux b/stdlib/test/test/lux/time/instant.lux index c1e258566..6914bd7b0 100644 --- a/stdlib/test/test/lux/time/instant.lux +++ b/stdlib/test/test/lux/time/instant.lux @@ -1,17 +1,22 @@ (.module: - lux - (lux [io] - (control [monad (#+ do Monad)] - pipe) - (data [text] - text/format - [error]) - (math ["r" random]) - (time ["@" instant] - ["@d" duration] - ["@date" date])) + [lux #* + [io] + [control + [monad (#+ do Monad)] + pipe] + [data + ["." text + format] + [error]] + [math + ["r" random]] + [time + ["@" instant] + ["@d" duration] + ["@date" date]]] lux/test - (// ["_." duration])) + [// + ["_." duration]]) (def: boundary Int 99_999_999_999_999) diff --git a/stdlib/test/test/lux/type/implicit.lux b/stdlib/test/test/lux/type/implicit.lux index 680241dde..e19f672e0 100644 --- a/stdlib/test/test/lux/type/implicit.lux +++ b/stdlib/test/test/lux/type/implicit.lux @@ -1,14 +1,17 @@ (.module: - lux - (lux [io] - (control [equivalence] - [functor] - [monad (#+ do Monad)]) - (data [number] - [bool ("bool/" Equivalence<Bool>)] - (collection [list])) - ["r" math/random] - (type implicit)) + [lux #* + [io] + [control + [equivalence] + [functor] + [monad (#+ do Monad)]] + [data + [bool ("bool/" Equivalence<Bool>)] + [number] + [collection [list]]] + [math + ["r" random]] + [type implicit]] lux/test) (context: "Automatic structure selection" diff --git a/stdlib/test/test/lux/type/object/interface.lux b/stdlib/test/test/lux/type/object/interface.lux index e7afc5f64..6cc1eb4b0 100644 --- a/stdlib/test/test/lux/type/object/interface.lux +++ b/stdlib/test/test/lux/type/object/interface.lux @@ -1,7 +1,11 @@ (.module: - lux - (lux (data (collection [list])) - (type (object interface)))) + [lux #* + [data + [collection + [list]]] + [type + [object + interface]]]) ## No parameters (interface: Counter diff --git a/stdlib/test/test/lux/type/object/protocol.lux b/stdlib/test/test/lux/type/object/protocol.lux index 58e4f6fcd..0ec93442b 100644 --- a/stdlib/test/test/lux/type/object/protocol.lux +++ b/stdlib/test/test/lux/type/object/protocol.lux @@ -1,7 +1,11 @@ (.module: - lux - (lux (data text/format) - (type (object protocol)))) + [lux #* + [data + [text + format]] + [type + [object + protocol]]]) (type: Counter (Object (Method Any Nat))) diff --git a/stdlib/test/test/lux/type/resource.lux b/stdlib/test/test/lux/type/resource.lux index 9024975e2..7a9940499 100644 --- a/stdlib/test/test/lux/type/resource.lux +++ b/stdlib/test/test/lux/type/resource.lux @@ -1,9 +1,12 @@ (.module: - lux - (lux (control (monad [indexed (#+ do)])) - [macro] - (type [resource (#+ Res)]) - [io]) + [lux #* + [control + [monad + [indexed (#+ do)]]] + [macro] + [type + [resource (#+ Res)]] + [io]] lux/test) (context: "Sub-structural typing." diff --git a/stdlib/test/test/lux/world/blob.lux b/stdlib/test/test/lux/world/blob.lux index 2adc116c3..7bce91298 100644 --- a/stdlib/test/test/lux/world/blob.lux +++ b/stdlib/test/test/lux/world/blob.lux @@ -1,16 +1,23 @@ (.module: - lux - (lux [io] - (control [monad (#+ do)] - [pipe]) - (data [bit] - [number] - ["e" error] - (collection [list])) - (world ["/" blob]) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do)] + [pipe]] + [data + [bit] + [number] + ["e" error] + [collection [list]]] + [world + ["/" blob]] + [math + ["r" random]]] lux/test - (test (lux (control ["_eq" equivalence])))) + [test + [lux + [control + ["_eq" equivalence]]]]) (def: (succeed result) (-> (e.Error Bool) Bool) diff --git a/stdlib/test/test/lux/world/file.lux b/stdlib/test/test/lux/world/file.lux index bd6ff9294..6f508baaa 100644 --- a/stdlib/test/test/lux/world/file.lux +++ b/stdlib/test/test/lux/world/file.lux @@ -1,19 +1,26 @@ (.module: - lux - (lux [io] - (control [monad (#+ do)]) - (concurrency [promise]) - (data [error] - [text] - text/format - [number]) - (time [instant] - [duration]) - (world ["@" file] - [blob]) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do)]] + [concurrency + [promise]] + [data + [error] + [number] + ["." text + format]] + [time + [instant] + [duration]] + [world + ["@" file] + [blob]] + [math + ["r" random]]] lux/test - (// ["_." blob])) + [// + ["_." blob]]) (def: truncate-millis (|>> (i// 1_000) (i/* 1_000))) diff --git a/stdlib/test/test/lux/world/net/tcp.lux b/stdlib/test/test/lux/world/net/tcp.lux index 7277a5b1c..26b7703ea 100644 --- a/stdlib/test/test/lux/world/net/tcp.lux +++ b/stdlib/test/test/lux/world/net/tcp.lux @@ -1,20 +1,26 @@ (.module: - lux - (lux [io] - (control [monad (#+ do)] - ["ex" exception (#+ exception:)]) - (concurrency ["P" promise] - ["T" task] - [frp ("frp/" Functor<Channel>)]) - (data ["E" error] - [text] - text/format) - (world [blob] - [net] - (net ["@" tcp])) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)]] + [concurrency + ["P" promise] + ["T" task] + [frp ("frp/" Functor<Channel>)]] + [data + ["E" error] + ["." text + format]] + [world + [blob] + ["." net + ["@" tcp]]] + [math + ["r" random]]] lux/test - (/// ["_." blob])) + [/// + ["_." blob]]) (def: localhost net.Address "127.0.0.1") (def: port diff --git a/stdlib/test/test/lux/world/net/udp.lux b/stdlib/test/test/lux/world/net/udp.lux index 53c2f9d88..b1685ebc7 100644 --- a/stdlib/test/test/lux/world/net/udp.lux +++ b/stdlib/test/test/lux/world/net/udp.lux @@ -1,20 +1,26 @@ (.module: - lux - (lux [io] - (control [monad (#+ do)] - ["ex" exception (#+ exception:)]) - (concurrency ["P" promise] - ["T" task] - [frp]) - (data ["E" error] - [text] - text/format) - (world [blob] - [net] - (net ["@" udp])) - ["r" math/random]) + [lux #* + [io] + [control + [monad (#+ do)] + ["ex" exception (#+ exception:)]] + [concurrency + ["P" promise] + ["T" task] + [frp]] + [data + ["E" error] + ["." text + format]] + [world + [blob] + ["." net + ["@" udp]]] + [math + ["r" random]]] lux/test - (/// ["_." blob])) + [/// + ["_." blob]]) (def: localhost net.Address "127.0.0.1") (def: port diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux index 8d644b68e..baa1c6f54 100644 --- a/stdlib/test/tests.lux +++ b/stdlib/test/tests.lux @@ -1,140 +1,174 @@ (.module: - lux - (lux [cli (#+ program:)] - [test]) - (test ["_." lux] - (lux ["_." cli] - ["_." host] - ["_." io] - (time ["_." instant] - ["_." duration] - ["_." date]) - (concurrency ["_." actor] - ["_." atom] - ["_." frp] - ["_." promise] - ["_." stm] - ["_." semaphore]) - (control ["_." exception] - ["_." interval] - ["_." pipe] - ["_." continuation] - ["_." reader] - ["_." writer] - ["_." state] - ["_." parser] - ["_." thread] - ["_." region]) - (data ["_." bit] - ["_." bool] - ["_." color] - ["_." error] - ["_." ident] - ["_." identity] - ["_." lazy] - ["_." maybe] - ["_." product] - ["_." sum] - ## ["_." number] ## Specially troublesome... - (number ["_." ratio] - ["_." complex]) - ["_." text] - (text ["_." format] - ["_." lexer] - ["_." regex]) - (format ["_." json] - ["_." xml]) - (collection ["_." array] - ["_." bits] - ["_." list] - ["_." stack] - ["_." row] - ["_." sequence] - ["_." dictionary] - (dictionary ["_.D" ordered]) - ["_." set] - (set ["_.S" ordered]) - ["_." queue] - (queue ["_." priority]) - (tree ["_." rose] - (rose ["_." zipper])))) - ["_." math] - (math ["_." random] - ["_." modular] - (logic ["_." continuous] - ["_." fuzzy])) - (macro ["_." code] - ["_." syntax] - (poly ["poly_." equivalence] - ["poly_." functor])) - (type ## ["_." implicit] ## Specially troublesome... - ["_." resource] - (object - ["_." interface] - ["_." protocol])) - (language ["_language/." syntax] - ["_." type] - (type ["_." check]) - (compiler (analysis ["_.A" primitive] - ["_.A" structure] - ["_.A" reference] - ["_.A" case] - ["_.A" function] - ## (procedure ["_.A" common] - ## ["_.A" host]) - ) - ## (synthesis ["_.S" primitive] - ## ["_.S" structure] - ## ["_.S" case] - ## ["_.S" function]) - ) - ) - (world ["_." blob] - ## ["_." file] ## Specially troublesome... - (net ["_." tcp] - ["_." udp])) - )) - (lux (control [contract] - [concatenative] - [predicate] - [monad/free]) - (data [env] - [trace] - [store] - [tainted] - (format [context] - [html] - [css] - [binary]) - (collection (tree ["_." rose/parser]) - (dictionary [plist]) - (set [multi])) - (text [buffer])) - [macro] - (macro (poly [json])) - (type [unit] - [refinement] - [quotient]) - (world [environment] - [console]) - (language (host [".H" scheme]) - (compiler [translation] - (translation (scheme ["._scheme" primitive] - ["._scheme" structure] - ["._scheme" reference] - ["._scheme" function] - ["._scheme" loop] - ["._scheme" case] - ["._scheme" extension] - ["._scheme" extension/common] - ["._scheme" expression])) - (default (repl [type])) - (meta [io] - [io/context] - [io/archive] - [archive] - ["._meta" cache]) - (default ["._default" cache])))) + [lux #* + [cli (#+ program:)] + [test] + ## TODO: Test these modules + [control + [contract] + [concatenative] + [predicate] + [monad/free]] + [data + [env] + [trace] + [store] + [tainted] + [format + [context] + [html] + [css] + [binary]] + [collection + [tree ["_." rose/parser]] + [dictionary [plist]] + [set [multi]]] + [text [buffer]]] + [macro (#+) + [poly [json]]] + [type + [unit] + [refinement] + [quotient]] + [world + [environment] + [console]] + [language + [host [".H" scheme]] + [compiler + [translation (#+) + [scheme + ["._scheme" primitive] + ["._scheme" structure] + ["._scheme" reference] + ["._scheme" function] + ["._scheme" loop] + ["._scheme" case] + ["._scheme" extension] + ["._scheme" extension/common] + ["._scheme" expression]]] + [default [repl [type]]] + [meta + [io] + [io/context] + [io/archive] + [archive] + ["._meta" cache]] + [default ["._default" cache]]]]] + [test + ["_." lux] + [lux + ["_." cli] + ["_." host] + ["_." io] + [time + ["_." instant] + ["_." duration] + ["_." date]] + [concurrency + ["_." actor] + ["_." atom] + ["_." frp] + ["_." promise] + ["_." stm] + ["_." semaphore]] + [control + ["_." exception] + ["_." interval] + ["_." pipe] + ["_." continuation] + ["_." reader] + ["_." writer] + ["_." state] + ["_." parser] + ["_." thread] + ["_." region]] + [data + ["_." bit] + ["_." bool] + ["_." color] + ["_." error] + ["_." ident] + ["_." identity] + ["_." lazy] + ["_." maybe] + ["_." product] + ["_." sum] + ## ["_." number] ## Specially troublesome... + [number + ["_." ratio] + ["_." complex]] + ["_." text] + [text + ["_." format] + ["_." lexer] + ["_." regex]] + [format + ["_." json] + ["_." xml]] + [collection + ["_." array] + ["_." bits] + ["_." list] + ["_." stack] + ["_." row] + ["_." sequence] + ["_." dictionary] + [dictionary ["_.D" ordered]] + ["_." set] + [set ["_.S" ordered]] + ["_." queue] + [queue ["_." priority]] + [tree + ["_." rose] + [rose ["_." zipper]]]]] + ["_." math] + [math + ["_." random] + ["_." modular] + [logic + ["_." continuous] + ["_." fuzzy]]] + [macro + ["_." code] + ["_." syntax] + [poly + ["poly_." equivalence] + ["poly_." functor]]] + [type + ## ["_." implicit] ## Specially troublesome... + ["_." resource] + [object + ["_." interface] + ["_." protocol]]] + [language + ["_language/." syntax] + ["_." type] + [type ["_." check]] + [compiler + [analysis + ["_.A" primitive] + ["_.A" structure] + ["_.A" reference] + ["_.A" case] + ["_.A" function] + ## [procedure + ## ["_.A" common] + ## ["_.A" host]] + ] + ## [synthesis + ## ["_.S" primitive] + ## ["_.S" structure] + ## ["_.S" case] + ## ["_.S" function]] + ] + ] + [world + ["_." blob] + ## ["_." file] ## Specially troublesome... + [net + ["_." tcp] + ["_." udp]]] + ]] ) (program: args |