1c584e5 · streamly · git.iko.soy

.github/workflows/regression-check.yml+2−2

compare with master

unifiedsplit

@@ -26,8 +26,8 @@ jobs:

26 Data.Fold.Window

27 Data.Parser

28 Data.ParserK

29− Data.Stream.StreamD

29+ Data.StreamD

30− Data.Stream.StreamK:6

30+ Data.StreamK:6

31 Data.Unfold

32 Data.Stream

33 Data.Stream.Concurrent

benchmark/Streamly/Benchmark/Data/Stream/StreamD.hs+1−1

@@ -461,7 +461,7 @@ inspect $ 'unfoldManyRepl `hasNoType` ''SPEC

461-------------------------------------------------------------------------------

462

463moduleName :: String

464−moduleName = "Data.Stream.StreamD"

464+moduleName = "Data.StreamD"

465

466o_1_space :: [Benchmark]

467o_1_space =

benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs+1−1

@@ -632,7 +632,7 @@ filterAllInNestedList str = do

632-------------------------------------------------------------------------------

633

634moduleName :: String

635−moduleName = "Data.Stream.StreamK"

635+moduleName = "Data.StreamK"

636

637o_1_space_generation :: Int -> Benchmark

638o_1_space_generation streamLen =

benchmark/Streamly/Benchmark/Data/Stream/StreamKAlt.hs+1−1

@@ -18,7 +18,7 @@ import Prelude hiding ()

18-- import qualified Prelude as P

19-- import qualified Data.List as List

20

21−import qualified Streamly.Internal.Data.Stream.StreamK.Alt as S

21+import qualified Streamly.Internal.Data.StreamK.Alt as S

22-- import qualified Streamly.Internal.Data.Stream.Common as SP

23-- import qualified Streamly.Internal.Data.SVar as S

24

benchmark/Streamly/Benchmark/Data/Stream/ToStreamK.hs+1−1

@@ -1,5 +1,5 @@

1-- |

2−-- Module : Streamly.Benchmark.Data.Stream.StreamK

2+-- Module : Streamly.Benchmark.Data.StreamK

4--

5-- License : BSD3

benchmark/Streamly/Benchmark/Unicode/Stream.hs+1−1

@@ -39,7 +39,7 @@ import Streamly.Benchmark.Common.Handle

39

40#ifdef INSPECTION

41import Streamly.Internal.Data.Unbox (Unbox)

42−import Streamly.Internal.Data.Stream.StreamD (Step(..))

42+import Streamly.Internal.Data.Stream (Step(..))

43import qualified Streamly.Internal.Data.Fold as Fold

44import qualified Streamly.Internal.Data.Tuple.Strict as Strict

45import 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]

60

61 -----------------------------------------------------------------------

62

63− | "Data.Stream.StreamD/o-n-space.elimination.toList" == benchName =

63+ | "Data.StreamD/o-n-space.elimination.toList" == benchName =

64 "-K2M"

65− | "Data.Stream.StreamK/o-n-space.elimination.toList" == benchName =

65+ | "Data.StreamK/o-n-space.elimination.toList" == benchName =

66 "-K2M"

67

68 -----------------------------------------------------------------------

benchmark/streamly-benchmarks.cabal+3−3

@@ -467,7 +467,7 @@ benchmark Data.ParserK.Chunked.Generic

467-- Raw Streams

468-------------------------------------------------------------------------------

469

470−benchmark Data.Stream.StreamD

470+benchmark Data.StreamD

471 import: bench-options

472 type: exitcode-stdio-1.0

473 hs-source-dirs: Streamly/Benchmark/Data/Stream

@@ -475,7 +475,7 @@ benchmark Data.Stream.StreamD

475 if impl(ghcjs)

476 buildable: False

477

478−benchmark Data.Stream.StreamK

478+benchmark Data.StreamK

479 import: bench-options

480 type: exitcode-stdio-1.0

481 hs-source-dirs: Streamly/Benchmark/Data/Stream

@@ -491,7 +491,7 @@ benchmark Data.Stream.ToStreamK

491 if !flag(dev) || impl(ghcjs)

492 buildable: False

493

494−benchmark Data.Stream.StreamK.Alt

494+benchmark Data.StreamK.Alt

495 import: bench-options

496 type: exitcode-stdio-1.0

497 hs-source-dirs: Streamly/Benchmark/Data/Stream

core/src/Streamly/Data/Stream.hs−10

@@ -42,9 +42,6 @@ module Streamly.Data.Stream

42 -- * Construction

43 -- | Functions ending in the general shape @b -> Stream m a@.

44 --

45− -- See also: "Streamly.Internal.Data.Stream.StreamD.Generate" for

46− -- @Pre-release@ functions.

47− --

48 -- Useful Idioms:

45 -- Useful Idioms:

49 --

46 --

50 -- >>> fromIndices f = fmap f $ Stream.enumerateFrom 0

47 -- >>> fromIndices f = fmap f $ Stream.enumerateFrom 0

@@ -117,8 +114,6 @@ module Streamly.Data.Stream

117 -- | Functions ending in the general shape @Stream m a -> m b@ or @Stream m

114 -- | Functions ending in the general shape @Stream m a -> m b@ or @Stream m

118 -- a -> m (b, Stream m a)@

115 -- a -> m (b, Stream m a)@

119 --

116 --

120− -- See also: "Streamly.Internal.Data.Stream.StreamD.Eliminate" for @Pre-release@

121− -- functions.

122

117

123-- EXPLANATION: In imperative terms a fold can be considered as a loop over the stream

118-- EXPLANATION: In imperative terms a fold can be considered as a loop over the stream

124-- that reduces the stream to a single value.

119-- that reduces the stream to a single value.

@@ -259,8 +254,6 @@ module Streamly.Data.Stream

259 -- * Scanning

254 -- * Scanning

260 -- | Stateful one-to-one transformations.

255 -- | Stateful one-to-one transformations.

261 --

256 --

262− -- See also: "Streamly.Internal.Data.Stream.StreamD.Transform" for

263− -- @Pre-release@ functions.

264

257

