bcf8ef4 · streamly · git.iko.soy

src/Streamly/Benchmark/FileIO/Stream.hs+1−1

compare with master

unifiedsplit

@@ -58,7 +58,7 @@ import Prelude hiding (last, length)

58import qualified Streamly.FileSystem.Handle as FH

59import qualified Streamly.FileSystem.Handle.Internal as FH

60import qualified Streamly.Memory.Array as A

61−import qualified Streamly.Memory.Array.Types as AT

61+import qualified Streamly.Internal.Memory.Array.Types as AT

62import qualified Streamly.Prelude as S

63import qualified Streamly.Data.Fold as FL

64import qualified Streamly.Data.String as SS

src/Streamly/Data/String.hs+1−1

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

95

96import qualified Streamly.Internal.Prelude as S

97import qualified Streamly.Memory.Array as A

98−import qualified Streamly.Memory.Array.Types as A

98+import qualified Streamly.Internal.Memory.Array.Types as A

99import qualified Streamly.Internal.Memory.ArrayStream as AS

100import qualified Streamly.Streams.StreamD as D

101import qualified Streamly.Internal.Data.Unfold as UF

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

@@ -136,12 +136,12 @@ import Prelude hiding (read)

136import qualified GHC.IO.FD as FD

137import qualified GHC.IO.Device as RawIO

138

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

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

140import Streamly.Streams.Serial (SerialT)

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

142

143#if !defined(mingw32_HOST_OS)

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

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

145import Streamly.Streams.StreamD (toStreamD)

146import Streamly.Streams.StreamD.Type (fromStreamD)

147import qualified Streamly.FileSystem.FDIO as RawIO hiding (write)

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

@@ -115,7 +115,7 @@ import Prelude hiding (read)

115

116import qualified System.IO as SIO

117

118−import Streamly.Memory.Array.Types (Array(..), defaultChunkSize)

118+import Streamly.Internal.Memory.Array.Types (Array(..), defaultChunkSize)

119import Streamly.Streams.Serial (SerialT)

120import Streamly.Streams.StreamK.Type (IsStream)

121import Streamly.SVar (MonadAsync)

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

@@ -119,9 +119,9 @@ import System.IO (Handle, hGetBufSome)

119import Prelude hiding (read)

120

121import Streamly.FileSystem.Handle.Internal (writeArray)

122−import Streamly.Memory.Array.Types (Array(..), writeNUnsafe)

122+import Streamly.Internal.Memory.Array.Types (Array(..), writeNUnsafe)

123import Streamly.Streams.StreamK.Type (IsStream, mkStream)

124−import Streamly.Memory.Array.Types

124+import Streamly.Internal.Memory.Array.Types

125 (defaultChunkSize, shrinkToFit, lpackArraysChunksOf)

126import Streamly.Data.Fold (Fold)

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

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

@@ -40,9 +40,9 @@ import Foreign.Storable (Storable(..))

40import System.IO (Handle, hPutBuf)

41import Prelude hiding (read)

42

43−import Streamly.Memory.Array.Types (Array(..))

43+import Streamly.Internal.Memory.Array.Types (Array(..))

44import Streamly.Streams.Serial (SerialT)

45−import Streamly.Memory.Array.Types (defaultChunkSize)

45+import Streamly.Internal.Memory.Array.Types (defaultChunkSize)

46

47import qualified Streamly.Memory.Array as A

48import qualified Streamly.Internal.Memory.ArrayStream as AS

src/Streamly/Internal.hs+1−1

@@ -28,5 +28,5 @@ where

28

29import Prelude hiding (break, span, splitAt)

30

31−import Streamly.Memory.Array.Types (readU)

31+import Streamly.Internal.Memory.Array.Types (readU)

32import Streamly.Streams.Combinators (inspectMode)

src/Streamly/Memory/Array/Types.hs → src/Streamly/Internal/Memory/Array/Types.hsrenamed+7−7

@@ -10,7 +10,7 @@

10#include "inline.hs"

11

12-- |

13−-- Module : Streamly.Memory.Array.Types

13+-- Module : Streamly.Internal.Memory.Array.Types

15--

16-- License : BSD3

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

18-- Stability : experimental

19-- Portability : GHC

20--

21−module Streamly.Memory.Array.Types

21+module Streamly.Internal.Memory.Array.Types

