diff options
Diffstat (limited to '')
104 files changed, 160 insertions, 163 deletions
diff --git a/stdlib/source/lux.lux b/stdlib/source/lux.lux index 138d965c4..71cdbe716 100644 --- a/stdlib/source/lux.lux +++ b/stdlib/source/lux.lux @@ -4948,7 +4948,7 @@ lux (lux (control (monad #as M #refer #all)) (data (text #open (\"text/\" Monoid<Text>)) - (coll (list #open (\"list/\" Monad<List>))) + (collection (list #open (\"list/\" Monad<List>))) maybe (ident #open (\"ident/\" Codec<Text,Ident>))) meta @@ -4959,7 +4959,7 @@ lux (lux (control [\"M\" monad #*]) (data [text \"text/\" Monoid<Text>] - (coll [list \"list/\" Monad<List>]) + (collection [list \"list/\" Monad<List>]) maybe [ident \"ident/\" Codec<Text,Ident>]) meta diff --git a/stdlib/source/lux/cli.lux b/stdlib/source/lux/cli.lux index c2e8e2c0f..ac04ce673 100644 --- a/stdlib/source/lux/cli.lux +++ b/stdlib/source/lux/cli.lux @@ -2,7 +2,7 @@ lux (lux (control monad ["p" parser]) - (data (coll [list "list/" Monoid<List> Monad<List>]) + (data (collection [list "list/" Monoid<List> Monad<List>]) [text "text/" Equivalence<Text>] text/format ["E" error]) diff --git a/stdlib/source/lux/concurrency/actor.lux b/stdlib/source/lux/concurrency/actor.lux index ad3bccfdc..187fe54eb 100644 --- a/stdlib/source/lux/concurrency/actor.lux +++ b/stdlib/source/lux/concurrency/actor.lux @@ -7,7 +7,7 @@ (data [product] ["e" error] text/format - (coll [list "list/" Monoid<List> Monad<List> Fold<List>])) + (collection [list "list/" Monoid<List> Monad<List> Fold<List>])) [macro #+ with-gensyms Monad<Meta>] (macro [code] ["s" syntax #+ syntax: Syntax] diff --git a/stdlib/source/lux/concurrency/frp.lux b/stdlib/source/lux/concurrency/frp.lux index dda469f62..8a1cff374 100644 --- a/stdlib/source/lux/concurrency/frp.lux +++ b/stdlib/source/lux/concurrency/frp.lux @@ -4,7 +4,7 @@ [apply #+ Apply] [monad #+ do Monad]) [io #+ IO io] - (data (coll [list "list/" Monoid<List>])) + (data (collection [list "list/" Monoid<List>])) (type abstract)) (// [atom #+ Atom atom] [promise #+ Promise])) diff --git a/stdlib/source/lux/concurrency/stm.lux b/stdlib/source/lux/concurrency/stm.lux index eddaabf2b..26bcf4c36 100644 --- a/stdlib/source/lux/concurrency/stm.lux +++ b/stdlib/source/lux/concurrency/stm.lux @@ -6,7 +6,7 @@ [io #+ IO io] (data [product] [maybe] - (coll [list "list/" Functor<List> Fold<List>])) + (collection [list "list/" Functor<List> Fold<List>])) (concurrency [atom #+ Atom atom] [promise #+ Promise promise] [frp "frp/" Functor<Channel>]) diff --git a/stdlib/source/lux/control/comonad.lux b/stdlib/source/lux/control/comonad.lux index f60a34c74..557cd3b7b 100644 --- a/stdlib/source/lux/control/comonad.lux +++ b/stdlib/source/lux/control/comonad.lux @@ -1,7 +1,7 @@ (.module: lux - ["F" //functor] - (lux/data/coll [list "list/" Fold<List>])) + (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 fb1e903b2..75c69baf9 100644 --- a/stdlib/source/lux/control/concatenative.lux +++ b/stdlib/source/lux/control/concatenative.lux @@ -8,7 +8,7 @@ (data [text] text/format [maybe "maybe/" Monad<Maybe>] - (coll [list "list/" Fold<List> Functor<List>])) + (collection [list "list/" Fold<List> Functor<List>])) [macro #+ with-gensyms Monad<Meta>] (macro [code] ["s" syntax #+ syntax:] diff --git a/stdlib/source/lux/control/exception.lux b/stdlib/source/lux/control/exception.lux index 80ddeed35..bf6859dcd 100644 --- a/stdlib/source/lux/control/exception.lux +++ b/stdlib/source/lux/control/exception.lux @@ -6,7 +6,7 @@ [maybe] [product] [text "text/" Monoid<Text>] - (coll [list "list/" Functor<List> Fold<List>])) + (collection [list "list/" Functor<List> Fold<List>])) [macro] (macro [code] ["s" syntax #+ syntax: Syntax] diff --git a/stdlib/source/lux/control/monad/indexed.lux b/stdlib/source/lux/control/monad/indexed.lux index 455334760..4967a016a 100644 --- a/stdlib/source/lux/control/monad/indexed.lux +++ b/stdlib/source/lux/control/monad/indexed.lux @@ -2,7 +2,7 @@ lux (lux (control [monad] ["p" parser]) - (data (coll [list "list/" Functor<List> Fold<List>])) + (data (collection [list "list/" Functor<List> Fold<List>])) [macro] (macro ["s" syntax #+ Syntax syntax:]))) diff --git a/stdlib/source/lux/control/parser.lux b/stdlib/source/lux/control/parser.lux index 1ad76a50a..6bdc5877c 100644 --- a/stdlib/source/lux/control/parser.lux +++ b/stdlib/source/lux/control/parser.lux @@ -4,7 +4,7 @@ [apply #+ Apply] [monad #+ do Monad] [codec]) - (data (coll [list "list/" Functor<List> Monoid<List>]) + (data (collection [list "list/" Functor<List> Monoid<List>]) [product] ["e" error #+ Error]))) diff --git a/stdlib/source/lux/control/pipe.lux b/stdlib/source/lux/control/pipe.lux index de058307b..aae6a7db5 100644 --- a/stdlib/source/lux/control/pipe.lux +++ b/stdlib/source/lux/control/pipe.lux @@ -3,7 +3,7 @@ (lux (control [monad #+ do] ["p" parser]) (data ["e" error] - (coll [list #+ "list/" Fold<List> Monad<List>])) + (collection [list #+ "list/" Fold<List> Monad<List>])) [macro #+ with-gensyms] (macro ["s" syntax #+ syntax: Syntax] [code]) diff --git a/stdlib/source/lux/control/predicate.lux b/stdlib/source/lux/control/predicate.lux index d7abc4139..e9ddf5ff4 100644 --- a/stdlib/source/lux/control/predicate.lux +++ b/stdlib/source/lux/control/predicate.lux @@ -1,7 +1,7 @@ (.module: lux (lux (control [monoid #+ Monoid]) - (data (coll [set #+ Set])) + (data (collection [set #+ Set])) [function])) (type: #export (Predicate a) diff --git a/stdlib/source/lux/control/region.lux b/stdlib/source/lux/control/region.lux index d35495d93..09db5b5a0 100644 --- a/stdlib/source/lux/control/region.lux +++ b/stdlib/source/lux/control/region.lux @@ -6,7 +6,7 @@ ["ex" exception #+ Exception exception:]) (data ["e" error #+ Error] text/format - (coll [list "list/" Fold<List>])))) + (collection [list "list/" Fold<List>])))) (type: (Cleaner r m) (-> r (m (Error Any)))) diff --git a/stdlib/source/lux/data/coll/array.lux b/stdlib/source/lux/data/collection/array.lux index 842acec39..46d5a9572 100644 --- a/stdlib/source/lux/data/coll/array.lux +++ b/stdlib/source/lux/data/collection/array.lux @@ -4,7 +4,7 @@ [functor #+ Functor] [equivalence #+ Equivalence] fold) - (data (coll [list "list/" Fold<List>]) + (data (collection [list "list/" Fold<List>]) [product]) )) diff --git a/stdlib/source/lux/data/coll/bits.lux b/stdlib/source/lux/data/collection/bits.lux index 426f830d2..a7be3a240 100644 --- a/stdlib/source/lux/data/coll/bits.lux +++ b/stdlib/source/lux/data/collection/bits.lux @@ -4,7 +4,7 @@ pipe) (data [maybe] [bit] - (coll [array "array/" Fold<Array>]) + (collection [array "array/" Fold<Array>]) text/format))) (type: #export Chunk I64) diff --git a/stdlib/source/lux/data/coll/dictionary.lux b/stdlib/source/lux/data/collection/dictionary.lux index e971228bb..368a77469 100644 --- a/stdlib/source/lux/data/coll/dictionary.lux +++ b/stdlib/source/lux/data/collection/dictionary.lux @@ -3,8 +3,8 @@ (lux (control hash [equivalence #+ Equivalence]) (data [maybe] - (coll [list "list/" Fold<List> Functor<List> Monoid<List>] - [array "array/" Functor<Array> Fold<Array>]) + (collection [list "list/" Fold<List> Functor<List> Monoid<List>] + [array "array/" Functor<Array> Fold<Array>]) [bit] [product] [number]) diff --git a/stdlib/source/lux/data/coll/dictionary/ordered.lux b/stdlib/source/lux/data/collection/dictionary/ordered.lux index 3cea300f7..478b75a2a 100644 --- a/stdlib/source/lux/data/coll/dictionary/ordered.lux +++ b/stdlib/source/lux/data/collection/dictionary/ordered.lux @@ -3,7 +3,7 @@ (lux (control [monad #+ do Monad] equivalence [order #+ Order]) - (data (coll [list "L/" Monad<List> Monoid<List> Fold<List>]) + (data (collection [list "L/" Monad<List> Monoid<List> Fold<List>]) ["p" product] [maybe]) [macro] diff --git a/stdlib/source/lux/data/coll/dictionary/plist.lux b/stdlib/source/lux/data/collection/dictionary/plist.lux index c483a3287..c483a3287 100644 --- a/stdlib/source/lux/data/coll/dictionary/plist.lux +++ b/stdlib/source/lux/data/collection/dictionary/plist.lux diff --git a/stdlib/source/lux/data/coll/list.lux b/stdlib/source/lux/data/collection/list.lux index 74ef2e5cc..74ef2e5cc 100644 --- a/stdlib/source/lux/data/coll/list.lux +++ b/stdlib/source/lux/data/collection/list.lux diff --git a/stdlib/source/lux/data/coll/queue.lux b/stdlib/source/lux/data/collection/queue.lux index 3b144a52a..a0206a9eb 100644 --- a/stdlib/source/lux/data/coll/queue.lux +++ b/stdlib/source/lux/data/collection/queue.lux @@ -2,7 +2,7 @@ lux (lux (control [equivalence #+ Equivalence] ["F" functor]) - (data (coll [list "L/" Monoid<List> Functor<List>])))) + (data (collection [list "L/" Monoid<List> Functor<List>])))) (type: #export (Queue a) {#front (List a) diff --git a/stdlib/source/lux/data/coll/queue/priority.lux b/stdlib/source/lux/data/collection/queue/priority.lux index 443a54908..d697b91c7 100644 --- a/stdlib/source/lux/data/coll/queue/priority.lux +++ b/stdlib/source/lux/data/collection/queue/priority.lux @@ -2,7 +2,7 @@ lux (lux (control [equivalence #+ Equivalence] [monad #+ do Monad]) - (data (coll (tree [finger #+ Tree])) + (data (collection (tree [finger #+ Tree])) [number "nat/" Interval<Nat>] [maybe]))) diff --git a/stdlib/source/lux/data/coll/row.lux b/stdlib/source/lux/data/collection/row.lux index 1d4dc648c..ca38f4961 100644 --- a/stdlib/source/lux/data/coll/row.lux +++ b/stdlib/source/lux/data/collection/row.lux @@ -8,8 +8,8 @@ fold ["p" parser]) (data [maybe] - (coll [list "list/" Fold<List> Functor<List> Monoid<List>] - [array "array/" Functor<Array> Fold<Array>]) + (collection [list "list/" Fold<List> Functor<List> Monoid<List>] + [array "array/" Functor<Array> Fold<Array>]) [bit] [product]) [macro #+ with-gensyms] diff --git a/stdlib/source/lux/data/coll/sequence.lux b/stdlib/source/lux/data/collection/sequence.lux index ab8f1d625..1776855c5 100644 --- a/stdlib/source/lux/data/coll/sequence.lux +++ b/stdlib/source/lux/data/collection/sequence.lux @@ -8,7 +8,7 @@ [macro #+ with-gensyms] (macro [code] ["s" syntax #+ syntax: Syntax]) - (data (coll [list "List/" Monad<List>]) + (data (collection [list "List/" Monad<List>]) bool))) ## [Types] diff --git a/stdlib/source/lux/data/coll/set.lux b/stdlib/source/lux/data/collection/set.lux index 929040ad0..10b7600ca 100644 --- a/stdlib/source/lux/data/coll/set.lux +++ b/stdlib/source/lux/data/collection/set.lux @@ -2,8 +2,8 @@ lux (lux (control [equivalence #+ Equivalence] [hash #+ Hash]) - (data (coll ["dict" dictionary #+ Dictionary] - [list "list/" Fold<List>])) + (data (collection ["dict" dictionary #+ Dictionary] + [list "list/" Fold<List>])) (type abstract))) (abstract: #export (Set a) diff --git a/stdlib/source/lux/data/coll/set/ordered.lux b/stdlib/source/lux/data/collection/set/ordered.lux index 2ad835849..f947d0b11 100644 --- a/stdlib/source/lux/data/coll/set/ordered.lux +++ b/stdlib/source/lux/data/collection/set/ordered.lux @@ -2,8 +2,8 @@ lux (lux (control [equivalence #+ Equivalence] [order #+ Order]) - (data (coll [list "list/" Fold<List>] - (dictionary ["//" ordered]))) + (data (collection [list "list/" Fold<List>] + (dictionary ["//" ordered]))) (type abstract))) (abstract: #export (Set a) diff --git a/stdlib/source/lux/data/coll/stack.lux b/stdlib/source/lux/data/collection/stack.lux index 8f93bdb69..c0e1af182 100644 --- a/stdlib/source/lux/data/coll/stack.lux +++ b/stdlib/source/lux/data/collection/stack.lux @@ -1,6 +1,6 @@ (.module: lux - (lux (data (coll [list])))) + (lux (data (collection [list])))) ## [Types] (type: #export (Stack a) diff --git a/stdlib/source/lux/data/coll/tree/finger.lux b/stdlib/source/lux/data/collection/tree/finger.lux index ea1ff0eee..ea1ff0eee 100644 --- a/stdlib/source/lux/data/coll/tree/finger.lux +++ b/stdlib/source/lux/data/collection/tree/finger.lux diff --git a/stdlib/source/lux/data/coll/tree/rose.lux b/stdlib/source/lux/data/collection/tree/rose.lux index 1fb5fc85a..9eae689d3 100644 --- a/stdlib/source/lux/data/coll/tree/rose.lux +++ b/stdlib/source/lux/data/collection/tree/rose.lux @@ -5,7 +5,7 @@ equivalence ["p" parser] fold) - (data (coll [list "L/" Monad<List> Fold<List>])) + (data (collection [list "L/" Monad<List> Fold<List>])) [macro] (macro [code] ["s" syntax #+ syntax: Syntax]))) diff --git a/stdlib/source/lux/data/coll/tree/rose/parser.lux b/stdlib/source/lux/data/collection/tree/rose/parser.lux index 3e3535649..3e3535649 100644 --- a/stdlib/source/lux/data/coll/tree/rose/parser.lux +++ b/stdlib/source/lux/data/collection/tree/rose/parser.lux diff --git a/stdlib/source/lux/data/coll/tree/rose/zipper.lux b/stdlib/source/lux/data/collection/tree/rose/zipper.lux index ba47b9f0a..4a85c68c6 100644 --- a/stdlib/source/lux/data/coll/tree/rose/zipper.lux +++ b/stdlib/source/lux/data/collection/tree/rose/zipper.lux @@ -2,9 +2,9 @@ lux (lux (control functor comonad) - (data (coll [list "L/" Monad<List> Fold<List> Monoid<List>] - (tree [rose #+ Tree "T/" Functor<Tree>]) - [stack #+ Stack]) + (data (collection [list "L/" Monad<List> Fold<List> Monoid<List>] + (tree [rose #+ Tree "T/" Functor<Tree>]) + [stack #+ Stack]) [maybe "M/" Monad<Maybe>]) [macro] (macro [code] diff --git a/stdlib/source/lux/data/color.lux b/stdlib/source/lux/data/color.lux index 7a23be703..bf11c378a 100644 --- a/stdlib/source/lux/data/color.lux +++ b/stdlib/source/lux/data/color.lux @@ -1,7 +1,7 @@ (.module: lux (lux (control ["eq" equivalence]) - (data (coll [list "L/" Functor<List>])) + (data (collection [list "L/" Functor<List>])) [math] (type abstract))) diff --git a/stdlib/source/lux/data/format/context.lux b/stdlib/source/lux/data/format/context.lux index f9874f6d2..0a4d8bd92 100644 --- a/stdlib/source/lux/data/format/context.lux +++ b/stdlib/source/lux/data/format/context.lux @@ -4,7 +4,7 @@ ["ex" exception #+ exception:] [monad #+ do]) (data ["E" error] - (coll ["dict" dictionary #+ Dictionary])))) + (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 d76242045..685bd9d6d 100644 --- a/stdlib/source/lux/data/format/css.lux +++ b/stdlib/source/lux/data/format/css.lux @@ -4,7 +4,7 @@ [number] [text] text/format - (coll [list "L/" Functor<List> Monoid<List>])))) + (collection [list "L/" 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 ef2e0abf0..891800e8a 100644 --- a/stdlib/source/lux/data/format/html.lux +++ b/stdlib/source/lux/data/format/html.lux @@ -2,7 +2,7 @@ [lux #- comment] (lux (data [text] text/format - (coll [list "L/" Functor<List>])))) + (collection [list "L/" 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 c3069c939..392e16c3b 100644 --- a/stdlib/source/lux/data/format/json.lux +++ b/stdlib/source/lux/data/format/json.lux @@ -14,9 +14,9 @@ ["e" error] [sum] [product] - (coll [list "list/" Fold<List> Monad<List>] - [row #+ Row row "row/" Monad<Row>] - ["dict" dictionary #+ Dictionary])) + (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]))) diff --git a/stdlib/source/lux/data/format/xml.lux b/stdlib/source/lux/data/format/xml.lux index dd389c55b..a966b1bfa 100644 --- a/stdlib/source/lux/data/format/xml.lux +++ b/stdlib/source/lux/data/format/xml.lux @@ -12,8 +12,8 @@ [product] [maybe "m/" Monad<Maybe>] [ident "ident/" Equivalence<Ident> Codec<Text,Ident>] - (coll [list "list/" Monad<List>] - ["d" dictionary])))) + (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/number/complex.lux b/stdlib/source/lux/data/number/complex.lux index 91a10fd59..3c92e181d 100644 --- a/stdlib/source/lux/data/number/complex.lux +++ b/stdlib/source/lux/data/number/complex.lux @@ -9,7 +9,7 @@ (data [number "frac/" Number<Frac> "f/" Codec<Text,Frac>] [text "text/" Monoid<Text>] [maybe] - (coll [list "L/" Monad<List>])) + (collection [list "L/" Monad<List>])) [macro] (macro [code] ["s" syntax #+ syntax: Syntax]))) diff --git a/stdlib/source/lux/data/text.lux b/stdlib/source/lux/data/text.lux index d09b713c9..1e1a660d7 100644 --- a/stdlib/source/lux/data/text.lux +++ b/stdlib/source/lux/data/text.lux @@ -6,7 +6,7 @@ [monad #+ do Monad] [codec #+ Codec] hash) - (data (coll [list]) + (data (collection [list]) [maybe]))) ## [Functions] diff --git a/stdlib/source/lux/data/text/buffer.lux b/stdlib/source/lux/data/text/buffer.lux index 423a1ba3c..0641ba215 100644 --- a/stdlib/source/lux/data/text/buffer.lux +++ b/stdlib/source/lux/data/text/buffer.lux @@ -2,7 +2,7 @@ lux (lux (data [product] text/format - (coll [row #+ Row "row/" Fold<Row>])) + (collection [row #+ Row "row/" Fold<Row>])) (lang ["_" host]) (type abstract) [host #+ import:]) diff --git a/stdlib/source/lux/data/text/format.lux b/stdlib/source/lux/data/text/format.lux index 847e4ac4f..26fca323d 100644 --- a/stdlib/source/lux/data/text/format.lux +++ b/stdlib/source/lux/data/text/format.lux @@ -6,7 +6,7 @@ [number] [text] [ident] - (coll [list "list/" Monad<List>]) + (collection [list "list/" Monad<List>]) (format [xml] [json])) (time [instant] diff --git a/stdlib/source/lux/data/text/lexer.lux b/stdlib/source/lux/data/text/lexer.lux index 84495a6a8..9f8bbb664 100644 --- a/stdlib/source/lux/data/text/lexer.lux +++ b/stdlib/source/lux/data/text/lexer.lux @@ -6,7 +6,7 @@ [product] [maybe] ["e" error] - (coll [list])) + (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 cf0d69475..f0e471ef4 100644 --- a/stdlib/source/lux/data/text/regex.lux +++ b/stdlib/source/lux/data/text/regex.lux @@ -9,7 +9,7 @@ [product] ["e" error] [maybe] - (coll [list "list/" Fold<List> Monad<List>])) + (collection [list "list/" Fold<List> Monad<List>])) [macro #+ with-gensyms] (macro [code] ["s" syntax #+ syntax:]))) diff --git a/stdlib/source/lux/data/text/unicode.lux b/stdlib/source/lux/data/text/unicode.lux index e00f23e84..8a88e1184 100644 --- a/stdlib/source/lux/data/text/unicode.lux +++ b/stdlib/source/lux/data/text/unicode.lux @@ -3,8 +3,8 @@ (lux (control [interval #+ Interval] [monoid #+ Monoid]) (data [number #+ hex "nat/" Interval<Nat>] - (coll [list] - (tree [finger #+ Tree]))) + (collection [list] + (tree [finger #+ Tree]))) (type abstract))) (type: #export Char Nat) diff --git a/stdlib/source/lux/host.js.lux b/stdlib/source/lux/host.js.lux index 876ab0c38..a0d1d0c3f 100644 --- a/stdlib/source/lux/host.js.lux +++ b/stdlib/source/lux/host.js.lux @@ -2,7 +2,7 @@ lux (lux (control monad ["p" parser]) - (data (coll [list #* "L/" Fold<List>])) + (data (collection [list #* "L/" Fold<List>])) [macro #+ with-gensyms] (macro [code] ["s" syntax #+ syntax: Syntax]) diff --git a/stdlib/source/lux/host.jvm.lux b/stdlib/source/lux/host.jvm.lux index 108ab2db9..43a78472b 100644 --- a/stdlib/source/lux/host.jvm.lux +++ b/stdlib/source/lux/host.jvm.lux @@ -5,7 +5,7 @@ ["p" parser]) [io #+ IO Monad<IO> io] function - (data (coll [list "list/" Monad<List> Fold<List> Monoid<List>]) + (data (collection [list "list/" Monad<List> Fold<List> Monoid<List>]) number [maybe] [product] diff --git a/stdlib/source/lux/io.lux b/stdlib/source/lux/io.lux index 7579a1463..ca9b80467 100644 --- a/stdlib/source/lux/io.lux +++ b/stdlib/source/lux/io.lux @@ -5,7 +5,7 @@ [monad #+ do Monad] ["ex" exception #+ Exception]) (data ["e" error #+ Error] - (coll [list])))) + (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/lang/compiler/analysis.lux b/stdlib/source/lux/lang/compiler/analysis.lux index c9e9b8be1..87a4cbe4f 100644 --- a/stdlib/source/lux/lang/compiler/analysis.lux +++ b/stdlib/source/lux/lang/compiler/analysis.lux @@ -3,7 +3,7 @@ (lux (data [product] [error] [text "text/" Equivalence<Text>] - (coll [list "list/" Fold<List>])) + (collection [list "list/" Fold<List>])) [function]) [///reference #+ Register Variable Reference] [//]) diff --git a/stdlib/source/lux/lang/compiler/analysis/case.lux b/stdlib/source/lux/lang/compiler/analysis/case.lux index 233ac114a..fc1e83d4a 100644 --- a/stdlib/source/lux/lang/compiler/analysis/case.lux +++ b/stdlib/source/lux/lang/compiler/analysis/case.lux @@ -6,7 +6,7 @@ [error] [maybe] text/format - (coll [list "list/" Fold<List> Monoid<List> Functor<List>])) + (collection [list "list/" Fold<List> Monoid<List> Functor<List>])) [macro] (macro [code])) (//// [type] diff --git a/stdlib/source/lux/lang/compiler/analysis/case/coverage.lux b/stdlib/source/lux/lang/compiler/analysis/case/coverage.lux index c76f98091..70c9fa80f 100644 --- a/stdlib/source/lux/lang/compiler/analysis/case/coverage.lux +++ b/stdlib/source/lux/lang/compiler/analysis/case/coverage.lux @@ -8,8 +8,8 @@ ["e" error "error/" Monad<Error>] [maybe] text/format - (coll [list "list/" Fold<List>] - ["dict" dictionary #+ Dictionary]))) + (collection [list "list/" Fold<List>] + ["dict" dictionary #+ Dictionary]))) [//// "operation/" Monad<Operation>] [/// #+ Pattern Variant Operation]) diff --git a/stdlib/source/lux/lang/compiler/analysis/function.lux b/stdlib/source/lux/lang/compiler/analysis/function.lux index b16b18e59..f8d8b826b 100644 --- a/stdlib/source/lux/lang/compiler/analysis/function.lux +++ b/stdlib/source/lux/lang/compiler/analysis/function.lux @@ -5,7 +5,7 @@ (data [maybe] [text] text/format - (coll [list "list/" Fold<List> Monoid<List> Monad<List>])) + (collection [list "list/" Fold<List> Monoid<List> Monad<List>])) [macro] (macro [code]) (lang [type] diff --git a/stdlib/source/lux/lang/compiler/analysis/inference.lux b/stdlib/source/lux/lang/compiler/analysis/inference.lux index 42ab27a6c..a89ed40f8 100644 --- a/stdlib/source/lux/lang/compiler/analysis/inference.lux +++ b/stdlib/source/lux/lang/compiler/analysis/inference.lux @@ -5,7 +5,7 @@ (data [maybe] [text] text/format - (coll [list "list/" Functor<List>])) + (collection [list "list/" Functor<List>])) [macro]) (//// [type] (type ["tc" check])) diff --git a/stdlib/source/lux/lang/compiler/analysis/structure.lux b/stdlib/source/lux/lang/compiler/analysis/structure.lux index dd832fe47..087ffa8c5 100644 --- a/stdlib/source/lux/lang/compiler/analysis/structure.lux +++ b/stdlib/source/lux/lang/compiler/analysis/structure.lux @@ -6,8 +6,8 @@ [number] [product] [maybe] - (coll [list "list/" Functor<List>] - ["dict" dictionary #+ Dictionary]) + (collection [list "list/" Functor<List>] + ["dict" dictionary #+ Dictionary]) text/format) [macro] (macro [code])) diff --git a/stdlib/source/lux/lang/compiler/default/repl/type.lux b/stdlib/source/lux/lang/compiler/default/repl/type.lux index 2fc2c74b6..b78d1785c 100644 --- a/stdlib/source/lux/lang/compiler/default/repl/type.lux +++ b/stdlib/source/lux/lang/compiler/default/repl/type.lux @@ -8,7 +8,7 @@ text/format (format [xml #+ XML] [json #+ JSON]) - (coll [list])) + (collection [list])) (time [instant #+ Instant] [duration #+ Duration] [date #+ Date]) diff --git a/stdlib/source/lux/lang/compiler/extension.lux b/stdlib/source/lux/lang/compiler/extension.lux index ce01c16ae..e23e9b511 100644 --- a/stdlib/source/lux/lang/compiler/extension.lux +++ b/stdlib/source/lux/lang/compiler/extension.lux @@ -4,7 +4,7 @@ ["ex" exception #+ exception:]) (data [error #+ Error] [text] - (coll ["dict" dictionary #+ Dictionary]))) + (collection ["dict" dictionary #+ Dictionary]))) [// #+ Operation Compiler]) (type: #export (Extension i) diff --git a/stdlib/source/lux/lang/compiler/extension/analysis.lux b/stdlib/source/lux/lang/compiler/extension/analysis.lux index b770e2f7e..9f48c79b4 100644 --- a/stdlib/source/lux/lang/compiler/extension/analysis.lux +++ b/stdlib/source/lux/lang/compiler/extension/analysis.lux @@ -1,8 +1,8 @@ (.module: lux (lux (data [text] - (coll [list "list/" Functor<List>] - ["dict" dictionary #+ Dictionary]))) + (collection [list "list/" Functor<List>] + ["dict" dictionary #+ Dictionary]))) [///analysis #+ Analysis State] [///synthesis #+ Synthesis] [//] diff --git a/stdlib/source/lux/lang/compiler/extension/analysis/common.lux b/stdlib/source/lux/lang/compiler/extension/analysis/common.lux index 1afbc13aa..62a01cee7 100644 --- a/stdlib/source/lux/lang/compiler/extension/analysis/common.lux +++ b/stdlib/source/lux/lang/compiler/extension/analysis/common.lux @@ -6,9 +6,9 @@ (concurrency [atom #+ Atom]) (data [text] text/format - (coll [list "list/" Functor<List>] - [array] - ["dict" dictionary #+ Dictionary])) + (collection [list "list/" Functor<List>] + [array] + ["dict" dictionary #+ Dictionary])) [lang] (lang (type ["tc" check])) [io #+ IO]) diff --git a/stdlib/source/lux/lang/compiler/extension/analysis/host.jvm.lux b/stdlib/source/lux/lang/compiler/extension/analysis/host.jvm.lux index 4316c4a53..265836e66 100644 --- a/stdlib/source/lux/lang/compiler/extension/analysis/host.jvm.lux +++ b/stdlib/source/lux/lang/compiler/extension/analysis/host.jvm.lux @@ -10,9 +10,9 @@ [text "text/" Equivalence<Text>] (text format ["l" lexer]) - (coll [list "list/" Fold<List> Functor<List> Monoid<List>] - [array] - ["dict" dictionary #+ Dictionary])) + (collection [list "list/" Fold<List> Functor<List> Monoid<List>] + [array] + ["dict" dictionary #+ Dictionary])) [macro "macro/" Monad<Meta>] (macro [code] ["s" syntax]) diff --git a/stdlib/source/lux/lang/compiler/extension/bundle.lux b/stdlib/source/lux/lang/compiler/extension/bundle.lux index e4f918ef3..4e011d2ca 100644 --- a/stdlib/source/lux/lang/compiler/extension/bundle.lux +++ b/stdlib/source/lux/lang/compiler/extension/bundle.lux @@ -4,8 +4,8 @@ ["ex" exception #+ exception:]) (data [text] text/format - (coll [list "list/" Functor<List>] - ["dict" dictionary #+ Dictionary]))) + (collection [list "list/" Functor<List>] + ["dict" dictionary #+ Dictionary]))) [//]) (exception: #export (incorrect-arity {name Text} {arity Nat} {args Nat}) diff --git a/stdlib/source/lux/lang/compiler/extension/synthesis.lux b/stdlib/source/lux/lang/compiler/extension/synthesis.lux index d06a2b144..48073d012 100644 --- a/stdlib/source/lux/lang/compiler/extension/synthesis.lux +++ b/stdlib/source/lux/lang/compiler/extension/synthesis.lux @@ -1,7 +1,7 @@ (.module: lux (lux (data [text] - (coll ["dict" dictionary #+ Dictionary]))) + (collection ["dict" dictionary #+ Dictionary]))) [//]) (def: #export defaults diff --git a/stdlib/source/lux/lang/compiler/extension/translation.lux b/stdlib/source/lux/lang/compiler/extension/translation.lux index 367288981..ae05fd61c 100644 --- a/stdlib/source/lux/lang/compiler/extension/translation.lux +++ b/stdlib/source/lux/lang/compiler/extension/translation.lux @@ -1,7 +1,7 @@ (.module: lux (lux (data [text] - (coll ["dict" dictionary #+ Dictionary]))) + (collection ["dict" dictionary #+ Dictionary]))) [//]) (def: #export defaults diff --git a/stdlib/source/lux/lang/compiler/meta/archive.lux b/stdlib/source/lux/lang/compiler/meta/archive.lux index 4a86055e8..53c3baa65 100644 --- a/stdlib/source/lux/lang/compiler/meta/archive.lux +++ b/stdlib/source/lux/lang/compiler/meta/archive.lux @@ -7,7 +7,7 @@ [ident] [text] text/format - (coll ["dict" dictionary #+ Dictionary])) + (collection ["dict" dictionary #+ Dictionary])) (lang [type #+ :share]) (type abstract) (world [file #+ File])) diff --git a/stdlib/source/lux/lang/compiler/meta/cache.lux b/stdlib/source/lux/lang/compiler/meta/cache.lux index 54919feb8..7c6b558db 100644 --- a/stdlib/source/lux/lang/compiler/meta/cache.lux +++ b/stdlib/source/lux/lang/compiler/meta/cache.lux @@ -10,9 +10,9 @@ (format [binary #+ Binary]) [text] text/format - (coll [list "list/" Functor<List> Fold<List>] - ["dict" dictionary #+ Dictionary] - [set #+ Set])) + (collection [list "list/" Functor<List> Fold<List>] + ["dict" dictionary #+ Dictionary] + [set #+ Set])) (world [file #+ File System])) [//io #+ Context Module] [//io/context] diff --git a/stdlib/source/lux/lang/compiler/meta/cache/dependency.lux b/stdlib/source/lux/lang/compiler/meta/cache/dependency.lux index 843644887..f489f04ed 100644 --- a/stdlib/source/lux/lang/compiler/meta/cache/dependency.lux +++ b/stdlib/source/lux/lang/compiler/meta/cache/dependency.lux @@ -1,8 +1,8 @@ (.module: [lux #- Module] (lux (data [text] - (coll [list "list/" Functor<List> Fold<List>] - ["dict" dictionary #+ Dictionary]))) + (collection [list "list/" Functor<List> Fold<List>] + ["dict" dictionary #+ Dictionary]))) [///io #+ Module] [///archive #+ Archive]) diff --git a/stdlib/source/lux/lang/compiler/synthesis.lux b/stdlib/source/lux/lang/compiler/synthesis.lux index 46f376adf..36db1fe5e 100644 --- a/stdlib/source/lux/lang/compiler/synthesis.lux +++ b/stdlib/source/lux/lang/compiler/synthesis.lux @@ -2,7 +2,7 @@ [lux #- i64 Scope] (lux (control [monad #+ do]) (data [error #+ Error] - (coll ["dict" dictionary #+ Dictionary]))) + (collection ["dict" dictionary #+ Dictionary]))) [///reference #+ Register Variable Reference] [// #+ Operation Compiler] [//analysis #+ Environment Arity Analysis]) diff --git a/stdlib/source/lux/lang/compiler/synthesis/case.lux b/stdlib/source/lux/lang/compiler/synthesis/case.lux index bdf06f05f..5fca60a99 100644 --- a/stdlib/source/lux/lang/compiler/synthesis/case.lux +++ b/stdlib/source/lux/lang/compiler/synthesis/case.lux @@ -8,7 +8,7 @@ [text "text/" Equivalence<Text>] text/format [number "frac/" Equivalence<Frac>] - (coll [list "list/" Fold<List> Monoid<List>]))) + (collection [list "list/" Fold<List> Monoid<List>]))) [///reference] [///compiler #+ Operation "operation/" Monad<Operation>] [///analysis #+ Pattern Match Analysis] diff --git a/stdlib/source/lux/lang/compiler/synthesis/expression.lux b/stdlib/source/lux/lang/compiler/synthesis/expression.lux index c9e3c577a..6db9a8fd5 100644 --- a/stdlib/source/lux/lang/compiler/synthesis/expression.lux +++ b/stdlib/source/lux/lang/compiler/synthesis/expression.lux @@ -3,8 +3,8 @@ (lux (control [monad #+ do] ["ex" exception #+ exception:]) (data [maybe] - (coll [list "list/" Functor<List>] - ["dict" dictionary #+ Dictionary]))) + (collection [list "list/" Functor<List>] + ["dict" dictionary #+ Dictionary]))) [///reference] [///compiler "operation/" Monad<Operation>] [///analysis #+ Analysis] diff --git a/stdlib/source/lux/lang/compiler/synthesis/function.lux b/stdlib/source/lux/lang/compiler/synthesis/function.lux index 2d2fffbf8..ae7b5c3b3 100644 --- a/stdlib/source/lux/lang/compiler/synthesis/function.lux +++ b/stdlib/source/lux/lang/compiler/synthesis/function.lux @@ -6,8 +6,8 @@ ["ex" exception #+ exception:]) (data [maybe "maybe/" Monad<Maybe>] [error] - (coll [list "list/" Functor<List> Monoid<List> Fold<List>] - ["dict" dictionary #+ Dictionary]))) + (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/lang/compiler/synthesis/loop.lux b/stdlib/source/lux/lang/compiler/synthesis/loop.lux index eb57eb7ad..e4722ee1f 100644 --- a/stdlib/source/lux/lang/compiler/synthesis/loop.lux +++ b/stdlib/source/lux/lang/compiler/synthesis/loop.lux @@ -3,7 +3,7 @@ (lux (control [monad #+ do] ["p" parser]) (data [maybe "maybe/" Monad<Maybe>] - (coll [list "list/" Functor<List>])) + (collection [list "list/" Functor<List>])) (macro [code] [syntax])) [///] diff --git a/stdlib/source/lux/lang/compiler/translation.lux b/stdlib/source/lux/lang/compiler/translation.lux index 1400cb446..8791c8d5e 100644 --- a/stdlib/source/lux/lang/compiler/translation.lux +++ b/stdlib/source/lux/lang/compiler/translation.lux @@ -6,8 +6,8 @@ [error #+ Error] [text] text/format - (coll [row #+ Row] - ["dict" dictionary #+ Dictionary])) + (collection [row #+ Row] + ["dict" dictionary #+ Dictionary])) (world [file #+ File])) [// #+ Operation Compiler] [//synthesis #+ Synthesis]) diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/case.jvm.lux b/stdlib/source/lux/lang/compiler/translation/scheme/case.jvm.lux index 70da9d5d8..39b5bdae1 100644 --- a/stdlib/source/lux/lang/compiler/translation/scheme/case.jvm.lux +++ b/stdlib/source/lux/lang/compiler/translation/scheme/case.jvm.lux @@ -5,8 +5,8 @@ (data [number] [text] text/format - (coll [list "list/" Functor<List> Fold<List>] - [set #+ Set]))) + (collection [list "list/" Functor<List> Fold<List>] + [set #+ Set]))) (///// [reference #+ Register] (host ["_" scheme #+ Expression Computation Var]) [compiler #+ "operation/" Monad<Operation>] @@ -93,9 +93,9 @@ (def: (pm-catch handler) (-> Expression Computation) (_.lambda [(list $alt_error) #.None] - (_.if (|> $alt_error (_.eqv?/2 pm-error)) - handler - (_.raise/1 $alt_error)))) + (_.if (|> $alt_error (_.eqv?/2 pm-error)) + handler + (_.raise/1 $alt_error)))) (def: (pattern-matching' translate pathP) (-> Translator Path (Operation Expression)) diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/extension.jvm.lux b/stdlib/source/lux/lang/compiler/translation/scheme/extension.jvm.lux index c894053d2..9fa0abc55 100644 --- a/stdlib/source/lux/lang/compiler/translation/scheme/extension.jvm.lux +++ b/stdlib/source/lux/lang/compiler/translation/scheme/extension.jvm.lux @@ -4,7 +4,7 @@ ["ex" exception #+ exception:]) (data [maybe] text/format - (coll ["dict" dictionary #+ Dictionary]))) + (collection ["dict" dictionary #+ Dictionary]))) (///// [reference #+ Register Variable] (host ["_" scheme #+ Computation]) [compiler "operation/" Monad<Operation>] diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/extension/common.jvm.lux b/stdlib/source/lux/lang/compiler/translation/scheme/extension/common.jvm.lux index e79b11c3b..11743b076 100644 --- a/stdlib/source/lux/lang/compiler/translation/scheme/extension/common.jvm.lux +++ b/stdlib/source/lux/lang/compiler/translation/scheme/extension/common.jvm.lux @@ -7,8 +7,8 @@ [text] text/format [number #+ hex] - (coll [list "list/" Functor<List>] - ["dict" dictionary #+ Dictionary])) + (collection [list "list/" Functor<List>] + ["dict" dictionary #+ Dictionary])) [macro #+ with-gensyms] (macro [code] ["s" syntax #+ syntax:]) diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/function.jvm.lux b/stdlib/source/lux/lang/compiler/translation/scheme/function.jvm.lux index 4ec601257..1ac433ec4 100644 --- a/stdlib/source/lux/lang/compiler/translation/scheme/function.jvm.lux +++ b/stdlib/source/lux/lang/compiler/translation/scheme/function.jvm.lux @@ -4,7 +4,7 @@ pipe) (data [product] text/format - (coll [list "list/" Functor<List>]))) + (collection [list "list/" Functor<List>]))) (///// [reference #+ Register Variable] [name] (host ["_" scheme #+ Expression Computation Var]) diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/loop.jvm.lux b/stdlib/source/lux/lang/compiler/translation/scheme/loop.jvm.lux index e9ea1c3e8..f77f7cf10 100644 --- a/stdlib/source/lux/lang/compiler/translation/scheme/loop.jvm.lux +++ b/stdlib/source/lux/lang/compiler/translation/scheme/loop.jvm.lux @@ -4,7 +4,7 @@ (data [product] [text] text/format - (coll [list "list/" Functor<List>])) + (collection [list "list/" Functor<List>])) [macro]) (///// (host ["_" scheme #+ Computation Var]) [compiler] diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/runtime.jvm.lux b/stdlib/source/lux/lang/compiler/translation/scheme/runtime.jvm.lux index 7ba873999..89707cdc4 100644 --- a/stdlib/source/lux/lang/compiler/translation/scheme/runtime.jvm.lux +++ b/stdlib/source/lux/lang/compiler/translation/scheme/runtime.jvm.lux @@ -4,7 +4,7 @@ [monad #+ do]) (data [number #+ hex] text/format - (coll [list "list/" Monad<List>])) + (collection [list "list/" Monad<List>])) [function] (macro [code] ["s" syntax #+ syntax:])) diff --git a/stdlib/source/lux/lang/host/scheme.lux b/stdlib/source/lux/lang/host/scheme.lux index adc8504bb..93d1b2017 100644 --- a/stdlib/source/lux/lang/host/scheme.lux +++ b/stdlib/source/lux/lang/host/scheme.lux @@ -4,7 +4,7 @@ (data [text] text/format [number] - (coll [list "list/" Functor<List> Fold<List>])) + (collection [list "list/" Functor<List> Fold<List>])) (type abstract))) (abstract: Global' {} Any) diff --git a/stdlib/source/lux/lang/module.lux b/stdlib/source/lux/lang/module.lux index b93b5e27b..dbb1cc0ea 100644 --- a/stdlib/source/lux/lang/module.lux +++ b/stdlib/source/lux/lang/module.lux @@ -6,8 +6,8 @@ (data [text "text/" Equivalence<Text>] text/format ["e" error] - (coll [list "list/" Fold<List> Functor<List>] - (dictionary [plist]))) + (collection [list "list/" Fold<List> Functor<List>] + (dictionary [plist]))) [macro]) [//compiler] (//compiler [analysis])) diff --git a/stdlib/source/lux/lang/scope.lux b/stdlib/source/lux/lang/scope.lux index 191eb5e5d..9cb1de1c2 100644 --- a/stdlib/source/lux/lang/scope.lux +++ b/stdlib/source/lux/lang/scope.lux @@ -6,8 +6,8 @@ [maybe "maybe/" Monad<Maybe>] [product] ["e" error] - (coll [list "list/" Functor<List> Fold<List> Monoid<List>] - (dictionary [plist]))) + (collection [list "list/" Functor<List> Fold<List> Monoid<List>] + (dictionary [plist]))) [macro]) [//reference #+ Register Variable]) diff --git a/stdlib/source/lux/lang/syntax.lux b/stdlib/source/lux/lang/syntax.lux index 2822e5e31..b9214ca11 100644 --- a/stdlib/source/lux/lang/syntax.lux +++ b/stdlib/source/lux/lang/syntax.lux @@ -36,8 +36,8 @@ [text] (text ["l" lexer] format) - (coll [row #+ Row] - ["dict" dictionary #+ Dictionary])))) + (collection [row #+ Row] + ["dict" dictionary #+ Dictionary])))) (type: #export Aliases (Dictionary Text Text)) diff --git a/stdlib/source/lux/lang/type.lux b/stdlib/source/lux/lang/type.lux index 8f3c2eb77..b7e04afa4 100644 --- a/stdlib/source/lux/lang/type.lux +++ b/stdlib/source/lux/lang/type.lux @@ -7,7 +7,7 @@ [ident "ident/" Equivalence<Ident> Codec<Text,Ident>] [number "nat/" Codec<Text,Nat>] [maybe] - (coll [list #+ "list/" Functor<List> Monoid<List> Fold<List>])) + (collection [list #+ "list/" Functor<List> Monoid<List> Fold<List>])) [macro] (macro [code] ["s" syntax #+ Syntax syntax:]) diff --git a/stdlib/source/lux/lang/type/check.lux b/stdlib/source/lux/lang/type/check.lux index fa21654b7..84b9f808d 100644 --- a/stdlib/source/lux/lang/type/check.lux +++ b/stdlib/source/lux/lang/type/check.lux @@ -8,8 +8,8 @@ [number "nat/" Codec<Text,Nat>] [maybe] [product] - (coll [list] - [set #+ Set]) + (collection [list] + [set #+ Set]) ["e" error]) (lang [type "type/" Equivalence<Type>]) )) diff --git a/stdlib/source/lux/macro.lux b/stdlib/source/lux/macro.lux index 8aaa567ae..f55eb2392 100644 --- a/stdlib/source/lux/macro.lux +++ b/stdlib/source/lux/macro.lux @@ -9,7 +9,7 @@ [maybe] ["e" error] [text "text/" Monoid<Text> Equivalence<Text>] - (coll [list "list/" Monoid<List> Monad<List>]))) + (collection [list "list/" Monoid<List> Monad<List>]))) (/ [code])) ## (type: (Meta a) diff --git a/stdlib/source/lux/macro/code.lux b/stdlib/source/lux/macro/code.lux index 42f575a57..cb977f36e 100644 --- a/stdlib/source/lux/macro/code.lux +++ b/stdlib/source/lux/macro/code.lux @@ -5,7 +5,7 @@ number [text #+ Equivalence<Text> "text/" Monoid<Text>] ident - (coll [list #* "" Functor<List> Fold<List>]) + (collection [list #* "" Functor<List> Fold<List>]) ))) ## [Types] diff --git a/stdlib/source/lux/macro/poly.lux b/stdlib/source/lux/macro/poly.lux index 429a93bde..05f800653 100644 --- a/stdlib/source/lux/macro/poly.lux +++ b/stdlib/source/lux/macro/poly.lux @@ -6,8 +6,8 @@ ["ex" exception #+ exception:]) [function] (data [text "text/" Monoid<Text>] - (coll [list "list/" Fold<List> Monad<List> Monoid<List>] - ["dict" dictionary #+ Dictionary]) + (collection [list "list/" Fold<List> Monad<List> Monoid<List>] + ["dict" dictionary #+ Dictionary]) [number "nat/" Codec<Text,Nat>] [product] [bool] diff --git a/stdlib/source/lux/macro/poly/equivalence.lux b/stdlib/source/lux/macro/poly/equivalence.lux index f8e178700..a01f70c74 100644 --- a/stdlib/source/lux/macro/poly/equivalence.lux +++ b/stdlib/source/lux/macro/poly/equivalence.lux @@ -5,13 +5,13 @@ ["p" parser]) (data [text "text/" Monoid<Text>] text/format - (coll [list "list/" Monad<List>] - [row] - [array] - [queue] - [set] - ["dict" dictionary #+ Dictionary] - (tree [rose])) + (collection [list "list/" Monad<List>] + [row] + [array] + [queue] + [set] + ["dict" dictionary #+ Dictionary] + (tree [rose])) [number "nat/" Codec<Text,Nat>] [product] [bool] diff --git a/stdlib/source/lux/macro/poly/functor.lux b/stdlib/source/lux/macro/poly/functor.lux index a0e5bb463..c7a000e61 100644 --- a/stdlib/source/lux/macro/poly/functor.lux +++ b/stdlib/source/lux/macro/poly/functor.lux @@ -5,7 +5,7 @@ ["p" parser]) (data [text] text/format - (coll [list "L/" Monad<List> Monoid<List>]) + (collection [list "L/" Monad<List> Monoid<List>]) [product]) [macro] (macro [code] diff --git a/stdlib/source/lux/macro/poly/json.lux b/stdlib/source/lux/macro/poly/json.lux index 8f7a1170e..1414bb38c 100644 --- a/stdlib/source/lux/macro/poly/json.lux +++ b/stdlib/source/lux/macro/poly/json.lux @@ -14,9 +14,9 @@ ["e" error] [sum] [product] - (coll [list "list/" Fold<List> Monad<List>] - [row #+ Row row "row/" Monad<Row>] - ["d" dictionary]) + (collection [list "list/" Fold<List> Monad<List>] + [row #+ Row row "row/" Monad<Row>] + ["d" dictionary]) (format ["//" json #+ JSON])) (time ## ["i" instant] ["du" duration] diff --git a/stdlib/source/lux/macro/syntax.lux b/stdlib/source/lux/macro/syntax.lux index 5739886ea..c333b3d8f 100644 --- a/stdlib/source/lux/macro/syntax.lux +++ b/stdlib/source/lux/macro/syntax.lux @@ -8,7 +8,7 @@ [number] [text "text/" Monoid<Text>] [ident] - (coll [list "list/" Functor<List>]) + (collection [list "list/" Functor<List>]) [maybe] [error #+ Error])) (// [code "code/" Equivalence<Code>])) diff --git a/stdlib/source/lux/macro/syntax/common/reader.lux b/stdlib/source/lux/macro/syntax/common/reader.lux index 0237d579a..0db5f645b 100644 --- a/stdlib/source/lux/macro/syntax/common/reader.lux +++ b/stdlib/source/lux/macro/syntax/common/reader.lux @@ -2,7 +2,7 @@ lux (lux (control monad ["p" parser "p/" Monad<Parser>]) - (data (coll [list]) + (data (collection [list]) [ident "ident/" Equivalence<Ident>] [product] [maybe]) diff --git a/stdlib/source/lux/macro/syntax/common/writer.lux b/stdlib/source/lux/macro/syntax/common/writer.lux index 9c304223e..06edd114a 100644 --- a/stdlib/source/lux/macro/syntax/common/writer.lux +++ b/stdlib/source/lux/macro/syntax/common/writer.lux @@ -1,7 +1,7 @@ (.module: {#.doc "Commons syntax writers."} lux - (lux (data (coll [list "list/" Functor<List>]) + (lux (data (collection [list "list/" Functor<List>]) [product]) (macro [code])) [//]) diff --git a/stdlib/source/lux/math.lux b/stdlib/source/lux/math.lux index 0ca31a34c..66b35f320 100644 --- a/stdlib/source/lux/math.lux +++ b/stdlib/source/lux/math.lux @@ -4,7 +4,7 @@ ["p" parser "p/" Functor<Parser>]) (data [product] [number] - (coll [list "L/" Fold<List>])) + (collection [list "L/" Fold<List>])) [macro] (macro ["s" syntax #+ syntax: Syntax] [code]))) diff --git a/stdlib/source/lux/math/logic/fuzzy.lux b/stdlib/source/lux/math/logic/fuzzy.lux index 9ee9b1685..5b31a6379 100644 --- a/stdlib/source/lux/math/logic/fuzzy.lux +++ b/stdlib/source/lux/math/logic/fuzzy.lux @@ -1,10 +1,7 @@ (.module: lux - (lux (data [number "Rev/" Interval<Rev>] - (coll [list] - [set #+ Set]) - text/format) - [math]) + (lux (data (collection [list] + [set #+ Set]))) (// ["&" continuous])) (type: #export (Fuzzy a) diff --git a/stdlib/source/lux/math/random.lux b/stdlib/source/lux/math/random.lux index 218c9131b..7a1fb7225 100644 --- a/stdlib/source/lux/math/random.lux +++ b/stdlib/source/lux/math/random.lux @@ -12,14 +12,14 @@ [number #+ hex] (number ["r" ratio] ["c" complex]) - (coll [list "list/" Fold<List>] - [array] - ["dict" dictionary #+ Dictionary] - [queue #+ Queue] - [set #+ Set] - [stack #+ Stack] - [row #+ Row] - (tree [finger #+ Tree]))) + (collection [list "list/" Fold<List>] + [array] + ["dict" dictionary #+ Dictionary] + [queue #+ Queue] + [set #+ Set] + [stack #+ Stack] + [row #+ Row] + (tree [finger #+ Tree]))) (type [refinement #+ Refiner Refined]) )) diff --git a/stdlib/source/lux/test.lux b/stdlib/source/lux/test.lux index 33ac37423..bd804cfb0 100644 --- a/stdlib/source/lux/test.lux +++ b/stdlib/source/lux/test.lux @@ -6,12 +6,12 @@ (control [monad #+ do Monad] ["p" parser]) (concurrency [promise #+ Promise]) - (data (coll [list "list/" Monad<List> Fold<List>]) - [product] + (data [product] [maybe] + ["e" error] [text] text/format - ["e" error]) + (collection [list "list/" Monad<List> Fold<List>])) [io #+ IO io] (time [instant] [duration]) diff --git a/stdlib/source/lux/time/date.lux b/stdlib/source/lux/time/date.lux index 38fc89800..fe0cff9b8 100644 --- a/stdlib/source/lux/time/date.lux +++ b/stdlib/source/lux/time/date.lux @@ -11,7 +11,7 @@ [number "int/" Codec<Text,Int>] [text "text/" Monoid<Text>] (text ["l" lexer]) - (coll [row #+ Row row])))) + (collection [row #+ Row row])))) (type: #export Year Int) diff --git a/stdlib/source/lux/time/instant.lux b/stdlib/source/lux/time/instant.lux index 88058868b..1765c524e 100644 --- a/stdlib/source/lux/time/instant.lux +++ b/stdlib/source/lux/time/instant.lux @@ -12,8 +12,8 @@ [number "int/" Codec<Text,Int>] ["e" error] [maybe] - (coll [list "L/" Fold<List> Functor<List>] - [row #+ Row row "row/" Functor<Row> Fold<Row>])) + (collection [list "L/" Fold<List> Functor<List>] + [row #+ Row row "row/" Functor<Row> Fold<Row>])) (type abstract)) (// [duration "duration/" Order<Duration>] [date])) diff --git a/stdlib/source/lux/type/abstract.lux b/stdlib/source/lux/type/abstract.lux index d9aa8a8bb..28c90bbc8 100644 --- a/stdlib/source/lux/type/abstract.lux +++ b/stdlib/source/lux/type/abstract.lux @@ -4,7 +4,7 @@ ["p" parser]) (data [text "text/" Equivalence<Text> Monoid<Text>] [error] - (coll [list "list/" Functor<List> Monoid<List>])) + (collection [list "list/" Functor<List> Monoid<List>])) [macro #+ "meta/" Monad<Meta>] (macro [code] ["s" syntax #+ syntax:] diff --git a/stdlib/source/lux/type/implicit.lux b/stdlib/source/lux/type/implicit.lux index aa0326b93..ea82200df 100644 --- a/stdlib/source/lux/type/implicit.lux +++ b/stdlib/source/lux/type/implicit.lux @@ -6,8 +6,8 @@ (data [text "text/" Equivalence<Text>] text/format [number] - (coll [list "list/" Monad<List> Fold<List>] - ["dict" dictionary #+ Dictionary]) + (collection [list "list/" Monad<List> Fold<List>] + ["dict" dictionary #+ Dictionary]) [bool] [product] [maybe]) diff --git a/stdlib/source/lux/type/object/interface.lux b/stdlib/source/lux/type/object/interface.lux index c2eca52ce..f48ccab0a 100644 --- a/stdlib/source/lux/type/object/interface.lux +++ b/stdlib/source/lux/type/object/interface.lux @@ -7,8 +7,8 @@ [product] [maybe] [ident #+ "ident/" Equivalence<Ident>] - (coll [list "list/" Functor<List> Fold<List> Monoid<List>] - [set #+ Set])) + (collection [list "list/" Functor<List> Fold<List> Monoid<List>] + [set #+ Set])) [macro #+ Monad<Meta> "meta/" Monad<Meta>] (macro [code] ["s" syntax #+ syntax:] diff --git a/stdlib/source/lux/type/object/protocol.lux b/stdlib/source/lux/type/object/protocol.lux index 3499b436a..5407b8f3f 100644 --- a/stdlib/source/lux/type/object/protocol.lux +++ b/stdlib/source/lux/type/object/protocol.lux @@ -3,7 +3,7 @@ (lux (control ["p" parser] [monad #+ do]) (data [sum] - (coll [list "list/" Functor<List>])) + (collection [list "list/" Functor<List>])) [macro "meta/" Monad<Meta>] (macro [code] ["s" syntax #+ syntax:] diff --git a/stdlib/source/lux/type/resource.lux b/stdlib/source/lux/type/resource.lux index cf2650f74..636939a1b 100644 --- a/stdlib/source/lux/type/resource.lux +++ b/stdlib/source/lux/type/resource.lux @@ -9,10 +9,10 @@ [product] [number] text/format - (coll ["dict" dictionary #+ Dictionary] - [set] - [row #+ Row] - [list "list/" Functor<List> Fold<List>])) + (collection ["dict" dictionary #+ Dictionary] + [set] + [row #+ Row] + [list "list/" Functor<List> Fold<List>])) (concurrency [promise #+ Promise]) [macro] (macro ["s" syntax #+ Syntax syntax:]) diff --git a/stdlib/source/lux/world/env.jvm.lux b/stdlib/source/lux/world/env.jvm.lux index 39c5f9472..56d2c9bf8 100644 --- a/stdlib/source/lux/world/env.jvm.lux +++ b/stdlib/source/lux/world/env.jvm.lux @@ -2,7 +2,7 @@ lux (lux (data [text] (format [context #+ Context]) - (coll ["dict" dictionary])) + (collection ["dict" dictionary])) [io #- run] [host])) diff --git a/stdlib/source/lux/world/file.lux b/stdlib/source/lux/world/file.lux index 3e0a6c65e..de93d940a 100644 --- a/stdlib/source/lux/world/file.lux +++ b/stdlib/source/lux/world/file.lux @@ -5,7 +5,7 @@ pipe) (data [error #+ Error] text/format - (coll [array])) + (collection [array])) (time [instant #+ Instant] [duration]) (world [blob #+ Blob]) diff --git a/stdlib/source/lux/world/net/udp.jvm.lux b/stdlib/source/lux/world/net/udp.jvm.lux index a11405132..527d957c6 100644 --- a/stdlib/source/lux/world/net/udp.jvm.lux +++ b/stdlib/source/lux/world/net/udp.jvm.lux @@ -6,7 +6,7 @@ ["T" task]) (data ["e" error] [maybe] - (coll [array])) + (collection [array])) (type abstract) (world [blob #+ Blob]) [io] |