3fb676b · streamly · git.iko.soy

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

compare with master

unifiedsplit

@@ -19,7 +19,7 @@ jobs:

19 env:

20 CI_BENCHMARKS_WITH_CUTOFF: >-

21 Data.Array

22− Data.Array.Mut

22+ Data.MutArray

23 Data.Array.Generic

24 Data.Ring.Unboxed

25 Data.Fold

benchmark/Streamly/Benchmark/Data/Fold.hs+1−1

@@ -28,7 +28,7 @@ import System.Random (randomRIO)

28import Streamly.Internal.Data.Stream (Stream)

29import Streamly.Internal.Data.Fold (Fold(..))

30import Streamly.Internal.Data.IsMap.HashMap ()

31−import Streamly.Internal.Data.Array.Mut (MutArray)

31+import Streamly.Internal.Data.MutArray (MutArray)

32

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

34import qualified Streamly.Data.Fold.Prelude as Fold

benchmark/Streamly/Benchmark/Data/Array/Mut.hs → benchmark/Streamly/Benchmark/Data/MutArray.hsrenamed+3−3

@@ -42,10 +42,10 @@ import Prelude

42 , id

43 , undefined

44 )

45−import Streamly.Internal.Data.Array.Mut (MutArray)

45+import Streamly.Internal.Data.MutArray (MutArray)

46

47import qualified Streamly.Internal.Data.Array as Array

48−import qualified Streamly.Internal.Data.Array.Mut as MArray

48+import qualified Streamly.Internal.Data.MutArray as MArray

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

50import qualified Streamly.Internal.Data.Stream as Stream

51

@@ -274,7 +274,7 @@ o_1_space_serial_marray value ~(array, indices) =

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

275

276moduleName :: String

277−moduleName = "Data.Array.Mut"

277+moduleName = "Data.MutArray"

278

279main :: IO ()

280main = do

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

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

43#ifdef INSPECTION

44import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

45

46−import qualified Streamly.Internal.Data.Array.Mut.Type as MA

46+import qualified Streamly.Internal.Data.MutArray.Type as MA

47import qualified Streamly.Internal.Data.Unfold as IUF

48

49import Test.Inspection

benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs+1−1

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

48#ifdef INSPECTION

49import Streamly.Internal.Data.Stream.StreamD.Type (Step(..), FoldMany)

50

51−import qualified Streamly.Internal.Data.Array.Mut.Type as MA

51+import qualified Streamly.Internal.Data.MutArray.Type as MA

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

53import qualified Streamly.Internal.Data.Unfold as IUF

54

benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs+1−1

@@ -42,7 +42,7 @@ import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

42

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

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

45−import qualified Streamly.Internal.Data.Array.Mut.Stream as MAS

45+import qualified Streamly.Internal.Data.Stream.MutChunked as MAS

46import qualified Streamly.Internal.Data.Array.Type as AT

47

48import Test.Inspection

benchmark/streamly-benchmarks.cabal+2−2

@@ -651,10 +651,10 @@ benchmark Data.Array

651 if flag(limit-build-mem)

652 ghc-options: +RTS -M1500M -RTS

653

654−benchmark Data.Array.Mut

654+benchmark Data.MutArray

655 import: bench-options

656 type: exitcode-stdio-1.0

657− main-is: Streamly/Benchmark/Data/Array/Mut.hs

657+ main-is: Streamly/Benchmark/Data/MutArray.hs

658 if flag(limit-build-mem)

659 ghc-options: +RTS -M1500M -RTS

660 if flag(use-streamly-core)

core/src/DocTestDataMutArray.hs+1−1

@@ -6,5 +6,5 @@

6

7For APIs that have not been released yet.

8

9−>>> import Streamly.Internal.Data.Array.Mut as MutArray

9+>>> import Streamly.Internal.Data.MutArray as MutArray

10-}

core/src/DocTestDataMutArrayGeneric.hs+1−1

@@ -6,5 +6,5 @@

6

7For APIs that have not been released yet.

8

9−>>> import Streamly.Internal.Data.Array.Generic.Mut.Type as MutArray

9+>>> import Streamly.Internal.Data.MutArray.Generic as MutArray

10-}