22 (

23 Array (..)

24

@@ -660,7 +660,7 @@ fromStreamDArraysOf n (D.Stream step state) =

660 step' _ (GroupStart st) = do

661 when (n <= 0) $

662 -- XXX we can pass the module string from the higher level API

663− error $ "Streamly.Memory.Array.Types.fromStreamDArraysOf: the size of "

663+ error $ "Streamly.Internal.Memory.Array.Types.fromStreamDArraysOf: the size of "

664 ++ "arrays [" ++ show n ++ "] must be a natural number"

665 Array start end bound <- liftIO $ newArray n

666 return $ D.Skip (GroupBuffer st start end bound)

@@ -1064,7 +1064,7 @@ packArraysChunksOf n (D.Stream step state) =

1064 step' gst (SpliceInitial st) = do

1065 when (n <= 0) $

1066 -- XXX we can pass the module string from the higher level API

1067− error $ "Streamly.Memory.Array.Types.packArraysChunksOf: the size of "

1067+ error $ "Streamly.Internal.Memory.Array.Types.packArraysChunksOf: the size of "

1068 ++ "arrays [" ++ show n ++ "] must be a natural number"

1069 r <- step gst st

1070 case r of

@@ -1110,7 +1110,7 @@ lpackArraysChunksOf n (Fold step1 initial1 extract1) =

1110 initial = do

1111 when (n <= 0) $

1112 -- XXX we can pass the module string from the higher level API

1113− error $ "Streamly.Memory.Array.Types.packArraysChunksOf: the size of "

1113+ error $ "Streamly.Internal.Memory.Array.Types.packArraysChunksOf: the size of "

1114 ++ "arrays [" ++ show n ++ "] must be a natural number"

1115 r1 <- initial1

1116 return (Tuple' Nothing r1)

@@ -1169,11 +1169,11 @@ groupIOVecsOf n maxIOVLen (D.Stream step state) =

1169 step' gst (GatherInitial st) = do

1170 when (n <= 0) $

1171 -- XXX we can pass the module string from the higher level API

1172− error $ "Streamly.Memory.Array.Types.groupIOVecsOf: the size of "

1172+ error $ "Streamly.Internal.Memory.Array.Types.groupIOVecsOf: the size of "

1173 ++ "groups [" ++ show n ++ "] must be a natural number"

1174 when (maxIOVLen <= 0) $

1175 -- XXX we can pass the module string from the higher level API

1176− error $ "Streamly.Memory.Array.Types.groupIOVecsOf: the number of "

1176+ error $ "Streamly.Internal.Memory.Array.Types.groupIOVecsOf: the number of "

1177 ++ "IOVec entries [" ++ show n ++ "] must be a natural number"

1178 r <- step (adaptState gst) st

1179 case r of

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

@@ -47,12 +47,12 @@ import Foreign.Ptr (minusPtr, plusPtr, castPtr)

47import Foreign.Storable (Storable(..))

48import Prelude hiding (length, null, last, map, (!!), read, concat)

49

50−import Streamly.Memory.Array.Types (Array(..), length)

50+import Streamly.Internal.Memory.Array.Types (Array(..), length)

51import Streamly.Streams.Serial (SerialT)

52import Streamly.Streams.StreamK.Type (IsStream)

53

54import qualified Streamly.Internal.Data.Unfold as UF

55−import qualified Streamly.Memory.Array.Types as A

55+import qualified Streamly.Internal.Memory.Array.Types as A

56import qualified Streamly.Internal.Prelude as S

57import qualified Streamly.Streams.StreamD as D

58import qualified Streamly.Streams.Prelude as P

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

@@ -405,7 +405,7 @@ import qualified System.IO as IO

405import Streamly.Enumeration (Enumerable(..), enumerate, enumerateTo)

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

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

408−import Streamly.Memory.Array.Types (Array, writeNUnsafe)

408+import Streamly.Internal.Memory.Array.Types (Array, writeNUnsafe)

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

410import Streamly.SVar (MonadAsync, defState)

411import Streamly.Streams.Async (mkAsync')

@@ -422,7 +422,7 @@ import Streamly.Time.Units

422

423import Streamly.Strict

424

425−import qualified Streamly.Memory.Array.Types as A

425+import qualified Streamly.Internal.Memory.Array.Types as A

426import qualified Streamly.Data.Fold as FL

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

428import qualified Streamly.Streams.Prelude as P

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

@@ -143,12 +143,12 @@ import Foreign.ForeignPtr (withForeignPtr)

143import Foreign.Storable (Storable(..))

144import Prelude hiding (length, null, last, map, (!!), read, concat)

145

146−import Streamly.Memory.Array.Types (Array(..), length)

146+import Streamly.Internal.Memory.Array.Types (Array(..), length)

147import Streamly.Streams.Serial (SerialT)

148import Streamly.Streams.StreamK.Type (IsStream)

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

150

151−import qualified Streamly.Memory.Array.Types as A

151+import qualified Streamly.Internal.Memory.Array.Types as A

152import qualified Streamly.Internal.Memory.ArrayStream as AS

153import qualified Streamly.Streams.Prelude as P

154import qualified Streamly.Streams.Serial as Serial

src/Streamly/Memory/Malloc.hs+1−1

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

11#include "inline.hs"

12

13-- |

14−-- Module : Streamly.Memory.Array.Types

14+-- Module : Streamly.Memory.Malloc

16--

17-- License : BSD3

src/Streamly/Memory/Ring.hs+1−1

@@ -40,7 +40,7 @@ import GHC.ForeignPtr (mallocPlainForeignPtrAlignedBytes)

40import GHC.Ptr (Ptr(..))

41import Prelude hiding (length, concat)

42

43−import qualified Streamly.Memory.Array.Types as A

43+import qualified Streamly.Internal.Memory.Array.Types as A

44

45-- | A ring buffer is a mutable array of fixed size. Initially the array is

46-- empty, with ringStart pointing at the start of allocated memory. We call the

src/Streamly/Network/Client.hs+1−1

@@ -67,7 +67,7 @@ import qualified Network.Socket as Net

67

68import Streamly (MonadAsync)

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

70−import Streamly.Memory.Array.Types (Array(..), defaultChunkSize, writeNUnsafe)

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

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

72import Streamly.Streams.StreamK.Type (IsStream)

73

src/Streamly/Network/Socket.hs+2−2

@@ -86,7 +86,7 @@ import Prelude hiding (read)

86

87import qualified Network.Socket as Net

88

89−import Streamly.Memory.Array.Types (Array(..))

89+import Streamly.Internal.Memory.Array.Types (Array(..))

90import Streamly.Streams.Serial (SerialT)

91import Streamly.Streams.StreamK.Type (IsStream, mkStream)

92import Streamly.Data.Fold (Fold)

@@ -96,7 +96,7 @@ import qualified Streamly.Data.Fold as FL

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

97import qualified Streamly.Memory.Array as A

98import qualified Streamly.Internal.Memory.ArrayStream as AS

99−import qualified Streamly.Memory.Array.Types as A

99+import qualified Streamly.Internal.Memory.Array.Types as A

100import qualified Streamly.Prelude as S

101

102-- | @'withSocket' socket act@ runs the monadic computation @act@ passing the

src/Streamly/Pipe.hs+2−2

@@ -254,7 +254,7 @@ import Prelude

254-- import Streamly.Data.Fold.Types (Fold(..))

255import Streamly.Pipe.Types

256 (Pipe(..), PipeState(..), Step(..), zipWith, tee, map, compose)

257−-- import Streamly.Memory.Array.Types (Array)

257+-- import Streamly.Internal.Memory.Array.Types (Array)

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

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

260-- import Streamly.Streams.StreamK (IsStream())

@@ -264,7 +264,7 @@ import Streamly.Pipe.Types

264

265-- import Streamly.Strict

266

267−-- import qualified Streamly.Memory.Array.Types as A

267+-- import qualified Streamly.Internal.Memory.Array.Types as A

268-- import qualified Streamly.Prelude as S

269-- import qualified Streamly.Streams.StreamD as D

270-- import qualified Streamly.Streams.StreamK as K

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

@@ -298,7 +298,7 @@ import Prelude

298

299import qualified Control.Monad.Catch as MC

300

301−import Streamly.Memory.Array.Types (Array(..))

301+import Streamly.Internal.Memory.Array.Types (Array(..))

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

303import Streamly.Pipe.Types (Pipe(..), PipeState(..))

304import Streamly.SVar (MonadAsync, defState, adaptState)

@@ -308,7 +308,7 @@ import Streamly.Strict (Tuple'(..))

308import Streamly.Streams.StreamD.Type

309

310import qualified Streamly.Pipe.Types as Pipe

311−import qualified Streamly.Memory.Array.Types as A

311+import qualified Streamly.Internal.Memory.Array.Types as A

312import qualified Streamly.Memory.Ring as RB

313import qualified Streamly.Streams.StreamK as K

314

streamly.cabal+1−1

@@ -259,7 +259,6 @@ library

259

260 -- Memory storage

261 , Streamly.Memory.Malloc

262− , Streamly.Memory.Array.Types

263 , Streamly.Memory.Ring

262 , Streamly.Memory.Ring

264

263

265 -- Base streams

264 -- Base streams

@@ -310,6 +309,7 @@ library

310

309

311 -- Internal modules

310 -- Internal modules

312 , Streamly.Internal

311 , Streamly.Internal

312+ , Streamly.Internal.Memory.Array.Types

313 , Streamly.Internal.Memory.ArrayStream

314 , Streamly.Internal.Data.Fold.Types

315 , Streamly.Internal.Data.Fold