- Moved lux/random to lux/math/random.

- Moved lux/math/ratio to lux/number/ratio.
- Moved lux/math/complex to lux/number/complex.

46 files changed, 52 insertions, 53 deletions

diff --git a/stdlib/test/test/lux.lux b/stdlib/test/test/lux.lux
index 92ed5e2ca..225467526 100644
--- a/stdlib/test/test/lux.lux
+++ b/stdlib/test/test/lux.lux
@@ -4,7 +4,7 @@
   (lux (control monad)
        [io]
        [math]
-       ["R" random]
+       ["R" math/random]
        (data [text "T/" Eq<Text>]
              text/format)
        [compiler]
diff --git a/stdlib/test/test/lux/cli.lux b/stdlib/test/test/lux/cli.lux
index 39cb8e74a..e8dbf1f82 100644
--- a/stdlib/test/test/lux/cli.lux
+++ b/stdlib/test/test/lux/cli.lux
@@ -10,7 +10,7 @@
              (coll [list]))
        (codata function)
        ["&" cli]
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/codata/coll/stream.lux b/stdlib/test/test/lux/codata/coll/stream.lux
index 36f7227a9..4c69f9f7b 100644
--- a/stdlib/test/test/lux/codata/coll/stream.lux
+++ b/stdlib/test/test/lux/codata/coll/stream.lux
@@ -10,7 +10,7 @@
        (codata function
                [cont]
                (coll ["&" stream]))
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/codata/cont.lux b/stdlib/test/test/lux/codata/cont.lux
index 2562da8f8..cef7661b0 100644
--- a/stdlib/test/test/lux/codata/cont.lux
+++ b/stdlib/test/test/lux/codata/cont.lux
@@ -8,7 +8,7 @@
              [product])
        (codata function
                ["&" cont])
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/codata/thunk.lux b/stdlib/test/test/lux/codata/thunk.lux
index 789805319..eb6a24701 100644
--- a/stdlib/test/test/lux/codata/thunk.lux
+++ b/stdlib/test/test/lux/codata/thunk.lux
@@ -4,7 +4,7 @@
        (control monad)
        (codata ["&" thunk])
        pipe
-       ["R" random])
+       ["R" math/random])
   lux/test)
 
 (test: "Thunks"
diff --git a/stdlib/test/test/lux/concurrency/atom.lux b/stdlib/test/test/lux/concurrency/atom.lux
index f59b9ce6d..9b6248ec8 100644
--- a/stdlib/test/test/lux/concurrency/atom.lux
+++ b/stdlib/test/test/lux/concurrency/atom.lux
@@ -6,7 +6,7 @@
              (coll [list "" Functor<List>])
              text/format)
        (concurrency ["&" atom])
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/concurrency/promise.lux b/stdlib/test/test/lux/concurrency/promise.lux
index c5ba46d7d..d75d6d676 100644
--- a/stdlib/test/test/lux/concurrency/promise.lux
+++ b/stdlib/test/test/lux/concurrency/promise.lux
@@ -7,7 +7,7 @@
              [error #- fail])
        (concurrency ["&" promise])
        (codata function)
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/concurrency/stm.lux b/stdlib/test/test/lux/concurrency/stm.lux
index 10c6a5242..f9e46b91d 100644
--- a/stdlib/test/test/lux/concurrency/stm.lux
+++ b/stdlib/test/test/lux/concurrency/stm.lux
@@ -8,7 +8,7 @@
        (concurrency ["&" stm]
                     [promise])
        (codata function)
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/bit.lux b/stdlib/test/test/lux/data/bit.lux
index 72973a5e7..0c9f5ac3d 100644
--- a/stdlib/test/test/lux/data/bit.lux
+++ b/stdlib/test/test/lux/data/bit.lux
@@ -4,7 +4,7 @@
        (control [monad])
        (data ["&" bit]
              number)
-       ["R" random])
+       ["R" math/random])
   lux/test)
 
 (def: width Nat +64)