core/src/Streamly/Data/MutArray.hs+2−2

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

12-- contents of a mutable array can be modified in-place. For general

13-- documentation, please refer to the original module.

14--

15−-- Please refer to "Streamly.Internal.Data.Array.Mut" for functions that have

15+-- Please refer to "Streamly.Internal.Data.MutArray" for functions that have

16-- not yet been released.

17--

18-- For mutable arrays that work on boxed types, not requiring the 'Unbox'

@@ -92,7 +92,7 @@ module Streamly.Data.MutArray

92where

93

94import Prelude hiding (length, read)

95−import Streamly.Internal.Data.Array.Mut

95+import Streamly.Internal.Data.MutArray

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

97import Control.Monad.IO.Class (MonadIO)

98

core/src/Streamly/Data/MutArray/Generic.hs+1−1

@@ -59,7 +59,7 @@ module Streamly.Data.MutArray.Generic

59 )

60where

61

62−import Streamly.Internal.Data.Array.Generic.Mut.Type

62+import Streamly.Internal.Data.MutArray.Generic

63import Prelude hiding (read, length)

64

65#include "DocTestDataMutArrayGeneric.hs"

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

@@ -117,7 +117,7 @@ import Foreign.Storable (Storable)

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

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

119

120−import Streamly.Internal.Data.Array.Mut.Type (ArrayUnsafe(..))

120+import Streamly.Internal.Data.MutArray.Type (ArrayUnsafe(..))

121import Streamly.Internal.Data.Array.Type

122 (Array(..), length, asPtrUnsafe)

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