265 {-

258 {-

266 -- ** Left scans

259 -- ** Left scans

@@ -485,9 +478,6 @@ module Streamly.Data.Stream

485 -- For example, instead of calling them on a stream of chars call them on a

478 -- For example, instead of calling them on a stream of chars call them on a

486 -- stream of arrays before flattening it to a stream of chars.

479 -- stream of arrays before flattening it to a stream of chars.

487 --

480 --

488− -- See also: "Streamly.Internal.Data.Stream.StreamD.Exception" for

489− -- @Pre-release@ functions.

490−

491 , onException

481 , onException

492 , handle

482 , handle

493

483

core/src/Streamly/Data/Unfold.hs+1−1

@@ -39,7 +39,7 @@ module Streamly.Data.Unfold

39

40 -- * Unfolds

41 -- One to one correspondence with

42− -- "Streamly.Internal.Data.Stream.StreamD.Generate"

42+ -- "Streamly.Internal.Data.Stream.Generate"

43

44 -- ** Basic Constructors

45 , unfoldrM

core/src/Streamly/Internal/Data/Array/Generic.hs+3−3

@@ -59,7 +59,7 @@ import GHC.IO (unsafePerformIO)

59import Text.Read (readPrec)

60

61import Streamly.Internal.Data.Fold.Type (Fold(..))

62−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

62+import Streamly.Internal.Data.Stream.Type (Stream)

63import Streamly.Internal.Data.Unfold.Type (Unfold(..))

64import Streamly.Internal.System.IO (unsafeInlineIO)

65

@@ -68,8 +68,8 @@ import qualified Streamly.Internal.Data.Fold.Type as FL

68import qualified Streamly.Internal.Data.Producer.Type as Producer

69import qualified Streamly.Internal.Data.Producer as Producer

70import qualified Streamly.Internal.Data.Ring.Generic as RB

71−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

71+import qualified Streamly.Internal.Data.Stream.Type as D

72−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as D

72+import qualified Streamly.Internal.Data.Stream.Generate as D

73import qualified Text.ParserCombinators.ReadPrec as ReadPrec

74

75import Prelude hiding (Foldable(..), read)

core/src/Streamly/Internal/Data/Array/Type.hs+4−4

@@ -105,7 +105,7 @@ import GHC.IO (unsafePerformIO)

105import GHC.Ptr (Ptr(..))

106import Streamly.Internal.Data.MutArray.Type (MutArray(..), MutableByteArray)

107import Streamly.Internal.Data.Fold.Type (Fold(..))

108−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

108+import Streamly.Internal.Data.Stream.Type (Stream)

109import Streamly.Internal.Data.Unbox (Unbox(..))

110import Streamly.Internal.Data.Unfold.Type (Unfold(..))

111import Text.Read (readPrec)

@@ -114,9 +114,9 @@ import Prelude hiding (Foldable(..), read, unlines, splitAt)

114

115import qualified GHC.Exts as Exts

116import qualified Streamly.Internal.Data.MutArray.Type as MA

117−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

117+import qualified Streamly.Internal.Data.Stream.Type as D

118−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as D

118+import qualified Streamly.Internal.Data.Stream.Generate as D

119−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

119+import qualified Streamly.Internal.Data.StreamK.Type as K

120import qualified Streamly.Internal.Data.Unbox as Unboxed

121import qualified Streamly.Internal.Data.Unfold.Type as Unfold

122import 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(..))

240import Streamly.Internal.Data.Unbox (Unbox, sizeOf)

241import Streamly.Internal.Data.Unfold.Type (Unfold(..))

242import Streamly.Internal.Data.Tuple.Strict (Tuple'(..), Tuple3'(..))

243−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

243+import Streamly.Internal.Data.Stream.Type (Stream)

244

245import qualified Prelude

246import qualified Streamly.Internal.Data.MutArray.Type as MA

@@ -248,7 +248,7 @@ import qualified Streamly.Internal.Data.Array.Type as Array

248import qualified Streamly.Internal.Data.Fold.Window as Fold

249import qualified Streamly.Internal.Data.Pipe.Type as Pipe

250import 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

252

253import Prelude hiding

254 ( 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)

452import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))

453import Streamly.Internal.Data.Refold.Type (Refold(..))

454

455−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

455+import qualified Streamly.Internal.Data.StreamK.Type as K

456

457import Prelude hiding (Foldable(..), concatMap, filter, map, take)

458

core/src/Streamly/Internal/Data/IORef/Unboxed.hs+1−1

@@ -47,7 +47,7 @@ import Streamly.Internal.Data.Unbox

47 , sizeOf

48 )

49

50−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

50+import qualified Streamly.Internal.Data.Stream.Type as D

51

52-- | An 'IORef' holds a single 'Unbox'-able value.

53newtype IORef a = IORef MutableByteArray

core/src/Streamly/Internal/Data/List.hs+5−5

@@ -66,19 +66,19 @@ where

66import Control.Arrow (second)

67import Data.Functor.Identity (Identity, runIdentity)

68import GHC.Exts (IsList(..), IsString(..))

69−import Streamly.Internal.Data.Stream.StreamD.Type

69+import Streamly.Internal.Data.Stream.Type

70 ( CrossStream

71 , mkCross

72 , unCross

73 )

74−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

74+import Streamly.Internal.Data.Stream.Type (Stream)

75import Text.Read

76 ( Lexeme(Ident), lexP, parens, prec, readPrec, readListPrec

77 , readListPrecDefault)

78

79−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

79+import qualified Streamly.Internal.Data.StreamK.Type as K

80−import qualified Streamly.Internal.Data.Stream.StreamD.Type as Stream

80+import qualified Streamly.Internal.Data.Stream.Type as Stream

81−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as Stream

81+import qualified Streamly.Internal.Data.Stream.Generate as Stream

82

83-- XXX Rename to PureStream.

84

core/src/Streamly/Internal/Data/MutArray/Generic.hs+5−5

@@ -182,15 +182,15 @@ import GHC.Int (Int(..))

182import Streamly.Internal.Data.Fold.Type (Fold(..))

183import Streamly.Internal.Data.Producer.Type (Producer (..))

184import Streamly.Internal.Data.Unfold.Type (Unfold(..))

185−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

185+import Streamly.Internal.Data.Stream.Type (Stream)

186import Streamly.Internal.Data.SVar.Type (adaptState)

187

188import qualified Streamly.Internal.Data.Fold.Type as FL

189import qualified Streamly.Internal.Data.Producer as Producer

190−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

190+import qualified Streamly.Internal.Data.Stream.Type as D

191−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as D

191+import qualified Streamly.Internal.Data.Stream.Generate as D

192−import qualified Streamly.Internal.Data.Stream.StreamD.Lift as D

192+import qualified Streamly.Internal.Data.Stream.Lift as D

193−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

193+import qualified Streamly.Internal.Data.StreamK.Type as K

194

195import Prelude hiding (read, length)

196

core/src/Streamly/Internal/Data/MutArray/Type.hs+5−5

@@ -256,17 +256,17 @@ import GHC.Ptr (Ptr(..))

256

257import Streamly.Internal.Data.Fold.Type (Fold(..))

258import Streamly.Internal.Data.Producer.Type (Producer (..))

259−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

259+import Streamly.Internal.Data.Stream.Type (Stream)

260−import Streamly.Internal.Data.Stream.StreamK.Type (StreamK)

260+import Streamly.Internal.Data.StreamK.Type (StreamK)

261import Streamly.Internal.Data.SVar.Type (adaptState, defState)

262import Streamly.Internal.Data.Unfold.Type (Unfold(..))

263import Streamly.Internal.System.IO (arrayPayloadSize, defaultChunkSize)

264

265import qualified Streamly.Internal.Data.Fold.Type as FL

266import qualified Streamly.Internal.Data.Producer as Producer

267−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

267+import qualified Streamly.Internal.Data.Stream.Type as D

