- Renamed lux/codata/* to lux/function/* and moved the lux/codata/coll/stream to lux/data/coll/stream.

31 files changed, 21 insertions, 47 deletions

diff --git a/stdlib/test/test/lux/cli.lux b/stdlib/test/test/lux/cli.lux
index e8dbf1f82..8393d459b 100644
--- a/stdlib/test/test/lux/cli.lux
+++ b/stdlib/test/test/lux/cli.lux
@@ -8,7 +8,6 @@
              [product]
              [sum]
              (coll [list]))
-       (codata function)
        ["&" cli]
        ["R" math/random]
        pipe)
diff --git a/stdlib/test/test/lux/concurrency/actor.lux b/stdlib/test/test/lux/concurrency/actor.lux
index e13a1ccc5..49100ef01 100644
--- a/stdlib/test/test/lux/concurrency/actor.lux
+++ b/stdlib/test/test/lux/concurrency/actor.lux
@@ -6,8 +6,7 @@
              text/format
              [error #- fail])
        (concurrency [promise #+ Promise Monad<Promise> "Promise/" Monad<Promise>]
-                    ["&" actor #+ actor:])
-       (codata function))
+                    ["&" actor #+ actor:]))
   lux/test)
 
 (actor: Adder
diff --git a/stdlib/test/test/lux/concurrency/frp.lux b/stdlib/test/test/lux/concurrency/frp.lux
index 80f15ad3d..6c2e9af99 100644
--- a/stdlib/test/test/lux/concurrency/frp.lux
+++ b/stdlib/test/test/lux/concurrency/frp.lux
@@ -6,8 +6,7 @@
              text/format
              [error #- fail])
        (concurrency [promise #+ Promise Monad<Promise> "Promise/" Monad<Promise>]
-                    ["&" frp])
-       (codata function))
+                    ["&" frp]))
   lux/test)
 
 (def: (List->Chan values)
diff --git a/stdlib/test/test/lux/concurrency/promise.lux b/stdlib/test/test/lux/concurrency/promise.lux
index d75d6d676..a054e5a96 100644
--- a/stdlib/test/test/lux/concurrency/promise.lux
+++ b/stdlib/test/test/lux/concurrency/promise.lux
@@ -6,7 +6,6 @@
              text/format
              [error #- fail])
        (concurrency ["&" promise])
-       (codata function)
        ["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 f9e46b91d..d48d20a9d 100644
--- a/stdlib/test/test/lux/concurrency/stm.lux
+++ b/stdlib/test/test/lux/concurrency/stm.lux
@@ -7,7 +7,6 @@
              text/format)
        (concurrency ["&" stm]
                     [promise])
-       (codata function)
        ["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 ff36cc362..3df06abcf 100644
--- a/stdlib/test/test/lux/data/coll/dict.lux
+++ b/stdlib/test/test/lux/data/coll/dict.lux
@@ -9,7 +9,6 @@
              [char]
              (coll ["&" dict]
                    [list "List/" Fold<List> Functor<List>]))
-       (codata function)
        ["R" math/random]
        pipe)
   lux/test)
diff --git a/stdlib/test/test/lux/codata/coll/stream.lux b/stdlib/test/test/lux/data/coll/stream.lux
index 4c69f9f7b..2be6aa054 100644
--- a/stdlib/test/test/lux/codata/coll/stream.lux
+++ b/stdlib/test/test/lux/data/coll/stream.lux
@@ -5,11 +5,10 @@
                 comonad)
        (data [text "Text/" Monoid<Text>]
              text/format
-             (coll [list])
+             (coll [list]
+                   ["&" stream])
              [number "Nat/" Codec<Text,Nat>])
-       (codata function
-               [cont]
-               (coll ["&" stream]))
+       (function [cont])
        ["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 888701bbe..ed0318cfe 100644
--- a/stdlib/test/test/lux/data/coll/tree/zipper.lux
+++ b/stdlib/test/test/lux/data/coll/tree/zipper.lux
@@ -8,7 +8,6 @@
              [text "Text/" Monoid<Text>]
              text/format
              [number])
-       (codata function)
        ["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 c82493df0..735374c5c 100644
--- a/stdlib/test/test/lux/data/coll/vector.lux
+++ b/stdlib/test/test/lux/data/coll/vector.lux
@@ -7,7 +7,6 @@
              [text "Text/" Monoid<Text>]
              text/format
              [number])
-       (codata function)
        ["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 96108e448..41d01077e 100644
--- a/stdlib/test/test/lux/data/error/exception.lux
+++ b/stdlib/test/test/lux/data/error/exception.lux
@@ -7,7 +7,6 @@
              [text]
              text/format
              [number])
-       (codata function)
        ["R" math/random]
        pipe)
   lux/test)
diff --git a/stdlib/test/test/lux/data/log.lux b/stdlib/test/test/lux/data/log.lux
index 8854ec191..40a124490 100644
--- a/stdlib/test/test/lux/data/log.lux
+++ b/stdlib/test/test/lux/data/log.lux
@@ -6,7 +6,6 @@
              [text "Text/" Monoid<Text> Eq<Text>]
              [number]
              [product])
-       (codata function)
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/number/complex.lux b/stdlib/test/test/lux/data/number/complex.lux
index f5c89d5ee..8ed27680c 100644
--- a/stdlib/test/test/lux/data/number/complex.lux
+++ b/stdlib/test/test/lux/data/number/complex.lux
@@ -9,7 +9,6 @@
              ["&" number/complex]
              (coll [list "List/" Fold<List> Functor<List>])
              [product])
-       (codata function)
        [math]
        ["R" math/random]
        pipe)
diff --git a/stdlib/test/test/lux/data/number/ratio.lux b/stdlib/test/test/lux/data/number/ratio.lux
index a082050f8..c1f7e104f 100644
--- a/stdlib/test/test/lux/data/number/ratio.lux
+++ b/stdlib/test/test/lux/data/number/ratio.lux
@@ -9,7 +9,6 @@
              ["&" number/ratio "&/" Number<Ratio>]
              (coll [list "List/" Fold<List> Functor<List>])
              [product])
-       (codata function)
        ["R" math/random]
        pipe)
   lux/test)
diff --git a/stdlib/test/test/lux/data/product.lux b/stdlib/test/test/lux/data/product.lux
index 3021f8b6d..00337ebfb 100644
--- a/stdlib/test/test/lux/data/product.lux
+++ b/stdlib/test/test/lux/data/product.lux
@@ -4,8 +4,7 @@
        (control monad)
        (data product
              [text "Text/" Monoid<Text>]
-             [number])
-       (codata function))
+             [number]))
   lux/test)
 
 (test: "Products"
diff --git a/stdlib/test/test/lux/data/sum.lux b/stdlib/test/test/lux/data/sum.lux
index 907eacac0..8ab124c1b 100644
--- a/stdlib/test/test/lux/data/sum.lux
+++ b/stdlib/test/test/lux/data/sum.lux
@@ -6,7 +6,6 @@
              [text "Text/" Monoid<Text>]
              [number]
              (coll [list]))
-       (codata function)
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/text.lux b/stdlib/test/test/lux/data/text.lux
index ce72cd520..4563d9b12 100644
--- a/stdlib/test/test/lux/data/text.lux
+++ b/stdlib/test/test/lux/data/text.lux
@@ -7,7 +7,6 @@
              text/format
              [number]
              (coll [list]))
-       (codata function)
        ["R" math/random]
        pipe)
   lux/test)
diff --git a/stdlib/test/test/lux/data/text/format.lux b/stdlib/test/test/lux/data/text/format.lux
index ed05a013d..97b955e20 100644
--- a/stdlib/test/test/lux/data/text/format.lux
+++ b/stdlib/test/test/lux/data/text/format.lux
@@ -4,8 +4,7 @@
        (control monad)
        (data text/format
              [text]
-             [number])
-       (codata function))
+             [number]))
   lux/test)
 
 (test: "Formatters"
diff --git a/stdlib/test/test/lux/codata/cont.lux b/stdlib/test/test/lux/function/cont.lux
index cef7661b0..ba1224bb8 100644
--- a/stdlib/test/test/lux/codata/cont.lux
+++ b/stdlib/test/test/lux/function/cont.lux
@@ -6,8 +6,7 @@
              text/format
              [number]
              [product])
-       (codata function
-               ["&" cont])
+       (function ["&" cont])
        ["R" math/random]
        pipe)
   lux/test)
diff --git a/stdlib/test/test/lux/codata/reader.lux b/stdlib/test/test/lux/function/reader.lux
index 021ee1ab9..14b95af94 100644
--- a/stdlib/test/test/lux/codata/reader.lux
+++ b/stdlib/test/test/lux/function/reader.lux
@@ -5,8 +5,7 @@
        (data [text "Text/" Monoid<Text>]
              text/format
              [number])
-       (codata function
-               ["&" reader])
+       (function ["&" reader])
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/codata/state.lux b/stdlib/test/test/lux/function/state.lux
index c6a6c7ee6..186b786e0 100644
--- a/stdlib/test/test/lux/codata/state.lux
+++ b/stdlib/test/test/lux/function/state.lux
@@ -6,8 +6,7 @@
              text/format
              [number]
              [product])
-       (codata function
-               ["&" state])
+       (function ["&" state])
        pipe)
   lux/test)
 
diff --git a/stdlib/test/test/lux/codata/thunk.lux b/stdlib/test/test/lux/function/thunk.lux
index eb6a24701..e3e9aca1b 100644
--- a/stdlib/test/test/lux/codata/thunk.lux
+++ b/stdlib/test/test/lux/function/thunk.lux
@@ -2,7 +2,7 @@
   lux
   (lux [io]
        (control monad)
-       (codata ["&" thunk])
+       (function ["&" thunk])
        pipe
        ["R" math/random])
   lux/test)
diff --git a/stdlib/test/test/lux/host.jvm.lux b/stdlib/test/test/lux/host.jvm.lux
index ff875ec2a..f58b706d5 100644
--- a/stdlib/test/test/lux/host.jvm.lux
+++ b/stdlib/test/test/lux/host.jvm.lux
@@ -6,7 +6,6 @@
              [number]
              [product]
              [text "Text/" Eq<Text>])
-       (codata function)
        ["&" host #+ jvm-import class: interface: object]
        ["R" math/random]
        pipe)
diff --git a/stdlib/test/test/lux/io.lux b/stdlib/test/test/lux/io.lux
index e7238aef1..839996e81 100644
--- a/stdlib/test/test/lux/io.lux
+++ b/stdlib/test/test/lux/io.lux
@@ -4,8 +4,7 @@
        (control monad)
        (data [text "Text/" Monoid<Text> Eq<Text>]
              text/format
-             [number])
-       (codata function))
+             [number]))
   lux/test)
 
 (test: "I/O"
diff --git a/stdlib/test/test/lux/macro/ast.lux b/stdlib/test/test/lux/macro/ast.lux
index 58efc1b83..768dafbf8 100644
--- a/stdlib/test/test/lux/macro/ast.lux
+++ b/stdlib/test/test/lux/macro/ast.lux
@@ -1,7 +1,6 @@
 (;module:
   lux
   (lux [io]
-       (codata function)
        (control monad)
        (data [text "T/" Eq<Text>]
              text/format
diff --git a/stdlib/test/test/lux/macro/syntax.lux b/stdlib/test/test/lux/macro/syntax.lux
index 329e16a0f..b9dd304e1 100644
--- a/stdlib/test/test/lux/macro/syntax.lux
+++ b/stdlib/test/test/lux/macro/syntax.lux
@@ -10,7 +10,6 @@
              [char]
              [ident]
              [error #- fail])
-       (codata function)
        ["R" math/random]
        pipe
        [compiler]
diff --git a/stdlib/test/test/lux/math.lux b/stdlib/test/test/lux/math.lux
index b1c9b100e..4d8b8d12a 100644
--- a/stdlib/test/test/lux/math.lux
+++ b/stdlib/test/test/lux/math.lux
@@ -8,7 +8,6 @@
              [number "r/" Number<Real>]
              (coll [list "List/" Fold<List> Functor<List>])
              [product])
-       (codata function)
        ["R" math/random]
        pipe
        ["&" math])
diff --git a/stdlib/test/test/lux/math/logic/continuous.lux b/stdlib/test/test/lux/math/logic/continuous.lux
index ab907d6bd..fa08ec864 100644
--- a/stdlib/test/test/lux/math/logic/continuous.lux
+++ b/stdlib/test/test/lux/math/logic/continuous.lux
@@ -2,7 +2,6 @@
   lux
   (lux [io]
        (control monad)
-       (codata function)
        ["R" math/random]
        pipe
        ["&" math/logic/continuous])
diff --git a/stdlib/test/test/lux/math/logic/fuzzy.lux b/stdlib/test/test/lux/math/logic/fuzzy.lux
index 45c54bb44..afcd8b731 100644
--- a/stdlib/test/test/lux/math/logic/fuzzy.lux
+++ b/stdlib/test/test/lux/math/logic/fuzzy.lux
@@ -2,7 +2,6 @@
   lux
   (lux [io]
        (control monad)
-       (codata function)
        (data (coll [list]
                    [set])
              [bool "B/" Eq<Bool>]
@@ -16,6 +15,7 @@
 
 (do-template [<desc> <gen> <triangle> <lt> <lte> <gt> <gte>]
   [(test: (format "[" <desc> "] " "Triangles")
+     #seed +1981055421923629192
      [x <gen>
       y <gen>
       z <gen>
@@ -52,6 +52,7 @@
 
 (do-template [<desc> <gen> <trapezoid> <lt> <lte> <gt> <gte>]
   [(test: (format "[" <desc> "] " "Trapezoids")
+     #seed +8418494856347027801
      [w <gen>
       x <gen>
       y <gen>
@@ -94,6 +95,7 @@
   )
 
 (test: "Gaussian"
+  #seed +1000679812414
   [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 7a70ec1a6..32f5fb20c 100644
--- a/stdlib/test/test/lux/math/simple.lux
+++ b/stdlib/test/test/lux/math/simple.lux
@@ -8,7 +8,6 @@
              [number "r/" Number<Real>]
              (coll [list "List/" Fold<List> Functor<List>])
              [product])
-       (codata function)
        ["R" math/random]
        pipe
        ["&" math/simple])
diff --git a/stdlib/test/test/lux/pipe.lux b/stdlib/test/test/lux/pipe.lux
index 383043ebb..08866a3f4 100644
--- a/stdlib/test/test/lux/pipe.lux
+++ b/stdlib/test/test/lux/pipe.lux
@@ -7,7 +7,6 @@
              [product]
              identity
              [text "T/" Eq<Text>])
-       (codata function)
        ["R" math/random]
        pipe)
   lux/test)
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index 53a003756..ca0079092 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -12,11 +12,10 @@
              ["_;" pipe]
              ["_;" lexer]
              (lexer ["_;" regex])
-             (codata ["_;" cont]
-                     ["_;" reader]
-                     ["_;" state]
-                     ["_;" thunk]
-                     (coll ["_;" stream]))
+             (function ["_;" cont]
+                       ["_;" reader]
+                       ["_;" state]
+                       ["_;" thunk])
              (concurrency ["_;" actor]
                           ["_;" atom]
                           ["_;" frp]
@@ -51,7 +50,8 @@
                          (tree [rose]
                                [zipper])
                          ["_;" seq]
-                         ["_;" priority-queue])
+                         ["_;" priority-queue]
+                         ["_;" stream])
                    (text [format])
                    )
              ["_;" math]