aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--stdlib/source/lux/data/coll/dictionary/ordered.lux (renamed from stdlib/source/lux/data/coll/dict/ordered.lux)0
-rw-r--r--stdlib/source/lux/data/coll/dictionary/unordered.lux (renamed from stdlib/source/lux/data/coll/dict/unordered.lux)0
-rw-r--r--stdlib/source/lux/data/coll/set/ordered.lux2
-rw-r--r--stdlib/source/lux/data/coll/set/unordered.lux2
-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/syntax.lux2
-rw-r--r--stdlib/source/lux/macro/poly.lux2
-rw-r--r--stdlib/source/lux/macro/poly/eq.lux2
-rw-r--r--stdlib/source/lux/macro/poly/json.lux2
-rw-r--r--stdlib/source/lux/math/random.lux2
-rw-r--r--stdlib/source/lux/type/implicit.lux2
-rw-r--r--stdlib/source/lux/type/resource.lux2
-rw-r--r--stdlib/source/lux/world/env.jvm.lux2
-rw-r--r--stdlib/test/test/lux/data/coll/dictionary/ordered.lux (renamed from stdlib/test/test/lux/data/coll/dict/ordered.lux)4
-rw-r--r--stdlib/test/test/lux/data/coll/dictionary/unordered.lux (renamed from stdlib/test/test/lux/data/coll/dict/unordered.lux)2
-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/syntax.lux2
-rw-r--r--stdlib/test/test/lux/math/random.lux2
-rw-r--r--stdlib/test/tests.lux4
22 files changed, 22 insertions, 22 deletions
diff --git a/stdlib/source/lux/data/coll/dict/ordered.lux b/stdlib/source/lux/data/coll/dictionary/ordered.lux
index a099087f3..a099087f3 100644
--- a/stdlib/source/lux/data/coll/dict/ordered.lux
+++ b/stdlib/source/lux/data/coll/dictionary/ordered.lux
diff --git a/stdlib/source/lux/data/coll/dict/unordered.lux b/stdlib/source/lux/data/coll/dictionary/unordered.lux
index 97a119755..97a119755 100644
--- a/stdlib/source/lux/data/coll/dict/unordered.lux
+++ b/stdlib/source/lux/data/coll/dictionary/unordered.lux
diff --git a/stdlib/source/lux/data/coll/set/ordered.lux b/stdlib/source/lux/data/coll/set/ordered.lux
index 9ae151762..2e2ca56fc 100644
--- a/stdlib/source/lux/data/coll/set/ordered.lux
+++ b/stdlib/source/lux/data/coll/set/ordered.lux
@@ -4,7 +4,7 @@
eq
[order #+ Order])
(data (coll [list "L/" Monad<List> Monoid<List> Fold<List>]
- (dict ["d" ordered]))
+ (dictionary ["d" ordered]))
["p" product]
["M" maybe #+ Functor<Maybe>])
[macro]
diff --git a/stdlib/source/lux/data/coll/set/unordered.lux b/stdlib/source/lux/data/coll/set/unordered.lux
index 797ac7849..199a076c8 100644
--- a/stdlib/source/lux/data/coll/set/unordered.lux
+++ b/stdlib/source/lux/data/coll/set/unordered.lux
@@ -2,7 +2,7 @@
lux
(lux (control [eq #+ Eq]
[hash #*])
- (data (coll (dict ["dict" unordered #+ Dict])
+ (data (coll (dictionary ["dict" unordered #+ Dict])
[list "list/" Fold<List> Functor<List>]))))
## [Types]
diff --git a/stdlib/source/lux/data/format/context.lux b/stdlib/source/lux/data/format/context.lux
index c6ffbed82..1810a66a2 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 ["dict" unordered #+ Dict])))))
+ (coll (dictionary ["dict" unordered #+ Dict])))))
(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 8ce54e9f2..7dfb7be5e 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>]
[sequence #+ Sequence sequence "sequence/" Monad<Sequence>]
- (dict ["dict" unordered #+ Dict])))
+ (dictionary ["dict" unordered #+ Dict])))
[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 d3f3d6110..06b4b3994 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/" Eq<Ident> Codec<Text,Ident>]
(coll [list "list/" Monad<List>]
- (dict ["d" unordered])))))
+ (dictionary ["d" unordered])))))
(type: #export Tag Ident)
(type: #export Attrs (d.Dict Ident Text))
diff --git a/stdlib/source/lux/lang/syntax.lux b/stdlib/source/lux/lang/syntax.lux
index 1a9b5e84c..1296cfaa5 100644
--- a/stdlib/source/lux/lang/syntax.lux
+++ b/stdlib/source/lux/lang/syntax.lux
@@ -38,7 +38,7 @@
(text ["l" lexer]
format)
(coll [sequence #+ Sequence]
- (dict ["dict" unordered #+ Dict])))))
+ (dictionary ["dict" unordered #+ Dict])))))
(type: #export Aliases (Dict Text Text))
diff --git a/stdlib/source/lux/macro/poly.lux b/stdlib/source/lux/macro/poly.lux
index f7914f189..763596473 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>]
- (dict ["dict" unordered #+ Dict]))
+ (dictionary ["dict" unordered #+ Dict]))
[number "nat/" Codec<Text,Nat>]
[product]
[bool]
diff --git a/stdlib/source/lux/macro/poly/eq.lux b/stdlib/source/lux/macro/poly/eq.lux
index d3a06fd30..7990bd3c4 100644
--- a/stdlib/source/lux/macro/poly/eq.lux
+++ b/stdlib/source/lux/macro/poly/eq.lux
@@ -10,7 +10,7 @@
[array]
[queue]
(set ["set" unordered])
- (dict ["dict" unordered #+ Dict])
+ (dictionary ["dict" unordered #+ Dict])
(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 8abfeb65e..38bf86866 100644
--- a/stdlib/source/lux/macro/poly/json.lux
+++ b/stdlib/source/lux/macro/poly/json.lux
@@ -15,7 +15,7 @@
[product]
(coll [list "list/" Fold<List> Monad<List>]
[sequence #+ Sequence sequence "sequence/" Monad<Sequence>]
- (dict ["d" unordered]))
+ (dictionary ["d" unordered]))
(format ["//" json #+ JSON]))
(time ## ["i" instant]
["du" duration]
diff --git a/stdlib/source/lux/math/random.lux b/stdlib/source/lux/math/random.lux
index 8e1dfd8fb..60f9b729d 100644
--- a/stdlib/source/lux/math/random.lux
+++ b/stdlib/source/lux/math/random.lux
@@ -13,7 +13,7 @@
["c" complex])
(coll [list "list/" Fold<List>]
[array]
- (dict ["dict" unordered #+ Dict])
+ (dictionary ["dict" unordered #+ Dict])
[queue #+ Queue]
(set ["set" unordered #+ Set])
[stack #+ Stack]
diff --git a/stdlib/source/lux/type/implicit.lux b/stdlib/source/lux/type/implicit.lux
index fc08d01bc..bc361d5e5 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>]
- (dict ["dict" unordered #+ Dict]))
+ (dictionary ["dict" unordered #+ Dict]))
[bool]
[product]
[maybe])
diff --git a/stdlib/source/lux/type/resource.lux b/stdlib/source/lux/type/resource.lux
index a95207ac8..bbef1783a 100644
--- a/stdlib/source/lux/type/resource.lux
+++ b/stdlib/source/lux/type/resource.lux
@@ -9,7 +9,7 @@
[product]
[number]
text/format
- (coll (dict ["dict" unordered #+ Dict])
+ (coll (dictionary ["dict" unordered #+ Dict])
(set ["set" unordered])
[sequence #+ Sequence]
[list "list/" Functor<List> Fold<List>]))
diff --git a/stdlib/source/lux/world/env.jvm.lux b/stdlib/source/lux/world/env.jvm.lux
index 70b6a91ff..fab0de3cc 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 ["dict" unordered])))
+ (coll (dictionary ["dict" unordered])))
[io #- run]
[host]))
diff --git a/stdlib/test/test/lux/data/coll/dict/ordered.lux b/stdlib/test/test/lux/data/coll/dictionary/ordered.lux
index 73a1ebcad..041e27484 100644
--- a/stdlib/test/test/lux/data/coll/dict/ordered.lux
+++ b/stdlib/test/test/lux/data/coll/dictionary/ordered.lux
@@ -6,8 +6,8 @@
(data [product]
[number]
(coll (set ["s" unordered])
- (dict ["dict" unordered]
- ["&" ordered])
+ (dictionary ["dict" unordered]
+ ["&" ordered])
[list "L/" Functor<List>]))
["r" math/random])
lux/test)
diff --git a/stdlib/test/test/lux/data/coll/dict/unordered.lux b/stdlib/test/test/lux/data/coll/dictionary/unordered.lux
index 73b0df822..8c6ea275e 100644
--- a/stdlib/test/test/lux/data/coll/dict/unordered.lux
+++ b/stdlib/test/test/lux/data/coll/dictionary/unordered.lux
@@ -7,7 +7,7 @@
text/format
[number]
[maybe]
- (coll (dict ["&" unordered])
+ (coll (dictionary ["&" unordered])
[list "list/" Fold<List> Functor<List>]))
["r" math/random])
lux/test)
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux
index d302c63b0..9e1930f3f 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 [sequence #+ sequence]
- (dict ["d" unordered])
+ (dictionary ["d" unordered])
[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 80ac5bcb1..d70b911dc 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 (dict ["dict" unordered])
+ (coll (dictionary ["dict" unordered])
[list "list/" Functor<List>]))
["r" math/random "r/" Monad<Random>]
test)
diff --git a/stdlib/test/test/lux/lang/syntax.lux b/stdlib/test/test/lux/lang/syntax.lux
index 49967e071..4e6bed9bc 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]
- (dict ["dict" unordered #+ Dict])))
+ (dictionary ["dict" unordered #+ Dict])))
["r" math/random "r/" Monad<Random>]
(macro [code])
(lang ["&" syntax])
diff --git a/stdlib/test/test/lux/math/random.lux b/stdlib/test/test/lux/math/random.lux
index 45c83016c..4230f27b1 100644
--- a/stdlib/test/test/lux/math/random.lux
+++ b/stdlib/test/test/lux/math/random.lux
@@ -10,7 +10,7 @@
[queue]
[stack]
(set ["set" unordered])
- (dict ["dict" unordered])))
+ (dictionary ["dict" unordered])))
(math ["r" random]))
lux/test)
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index 2c462e248..7351c8746 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -43,8 +43,8 @@
["_." xml])
(coll ["_." array]
["_." bits]
- ["_." dict/unordered]
- ["_." dict/ordered]
+ ["_." dictionary/unordered]
+ ["_." dictionary/ordered]
["_." list]
["_." queue]
["_." set/unordered]