268−import qualified Streamly.Internal.Data.Stream.StreamD.Lift as D

268+import qualified Streamly.Internal.Data.Stream.Lift as D

269−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

269+import qualified Streamly.Internal.Data.StreamK.Type as K

270import qualified Streamly.Internal.Data.Unbox as Unboxed

271import qualified Prelude

272

core/src/Streamly/Internal/Data/Parser.hs+3−3

@@ -266,12 +266,12 @@ import Streamly.Internal.Data.SVar.Type (defState)

266import Streamly.Internal.Data.Either.Strict (Either'(..))

267import Streamly.Internal.Data.Maybe.Strict (Maybe'(..))

268import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))

269−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

269+import Streamly.Internal.Data.Stream.Type (Stream)

270

271import qualified Data.Foldable as Foldable

272import qualified Streamly.Internal.Data.Fold.Type as FL

273−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

273+import qualified Streamly.Internal.Data.Stream.Type as D

274−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as D

274+import qualified Streamly.Internal.Data.Stream.Generate as D

275

276import Prelude hiding

277 (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

261import Streamly.Internal.Data.StreamK (Stream)

262import qualified Streamly.Internal.Data.StreamK as Stream

263#else

264−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

264+import Streamly.Internal.Data.Stream.Type (Stream)

265−import qualified Streamly.Internal.Data.Stream.StreamD.Type as Stream

265+import qualified Streamly.Internal.Data.Stream.Type as Stream

266#endif

267

268import Prelude hiding

core/src/Streamly/Internal/Data/Producer.hs+2−2

@@ -36,8 +36,8 @@ where

36

37#include "inline.hs"

38

39−import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))

39+import Streamly.Internal.Data.Stream.Step (Step(..))

40−import Streamly.Internal.Data.Stream.StreamD.Type (Stream(..))

40+import Streamly.Internal.Data.Stream.Type (Stream(..))

41import Streamly.Internal.Data.SVar.Type (defState)

42import Streamly.Internal.Data.Unfold.Type (Unfold(..))

43

core/src/Streamly/Internal/Data/Producer/Source.hs+1−1

@@ -38,7 +38,7 @@ import GHC.Exts (SpecConstrAnnotation(..))

38import GHC.Types (SPEC(..))

39import Streamly.Internal.Data.Parser (ParseError(..), Step(..))

40import Streamly.Internal.Data.Producer.Type (Producer(..))

41−import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))

41+import Streamly.Internal.Data.Stream.Step (Step(..))

42

43import qualified Streamly.Internal.Data.Parser as ParserD

44-- 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

33#include "inline.hs"

34

35import Fusion.Plugin.Types (Fuse(..))

36−import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))

36+import Streamly.Internal.Data.Stream.Step (Step(..))

37import Prelude hiding (concat, map)

38

39------------------------------------------------------------------------------

core/src/Streamly/Internal/Data/Ring.hs+2−2

@@ -84,8 +84,8 @@ import GHC.ForeignPtr (mallocPlainForeignPtrAlignedBytes)

84import GHC.Ptr (Ptr(..))

85import Streamly.Internal.Data.MutArray.Type (MutArray)

86import Streamly.Internal.Data.Fold.Type (Fold(..), Step(..), lmap)

87−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

87+import Streamly.Internal.Data.Stream.Type (Stream)

88−import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))

88+import Streamly.Internal.Data.Stream.Step (Step(..))

89import Streamly.Internal.Data.Unfold.Type (Unfold(..))

90import Streamly.Internal.System.IO (unsafeInlineIO)

91

core/src/Streamly/Internal/Data/Ring/Generic.hs+2−2

@@ -26,7 +26,7 @@ module Streamly.Internal.Data.Ring.Generic

26#include "assert.hs"

27

28import Control.Monad.IO.Class (liftIO, MonadIO)

29−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

29+import Streamly.Internal.Data.Stream.Type (Stream)

30import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))

31import Streamly.Internal.Data.Fold.Type (Fold(..))

32import Streamly.Internal.Data.MutArray.Generic

@@ -36,7 +36,7 @@ import Streamly.Internal.Data.MutArray.Generic

36 , putIndexUnsafe

37 , putSliceUnsafe

38 )

39−-- import qualified Streamly.Internal.Data.Stream.StreamD.Type as Stream

39+-- import qualified Streamly.Internal.Data.Stream.Type as Stream

40import qualified Streamly.Internal.Data.Fold.Type as Fold

41

42-- XXX Use MutableArray rather than keeping a MutArray here.

core/src/Streamly/Internal/Data/Stream.hs+20−20

@@ -17,26 +17,26 @@

17

18module Streamly.Internal.Data.Stream

19 (

20− module Streamly.Internal.Data.Stream.StreamD.Type

20+ module Streamly.Internal.Data.Stream.Type

21− , module Streamly.Internal.Data.Stream.StreamD.Generate

21+ , module Streamly.Internal.Data.Stream.Generate

22− , module Streamly.Internal.Data.Stream.StreamD.Eliminate

22+ , module Streamly.Internal.Data.Stream.Eliminate

23− , module Streamly.Internal.Data.Stream.StreamD.Exception

23+ , module Streamly.Internal.Data.Stream.Exception

24− , module Streamly.Internal.Data.Stream.StreamD.Lift

24+ , module Streamly.Internal.Data.Stream.Lift

25− , module Streamly.Internal.Data.Stream.StreamD.Transformer

25+ , module Streamly.Internal.Data.Stream.Transformer

26− , module Streamly.Internal.Data.Stream.StreamD.Nesting

26+ , module Streamly.Internal.Data.Stream.Nesting

27− , module Streamly.Internal.Data.Stream.StreamD.Transform

27+ , module Streamly.Internal.Data.Stream.Transform

28− , module Streamly.Internal.Data.Stream.StreamD.Top

28+ , module Streamly.Internal.Data.Stream.Top

29− , module Streamly.Internal.Data.Stream.StreamD.Container

29+ , module Streamly.Internal.Data.Stream.Container

30 )

31where

32

33−import Streamly.Internal.Data.Stream.StreamD.Type

33+import Streamly.Internal.Data.Stream.Type

34−import Streamly.Internal.Data.Stream.StreamD.Generate

34+import Streamly.Internal.Data.Stream.Generate

35−import Streamly.Internal.Data.Stream.StreamD.Eliminate

35+import Streamly.Internal.Data.Stream.Eliminate

36−import Streamly.Internal.Data.Stream.StreamD.Exception

36+import Streamly.Internal.Data.Stream.Exception

37−import Streamly.Internal.Data.Stream.StreamD.Lift

37+import Streamly.Internal.Data.Stream.Lift

38−import Streamly.Internal.Data.Stream.StreamD.Transformer

38+import Streamly.Internal.Data.Stream.Transformer

39−import Streamly.Internal.Data.Stream.StreamD.Nesting

39+import Streamly.Internal.Data.Stream.Nesting

40−import Streamly.Internal.Data.Stream.StreamD.Transform

