- Re-organized dictionary & set modules a bit.

15 files changed, 22 insertions, 22 deletions

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)