diff --git a/stdlib/test/test/lux/data/bool.lux b/stdlib/test/test/lux/data/bool.lux
index d9052db57..51e499779 100644
--- a/stdlib/test/test/lux/data/bool.lux
+++ b/stdlib/test/test/lux/data/bool.lux
@@ -3,7 +3,7 @@
   (lux (control [monad])
        [io]
        (data bool)
-       ["R" random])
+       ["R" math/random])
   lux/test)
 
 (test: "Boolean operations."
diff --git a/stdlib/test/test/lux/data/char.lux b/stdlib/test/test/lux/data/char.lux
index 88a5d86ae..6b7175de7 100644
--- a/stdlib/test/test/lux/data/char.lux
+++ b/stdlib/test/test/lux/data/char.lux
@@ -5,7 +5,7 @@
        (data char
              [text]
              text/format)
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/coll/array.lux b/stdlib/test/test/lux/data/coll/array.lux
index e05afd1c3..b5003f703 100644
--- a/stdlib/test/test/lux/data/coll/array.lux
+++ b/stdlib/test/test/lux/data/coll/array.lux
@@ -5,7 +5,7 @@
        (data (coll ["&" array]
                    [list])
              [number])
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/coll/dict.lux b/stdlib/test/test/lux/data/coll/dict.lux
index 4378d4dab..ff36cc362 100644
--- a/stdlib/test/test/lux/data/coll/dict.lux
+++ b/stdlib/test/test/lux/data/coll/dict.lux
@@ -10,7 +10,7 @@
              (coll ["&" dict]
                    [list "List/" Fold<List> Functor<List>]))
        (codata function)
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/coll/list.lux b/stdlib/test/test/lux/data/coll/list.lux
index 823266319..e1705291a 100644
--- a/stdlib/test/test/lux/data/coll/list.lux
+++ b/stdlib/test/test/lux/data/coll/list.lux
@@ -7,7 +7,7 @@
              [number]
              [bool]
              [product])
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/coll/queue.lux b/stdlib/test/test/lux/data/coll/queue.lux
index 70444516c..fac5cef12 100644
--- a/stdlib/test/test/lux/data/coll/queue.lux
+++ b/stdlib/test/test/lux/data/coll/queue.lux
@@ -4,7 +4,7 @@
        (control monad)
        (data (coll ["&" queue])
              [number])
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/coll/set.lux b/stdlib/test/test/lux/data/coll/set.lux
index 42c3959b8..2a4f05bb1 100644
--- a/stdlib/test/test/lux/data/coll/set.lux
+++ b/stdlib/test/test/lux/data/coll/set.lux
@@ -5,7 +5,7 @@
        (data (coll ["&" set]
                    [list "" Fold<List>])
              [number])
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/coll/stack.lux b/stdlib/test/test/lux/data/coll/stack.lux
index ec6fb2b50..4c44cbf06 100644
--- a/stdlib/test/test/lux/data/coll/stack.lux
+++ b/stdlib/test/test/lux/data/coll/stack.lux
@@ -5,7 +5,7 @@
        (data (coll ["&" stack]
                    [list "" Fold<List>])
              [number])
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/coll/tree/rose.lux b/stdlib/test/test/lux/data/coll/tree/rose.lux
index 018164b8b..ef43fae44 100644
--- a/stdlib/test/test/lux/data/coll/tree/rose.lux
+++ b/stdlib/test/test/lux/data/coll/tree/rose.lux
@@ -5,7 +5,7 @@
        (data (coll (tree ["&" rose])
                    [list "List/" Monad<List>])
              [number])
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/coll/tree/zipper.lux b/stdlib/test/test/lux/data/coll/tree/zipper.lux
index 5a8a3aee3..888701bbe 100644
--- a/stdlib/test/test/lux/data/coll/tree/zipper.lux
+++ b/stdlib/test/test/lux/data/coll/tree/zipper.lux
@@ -9,7 +9,7 @@
              text/format
              [number])
        (codata function)
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/coll/vector.lux b/stdlib/test/test/lux/data/coll/vector.lux
index 9b3edf078..c82493df0 100644
--- a/stdlib/test/test/lux/data/coll/vector.lux
+++ b/stdlib/test/test/lux/data/coll/vector.lux
@@ -8,7 +8,7 @@
              text/format
              [number])
        (codata function)
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/error/exception.lux b/stdlib/test/test/lux/data/error/exception.lux
index b2c417f75..96108e448 100644
--- a/stdlib/test/test/lux/data/error/exception.lux
+++ b/stdlib/test/test/lux/data/error/exception.lux
@@ -8,7 +8,7 @@
              text/format
              [number])
        (codata function)
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux
index 7233e44e3..ad70d5c0e 100644
--- a/stdlib/test/test/lux/data/format/json.lux
+++ b/stdlib/test/test/lux/data/format/json.lux
@@ -20,7 +20,7 @@
        (macro [ast]
               [syntax #+ syntax:]
               [poly #+ derived:])
-       ["R" random]
+       ["R" math/random]
        pipe
        test)
   )
diff --git a/stdlib/test/test/lux/data/ident.lux b/stdlib/test/test/lux/data/ident.lux
index a47a7ed0f..f88693003 100644
--- a/stdlib/test/test/lux/data/ident.lux
+++ b/stdlib/test/test/lux/data/ident.lux
@@ -5,7 +5,7 @@
        (data ["&" ident]
              [text "Text/" Eq<Text>]
              text/format)
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/number.lux b/stdlib/test/test/lux/data/number.lux
index 6f296a628..8424c82a3 100644
--- a/stdlib/test/test/lux/data/number.lux
+++ b/stdlib/test/test/lux/data/number.lux
@@ -5,7 +5,7 @@
        (data number
              [text "Text/" Monoid<Text> Eq<Text>]
              text/format)
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/math/complex.lux b/stdlib/test/test/lux/data/number/complex.lux
index f965f9214..f5c89d5ee 100644
--- a/stdlib/test/test/lux/math/complex.lux
+++ b/stdlib/test/test/lux/data/number/complex.lux
@@ -6,13 +6,13 @@
              text/format
              [bool "b/" Eq<Bool>]
              [number "r/" Number<Real>]
+             ["&" number/complex]
              (coll [list "List/" Fold<List> Functor<List>])
              [product])
        (codata function)
        [math]