40+import Streamly.Internal.Data.Stream.Transform

41−import Streamly.Internal.Data.Stream.StreamD.Top

41+import Streamly.Internal.Data.Stream.Top

42−import Streamly.Internal.Data.Stream.StreamD.Container

42+import Streamly.Internal.Data.Stream.Container

core/src/Streamly/Internal/Data/Stream/Common.hs+2−2

@@ -32,8 +32,8 @@ where

32

33import Streamly.Internal.Data.Fold.Type (Fold (..))

34

35−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

35+import qualified Streamly.Internal.Data.StreamK.Type as K

36−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

36+import qualified Streamly.Internal.Data.Stream.Type as D

37

38import Prelude hiding (Foldable(..), repeat)

39

core/src/Streamly/Internal/Data/Stream/StreamD/Container.hs → core/src/Streamly/Internal/Data/Stream/Container.hsrenamed+9−9

@@ -1,6 +1,6 @@

1{-# LANGUAGE CPP #-}

2-- |

3−-- Module : Streamly.Internal.Data.Stream.StreamD.Container

3+-- Module : Streamly.Internal.Data.Stream.Container

5-- License : BSD-3-Clause

6-- Maintainer : streamly@composewell.com

@@ -9,7 +9,7 @@

9--

10-- Stream operations that require transformers or containers like Set or Map.

11

12−module Streamly.Internal.Data.Stream.StreamD.Container

12+module Streamly.Internal.Data.Stream.Container

13 (

14 nub

15

@@ -30,8 +30,8 @@ import Control.Monad.IO.Class (MonadIO)

30import Control.Monad.Trans.State.Strict (get, put)

31import Data.Function ((&))

32import Data.Maybe (isJust)

33−import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))

33+import Streamly.Internal.Data.Stream.Step (Step(..))

34−import Streamly.Internal.Data.Stream.StreamD.Type

34+import Streamly.Internal.Data.Stream.Type

35 (Stream(..), mkCross, unCross)

36

37import qualified Data.Map.Strict as Map

@@ -39,11 +39,11 @@ import qualified Data.Set as Set

39import qualified Streamly.Data.Fold as Fold

40import qualified Streamly.Internal.Data.Array.Generic as Array

41import qualified Streamly.Internal.Data.MutArray.Type as MA

42−import qualified Streamly.Internal.Data.Stream.StreamD.Type as Stream

42+import qualified Streamly.Internal.Data.Stream.Type as Stream

43−import qualified Streamly.Internal.Data.Stream.StreamD.Nesting as Stream

43+import qualified Streamly.Internal.Data.Stream.Nesting as Stream

44−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as Stream

44+import qualified Streamly.Internal.Data.Stream.Generate as Stream

45−import qualified Streamly.Internal.Data.Stream.StreamD.Transform as Stream

45+import qualified Streamly.Internal.Data.Stream.Transform as Stream

46−import qualified Streamly.Internal.Data.Stream.StreamD.Transformer as Stream

46+import qualified Streamly.Internal.Data.Stream.Transformer as Stream

47

48#include "DocTestDataStream.hs"

49

core/src/Streamly/Internal/Data/Stream/StreamD/Eliminate.hs → core/src/Streamly/Internal/Data/Stream/Eliminate.hsrenamed+6−8

@@ -1,6 +1,6 @@

