70c03f9 · streamly · git.iko.soy

benchmark/NanoBenchmarks.hs+1−1

compare with master

unifiedsplit

@@ -15,7 +15,7 @@ import qualified Streamly.Internal.FileSystem.Handle as IFH

15import qualified Streamly.Data.Fold as FL

16import qualified Streamly.Internal.Prelude as Internal

17import qualified Streamly.Prelude as S

18−import qualified Streamly.Streams.StreamK as K

18+import qualified Streamly.Internal.Data.Stream.StreamK as K

19

20import Data.Char (ord)

21import Gauge

benchmark/StreamKOps.hs+1−1

@@ -19,7 +19,7 @@ import Prelude

19import qualified Prelude as P

20import qualified Data.List as List

21

22−import qualified Streamly.Streams.StreamK as S

22+import qualified Streamly.Internal.Data.Stream.StreamK as S

23import qualified Streamly.Streams.Prelude as SP

24import qualified Streamly.Internal.Data.SVar as S

25

design/inlining.md+1−1

@@ -13,7 +13,7 @@ i.e. phase 0, 1 and 2. We have defined them as follows in `inline.h`:

13## Low Level `fromStreamD/toStreamD` Fusion

14

15The combinators in `Streamly.Prelude` are defined in terms of combinators in

16−`Streamly.Internal.Data.Stream.StreamD` (Direct style streams) or `Streamly.Streams.StreamK`

16+`Streamly.Internal.Data.Stream.StreamD` (Direct style streams) or `Streamly.Internal.Data.Stream.StreamK`

17(CPS style streams). We convert the stream from `StreamD` to `StreamK`

18representation or vice versa in some cases.

19

src/Streamly.hs+2−2

@@ -229,12 +229,12 @@ import Streamly.Streams.Async

229import Streamly.Streams.Combinators

230import Streamly.Streams.Parallel

231import Streamly.Streams.Serial

232−import Streamly.Streams.StreamK hiding (serial)

232+import Streamly.Internal.Data.Stream.StreamK hiding (serial)

233import Streamly.Streams.Zip

234

235import qualified Streamly.Prelude as P

236import qualified Streamly.Internal.Prelude as IP

237−import qualified Streamly.Streams.StreamK as K

237+import qualified Streamly.Internal.Data.Stream.StreamK as K

238

239-- XXX provide good succinct examples of pipelining, merging, splitting etc.

240-- below.

src/Streamly/FileSystem/FD.hs+1−1

@@ -138,7 +138,7 @@ import qualified GHC.IO.Device as RawIO

138

139import Streamly.Internal.Memory.Array.Types (Array(..), byteLength, defaultChunkSize)

140import Streamly.Streams.Serial (SerialT)

141−import Streamly.Streams.StreamK.Type (IsStream, mkStream)

141+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream)

142

143#if !defined(mingw32_HOST_OS)

144import Streamly.Internal.Memory.Array.Types (groupIOVecsOf)

src/Streamly/Internal/Data/Array.hs+1−1

@@ -58,7 +58,7 @@ import qualified GHC.Exts as Exts

58

59import Streamly.Internal.Data.Unfold.Types (Unfold(..))

60import Streamly.Internal.Data.Fold.Types (Fold(..))

61−import Streamly.Streams.StreamK.Type (IsStream)

61+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

62import Streamly.Streams.Serial (SerialT)

63

64import qualified Streamly.Internal.Data.Stream.StreamD as D

src/Streamly/Internal/Data/List.hs+1−1

@@ -88,7 +88,7 @@ import Streamly.Streams.Serial (SerialT)

88import Streamly.Streams.Zip (ZipSerialM)

89

90import qualified Streamly.Streams.Prelude as P

91−import qualified Streamly.Streams.StreamK as K

91+import qualified Streamly.Internal.Data.Stream.StreamK as K

92

93-- We implement list as a newtype instead of a type synonym to make type

94-- inference easier when using -XOverloadedLists and -XOverloadedStrings. When

src/Streamly/Internal/Data/Pipe.hs+2−2

@@ -258,7 +258,7 @@ import Streamly.Internal.Data.Pipe.Types

258-- import Streamly.Internal.Memory.Array.Types (Array)

259-- import Streamly.Memory.Ring (Ring)

260-- import Streamly.Streams.Serial (SerialT)

261−-- import Streamly.Streams.StreamK (IsStream())

