aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--stdlib/source/lux/control/predicate.lux2
-rw-r--r--stdlib/source/lux/data/coll/set/ordered.lux (renamed from stdlib/source/lux/data/coll/ordered/set.lux)0
-rw-r--r--stdlib/source/lux/data/coll/set/unordered.lux (renamed from stdlib/source/lux/data/coll/set.lux)0
-rw-r--r--stdlib/source/lux/lang/type/check.lux2
-rw-r--r--stdlib/source/lux/macro/poly/eq.lux2
-rw-r--r--stdlib/source/lux/math/logic/fuzzy.lux4
-rw-r--r--stdlib/source/lux/math/random.lux2
-rw-r--r--stdlib/source/lux/type/object/interface.lux2
-rw-r--r--stdlib/source/lux/type/resource.lux2
-rw-r--r--stdlib/test/test/lux/control/interval.lux4
-rw-r--r--stdlib/test/test/lux/data/coll/ordered/dict.lux2
-rw-r--r--stdlib/test/test/lux/data/coll/set/ordered.lux (renamed from stdlib/test/test/lux/data/coll/ordered/set.lux)4
-rw-r--r--stdlib/test/test/lux/data/coll/set/unordered.lux (renamed from stdlib/test/test/lux/data/coll/set.lux)2
-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.lux2
-rw-r--r--stdlib/test/tests.lux6
17 files changed, 20 insertions, 20 deletions
diff --git a/stdlib/source/lux/control/predicate.lux b/stdlib/source/lux/control/predicate.lux
index 641a90b28..de9d0dab0 100644
--- a/stdlib/source/lux/control/predicate.lux
+++ b/stdlib/source/lux/control/predicate.lux
@@ -1,6 +1,6 @@
(.module:
lux
- (lux (data (coll [set #+ Set]))))
+ (lux (data (coll (set ["set" unordered #+ Set])))))
(type: #export (Pred a)
(-> a Bool))
diff --git a/stdlib/source/lux/data/coll/ordered/set.lux b/stdlib/source/lux/data/coll/set/ordered.lux
index 5d6ba5478..5d6ba5478 100644
--- a/stdlib/source/lux/data/coll/ordered/set.lux
+++ b/stdlib/source/lux/data/coll/set/ordered.lux
diff --git a/stdlib/source/lux/data/coll/set.lux b/stdlib/source/lux/data/coll/set/unordered.lux
index a09300a7a..a09300a7a 100644
--- a/stdlib/source/lux/data/coll/set.lux
+++ b/stdlib/source/lux/data/coll/set/unordered.lux
diff --git a/stdlib/source/lux/lang/type/check.lux b/stdlib/source/lux/lang/type/check.lux
index 7b7c1e3ee..09af682ca 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])
+ (set ["set" unordered #+ Set]))
["e" error])
(lang [type "type/" Eq<Type>])
))
diff --git a/stdlib/source/lux/macro/poly/eq.lux b/stdlib/source/lux/macro/poly/eq.lux
index c1566b6d3..a5b312a2d 100644
--- a/stdlib/source/lux/macro/poly/eq.lux
+++ b/stdlib/source/lux/macro/poly/eq.lux
@@ -9,7 +9,7 @@
[sequence]
[array]
[queue]
- [set]
+ (set ["set" unordered])
[dict #+ Dict]
(tree [rose]))
[number "nat/" Codec<Text,Nat>]
diff --git a/stdlib/source/lux/math/logic/fuzzy.lux b/stdlib/source/lux/math/logic/fuzzy.lux
index 58e716c55..7933027c9 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 "Deg/" Interval<Deg>]
(coll [list]
- [set])
+ (set ["set" unordered #+ Set]))
text/format)
[math])
(// ["&" continuous]))
@@ -45,7 +45,7 @@
&.~false)))
(def: #export (from-set set)
- (All [a] (-> (set.Set a) (Fuzzy a)))
+ (All [a] (-> (Set a) (Fuzzy a)))
(from-predicate (set.member? set)))
(do-template [<ascending> <descending> <gradient> <type> <lt> <gt> <lte> <gte> <sub> <div> <post>]
diff --git a/stdlib/source/lux/math/random.lux b/stdlib/source/lux/math/random.lux
index f2f4d2e14..7172309d0 100644
--- a/stdlib/source/lux/math/random.lux
+++ b/stdlib/source/lux/math/random.lux
@@ -15,7 +15,7 @@
[array]
[dict #+ Dict]
[queue #+ Queue]
- [set #+ Set]
+ (set ["set" unordered #+ Set])
[stack #+ Stack]
[sequence #+ Sequence]))
))
diff --git a/stdlib/source/lux/type/object/interface.lux b/stdlib/source/lux/type/object/interface.lux
index 9e723548a..a572985ad 100644
--- a/stdlib/source/lux/type/object/interface.lux
+++ b/stdlib/source/lux/type/object/interface.lux
@@ -8,7 +8,7 @@
[maybe]
[ident #+ "ident/" Eq<Ident>]
(coll [list "list/" Functor<List> Fold<List> Monoid<List>]
- [set #+ Set]))
+ (set ["set" unordered #+ Set])))
[macro #+ Monad<Meta> "macro/" Monad<Meta>]
(macro [code]
["s" syntax #+ syntax:]
diff --git a/stdlib/source/lux/type/resource.lux b/stdlib/source/lux/type/resource.lux
index 526dbecc9..ce792af96 100644
--- a/stdlib/source/lux/type/resource.lux
+++ b/stdlib/source/lux/type/resource.lux
@@ -10,7 +10,7 @@
[number]
text/format
(coll [dict #+ Dict]
- [set]
+ (set ["set" unordered])
[sequence #+ Sequence]
[list "list/" Functor<List> Fold<List>]))
(concurrency [promise #+ Promise])
diff --git a/stdlib/test/test/lux/control/interval.lux b/stdlib/test/test/lux/control/interval.lux
index 05566f464..3187c0b7b 100644
--- a/stdlib/test/test/lux/control/interval.lux
+++ b/stdlib/test/test/lux/control/interval.lux
@@ -8,8 +8,8 @@
["r" math/random]
(data text/format
[number]
- ["S" coll/set]
- ["L" coll/list])))
+ (coll ["S" set/unordered]
+ ["L" list]))))
(context: "Equality."
(<| (times +100)
diff --git a/stdlib/test/test/lux/data/coll/ordered/dict.lux b/stdlib/test/test/lux/data/coll/ordered/dict.lux
index 975b26dd2..301e64927 100644
--- a/stdlib/test/test/lux/data/coll/ordered/dict.lux
+++ b/stdlib/test/test/lux/data/coll/ordered/dict.lux
@@ -6,7 +6,7 @@
(data [product]
[number]
(coll (ordered ["&" dict])
- ["s" set]
+ (set ["s" unordered])
["d" dict]
[list "L/" Functor<List>]))
["r" math/random])
diff --git a/stdlib/test/test/lux/data/coll/ordered/set.lux b/stdlib/test/test/lux/data/coll/set/ordered.lux
index 123613972..cb78ad963 100644
--- a/stdlib/test/test/lux/data/coll/ordered/set.lux
+++ b/stdlib/test/test/lux/data/coll/set/ordered.lux
@@ -2,8 +2,8 @@
lux
(lux [io]
(control [monad #+ do Monad])
- (data (coll (ordered ["&" set])
- ["s" set]
+ (data (coll (set ["s" unordered]
+ ["&" ordered])
[list "" Fold<List>])
[number]
text/format)
diff --git a/stdlib/test/test/lux/data/coll/set.lux b/stdlib/test/test/lux/data/coll/set/unordered.lux
index eb43bd0d2..bdb896e8b 100644
--- a/stdlib/test/test/lux/data/coll/set.lux
+++ b/stdlib/test/test/lux/data/coll/set/unordered.lux
@@ -2,7 +2,7 @@
lux
(lux [io]
(control [monad #+ do Monad])
- (data (coll ["&" set]
+ (data (coll (set ["&" unordered #+ Set])
[list "" Fold<List>])
[number])
["r" math/random])
diff --git a/stdlib/test/test/lux/lang/type/check.lux b/stdlib/test/test/lux/lang/type/check.lux
index dd42ceaf4..48a3f35cb 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> Eq<Text>]
text/format
(coll [list "list/" Functor<List>]
- [set]))
+ (set ["set" unordered])))
["r" math/random]
(lang [type "type/" Eq<Type>]
["@" type/check]))
diff --git a/stdlib/test/test/lux/math/logic/fuzzy.lux b/stdlib/test/test/lux/math/logic/fuzzy.lux
index a1c01408c..068e00523 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 ["set" unordered]))
[bool "B/" Eq<Bool>]
[number]
text/format)
diff --git a/stdlib/test/test/lux/math/random.lux b/stdlib/test/test/lux/math/random.lux
index b5e305ff7..eed882ea7 100644
--- a/stdlib/test/test/lux/math/random.lux
+++ b/stdlib/test/test/lux/math/random.lux
@@ -9,7 +9,7 @@
[array]
[queue]
[stack]
- [set]
+ (set ["set" unordered])
[dict]))
(math ["r" random]))
lux/test)
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index 05118f921..9739c63e5 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -46,15 +46,15 @@
["_." dict]
["_." list]
["_." queue]
- ["_." set]
+ ["_." set/unordered]
+ ["_." set/ordered]
["_." stack]
["_." sequence]
["_." priority-queue]
["_." stream]
(tree ["tree_." rose]
["tree_." zipper])
- (ordered ["ordered_." dict]
- ["ordered_." set]))
+ (ordered ["ordered_." dict]))
(text ["_." format]
["_." lexer]
["_." regex]))