1{-# LANGUAGE CPP #-}

2-- |

3−-- Module : Streamly.Internal.Data.Stream.StreamD.Eliminate

3+-- Module : Streamly.Internal.Data.Stream.Eliminate

5-- (c) Roman Leshchinskiy 2008-2010

6-- License : BSD-3-Clause

@@ -11,7 +11,7 @@

11-- A few functions in this module have been adapted from the vector package

12-- (c) Roman Leshchinskiy.

13--

14−module Streamly.Internal.Data.Stream.StreamD.Eliminate

14+module Streamly.Internal.Data.Stream.Eliminate

15 (

16 -- * Running a 'Fold'

17 fold

@@ -99,15 +99,15 @@ import qualified Streamly.Internal.Data.Array.Type as Array

99import qualified Streamly.Internal.Data.Fold as Fold

100import qualified Streamly.Internal.Data.Parser as PR

101import qualified Streamly.Internal.Data.Parser as PRD

102−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as StreamD

102+import qualified Streamly.Internal.Data.Stream.Generate as StreamD

103−import qualified Streamly.Internal.Data.Stream.StreamD.Nesting as Nesting

103+import qualified Streamly.Internal.Data.Stream.Nesting as Nesting

104−import qualified Streamly.Internal.Data.Stream.StreamD.Transform as StreamD

104+import qualified Streamly.Internal.Data.Stream.Transform as StreamD

105

106import Prelude hiding

107 ( Foldable(..), all, any, head, last, lookup, mapM, mapM_

108 , notElem, splitAt, tail, (!!))

109import Data.Foldable (length)

110−import Streamly.Internal.Data.Stream.StreamD.Type

110+import Streamly.Internal.Data.Stream.Type

111

112#include "DocTestDataStream.hs"

113

@@ -820,8 +820,6 @@ isSuffixOfUnbox suffix stream =

820-- stripSuffix on that especially if the elements have a Storable or Prim

821-- instance.

822--

823−-- See also "Streamly.Internal.Data.Stream.StreamD.Reduce.dropSuffix".

824−--

825-- Space: @O(n)@, buffers the entire input stream as well as the suffix

823-- Space: @O(n)@, buffers the entire input stream as well as the suffix

826--

824--

827-- /Pre-release/

825-- /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 @@

1{-# LANGUAGE CPP #-}

2-- |

3−-- Module : Streamly.Internal.Data.Stream.StreamD.Exception

3+-- Module : Streamly.Internal.Data.Stream.Exception

5-- License : BSD-3-Clause

6-- Maintainer : streamly@composewell.com

7-- Stability : experimental

8-- Portability : GHC

9

10−module Streamly.Internal.Data.Stream.StreamD.Exception

10+module Streamly.Internal.Data.Stream.Exception

11 (

12 gbracket_

13 , gbracket

@@ -36,7 +36,7 @@ import Streamly.Internal.Data.IOFinalizer

36

37import qualified Control.Monad.Catch as MC

38

39−import Streamly.Internal.Data.Stream.StreamD.Type

39+import Streamly.Internal.Data.Stream.Type

40

41#include "DocTestDataStream.hs"

42

core/src/Streamly/Internal/Data/Stream/StreamD/Generate.hs → core/src/Streamly/Internal/Data/Stream/Generate.hsrenamed+3−3

@@ -1,6 +1,6 @@

1{-# LANGUAGE CPP #-}

2-- |

3−-- Module : Streamly.Internal.Data.Stream.StreamD.Generate

3+-- Module : Streamly.Internal.Data.Stream.Generate

5-- (c) Roman Leshchinskiy 2008-2010

6-- License : BSD-3-Clause

@@ -12,7 +12,7 @@

12-- A few combinators in this module have been adapted from the vector package

13-- (c) Roman Leshchinskiy. See the notes in specific combinators.

14--

15−module Streamly.Internal.Data.Stream.StreamD.Generate

15+module Streamly.Internal.Data.Stream.Generate

16 (

17 -- * Primitives

18 nil

@@ -135,7 +135,7 @@ import Data.Ratio

135import Data.Word

136import Numeric.Natural

137import Prelude hiding (iterate, repeat, replicate, take, takeWhile)

138−import Streamly.Internal.Data.Stream.StreamD.Type

138+import Streamly.Internal.Data.Stream.Type

139

140#include "DocTestDataStream.hs"

141

core/src/Streamly/Internal/Data/Stream/StreamD/Lift.hs → core/src/Streamly/Internal/Data/Stream/Lift.hsrenamed+3−3

@@ -1,6 +1,6 @@

1{-# LANGUAGE CPP #-}

2-- |

3−-- Module : Streamly.Internal.Data.Stream.StreamD.Lift

3+-- Module : Streamly.Internal.Data.Stream.Lift

5-- License : BSD-3-Clause

6-- Maintainer : streamly@composewell.com

@@ -9,7 +9,7 @@

9--

10-- Transform the underlying monad of a stream.

11

12−module Streamly.Internal.Data.Stream.StreamD.Lift

12+module Streamly.Internal.Data.Stream.Lift

13 (

14 -- * Generalize Inner Monad

15 morphInner

@@ -27,7 +27,7 @@ where

27import Data.Functor.Identity (Identity(..))

28import Streamly.Internal.Data.SVar.Type (adaptState)

29

30−import Streamly.Internal.Data.Stream.StreamD.Type

30+import Streamly.Internal.Data.Stream.Type

31

32#include "DocTestDataStream.hs"

33

core/src/Streamly/Internal/Data/Stream/MutChunked.hs+1−1

@@ -35,7 +35,7 @@ import Streamly.Internal.Data.Unbox (Unbox, sizeOf)

35import Streamly.Internal.Data.MutArray.Type (MutArray(..))

36import Streamly.Internal.Data.Fold.Type (Fold(..))

37import Streamly.Internal.Data.Parser (ParseError)

38−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

38+import Streamly.Internal.Data.Stream.Type (Stream)

39import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))

40

41import 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 @@

1{-# LANGUAGE CPP #-}

2-- |

3−-- Module : Streamly.Internal.Data.Stream.StreamD.Nesting

3+-- Module : Streamly.Internal.Data.Stream.Nesting

5-- (c) Roman Leshchinskiy 2008-2010

6-- License : BSD-3-Clause

@@ -24,7 +24,7 @@

24-- The zipWithM combinator in this module has been adapted from the vector

25-- package (c) Roman Leshchinskiy.

26--

27−module Streamly.Internal.Data.Stream.StreamD.Nesting

27+module Streamly.Internal.Data.Stream.Nesting

28 (

29 -- * Generate

30 -- | Combining streams to generate streams.

@@ -197,9 +197,9 @@ import qualified Streamly.Internal.Data.Parser as PR

197import qualified Streamly.Internal.Data.Parser as PRD

198import qualified Streamly.Internal.Data.Ring as RB

199

200−import Streamly.Internal.Data.Stream.StreamD.Transform

200+import Streamly.Internal.Data.Stream.Transform

201 (intersperse, intersperseMSuffix)

202−import Streamly.Internal.Data.Stream.StreamD.Type

202+import Streamly.Internal.Data.Stream.Type

203

204import Prelude hiding (concatMap, mapM, zipWith)

205

core/src/Streamly/Internal/Data/Stream/StreamD/Step.hs → core/src/Streamly/Internal/Data/Stream/Step.hsrenamed+2−2

@@ -1,12 +1,12 @@

1-- |

2−-- Module : Streamly.Internal.Data.Stream.StreamD.Step

2+-- Module : Streamly.Internal.Data.Stream.Step

4-- License : BSD-3-Clause

5-- Maintainer : streamly@composewell.com

6-- Stability : experimental

7-- Portability : GHC

8

9−module Streamly.Internal.Data.Stream.StreamD.Step

9+module Streamly.Internal.Data.Stream.Step

10 (

11 -- * The stream type

12 Step (..)

core/src/Streamly/Internal/Data/Stream/StreamD/Top.hs → core/src/Streamly/Internal/Data/Stream/Top.hsrenamed+6−6

@@ -1,6 +1,6 @@

1{-# LANGUAGE CPP #-}

2-- |

3−-- Module : Streamly.Internal.Data.Stream.StreamD.Top

3+-- Module : Streamly.Internal.Data.Stream.Top

5-- License : BSD-3-Clause

6-- Maintainer : streamly@composewell.com

@@ -9,7 +9,7 @@

9--

10-- Top level module that can depend on all other lower level Stream modules.

11

12−module Streamly.Internal.Data.Stream.StreamD.Top

12+module Streamly.Internal.Data.Stream.Top

13 (

14 -- * Transformation

15 -- ** Sampling

@@ -49,13 +49,13 @@ import Control.Monad.IO.Class (MonadIO(..))

49import Data.IORef (newIORef, readIORef, modifyIORef')

50import Streamly.Internal.Data.Fold.Type (Fold)

51import Streamly.Internal.Data.Stream.Common ()

52−import Streamly.Internal.Data.Stream.StreamD.Type (Stream, cross)

52+import Streamly.Internal.Data.Stream.Type (Stream, cross)

53

54import qualified Data.List as List

55import qualified Streamly.Internal.Data.Fold as Fold

56−import qualified Streamly.Internal.Data.Stream.StreamD.Type as Stream

56+import qualified Streamly.Internal.Data.Stream.Type as Stream

57−import qualified Streamly.Internal.Data.Stream.StreamD.Nesting as Stream

57+import qualified Streamly.Internal.Data.Stream.Nesting as Stream

58−import qualified Streamly.Internal.Data.Stream.StreamD.Transform as Stream

58+import qualified Streamly.Internal.Data.Stream.Transform as Stream

59

60import Prelude hiding (filter, zipWith, concatMap, concat)

61

core/src/Streamly/Internal/Data/Stream/StreamD/Transform.hs → core/src/Streamly/Internal/Data/Stream/Transform.hsrenamed+5−5

@@ -1,6 +1,6 @@

1{-# LANGUAGE CPP #-}

2-- |

3−-- Module : Streamly.Internal.Data.Stream.StreamD.Transform

3+-- Module : Streamly.Internal.Data.Stream.Transform

5-- (c) Roman Leshchinskiy 2008-2010

6-- License : BSD-3-Clause

@@ -13,7 +13,7 @@

13-- A few functions in this module have been adapted from the vector package

14-- (c) Roman Leshchinskiy. See the notes in specific combinators.

15

16−module Streamly.Internal.Data.Stream.StreamD.Transform

16+module Streamly.Internal.Data.Stream.Transform

17 (

18 -- * Piping

19 -- | Pass through a 'Pipe'.

@@ -173,15 +173,15 @@ import Streamly.Internal.System.IO (defaultChunkSize)

173import qualified Streamly.Internal.Data.Array.Type as A

174import qualified Streamly.Internal.Data.Fold as FL

175import 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

177

178import Prelude hiding

179 ( drop, dropWhile, filter, map, mapM, reverse

180 , scanl, scanl1, sequence, take, takeWhile, zipWith)

181

182−import Streamly.Internal.Data.Stream.StreamD.Generate

182+import Streamly.Internal.Data.Stream.Generate

183 (absTimesWith, relTimesWith)

184−import Streamly.Internal.Data.Stream.StreamD.Type

184+import Streamly.Internal.Data.Stream.Type

185

186#include "DocTestDataStream.hs"

187

core/src/Streamly/Internal/Data/Stream/StreamD/Transformer.hs → core/src/Streamly/Internal/Data/Stream/Transformer.hsrenamed+3−3

@@ -1,6 +1,6 @@

1{-# LANGUAGE CPP #-}

2-- |

3−-- Module : Streamly.Internal.Data.Stream.StreamD.Transformer

3+-- Module : Streamly.Internal.Data.Stream.Transformer

5-- License : BSD-3-Clause

6-- Maintainer : streamly@composewell.com

@@ -9,7 +9,7 @@

9--

10-- Transform the underlying monad of a stream using a monad transfomer.

11

12−module Streamly.Internal.Data.Stream.StreamD.Transformer

12+module Streamly.Internal.Data.Stream.Transformer

13 (

14 foldlT

15 , foldrT

@@ -35,7 +35,7 @@ import Streamly.Internal.Data.SVar.Type (defState, adaptState)

35import qualified Control.Monad.Trans.Reader as Reader

36import qualified Control.Monad.Trans.State.Strict as State

37

38−import Streamly.Internal.Data.Stream.StreamD.Type

38+import Streamly.Internal.Data.Stream.Type

39

40#include "DocTestDataStream.hs"

41

core/src/Streamly/Internal/Data/Stream/StreamD/Type.hs → core/src/Streamly/Internal/Data/Stream/Type.hsrenamed+17−17

@@ -2,7 +2,7 @@

2{-# LANGUAGE UndecidableInstances #-}

3

4-- |

5−-- Module : Streamly.Internal.Data.Stream.StreamD.Type

5+-- Module : Streamly.Internal.Data.Stream.Type

7-- (c) Roman Leshchinskiy 2008-2010

8-- License : BSD-3-Clause

@@ -14,7 +14,7 @@

14-- module have been originally adapted from the vector package (c) Roman

15-- Leshchinskiy. See the notes in specific functions.

16

17−module Streamly.Internal.Data.Stream.StreamD.Type

17+module Streamly.Internal.Data.Stream.Type

18 (

19 -- * The stream type

20 Step (..)

@@ -44,20 +44,20 @@ module Streamly.Internal.Data.Stream.StreamD.Type

44 , fromEffect

45

46 -- ** From Containers

47− , Streamly.Internal.Data.Stream.StreamD.Type.fromList

47+ , Streamly.Internal.Data.Stream.Type.fromList

48

49 -- * Elimination

50 -- ** Primitives

51 , uncons

52

53 -- ** Strict Left Folds

54− , Streamly.Internal.Data.Stream.StreamD.Type.fold

54+ , Streamly.Internal.Data.Stream.Type.fold

55 , foldBreak

56 , foldAddLazy

57 , foldAdd

58 , foldEither

59

60− , Streamly.Internal.Data.Stream.StreamD.Type.foldl'

60+ , Streamly.Internal.Data.Stream.Type.foldl'

61 , foldlM'

62 , foldlx'

63 , foldlMx'

@@ -65,12 +65,12 @@ module Streamly.Internal.Data.Stream.StreamD.Type

65 -- ** Lazy Right Folds

66 , foldrM

67 , foldrMx

68− , Streamly.Internal.Data.Stream.StreamD.Type.foldr

68+ , Streamly.Internal.Data.Stream.Type.foldr

69 , foldrS

70

71 -- ** Specific Folds

72 , drain

73− , Streamly.Internal.Data.Stream.StreamD.Type.toList

73+ , Streamly.Internal.Data.Stream.Type.toList

74

75 -- * Mapping

76 , map

@@ -158,12 +158,12 @@ import Streamly.Internal.BaseCompat ((#.))

158import Streamly.Internal.Data.Fold.Type (Fold(..))

159import Streamly.Internal.Data.Maybe.Strict (Maybe'(..), toMaybe)

160import Streamly.Internal.Data.Refold.Type (Refold(..))

161−import Streamly.Internal.Data.Stream.StreamD.Step (Step (..))

161+import Streamly.Internal.Data.Stream.Step (Step (..))

162import Streamly.Internal.Data.SVar.Type (State, adaptState, defState)

163import Streamly.Internal.Data.Unfold.Type (Unfold(..))

164

165import 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

167#ifdef USE_UNFOLDS_EVERYWHERE

168import qualified Streamly.Internal.Data.Unfold.Type as Unfold

169#endif

@@ -505,7 +505,7 @@ foldAddLazy (Fold fstep finitial fextract) (Stream sstep state) =

505--

506foldAdd :: Monad m => Fold m a b -> Stream m a -> m (Fold m a b)

507foldAdd f =

508− Streamly.Internal.Data.Stream.StreamD.Type.fold (FL.duplicate f)

508+ Streamly.Internal.Data.Stream.Type.fold (FL.duplicate f)

509

510------------------------------------------------------------------------------

511-- Right Folds

@@ -740,7 +740,7 @@ drain (Stream step state) = go SPEC state

740--

741{-# INLINE_NORMAL toList #-}

742toList :: Monad m => Stream m a -> m [a]

743−toList = Streamly.Internal.Data.Stream.StreamD.Type.foldr (:) []

743+toList = Streamly.Internal.Data.Stream.Type.foldr (:) []

744

745-- Use foldr/build fusion to fuse with list consumers

746-- This can be useful when using the IsList instance

@@ -753,7 +753,7 @@ toListFB c n (Stream step state) = go state

753 Skip s -> go s

754 Stop -> n

755

756−{-# RULES "toList Identity" Streamly.Internal.Data.Stream.StreamD.Type.toList = toListId #-}

756+{-# RULES "toList Identity" Streamly.Internal.Data.Stream.Type.toList = toListId #-}

757{-# INLINE_EARLY toListId #-}

758toListId :: Stream Identity a -> Identity [a]

759toListId s = Identity $ build (\c n -> toListFB c n s)

@@ -880,10 +880,10 @@ instance IsList (Stream Identity a) where

880 type (Item (Stream Identity a)) = a

881

882 {-# INLINE fromList #-}

883− fromList = Streamly.Internal.Data.Stream.StreamD.Type.fromList

883+ fromList = Streamly.Internal.Data.Stream.Type.fromList

884

885 {-# INLINE toList #-}

886− toList = runIdentity . Streamly.Internal.Data.Stream.StreamD.Type.toList

886+ toList = runIdentity . Streamly.Internal.Data.Stream.Type.toList

887

888instance Eq a => Eq (Stream Identity a) where

889 {-# INLINE (==) #-}

@@ -930,13 +930,13 @@ instance Show a => Show (Stream Identity a) where

930instance Read a => Read (Stream Identity a) where

931 readPrec = parens $ prec 10 $ do

932 Ident "fromList" <- lexP

933− Streamly.Internal.Data.Stream.StreamD.Type.fromList <$> readPrec

933+ Streamly.Internal.Data.Stream.Type.fromList <$> readPrec

934

935 readListPrec = readListPrecDefault

936

937instance (a ~ Char) => IsString (Stream Identity a) where

938 {-# INLINE fromString #-}

939− fromString = Streamly.Internal.Data.Stream.StreamD.Type.fromList

939+ fromString = Streamly.Internal.Data.Stream.Type.fromList

940

941-------------------------------------------------------------------------------

942-- Foldable

@@ -957,7 +957,7 @@ instance (Foldable m, Monad m) => Foldable (Stream m) where

957 {-# INLINE foldMap #-}

958 foldMap f =

959 Data.Foldable.fold

960− . Streamly.Internal.Data.Stream.StreamD.Type.foldr (mappend . f) mempty

960+ . Streamly.Internal.Data.Stream.Type.foldr (mappend . f) mempty

961

962 {-# INLINE foldr #-}

963 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

17 -- $setup

18

19 -- * The stream type

20− module Streamly.Internal.Data.Stream.StreamK.Type

20+ module Streamly.Internal.Data.StreamK.Type

21− , module Streamly.Internal.Data.Stream.StreamK.Transformer

21+ , module Streamly.Internal.Data.StreamK.Transformer

22

23 , StreamK(..)

24 , fromList

@@ -159,8 +159,8 @@ import Prelude

159 notElem, head, tail, init, zipWith, lookup,

160 (!!), replicate, reverse, concatMap, iterate, splitAt)

161import Data.Foldable (sum, length)

162−import Streamly.Internal.Data.Stream.StreamK.Type

162+import Streamly.Internal.Data.StreamK.Type

163−import Streamly.Internal.Data.Stream.StreamK.Transformer

163+import Streamly.Internal.Data.StreamK.Transformer

164import Streamly.Internal.Data.Parser (ParseError(..))

165

166#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 @@

92-- a push style CPS representation should be able to be used along with StreamK

93-- to efficiently implement composable folds.

94

95−module Streamly.Internal.Data.Stream.StreamK.Alt

95+module Streamly.Internal.Data.StreamK.Alt

96 (

97 -- * Stream Type

98

core/src/Streamly/Internal/Data/Stream/StreamK/Transformer.hs → core/src/Streamly/Internal/Data/StreamK/Transformer.hsrenamed+3−3

@@ -1,12 +1,12 @@

1-- |

2−-- Module : Streamly.Internal.Data.Stream.StreamK.Transformer

2+-- Module : Streamly.Internal.Data.StreamK.Transformer

4-- License : BSD3

5-- Maintainer : streamly@composewell.com

6-- Stability : experimental

7-- Portability : GHC

8--

9−module Streamly.Internal.Data.Stream.StreamK.Transformer

9+module Streamly.Internal.Data.StreamK.Transformer

10 (

11 foldlT

12 , foldrT

@@ -18,7 +18,7 @@ where

18

19import Control.Monad.Trans.Class (MonadTrans(lift))

20import Control.Monad.Trans.State.Strict (StateT)

21−import Streamly.Internal.Data.Stream.StreamK.Type

21+import Streamly.Internal.Data.StreamK.Type

22 (StreamK, nil, cons, uncons, concatEffect)

23

24import 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 @@

1{-# LANGUAGE CPP #-}

2{-# LANGUAGE UndecidableInstances #-}

3-- |

4−-- Module : Streamly.Internal.Data.Stream.StreamK.Type

4+-- Module : Streamly.Internal.Data.StreamK.Type

6--

7-- License : BSD3

@@ -13,7 +13,7 @@

13-- Continuation passing style (CPS) stream implementation. The symbol 'K' below

14-- denotes a function as well as a Kontinuation.

15--

16−module Streamly.Internal.Data.Stream.StreamK.Type

16+module Streamly.Internal.Data.StreamK.Type

17 (

18 -- * StreamK type

19 Stream

@@ -82,11 +82,11 @@ module Streamly.Internal.Data.Stream.StreamK.Type

82 , uncons

83

84 -- ** Strict Left Folds

85− , Streamly.Internal.Data.Stream.StreamK.Type.foldl'

85+ , Streamly.Internal.Data.StreamK.Type.foldl'

86 , foldlx'

87

88 -- ** Lazy Right Folds

89− , Streamly.Internal.Data.Stream.StreamK.Type.foldr

89+ , Streamly.Internal.Data.StreamK.Type.foldr

90

91 -- ** Specific Folds

92 , drain

@@ -1070,7 +1070,7 @@ instance (Foldable m, Monad m) => Foldable (StreamK m) where

1070 {-# INLINE foldMap #-}

1071 foldMap f =

1072 fold

1073− . Streamly.Internal.Data.Stream.StreamK.Type.foldr (mappend . f) mempty

1073+ . Streamly.Internal.Data.StreamK.Type.foldr (mappend . f) mempty

1074

1075 {-# INLINE foldr #-}

1076 foldr f z t = appEndo (foldMap (Endo #. f) t) z

@@ -1121,7 +1121,7 @@ instance Traversable (StreamK Identity) where

1121 {-# INLINE traverse #-}

1122 traverse f xs =

1123 runIdentity

1124− $ Streamly.Internal.Data.Stream.StreamK.Type.foldr

1124+ $ Streamly.Internal.Data.StreamK.Type.foldr

1125 consA (pure mempty) xs

1126

1127 where

core/src/Streamly/Internal/Data/Unfold.hs+4−4

@@ -20,7 +20,7 @@ module Streamly.Internal.Data.Unfold

20

21 -- * Unfolds

22 -- One to one correspondence with

23− -- "Streamly.Internal.Data.Stream.StreamD.Generate"

23+ -- "Streamly.Internal.Data.Stream.Generate"

24 -- ** Basic Constructors

25 , nilM

26 , nil

@@ -120,14 +120,14 @@ import GHC.Types (SPEC(..))

120import Streamly.Internal.Data.Fold.Type (Fold(..))

121import Streamly.Internal.Data.IOFinalizer

122 (newIOFinalizer, runIOFinalizer, clearingIOFinalizer)

123−import Streamly.Internal.Data.Stream.StreamD.Type (Stream(..))

123+import Streamly.Internal.Data.Stream.Type (Stream(..))

124import Streamly.Internal.Data.SVar.Type (defState)

125

126import qualified Control.Monad.Catch as MC

127import qualified Data.Tuple as Tuple

128import qualified Streamly.Internal.Data.Fold.Type as FL

129−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

129+import qualified Streamly.Internal.Data.Stream.Type as D

130−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

130+import qualified Streamly.Internal.Data.StreamK.Type as K

131import qualified Prelude

132

133import Streamly.Internal.Data.Unfold.Enumeration

core/src/Streamly/Internal/Data/Unfold/Type.hs+1−1

@@ -112,7 +112,7 @@ import Control.Monad ((>=>))

112import Data.Void (Void)

113import Fusion.Plugin.Types (Fuse(..))

114import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))

115−import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))

115+import Streamly.Internal.Data.Stream.Step (Step(..))

116

117import Prelude hiding (map, mapM, concatMap, zipWith, takeWhile)

118

core/src/Streamly/Internal/FileSystem/Handle.hs+2−2

@@ -132,7 +132,7 @@ import Streamly.Internal.Data.Refold.Type (Refold(..))

132import Streamly.Internal.Data.Unfold.Type (Unfold(..))

133import Streamly.Internal.Data.Array.Type

134 (Array(..), pinnedWriteNUnsafe, unsafeFreezeWithShrink, byteLength)

135−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

135+import Streamly.Internal.Data.Stream.Type (Stream)

136import Streamly.Internal.Data.Stream.Chunked (lpackArraysChunksOf)

137-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)

138import Streamly.Internal.System.IO (defaultChunkSize)

@@ -148,7 +148,7 @@ import qualified Streamly.Internal.Data.Stream as S

148import qualified Streamly.Internal.Data.Stream as D

149 (Stream(..), Step(..))

150import 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)

152

153#include "DocTestFileSystemHandle.hs"

154

core/src/Streamly/Internal/Unicode/Stream.hs+4−4

@@ -556,7 +556,7 @@ decodeUtf8WithD cfm (D.Stream step state) =

556

557 where

558

559− prefix = "Streamly.Internal.Data.Stream.StreamD.decodeUtf8With: "

559+ prefix = "Streamly.Internal.Data.Stream.decodeUtf8With: "

560

561 {-# INLINE handleError #-}

562 handleError e s =

@@ -720,7 +720,7 @@ decodeUtf8ArraysWithD cfm (D.Stream step state) =

720 case cfm of

721 ErrorOnCodingFailure ->

722 error $

723− show "Streamly.Internal.Data.Stream.StreamD."

723+ show "Streamly.Internal.Data.Stream."

724 ++ "decodeUtf8ArraysWith: Input Underflow"

725 TransliterateCodingFailure -> YAndC replacementChar D

726 DropOnCodingFailure -> D

@@ -769,7 +769,7 @@ decodeUtf8ArraysWithD cfm (D.Stream step state) =

769 Skip $

770 transliterateOrError

771 (

772− "Streamly.Internal.Data.Stream.StreamD."

772+ "Streamly.Internal.Data.Stream."

773 ++ "decodeUtf8ArraysWith: Invalid UTF8"

774 ++ " codepoint encountered"

775 )

@@ -792,7 +792,7 @@ decodeUtf8ArraysWithD cfm (D.Stream step state) =

792 Skip $

793 transliterateOrError

794 (

795− "Streamly.Internal.Data.Stream.StreamD."

795+ "Streamly.Internal.Data.Stream."

796 ++ "decodeUtf8ArraysWith: Invalid UTF8"

797 ++ " codepoint encountered"

798 )

core/streamly-core.cabal+15−15

@@ -405,20 +405,20 @@ library

405 , Streamly.Internal.Data.Fold.Container

406 , Streamly.Internal.Data.Fold.Window

407

408− , Streamly.Internal.Data.Stream.StreamD.Container

408+ , Streamly.Internal.Data.Stream.Container

409− , Streamly.Internal.Data.Stream.StreamD.Eliminate

409+ , Streamly.Internal.Data.Stream.Eliminate

410− , Streamly.Internal.Data.Stream.StreamD.Exception

410+ , Streamly.Internal.Data.Stream.Exception

411− , Streamly.Internal.Data.Stream.StreamD.Generate

411+ , Streamly.Internal.Data.Stream.Generate

412− , Streamly.Internal.Data.Stream.StreamD.Lift

412+ , Streamly.Internal.Data.Stream.Lift

413− , Streamly.Internal.Data.Stream.StreamD.Nesting

413+ , Streamly.Internal.Data.Stream.Nesting

414− , Streamly.Internal.Data.Stream.StreamD.Step

414+ , Streamly.Internal.Data.Stream.Step

415− , Streamly.Internal.Data.Stream.StreamD.Top

415+ , Streamly.Internal.Data.Stream.Top

416− , Streamly.Internal.Data.Stream.StreamD.Transform

416+ , Streamly.Internal.Data.Stream.Transform

417− , Streamly.Internal.Data.Stream.StreamD.Transformer

417+ , Streamly.Internal.Data.Stream.Transformer

418− , Streamly.Internal.Data.Stream.StreamD.Type

418+ , Streamly.Internal.Data.Stream.Type

419−

419+

420− , Streamly.Internal.Data.Stream.StreamK.Type

420+ , Streamly.Internal.Data.StreamK.Type

421− , Streamly.Internal.Data.Stream.StreamK.Transformer

421+ , Streamly.Internal.Data.StreamK.Transformer

422

423 , Streamly.Internal.Data.Pipe.Type

424

@@ -434,7 +434,7 @@ library

434

435 if flag(dev)

436 other-modules:

437− Streamly.Internal.Data.Stream.StreamK.Alt

437+ Streamly.Internal.Data.StreamK.Alt

438 , Streamly.Internal.Data.List

439

440 build-depends:

hie.yaml+2−2

@@ -31,9 +31,9 @@ cradle:

31 - path: "./benchmark/Streamly/Benchmark/Data/ParserK.hs"

32 component: "bench:Data.ParserK"

33 - path: "./benchmark/Streamly/Benchmark/Data/Stream/StreamD.hs"

34− component: "bench:Data.Stream.StreamD"

34+ component: "bench:Data.StreamD"

35 - path: "./benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs"

36− component: "bench:Data.Stream.StreamK"

36+ component: "bench:Data.StreamK"

37 - path: "./benchmark/Streamly/Benchmark/Data/Stream/ToStreamK.hs"

38 component: "bench:Data.Stream.ToStreamK"

39 - path: "./benchmark/Streamly/Benchmark/Data/Stream/Common.hs"

targets/Targets.hs+2−2

@@ -10,13 +10,13 @@ where

10targets :: [(String, [String])]

11targets =

12 [ -- Base streams

13− ("Data.Stream.StreamD",

13+ ("Data.Stream",

14 [ "base_stream_grp"

15 , "base_stream_cmp"

16 , "noTest"

17 ]

18 )

19− , ("Data.Stream.StreamK",

19+ , ("Data.StreamK",

20 [ "base_stream_grp"

21 , "base_stream_cmp"

22 , "noTest"