261+-- import Streamly.Internal.Data.Stream.StreamK (IsStream())

262-- import Streamly.Internal.Data.Time.Units

263-- (AbsTime, MilliSecond64(..), addToAbsTime, diffAbsTime, toRelTime,

264-- toAbsTime)

@@ -268,7 +268,7 @@ import Streamly.Internal.Data.Pipe.Types

268-- import qualified Streamly.Internal.Memory.Array.Types as A

269-- import qualified Streamly.Prelude as S

270-- import qualified Streamly.Internal.Data.Stream.StreamD as D

271−-- import qualified Streamly.Streams.StreamK as K

271+-- import qualified Streamly.Internal.Data.Stream.StreamK as K

272-- import qualified Streamly.Streams.Prelude as P

273

274------------------------------------------------------------------------------

src/Streamly/Internal/Data/Stream/StreamD.hs+1−1

@@ -360,7 +360,7 @@ import qualified Streamly.Internal.Data.Pipe.Types as Pipe

360import qualified Streamly.Internal.Memory.Array.Types as A

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

362import qualified Streamly.Memory.Ring as RB

363−import qualified Streamly.Streams.StreamK as K

363+import qualified Streamly.Internal.Data.Stream.StreamK as K

364

365import Foreign.Ptr (plusPtr)

366import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

src/Streamly/Internal/Data/Stream/StreamD/Type.hs+1−1

@@ -79,7 +79,7 @@ import Prelude hiding (map, mapM, foldr, take, concatMap)

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

80import Streamly.Internal.Data.Fold.Types (Fold(..), Fold2(..))

81

82−import qualified Streamly.Streams.StreamK as K

82+import qualified Streamly.Internal.Data.Stream.StreamK as K

83

84------------------------------------------------------------------------------

85-- The direct style stream type

src/Streamly/Streams/StreamK.hs → src/Streamly/Internal/Data/Stream/StreamK.hsrenamed+4−4

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

12#include "inline.hs"

13

14-- |

15−-- Module : Streamly.Streams.StreamK

15+-- Module : Streamly.Internal.Data.Stream.StreamK

17--

18-- License : BSD3

@@ -25,10 +25,10 @@

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

26--

27-- @

28−-- import qualified Streamly.Streams.StreamK as K

28+-- import qualified Streamly.Internal.Data.Stream.StreamK as K

29-- @

30--

31−module Streamly.Streams.StreamK

31+module Streamly.Internal.Data.Stream.StreamK