-       ["R" random]
-       pipe
-       ["&" math/complex])
+       ["R" math/random]
+       pipe)
   lux/test)
 
 ## Based on org.apache.commons.math4.complex.Complex
diff --git a/stdlib/test/test/lux/math/ratio.lux b/stdlib/test/test/lux/data/number/ratio.lux
index 8af9127a1..a082050f8 100644
--- a/stdlib/test/test/lux/math/ratio.lux
+++ b/stdlib/test/test/lux/data/number/ratio.lux
@@ -6,12 +6,12 @@
              text/format
              [bool "b/" Eq<Bool>]
              [number "r/" Number<Real>]
+             ["&" number/ratio "&/" Number<Ratio>]
              (coll [list "List/" Fold<List> Functor<List>])
              [product])
        (codata function)
-       ["R" random]
-       pipe
-       ["&" math/ratio "&/" Number<Ratio>])
+       ["R" math/random]
+       pipe)
   lux/test)
 
 (def: gen-part
diff --git a/stdlib/test/test/lux/data/text.lux b/stdlib/test/test/lux/data/text.lux
index 883ff0b2b..72e633847 100644
--- a/stdlib/test/test/lux/data/text.lux
+++ b/stdlib/test/test/lux/data/text.lux
@@ -8,7 +8,7 @@
              [number]
              (coll [list]))
        (codata function)
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/effect.lux b/stdlib/test/test/lux/effect.lux
index 62c46ecb1..38ca21ce1 100644
--- a/stdlib/test/test/lux/effect.lux
+++ b/stdlib/test/test/lux/effect.lux
@@ -6,7 +6,7 @@
        (data [text]
              text/format)
        [macro]
-       ["R" random]
+       ["R" math/random]
        pipe
        effect)
   lux/test)
diff --git a/stdlib/test/test/lux/host.js.lux b/stdlib/test/test/lux/host.js.lux
index 4c2b55485..7d79b2b87 100644
--- a/stdlib/test/test/lux/host.js.lux
+++ b/stdlib/test/test/lux/host.js.lux
@@ -4,7 +4,7 @@
        (control monad)
        (data text/format)
        ["&" host]
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/host.jvm.lux b/stdlib/test/test/lux/host.jvm.lux
index 54e6cf4b9..ff875ec2a 100644
--- a/stdlib/test/test/lux/host.jvm.lux
+++ b/stdlib/test/test/lux/host.jvm.lux
@@ -8,7 +8,7 @@
              [text "Text/" Eq<Text>])
        (codata function)
        ["&" host #+ jvm-import class: interface: object]
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/lexer.lux b/stdlib/test/test/lux/lexer.lux
index 5ce15a25b..0bfd8dec7 100644
--- a/stdlib/test/test/lux/lexer.lux
+++ b/stdlib/test/test/lux/lexer.lux
@@ -7,7 +7,7 @@
              text/format
              [char "C/" Eq<Char>]
              (coll [list]))
