aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Julian2018-07-10 20:12:58 -0400
committerEduardo Julian2018-07-10 20:12:58 -0400
commit2f4233ded0dce94c12f52db5fef0769670c78fdd (patch)
tree4dbf3f6edeaad7a90f1d64a4216bab017436de3a
parent18c7510daf68df970ca0400a5c0e0530236cf2bb (diff)
- Re-organized dictionary & set modules a bit.
Diffstat (limited to '')
-rw-r--r--stdlib/source/lux/control/predicate.lux2
-rw-r--r--stdlib/source/lux/data/coll/dictionary.lux (renamed from stdlib/source/lux/data/coll/dictionary/unordered.lux)0
-rw-r--r--stdlib/source/lux/data/coll/set.lux (renamed from stdlib/source/lux/data/coll/set/unordered.lux)2
-rw-r--r--stdlib/source/lux/data/format/context.lux2
-rw-r--r--stdlib/source/lux/data/format/json.lux2
-rw-r--r--stdlib/source/lux/data/format/xml.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/analysis/case/coverage.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/analysis/structure.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/extension.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/extension/analysis.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/extension/analysis/common.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/extension/analysis/host.jvm.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/extension/bundle.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/extension/synthesis.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/extension/translation.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/meta/archive.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/meta/cache.lux4
-rw-r--r--stdlib/source/lux/lang/compiler/meta/cache/dependency.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/synthesis.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/synthesis/expression.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/synthesis/function.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/translation.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/translation/scheme/case.jvm.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/translation/scheme/extension.jvm.lux2
-rw-r--r--stdlib/source/lux/lang/compiler/translation/scheme/extension/common.jvm.lux2
-rw-r--r--stdlib/source/lux/lang/syntax.lux2
-rw-r--r--stdlib/source/lux/lang/type/check.lux2
-rw-r--r--stdlib/source/lux/macro/poly.lux2
-rw-r--r--stdlib/source/lux/macro/poly/equivalence.lux4
-rw-r--r--stdlib/source/lux/macro/poly/json.lux2
-rw-r--r--stdlib/source/lux/math/logic/fuzzy.lux2
-rw-r--r--stdlib/source/lux/math/random.lux4
-rw-r--r--stdlib/source/lux/type/implicit.lux2
-rw-r--r--stdlib/source/lux/type/object/interface.lux2
-rw-r--r--stdlib/source/lux/type/resource.lux4
-rw-r--r--stdlib/source/lux/world/env.jvm.lux2
-rw-r--r--stdlib/test/test/lux/control/interval.lux2
-rw-r--r--stdlib/test/test/lux/data/coll/dictionary.lux (renamed from stdlib/test/test/lux/data/coll/dictionary/unordered.lux)2
-rw-r--r--stdlib/test/test/lux/data/coll/dictionary/ordered.lux6
-rw-r--r--stdlib/test/test/lux/data/coll/set.lux (renamed from stdlib/test/test/lux/data/coll/set/unordered.lux)2
-rw-r--r--stdlib/test/test/lux/data/coll/set/ordered.lux8
-rw-r--r--stdlib/test/test/lux/data/format/json.lux2
-rw-r--r--stdlib/test/test/lux/data/format/xml.lux2
-rw-r--r--stdlib/test/test/lux/lang/compiler/analysis/case.lux2
-rw-r--r--stdlib/test/test/lux/lang/compiler/analysis/procedure/host.jvm.lux2
-rw-r--r--stdlib/test/test/lux/lang/compiler/analysis/structure.lux2
-rw-r--r--stdlib/test/test/lux/lang/compiler/synthesis/function.lux4
-rw-r--r--stdlib/test/test/lux/lang/syntax.lux2
-rw-r--r--stdlib/test/test/lux/lang/type/check.lux2
-rw-r--r--stdlib/test/test/lux/math/logic/fuzzy.lux2
-rw-r--r--stdlib/test/test/lux/math/random.lux4
51 files changed, 61 insertions, 61 deletions
diff --git a/stdlib/source/lux/control/predicate.lux b/stdlib/source/lux/control/predicate.lux
index 56c048593..d7abc4139 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" unordered #+ Set])))
+ (data (coll [set #+ Set]))
[function]))
(type: #export (Predicate a)
diff --git a/stdlib/source/lux/data/coll/dictionary/unordered.lux b/stdlib/source/lux/data/coll/dictionary.lux
index e971228bb..e971228bb 100644
--- a/stdlib/source/lux/data/coll/dictionary/unordered.lux
+++ b/stdlib/source/lux/data/coll/dictionary.lux
diff --git a/stdlib/source/lux/data/coll/set/unordered.lux b/stdlib/source/lux/data/coll/set.lux
index ba5b1e8eb..929040ad0 100644
--- a/stdlib/source/lux/data/coll/set/unordered.lux
+++ b/stdlib/source/lux/data/coll/set.lux
@@ -2,7 +2,7 @@
lux
(lux (control [equivalence #+ Equivalence]
[hash #+ Hash])
- (data (coll (dictionary ["dict" unordered #+ Dictionary])
+ (data (coll ["dict" dictionary #+ Dictionary]
[list "list/" Fold<List>]))
(type abstract)))
diff --git a/stdlib/source/lux/data/format/context.lux b/stdlib/source/lux/data/format/context.lux
index 0eee7a061..f9874f6d2 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 (dictionary ["dict" unordered #+ Dictionary])))))
+ (coll ["dict" dictionary #+ Dictionary]))))
(exception: #export (unknown-property {property Text})
property)
diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/lux/data/format/json.lux
index af6348fef..c3069c939 100644
--- a/stdlib/source/lux/data/format/json.lux
+++ b/stdlib/source/lux/data/format/json.lux
@@ -16,7 +16,7 @@
[product]
(coll [list "list/" Fold<List> Monad<List>]
[row #+ Row row "row/" Monad<Row>]
- (dictionary ["dict" unordered #+ Dictionary])))
+ ["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 2edae8971..dd389c55b 100644
--- a/stdlib/source/lux/data/format/xml.lux
+++ b/stdlib/source/lux/data/format/xml.lux
@@ -13,7 +13,7 @@
[maybe "m/" Monad<Maybe>]
[ident "ident/" Equivalence<Ident> Codec<Text,Ident>]
(coll [list "list/" Monad<List>]
- (dictionary ["d" unordered])))))
+ ["d" dictionary]))))
(type: #export Tag Ident)
(type: #export Attrs (d.Dictionary Ident Text))
diff --git a/stdlib/source/lux/lang/compiler/analysis/case/coverage.lux b/stdlib/source/lux/lang/compiler/analysis/case/coverage.lux
index 20000a8e0..c76f98091 100644
--- a/stdlib/source/lux/lang/compiler/analysis/case/coverage.lux
+++ b/stdlib/source/lux/lang/compiler/analysis/case/coverage.lux
@@ -9,7 +9,7 @@
[maybe]
text/format
(coll [list "list/" Fold<List>]
- (dictionary ["dict" unordered #+ Dictionary]))))
+ ["dict" dictionary #+ Dictionary])))
[//// "operation/" Monad<Operation>]
[/// #+ Pattern Variant Operation])
diff --git a/stdlib/source/lux/lang/compiler/analysis/structure.lux b/stdlib/source/lux/lang/compiler/analysis/structure.lux
index 7307d6472..dd832fe47 100644
--- a/stdlib/source/lux/lang/compiler/analysis/structure.lux
+++ b/stdlib/source/lux/lang/compiler/analysis/structure.lux
@@ -7,7 +7,7 @@
[product]
[maybe]
(coll [list "list/" Functor<List>]
- (dictionary ["dict" unordered #+ Dictionary]))
+ ["dict" dictionary #+ Dictionary])
text/format)
[macro]
(macro [code]))
diff --git a/stdlib/source/lux/lang/compiler/extension.lux b/stdlib/source/lux/lang/compiler/extension.lux
index 19f993163..ce01c16ae 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 (dictionary ["dict" unordered #+ Dictionary]))))
+ (coll ["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 9a28ff39f..b770e2f7e 100644
--- a/stdlib/source/lux/lang/compiler/extension/analysis.lux
+++ b/stdlib/source/lux/lang/compiler/extension/analysis.lux
@@ -2,7 +2,7 @@
lux
(lux (data [text]
(coll [list "list/" Functor<List>]
- (dictionary ["dict" unordered #+ Dictionary]))))
+ ["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 71df4c678..1afbc13aa 100644
--- a/stdlib/source/lux/lang/compiler/extension/analysis/common.lux
+++ b/stdlib/source/lux/lang/compiler/extension/analysis/common.lux
@@ -8,7 +8,7 @@
text/format
(coll [list "list/" Functor<List>]
[array]
- (dictionary ["dict" unordered #+ Dictionary])))
+ ["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 ead713305..4316c4a53 100644
--- a/stdlib/source/lux/lang/compiler/extension/analysis/host.jvm.lux
+++ b/stdlib/source/lux/lang/compiler/extension/analysis/host.jvm.lux
@@ -12,7 +12,7 @@
["l" lexer])
(coll [list "list/" Fold<List> Functor<List> Monoid<List>]
[array]
- (dictionary ["dict" unordered #+ Dictionary])))
+ ["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 e68c391c6..e4f918ef3 100644
--- a/stdlib/source/lux/lang/compiler/extension/bundle.lux
+++ b/stdlib/source/lux/lang/compiler/extension/bundle.lux
@@ -5,7 +5,7 @@
(data [text]
text/format
(coll [list "list/" Functor<List>]
- (dictionary ["dict" unordered #+ Dictionary]))))
+ ["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 ca20b0738..d06a2b144 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 (dictionary ["dict" unordered #+ Dictionary]))))
+ (coll ["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 2063d5fb2..367288981 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 (dictionary ["dict" unordered #+ Dictionary]))))
+ (coll ["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 09dfa211a..4a86055e8 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 (dictionary ["dict" unordered #+ Dictionary])))
+ (coll ["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 dc5dda4a8..54919feb8 100644
--- a/stdlib/source/lux/lang/compiler/meta/cache.lux
+++ b/stdlib/source/lux/lang/compiler/meta/cache.lux
@@ -11,8 +11,8 @@
[text]
text/format
(coll [list "list/" Functor<List> Fold<List>]
- (dictionary ["dict" unordered #+ Dictionary])
- (set ["set" unordered #+ Set])))
+ ["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 e6d94dc65..843644887 100644
--- a/stdlib/source/lux/lang/compiler/meta/cache/dependency.lux
+++ b/stdlib/source/lux/lang/compiler/meta/cache/dependency.lux
@@ -2,7 +2,7 @@
[lux #- Module]
(lux (data [text]
(coll [list "list/" Functor<List> Fold<List>]
- (dictionary ["dict" unordered #+ Dictionary]))))
+ ["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 bd23523e3..46f376adf 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 (dictionary ["dict" unordered #+ Dictionary]))))
+ (coll ["dict" dictionary #+ Dictionary])))
[///reference #+ Register Variable Reference]
[// #+ Operation Compiler]
[//analysis #+ Environment Arity Analysis])
diff --git a/stdlib/source/lux/lang/compiler/synthesis/expression.lux b/stdlib/source/lux/lang/compiler/synthesis/expression.lux
index 81cc89b08..c9e3c577a 100644
--- a/stdlib/source/lux/lang/compiler/synthesis/expression.lux
+++ b/stdlib/source/lux/lang/compiler/synthesis/expression.lux
@@ -4,7 +4,7 @@
["ex" exception #+ exception:])
(data [maybe]
(coll [list "list/" Functor<List>]
- (dictionary ["dict" unordered #+ Dictionary]))))
+ ["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 5d31a947b..2d2fffbf8 100644
--- a/stdlib/source/lux/lang/compiler/synthesis/function.lux
+++ b/stdlib/source/lux/lang/compiler/synthesis/function.lux
@@ -7,7 +7,7 @@
(data [maybe "maybe/" Monad<Maybe>]
[error]
(coll [list "list/" Functor<List> Monoid<List> Fold<List>]
- (dictionary ["dict" unordered #+ Dictionary]))))
+ ["dict" dictionary #+ Dictionary])))
[///reference #+ Variable]
[///compiler #+ Operation]
[///analysis #+ Environment Arity Analysis]
diff --git a/stdlib/source/lux/lang/compiler/translation.lux b/stdlib/source/lux/lang/compiler/translation.lux
index 80c606f30..1400cb446 100644
--- a/stdlib/source/lux/lang/compiler/translation.lux
+++ b/stdlib/source/lux/lang/compiler/translation.lux
@@ -7,7 +7,7 @@
[text]
text/format
(coll [row #+ Row]
- (dictionary ["dict" unordered #+ Dictionary])))
+ ["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 0ee52c54b..70da9d5d8 100644
--- a/stdlib/source/lux/lang/compiler/translation/scheme/case.jvm.lux
+++ b/stdlib/source/lux/lang/compiler/translation/scheme/case.jvm.lux
@@ -6,7 +6,7 @@
[text]
text/format
(coll [list "list/" Functor<List> Fold<List>]
- (set ["set" unordered #+ Set]))))
+ [set #+ Set])))
(///// [reference #+ Register]
(host ["_" scheme #+ Expression Computation Var])
[compiler #+ "operation/" Monad<Operation>]
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 7170d29b7..c894053d2 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 (dictionary ["dict" unordered #+ Dictionary]))))
+ (coll ["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 044b75cac..e79b11c3b 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
@@ -8,7 +8,7 @@
text/format
[number #+ hex]
(coll [list "list/" Functor<List>]
- (dictionary ["dict" unordered #+ Dictionary])))
+ ["dict" dictionary #+ Dictionary]))
[macro #+ with-gensyms]
(macro [code]
["s" syntax #+ syntax:])
diff --git a/stdlib/source/lux/lang/syntax.lux b/stdlib/source/lux/lang/syntax.lux
index 6211edf8a..2822e5e31 100644
--- a/stdlib/source/lux/lang/syntax.lux
+++ b/stdlib/source/lux/lang/syntax.lux
@@ -37,7 +37,7 @@
(text ["l" lexer]
format)
(coll [row #+ Row]
- (dictionary ["dict" unordered #+ Dictionary])))))
+ ["dict" dictionary #+ Dictionary]))))
(type: #export Aliases (Dictionary Text Text))
diff --git a/stdlib/source/lux/lang/type/check.lux b/stdlib/source/lux/lang/type/check.lux
index ab1b6be1d..fa21654b7 100644
--- a/stdlib/source/lux/lang/type/check.lux
+++ b/stdlib/source/lux/lang/type/check.lux
@@ -9,7 +9,7 @@
[maybe]
[product]
(coll [list]
- (set ["set" unordered #+ Set]))
+ [set #+ Set])
["e" error])
(lang [type "type/" Equivalence<Type>])
))
diff --git a/stdlib/source/lux/macro/poly.lux b/stdlib/source/lux/macro/poly.lux
index 0ed67fdf1..429a93bde 100644
--- a/stdlib/source/lux/macro/poly.lux
+++ b/stdlib/source/lux/macro/poly.lux
@@ -7,7 +7,7 @@
[function]
(data [text "text/" Monoid<Text>]
(coll [list "list/" Fold<List> Monad<List> Monoid<List>]
- (dictionary ["dict" unordered #+ Dictionary]))
+ ["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 44fd60ed5..f8e178700 100644
--- a/stdlib/source/lux/macro/poly/equivalence.lux
+++ b/stdlib/source/lux/macro/poly/equivalence.lux
@@ -9,8 +9,8 @@
[row]
[array]
[queue]
- (set ["set" unordered])
- (dictionary ["dict" unordered #+ Dictionary])
+ [set]
+ ["dict" dictionary #+ Dictionary]
(tree [rose]))
[number "nat/" Codec<Text,Nat>]
[product]
diff --git a/stdlib/source/lux/macro/poly/json.lux b/stdlib/source/lux/macro/poly/json.lux
index 1c198c1fe..8f7a1170e 100644
--- a/stdlib/source/lux/macro/poly/json.lux
+++ b/stdlib/source/lux/macro/poly/json.lux
@@ -16,7 +16,7 @@
[product]
(coll [list "list/" Fold<List> Monad<List>]
[row #+ Row row "row/" Monad<Row>]
- (dictionary ["d" unordered]))
+ ["d" dictionary])
(format ["//" json #+ JSON]))
(time ## ["i" instant]
["du" duration]
diff --git a/stdlib/source/lux/math/logic/fuzzy.lux b/stdlib/source/lux/math/logic/fuzzy.lux
index 57f5978f3..9ee9b1685 100644
--- a/stdlib/source/lux/math/logic/fuzzy.lux
+++ b/stdlib/source/lux/math/logic/fuzzy.lux
@@ -2,7 +2,7 @@
lux
(lux (data [number "Rev/" Interval<Rev>]
(coll [list]
- (set ["set" unordered #+ Set]))
+ [set #+ Set])
text/format)
[math])
(// ["&" continuous]))
diff --git a/stdlib/source/lux/math/random.lux b/stdlib/source/lux/math/random.lux
index 887e53a9f..218c9131b 100644
--- a/stdlib/source/lux/math/random.lux
+++ b/stdlib/source/lux/math/random.lux
@@ -14,9 +14,9 @@
["c" complex])
(coll [list "list/" Fold<List>]
[array]
- (dictionary ["dict" unordered #+ Dictionary])
+ ["dict" dictionary #+ Dictionary]
[queue #+ Queue]
- (set ["set" unordered #+ Set])
+ [set #+ Set]
[stack #+ Stack]
[row #+ Row]
(tree [finger #+ Tree])))
diff --git a/stdlib/source/lux/type/implicit.lux b/stdlib/source/lux/type/implicit.lux
index 85ebe33c3..aa0326b93 100644
--- a/stdlib/source/lux/type/implicit.lux
+++ b/stdlib/source/lux/type/implicit.lux
@@ -7,7 +7,7 @@
text/format
[number]
(coll [list "list/" Monad<List> Fold<List>]
- (dictionary ["dict" unordered #+ Dictionary]))
+ ["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 e16a89f44..c2eca52ce 100644
--- a/stdlib/source/lux/type/object/interface.lux
+++ b/stdlib/source/lux/type/object/interface.lux
@@ -8,7 +8,7 @@
[maybe]
[ident #+ "ident/" Equivalence<Ident>]
(coll [list "list/" Functor<List> Fold<List> Monoid<List>]
- (set ["set" unordered #+ Set])))
+ [set #+ Set]))
[macro #+ Monad<Meta> "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 60eeef73b..cf2650f74 100644
--- a/stdlib/source/lux/type/resource.lux
+++ b/stdlib/source/lux/type/resource.lux
@@ -9,8 +9,8 @@
[product]
[number]
text/format
- (coll (dictionary ["dict" unordered #+ Dictionary])
- (set ["set" unordered])
+ (coll ["dict" dictionary #+ Dictionary]
+ [set]
[row #+ Row]
[list "list/" Functor<List> Fold<List>]))
(concurrency [promise #+ Promise])
diff --git a/stdlib/source/lux/world/env.jvm.lux b/stdlib/source/lux/world/env.jvm.lux
index e2511416e..39c5f9472 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 (dictionary ["dict" unordered])))
+ (coll ["dict" dictionary]))
[io #- run]
[host]))
diff --git a/stdlib/test/test/lux/control/interval.lux b/stdlib/test/test/lux/control/interval.lux
index 06fe5cbde..6b6e96789 100644
--- a/stdlib/test/test/lux/control/interval.lux
+++ b/stdlib/test/test/lux/control/interval.lux
@@ -8,7 +8,7 @@
["r" math/random]
(data text/format
[number]
- (coll ["S" set/unordered]
+ (coll ["S" set]
["L" list]))))
(context: "Equivalence."
diff --git a/stdlib/test/test/lux/data/coll/dictionary/unordered.lux b/stdlib/test/test/lux/data/coll/dictionary.lux
index 3476898b6..9c652ee7a 100644
--- a/stdlib/test/test/lux/data/coll/dictionary/unordered.lux
+++ b/stdlib/test/test/lux/data/coll/dictionary.lux
@@ -7,7 +7,7 @@
text/format
[number]
[maybe]
- (coll (dictionary ["&" unordered])
+ (coll ["&" dictionary]
[list "list/" Fold<List> Functor<List>]))
["r" math/random])
lux/test)
diff --git a/stdlib/test/test/lux/data/coll/dictionary/ordered.lux b/stdlib/test/test/lux/data/coll/dictionary/ordered.lux
index bfcd4b569..548fd7f83 100644
--- a/stdlib/test/test/lux/data/coll/dictionary/ordered.lux
+++ b/stdlib/test/test/lux/data/coll/dictionary/ordered.lux
@@ -5,9 +5,9 @@
[equivalence #+ Equivalence])
(data [product]
[number]
- (coll (set ["s" unordered])
- (dictionary ["dict" unordered]
- ["&" ordered])
+ (coll ["s" set]
+ ["dict" dictionary]
+ (dictionary ["&" ordered])
[list "L/" Functor<List>]))
["r" math/random])
lux/test)
diff --git a/stdlib/test/test/lux/data/coll/set/unordered.lux b/stdlib/test/test/lux/data/coll/set.lux
index f17867665..6b341ee3a 100644
--- a/stdlib/test/test/lux/data/coll/set/unordered.lux
+++ b/stdlib/test/test/lux/data/coll/set.lux
@@ -2,7 +2,7 @@
lux
(lux [io]
(control [monad #+ do Monad])
- (data (coll (set ["&" unordered #+ Set])
+ (data (coll ["&" set #+ Set]
[list "" Fold<List>])
[number])
["r" math/random])
diff --git a/stdlib/test/test/lux/data/coll/set/ordered.lux b/stdlib/test/test/lux/data/coll/set/ordered.lux
index fd4fb5579..6833bf4a6 100644
--- a/stdlib/test/test/lux/data/coll/set/ordered.lux
+++ b/stdlib/test/test/lux/data/coll/set/ordered.lux
@@ -2,8 +2,8 @@
lux
(lux [io]
(control [monad #+ do Monad])
- (data (coll (set ["s" unordered]
- ["&" ordered])
+ (data (coll [set]
+ (set ["&" ordered])
[list "" Fold<List>])
[number]
text/format)
@@ -20,8 +20,8 @@
(do @
[sizeL gen-nat
sizeR gen-nat
- listL (|> (r.set number.Hash<Nat> sizeL gen-nat) (:: @ map s.to-list))
- listR (|> (r.set number.Hash<Nat> sizeR gen-nat) (:: @ map s.to-list))
+ listL (|> (r.set number.Hash<Nat> sizeL gen-nat) (:: @ map set.to-list))
+ listR (|> (r.set number.Hash<Nat> sizeR gen-nat) (:: @ map set.to-list))
#let [(^open "&/") &.Equivalence<Set>
setL (&.from-list number.Order<Nat> listL)
setR (&.from-list number.Order<Nat> listR)
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux
index 27e9850e0..02a82bc63 100644
--- a/stdlib/test/test/lux/data/format/json.lux
+++ b/stdlib/test/test/lux/data/format/json.lux
@@ -14,7 +14,7 @@
[number]
(format ["@" json])
(coll [row #+ row]
- (dictionary ["d" unordered])
+ ["d" dictionary]
[list]))
[macro #+ with-gensyms]
(macro [code]
diff --git a/stdlib/test/test/lux/data/format/xml.lux b/stdlib/test/test/lux/data/format/xml.lux
index acdd2aec8..dd82c2e14 100644
--- a/stdlib/test/test/lux/data/format/xml.lux
+++ b/stdlib/test/test/lux/data/format/xml.lux
@@ -10,7 +10,7 @@
["E" error]
[maybe]
(format ["&" xml])
- (coll (dictionary ["dict" unordered])
+ (coll ["dict" dictionary]
[list "list/" Functor<List>]))
["r" math/random "r/" Monad<Random>]
test)
diff --git a/stdlib/test/test/lux/lang/compiler/analysis/case.lux b/stdlib/test/test/lux/lang/compiler/analysis/case.lux
index 21fa2b9f9..2088a775b 100644
--- a/stdlib/test/test/lux/lang/compiler/analysis/case.lux
+++ b/stdlib/test/test/lux/lang/compiler/analysis/case.lux
@@ -10,7 +10,7 @@
[text "T/" Equivalence<Text>]
text/format
(coll [list "list/" Monad<List>]
- (set ["set" unordered])))
+ [set]))
["r" math/random "r/" Monad<Random>]
[macro #+ Monad<Meta>]
(macro [code])
diff --git a/stdlib/test/test/lux/lang/compiler/analysis/procedure/host.jvm.lux b/stdlib/test/test/lux/lang/compiler/analysis/procedure/host.jvm.lux
index af4741918..7aa527c93 100644
--- a/stdlib/test/test/lux/lang/compiler/analysis/procedure/host.jvm.lux
+++ b/stdlib/test/test/lux/lang/compiler/analysis/procedure/host.jvm.lux
@@ -11,7 +11,7 @@
text/format
(coll [array]
[list "list/" Fold<List>]
- (dictionary ["dict" unordered])))
+ ["dict" dictionary]))
["r" math/random "r/" Monad<Random>]
[macro #+ Monad<Meta>]
(macro [code])
diff --git a/stdlib/test/test/lux/lang/compiler/analysis/structure.lux b/stdlib/test/test/lux/lang/compiler/analysis/structure.lux
index d9d029d31..0fc97dfbe 100644
--- a/stdlib/test/test/lux/lang/compiler/analysis/structure.lux
+++ b/stdlib/test/test/lux/lang/compiler/analysis/structure.lux
@@ -10,7 +10,7 @@
[text]
text/format
(coll [list "list/" Functor<List>]
- (set ["set" unordered])))
+ [set]))
["r" math/random "r/" Monad<Random>]
[macro]
(macro [code])
diff --git a/stdlib/test/test/lux/lang/compiler/synthesis/function.lux b/stdlib/test/test/lux/lang/compiler/synthesis/function.lux
index ba7d015e2..44df282b9 100644
--- a/stdlib/test/test/lux/lang/compiler/synthesis/function.lux
+++ b/stdlib/test/test/lux/lang/compiler/synthesis/function.lux
@@ -9,8 +9,8 @@
[number]
text/format
(coll [list "list/" Functor<List> Fold<List>]
- (dictionary ["dict" unordered #+ Dictionary])
- (set ["set" unordered])))
+ ["dict" dictionary #+ Dictionary]
+ [set]))
(lang ["///." reference #+ Variable "variable/" Equivalence<Variable>]
["///." compiler]
[".L" analysis #+ Arity Analysis]
diff --git a/stdlib/test/test/lux/lang/syntax.lux b/stdlib/test/test/lux/lang/syntax.lux
index d9a16b2c3..f3066368e 100644
--- a/stdlib/test/test/lux/lang/syntax.lux
+++ b/stdlib/test/test/lux/lang/syntax.lux
@@ -8,7 +8,7 @@
(text format
["l" lexer])
(coll [list]
- (dictionary ["dict" unordered #+ Dictionary])))
+ ["dict" dictionary #+ Dictionary]))
["r" math/random "r/" Monad<Random>]
(macro [code])
(lang ["&" syntax])
diff --git a/stdlib/test/test/lux/lang/type/check.lux b/stdlib/test/test/lux/lang/type/check.lux
index 2ffee1318..7a65782de 100644
--- a/stdlib/test/test/lux/lang/type/check.lux
+++ b/stdlib/test/test/lux/lang/type/check.lux
@@ -9,7 +9,7 @@
[text "text/" Monoid<Text> Equivalence<Text>]
text/format
(coll [list "list/" Functor<List>]
- (set ["set" unordered])))
+ [set]))
["r" math/random]
(lang [type "type/" Equivalence<Type>]
["@" type/check]))
diff --git a/stdlib/test/test/lux/math/logic/fuzzy.lux b/stdlib/test/test/lux/math/logic/fuzzy.lux
index 3fa7c66cc..d4a8ced61 100644
--- a/stdlib/test/test/lux/math/logic/fuzzy.lux
+++ b/stdlib/test/test/lux/math/logic/fuzzy.lux
@@ -3,7 +3,7 @@
(lux [io]
(control [monad #+ do Monad])
(data (coll [list]
- (set ["set" unordered]))
+ [set])
[bool "B/" Equivalence<Bool>]
[number]
text/format)
diff --git a/stdlib/test/test/lux/math/random.lux b/stdlib/test/test/lux/math/random.lux
index 46d9edef4..1e85636d5 100644
--- a/stdlib/test/test/lux/math/random.lux
+++ b/stdlib/test/test/lux/math/random.lux
@@ -9,8 +9,8 @@
[array]
[queue]
[stack]
- (set ["set" unordered])
- (dictionary ["dict" unordered])))
+ [set]
+ ["dict" dictionary]))
(math ["r" random]))
lux/test)