bcf8ef4 · streamly · git.iko.soy

git.iko.soy/streamly

rename Memory/Array/Types.hs to Internal

commitbcf8ef41b96ee1bb252d6a217c64fd7c4ef7fe59 authorHarendra Kumar <harendra.kumar@gmail.com> dateTue 24 Sep 2019, 23:35 (7 years ago) parenta754b13

18 files changed+33−33

compare with master

unifiedsplit

src/Streamly/Benchmark/FileIO/Stream.hs+1−1 src/Streamly/Data/String.hs+1−1 src/Streamly/FileSystem/FD.hs+2−2 src/Streamly/FileSystem/File.hs+1−1 src/Streamly/FileSystem/Handle.hs+2−2 src/Streamly/FileSystem/Handle/Internal.hs+2−2 src/Streamly/Internal.hs+1−1 src/Streamly/Memory/Array/Types.hs → src/Streamly/Internal/Memory/Array/Types.hs+7−7 src/Streamly/Internal/Memory/ArrayStream.hs+2−2 src/Streamly/Internal/Prelude.hs+2−2 src/Streamly/Memory/Array.hs+2−2 src/Streamly/Memory/Malloc.hs+1−1 src/Streamly/Memory/Ring.hs+1−1 src/Streamly/Network/Client.hs+1−1 src/Streamly/Network/Socket.hs+2−2 src/Streamly/Pipe.hs+2−2 src/Streamly/Streams/StreamD.hs+2−2 streamly.cabal+1−1

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

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

5858import qualified Streamly.FileSystem.Handle as FH

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

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

6262import qualified Streamly.Prelude as S

6363import qualified Streamly.Data.Fold as FL

6464import qualified Streamly.Data.String as SS

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

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

9595

9696import qualified Streamly.Internal.Prelude as S

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

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

100100import qualified Streamly.Streams.StreamD as D

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

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

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

136136import qualified GHC.IO.FD as FD

137137import qualified GHC.IO.Device as RawIO

138138

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

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

140140import Streamly.Streams.Serial (SerialT)

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

142142

143143#if !defined(mingw32_HOST_OS)

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

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

145145import Streamly.Streams.StreamD (toStreamD)

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

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

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

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

115115

116116import qualified System.IO as SIO

117117

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

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

119119import Streamly.Streams.Serial (SerialT)

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

121121import Streamly.SVar (MonadAsync)

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

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

119119import Prelude hiding (read)

120120

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

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

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

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

124−import Streamly.Memory.Array.Types

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

125125 (defaultChunkSize, shrinkToFit, lpackArraysChunksOf)

126126import Streamly.Data.Fold (Fold)

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

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

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

4040import System.IO (Handle, hPutBuf)

4141import Prelude hiding (read)

4242

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

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

4444import Streamly.Streams.Serial (SerialT)

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

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

4646

4747import qualified Streamly.Memory.Array as A

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

src/Streamly/Internal.hs+1−1

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

2828

2929import Prelude hiding (break, span, splitAt)

3030

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

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

3232import Streamly.Streams.Combinators (inspectMode)

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

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

1010#include "inline.hs"

1111

1212-- |

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

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

1515--

1616-- License : BSD3

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

1818-- Stability : experimental

1919-- Portability : GHC

2020--

21−module Streamly.Memory.Array.Types

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

2222 (

2323 Array (..)

2424

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

660660 step' _ (GroupStart st) = do

661661 when (n <= 0) $

662662 -- 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 "

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

665665 Array start end bound <- liftIO $ newArray n

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

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

10641064 step' gst (SpliceInitial st) = do

10651065 when (n <= 0) $

10661066 -- 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 "

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

10691069 r <- step gst st

10701070 case r of

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

11101110 initial = do

11111111 when (n <= 0) $

11121112 -- 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 "

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

11151115 r1 <- initial1

11161116 return (Tuple' Nothing r1)

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

11691169 step' gst (GatherInitial st) = do

11701170 when (n <= 0) $

11711171 -- 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 "

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

11741174 when (maxIOVLen <= 0) $

11751175 -- 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 "

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

11781178 r <- step (adaptState gst) st

11791179 case r of

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

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

4747import Foreign.Storable (Storable(..))

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

4949

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

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

5151import Streamly.Streams.Serial (SerialT)

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

5353

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

5656import qualified Streamly.Internal.Prelude as S

5757import qualified Streamly.Streams.StreamD as D

5858import qualified Streamly.Streams.Prelude as P

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

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

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

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

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

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

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

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

410410import Streamly.SVar (MonadAsync, defState)

411411import Streamly.Streams.Async (mkAsync')

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

422422

423423import Streamly.Strict

424424

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

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

426426import qualified Streamly.Data.Fold as FL

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

428428import qualified Streamly.Streams.Prelude as P

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

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

143143import Foreign.Storable (Storable(..))

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

145145

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

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

147147import Streamly.Streams.Serial (SerialT)

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

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

150150

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

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

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

153153import qualified Streamly.Streams.Prelude as P

154154import qualified Streamly.Streams.Serial as Serial

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

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

1111#include "inline.hs"

1212

1313-- |

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

14+-- Module : Streamly.Memory.Malloc

1616--

1717-- License : BSD3

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

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

4040import GHC.Ptr (Ptr(..))

4141import Prelude hiding (length, concat)

4242

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

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

4444

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

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

6767

6868import Streamly (MonadAsync)

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

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

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

7373

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

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

8686

8787import qualified Network.Socket as Net

8888

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

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

9090import Streamly.Streams.Serial (SerialT)

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

9292import Streamly.Data.Fold (Fold)

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

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

9797import qualified Streamly.Memory.Array as A

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

100100import qualified Streamly.Prelude as S

101101

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

src/Streamly/Pipe.hs+2−2

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

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

255255import Streamly.Pipe.Types

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

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

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

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

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

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

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

264264

265265-- import Streamly.Strict

266266

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

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

268268-- import qualified Streamly.Prelude as S

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

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

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

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

298298

299299import qualified Control.Monad.Catch as MC

300300

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

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

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

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

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

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

308308import Streamly.Streams.StreamD.Type

309309

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

312312import qualified Streamly.Memory.Ring as RB

313313import qualified Streamly.Streams.StreamK as K

314314

streamly.cabal+1−1

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

259259

260260 -- Memory storage

261261 , Streamly.Memory.Malloc

262− , Streamly.Memory.Array.Types

263262 , Streamly.Memory.Ring

264263

265264 -- Base streams

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

310309

311310 -- Internal modules

312311 , Streamly.Internal

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

313313 , Streamly.Internal.Memory.ArrayStream

314314 , Streamly.Internal.Data.Fold.Types

315315 , Streamly.Internal.Data.Fold