@@ -127,8 +127,8 @@ import Streamly.Internal.Data.Tuple.Strict (Tuple3Fused'(..))

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

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

129

130−import qualified Streamly.Internal.Data.Array.Mut.Type as MA

130+import qualified Streamly.Internal.Data.MutArray.Type as MA

131−import qualified Streamly.Internal.Data.Array.Mut as MA

131+import qualified Streamly.Internal.Data.MutArray as MA

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

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

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

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

@@ -61,7 +61,7 @@ import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

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

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

63

64−import qualified Streamly.Internal.Data.Array.Generic.Mut.Type as MArray

64+import qualified Streamly.Internal.Data.MutArray.Generic as MArray

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

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

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

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

@@ -8,7 +8,7 @@

8-- Stability : experimental

9-- Portability : GHC

10--

11−-- See notes in "Streamly.Internal.Data.Array.Mut.Type"

11+-- See notes in "Streamly.Internal.Data.MutArray.Type"

12--

13module Streamly.Internal.Data.Array.Type

14 (

@@ -100,7 +100,7 @@ import GHC.Exts (IsList, IsString(..), Addr#)

100

101import GHC.IO (unsafePerformIO)

102import GHC.Ptr (Ptr(..))

103−import Streamly.Internal.Data.Array.Mut.Type (MutArray(..), MutableByteArray)

103+import Streamly.Internal.Data.MutArray.Type (MutArray(..), MutableByteArray)

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

105import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

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

@@ -110,7 +110,7 @@ import Text.Read (readPrec)

110import Prelude hiding (Foldable(..), read, unlines, splitAt)

111

112import qualified GHC.Exts as Exts

113−import qualified Streamly.Internal.Data.Array.Mut.Type as MA

113+import qualified Streamly.Internal.Data.MutArray.Type as MA

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

115import qualified Streamly.Internal.Data.Stream.StreamD.Generate as D

116import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

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

@@ -323,7 +323,7 @@ import Data.Int (Int64)

323import Data.Proxy (Proxy(..))

324import Data.Word (Word32)

325import Foreign.Storable (Storable, peek)

326−import Streamly.Internal.Data.Array.Mut.Type (MutArray(..))

326+import Streamly.Internal.Data.MutArray.Type (MutArray(..))

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

328import Streamly.Internal.Data.Pipe.Type (Pipe (..), PipeState(..))

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

@@ -332,7 +332,7 @@ import Streamly.Internal.Data.Tuple.Strict (Tuple'(..), Tuple3'(..))

332import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

333

334import qualified Prelude

335−import qualified Streamly.Internal.Data.Array.Mut.Type as MA

335+import qualified Streamly.Internal.Data.MutArray.Type as MA

336import qualified Streamly.Internal.Data.Array.Type as Array

337import qualified Streamly.Internal.Data.Fold.Window as FoldW

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

core/src/Streamly/Internal/Data/Fold/Chunked.hs+1−1

@@ -65,7 +65,7 @@ import Data.Bifunctor (first)

65import Data.Proxy (Proxy(..))

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

67import GHC.Types (SPEC(..))

68−import Streamly.Internal.Data.Array.Mut.Type (touch)

68+import Streamly.Internal.Data.MutArray.Type (touch)

69import Streamly.Internal.Data.Array.Type (Array(..))

70import Streamly.Internal.Data.Parser (Initial(..), Step(..))

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

core/src/Streamly/Internal/Data/Array/Mut.hs → core/src/Streamly/Internal/Data/MutArray.hsrenamed+4−4

@@ -1,14 +1,14 @@

1-- |

2−-- Module : Streamly.Internal.Data.Array.Mut

2+-- Module : Streamly.Internal.Data.MutArray

4-- License : BSD-3-Clause

5-- Maintainer : streamly@composewell.com

6-- Stability : experimental

7-- Portability : GHC

8--

9−module Streamly.Internal.Data.Array.Mut

9+module Streamly.Internal.Data.MutArray

10 (

11− module Streamly.Internal.Data.Array.Mut.Type

11+ module Streamly.Internal.Data.MutArray.Type

12 , splitOn

13 , genSlicesFromLen

14 , getSlicesFromLen

@@ -27,7 +27,7 @@ import qualified Streamly.Internal.Data.Stream as D

27import qualified Streamly.Internal.Data.Unfold as Unfold

28

29import Prelude hiding (foldr, length, read, splitAt)

30−import Streamly.Internal.Data.Array.Mut.Type

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

31

32-- | Split the array into a stream of slices using a predicate. The element

33-- matching the predicate is dropped.

core/src/Streamly/Internal/Data/Array/Generic/Mut/Type.hs → core/src/Streamly/Internal/Data/MutArray/Generic.hsrenamed+3−3

@@ -1,14 +1,14 @@

1{-# LANGUAGE CPP #-}

2{-# LANGUAGE UnboxedTuples #-}

3-- |

4−-- Module : Streamly.Internal.Data.Array.Generic.Mut.Type

4+-- Module : Streamly.Internal.Data.MutArray.Generic

6-- License : BSD3-3-Clause

7-- Maintainer : streamly@composewell.com

8-- Stability : experimental

9-- Portability : GHC

10--

11−module Streamly.Internal.Data.Array.Generic.Mut.Type

11+module Streamly.Internal.Data.MutArray.Generic

12(

13 -- * Type

14 -- $arrayNotes

@@ -229,7 +229,7 @@ bottomElement =

229

230 where

231

232− funcName = "Streamly.Internal.Data.Array.Generic.Mut.Type.bottomElement:"

232+ funcName = "Streamly.Internal.Data.MutArray.Generic.bottomElement:"

233

234-- XXX Would be nice if GHC can provide something like newUninitializedArray# so

235-- that we do not have to write undefined or error in the whole array.

core/src/Streamly/Internal/Data/Array/Mut/Type.hs → core/src/Streamly/Internal/Data/MutArray/Type.hsrenamed+2−2

@@ -1,7 +1,7 @@

1{-# LANGUAGE CPP #-}

2{-# LANGUAGE UnboxedTuples #-}

3-- |

4−-- Module : Streamly.Internal.Data.Array.Mut.Type

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

6-- License : BSD3-3-Clause

7-- Maintainer : streamly@composewell.com

@@ -26,7 +26,7 @@

26-- strive to keep the API consistent for both. Ideally, you should be able to

27-- replace one with another with little changes to the code.

28

29−module Streamly.Internal.Data.Array.Mut.Type

29+module Streamly.Internal.Data.MutArray.Type

30 (

31 -- * Type

32 -- $arrayNotes

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

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

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

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

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

32−import Streamly.Internal.Data.Array.Generic.Mut.Type

32+import Streamly.Internal.Data.MutArray.Generic

33 ( MutArray(..)

34 , new

35 , uninit

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

@@ -82,14 +82,14 @@ import Foreign.Ptr (plusPtr, minusPtr, castPtr)

82import Streamly.Internal.Data.Unbox as Unboxed (Unbox(peekByteIndex))

83import GHC.ForeignPtr (mallocPlainForeignPtrAlignedBytes)

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

85−import Streamly.Internal.Data.Array.Mut.Type (MutArray)

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

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

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

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

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

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

91

92−import qualified Streamly.Internal.Data.Array.Mut.Type as MA

92+import qualified Streamly.Internal.Data.MutArray.Type as MA

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

94

95import Prelude hiding (length, concat, read)

core/src/Streamly/Internal/Data/Stream/Chunked.hs+3−3

@@ -88,8 +88,8 @@ import qualified Streamly.Data.Fold as FL

88import qualified Streamly.Internal.Data.Array as A

89import qualified Streamly.Internal.Data.Array as Array

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

91−import qualified Streamly.Internal.Data.Array.Mut.Type as MA

91+import qualified Streamly.Internal.Data.MutArray.Type as MA

92−import qualified Streamly.Internal.Data.Array.Mut.Stream as AS

92+import qualified Streamly.Internal.Data.Stream.MutChunked as AS

93import qualified Streamly.Internal.Data.Fold.Type as FL (Fold(..), Step(..))

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

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

@@ -206,7 +206,7 @@ unlines sep (D.Stream step state) = D.Stream step' (OuterLoop state)

206-------------------------------------------------------------------------------

207

208-- XXX These would not be needed once we implement compactLEFold, see

209−-- module Streamly.Internal.Data.Array.Mut.Stream

209+-- module Streamly.Internal.Data.Stream.MutChunked

210--

211-- XXX Note that this thaws immutable arrays for appending, that may be

212-- problematic if multiple users do the same thing, however, immutable arrays

core/src/Streamly/Internal/Data/Array/Mut/Stream.hs → core/src/Streamly/Internal/Data/Stream/MutChunked.hsrenamed+8−8

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

1-- |

2−-- Module : Streamly.Internal.Data.Array.Mut.Stream

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

4-- License : BSD3-3-Clause

5-- Maintainer : streamly@composewell.com

@@ -8,7 +8,7 @@

8--

9-- Combinators to efficiently manipulate streams of mutable arrays.

10--

11−module Streamly.Internal.Data.Array.Mut.Stream

11+module Streamly.Internal.Data.Stream.MutChunked

12 (

13 -- * Generation

14 chunksOf

@@ -32,13 +32,13 @@ import Control.Monad (when)

32import Data.Bifunctor (first)

33import Data.Proxy (Proxy(..))

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

35−import Streamly.Internal.Data.Array.Mut.Type (MutArray(..))

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

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

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

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

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

40

41−import qualified Streamly.Internal.Data.Array.Mut.Type as MArray

41+import qualified Streamly.Internal.Data.MutArray.Type as MArray

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

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

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

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

92 step' gst (SpliceInitial st) = do

93 when (n <= 0) $

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

95− error $ "Streamly.Internal.Data.Array.Mut.Type.packArraysChunksOf: the size of "

95+ error $ "Streamly.Internal.Data.MutArray.Type.packArraysChunksOf: the size of "

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

97 r <- step gst st

98 case r of

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

139 initial = do

140 when (n <= 0) $

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

142− error $ "Streamly.Internal.Data.Array.Mut.Type.packArraysChunksOf: the size of "

142+ error $ "Streamly.Internal.Data.MutArray.Type.packArraysChunksOf: the size of "

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

144

145 r <- initial1

@@ -243,7 +243,7 @@ compactLEParserD n = ParserD.Parser step initial extract

243 extract (Just buf) = return $ ParserD.Done 0 buf

244

245 functionPath =

246− "Streamly.Internal.Data.Array.Mut.Stream.compactLEParserD"

246+ "Streamly.Internal.Data.Stream.MutChunked.compactLEParserD"

247

248-- | Coalesce adjacent arrays in incoming stream to form bigger arrays of a

249-- minimum specified size. Note that if all the arrays in the stream together

@@ -292,7 +292,7 @@ compactGEFold n = Fold step initial extract

292 extract (Just buf) = return buf

293

294 functionPath =

295− "Streamly.Internal.Data.Array.Mut.Stream.compactGEFold"

295+ "Streamly.Internal.Data.Stream.MutChunked.compactGEFold"

296

297-- | Coalesce adjacent arrays in incoming stream to form bigger arrays of a

298-- maximum specified size in bytes.

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

@@ -38,7 +38,7 @@ import qualified Data.Map.Strict as Map

38import qualified Data.Set as Set

39import qualified Streamly.Data.Fold as Fold

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

41−import qualified Streamly.Internal.Data.Array.Mut.Type as MA

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

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

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

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

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

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

133import qualified Streamly.Data.Array as A

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

135import qualified Streamly.Internal.Data.Stream.Chunked as AS

136−import qualified Streamly.Internal.Data.Array.Mut.Type as MArray

136+import qualified Streamly.Internal.Data.MutArray.Type as MArray

137import qualified Streamly.Internal.Data.Refold.Type as Refold

138import qualified Streamly.Internal.Data.Fold.Type as FL(refoldMany)

139import qualified Streamly.Internal.Data.Stream as S

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

@@ -102,7 +102,7 @@ import GHC.IO.Encoding.Failure (isSurrogate)

102import GHC.Ptr (Ptr (..), plusPtr)

103import System.IO.Unsafe (unsafePerformIO)

104import Streamly.Internal.Data.Array.Type (Array(..))

105−import Streamly.Internal.Data.Array.Mut.Type (MutableByteArray)

105+import Streamly.Internal.Data.MutArray.Type (MutableByteArray)

106import Streamly.Internal.Data.Fold (Fold)

107import Streamly.Internal.Data.Stream (Stream)

108import Streamly.Internal.Data.Stream (Step (..))

core/streamly-core.cabal+4−4

@@ -307,10 +307,10 @@ library

307 -- Unboxed IORef

308 , Streamly.Internal.Data.IORef.Unboxed

309 -- May depend on streamly-core-stream

310− , Streamly.Internal.Data.Array.Mut.Type

310+ , Streamly.Internal.Data.MutArray.Type

311− , Streamly.Internal.Data.Array.Mut

311+ , Streamly.Internal.Data.MutArray

312 , Streamly.Internal.Data.Array.Type

313− , Streamly.Internal.Data.Array.Generic.Mut.Type

313+ , Streamly.Internal.Data.MutArray.Generic

314

315 -- streamly-core-streams

316 , Streamly.Internal.Data.StreamK

@@ -352,7 +352,7 @@ library

352 -- streamly-core-data-arrays

353 , Streamly.Internal.Data.Array.Generic

354 , Streamly.Internal.Data.Array

355− , Streamly.Internal.Data.Array.Mut.Stream

355+ , Streamly.Internal.Data.Stream.MutChunked

356

357 -- streamly-serde

358 , Streamly.Internal.Serialize.FromBytes

docs/Developer/module-organization.md+1−1

@@ -225,7 +225,7 @@ Unboxed arrays, based on `Prim` type class:

225

226Mutable arrays are a generalization of immutable arrays:

227

228−* `Streamly.Data.Array.Mut`

228+* `Streamly.Data.MutArray`

229* `Streamly.Data.Array.Storable.Mut`

230* `Streamly.Data.Array.Storable.Pinned.Mut`

231* ...

hie.yaml+4−4

@@ -20,8 +20,8 @@ cradle:

20 component: "bench:Data.Array"

21 - path: "./benchmark/Streamly/Benchmark/Data/Array/Generic.hs"

22 component: "bench:Data.Array.Generic"

23− - path: "./benchmark/Streamly/Benchmark/Data/Array/Mut.hs"

23+ - path: "./benchmark/Streamly/Benchmark/Data/MutArray.hs"

24− component: "bench:Data.Array.Mut"

24+ component: "bench:Data.MutArray"

25 - path: "./benchmark/Streamly/Benchmark/Data/Array/Stream.hs"

26 component: "bench:Data.Array.Stream"

27 - path: "./benchmark/Streamly/Benchmark/Data/Fold.hs"

@@ -98,8 +98,8 @@ cradle:

98 component: "test:Data.Stream"

99 - path: "./test/Streamly/Test/Data/Array/Generic.hs"

100 component: "test:Data.Array.Generic"

101− - path: "./test/Streamly/Test/Data/Array/Mut.hs"

101+ - path: "./test/Streamly/Test/Data/MutArray.hs"

102− component: "test:Data.Array.Mut"

102+ component: "test:Data.MutArray"

103 - path: "./test/Streamly/Test/Data/Array/Stream.hs"

104 component: "test:Data.Array.Stream"

105 - path: "./test/Streamly/Test/Data/Fold.hs"

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

@@ -145,8 +145,8 @@ import qualified Streamly.Internal.System.IOVec.Type as RawIO

145

146import qualified Streamly.Data.Array as A

147import qualified Streamly.Data.Fold as FL

148−import qualified Streamly.Internal.Data.Array.Mut as MArray

148+import qualified Streamly.Internal.Data.MutArray as MArray

149− (MutArray(..), pinnedNewBytes, asPtrUnsafe)

149+ (MutArray(..), asPtrUnsafe)

150import qualified Streamly.Internal.Data.Stream.Chunked as AS

151import qualified Streamly.Internal.Data.Stream as S

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

src/Streamly/Internal/Network/Socket.hs+3−5

@@ -97,11 +97,9 @@ import Streamly.Internal.System.IO (defaultChunkSize)

97import qualified Streamly.Data.Array as A (reader, length)

98import qualified Streamly.Data.Fold as FL

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

100− ( unsafeFreeze, asPtrUnsafe, byteLength, pinnedWriteNUnsafe, pinnedChunksOf

100+ (unsafeFreeze, asPtrUnsafe, byteLength, pinnedChunksOf, pinnedWriteN, pinnedWriteNUnsafe)

101− , pinnedWriteN

102− )

103−import qualified Streamly.Internal.Data.Array.Mut as MArray

101+import qualified Streamly.Internal.Data.MutArray as MArray

104− (MutArray(..), pinnedNewBytes, asPtrUnsafe)

102+ (MutArray(..), asPtrUnsafe, pinnedNewBytes)

105import qualified Streamly.Internal.Data.Stream as S

103import qualified Streamly.Internal.Data.Stream as S

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

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

107 (Stream(..), Step(..))

105 (Stream(..), Step(..))

src/Streamly/Internal/System/IOVec.hs+5−5

@@ -30,12 +30,12 @@ where

30import Control.Monad (when)

31import Control.Monad.IO.Class (MonadIO(..))

32import Foreign.Ptr (castPtr)

33−import Streamly.Internal.Data.Array.Mut.Type (length)

33+import Streamly.Internal.Data.MutArray.Type (length)

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

35−import Streamly.Internal.Data.Array.Mut.Type (Array(..))

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

36

37import qualified Streamly.Internal.Data.Array.Type as Array

38−import qualified Streamly.Internal.Data.Array.Mut.Type as MArray

38+import qualified Streamly.Internal.Data.MutArray.Type as MArray

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

40-}

41#endif

@@ -69,11 +69,11 @@ groupIOVecsOfMut n maxIOVLen (D.Stream step state) =

69 step' gst (GatherInitial st) = do

70 when (n <= 0) $

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

72− error $ "Streamly.Internal.Data.Array.Mut.Type.groupIOVecsOf: the size of "

72+ error $ "Streamly.Internal.Data.MutArray.Type.groupIOVecsOf: the size of "

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

74 when (maxIOVLen <= 0) $

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

76− error $ "Streamly.Internal.Data.Array.Mut.Type.groupIOVecsOf: the number of "

76+ error $ "Streamly.Internal.Data.MutArray.Type.groupIOVecsOf: the number of "

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

78 r <- step (adaptState gst) st

79 case r of

streamly.cabal+2−2

@@ -69,7 +69,7 @@ extra-source-files:

69 benchmark/Streamly/Benchmark/Data/Array/SmallArray.hs

70 benchmark/Streamly/Benchmark/Data/Array.hs

71 benchmark/Streamly/Benchmark/Data/Ring/Unboxed.hs

72− benchmark/Streamly/Benchmark/Data/Array/Mut.hs

72+ benchmark/Streamly/Benchmark/Data/MutArray.hs

73 benchmark/Streamly/Benchmark/Data/Array/Stream.hs

74 benchmark/Streamly/Benchmark/Data/Fold/Window.hs

75 benchmark/Streamly/Benchmark/Data/Stream/*.hs

@@ -104,7 +104,7 @@ extra-source-files:

104 test/Streamly/Test/Data/Array/Common.hs

105 test/Streamly/Test/Data/Array/Generic.hs

106 test/Streamly/Test/Data/Array.hs

107− test/Streamly/Test/Data/Array/Mut.hs

107+ test/Streamly/Test/Data/MutArray.hs

108 test/Streamly/Test/Data/Ring/Unboxed.hs

109 test/Streamly/Test/Data/Array/Stream.hs

110 test/Streamly/Test/Data/Parser/ParserD.hs

targets/Targets.hs+1−1

@@ -166,7 +166,7 @@ targets =

166 , "pinned_array_cmp"

167 ]

168 )

169− , ("Data.Array.Mut",

169+ , ("Data.MutArray",

170 [ "array_grp"

171 , "array_cmp"

172 ]

test/Streamly/Test/Data/Array.hs+2−2

@@ -15,12 +15,12 @@ import Data.Word(Word8)

15import Foreign.Storable (peek)

16import GHC.Ptr (plusPtr)

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

18−import Streamly.Internal.Data.Array.Mut.Type (MutArray)

18+import Streamly.Internal.Data.MutArray.Type (MutArray)

19import Test.QuickCheck (chooseInt, listOf)

20

21import qualified Streamly.Internal.Data.Array as A

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

23−import qualified Streamly.Internal.Data.Array.Mut.Type as MA

23+import qualified Streamly.Internal.Data.MutArray.Type as MA

24

25#include "Streamly/Test/Data/Array/CommonImports.hs"

26

test/Streamly/Test/Data/Fold.hs+1−1

@@ -23,7 +23,7 @@ import Test.QuickCheck.Monadic (monadicIO, assert, run)

23

24import qualified Data.Map

25import qualified Prelude

26−import qualified Streamly.Internal.Data.Array.Mut as MArray

26+import qualified Streamly.Internal.Data.MutArray as MArray

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

28import qualified Streamly.Internal.Data.Fold.Container as Fold

29import qualified Streamly.Internal.Data.Stream as Stream

test/Streamly/Test/Data/Array/Mut.hs → test/Streamly/Test/Data/MutArray.hsrenamed+3−3

@@ -1,4 +1,4 @@

1−module Streamly.Test.Data.Array.Mut (main) where

1+module Streamly.Test.Data.MutArray (main) where

2

3import Test.QuickCheck (listOf)

4

@@ -23,7 +23,7 @@ import Test.QuickCheck.Monadic (monadicIO, assert)

23import GHC.RTS.Flags (IoSubSystem(..))

24#endif

25

26−import qualified Streamly.Internal.Data.Array.Mut as MArray

26+import qualified Streamly.Internal.Data.MutArray as MArray

27import qualified Streamly.Internal.Data.Stream as Stream

28import qualified Test.Hspec as Hspec

29

@@ -31,7 +31,7 @@ maxTestCount :: Int

31maxTestCount = 100

32

33moduleName :: String

34−moduleName = "Data.Array.Mut"

34+moduleName = "Data.MutArray"

35

36testAppend :: Property

37testAppend =

test/streamly-tests.cabal+3−3

@@ -248,11 +248,11 @@ test-suite Data.Stream

248 main-is: Streamly/Test/Data/Stream.hs

249 ghc-options: -main-is Streamly.Test.Data.Stream.main

250

251−test-suite Data.Array.Mut

251+test-suite Data.MutArray

252 import: test-options

253 type: exitcode-stdio-1.0

254− main-is: Streamly/Test/Data/Array/Mut.hs

254+ main-is: Streamly/Test/Data/MutArray.hs

255− ghc-options: -main-is Streamly.Test.Data.Array.Mut.main

255+ ghc-options: -main-is Streamly.Test.Data.MutArray.main

256

257test-suite Data.Ring.Unboxed

258 import: test-options