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

15 files changed, 10 insertions, 16 deletions

diff --git a/stdlib/source/lux/concurrency/actor.lux b/stdlib/source/lux/concurrency/actor.lux
index 97ce7dec3..56b40f41b 100644
--- a/stdlib/source/lux/concurrency/actor.lux
+++ b/stdlib/source/lux/concurrency/actor.lux
@@ -2,7 +2,7 @@
   lux
   (lux (control monad)
        [io #- run]
-       (codata function)
+       function
        (data [error #- fail]
              text/format
              (coll [list "List/" Monoid<List> Monad<List>])
diff --git a/stdlib/source/lux/concurrency/frp.lux b/stdlib/source/lux/concurrency/frp.lux
index f84103e3f..6d18a73bb 100644
--- a/stdlib/source/lux/concurrency/frp.lux
+++ b/stdlib/source/lux/concurrency/frp.lux
@@ -5,7 +5,6 @@
                 monad
                 eq)
        [io #- run]
-       (codata function)
        (data (coll [list "L/" Monoid<List>])
              text/format)
        [compiler]
diff --git a/stdlib/source/lux/concurrency/promise.lux b/stdlib/source/lux/concurrency/promise.lux
index ef7efd923..e94aa68e5 100644
--- a/stdlib/source/lux/concurrency/promise.lux
+++ b/stdlib/source/lux/concurrency/promise.lux
@@ -5,7 +5,7 @@
              text/format
              error)
        [io #- run]
-       (codata function)
+       function
        (control functor
                 applicative
                 monad)
diff --git a/stdlib/source/lux/control/order.lux b/stdlib/source/lux/control/order.lux
index 153100cff..eb2a6f81b 100644
--- a/stdlib/source/lux/control/order.lux
+++ b/stdlib/source/lux/control/order.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
-  (.. eq)
-  lux/codata/function)
+  (lux function)
+  (.. eq))
 
 ## [Signatures]
 (sig: #export (Order a)
diff --git a/stdlib/source/lux/data/bool.lux b/stdlib/source/lux/data/bool.lux
index 0b8d207fc..2d89de635 100644
--- a/stdlib/source/lux/data/bool.lux
+++ b/stdlib/source/lux/data/bool.lux
@@ -2,8 +2,7 @@
   lux
   (lux (control monoid
                 eq
-                codec)
-       (codata function)))
+                codec)))
 
 ## [Structures]
 (struct: #export _ (Eq Bool)
diff --git a/stdlib/source/lux/data/coll/list.lux b/stdlib/source/lux/data/coll/list.lux
index 5f2ef3984..4f93bb541 100644
--- a/stdlib/source/lux/data/coll/list.lux
+++ b/stdlib/source/lux/data/coll/list.lux
@@ -8,8 +8,7 @@
                 [fold])
        (data [number "Int/" Number<Int> Codec<Text,Int>]
              bool
-             [product])
-       codata/function))
+             [product])))
 
 ## [Types]
 ## (type: (List a)
diff --git a/stdlib/source/lux/data/coll/set.lux b/stdlib/source/lux/data/coll/set.lux
index 3ac6725c1..e10f20488 100644
--- a/stdlib/source/lux/data/coll/set.lux
+++ b/stdlib/source/lux/data/coll/set.lux
@@ -6,8 +6,7 @@
                 eq
                 [hash #*])
        (data (coll [dict]
-                   [list "List/" Fold<List> Functor<List>]))
-       (codata function)))
+                   [list "List/" Fold<List> Functor<List>]))))
 
 ## [Types]
 (type: #export (Set a)
diff --git a/stdlib/source/lux/codata/coll/stream.lux b/stdlib/source/lux/data/coll/stream.lux
index 3089fe1b2..5cb0829e9 100644
--- a/stdlib/source/lux/codata/coll/stream.lux
+++ b/stdlib/source/lux/data/coll/stream.lux
@@ -7,7 +7,7 @@
        (macro ["s" syntax #+ syntax: Syntax])
        (data (coll [list "List/" Monad<List>])
              bool)
-       (codata [cont #+ @lazy Cont])))
+       (function [cont #+ @lazy Cont])))
 
 ## [Types]
 (type: #export (Stream a)
diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/lux/data/format/json.lux
index 8565fb32f..066777fdf 100644
--- a/stdlib/source/lux/data/format/json.lux
+++ b/stdlib/source/lux/data/format/json.lux
@@ -19,7 +19,6 @@
              (coll [list "" Fold<List> "List/" Monad<List>]
                    [vector #+ Vector vector "Vector/" Monad<Vector>]
                    [dict #+ Dict]))
-       (codata [function])
        [compiler #+ Monad<Lux> with-gensyms]
        (macro [syntax #+ syntax:]
               [ast]
diff --git a/stdlib/source/lux/codata/function.lux b/stdlib/source/lux/function.lux
index cddf5d472..cddf5d472 100644
--- a/stdlib/source/lux/codata/function.lux
+++ b/stdlib/source/lux/function.lux
diff --git a/stdlib/source/lux/codata/cont.lux b/stdlib/source/lux/function/cont.lux
index 7f1b918f0..f6330cbe4 100644
--- a/stdlib/source/lux/codata/cont.lux
+++ b/stdlib/source/lux/function/cont.lux
@@ -4,8 +4,8 @@
        (control functor
                 applicative
                 monad)
-       (data (coll list)))
-  (.. function))
+       (data (coll list))
+       function))
 
 ## [Types]
 (type: #export (Cont a)
diff --git a/stdlib/source/lux/codata/reader.lux b/stdlib/source/lux/function/reader.lux
index 955b4bba3..955b4bba3 100644
--- a/stdlib/source/lux/codata/reader.lux
+++ b/stdlib/source/lux/function/reader.lux
diff --git a/stdlib/source/lux/codata/state.lux b/stdlib/source/lux/function/state.lux
index 5f5b96e4b..5f5b96e4b 100644
--- a/stdlib/source/lux/codata/state.lux
+++ b/stdlib/source/lux/function/state.lux
diff --git a/stdlib/source/lux/codata/thunk.lux b/stdlib/source/lux/function/thunk.lux
index 12af1dfe2..12af1dfe2 100644
--- a/stdlib/source/lux/codata/thunk.lux
+++ b/stdlib/source/lux/function/thunk.lux
diff --git a/stdlib/source/lux/host.jvm.lux b/stdlib/source/lux/host.jvm.lux
index 002208fd2..a527a7dda 100644
--- a/stdlib/source/lux/host.jvm.lux
+++ b/stdlib/source/lux/host.jvm.lux
@@ -3,7 +3,6 @@
   (lux (control monad
                 [enum])
        [io #+ IO Monad<IO> io]
-       (codata function)
        (data (coll [list #* "" Functor<List> Fold<List> "List/" Monad<List> Monoid<List>]
                    [array #+ Array])
              number