aboutsummaryrefslogtreecommitdiff
path: root/stdlib/test
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--stdlib/test/test/lux.lux4
-rw-r--r--stdlib/test/test/lux/cli.lux2
-rw-r--r--stdlib/test/test/lux/concurrency/actor.lux6
-rw-r--r--stdlib/test/test/lux/concurrency/atom.lux2
-rw-r--r--stdlib/test/test/lux/concurrency/frp.lux10
-rw-r--r--stdlib/test/test/lux/concurrency/promise.lux4
-rw-r--r--stdlib/test/test/lux/concurrency/semaphore.lux6
-rw-r--r--stdlib/test/test/lux/concurrency/stm.lux10
-rw-r--r--stdlib/test/test/lux/control/continuation.lux2
-rw-r--r--stdlib/test/test/lux/control/equivalence.lux2
-rw-r--r--stdlib/test/test/lux/control/exception.lux4
-rw-r--r--stdlib/test/test/lux/control/interval.lux2
-rw-r--r--stdlib/test/test/lux/control/parser.lux6
-rw-r--r--stdlib/test/test/lux/control/pipe.lux2
-rw-r--r--stdlib/test/test/lux/control/reader.lux2
-rw-r--r--stdlib/test/test/lux/control/region.lux8
-rw-r--r--stdlib/test/test/lux/control/state.lux2
-rw-r--r--stdlib/test/test/lux/control/thread.lux2
-rw-r--r--stdlib/test/test/lux/control/writer.lux2
-rw-r--r--stdlib/test/test/lux/data/bit.lux2
-rw-r--r--stdlib/test/test/lux/data/bool.lux2
-rw-r--r--stdlib/test/test/lux/data/collection/array.lux2
-rw-r--r--stdlib/test/test/lux/data/collection/bits.lux2
-rw-r--r--stdlib/test/test/lux/data/collection/dictionary.lux2
-rw-r--r--stdlib/test/test/lux/data/collection/dictionary/ordered.lux4
-rw-r--r--stdlib/test/test/lux/data/collection/list.lux2
-rw-r--r--stdlib/test/test/lux/data/collection/queue.lux2
-rw-r--r--stdlib/test/test/lux/data/collection/queue/priority.lux2
-rw-r--r--stdlib/test/test/lux/data/collection/row.lux2
-rw-r--r--stdlib/test/test/lux/data/collection/sequence.lux2
-rw-r--r--stdlib/test/test/lux/data/collection/set.lux4
-rw-r--r--stdlib/test/test/lux/data/collection/set/ordered.lux2
-rw-r--r--stdlib/test/test/lux/data/collection/stack.lux2
-rw-r--r--stdlib/test/test/lux/data/collection/tree/rose.lux2
-rw-r--r--stdlib/test/test/lux/data/collection/tree/rose/zipper.lux2
-rw-r--r--stdlib/test/test/lux/data/color.lux2
-rw-r--r--stdlib/test/test/lux/data/error.lux2
-rw-r--r--stdlib/test/test/lux/data/format/json.lux12
-rw-r--r--stdlib/test/test/lux/data/format/xml.lux2
-rw-r--r--stdlib/test/test/lux/data/ident.lux2
-rw-r--r--stdlib/test/test/lux/data/identity.lux2
-rw-r--r--stdlib/test/test/lux/data/lazy.lux2
-rw-r--r--stdlib/test/test/lux/data/maybe.lux2
-rw-r--r--stdlib/test/test/lux/data/number.lux2
-rw-r--r--stdlib/test/test/lux/data/number/complex.lux2
-rw-r--r--stdlib/test/test/lux/data/number/ratio.lux2
-rw-r--r--stdlib/test/test/lux/data/product.lux2
-rw-r--r--stdlib/test/test/lux/data/sum.lux3
-rw-r--r--stdlib/test/test/lux/data/text.lux2
-rw-r--r--stdlib/test/test/lux/data/text/format.lux2
-rw-r--r--stdlib/test/test/lux/data/text/lexer.lux2
-rw-r--r--stdlib/test/test/lux/data/text/regex.lux4
-rw-r--r--stdlib/test/test/lux/host.js.lux2
-rw-r--r--stdlib/test/test/lux/host.jvm.lux4
-rw-r--r--stdlib/test/test/lux/io.lux2
-rw-r--r--stdlib/test/test/lux/language/compiler/analysis/case.lux4
-rw-r--r--stdlib/test/test/lux/language/compiler/analysis/function.lux4
-rw-r--r--stdlib/test/test/lux/language/compiler/analysis/primitive.lux8
-rw-r--r--stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux4
-rw-r--r--stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux4
-rw-r--r--stdlib/test/test/lux/language/compiler/analysis/reference.lux4
-rw-r--r--stdlib/test/test/lux/language/compiler/analysis/structure.lux4
-rw-r--r--stdlib/test/test/lux/language/compiler/synthesis/case.lux6
-rw-r--r--stdlib/test/test/lux/language/compiler/synthesis/function.lux10
-rw-r--r--stdlib/test/test/lux/language/compiler/synthesis/primitive.lux8
-rw-r--r--stdlib/test/test/lux/language/compiler/synthesis/structure.lux4
-rw-r--r--stdlib/test/test/lux/language/syntax.lux4
-rw-r--r--stdlib/test/test/lux/language/type.lux2
-rw-r--r--stdlib/test/test/lux/language/type/check.lux4
-rw-r--r--stdlib/test/test/lux/macro/code.lux2
-rw-r--r--stdlib/test/test/lux/macro/poly/equivalence.lux6
-rw-r--r--stdlib/test/test/lux/macro/poly/functor.lux2
-rw-r--r--stdlib/test/test/lux/macro/syntax.lux6
-rw-r--r--stdlib/test/test/lux/math.lux2
-rw-r--r--stdlib/test/test/lux/math/logic/continuous.lux4
-rw-r--r--stdlib/test/test/lux/math/logic/fuzzy.lux2
-rw-r--r--stdlib/test/test/lux/math/modular.lux2
-rw-r--r--stdlib/test/test/lux/math/random.lux2
-rw-r--r--stdlib/test/test/lux/time/date.lux2
-rw-r--r--stdlib/test/test/lux/time/duration.lux2
-rw-r--r--stdlib/test/test/lux/time/instant.lux2
-rw-r--r--stdlib/test/test/lux/type/implicit.lux2
-rw-r--r--stdlib/test/test/lux/type/resource.lux4
-rw-r--r--stdlib/test/test/lux/world/blob.lux2
-rw-r--r--stdlib/test/test/lux/world/file.lux2
-rw-r--r--stdlib/test/test/lux/world/net/tcp.lux4
-rw-r--r--stdlib/test/test/lux/world/net/udp.lux4
-rw-r--r--stdlib/test/tests.lux95
88 files changed, 210 insertions, 176 deletions
diff --git a/stdlib/test/test/lux.lux b/stdlib/test/test/lux.lux
index ec3c82197..4afb041fe 100644
--- a/stdlib/test/test/lux.lux
+++ b/stdlib/test/test/lux.lux
@@ -1,7 +1,7 @@
(.module:
lux
lux/test
- (lux (control [monad #+ do])
+ (lux (control [monad (#+ do)])
[math]
["r" math/random]
(data [maybe]
@@ -9,7 +9,7 @@
[text "text/" Equivalence<Text>]
text/format)
[macro]
- (macro ["s" syntax #+ syntax:])))
+ (macro ["s" syntax (#+ syntax:)])))
(context: "Value identity."
(<| (times +100)
diff --git a/stdlib/test/test/lux/cli.lux b/stdlib/test/test/lux/cli.lux
index bd0ed72d8..f52f0d498 100644
--- a/stdlib/test/test/lux/cli.lux
+++ b/stdlib/test/test/lux/cli.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad]
+ (control ["M" monad (#+ do Monad)]
pipe
["p" parser])
(data [product]
diff --git a/stdlib/test/test/lux/concurrency/actor.lux b/stdlib/test/test/lux/concurrency/actor.lux
index dc924de27..54f60b740 100644
--- a/stdlib/test/test/lux/concurrency/actor.lux
+++ b/stdlib/test/test/lux/concurrency/actor.lux
@@ -1,14 +1,14 @@
(.module:
lux
- (lux [io #+ IO io]
- (control ["M" monad #+ do Monad]
+ (lux [io (#+ IO io)]
+ (control ["M" monad (#+ do Monad)]
["ex" exception])
(data [number]
text/format
["e" error])
(concurrency ["P" promise "P/" Monad<Promise>]
["T" task]
- ["&" actor #+ actor: message:]))
+ ["&" actor (#+ actor: message:)]))
lux/test)
(actor: Counter
diff --git a/stdlib/test/test/lux/concurrency/atom.lux b/stdlib/test/test/lux/concurrency/atom.lux
index b6c220b28..36dc59074 100644
--- a/stdlib/test/test/lux/concurrency/atom.lux
+++ b/stdlib/test/test/lux/concurrency/atom.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad])
+ (control ["M" monad (#+ do Monad)])
(data [number]
(collection [list "" Functor<List>])
text/format)
diff --git a/stdlib/test/test/lux/concurrency/frp.lux b/stdlib/test/test/lux/concurrency/frp.lux
index 7760ad806..6996997f1 100644
--- a/stdlib/test/test/lux/concurrency/frp.lux
+++ b/stdlib/test/test/lux/concurrency/frp.lux
@@ -1,13 +1,13 @@
(.module:
lux
- (lux [io #+ IO io]
- (control [monad #+ do Monad])
+ (lux [io (#+ IO io)]
+ (control [monad (#+ do Monad)])
(data [number]
text/format
(collection [list]))
- (concurrency [promise #+ "promise/" Monad<Promise>]
- [frp #+ Channel]
- [atom #+ Atom atom]))
+ (concurrency [promise "promise/" Monad<Promise>]
+ [frp (#+ Channel)]
+ [atom (#+ Atom atom)]))
lux/test)
(def: (write! values channel)
diff --git a/stdlib/test/test/lux/concurrency/promise.lux b/stdlib/test/test/lux/concurrency/promise.lux
index 37ba6f2e1..77f69dd46 100644
--- a/stdlib/test/test/lux/concurrency/promise.lux
+++ b/stdlib/test/test/lux/concurrency/promise.lux
@@ -1,7 +1,7 @@
(.module:
lux
- (lux [io #+ IO io]
- (control ["M" monad #+ do Monad]
+ (lux [io (#+ IO io)]
+ (control ["M" monad (#+ do Monad)]
pipe)
(data [number]
text/format)
diff --git a/stdlib/test/test/lux/concurrency/semaphore.lux b/stdlib/test/test/lux/concurrency/semaphore.lux
index 294f2c5e2..6eb1752a6 100644
--- a/stdlib/test/test/lux/concurrency/semaphore.lux
+++ b/stdlib/test/test/lux/concurrency/semaphore.lux
@@ -1,13 +1,13 @@
(.module:
lux
- (lux (control [monad #+ do])
+ (lux (control [monad (#+ do)])
(data [maybe]
[text "text/" Equivalence<Text> Monoid<Text>]
text/format
(collection [list "list/" Functor<List>]))
(concurrency ["/" semaphore]
- [promise #+ Promise]
- [atom #+ Atom])
+ [promise (#+ Promise)]
+ [atom (#+ Atom)])
[io]
["r" math/random])
lux/test)
diff --git a/stdlib/test/test/lux/concurrency/stm.lux b/stdlib/test/test/lux/concurrency/stm.lux
index 23dbb6850..a9c9f4420 100644
--- a/stdlib/test/test/lux/concurrency/stm.lux
+++ b/stdlib/test/test/lux/concurrency/stm.lux
@@ -1,15 +1,15 @@
(.module:
lux
- (lux [io #+ IO]
- (control ["M" monad #+ do Monad])
+ (lux [io (#+ IO)]
+ (control ["M" monad (#+ do Monad)])
(data [number]
[maybe]
- (collection [list "" Functor<List> "List/" Fold<List>])
+ (collection [list "" Functor<List>])
text/format)
- (concurrency [atom #+ Atom atom]
+ (concurrency [atom (#+ Atom atom)]
["&" stm]
[promise]
- [frp #+ Channel])
+ [frp (#+ Channel)])
["r" math/random])
lux/test)
diff --git a/stdlib/test/test/lux/control/continuation.lux b/stdlib/test/test/lux/control/continuation.lux
index c5fa339d0..0df6d497d 100644
--- a/stdlib/test/test/lux/control/continuation.lux
+++ b/stdlib/test/test/lux/control/continuation.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad]
+ (control ["M" monad (#+ do Monad)]
["&" continuation])
(data [text "Text/" Monoid<Text>]
text/format
diff --git a/stdlib/test/test/lux/control/equivalence.lux b/stdlib/test/test/lux/control/equivalence.lux
index 18265af6c..5fd317fe4 100644
--- a/stdlib/test/test/lux/control/equivalence.lux
+++ b/stdlib/test/test/lux/control/equivalence.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux (control ["/" equivalence]
- [monad #+ do])
+ [monad (#+ do)])
(math ["r" random])
test))
diff --git a/stdlib/test/test/lux/control/exception.lux b/stdlib/test/test/lux/control/exception.lux
index dfd55abd4..dc768633c 100644
--- a/stdlib/test/test/lux/control/exception.lux
+++ b/stdlib/test/test/lux/control/exception.lux
@@ -1,8 +1,8 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad]
- ["&" exception #+ exception:])
+ (control ["M" monad (#+ do Monad)]
+ ["&" exception (#+ exception:)])
(data ["E" error]
[text]
text/format
diff --git a/stdlib/test/test/lux/control/interval.lux b/stdlib/test/test/lux/control/interval.lux
index 99dd14b4e..c836dacda 100644
--- a/stdlib/test/test/lux/control/interval.lux
+++ b/stdlib/test/test/lux/control/interval.lux
@@ -1,7 +1,7 @@
(.module:
lux
lux/test
- (lux (control ["M" monad #+ do Monad]
+ (lux (control ["M" monad (#+ do Monad)]
pipe
["&" interval])
[io]
diff --git a/stdlib/test/test/lux/control/parser.lux b/stdlib/test/test/lux/control/parser.lux
index c7293c2ee..1f8e8ce73 100644
--- a/stdlib/test/test/lux/control/parser.lux
+++ b/stdlib/test/test/lux/control/parser.lux
@@ -1,8 +1,8 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad]
- [equivalence #+ Equivalence]
+ (control ["M" monad (#+ do Monad)]
+ [equivalence (#+ Equivalence)]
["&" parser]
pipe)
(data [text "Text/" Monoid<Text>]
@@ -14,7 +14,7 @@
["r" math/random]
[macro]
(macro [code]
- ["s" syntax #+ syntax:]))
+ ["s" syntax (#+ syntax:)]))
lux/test)
## [Utils]
diff --git a/stdlib/test/test/lux/control/pipe.lux b/stdlib/test/test/lux/control/pipe.lux
index 1288b5302..081c4d308 100644
--- a/stdlib/test/test/lux/control/pipe.lux
+++ b/stdlib/test/test/lux/control/pipe.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
pipe)
(data text/format
[number]
diff --git a/stdlib/test/test/lux/control/reader.lux b/stdlib/test/test/lux/control/reader.lux
index eba19b47b..82fbb71c1 100644
--- a/stdlib/test/test/lux/control/reader.lux
+++ b/stdlib/test/test/lux/control/reader.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
pipe
["&" reader])
(data [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/control/region.lux b/stdlib/test/test/lux/control/region.lux
index d0a2fb11d..abfe25985 100644
--- a/stdlib/test/test/lux/control/region.lux
+++ b/stdlib/test/test/lux/control/region.lux
@@ -1,10 +1,10 @@
(.module:
lux
- (lux (control [monad #+ do]
+ (lux (control [monad (#+ do)]
["/" region]
- [thread #+ Thread]
- ["ex" exception #+ exception:])
- (data ["e" error #+ Error]
+ [thread (#+ Thread)]
+ ["ex" exception (#+ exception:)])
+ (data ["e" error (#+ Error)]
(collection [list])
text/format)
["r" math/random])
diff --git a/stdlib/test/test/lux/control/state.lux b/stdlib/test/test/lux/control/state.lux
index 1194351e5..72fa13273 100644
--- a/stdlib/test/test/lux/control/state.lux
+++ b/stdlib/test/test/lux/control/state.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad]
+ (control ["M" monad (#+ do Monad)]
pipe
["&" state])
(data [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/control/thread.lux b/stdlib/test/test/lux/control/thread.lux
index 3dd27d0ad..f1e9673e3 100644
--- a/stdlib/test/test/lux/control/thread.lux
+++ b/stdlib/test/test/lux/control/thread.lux
@@ -1,6 +1,6 @@
(.module:
lux
- (lux (control [monad #+ do]
+ (lux (control [monad (#+ do)]
["/" thread])))
(def: _test0_
diff --git a/stdlib/test/test/lux/control/writer.lux b/stdlib/test/test/lux/control/writer.lux
index 35df0ae06..1b9cba738 100644
--- a/stdlib/test/test/lux/control/writer.lux
+++ b/stdlib/test/test/lux/control/writer.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad]
+ (control ["M" monad (#+ do Monad)]
pipe
["&" writer])
(data [text "Text/" Monoid<Text> Equivalence<Text>]
diff --git a/stdlib/test/test/lux/data/bit.lux b/stdlib/test/test/lux/data/bit.lux
index 9008f89cf..158c1d218 100644
--- a/stdlib/test/test/lux/data/bit.lux
+++ b/stdlib/test/test/lux/data/bit.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad])
+ (control ["M" monad (#+ do Monad)])
(data ["&" bit]
number)
["r" math/random])
diff --git a/stdlib/test/test/lux/data/bool.lux b/stdlib/test/test/lux/data/bool.lux
index ead88f0db..fb5db77df 100644
--- a/stdlib/test/test/lux/data/bool.lux
+++ b/stdlib/test/test/lux/data/bool.lux
@@ -1,6 +1,6 @@
(.module:
lux
- (lux (control ["M" monad #+ do Monad])
+ (lux (control ["M" monad (#+ do Monad)])
[io]
(data bool)
["r" math/random])
diff --git a/stdlib/test/test/lux/data/collection/array.lux b/stdlib/test/test/lux/data/collection/array.lux
index 1e083676c..769a7a215 100644
--- a/stdlib/test/test/lux/data/collection/array.lux
+++ b/stdlib/test/test/lux/data/collection/array.lux
@@ -1,6 +1,6 @@
(.module:
lux
- (lux (control [monad #+ do Monad]
+ (lux (control [monad (#+ do Monad)]
pipe)
[io]
(data (collection ["@" array]
diff --git a/stdlib/test/test/lux/data/collection/bits.lux b/stdlib/test/test/lux/data/collection/bits.lux
index bef677ad5..8e1d672d7 100644
--- a/stdlib/test/test/lux/data/collection/bits.lux
+++ b/stdlib/test/test/lux/data/collection/bits.lux
@@ -1,6 +1,6 @@
(.module:
lux
- (lux (control [monad #+ do]
+ (lux (control [monad (#+ do)]
[predicate])
(data (collection ["/" bits]))
["r" math/random])
diff --git a/stdlib/test/test/lux/data/collection/dictionary.lux b/stdlib/test/test/lux/data/collection/dictionary.lux
index 5b18c863f..89121c106 100644
--- a/stdlib/test/test/lux/data/collection/dictionary.lux
+++ b/stdlib/test/test/lux/data/collection/dictionary.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
["eq" equivalence])
(data [text]
text/format
diff --git a/stdlib/test/test/lux/data/collection/dictionary/ordered.lux b/stdlib/test/test/lux/data/collection/dictionary/ordered.lux
index a5b680037..a70244160 100644
--- a/stdlib/test/test/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/test/test/lux/data/collection/dictionary/ordered.lux
@@ -1,8 +1,8 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
- [equivalence #+ Equivalence])
+ (control [monad (#+ do Monad)]
+ [equivalence (#+ Equivalence)])
(data [product]
[number]
(collection ["s" set]
diff --git a/stdlib/test/test/lux/data/collection/list.lux b/stdlib/test/test/lux/data/collection/list.lux
index 90d3cfc67..940273ba1 100644
--- a/stdlib/test/test/lux/data/collection/list.lux
+++ b/stdlib/test/test/lux/data/collection/list.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
pipe)
(data (collection ["&" list])
[number]
diff --git a/stdlib/test/test/lux/data/collection/queue.lux b/stdlib/test/test/lux/data/collection/queue.lux
index 8160c9d82..a28196c8a 100644
--- a/stdlib/test/test/lux/data/collection/queue.lux
+++ b/stdlib/test/test/lux/data/collection/queue.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad])
+ (control [monad (#+ do Monad)])
(data (collection ["&" queue])
[number])
["r" math/random])
diff --git a/stdlib/test/test/lux/data/collection/queue/priority.lux b/stdlib/test/test/lux/data/collection/queue/priority.lux
index d1880a735..a6f62a69b 100644
--- a/stdlib/test/test/lux/data/collection/queue/priority.lux
+++ b/stdlib/test/test/lux/data/collection/queue/priority.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad])
+ (control [monad (#+ do Monad)])
(data (collection (queue ["&" priority]))
[number]
[maybe])
diff --git a/stdlib/test/test/lux/data/collection/row.lux b/stdlib/test/test/lux/data/collection/row.lux
index 709d8b44e..0e861f0d8 100644
--- a/stdlib/test/test/lux/data/collection/row.lux
+++ b/stdlib/test/test/lux/data/collection/row.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad])
+ (control [monad (#+ do Monad)])
(data (collection ["&" row]
[list "list/" Fold<List>])
[number]
diff --git a/stdlib/test/test/lux/data/collection/sequence.lux b/stdlib/test/test/lux/data/collection/sequence.lux
index a168d749f..9f45c36d6 100644
--- a/stdlib/test/test/lux/data/collection/sequence.lux
+++ b/stdlib/test/test/lux/data/collection/sequence.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
comonad)
(data [maybe]
[text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/data/collection/set.lux b/stdlib/test/test/lux/data/collection/set.lux
index 346f1a39b..35a41b06d 100644
--- a/stdlib/test/test/lux/data/collection/set.lux
+++ b/stdlib/test/test/lux/data/collection/set.lux
@@ -1,8 +1,8 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad])
- (data (collection ["&" set #+ Set]
+ (control [monad (#+ do Monad)])
+ (data (collection ["&" set (#+ Set)]
[list "" Fold<List>])
[number])
["r" math/random])
diff --git a/stdlib/test/test/lux/data/collection/set/ordered.lux b/stdlib/test/test/lux/data/collection/set/ordered.lux
index 455ea5cb2..ab4cdd8d3 100644
--- a/stdlib/test/test/lux/data/collection/set/ordered.lux
+++ b/stdlib/test/test/lux/data/collection/set/ordered.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad])
+ (control [monad (#+ do Monad)])
(data (collection [set]
(set ["&" ordered])
[list "" Fold<List>])
diff --git a/stdlib/test/test/lux/data/collection/stack.lux b/stdlib/test/test/lux/data/collection/stack.lux
index c4e5f58a3..a60cc6004 100644
--- a/stdlib/test/test/lux/data/collection/stack.lux
+++ b/stdlib/test/test/lux/data/collection/stack.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad])
+ (control [monad (#+ do Monad)])
(data (collection ["&" stack]
[list "" Fold<List>])
[number]
diff --git a/stdlib/test/test/lux/data/collection/tree/rose.lux b/stdlib/test/test/lux/data/collection/tree/rose.lux
index b83c3e675..282e1c009 100644
--- a/stdlib/test/test/lux/data/collection/tree/rose.lux
+++ b/stdlib/test/test/lux/data/collection/tree/rose.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad])
+ (control [monad (#+ do Monad)])
(data [product]
[number]
[text "T/" Equivalence<Text>]
diff --git a/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux b/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux
index 3a1a9ed7a..2a0b1f365 100644
--- a/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux
+++ b/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
pipe)
(data (collection [list "list/" Fold<List> Functor<List>]
(tree [rose]
diff --git a/stdlib/test/test/lux/data/color.lux b/stdlib/test/test/lux/data/color.lux
index 776862749..c321d26d9 100644
--- a/stdlib/test/test/lux/data/color.lux
+++ b/stdlib/test/test/lux/data/color.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do])
+ (control [monad (#+ do)])
(data ["@" color]
[number "frac/" Number<Frac>])
[math]
diff --git a/stdlib/test/test/lux/data/error.lux b/stdlib/test/test/lux/data/error.lux
index ed7b6cc58..733be1cc6 100644
--- a/stdlib/test/test/lux/data/error.lux
+++ b/stdlib/test/test/lux/data/error.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad]
+ (control ["M" monad (#+ do Monad)]
pipe)
(data text/format
["&" error]))
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux
index 40aaf97d2..9929e1567 100644
--- a/stdlib/test/test/lux/data/format/json.lux
+++ b/stdlib/test/test/lux/data/format/json.lux
@@ -1,9 +1,9 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
codec
- [equivalence #+ Equivalence]
+ [equivalence (#+ Equivalence)]
pipe
["p" parser])
(data [text]
@@ -13,13 +13,13 @@
[maybe]
[number]
(format ["@" json])
- (collection [row #+ row]
+ (collection [row (#+ row)]
["d" dictionary]
[list]))
- [macro #+ with-gensyms]
+ [macro (#+ with-gensyms)]
(macro [code]
- [syntax #+ syntax:]
- [poly #+ derived:]
+ [syntax (#+ syntax:)]
+ [poly (#+ derived:)]
[poly/equivalence]
[poly/json])
(type [unit])
diff --git a/stdlib/test/test/lux/data/format/xml.lux b/stdlib/test/test/lux/data/format/xml.lux
index a6f57d6b1..4f14650b3 100644
--- a/stdlib/test/test/lux/data/format/xml.lux
+++ b/stdlib/test/test/lux/data/format/xml.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
["p" parser]
pipe)
(data [text "text/" Equivalence<Text>]
diff --git a/stdlib/test/test/lux/data/ident.lux b/stdlib/test/test/lux/data/ident.lux
index b1e4c8490..abb8a5d5c 100644
--- a/stdlib/test/test/lux/data/ident.lux
+++ b/stdlib/test/test/lux/data/ident.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
pipe)
(data ["&" ident]
[text "text/" Equivalence<Text>]
diff --git a/stdlib/test/test/lux/data/identity.lux b/stdlib/test/test/lux/data/identity.lux
index 479ec5670..df68144e4 100644
--- a/stdlib/test/test/lux/data/identity.lux
+++ b/stdlib/test/test/lux/data/identity.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad]
+ (control ["M" monad (#+ do Monad)]
comonad)
(data ["&" identity]
[text "Text/" Monoid<Text> Equivalence<Text>]))
diff --git a/stdlib/test/test/lux/data/lazy.lux b/stdlib/test/test/lux/data/lazy.lux
index da28003ba..e6a266b4a 100644
--- a/stdlib/test/test/lux/data/lazy.lux
+++ b/stdlib/test/test/lux/data/lazy.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad])
+ (control [monad (#+ do Monad)])
(data ["&" lazy])
["r" math/random])
lux/test)
diff --git a/stdlib/test/test/lux/data/maybe.lux b/stdlib/test/test/lux/data/maybe.lux
index 8353461b7..188db2b20 100644
--- a/stdlib/test/test/lux/data/maybe.lux
+++ b/stdlib/test/test/lux/data/maybe.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad]
+ (control ["M" monad (#+ do Monad)]
pipe)
(data ["&" maybe]
[text "text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/data/number.lux b/stdlib/test/test/lux/data/number.lux
index 4afba422a..7cdbe5848 100644
--- a/stdlib/test/test/lux/data/number.lux
+++ b/stdlib/test/test/lux/data/number.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad]
+ (control ["M" monad (#+ do Monad)]
pipe)
(data number
[text "Text/" Monoid<Text> Equivalence<Text>]
diff --git a/stdlib/test/test/lux/data/number/complex.lux b/stdlib/test/test/lux/data/number/complex.lux
index d75cbc428..17cd07278 100644
--- a/stdlib/test/test/lux/data/number/complex.lux
+++ b/stdlib/test/test/lux/data/number/complex.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
pipe)
(data [product]
[number "frac/" Number<Frac>]
diff --git a/stdlib/test/test/lux/data/number/ratio.lux b/stdlib/test/test/lux/data/number/ratio.lux
index c96c6f5ca..9802ac3b2 100644
--- a/stdlib/test/test/lux/data/number/ratio.lux
+++ b/stdlib/test/test/lux/data/number/ratio.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
pipe)
(data ["&" number/ratio "&/" Number<Ratio>])
["r" math/random])
diff --git a/stdlib/test/test/lux/data/product.lux b/stdlib/test/test/lux/data/product.lux
index 0bf0cdedd..11e574cc2 100644
--- a/stdlib/test/test/lux/data/product.lux
+++ b/stdlib/test/test/lux/data/product.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad])
+ (control ["M" monad (#+ do Monad)])
(data product
[text "Text/" Monoid<Text>]
[number]))
diff --git a/stdlib/test/test/lux/data/sum.lux b/stdlib/test/test/lux/data/sum.lux
index 6ef7ce2bc..1b73fb627 100644
--- a/stdlib/test/test/lux/data/sum.lux
+++ b/stdlib/test/test/lux/data/sum.lux
@@ -1,8 +1,7 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad]
- pipe)
+ (control pipe)
(data sum
[text "Text/" Monoid<Text>]
[number]
diff --git a/stdlib/test/test/lux/data/text.lux b/stdlib/test/test/lux/data/text.lux
index 9c5f317f8..edd3fa8a6 100644
--- a/stdlib/test/test/lux/data/text.lux
+++ b/stdlib/test/test/lux/data/text.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
pipe)
(data ["&" text]
text/format
diff --git a/stdlib/test/test/lux/data/text/format.lux b/stdlib/test/test/lux/data/text/format.lux
index 2ce811b33..81304af36 100644
--- a/stdlib/test/test/lux/data/text/format.lux
+++ b/stdlib/test/test/lux/data/text/format.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad])
+ (control [monad (#+ do Monad)])
(data text/format
[text]
[number]))
diff --git a/stdlib/test/test/lux/data/text/lexer.lux b/stdlib/test/test/lux/data/text/lexer.lux
index 31b9dcc40..b13605054 100644
--- a/stdlib/test/test/lux/data/text/lexer.lux
+++ b/stdlib/test/test/lux/data/text/lexer.lux
@@ -1,6 +1,6 @@
(.module:
lux
- (lux (control [monad #+ do Monad]
+ (lux (control [monad (#+ do Monad)]
pipe
["p" parser])
[io]
diff --git a/stdlib/test/test/lux/data/text/regex.lux b/stdlib/test/test/lux/data/text/regex.lux
index cab2b168b..7233c7308 100644
--- a/stdlib/test/test/lux/data/text/regex.lux
+++ b/stdlib/test/test/lux/data/text/regex.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
pipe
["p" parser])
(data [product]
@@ -11,7 +11,7 @@
["&" regex]))
[macro]
(macro [code]
- ["s" syntax #+ syntax:])
+ ["s" syntax (#+ syntax:)])
["r" math/random])
lux/test)
diff --git a/stdlib/test/test/lux/host.js.lux b/stdlib/test/test/lux/host.js.lux
index 49b15d7e4..8e301bdaa 100644
--- a/stdlib/test/test/lux/host.js.lux
+++ b/stdlib/test/test/lux/host.js.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad])
+ (control ["M" monad (#+ do Monad)])
(data text/format)
["&" host]
["r" math/random])
diff --git a/stdlib/test/test/lux/host.jvm.lux b/stdlib/test/test/lux/host.jvm.lux
index c9c59e8d2..5096f3200 100644
--- a/stdlib/test/test/lux/host.jvm.lux
+++ b/stdlib/test/test/lux/host.jvm.lux
@@ -1,13 +1,13 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
pipe)
(data text/format
[number]
[product]
[text "text/" Equivalence<Text>])
- ["&" host #+ class: interface: object]
+ ["&" host (#+ class: interface: object)]
["r" math/random])
lux/test)
diff --git a/stdlib/test/test/lux/io.lux b/stdlib/test/test/lux/io.lux
index 768bc3166..f4c1bbf68 100644
--- a/stdlib/test/test/lux/io.lux
+++ b/stdlib/test/test/lux/io.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux ["&" io]
- (control ["M" monad #+ do Monad])
+ (control ["M" monad (#+ do Monad)])
(data [text "Text/" Monoid<Text> Equivalence<Text>]
text/format
[number]))
diff --git a/stdlib/test/test/lux/language/compiler/analysis/case.lux b/stdlib/test/test/lux/language/compiler/analysis/case.lux
index ef54a66c1..e69e4d9d5 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/case.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/case.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do]
+ (control [monad (#+ do)]
pipe)
(data [bool "B/" Equivalence<Bool>]
["R" error]
@@ -12,7 +12,7 @@
(collection [list "list/" Monad<List>]
[set]))
["r" math/random "r/" Monad<Random>]
- [macro #+ Monad<Meta>]
+ [macro (#+ Monad<Meta>)]
(macro [code])
(language [type "type/" Equivalence<Type>]
(type ["tc" check])
diff --git a/stdlib/test/test/lux/language/compiler/analysis/function.lux b/stdlib/test/test/lux/language/compiler/analysis/function.lux
index e751f5e27..a1b4dafe9 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/function.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/function.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do]
+ (control [monad (#+ do)]
pipe)
(data ["e" error]
[maybe]
@@ -16,7 +16,7 @@
(language [type "type/" Equivalence<Type>]
[".L" reference]
(compiler [".L" init]
- [".L" analysis #+ Analysis]
+ [".L" analysis (#+ Analysis)]
(analysis [".A" type]
[".A" expression]
["/" function])))
diff --git a/stdlib/test/test/lux/language/compiler/analysis/primitive.lux b/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
index 5e19dd4e8..5a6e6cc69 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
@@ -1,9 +1,9 @@
(.module:
- [lux #- primitive]
+ [lux (#- primitive)]
(lux [io]
- (control [monad #+ do]
+ (control [monad (#+ do)]
pipe
- ["ex" exception #+ exception:])
+ ["ex" exception (#+ exception:)])
(data (text format)
["e" error])
["r" math/random "r/" Monad<Random>]
@@ -12,7 +12,7 @@
[language]
(language [".L" type "type/" Equivalence<Type>]
(compiler [".L" init]
- [analysis #+ Analysis]
+ [analysis (#+ Analysis)]
(analysis [".A" type]
[".A" expression])))
test))
diff --git a/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux b/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
index 743c4194c..656e0bdd6 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do]
+ (control [monad (#+ do)]
pipe)
(concurrency [atom])
(data text/format
@@ -9,7 +9,7 @@
[product]
(collection [array]))
["r" math/random "r/" Monad<Random>]
- [macro #+ Monad<Meta>]
+ [macro (#+ Monad<Meta>)]
(macro [code])
[language]
(language [type "type/" Equivalence<Type>]
diff --git a/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux b/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux
index bbe4c0170..72a1f0337 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do]
+ (control [monad (#+ do)]
pipe)
(concurrency [atom])
(data ["e" error]
@@ -13,7 +13,7 @@
[list "list/" Fold<List>]
["dict" dictionary]))
["r" math/random "r/" Monad<Random>]
- [macro #+ Monad<Meta>]
+ [macro (#+ Monad<Meta>)]
(macro [code])
[language]
(language [type]
diff --git a/stdlib/test/test/lux/language/compiler/analysis/reference.lux b/stdlib/test/test/lux/language/compiler/analysis/reference.lux
index 7016c3181..f91edb1ba 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/reference.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/reference.lux
@@ -1,13 +1,13 @@
(.module:
lux
(lux [io]
- (control [monad #+ do]
+ (control [monad (#+ do)]
pipe)
(data ["e" error]
[ident "ident/" Equivalence<Ident>]
[text "text/" Equivalence<Text>])
["r" math/random]
- [macro #+ Monad<Meta>]
+ [macro (#+ Monad<Meta>)]
(macro [code])
[language]
(language [type "type/" Equivalence<Type>]
diff --git a/stdlib/test/test/lux/language/compiler/analysis/structure.lux b/stdlib/test/test/lux/language/compiler/analysis/structure.lux
index 177e84e52..95c19331b 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/structure.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/structure.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do]
+ (control [monad (#+ do)]
pipe)
(data [bool "bool/" Equivalence<Bool>]
["e" error]
@@ -19,7 +19,7 @@
(type ["tc" check])
[".L" module]
(compiler [".L" init]
- [".L" analysis #+ Analysis Variant Tag]
+ [".L" analysis (#+ Analysis Variant Tag)]
(analysis [".A" type]
["/" structure]
[".A" expression])))
diff --git a/stdlib/test/test/lux/language/compiler/synthesis/case.lux b/stdlib/test/test/lux/language/compiler/synthesis/case.lux
index 92051fcb4..b6d554604 100644
--- a/stdlib/test/test/lux/language/compiler/synthesis/case.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/case.lux
@@ -1,12 +1,12 @@
(.module:
lux
- (lux (control [monad #+ do]
+ (lux (control [monad (#+ do)]
pipe)
(data [error "error/" Functor<Error>])
(language ["///." reference]
["///." compiler]
- [".L" analysis #+ Branch Analysis]
- ["//" synthesis #+ Synthesis]
+ [".L" analysis (#+ Branch Analysis)]
+ ["//" synthesis (#+ Synthesis)]
(synthesis [".S" expression])
[".L" extension])
["r" math/random "r/" Monad<Random>]
diff --git a/stdlib/test/test/lux/language/compiler/synthesis/function.lux b/stdlib/test/test/lux/language/compiler/synthesis/function.lux
index bd6c4c7a9..244692994 100644
--- a/stdlib/test/test/lux/language/compiler/synthesis/function.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/function.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do]
+ (control [monad (#+ do)]
pipe)
(data [product]
[maybe]
@@ -9,12 +9,12 @@
[number]
text/format
(collection [list "list/" Functor<List> Fold<List>]
- ["dict" dictionary #+ Dictionary]
+ ["dict" dictionary (#+ Dictionary)]
[set]))
- (language ["///." reference #+ Variable "variable/" Equivalence<Variable>]
+ (language ["///." reference (#+ Variable) "variable/" Equivalence<Variable>]
["///." compiler]
- [".L" analysis #+ Arity Analysis]
- ["//" synthesis #+ Synthesis]
+ [".L" analysis (#+ Arity Analysis)]
+ ["//" synthesis (#+ Synthesis)]
(synthesis [".S" expression])
[".L" extension])
["r" math/random]
diff --git a/stdlib/test/test/lux/language/compiler/synthesis/primitive.lux b/stdlib/test/test/lux/language/compiler/synthesis/primitive.lux
index 04e8b4dec..e90d8cb26 100644
--- a/stdlib/test/test/lux/language/compiler/synthesis/primitive.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/primitive.lux
@@ -1,15 +1,15 @@
(.module:
- [lux #- primitive]
+ [lux (#- primitive)]
(lux [io]
- (control [monad #+ do]
+ (control [monad (#+ do)]
pipe)
(data [error]
text/format)
[language]
(language [".L" extension]
["///." compiler]
- [".L" analysis #+ Analysis]
- ["//" synthesis #+ Synthesis]
+ [".L" analysis (#+ Analysis)]
+ ["//" synthesis (#+ Synthesis)]
(synthesis [".S" expression]))
["r" math/random]
test))
diff --git a/stdlib/test/test/lux/language/compiler/synthesis/structure.lux b/stdlib/test/test/lux/language/compiler/synthesis/structure.lux
index e3351158e..125efdc49 100644
--- a/stdlib/test/test/lux/language/compiler/synthesis/structure.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/structure.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do]
+ (control [monad (#+ do)]
pipe)
(data [bool "bool/" Equivalence<Bool>]
[product]
@@ -9,7 +9,7 @@
(collection [list]))
(language ["///." compiler]
[".L" analysis]
- ["//" synthesis #+ Synthesis]
+ ["//" synthesis (#+ Synthesis)]
(synthesis [".S" expression])
[".L" extension])
["r" math/random "r/" Monad<Random>]
diff --git a/stdlib/test/test/lux/language/syntax.lux b/stdlib/test/test/lux/language/syntax.lux
index 9df62a608..02bfee533 100644
--- a/stdlib/test/test/lux/language/syntax.lux
+++ b/stdlib/test/test/lux/language/syntax.lux
@@ -1,14 +1,14 @@
(.module:
lux
(lux [io]
- (control [monad #+ do])
+ (control [monad (#+ do)])
(data [number]
["e" error]
[text]
(text format
["l" lexer])
(collection [list]
- ["dict" dictionary #+ Dictionary]))
+ ["dict" dictionary (#+ Dictionary)]))
["r" math/random "r/" Monad<Random>]
(macro [code])
(language ["&" syntax])
diff --git a/stdlib/test/test/lux/language/type.lux b/stdlib/test/test/lux/language/type.lux
index ee53dd542..7e4689a58 100644
--- a/stdlib/test/test/lux/language/type.lux
+++ b/stdlib/test/test/lux/language/type.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control ["M" monad #+ do Monad]
+ (control ["M" monad (#+ do Monad)]
pipe)
(data [text "Text/" Monoid<Text>]
text/format
diff --git a/stdlib/test/test/lux/language/type/check.lux b/stdlib/test/test/lux/language/type/check.lux
index 7b24d0f91..f1f464bf8 100644
--- a/stdlib/test/test/lux/language/type/check.lux
+++ b/stdlib/test/test/lux/language/type/check.lux
@@ -1,8 +1,8 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
- [pipe #+ case>])
+ (control [monad (#+ do Monad)]
+ [pipe (#+ case>)])
(data [product]
[maybe]
[number]
diff --git a/stdlib/test/test/lux/macro/code.lux b/stdlib/test/test/lux/macro/code.lux
index 300adc53c..bc172def2 100644
--- a/stdlib/test/test/lux/macro/code.lux
+++ b/stdlib/test/test/lux/macro/code.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad])
+ (control [monad (#+ do Monad)])
(data [text "T/" Equivalence<Text>]
text/format
[number])
diff --git a/stdlib/test/test/lux/macro/poly/equivalence.lux b/stdlib/test/test/lux/macro/poly/equivalence.lux
index fc86cb597..a498478fd 100644
--- a/stdlib/test/test/lux/macro/poly/equivalence.lux
+++ b/stdlib/test/test/lux/macro/poly/equivalence.lux
@@ -1,8 +1,8 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
- [equivalence #+ Equivalence])
+ (control [monad (#+ do Monad)]
+ [equivalence (#+ Equivalence)])
(data text/format
[bool]
[number "int/" Number<Int>]
@@ -11,7 +11,7 @@
(collection [list]))
["r" math/random]
[macro]
- (macro [poly #+ derived:]
+ (macro [poly (#+ derived:)]
["&" poly/equivalence]))
lux/test)
diff --git a/stdlib/test/test/lux/macro/poly/functor.lux b/stdlib/test/test/lux/macro/poly/functor.lux
index 9db2ea282..0b92743e2 100644
--- a/stdlib/test/test/lux/macro/poly/functor.lux
+++ b/stdlib/test/test/lux/macro/poly/functor.lux
@@ -2,7 +2,7 @@
lux
(lux (control [state])
(data [identity])
- (macro [poly #+ derived:]
+ (macro [poly (#+ derived:)]
["&" poly/functor]))
lux/test)
diff --git a/stdlib/test/test/lux/macro/syntax.lux b/stdlib/test/test/lux/macro/syntax.lux
index 3b9815064..258610aff 100644
--- a/stdlib/test/test/lux/macro/syntax.lux
+++ b/stdlib/test/test/lux/macro/syntax.lux
@@ -1,8 +1,8 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
- [equivalence #+ Equivalence]
+ (control [monad (#+ do Monad)]
+ [equivalence (#+ Equivalence)]
["p" parser])
(data [text "Text/" Monoid<Text>]
text/format
@@ -13,7 +13,7 @@
["r" math/random]
[macro]
(macro [code]
- ["s" syntax #+ syntax: Syntax]))
+ ["s" syntax (#+ syntax: Syntax)]))
lux/test)
## [Utils]
diff --git a/stdlib/test/test/lux/math.lux b/stdlib/test/test/lux/math.lux
index 4e7e29a1e..8fee2b105 100644
--- a/stdlib/test/test/lux/math.lux
+++ b/stdlib/test/test/lux/math.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad])
+ (control [monad (#+ do Monad)])
(data [bool "bool/" Equivalence<Bool>]
[number "frac/" Number<Frac>])
["r" math/random]
diff --git a/stdlib/test/test/lux/math/logic/continuous.lux b/stdlib/test/test/lux/math/logic/continuous.lux
index f5eb9d1c7..8962fc0a2 100644
--- a/stdlib/test/test/lux/math/logic/continuous.lux
+++ b/stdlib/test/test/lux/math/logic/continuous.lux
@@ -1,7 +1,7 @@
(.module:
lux
- (lux [io]
- (control [monad #+ do Monad])
+ (lux (control [monad (#+ do)])
+ [io]
["r" math/random]
["&" math/logic/continuous])
lux/test)
diff --git a/stdlib/test/test/lux/math/logic/fuzzy.lux b/stdlib/test/test/lux/math/logic/fuzzy.lux
index a73df0c37..ed41fde5d 100644
--- a/stdlib/test/test/lux/math/logic/fuzzy.lux
+++ b/stdlib/test/test/lux/math/logic/fuzzy.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad])
+ (control [monad (#+ do Monad)])
(data (collection [list]
[set])
[bool "B/" Equivalence<Bool>]
diff --git a/stdlib/test/test/lux/math/modular.lux b/stdlib/test/test/lux/math/modular.lux
index dc0d89c40..b6778e2a0 100644
--- a/stdlib/test/test/lux/math/modular.lux
+++ b/stdlib/test/test/lux/math/modular.lux
@@ -1,6 +1,6 @@
(.module:
lux
- (lux (control [monad #+ do])
+ (lux (control [monad (#+ do)])
(data [product]
[bool "bool/" Equivalence<Bool>]
["e" error]
diff --git a/stdlib/test/test/lux/math/random.lux b/stdlib/test/test/lux/math/random.lux
index a7e2f583d..aa574511b 100644
--- a/stdlib/test/test/lux/math/random.lux
+++ b/stdlib/test/test/lux/math/random.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad])
+ (control [monad (#+ do Monad)])
(data [number]
text/format
(collection [list]
diff --git a/stdlib/test/test/lux/time/date.lux b/stdlib/test/test/lux/time/date.lux
index dbd925fda..798bda645 100644
--- a/stdlib/test/test/lux/time/date.lux
+++ b/stdlib/test/test/lux/time/date.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
[pipe])
(data ["E" error])
(math ["r" random "r/" Monad<Random>])
diff --git a/stdlib/test/test/lux/time/duration.lux b/stdlib/test/test/lux/time/duration.lux
index 6437a45a3..a15738906 100644
--- a/stdlib/test/test/lux/time/duration.lux
+++ b/stdlib/test/test/lux/time/duration.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad])
+ (control [monad (#+ do Monad)])
(data ["E" error])
(math ["r" random])
(time ["@" duration]))
diff --git a/stdlib/test/test/lux/time/instant.lux b/stdlib/test/test/lux/time/instant.lux
index cff332527..e5bc7a7ea 100644
--- a/stdlib/test/test/lux/time/instant.lux
+++ b/stdlib/test/test/lux/time/instant.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do Monad]
+ (control [monad (#+ do Monad)]
pipe)
(data [text]
text/format
diff --git a/stdlib/test/test/lux/type/implicit.lux b/stdlib/test/test/lux/type/implicit.lux
index 001185a2e..94dcdad1e 100644
--- a/stdlib/test/test/lux/type/implicit.lux
+++ b/stdlib/test/test/lux/type/implicit.lux
@@ -3,7 +3,7 @@
(lux [io]
(control [equivalence]
[functor]
- [monad #+ do Monad])
+ [monad (#+ do Monad)])
(data [number]
[bool "bool/" Equivalence<Bool>]
(collection [list]))
diff --git a/stdlib/test/test/lux/type/resource.lux b/stdlib/test/test/lux/type/resource.lux
index c92af92e8..9024975e2 100644
--- a/stdlib/test/test/lux/type/resource.lux
+++ b/stdlib/test/test/lux/type/resource.lux
@@ -1,8 +1,8 @@
(.module:
lux
- (lux (control (monad [indexed #+ do]))
+ (lux (control (monad [indexed (#+ do)]))
[macro]
- (type [resource #+ Res])
+ (type [resource (#+ Res)])
[io])
lux/test)
diff --git a/stdlib/test/test/lux/world/blob.lux b/stdlib/test/test/lux/world/blob.lux
index c0704d851..2adc116c3 100644
--- a/stdlib/test/test/lux/world/blob.lux
+++ b/stdlib/test/test/lux/world/blob.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do]
+ (control [monad (#+ do)]
[pipe])
(data [bit]
[number]
diff --git a/stdlib/test/test/lux/world/file.lux b/stdlib/test/test/lux/world/file.lux
index e126b8703..bd6ff9294 100644
--- a/stdlib/test/test/lux/world/file.lux
+++ b/stdlib/test/test/lux/world/file.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do])
+ (control [monad (#+ do)])
(concurrency [promise])
(data [error]
[text]
diff --git a/stdlib/test/test/lux/world/net/tcp.lux b/stdlib/test/test/lux/world/net/tcp.lux
index e49a06a1e..7b232b7c6 100644
--- a/stdlib/test/test/lux/world/net/tcp.lux
+++ b/stdlib/test/test/lux/world/net/tcp.lux
@@ -1,8 +1,8 @@
(.module:
lux
(lux [io]
- (control [monad #+ do]
- ["ex" exception #+ exception:])
+ (control [monad (#+ do)]
+ ["ex" exception (#+ exception:)])
(concurrency ["P" promise]
["T" task]
[frp "frp/" Functor<Channel>])
diff --git a/stdlib/test/test/lux/world/net/udp.lux b/stdlib/test/test/lux/world/net/udp.lux
index 6a51e0bf4..53c2f9d88 100644
--- a/stdlib/test/test/lux/world/net/udp.lux
+++ b/stdlib/test/test/lux/world/net/udp.lux
@@ -1,8 +1,8 @@
(.module:
lux
(lux [io]
- (control [monad #+ do]
- ["ex" exception #+ exception:])
+ (control [monad (#+ do)]
+ ["ex" exception (#+ exception:)])
(concurrency ["P" promise]
["T" task]
[frp])
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index ce4113317..8d644b68e 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -1,6 +1,6 @@
(.module:
lux
- (lux [cli #+ program:]
+ (lux [cli (#+ program:)]
[test])
(test ["_." lux]
(lux ["_." cli]
@@ -35,7 +35,7 @@
["_." maybe]
["_." product]
["_." sum]
- ["_." number]
+ ## ["_." number] ## Specially troublesome...
(number ["_." ratio]
["_." complex])
["_." text]
@@ -44,40 +44,53 @@
["_." regex])
(format ["_." json]
["_." xml])
- (coll ["_." array]
- ["_." bits]
- ["_." list]
- ["_." stack]
- ["_." sequence]
- ["_." stream]
- ["_." dictionary/unordered]
- ["_." dictionary/ordered]
- ["_." set/unordered]
- ["_." set/ordered]
- ["_." queue]
- (queue ["_." priority])
- (tree ["_." rose]
- (rose ["_." zipper]))))
+ (collection ["_." array]
+ ["_." bits]
+ ["_." list]
+ ["_." stack]
+ ["_." row]
+ ["_." sequence]
+ ["_." dictionary]
+ (dictionary ["_.D" ordered])
+ ["_." set]
+ (set ["_.S" ordered])
+ ["_." queue]
+ (queue ["_." priority])
+ (tree ["_." rose]
+ (rose ["_." zipper]))))
["_." math]
(math ["_." random]
["_." modular]
- ["_." constructive]
(logic ["_." continuous]
["_." fuzzy]))
(macro ["_." code]
["_." syntax]
- (poly ["poly_." equality]
+ (poly ["poly_." equivalence]
["poly_." functor]))
- (type ["_." implicit]
+ (type ## ["_." implicit] ## Specially troublesome...
["_." resource]
- (object
- ["_." interface]
- ["_." protocol]))
- (lang ["_lang/." syntax]
- ["_." type]
- (type ["_." check]))
+ (object
+ ["_." interface]
+ ["_." protocol]))
+ (language ["_language/." syntax]
+ ["_." type]
+ (type ["_." check])
+ (compiler (analysis ["_.A" primitive]
+ ["_.A" structure]
+ ["_.A" reference]
+ ["_.A" case]
+ ["_.A" function]
+ ## (procedure ["_.A" common]
+ ## ["_.A" host])
+ )
+ ## (synthesis ["_.S" primitive]
+ ## ["_.S" structure]
+ ## ["_.S" case]
+ ## ["_.S" function])
+ )
+ )
(world ["_." blob]
- ["_." file]
+ ## ["_." file] ## Specially troublesome...
(net ["_." tcp]
["_." udp]))
))
@@ -91,15 +104,37 @@
[tainted]
(format [context]
[html]
- [css])
- (coll (tree ["_." rose/parser])))
+ [css]
+ [binary])
+ (collection (tree ["_." rose/parser])
+ (dictionary [plist])
+ (set [multi]))
+ (text [buffer]))
[macro]
(macro (poly [json]))
(type [unit]
[refinement]
[quotient])
- [world/env]
- [world/console])
+ (world [environment]
+ [console])
+ (language (host [".H" scheme])
+ (compiler [translation]
+ (translation (scheme ["._scheme" primitive]
+ ["._scheme" structure]
+ ["._scheme" reference]
+ ["._scheme" function]
+ ["._scheme" loop]
+ ["._scheme" case]
+ ["._scheme" extension]
+ ["._scheme" extension/common]
+ ["._scheme" expression]))
+ (default (repl [type]))
+ (meta [io]
+ [io/context]
+ [io/archive]
+ [archive]
+ ["._meta" cache])
+ (default ["._default" cache]))))
)
(program: args