git.iko.soy/streamly
on master help sign in
Re-export entire submodules from Streamly.Internal.Data.Unfold (#2506)

Co-authored-by: Harendra Kumar <harendra@composewell.com>

commit6624d6c7b12939d3e109d231d0ed8a9973ca4701 authorRanjeet Ranjan <ranjeetr@composewell.com> dateThu 10 Aug 2023, 10:20 (3 years ago) parente301ee3
13 files changed+14−62
compare with master
unifiedsplit
core/src/Streamly/Internal/Data/Stream/StreamD/Generate.hs−1 core/src/Streamly/Internal/Data/Unfold.hs+2−42 core/src/Streamly/Internal/Data/Unfold/Enumeration.hs−1 core/src/Streamly/Internal/Data/Unfold/Type.hs+3−7 core/streamly-core.cabal+1−1 src/Streamly/Internal/Data/SmallArray.hs+1−1 src/Streamly/Internal/Data/Stream/IsStream/Generate.hs+1−1 src/Streamly/Internal/Data/Unfold/Exception.hs+1−3 src/Streamly/Internal/Data/Unfold/SVar.hs+1−1 src/Streamly/Internal/Network/Inet/TCP.hs+1−1 src/Streamly/Internal/Network/Socket.hs+1−1 src/Streamly/Network/Inet/TCP.hs+1−1 src/Streamly/Network/Socket.hs+1−1
core/src/Streamly/Internal/Data/Stream/StreamD/Generate.hs−1
@@ -127,7 +127,6 @@ import Streamly.Internal.System.IO (unsafeInlineIO)
127127
128128#ifdef USE_UNFOLDS_EVERYWHERE
129129import qualified Streamly.Internal.Data.Unfold as Unfold
130−import qualified Streamly.Internal.Data.Unfold.Enumeration as Unfold
131130#endif
132131
133132import Data.Fixed
core/src/Streamly/Internal/Data/Unfold.hs+2−42
@@ -16,28 +16,16 @@ module Streamly.Internal.Data.Unfold
1616 -- $setup
1717
1818 -- * Unfold Type
19− Step(..)
20− , Unfold
19+ module Streamly.Internal.Data.Unfold.Type
2120
2221 -- * Unfolds
2322 -- One to one correspondence with
2423 -- "Streamly.Internal.Data.Stream.StreamD.Generate"
2524 -- ** Basic Constructors
26− , mkUnfoldM
27− , mkUnfoldrM
28− , unfoldrM
29− , unfoldr
30− , functionM
31− , function
32− , identity
3325 , nilM
3426 , nil
3527 , consM
3628
37− -- ** From Values
38− , fromEffect
39− , fromPure
40−
4129 -- ** Generators
4230 -- | Generate a monadic stream from a seed.
4331 , repeatM
@@ -49,7 +37,6 @@ module Streamly.Internal.Data.Unfold
4937 , module Streamly.Internal.Data.Unfold.Enumeration
5038
5139 -- ** From Containers
52− , fromList
5340 , fromListM
5441
5542 -- ** From Memory
@@ -62,11 +49,6 @@ module Streamly.Internal.Data.Unfold
6249
6350 -- * Combinators
6451 -- ** Mapping on Input
65− , lmap
66− , lmapM
67− , both
68− , first
69− , second
7052 , discardFirst
7153 , discardSecond
7254 , swap
@@ -81,11 +63,6 @@ module Streamly.Internal.Data.Unfold
8163 -- input, but that might make the common case more inconvenient.
8264
8365 -- ** Mapping on Output
84− , map
85− , map2
86− , mapM
87− , mapM2
88−
8966 , postscanlM'
9067 , postscan
9168 , scan
@@ -97,8 +74,6 @@ module Streamly.Internal.Data.Unfold
9774 , either
9875
9976 -- ** Filtering
100− , takeWhileM
101− , takeWhile
10277 , take
10378 , filter
10479 , filterM
@@ -106,23 +81,8 @@ module Streamly.Internal.Data.Unfold
10681 , dropWhile
10782 , dropWhileM
10883
109− -- ** Zipping
110− , zipWithM
111− , zipWith
112−
11384 -- ** Cross product
114− , crossWithM
115− , crossWith
116− , cross
11785 , joinInnerGeneric
118− , crossApply
119−
120− -- ** Nesting
121− , ConcatState (..)
122− , many
123− , many2
124− , concatMapM
125− , bind
12686
12787 -- ** Resource Management
12888 -- | 'bracket' is the most general resource management operation, all other
@@ -160,7 +120,7 @@ import GHC.Types (SPEC(..))
160120import Streamly.Internal.Data.Fold.Type (Fold(..))
161121import Streamly.Internal.Data.IOFinalizer
162122 (newIOFinalizer, runIOFinalizer, clearingIOFinalizer)
163−import Streamly.Internal.Data.Stream.StreamD.Type (Stream(..), Step(..))
123+import Streamly.Internal.Data.Stream.StreamD.Type (Stream(..))
164124import Streamly.Internal.Data.SVar.Type (defState)
165125
166126import qualified Control.Monad.Catch as MC
core/src/Streamly/Internal/Data/Unfold/Enumeration.hs−1
@@ -65,7 +65,6 @@ import Data.Ratio
6565import Data.Word
6666import Numeric.Natural
6767import Data.Functor.Identity (Identity(..))
68−import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))
6968import Streamly.Internal.Data.Unfold.Type
7069import Prelude
7170 hiding (map, mapM, takeWhile, take, filter, const, zipWith
core/src/Streamly/Internal/Data/Unfold/Type.hs+3−7
@@ -39,17 +39,13 @@
3939
4040module Streamly.Internal.Data.Unfold.Type
4141 (
42− -- * Setup
43− -- | To execute the code examples provided in this module in ghci, please
44− -- run the following commands first.
45− --
46− -- $setup
47−
4842 -- * General Notes
4943 -- $notes
5044
5145 -- * Type
52− Unfold (..)
46+ -- StreamD Step type re-exported
47+ Step(..)
48+ , Unfold (..)
5349
5450 -- * Basic Constructors
5551 , mkUnfoldM
core/streamly-core.cabal+1−1
@@ -292,7 +292,6 @@ library
292292 , Streamly.Internal.Data.SVar.Type
293293 , Streamly.Internal.Data.Stream.StreamK.Type
294294 , Streamly.Internal.Data.Refold.Type
295− , Streamly.Internal.Data.Unfold.Type
296295 , Streamly.Internal.Data.Producer.Type
297296 , Streamly.Internal.Data.Producer
298297 , Streamly.Internal.Data.Producer.Source
@@ -427,6 +426,7 @@ library
427426 , Streamly.Internal.Data.Stream.StreamD.Transformer
428427 , Streamly.Internal.Data.Stream.StreamD.Type
429428
429+ , Streamly.Internal.Data.Unfold.Type
430430 , Streamly.Internal.Data.Unfold.Enumeration
431431
432432 if flag(dev)
src/Streamly/Internal/Data/SmallArray.hs+1−1
@@ -51,7 +51,7 @@ import Data.Functor.Identity (runIdentity)
5151import Streamly.Data.Fold (Fold)
5252import Streamly.Data.Stream (Stream)
5353import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
54−import Streamly.Internal.Data.Unfold.Type (Unfold(..))
54+import Streamly.Internal.Data.Unfold (Unfold(..))
5555
5656import qualified Streamly.Internal.Data.Stream as D
5757import qualified Streamly.Internal.Data.Fold as FL
src/Streamly/Internal/Data/Stream/IsStream/Generate.hs+1−1
@@ -92,7 +92,7 @@ where
9292import Control.Monad.IO.Class (MonadIO(..))
9393import Data.Void (Void)
9494import Streamly.Internal.Control.Concurrent (MonadAsync)
95−import Streamly.Internal.Data.Unfold.Type (Unfold)
95+import Streamly.Internal.Data.Unfold (Unfold)
9696import Streamly.Internal.Data.SVar (Rate (..))
9797import Streamly.Internal.Data.Stream.IsStream.Enumeration
9898 (Enumerable(..), enumerate, enumerateTo)
src/Streamly/Internal/Data/Unfold/Exception.hs+1−3
@@ -25,11 +25,9 @@ import Streamly.Internal.Control.Concurrent
2525 (MonadRunInIO, MonadAsync, withRunInIO)
2626import Streamly.Internal.Data.IOFinalizer.Lifted
2727 (newIOFinalizer, runIOFinalizer, clearingIOFinalizer)
28−import Streamly.Internal.Data.Stream (Step(..))
29−
3028import qualified Control.Monad.Catch as MC
3129
32−import Streamly.Internal.Data.Unfold.Type
30+import Streamly.Internal.Data.Unfold
3331
3432-- | Run the alloc action @a -> m c@ with async exceptions disabled but keeping
3533-- blocking operations interruptible (see 'Control.Exception.mask'). Use the
src/Streamly/Internal/Data/Unfold/SVar.hs+1−1
@@ -24,7 +24,7 @@ import Streamly.Internal.Control.Concurrent (MonadAsync)
2424import Streamly.Internal.Data.Stream (Step(..))
2525import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)
2626import Streamly.Internal.Data.SVar (printSVar, cleanupSVar, sendStopToProducer)
27−import Streamly.Internal.Data.Unfold.Type (Unfold(..))
27+import Streamly.Internal.Data.Unfold (Unfold(..))
2828import System.Mem (performMajorGC)
2929
3030import qualified Control.Monad.Catch as MC
src/Streamly/Internal/Network/Inet/TCP.hs+1−1
@@ -111,7 +111,7 @@ import Streamly.Internal.Data.Fold (Fold(..))
111111import Streamly.Data.Stream (Stream)
112112import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
113113import Streamly.Internal.Data.Unbox (Unbox)
114−import Streamly.Internal.Data.Unfold.Type (Unfold(..))
114+import Streamly.Internal.Data.Unfold (Unfold(..))
115115import Streamly.Internal.Network.Socket (SockSpec(..), accept, acceptor)
116116import Streamly.Internal.System.IO (defaultChunkSize)
117117
src/Streamly/Internal/Network/Socket.hs+1−1
@@ -90,7 +90,7 @@ import Streamly.Internal.Data.Array.Type (Array(..))
9090import Streamly.Internal.Data.Stream.Chunked (lpackArraysChunksOf)
9191import Streamly.Internal.Data.Fold (Fold)
9292import Streamly.Internal.Data.Stream (Stream)
93−import Streamly.Internal.Data.Unfold.Type (Unfold(..))
93+import Streamly.Internal.Data.Unfold (Unfold(..))
9494-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)
9595import Streamly.Internal.System.IO (defaultChunkSize)
9696
src/Streamly/Network/Inet/TCP.hs+1−1
@@ -58,7 +58,7 @@ where
5858import Control.Monad.IO.Class (MonadIO(..))
5959import Data.Word (Word8)
6060import Network.Socket (Socket, PortNumber)
61−import Streamly.Internal.Data.Unfold.Type (Unfold(..))
61+import Streamly.Internal.Data.Unfold (Unfold(..))
6262
6363import Streamly.Internal.Network.Inet.TCP
6464 hiding (acceptOnAddr, acceptOnPort, acceptOnPortLocal)
src/Streamly/Network/Socket.hs+1−1
@@ -136,7 +136,7 @@ where
136136import Control.Monad.IO.Class (MonadIO(..))
137137import Data.Word (Word8)
138138import Network.Socket (Socket, SockAddr)
139−import Streamly.Internal.Data.Unfold.Type (Unfold(..))
139+import Streamly.Internal.Data.Unfold (Unfold(..))
140140import Streamly.Internal.Data.Array.Type (Array(..))
141141import Streamly.Internal.Data.Unbox (Unbox)
142142