on master help sign in
Move StreamK and StreamD folder up (#2543)
commit1c584e545a61809eec89c3e8c19659a9f23fc7f0 authorRanjeet Ranjan <ranjeetr@composewell.com> dateSat 19 Aug 2023, 15:38 (3 years ago) parente2d5628
50 files changed+180−192
.github/workflows/regression-check.yml+2−2 benchmark/Streamly/Benchmark/Data/Stream/StreamD.hs+1−1 benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs+1−1 benchmark/Streamly/Benchmark/Data/Stream/StreamKAlt.hs+1−1 benchmark/Streamly/Benchmark/Data/Stream/ToStreamK.hs+1−1 benchmark/Streamly/Benchmark/Unicode/Stream.hs+1−1 benchmark/bench-runner/Main.hs+2−2 benchmark/streamly-benchmarks.cabal+3−3 core/src/Streamly/Data/Stream.hs−10 core/src/Streamly/Data/Unfold.hs+1−1 core/src/Streamly/Internal/Data/Array/Generic.hs+3−3 core/src/Streamly/Internal/Data/Array/Type.hs+4−4 core/src/Streamly/Internal/Data/Fold/Combinators.hs+2−2 core/src/Streamly/Internal/Data/Fold/Type.hs+1−1 core/src/Streamly/Internal/Data/IORef/Unboxed.hs+1−1 core/src/Streamly/Internal/Data/List.hs+5−5 core/src/Streamly/Internal/Data/MutArray/Generic.hs+5−5 core/src/Streamly/Internal/Data/MutArray/Type.hs+5−5 core/src/Streamly/Internal/Data/Parser.hs+3−3 core/src/Streamly/Internal/Data/Parser/ParserDK.hs+2−2 core/src/Streamly/Internal/Data/Producer.hs+2−2 core/src/Streamly/Internal/Data/Producer/Source.hs+1−1 core/src/Streamly/Internal/Data/Producer/Type.hs+1−1 core/src/Streamly/Internal/Data/Ring.hs+2−2 core/src/Streamly/Internal/Data/Ring/Generic.hs+2−2 core/src/Streamly/Internal/Data/Stream.hs+20−20 core/src/Streamly/Internal/Data/Stream/Common.hs+2−2 core/src/Streamly/Internal/Data/Stream/StreamD/Container.hs → core/src/Streamly/Internal/Data/Stream/Container.hs+9−9 core/src/Streamly/Internal/Data/Stream/StreamD/Eliminate.hs → core/src/Streamly/Internal/Data/Stream/Eliminate.hs+6−8 core/src/Streamly/Internal/Data/Stream/StreamD/Exception.hs → core/src/Streamly/Internal/Data/Stream/Exception.hs+3−3 core/src/Streamly/Internal/Data/Stream/StreamD/Generate.hs → core/src/Streamly/Internal/Data/Stream/Generate.hs+3−3 core/src/Streamly/Internal/Data/Stream/StreamD/Lift.hs → core/src/Streamly/Internal/Data/Stream/Lift.hs+3−3 core/src/Streamly/Internal/Data/Stream/MutChunked.hs+1−1 core/src/Streamly/Internal/Data/Stream/StreamD/Nesting.hs → core/src/Streamly/Internal/Data/Stream/Nesting.hs+4−4 core/src/Streamly/Internal/Data/Stream/StreamD/Step.hs → core/src/Streamly/Internal/Data/Stream/Step.hs+2−2 core/src/Streamly/Internal/Data/Stream/StreamD/Top.hs → core/src/Streamly/Internal/Data/Stream/Top.hs+6−6 core/src/Streamly/Internal/Data/Stream/StreamD/Transform.hs → core/src/Streamly/Internal/Data/Stream/Transform.hs+5−5 core/src/Streamly/Internal/Data/Stream/StreamD/Transformer.hs → core/src/Streamly/Internal/Data/Stream/Transformer.hs+3−3 core/src/Streamly/Internal/Data/Stream/StreamD/Type.hs → core/src/Streamly/Internal/Data/Stream/Type.hs+17−17 core/src/Streamly/Internal/Data/StreamK.hs+4−4 core/src/Streamly/Internal/Data/Stream/StreamK/Alt.hs → core/src/Streamly/Internal/Data/StreamK/Alt.hs+1−1 core/src/Streamly/Internal/Data/Stream/StreamK/Transformer.hs → core/src/Streamly/Internal/Data/StreamK/Transformer.hs+3−3 core/src/Streamly/Internal/Data/Stream/StreamK/Type.hs → core/src/Streamly/Internal/Data/StreamK/Type.hs+6−6 core/src/Streamly/Internal/Data/Unfold.hs+4−4 core/src/Streamly/Internal/Data/Unfold/Type.hs+1−1 core/src/Streamly/Internal/FileSystem/Handle.hs+2−2 core/src/Streamly/Internal/Unicode/Stream.hs+4−4 core/streamly-core.cabal+15−15 hie.yaml+2−2 targets/Targets.hs+2−2
.github/workflows/regression-check.yml+2−2
@@ -26,8 +26,8 @@ jobs:
2626 Data.Fold.Window
2727 Data.Parser
2828 Data.ParserK
29− Data.Stream.StreamD
30− Data.Stream.StreamK:6
29+ Data.StreamD
30+ Data.StreamK:6
3131 Data.Unfold
3232 Data.Stream
3333 Data.Stream.Concurrent
benchmark/Streamly/Benchmark/Data/Stream/StreamD.hs+1−1
@@ -461,7 +461,7 @@ inspect $ 'unfoldManyRepl `hasNoType` ''SPEC
461461-------------------------------------------------------------------------------
462462
463463moduleName :: String
464−moduleName = "Data.Stream.StreamD"
464+moduleName = "Data.StreamD"
465465
466466o_1_space :: [Benchmark]
467467o_1_space =
benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs+1−1
@@ -632,7 +632,7 @@ filterAllInNestedList str = do
632632-------------------------------------------------------------------------------
633633
634634moduleName :: String
635−moduleName = "Data.Stream.StreamK"
635+moduleName = "Data.StreamK"
636636
637637o_1_space_generation :: Int -> Benchmark
638638o_1_space_generation streamLen =
benchmark/Streamly/Benchmark/Data/Stream/StreamKAlt.hs+1−1
@@ -18,7 +18,7 @@ import Prelude hiding ()
1818-- import qualified Prelude as P
1919-- import qualified Data.List as List
2020
21−import qualified Streamly.Internal.Data.Stream.StreamK.Alt as S
21+import qualified Streamly.Internal.Data.StreamK.Alt as S
2222-- import qualified Streamly.Internal.Data.Stream.Common as SP
2323-- import qualified Streamly.Internal.Data.SVar as S
2424
benchmark/Streamly/Benchmark/Data/Stream/ToStreamK.hs+1−1
@@ -1,5 +1,5 @@
11-- |
2−-- Module : Streamly.Benchmark.Data.Stream.StreamK
2+-- Module : Streamly.Benchmark.Data.StreamK
33-- Copyright : (c) 2018 Composewell Technologies
44--
55-- License : BSD3
benchmark/Streamly/Benchmark/Unicode/Stream.hs+1−1
@@ -39,7 +39,7 @@ import Streamly.Benchmark.Common.Handle
3939
4040#ifdef INSPECTION
4141import Streamly.Internal.Data.Unbox (Unbox)
42−import Streamly.Internal.Data.Stream.StreamD (Step(..))
42+import Streamly.Internal.Data.Stream (Step(..))
4343import qualified Streamly.Internal.Data.Fold as Fold
4444import qualified Streamly.Internal.Data.Tuple.Strict as Strict
4545import qualified Streamly.Internal.Data.Array as Array
benchmark/bench-runner/Main.hs+2−2
@@ -60,9 +60,9 @@ rtsOpts exeName benchName0 = unwords [general, exeSpecific, benchSpecific]
6060
6161 -----------------------------------------------------------------------
6262
63− | "Data.Stream.StreamD/o-n-space.elimination.toList" == benchName =
63+ | "Data.StreamD/o-n-space.elimination.toList" == benchName =
6464 "-K2M"
65− | "Data.Stream.StreamK/o-n-space.elimination.toList" == benchName =
65+ | "Data.StreamK/o-n-space.elimination.toList" == benchName =
6666 "-K2M"
6767
6868 -----------------------------------------------------------------------
benchmark/streamly-benchmarks.cabal+3−3
@@ -467,7 +467,7 @@ benchmark Data.ParserK.Chunked.Generic
467467-- Raw Streams
468468-------------------------------------------------------------------------------
469469
470−benchmark Data.Stream.StreamD
470+benchmark Data.StreamD
471471 import: bench-options
472472 type: exitcode-stdio-1.0
473473 hs-source-dirs: Streamly/Benchmark/Data/Stream
@@ -475,7 +475,7 @@ benchmark Data.Stream.StreamD
475475 if impl(ghcjs)
476476 buildable: False
477477
478−benchmark Data.Stream.StreamK
478+benchmark Data.StreamK
479479 import: bench-options
480480 type: exitcode-stdio-1.0
481481 hs-source-dirs: Streamly/Benchmark/Data/Stream
@@ -491,7 +491,7 @@ benchmark Data.Stream.ToStreamK
491491 if !flag(dev) || impl(ghcjs)
492492 buildable: False
493493
494−benchmark Data.Stream.StreamK.Alt
494+benchmark Data.StreamK.Alt
495495 import: bench-options
496496 type: exitcode-stdio-1.0
497497 hs-source-dirs: Streamly/Benchmark/Data/Stream
core/src/Streamly/Data/Stream.hs−10
@@ -42,9 +42,6 @@ module Streamly.Data.Stream
4242 -- * Construction
4343 -- | Functions ending in the general shape @b -> Stream m a@.
4444 --
45− -- See also: "Streamly.Internal.Data.Stream.StreamD.Generate" for
46− -- @Pre-release@ functions.
47− --
4845 -- Useful Idioms:
4946 --
5047 -- >>> fromIndices f = fmap f $ Stream.enumerateFrom 0
@@ -117,8 +114,6 @@ module Streamly.Data.Stream
117114 -- | Functions ending in the general shape @Stream m a -> m b@ or @Stream m
118115 -- a -> m (b, Stream m a)@
119116 --
120− -- See also: "Streamly.Internal.Data.Stream.StreamD.Eliminate" for @Pre-release@
121− -- functions.
122117
123118-- EXPLANATION: In imperative terms a fold can be considered as a loop over the stream
124119-- that reduces the stream to a single value.
@@ -259,8 +254,6 @@ module Streamly.Data.Stream
259254 -- * Scanning
260255 -- | Stateful one-to-one transformations.
261256 --
262− -- See also: "Streamly.Internal.Data.Stream.StreamD.Transform" for
263− -- @Pre-release@ functions.
264257
265258 {-
266259 -- ** Left scans
@@ -485,9 +478,6 @@ module Streamly.Data.Stream
485478 -- For example, instead of calling them on a stream of chars call them on a
486479 -- stream of arrays before flattening it to a stream of chars.
487480 --
488− -- See also: "Streamly.Internal.Data.Stream.StreamD.Exception" for
489− -- @Pre-release@ functions.
490−
491481 , onException
492482 , handle
493483
core/src/Streamly/Data/Unfold.hs+1−1
@@ -39,7 +39,7 @@ module Streamly.Data.Unfold
3939
4040 -- * Unfolds
4141 -- One to one correspondence with
42− -- "Streamly.Internal.Data.Stream.StreamD.Generate"
42+ -- "Streamly.Internal.Data.Stream.Generate"
4343
4444 -- ** Basic Constructors
4545 , unfoldrM
core/src/Streamly/Internal/Data/Array/Generic.hs+3−3
@@ -59,7 +59,7 @@ import GHC.IO (unsafePerformIO)
5959import Text.Read (readPrec)
6060
6161import Streamly.Internal.Data.Fold.Type (Fold(..))
62−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
62+import Streamly.Internal.Data.Stream.Type (Stream)
6363import Streamly.Internal.Data.Unfold.Type (Unfold(..))
6464import Streamly.Internal.System.IO (unsafeInlineIO)
6565
@@ -68,8 +68,8 @@ import qualified Streamly.Internal.Data.Fold.Type as FL
6868import qualified Streamly.Internal.Data.Producer.Type as Producer
6969import qualified Streamly.Internal.Data.Producer as Producer
7070import qualified Streamly.Internal.Data.Ring.Generic as RB
71−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
72−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as D
71+import qualified Streamly.Internal.Data.Stream.Type as D
72+import qualified Streamly.Internal.Data.Stream.Generate as D
7373import qualified Text.ParserCombinators.ReadPrec as ReadPrec
7474
7575import Prelude hiding (Foldable(..), read)
core/src/Streamly/Internal/Data/Array/Type.hs+4−4
@@ -105,7 +105,7 @@ import GHC.IO (unsafePerformIO)
105105import GHC.Ptr (Ptr(..))
106106import Streamly.Internal.Data.MutArray.Type (MutArray(..), MutableByteArray)
107107import Streamly.Internal.Data.Fold.Type (Fold(..))
108−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
108+import Streamly.Internal.Data.Stream.Type (Stream)
109109import Streamly.Internal.Data.Unbox (Unbox(..))
110110import Streamly.Internal.Data.Unfold.Type (Unfold(..))
111111import Text.Read (readPrec)
@@ -114,9 +114,9 @@ import Prelude hiding (Foldable(..), read, unlines, splitAt)
114114
115115import qualified GHC.Exts as Exts
116116import qualified Streamly.Internal.Data.MutArray.Type as MA
117−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
118−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as D
119−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
117+import qualified Streamly.Internal.Data.Stream.Type as D
118+import qualified Streamly.Internal.Data.Stream.Generate as D
119+import qualified Streamly.Internal.Data.StreamK.Type as K
120120import qualified Streamly.Internal.Data.Unbox as Unboxed
121121import qualified Streamly.Internal.Data.Unfold.Type as Unfold
122122import qualified Text.ParserCombinators.ReadPrec as ReadPrec
core/src/Streamly/Internal/Data/Fold/Combinators.hs+2−2
@@ -240,7 +240,7 @@ import Streamly.Internal.Data.Pipe.Type (Pipe (..), PipeState(..))
240240import Streamly.Internal.Data.Unbox (Unbox, sizeOf)
241241import Streamly.Internal.Data.Unfold.Type (Unfold(..))
242242import Streamly.Internal.Data.Tuple.Strict (Tuple'(..), Tuple3'(..))
243−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
243+import Streamly.Internal.Data.Stream.Type (Stream)
244244
245245import qualified Prelude
246246import qualified Streamly.Internal.Data.MutArray.Type as MA
@@ -248,7 +248,7 @@ import qualified Streamly.Internal.Data.Array.Type as Array
248248import qualified Streamly.Internal.Data.Fold.Window as Fold
249249import qualified Streamly.Internal.Data.Pipe.Type as Pipe
250250import qualified Streamly.Internal.Data.Ring as Ring
251−import qualified Streamly.Internal.Data.Stream.StreamD.Type as StreamD
251+import qualified Streamly.Internal.Data.Stream.Type as StreamD
252252
253253import Prelude hiding
254254 ( Foldable(..), filter, drop, dropWhile, take, takeWhile, zipWith
core/src/Streamly/Internal/Data/Fold/Type.hs+1−1
@@ -452,7 +452,7 @@ import Streamly.Internal.Data.Maybe.Strict (Maybe'(..), toMaybe)
452452import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
453453import Streamly.Internal.Data.Refold.Type (Refold(..))
454454
455−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
455+import qualified Streamly.Internal.Data.StreamK.Type as K
456456
457457import Prelude hiding (Foldable(..), concatMap, filter, map, take)
458458
core/src/Streamly/Internal/Data/IORef/Unboxed.hs+1−1
@@ -47,7 +47,7 @@ import Streamly.Internal.Data.Unbox
4747 , sizeOf
4848 )
4949
50−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
50+import qualified Streamly.Internal.Data.Stream.Type as D
5151
5252-- | An 'IORef' holds a single 'Unbox'-able value.
5353newtype IORef a = IORef MutableByteArray
core/src/Streamly/Internal/Data/List.hs+5−5
@@ -66,19 +66,19 @@ where
6666import Control.Arrow (second)
6767import Data.Functor.Identity (Identity, runIdentity)
6868import GHC.Exts (IsList(..), IsString(..))
69−import Streamly.Internal.Data.Stream.StreamD.Type
69+import Streamly.Internal.Data.Stream.Type
7070 ( CrossStream
7171 , mkCross
7272 , unCross
7373 )
74−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
74+import Streamly.Internal.Data.Stream.Type (Stream)
7575import Text.Read
7676 ( Lexeme(Ident), lexP, parens, prec, readPrec, readListPrec
7777 , readListPrecDefault)
7878
79−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
80−import qualified Streamly.Internal.Data.Stream.StreamD.Type as Stream
81−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as Stream
79+import qualified Streamly.Internal.Data.StreamK.Type as K
80+import qualified Streamly.Internal.Data.Stream.Type as Stream
81+import qualified Streamly.Internal.Data.Stream.Generate as Stream
8282
8383-- XXX Rename to PureStream.
8484
core/src/Streamly/Internal/Data/MutArray/Generic.hs+5−5
@@ -182,15 +182,15 @@ import GHC.Int (Int(..))
182182import Streamly.Internal.Data.Fold.Type (Fold(..))
183183import Streamly.Internal.Data.Producer.Type (Producer (..))
184184import Streamly.Internal.Data.Unfold.Type (Unfold(..))
185−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
185+import Streamly.Internal.Data.Stream.Type (Stream)
186186import Streamly.Internal.Data.SVar.Type (adaptState)
187187
188188import qualified Streamly.Internal.Data.Fold.Type as FL
189189import qualified Streamly.Internal.Data.Producer as Producer
190−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
191−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as D
192−import qualified Streamly.Internal.Data.Stream.StreamD.Lift as D
193−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
190+import qualified Streamly.Internal.Data.Stream.Type as D
191+import qualified Streamly.Internal.Data.Stream.Generate as D
192+import qualified Streamly.Internal.Data.Stream.Lift as D
193+import qualified Streamly.Internal.Data.StreamK.Type as K
194194
195195import Prelude hiding (read, length)
196196
core/src/Streamly/Internal/Data/MutArray/Type.hs+5−5
@@ -256,17 +256,17 @@ import GHC.Ptr (Ptr(..))
256256
257257import Streamly.Internal.Data.Fold.Type (Fold(..))
258258import Streamly.Internal.Data.Producer.Type (Producer (..))
259−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
260−import Streamly.Internal.Data.Stream.StreamK.Type (StreamK)
259+import Streamly.Internal.Data.Stream.Type (Stream)
260+import Streamly.Internal.Data.StreamK.Type (StreamK)
261261import Streamly.Internal.Data.SVar.Type (adaptState, defState)
262262import Streamly.Internal.Data.Unfold.Type (Unfold(..))
263263import Streamly.Internal.System.IO (arrayPayloadSize, defaultChunkSize)
264264
265265import qualified Streamly.Internal.Data.Fold.Type as FL
266266import qualified Streamly.Internal.Data.Producer as Producer
267−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
268−import qualified Streamly.Internal.Data.Stream.StreamD.Lift as D
269−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
267+import qualified Streamly.Internal.Data.Stream.Type as D
268+import qualified Streamly.Internal.Data.Stream.Lift as D
269+import qualified Streamly.Internal.Data.StreamK.Type as K
270270import qualified Streamly.Internal.Data.Unbox as Unboxed
271271import qualified Prelude
272272
core/src/Streamly/Internal/Data/Parser.hs+3−3
@@ -266,12 +266,12 @@ import Streamly.Internal.Data.SVar.Type (defState)
266266import Streamly.Internal.Data.Either.Strict (Either'(..))
267267import Streamly.Internal.Data.Maybe.Strict (Maybe'(..))
268268import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
269−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
269+import Streamly.Internal.Data.Stream.Type (Stream)
270270
271271import qualified Data.Foldable as Foldable
272272import qualified Streamly.Internal.Data.Fold.Type as FL
273−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
274−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as D
273+import qualified Streamly.Internal.Data.Stream.Type as D
274+import qualified Streamly.Internal.Data.Stream.Generate as D
275275
276276import Prelude hiding
277277 (any, all, take, takeWhile, sequence, concatMap, maybe, either, span
core/src/Streamly/Internal/Data/Parser/ParserDK.hs+2−2
@@ -261,8 +261,8 @@ import qualified Streamly.Internal.Data.Parser.ParserK.Type as K
261261import Streamly.Internal.Data.StreamK (Stream)
262262import qualified Streamly.Internal.Data.StreamK as Stream
263263#else
264−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
265−import qualified Streamly.Internal.Data.Stream.StreamD.Type as Stream
264+import Streamly.Internal.Data.Stream.Type (Stream)
265+import qualified Streamly.Internal.Data.Stream.Type as Stream
266266#endif
267267
268268import Prelude hiding
core/src/Streamly/Internal/Data/Producer.hs+2−2
@@ -36,8 +36,8 @@ where
3636
3737#include "inline.hs"
3838
39−import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))
40−import Streamly.Internal.Data.Stream.StreamD.Type (Stream(..))
39+import Streamly.Internal.Data.Stream.Step (Step(..))
40+import Streamly.Internal.Data.Stream.Type (Stream(..))
4141import Streamly.Internal.Data.SVar.Type (defState)
4242import Streamly.Internal.Data.Unfold.Type (Unfold(..))
4343
core/src/Streamly/Internal/Data/Producer/Source.hs+1−1
@@ -38,7 +38,7 @@ import GHC.Exts (SpecConstrAnnotation(..))
3838import GHC.Types (SPEC(..))
3939import Streamly.Internal.Data.Parser (ParseError(..), Step(..))
4040import Streamly.Internal.Data.Producer.Type (Producer(..))
41−import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))
41+import Streamly.Internal.Data.Stream.Step (Step(..))
4242
4343import qualified Streamly.Internal.Data.Parser as ParserD
4444-- import qualified Streamly.Internal.Data.Parser.ParserK.Type as ParserK
core/src/Streamly/Internal/Data/Producer/Type.hs+1−1
@@ -33,7 +33,7 @@ where
3333#include "inline.hs"
3434
3535import Fusion.Plugin.Types (Fuse(..))
36−import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))
36+import Streamly.Internal.Data.Stream.Step (Step(..))
3737import Prelude hiding (concat, map)
3838
3939------------------------------------------------------------------------------
core/src/Streamly/Internal/Data/Ring.hs+2−2
@@ -84,8 +84,8 @@ import GHC.ForeignPtr (mallocPlainForeignPtrAlignedBytes)
8484import GHC.Ptr (Ptr(..))
8585import Streamly.Internal.Data.MutArray.Type (MutArray)
8686import Streamly.Internal.Data.Fold.Type (Fold(..), Step(..), lmap)
87−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
88−import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))
87+import Streamly.Internal.Data.Stream.Type (Stream)
88+import Streamly.Internal.Data.Stream.Step (Step(..))
8989import Streamly.Internal.Data.Unfold.Type (Unfold(..))
9090import Streamly.Internal.System.IO (unsafeInlineIO)
9191
core/src/Streamly/Internal/Data/Ring/Generic.hs+2−2
@@ -26,7 +26,7 @@ module Streamly.Internal.Data.Ring.Generic
2626#include "assert.hs"
2727
2828import Control.Monad.IO.Class (liftIO, MonadIO)
29−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
29+import Streamly.Internal.Data.Stream.Type (Stream)
3030import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
3131import Streamly.Internal.Data.Fold.Type (Fold(..))
3232import Streamly.Internal.Data.MutArray.Generic
@@ -36,7 +36,7 @@ import Streamly.Internal.Data.MutArray.Generic
3636 , putIndexUnsafe
3737 , putSliceUnsafe
3838 )
39−-- import qualified Streamly.Internal.Data.Stream.StreamD.Type as Stream
39+-- import qualified Streamly.Internal.Data.Stream.Type as Stream
4040import qualified Streamly.Internal.Data.Fold.Type as Fold
4141
4242-- XXX Use MutableArray rather than keeping a MutArray here.
core/src/Streamly/Internal/Data/Stream.hs+20−20
@@ -17,26 +17,26 @@
1717
1818module Streamly.Internal.Data.Stream
1919 (
20− module Streamly.Internal.Data.Stream.StreamD.Type
21− , module Streamly.Internal.Data.Stream.StreamD.Generate
22− , module Streamly.Internal.Data.Stream.StreamD.Eliminate
23− , module Streamly.Internal.Data.Stream.StreamD.Exception
24− , module Streamly.Internal.Data.Stream.StreamD.Lift
25− , module Streamly.Internal.Data.Stream.StreamD.Transformer
26− , module Streamly.Internal.Data.Stream.StreamD.Nesting
27− , module Streamly.Internal.Data.Stream.StreamD.Transform
28− , module Streamly.Internal.Data.Stream.StreamD.Top
29− , module Streamly.Internal.Data.Stream.StreamD.Container
20+ module Streamly.Internal.Data.Stream.Type
21+ , module Streamly.Internal.Data.Stream.Generate
22+ , module Streamly.Internal.Data.Stream.Eliminate
23+ , module Streamly.Internal.Data.Stream.Exception
24+ , module Streamly.Internal.Data.Stream.Lift
25+ , module Streamly.Internal.Data.Stream.Transformer
26+ , module Streamly.Internal.Data.Stream.Nesting
27+ , module Streamly.Internal.Data.Stream.Transform
28+ , module Streamly.Internal.Data.Stream.Top
29+ , module Streamly.Internal.Data.Stream.Container
3030 )
3131where
3232
33−import Streamly.Internal.Data.Stream.StreamD.Type
34−import Streamly.Internal.Data.Stream.StreamD.Generate
35−import Streamly.Internal.Data.Stream.StreamD.Eliminate
36−import Streamly.Internal.Data.Stream.StreamD.Exception
37−import Streamly.Internal.Data.Stream.StreamD.Lift
38−import Streamly.Internal.Data.Stream.StreamD.Transformer
39−import Streamly.Internal.Data.Stream.StreamD.Nesting
40−import Streamly.Internal.Data.Stream.StreamD.Transform
41−import Streamly.Internal.Data.Stream.StreamD.Top
42−import Streamly.Internal.Data.Stream.StreamD.Container
33+import Streamly.Internal.Data.Stream.Type
34+import Streamly.Internal.Data.Stream.Generate
35+import Streamly.Internal.Data.Stream.Eliminate
36+import Streamly.Internal.Data.Stream.Exception
37+import Streamly.Internal.Data.Stream.Lift
38+import Streamly.Internal.Data.Stream.Transformer
39+import Streamly.Internal.Data.Stream.Nesting
40+import Streamly.Internal.Data.Stream.Transform
41+import Streamly.Internal.Data.Stream.Top
42+import Streamly.Internal.Data.Stream.Container
core/src/Streamly/Internal/Data/Stream/Common.hs+2−2
@@ -32,8 +32,8 @@ where
3232
3333import Streamly.Internal.Data.Fold.Type (Fold (..))
3434
35−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
36−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
35+import qualified Streamly.Internal.Data.StreamK.Type as K
36+import qualified Streamly.Internal.Data.Stream.Type as D
3737
3838import Prelude hiding (Foldable(..), repeat)
3939
core/src/Streamly/Internal/Data/Stream/StreamD/Container.hs → core/src/Streamly/Internal/Data/Stream/Container.hsrenamed+9−9
@@ -1,6 +1,6 @@
11{-# LANGUAGE CPP #-}
22-- |
3−-- Module : Streamly.Internal.Data.Stream.StreamD.Container
3+-- Module : Streamly.Internal.Data.Stream.Container
44-- Copyright : (c) 2019 Composewell Technologies
55-- License : BSD-3-Clause
66-- Maintainer : streamly@composewell.com
@@ -9,7 +9,7 @@
99--
1010-- Stream operations that require transformers or containers like Set or Map.
1111
12−module Streamly.Internal.Data.Stream.StreamD.Container
12+module Streamly.Internal.Data.Stream.Container
1313 (
1414 nub
1515
@@ -30,8 +30,8 @@ import Control.Monad.IO.Class (MonadIO)
3030import Control.Monad.Trans.State.Strict (get, put)
3131import Data.Function ((&))
3232import Data.Maybe (isJust)
33−import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))
34−import Streamly.Internal.Data.Stream.StreamD.Type
33+import Streamly.Internal.Data.Stream.Step (Step(..))
34+import Streamly.Internal.Data.Stream.Type
3535 (Stream(..), mkCross, unCross)
3636
3737import qualified Data.Map.Strict as Map
@@ -39,11 +39,11 @@ import qualified Data.Set as Set
3939import qualified Streamly.Data.Fold as Fold
4040import qualified Streamly.Internal.Data.Array.Generic as Array
4141import qualified Streamly.Internal.Data.MutArray.Type as MA
42−import qualified Streamly.Internal.Data.Stream.StreamD.Type as Stream
43−import qualified Streamly.Internal.Data.Stream.StreamD.Nesting as Stream
44−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as Stream
45−import qualified Streamly.Internal.Data.Stream.StreamD.Transform as Stream
46−import qualified Streamly.Internal.Data.Stream.StreamD.Transformer as Stream
42+import qualified Streamly.Internal.Data.Stream.Type as Stream
43+import qualified Streamly.Internal.Data.Stream.Nesting as Stream
44+import qualified Streamly.Internal.Data.Stream.Generate as Stream
45+import qualified Streamly.Internal.Data.Stream.Transform as Stream
46+import qualified Streamly.Internal.Data.Stream.Transformer as Stream
4747
4848#include "DocTestDataStream.hs"
4949
core/src/Streamly/Internal/Data/Stream/StreamD/Eliminate.hs → core/src/Streamly/Internal/Data/Stream/Eliminate.hsrenamed+6−8
@@ -1,6 +1,6 @@
11{-# LANGUAGE CPP #-}
22-- |
3−-- Module : Streamly.Internal.Data.Stream.StreamD.Eliminate
3+-- Module : Streamly.Internal.Data.Stream.Eliminate
44-- Copyright : (c) 2018 Composewell Technologies
55-- (c) Roman Leshchinskiy 2008-2010
66-- License : BSD-3-Clause
@@ -11,7 +11,7 @@
1111-- A few functions in this module have been adapted from the vector package
1212-- (c) Roman Leshchinskiy.
1313--
14−module Streamly.Internal.Data.Stream.StreamD.Eliminate
14+module Streamly.Internal.Data.Stream.Eliminate
1515 (
1616 -- * Running a 'Fold'
1717 fold
@@ -99,15 +99,15 @@ import qualified Streamly.Internal.Data.Array.Type as Array
9999import qualified Streamly.Internal.Data.Fold as Fold
100100import qualified Streamly.Internal.Data.Parser as PR
101101import qualified Streamly.Internal.Data.Parser as PRD
102−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as StreamD
103−import qualified Streamly.Internal.Data.Stream.StreamD.Nesting as Nesting
104−import qualified Streamly.Internal.Data.Stream.StreamD.Transform as StreamD
102+import qualified Streamly.Internal.Data.Stream.Generate as StreamD
103+import qualified Streamly.Internal.Data.Stream.Nesting as Nesting
104+import qualified Streamly.Internal.Data.Stream.Transform as StreamD
105105
106106import Prelude hiding
107107 ( Foldable(..), all, any, head, last, lookup, mapM, mapM_
108108 , notElem, splitAt, tail, (!!))
109109import Data.Foldable (length)
110−import Streamly.Internal.Data.Stream.StreamD.Type
110+import Streamly.Internal.Data.Stream.Type
111111
112112#include "DocTestDataStream.hs"
113113
@@ -820,8 +820,6 @@ isSuffixOfUnbox suffix stream =
820820-- stripSuffix on that especially if the elements have a Storable or Prim
821821-- instance.
822822--
823−-- See also "Streamly.Internal.Data.Stream.StreamD.Reduce.dropSuffix".
824−--
825823-- Space: @O(n)@, buffers the entire input stream as well as the suffix
826824--
827825-- /Pre-release/
core/src/Streamly/Internal/Data/Stream/StreamD/Exception.hs → core/src/Streamly/Internal/Data/Stream/Exception.hsrenamed+3−3
@@ -1,13 +1,13 @@
11{-# LANGUAGE CPP #-}
22-- |
3−-- Module : Streamly.Internal.Data.Stream.StreamD.Exception
3+-- Module : Streamly.Internal.Data.Stream.Exception
44-- Copyright : (c) 2020 Composewell Technologies and Contributors
55-- License : BSD-3-Clause
66-- Maintainer : streamly@composewell.com
77-- Stability : experimental
88-- Portability : GHC
99
10−module Streamly.Internal.Data.Stream.StreamD.Exception
10+module Streamly.Internal.Data.Stream.Exception
1111 (
1212 gbracket_
1313 , gbracket
@@ -36,7 +36,7 @@ import Streamly.Internal.Data.IOFinalizer
3636
3737import qualified Control.Monad.Catch as MC
3838
39−import Streamly.Internal.Data.Stream.StreamD.Type
39+import Streamly.Internal.Data.Stream.Type
4040
4141#include "DocTestDataStream.hs"
4242
core/src/Streamly/Internal/Data/Stream/StreamD/Generate.hs → core/src/Streamly/Internal/Data/Stream/Generate.hsrenamed+3−3
@@ -1,6 +1,6 @@
11{-# LANGUAGE CPP #-}
22-- |
3−-- Module : Streamly.Internal.Data.Stream.StreamD.Generate
3+-- Module : Streamly.Internal.Data.Stream.Generate
44-- Copyright : (c) 2020 Composewell Technologies and Contributors
55-- (c) Roman Leshchinskiy 2008-2010
66-- License : BSD-3-Clause
@@ -12,7 +12,7 @@
1212-- A few combinators in this module have been adapted from the vector package
1313-- (c) Roman Leshchinskiy. See the notes in specific combinators.
1414--
15−module Streamly.Internal.Data.Stream.StreamD.Generate
15+module Streamly.Internal.Data.Stream.Generate
1616 (
1717 -- * Primitives
1818 nil
@@ -135,7 +135,7 @@ import Data.Ratio
135135import Data.Word
136136import Numeric.Natural
137137import Prelude hiding (iterate, repeat, replicate, take, takeWhile)
138−import Streamly.Internal.Data.Stream.StreamD.Type
138+import Streamly.Internal.Data.Stream.Type
139139
140140#include "DocTestDataStream.hs"
141141
core/src/Streamly/Internal/Data/Stream/StreamD/Lift.hs → core/src/Streamly/Internal/Data/Stream/Lift.hsrenamed+3−3
@@ -1,6 +1,6 @@
11{-# LANGUAGE CPP #-}
22-- |
3−-- Module : Streamly.Internal.Data.Stream.StreamD.Lift
3+-- Module : Streamly.Internal.Data.Stream.Lift
44-- Copyright : (c) 2018 Composewell Technologies
55-- License : BSD-3-Clause
66-- Maintainer : streamly@composewell.com
@@ -9,7 +9,7 @@
99--
1010-- Transform the underlying monad of a stream.
1111
12−module Streamly.Internal.Data.Stream.StreamD.Lift
12+module Streamly.Internal.Data.Stream.Lift
1313 (
1414 -- * Generalize Inner Monad
1515 morphInner
@@ -27,7 +27,7 @@ where
2727import Data.Functor.Identity (Identity(..))
2828import Streamly.Internal.Data.SVar.Type (adaptState)
2929
30−import Streamly.Internal.Data.Stream.StreamD.Type
30+import Streamly.Internal.Data.Stream.Type
3131
3232#include "DocTestDataStream.hs"
3333
core/src/Streamly/Internal/Data/Stream/MutChunked.hs+1−1
@@ -35,7 +35,7 @@ import Streamly.Internal.Data.Unbox (Unbox, sizeOf)
3535import Streamly.Internal.Data.MutArray.Type (MutArray(..))
3636import Streamly.Internal.Data.Fold.Type (Fold(..))
3737import Streamly.Internal.Data.Parser (ParseError)
38−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
38+import Streamly.Internal.Data.Stream.Type (Stream)
3939import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
4040
4141import qualified Streamly.Internal.Data.MutArray.Type as MArray
core/src/Streamly/Internal/Data/Stream/StreamD/Nesting.hs → core/src/Streamly/Internal/Data/Stream/Nesting.hsrenamed+4−4
@@ -1,6 +1,6 @@
11{-# LANGUAGE CPP #-}
22-- |
3−-- Module : Streamly.Internal.Data.Stream.StreamD.Nesting
3+-- Module : Streamly.Internal.Data.Stream.Nesting
44-- Copyright : (c) 2018 Composewell Technologies
55-- (c) Roman Leshchinskiy 2008-2010
66-- License : BSD-3-Clause
@@ -24,7 +24,7 @@
2424-- The zipWithM combinator in this module has been adapted from the vector
2525-- package (c) Roman Leshchinskiy.
2626--
27−module Streamly.Internal.Data.Stream.StreamD.Nesting
27+module Streamly.Internal.Data.Stream.Nesting
2828 (
2929 -- * Generate
3030 -- | Combining streams to generate streams.
@@ -197,9 +197,9 @@ import qualified Streamly.Internal.Data.Parser as PR
197197import qualified Streamly.Internal.Data.Parser as PRD
198198import qualified Streamly.Internal.Data.Ring as RB
199199
200−import Streamly.Internal.Data.Stream.StreamD.Transform
200+import Streamly.Internal.Data.Stream.Transform
201201 (intersperse, intersperseMSuffix)
202−import Streamly.Internal.Data.Stream.StreamD.Type
202+import Streamly.Internal.Data.Stream.Type
203203
204204import Prelude hiding (concatMap, mapM, zipWith)
205205
core/src/Streamly/Internal/Data/Stream/StreamD/Step.hs → core/src/Streamly/Internal/Data/Stream/Step.hsrenamed+2−2
@@ -1,12 +1,12 @@
11-- |
2−-- Module : Streamly.Internal.Data.Stream.StreamD.Step
2+-- Module : Streamly.Internal.Data.Stream.Step
33-- Copyright : (c) 2018 Composewell Technologies
44-- License : BSD-3-Clause
55-- Maintainer : streamly@composewell.com
66-- Stability : experimental
77-- Portability : GHC
88
9−module Streamly.Internal.Data.Stream.StreamD.Step
9+module Streamly.Internal.Data.Stream.Step
1010 (
1111 -- * The stream type
1212 Step (..)
core/src/Streamly/Internal/Data/Stream/StreamD/Top.hs → core/src/Streamly/Internal/Data/Stream/Top.hsrenamed+6−6
@@ -1,6 +1,6 @@
11{-# LANGUAGE CPP #-}
22-- |
3−-- Module : Streamly.Internal.Data.Stream.StreamD.Top
3+-- Module : Streamly.Internal.Data.Stream.Top
44-- Copyright : (c) 2020 Composewell Technologies
55-- License : BSD-3-Clause
66-- Maintainer : streamly@composewell.com
@@ -9,7 +9,7 @@
99--
1010-- Top level module that can depend on all other lower level Stream modules.
1111
12−module Streamly.Internal.Data.Stream.StreamD.Top
12+module Streamly.Internal.Data.Stream.Top
1313 (
1414 -- * Transformation
1515 -- ** Sampling
@@ -49,13 +49,13 @@ import Control.Monad.IO.Class (MonadIO(..))
4949import Data.IORef (newIORef, readIORef, modifyIORef')
5050import Streamly.Internal.Data.Fold.Type (Fold)
5151import Streamly.Internal.Data.Stream.Common ()
52−import Streamly.Internal.Data.Stream.StreamD.Type (Stream, cross)
52+import Streamly.Internal.Data.Stream.Type (Stream, cross)
5353
5454import qualified Data.List as List
5555import qualified Streamly.Internal.Data.Fold as Fold
56−import qualified Streamly.Internal.Data.Stream.StreamD.Type as Stream
57−import qualified Streamly.Internal.Data.Stream.StreamD.Nesting as Stream
58−import qualified Streamly.Internal.Data.Stream.StreamD.Transform as Stream
56+import qualified Streamly.Internal.Data.Stream.Type as Stream
57+import qualified Streamly.Internal.Data.Stream.Nesting as Stream
58+import qualified Streamly.Internal.Data.Stream.Transform as Stream
5959
6060import Prelude hiding (filter, zipWith, concatMap, concat)
6161
core/src/Streamly/Internal/Data/Stream/StreamD/Transform.hs → core/src/Streamly/Internal/Data/Stream/Transform.hsrenamed+5−5
@@ -1,6 +1,6 @@
11{-# LANGUAGE CPP #-}
22-- |
3−-- Module : Streamly.Internal.Data.Stream.StreamD.Transform
3+-- Module : Streamly.Internal.Data.Stream.Transform
44-- Copyright : (c) 2018 Composewell Technologies
55-- (c) Roman Leshchinskiy 2008-2010
66-- License : BSD-3-Clause
@@ -13,7 +13,7 @@
1313-- A few functions in this module have been adapted from the vector package
1414-- (c) Roman Leshchinskiy. See the notes in specific combinators.
1515
16−module Streamly.Internal.Data.Stream.StreamD.Transform
16+module Streamly.Internal.Data.Stream.Transform
1717 (
1818 -- * Piping
1919 -- | Pass through a 'Pipe'.
@@ -173,15 +173,15 @@ import Streamly.Internal.System.IO (defaultChunkSize)
173173import qualified Streamly.Internal.Data.Array.Type as A
174174import qualified Streamly.Internal.Data.Fold as FL
175175import qualified Streamly.Internal.Data.Pipe.Type as Pipe
176−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
176+import qualified Streamly.Internal.Data.StreamK.Type as K
177177
178178import Prelude hiding
179179 ( drop, dropWhile, filter, map, mapM, reverse
180180 , scanl, scanl1, sequence, take, takeWhile, zipWith)
181181
182−import Streamly.Internal.Data.Stream.StreamD.Generate
182+import Streamly.Internal.Data.Stream.Generate
183183 (absTimesWith, relTimesWith)
184−import Streamly.Internal.Data.Stream.StreamD.Type
184+import Streamly.Internal.Data.Stream.Type
185185
186186#include "DocTestDataStream.hs"
187187
core/src/Streamly/Internal/Data/Stream/StreamD/Transformer.hs → core/src/Streamly/Internal/Data/Stream/Transformer.hsrenamed+3−3
@@ -1,6 +1,6 @@
11{-# LANGUAGE CPP #-}
22-- |
3−-- Module : Streamly.Internal.Data.Stream.StreamD.Transformer
3+-- Module : Streamly.Internal.Data.Stream.Transformer
44-- Copyright : (c) 2018 Composewell Technologies
55-- License : BSD-3-Clause
66-- Maintainer : streamly@composewell.com
@@ -9,7 +9,7 @@
99--
1010-- Transform the underlying monad of a stream using a monad transfomer.
1111
12−module Streamly.Internal.Data.Stream.StreamD.Transformer
12+module Streamly.Internal.Data.Stream.Transformer
1313 (
1414 foldlT
1515 , foldrT
@@ -35,7 +35,7 @@ import Streamly.Internal.Data.SVar.Type (defState, adaptState)
3535import qualified Control.Monad.Trans.Reader as Reader
3636import qualified Control.Monad.Trans.State.Strict as State
3737
38−import Streamly.Internal.Data.Stream.StreamD.Type
38+import Streamly.Internal.Data.Stream.Type
3939
4040#include "DocTestDataStream.hs"
4141
core/src/Streamly/Internal/Data/Stream/StreamD/Type.hs → core/src/Streamly/Internal/Data/Stream/Type.hsrenamed+17−17
@@ -2,7 +2,7 @@
22{-# LANGUAGE UndecidableInstances #-}
33
44-- |
5−-- Module : Streamly.Internal.Data.Stream.StreamD.Type
5+-- Module : Streamly.Internal.Data.Stream.Type
66-- Copyright : (c) 2018 Composewell Technologies
77-- (c) Roman Leshchinskiy 2008-2010
88-- License : BSD-3-Clause
@@ -14,7 +14,7 @@
1414-- module have been originally adapted from the vector package (c) Roman
1515-- Leshchinskiy. See the notes in specific functions.
1616
17−module Streamly.Internal.Data.Stream.StreamD.Type
17+module Streamly.Internal.Data.Stream.Type
1818 (
1919 -- * The stream type
2020 Step (..)
@@ -44,20 +44,20 @@ module Streamly.Internal.Data.Stream.StreamD.Type
4444 , fromEffect
4545
4646 -- ** From Containers
47− , Streamly.Internal.Data.Stream.StreamD.Type.fromList
47+ , Streamly.Internal.Data.Stream.Type.fromList
4848
4949 -- * Elimination
5050 -- ** Primitives
5151 , uncons
5252
5353 -- ** Strict Left Folds
54− , Streamly.Internal.Data.Stream.StreamD.Type.fold
54+ , Streamly.Internal.Data.Stream.Type.fold
5555 , foldBreak
5656 , foldAddLazy
5757 , foldAdd
5858 , foldEither
5959
60− , Streamly.Internal.Data.Stream.StreamD.Type.foldl'
60+ , Streamly.Internal.Data.Stream.Type.foldl'
6161 , foldlM'
6262 , foldlx'
6363 , foldlMx'
@@ -65,12 +65,12 @@ module Streamly.Internal.Data.Stream.StreamD.Type
6565 -- ** Lazy Right Folds
6666 , foldrM
6767 , foldrMx
68− , Streamly.Internal.Data.Stream.StreamD.Type.foldr
68+ , Streamly.Internal.Data.Stream.Type.foldr
6969 , foldrS
7070
7171 -- ** Specific Folds
7272 , drain
73− , Streamly.Internal.Data.Stream.StreamD.Type.toList
73+ , Streamly.Internal.Data.Stream.Type.toList
7474
7575 -- * Mapping
7676 , map
@@ -158,12 +158,12 @@ import Streamly.Internal.BaseCompat ((#.))
158158import Streamly.Internal.Data.Fold.Type (Fold(..))
159159import Streamly.Internal.Data.Maybe.Strict (Maybe'(..), toMaybe)
160160import Streamly.Internal.Data.Refold.Type (Refold(..))
161−import Streamly.Internal.Data.Stream.StreamD.Step (Step (..))
161+import Streamly.Internal.Data.Stream.Step (Step (..))
162162import Streamly.Internal.Data.SVar.Type (State, adaptState, defState)
163163import Streamly.Internal.Data.Unfold.Type (Unfold(..))
164164
165165import qualified Streamly.Internal.Data.Fold.Type as FL hiding (foldr)
166−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
166+import qualified Streamly.Internal.Data.StreamK.Type as K
167167#ifdef USE_UNFOLDS_EVERYWHERE
168168import qualified Streamly.Internal.Data.Unfold.Type as Unfold
169169#endif
@@ -505,7 +505,7 @@ foldAddLazy (Fold fstep finitial fextract) (Stream sstep state) =
505505--
506506foldAdd :: Monad m => Fold m a b -> Stream m a -> m (Fold m a b)
507507foldAdd f =
508− Streamly.Internal.Data.Stream.StreamD.Type.fold (FL.duplicate f)
508+ Streamly.Internal.Data.Stream.Type.fold (FL.duplicate f)
509509
510510------------------------------------------------------------------------------
511511-- Right Folds
@@ -740,7 +740,7 @@ drain (Stream step state) = go SPEC state
740740--
741741{-# INLINE_NORMAL toList #-}
742742toList :: Monad m => Stream m a -> m [a]
743−toList = Streamly.Internal.Data.Stream.StreamD.Type.foldr (:) []
743+toList = Streamly.Internal.Data.Stream.Type.foldr (:) []
744744
745745-- Use foldr/build fusion to fuse with list consumers
746746-- This can be useful when using the IsList instance
@@ -753,7 +753,7 @@ toListFB c n (Stream step state) = go state
753753 Skip s -> go s
754754 Stop -> n
755755
756−{-# RULES "toList Identity" Streamly.Internal.Data.Stream.StreamD.Type.toList = toListId #-}
756+{-# RULES "toList Identity" Streamly.Internal.Data.Stream.Type.toList = toListId #-}
757757{-# INLINE_EARLY toListId #-}
758758toListId :: Stream Identity a -> Identity [a]
759759toListId s = Identity $ build (\c n -> toListFB c n s)
@@ -880,10 +880,10 @@ instance IsList (Stream Identity a) where
880880 type (Item (Stream Identity a)) = a
881881
882882 {-# INLINE fromList #-}
883− fromList = Streamly.Internal.Data.Stream.StreamD.Type.fromList
883+ fromList = Streamly.Internal.Data.Stream.Type.fromList
884884
885885 {-# INLINE toList #-}
886− toList = runIdentity . Streamly.Internal.Data.Stream.StreamD.Type.toList
886+ toList = runIdentity . Streamly.Internal.Data.Stream.Type.toList
887887
888888instance Eq a => Eq (Stream Identity a) where
889889 {-# INLINE (==) #-}
@@ -930,13 +930,13 @@ instance Show a => Show (Stream Identity a) where
930930instance Read a => Read (Stream Identity a) where
931931 readPrec = parens $ prec 10 $ do
932932 Ident "fromList" <- lexP
933− Streamly.Internal.Data.Stream.StreamD.Type.fromList <$> readPrec
933+ Streamly.Internal.Data.Stream.Type.fromList <$> readPrec
934934
935935 readListPrec = readListPrecDefault
936936
937937instance (a ~ Char) => IsString (Stream Identity a) where
938938 {-# INLINE fromString #-}
939− fromString = Streamly.Internal.Data.Stream.StreamD.Type.fromList
939+ fromString = Streamly.Internal.Data.Stream.Type.fromList
940940
941941-------------------------------------------------------------------------------
942942-- Foldable
@@ -957,7 +957,7 @@ instance (Foldable m, Monad m) => Foldable (Stream m) where
957957 {-# INLINE foldMap #-}
958958 foldMap f =
959959 Data.Foldable.fold
960− . Streamly.Internal.Data.Stream.StreamD.Type.foldr (mappend . f) mempty
960+ . Streamly.Internal.Data.Stream.Type.foldr (mappend . f) mempty
961961
962962 {-# INLINE foldr #-}
963963 foldr f z t = appEndo (foldMap (Endo #. f) t) z
core/src/Streamly/Internal/Data/StreamK.hs+4−4
@@ -17,8 +17,8 @@ module Streamly.Internal.Data.StreamK
1717 -- $setup
1818
1919 -- * The stream type
20− module Streamly.Internal.Data.Stream.StreamK.Type
21− , module Streamly.Internal.Data.Stream.StreamK.Transformer
20+ module Streamly.Internal.Data.StreamK.Type
21+ , module Streamly.Internal.Data.StreamK.Transformer
2222
2323 , StreamK(..)
2424 , fromList
@@ -159,8 +159,8 @@ import Prelude
159159 notElem, head, tail, init, zipWith, lookup,
160160 (!!), replicate, reverse, concatMap, iterate, splitAt)
161161import Data.Foldable (sum, length)
162−import Streamly.Internal.Data.Stream.StreamK.Type
163−import Streamly.Internal.Data.Stream.StreamK.Transformer
162+import Streamly.Internal.Data.StreamK.Type
163+import Streamly.Internal.Data.StreamK.Transformer
164164import Streamly.Internal.Data.Parser (ParseError(..))
165165
166166#include "DocTestDataStreamK.hs"
core/src/Streamly/Internal/Data/Stream/StreamK/Alt.hs → core/src/Streamly/Internal/Data/StreamK/Alt.hsrenamed+1−1
@@ -92,7 +92,7 @@
9292-- a push style CPS representation should be able to be used along with StreamK
9393-- to efficiently implement composable folds.
9494
95−module Streamly.Internal.Data.Stream.StreamK.Alt
95+module Streamly.Internal.Data.StreamK.Alt
9696 (
9797 -- * Stream Type
9898
core/src/Streamly/Internal/Data/Stream/StreamK/Transformer.hs → core/src/Streamly/Internal/Data/StreamK/Transformer.hsrenamed+3−3
@@ -1,12 +1,12 @@
11-- |
2−-- Module : Streamly.Internal.Data.Stream.StreamK.Transformer
2+-- Module : Streamly.Internal.Data.StreamK.Transformer
33-- Copyright : (c) 2017 Composewell Technologies
44-- License : BSD3
55-- Maintainer : streamly@composewell.com
66-- Stability : experimental
77-- Portability : GHC
88--
9−module Streamly.Internal.Data.Stream.StreamK.Transformer
9+module Streamly.Internal.Data.StreamK.Transformer
1010 (
1111 foldlT
1212 , foldrT
@@ -18,7 +18,7 @@ where
1818
1919import Control.Monad.Trans.Class (MonadTrans(lift))
2020import Control.Monad.Trans.State.Strict (StateT)
21−import Streamly.Internal.Data.Stream.StreamK.Type
21+import Streamly.Internal.Data.StreamK.Type
2222 (StreamK, nil, cons, uncons, concatEffect)
2323
2424import qualified Control.Monad.Trans.State.Strict as State
core/src/Streamly/Internal/Data/Stream/StreamK/Type.hs → core/src/Streamly/Internal/Data/StreamK/Type.hsrenamed+6−6
@@ -1,7 +1,7 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE UndecidableInstances #-}
33-- |
4−-- Module : Streamly.Internal.Data.Stream.StreamK.Type
4+-- Module : Streamly.Internal.Data.StreamK.Type
55-- Copyright : (c) 2017 Composewell Technologies
66--
77-- License : BSD3
@@ -13,7 +13,7 @@
1313-- Continuation passing style (CPS) stream implementation. The symbol 'K' below
1414-- denotes a function as well as a Kontinuation.
1515--
16−module Streamly.Internal.Data.Stream.StreamK.Type
16+module Streamly.Internal.Data.StreamK.Type
1717 (
1818 -- * StreamK type
1919 Stream
@@ -82,11 +82,11 @@ module Streamly.Internal.Data.Stream.StreamK.Type
8282 , uncons
8383
8484 -- ** Strict Left Folds
85− , Streamly.Internal.Data.Stream.StreamK.Type.foldl'
85+ , Streamly.Internal.Data.StreamK.Type.foldl'
8686 , foldlx'
8787
8888 -- ** Lazy Right Folds
89− , Streamly.Internal.Data.Stream.StreamK.Type.foldr
89+ , Streamly.Internal.Data.StreamK.Type.foldr
9090
9191 -- ** Specific Folds
9292 , drain
@@ -1070,7 +1070,7 @@ instance (Foldable m, Monad m) => Foldable (StreamK m) where
10701070 {-# INLINE foldMap #-}
10711071 foldMap f =
10721072 fold
1073− . Streamly.Internal.Data.Stream.StreamK.Type.foldr (mappend . f) mempty
1073+ . Streamly.Internal.Data.StreamK.Type.foldr (mappend . f) mempty
10741074
10751075 {-# INLINE foldr #-}
10761076 foldr f z t = appEndo (foldMap (Endo #. f) t) z
@@ -1121,7 +1121,7 @@ instance Traversable (StreamK Identity) where
11211121 {-# INLINE traverse #-}
11221122 traverse f xs =
11231123 runIdentity
1124− $ Streamly.Internal.Data.Stream.StreamK.Type.foldr
1124+ $ Streamly.Internal.Data.StreamK.Type.foldr
11251125 consA (pure mempty) xs
11261126
11271127 where
core/src/Streamly/Internal/Data/Unfold.hs+4−4
@@ -20,7 +20,7 @@ module Streamly.Internal.Data.Unfold
2020
2121 -- * Unfolds
2222 -- One to one correspondence with
23− -- "Streamly.Internal.Data.Stream.StreamD.Generate"
23+ -- "Streamly.Internal.Data.Stream.Generate"
2424 -- ** Basic Constructors
2525 , nilM
2626 , nil
@@ -120,14 +120,14 @@ import GHC.Types (SPEC(..))
120120import Streamly.Internal.Data.Fold.Type (Fold(..))
121121import Streamly.Internal.Data.IOFinalizer
122122 (newIOFinalizer, runIOFinalizer, clearingIOFinalizer)
123−import Streamly.Internal.Data.Stream.StreamD.Type (Stream(..))
123+import Streamly.Internal.Data.Stream.Type (Stream(..))
124124import Streamly.Internal.Data.SVar.Type (defState)
125125
126126import qualified Control.Monad.Catch as MC
127127import qualified Data.Tuple as Tuple
128128import qualified Streamly.Internal.Data.Fold.Type as FL
129−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
130−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
129+import qualified Streamly.Internal.Data.Stream.Type as D
130+import qualified Streamly.Internal.Data.StreamK.Type as K
131131import qualified Prelude
132132
133133import Streamly.Internal.Data.Unfold.Enumeration
core/src/Streamly/Internal/Data/Unfold/Type.hs+1−1
@@ -112,7 +112,7 @@ import Control.Monad ((>=>))
112112import Data.Void (Void)
113113import Fusion.Plugin.Types (Fuse(..))
114114import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
115−import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))
115+import Streamly.Internal.Data.Stream.Step (Step(..))
116116
117117import Prelude hiding (map, mapM, concatMap, zipWith, takeWhile)
118118
core/src/Streamly/Internal/FileSystem/Handle.hs+2−2
@@ -132,7 +132,7 @@ import Streamly.Internal.Data.Refold.Type (Refold(..))
132132import Streamly.Internal.Data.Unfold.Type (Unfold(..))
133133import Streamly.Internal.Data.Array.Type
134134 (Array(..), pinnedWriteNUnsafe, unsafeFreezeWithShrink, byteLength)
135−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
135+import Streamly.Internal.Data.Stream.Type (Stream)
136136import Streamly.Internal.Data.Stream.Chunked (lpackArraysChunksOf)
137137-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)
138138import Streamly.Internal.System.IO (defaultChunkSize)
@@ -148,7 +148,7 @@ import qualified Streamly.Internal.Data.Stream as S
148148import qualified Streamly.Internal.Data.Stream as D
149149 (Stream(..), Step(..))
150150import qualified Streamly.Internal.Data.Unfold as UF
151−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K (mkStream)
151+import qualified Streamly.Internal.Data.StreamK.Type as K (mkStream)
152152
153153#include "DocTestFileSystemHandle.hs"
154154
core/src/Streamly/Internal/Unicode/Stream.hs+4−4
@@ -556,7 +556,7 @@ decodeUtf8WithD cfm (D.Stream step state) =
556556
557557 where
558558
559− prefix = "Streamly.Internal.Data.Stream.StreamD.decodeUtf8With: "
559+ prefix = "Streamly.Internal.Data.Stream.decodeUtf8With: "
560560
561561 {-# INLINE handleError #-}
562562 handleError e s =
@@ -720,7 +720,7 @@ decodeUtf8ArraysWithD cfm (D.Stream step state) =
720720 case cfm of
721721 ErrorOnCodingFailure ->
722722 error $
723− show "Streamly.Internal.Data.Stream.StreamD."
723+ show "Streamly.Internal.Data.Stream."
724724 ++ "decodeUtf8ArraysWith: Input Underflow"
725725 TransliterateCodingFailure -> YAndC replacementChar D
726726 DropOnCodingFailure -> D
@@ -769,7 +769,7 @@ decodeUtf8ArraysWithD cfm (D.Stream step state) =
769769 Skip $
770770 transliterateOrError
771771 (
772− "Streamly.Internal.Data.Stream.StreamD."
772+ "Streamly.Internal.Data.Stream."
773773 ++ "decodeUtf8ArraysWith: Invalid UTF8"
774774 ++ " codepoint encountered"
775775 )
@@ -792,7 +792,7 @@ decodeUtf8ArraysWithD cfm (D.Stream step state) =
792792 Skip $
793793 transliterateOrError
794794 (
795− "Streamly.Internal.Data.Stream.StreamD."
795+ "Streamly.Internal.Data.Stream."
796796 ++ "decodeUtf8ArraysWith: Invalid UTF8"
797797 ++ " codepoint encountered"
798798 )
core/streamly-core.cabal+15−15
@@ -405,20 +405,20 @@ library
405405 , Streamly.Internal.Data.Fold.Container
406406 , Streamly.Internal.Data.Fold.Window
407407
408− , Streamly.Internal.Data.Stream.StreamD.Container
409− , Streamly.Internal.Data.Stream.StreamD.Eliminate
410− , Streamly.Internal.Data.Stream.StreamD.Exception
411− , Streamly.Internal.Data.Stream.StreamD.Generate
412− , Streamly.Internal.Data.Stream.StreamD.Lift
413− , Streamly.Internal.Data.Stream.StreamD.Nesting
414− , Streamly.Internal.Data.Stream.StreamD.Step
415− , Streamly.Internal.Data.Stream.StreamD.Top
416− , Streamly.Internal.Data.Stream.StreamD.Transform
417− , Streamly.Internal.Data.Stream.StreamD.Transformer
418− , Streamly.Internal.Data.Stream.StreamD.Type
419−
420− , Streamly.Internal.Data.Stream.StreamK.Type
421− , Streamly.Internal.Data.Stream.StreamK.Transformer
408+ , Streamly.Internal.Data.Stream.Container
409+ , Streamly.Internal.Data.Stream.Eliminate
410+ , Streamly.Internal.Data.Stream.Exception
411+ , Streamly.Internal.Data.Stream.Generate
412+ , Streamly.Internal.Data.Stream.Lift
413+ , Streamly.Internal.Data.Stream.Nesting
414+ , Streamly.Internal.Data.Stream.Step
415+ , Streamly.Internal.Data.Stream.Top
416+ , Streamly.Internal.Data.Stream.Transform
417+ , Streamly.Internal.Data.Stream.Transformer
418+ , Streamly.Internal.Data.Stream.Type
419+
420+ , Streamly.Internal.Data.StreamK.Type
421+ , Streamly.Internal.Data.StreamK.Transformer
422422
423423 , Streamly.Internal.Data.Pipe.Type
424424
@@ -434,7 +434,7 @@ library
434434
435435 if flag(dev)
436436 other-modules:
437− Streamly.Internal.Data.Stream.StreamK.Alt
437+ Streamly.Internal.Data.StreamK.Alt
438438 , Streamly.Internal.Data.List
439439
440440 build-depends:
hie.yaml+2−2
@@ -31,9 +31,9 @@ cradle:
3131 - path: "./benchmark/Streamly/Benchmark/Data/ParserK.hs"
3232 component: "bench:Data.ParserK"
3333 - path: "./benchmark/Streamly/Benchmark/Data/Stream/StreamD.hs"
34− component: "bench:Data.Stream.StreamD"
34+ component: "bench:Data.StreamD"
3535 - path: "./benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs"
36− component: "bench:Data.Stream.StreamK"
36+ component: "bench:Data.StreamK"
3737 - path: "./benchmark/Streamly/Benchmark/Data/Stream/ToStreamK.hs"
3838 component: "bench:Data.Stream.ToStreamK"
3939 - path: "./benchmark/Streamly/Benchmark/Data/Stream/Common.hs"
targets/Targets.hs+2−2
@@ -10,13 +10,13 @@ where
1010targets :: [(String, [String])]
1111targets =
1212 [ -- Base streams
13− ("Data.Stream.StreamD",
13+ ("Data.Stream",
1414 [ "base_stream_grp"
1515 , "base_stream_cmp"
1616 , "noTest"
1717 ]
1818 )
19− , ("Data.Stream.StreamK",
19+ , ("Data.StreamK",
2020 [ "base_stream_grp"
2121 , "base_stream_cmp"
2222 , "noTest"