-       ["R" random]
+       ["R" math/random]
        pipe
        ["&" lexer])
   lux/test)
diff --git a/stdlib/test/test/lux/lexer/regex.lux b/stdlib/test/test/lux/lexer/regex.lux
index 5b1cce0dd..c5c21df2a 100644
--- a/stdlib/test/test/lux/lexer/regex.lux
+++ b/stdlib/test/test/lux/lexer/regex.lux
@@ -9,7 +9,7 @@
        [compiler]
        (macro [ast]
               ["s" syntax #+ syntax:])
-       ["R" random]
+       ["R" math/random]
        pipe
        [lexer]
        (lexer ["&" regex]))
diff --git a/stdlib/test/test/lux/macro/ast.lux b/stdlib/test/test/lux/macro/ast.lux
index e8ff5e1ef..58efc1b83 100644
--- a/stdlib/test/test/lux/macro/ast.lux
+++ b/stdlib/test/test/lux/macro/ast.lux
@@ -6,7 +6,7 @@
        (data [text "T/" Eq<Text>]
              text/format
              [number])
-       ["R" random]
+       ["R" math/random]
        pipe
        (macro ["&" ast]))
   lux/test)
diff --git a/stdlib/test/test/lux/macro/poly/eq.lux b/stdlib/test/test/lux/macro/poly/eq.lux
index f3821f880..c2f9c0ac1 100644
--- a/stdlib/test/test/lux/macro/poly/eq.lux
+++ b/stdlib/test/test/lux/macro/poly/eq.lux
@@ -8,7 +8,7 @@
              [number "i/" Number<Int>]
              [char]
              [text])