32 (

33 -- * A class for streams

34 IsStream (..)

@@ -198,7 +198,7 @@ import Prelude

198import qualified Prelude

199

200import Streamly.Internal.Data.SVar

201−import Streamly.Streams.StreamK.Type

201+import Streamly.Internal.Data.Stream.StreamK.Type

202

203-------------------------------------------------------------------------------

204-- Deconstruction

src/Streamly/Streams/StreamK/Type.hs → src/Streamly/Internal/Data/Stream/StreamK/Type.hsrenamed+3−3

@@ -14,10 +14,10 @@

14{-# LANGUAGE RankNTypes #-}

15{-# LANGUAGE UndecidableInstances #-} -- XXX

16

17−#include "../inline.hs"

17+#include "inline.hs"

18

19-- |

20−-- Module : Streamly.Streams.StreamK.Type

20+-- Module : Streamly.Internal.Data.Stream.StreamK.Type

22--

23-- License : BSD3

@@ -29,7 +29,7 @@

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

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

31--

32−module Streamly.Streams.StreamK.Type

32+module Streamly.Internal.Data.Stream.StreamK.Type

33 (

34 -- * A class for streams

35 IsStream (..)

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

@@ -139,7 +139,7 @@ import Control.Monad.Catch (MonadCatch)

139import qualified Prelude

140import qualified Control.Monad.Catch as MC

141import qualified Data.Tuple as Tuple

142−import qualified Streamly.Streams.StreamK as K

142+import qualified Streamly.Internal.Data.Stream.StreamK as K

143import qualified Streamly.Internal.Data.Stream.StreamD as D

144

145-------------------------------------------------------------------------------

src/Streamly/Internal/FileSystem/Dir.hs+1−1

@@ -74,7 +74,7 @@ import Streamly.Internal.Data.Unfold.Types (Unfold(..))

74-- (Array(..), writeNUnsafe, defaultChunkSize, shrinkToFit,

75-- lpackArraysChunksOf)

76-- import Streamly.Streams.Serial (SerialT)

77−import Streamly.Streams.StreamK.Type (IsStream)

77+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

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

79

80-- import qualified Streamly.Data.Fold as FL

src/Streamly/Internal/FileSystem/File.hs+1−1

@@ -108,7 +108,7 @@ import Streamly.Internal.Data.Unfold.Types (Unfold(..))

108import Streamly.Internal.Memory.Array.Types

109 (Array(..), defaultChunkSize, writeNUnsafe)

110import Streamly.Streams.Serial (SerialT)

111−import Streamly.Streams.StreamK.Type (IsStream)

111+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

112import Streamly.Internal.Data.SVar (MonadAsync)

113-- import Streamly.Data.Fold (Fold)

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

src/Streamly/Internal/FileSystem/Handle.hs+1−1

@@ -125,7 +125,7 @@ import Streamly.Internal.Memory.Array.Types

125 (Array(..), writeNUnsafe, defaultChunkSize, shrinkToFit,

126 lpackArraysChunksOf)

127import Streamly.Streams.Serial (SerialT)

128−import Streamly.Streams.StreamK.Type (IsStream, mkStream)

128+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream)

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

130

131import qualified Streamly.Data.Fold as FL

src/Streamly/Internal/Memory/Array.hs+2−2

@@ -143,13 +143,13 @@ import Streamly.Internal.Data.Fold.Types (Fold(..))

143import Streamly.Internal.Data.Unfold.Types (Unfold(..))

144import Streamly.Internal.Memory.Array.Types (Array(..), length)

145import Streamly.Streams.Serial (SerialT)

146−import Streamly.Streams.StreamK.Type (IsStream)

146+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

147

148import qualified Streamly.Internal.Memory.Array.Types as A

149import qualified Streamly.Streams.Prelude as P

150import qualified Streamly.Streams.Serial as Serial

151import qualified Streamly.Internal.Data.Stream.StreamD as D

152−import qualified Streamly.Streams.StreamK as K

152+import qualified Streamly.Internal.Data.Stream.StreamK as K

153

154-------------------------------------------------------------------------------

155-- Construction

src/Streamly/Internal/Memory/Array/Types.hs+1−1

@@ -121,7 +121,7 @@ import Streamly.FileSystem.FDIO (IOVec(..))

121

122import qualified Streamly.Memory.Malloc as Malloc

123import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

124−import qualified Streamly.Streams.StreamK as K

124+import qualified Streamly.Internal.Data.Stream.StreamK as K

125import qualified GHC.Exts as Exts

126

127#ifdef DEVBUILD

src/Streamly/Internal/Memory/ArrayStream.hs+1−1

@@ -51,7 +51,7 @@ import Prelude hiding (length, null, last, map, (!!), read, concat)

51

52import Streamly.Internal.Memory.Array.Types (Array(..), length)

53import Streamly.Streams.Serial (SerialT)

54−import Streamly.Streams.StreamK.Type (IsStream)

54+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

55

56import qualified Streamly.Internal.Memory.Array as A

57import qualified Streamly.Internal.Memory.Array.Types as A

src/Streamly/Internal/Network/Inet/TCP.hs+1−1

@@ -114,7 +114,7 @@ import Streamly.Internal.Data.Unfold.Types (Unfold(..))

114import Streamly.Internal.Network.Socket (SockSpec(..), accept, connections)

115import Streamly.Streams.Serial (SerialT)

116import Streamly.Internal.Memory.Array.Types (Array(..), defaultChunkSize, writeNUnsafe)

117−import Streamly.Streams.StreamK.Type (IsStream)

117+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

118

119import qualified Control.Monad.Catch as MC

120import qualified Network.Socket as Net

src/Streamly/Internal/Network/Socket.hs+1−1

@@ -96,7 +96,7 @@ import Streamly (MonadAsync)

96import Streamly.Internal.Data.Unfold.Types (Unfold(..))

97import Streamly.Internal.Memory.Array.Types (Array(..))

98import Streamly.Streams.Serial (SerialT)

99−import Streamly.Streams.StreamK.Type (IsStream, mkStream)

99+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream)

100import Streamly.Data.Fold (Fold)

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

102

src/Streamly/Internal/Prelude.hs+3−3

@@ -452,7 +452,7 @@ import Streamly.Streams.Combinators (inspectMode, maxYields)

452import Streamly.Streams.Prelude

453 (fromStreamS, toStreamS, foldWith, foldMapWith, forEachWith)

454import Streamly.Internal.Data.Stream.StreamD (fromStreamD, toStreamD)

455−import Streamly.Streams.StreamK (IsStream((|:), consM))

455+import Streamly.Internal.Data.Stream.StreamK (IsStream((|:), consM))

456import Streamly.Streams.Serial (SerialT)

457import Streamly.Internal.Data.Pipe.Types (Pipe (..))

458import Streamly.Internal.Data.Time.Units

@@ -465,11 +465,11 @@ import qualified Streamly.Internal.Memory.Array as A

465import qualified Streamly.Data.Fold as FL

466import qualified Streamly.Internal.Data.Fold.Types as FL

467import qualified Streamly.Streams.Prelude as P

468−import qualified Streamly.Streams.StreamK as K

468+import qualified Streamly.Internal.Data.Stream.StreamK as K

469import qualified Streamly.Internal.Data.Stream.StreamD as D

470

471#ifdef USE_STREAMK_ONLY

472−import qualified Streamly.Streams.StreamK as S

472+import qualified Streamly.Internal.Data.Stream.StreamK as S

473#else

474import qualified Streamly.Internal.Data.Stream.StreamD as S

475#endif

src/Streamly/Streams/Ahead.hs+2−2

@@ -49,10 +49,10 @@ import qualified Data.Heap as H

49import Streamly.Streams.SVar (fromSVar)

50import Streamly.Streams.Serial (map)

51import Streamly.Internal.Data.SVar

52−import Streamly.Streams.StreamK

52+import Streamly.Internal.Data.Stream.StreamK

53 (IsStream(..), Stream, mkStream, foldStream, foldStreamShared,

54 foldStreamSVar)

55−import qualified Streamly.Streams.StreamK as K

55+import qualified Streamly.Internal.Data.Stream.StreamK as K

56

57import Prelude hiding (map)

58

src/Streamly/Streams/Async.hs+2−2

@@ -60,10 +60,10 @@ import Streamly.Internal.Data.Atomics (atomicModifyIORefCAS)

60import Streamly.Streams.SVar (fromSVar)

61import Streamly.Streams.Serial (map)

62import Streamly.Internal.Data.SVar

63−import Streamly.Streams.StreamK

63+import Streamly.Internal.Data.Stream.StreamK

64 (IsStream(..), Stream, mkStream, foldStream, adapt, foldStreamShared,

65 foldStreamSVar)

66−import qualified Streamly.Streams.StreamK as K

66+import qualified Streamly.Internal.Data.Stream.StreamK as K

67

68#include "Instances.hs"

69

src/Streamly/Streams/Combinators.hs+1−1

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

30import Data.Int (Int64)

31

32import Streamly.Internal.Data.SVar

33−import Streamly.Streams.StreamK

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

34import Streamly.Streams.Serial (SerialT)

35

36-------------------------------------------------------------------------------

src/Streamly/Streams/Enumeration.hs+1−1

@@ -63,7 +63,7 @@ import Numeric.Natural

63import Data.Functor.Identity (Identity(..))

64

65import Streamly.Internal.Data.Stream.StreamD (fromStreamD)

66−import Streamly.Streams.StreamK (IsStream(..))

66+import Streamly.Internal.Data.Stream.StreamK (IsStream(..))

67

68import qualified Streamly.Internal.Data.Stream.StreamD as D

69import qualified Streamly.Streams.Serial as Serial

src/Streamly/Streams/Parallel.hs+2−2

@@ -56,12 +56,12 @@ import qualified Data.Set as Set

56

57import Streamly.Streams.SVar (fromSVar, fromStreamVar)

58import Streamly.Streams.Serial (map)

59−import Streamly.Streams.StreamK (IsStream(..), Stream, mkStream, foldStream,

59+import Streamly.Internal.Data.Stream.StreamK (IsStream(..), Stream, mkStream, foldStream,

60 foldStreamShared, adapt)

61

62import Streamly.Internal.Data.SVar hiding (handleChildException)

63

64−import qualified Streamly.Streams.StreamK as K

64+import qualified Streamly.Internal.Data.Stream.StreamK as K

65import qualified Streamly.Internal.Data.Stream.StreamD as D

66

67#include "Instances.hs"

src/Streamly/Streams/Prelude.hs+3−3

@@ -70,13 +70,13 @@ import qualified Prelude

70import Streamly.Internal.Data.Fold.Types (Fold (..))

71

72#ifdef USE_STREAMK_ONLY

73−import qualified Streamly.Streams.StreamK as S

73+import qualified Streamly.Internal.Data.Stream.StreamK as S

74#else

75import qualified Streamly.Internal.Data.Stream.StreamD as S

76#endif

77

78−import Streamly.Streams.StreamK (IsStream(..))

78+import Streamly.Internal.Data.Stream.StreamK (IsStream(..))

79−import qualified Streamly.Streams.StreamK as K

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

80import qualified Streamly.Internal.Data.Stream.StreamD as D

81

82------------------------------------------------------------------------------

src/Streamly/Streams/SVar.hs+1−1

@@ -28,7 +28,7 @@ import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)

28import System.Mem (performMajorGC)

29

30import Streamly.Internal.Data.SVar

31−import Streamly.Streams.StreamK hiding (reverse)

31+import Streamly.Internal.Data.Stream.StreamK hiding (reverse)

32

33-- | Pull a stream from an SVar.

34{-# NOINLINE fromStreamVar #-}

src/Streamly/Streams/Serial.hs+2−2

@@ -67,10 +67,10 @@ import Text.Read (Lexeme(Ident), lexP, parens, prec, readPrec, readListPrec,

67 readListPrecDefault)

68import Prelude hiding (map, mapM)

69

70−import Streamly.Streams.StreamK (IsStream(..), adapt, Stream, mkStream,

70+import Streamly.Internal.Data.Stream.StreamK (IsStream(..), adapt, Stream, mkStream,

71 foldStream)

72import qualified Streamly.Streams.Prelude as P

73−import qualified Streamly.Streams.StreamK as K

73+import qualified Streamly.Internal.Data.Stream.StreamK as K

74import qualified Streamly.Internal.Data.Stream.StreamD as D

75

76#include "Instances.hs"

src/Streamly/Streams/Zip.hs+2−2

@@ -48,13 +48,13 @@ import Text.Read (Lexeme(Ident), lexP, parens, prec, readPrec, readListPrec,

48 readListPrecDefault)

49import Prelude hiding (map, repeat, zipWith)

50

51−import Streamly.Streams.StreamK (IsStream(..), Stream)

51+import Streamly.Internal.Data.Stream.StreamK (IsStream(..), Stream)

52import Streamly.Streams.Serial (map)

53import Streamly.Internal.Data.SVar (MonadAsync)

54import Streamly.Internal.Prelude (zipWith, zipAsyncWith)

55

56import qualified Streamly.Streams.Prelude as P

57−import qualified Streamly.Streams.StreamK as K

57+import qualified Streamly.Internal.Data.Stream.StreamK as K

58

59#include "Instances.hs"

60

streamly.cabal+6−6

@@ -278,8 +278,8 @@ library

278 , Streamly.Memory.Ring

279

280 -- Base streams

281− , Streamly.Streams.StreamK.Type

281+ , Streamly.Internal.Data.Stream.StreamK.Type

282− , Streamly.Streams.StreamK

282+ , Streamly.Internal.Data.Stream.StreamK

283 , Streamly.Streams.StreamDK.Type

284 , Streamly.Streams.StreamDK

285 , Streamly.Internal.Data.Stream.StreamD

@@ -726,8 +726,8 @@ benchmark base

726 , Streamly.Internal.Data.Time.Clock

727 , Streamly.Streams.StreamDK.Type

728 , Streamly.Streams.StreamDK

729− , Streamly.Streams.StreamK.Type

729+ , Streamly.Internal.Data.Stream.StreamK.Type

730− , Streamly.Streams.StreamK

730+ , Streamly.Internal.Data.Stream.StreamK

731 , Streamly.Internal.Data.Stream.StreamD

732 , Streamly.Streams.Prelude

733 , Streamly.FileSystem.IOVec

@@ -779,8 +779,8 @@ executable nano-bench

779 , Streamly.Internal.Data.SVar

780 , Streamly.Internal.Data.Time.Units

781 , Streamly.Internal.Data.Time.Clock

782− , Streamly.Streams.StreamK.Type

782+ , Streamly.Internal.Data.Stream.StreamK.Type

783− , Streamly.Streams.StreamK

783+ , Streamly.Internal.Data.Stream.StreamK

784 , Streamly.FileSystem.IOVec

785 , Streamly.Internal.Data.Stream.StreamD

786 if flag(dev)