-       ["R" random]
+       ["R" math/random]
        pipe
        [macro]
        (macro [poly #+ derived:]
diff --git a/stdlib/test/test/lux/macro/poly/functor.lux b/stdlib/test/test/lux/macro/poly/functor.lux
index 5f525d692..b98d75c7a 100644
--- a/stdlib/test/test/lux/macro/poly/functor.lux
+++ b/stdlib/test/test/lux/macro/poly/functor.lux
@@ -9,7 +9,7 @@
              [number "i/" Number<Int>]
              [char]
              [text])
-       ["R" random]
+       ["R" math/random]
        pipe
        [macro]
        (macro [poly #+ derived:]
diff --git a/stdlib/test/test/lux/macro/poly/text-encoder.lux b/stdlib/test/test/lux/macro/poly/text-encoder.lux
index a79af3cff..ec312e62b 100644
--- a/stdlib/test/test/lux/macro/poly/text-encoder.lux
+++ b/stdlib/test/test/lux/macro/poly/text-encoder.lux
@@ -8,7 +8,7 @@
              [number "i/" Number<Int>]
              [char]
              [text])
-       ["R" random]
+       ["R" math/random]
        pipe
        [macro]
        (macro [poly #+ derived:]
diff --git a/stdlib/test/test/lux/macro/syntax.lux b/stdlib/test/test/lux/macro/syntax.lux
index fe5b48993..329e16a0f 100644
--- a/stdlib/test/test/lux/macro/syntax.lux
+++ b/stdlib/test/test/lux/macro/syntax.lux
@@ -11,7 +11,7 @@
              [ident]
              [error #- fail])
        (codata function)
-       ["R" random]
+       ["R" math/random]
        pipe
        [compiler]
        (macro [ast]
diff --git a/stdlib/test/test/lux/math.lux b/stdlib/test/test/lux/math.lux
index 769a6f889..b1c9b100e 100644
--- a/stdlib/test/test/lux/math.lux
+++ b/stdlib/test/test/lux/math.lux
@@ -9,7 +9,7 @@
              (coll [list "List/" Fold<List> Functor<List>])
              [product])
        (codata function)
-       ["R" random]
+       ["R" math/random]
        pipe
        ["&" math])
   lux/test)
diff --git a/stdlib/test/test/lux/math/logic/continuous.lux b/stdlib/test/test/lux/math/logic/continuous.lux
index 2c13e123e..ab907d6bd 100644
--- a/stdlib/test/test/lux/math/logic/continuous.lux
+++ b/stdlib/test/test/lux/math/logic/continuous.lux
@@ -3,7 +3,7 @@
   (lux [io]
        (control monad)
        (codata function)
-       ["R" random]
+       ["R" math/random]
        pipe
        ["&" 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 5b25ecf44..45c54bb44 100644
--- a/stdlib/test/test/lux/math/logic/fuzzy.lux
+++ b/stdlib/test/test/lux/math/logic/fuzzy.lux
@@ -8,7 +8,7 @@
              [bool "B/" Eq<Bool>]
              [number]
              text/format)
-       ["R" random]
+       ["R" math/random]
        pipe
        (math/logic ["&" fuzzy]
                    continuous))
@@ -94,7 +94,6 @@
   )
 
 (test: "Gaussian"
-  #seed +1485654865687
   [deviation R;real
    center R;real
    #let [gaussian (&;gaussian deviation center)]]
diff --git a/stdlib/test/test/lux/math/simple.lux b/stdlib/test/test/lux/math/simple.lux
index ddd914bdf..7a70ec1a6 100644
--- a/stdlib/test/test/lux/math/simple.lux
+++ b/stdlib/test/test/lux/math/simple.lux
@@ -9,7 +9,7 @@
              (coll [list "List/" Fold<List> Functor<List>])
              [product])
        (codata function)
-       ["R" random]
+       ["R" math/random]
        pipe
        ["&" math/simple])
   lux/test)
diff --git a/stdlib/test/test/lux/pipe.lux b/stdlib/test/test/lux/pipe.lux
index cf53335d3..383043ebb 100644
--- a/stdlib/test/test/lux/pipe.lux
+++ b/stdlib/test/test/lux/pipe.lux
@@ -8,7 +8,7 @@
              identity
              [text "T/" Eq<Text>])
        (codata function)
-       ["R" random]
+       ["R" math/random]
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/type.lux b/stdlib/test/test/lux/type.lux
index 6d1f677c7..e9401c738 100644
--- a/stdlib/test/test/lux/type.lux
+++ b/stdlib/test/test/lux/type.lux
@@ -7,7 +7,7 @@
              [number]
              maybe
              (coll [list]))
-       ["R" random]
+       ["R" math/random]
        pipe
        ["&" type])
   lux/test)
diff --git a/stdlib/test/test/lux/type/auto.lux b/stdlib/test/test/lux/type/auto.lux
index dc28b8797..536e3b851 100644
--- a/stdlib/test/test/lux/type/auto.lux
+++ b/stdlib/test/test/lux/type/auto.lux
@@ -10,7 +10,7 @@
              [bool "B/" Eq<Bool>]
              maybe
              (coll [list]))
-       ["R" random]
+       ["R" math/random]
        pipe
        [type]
        type/auto)
diff --git a/stdlib/test/test/lux/type/check.lux b/stdlib/test/test/lux/type/check.lux
index 1e8f4c648..47904c41b 100644
--- a/stdlib/test/test/lux/type/check.lux
+++ b/stdlib/test/test/lux/type/check.lux
@@ -7,7 +7,7 @@
              [number]
              maybe
              (coll [list]))
-       ["R" random]
+       ["R" math/random]
        pipe
        [type]
        ["&" type/check])
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index e3d0e15c3..ce01da97e 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -32,6 +32,8 @@
                    [log]
                    [maybe]
                    [number]
+                   (number ["_;" ratio]
+                           ["_;" complex])
                    [product]
                    [sum]
                    [text]
@@ -49,9 +51,7 @@
                    (text [format])
                    )
              ["_;" math]
-             (math ["_;" ratio]
-                   ["_;" complex]
-                   ## ["_;" random]
+             (math ## ["_;" random]
                    ["_;" simple]
                    (logic ["_;" continuous]
                           ["_;" fuzzy]))