git.iko.soy/streamly
on master help sign in
Correct Internal Array module names (#2478)
commit3fb676b98b68498e8a8c0684fd9aafc1bf36c27d authorRanjeet Ranjan <ranjeetr@composewell.com> dateSat 29 Jul 2023, 00:00 (3 years ago) parentb085507
38 files changed+82−84
compare with master
unifiedsplit
.github/workflows/regression-check.yml+1−1 benchmark/Streamly/Benchmark/Data/Fold.hs+1−1 benchmark/Streamly/Benchmark/Data/Array/Mut.hs → benchmark/Streamly/Benchmark/Data/MutArray.hs+3−3 benchmark/Streamly/Benchmark/Data/Stream/Split.hs+1−1 benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs+1−1 benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs+1−1 benchmark/streamly-benchmarks.cabal+2−2 core/src/DocTestDataMutArray.hs+1−1 core/src/DocTestDataMutArrayGeneric.hs+1−1 core/src/Streamly/Data/MutArray.hs+2−2 core/src/Streamly/Data/MutArray/Generic.hs+1−1 core/src/Streamly/Internal/Data/Array.hs+3−3 core/src/Streamly/Internal/Data/Array/Generic.hs+1−1 core/src/Streamly/Internal/Data/Array/Type.hs+3−3 core/src/Streamly/Internal/Data/Fold.hs+2−2 core/src/Streamly/Internal/Data/Fold/Chunked.hs+1−1 core/src/Streamly/Internal/Data/Array/Mut.hs → core/src/Streamly/Internal/Data/MutArray.hs+4−4 core/src/Streamly/Internal/Data/Array/Generic/Mut/Type.hs → core/src/Streamly/Internal/Data/MutArray/Generic.hs+3−3 core/src/Streamly/Internal/Data/Array/Mut/Type.hs → core/src/Streamly/Internal/Data/MutArray/Type.hs+2−2 core/src/Streamly/Internal/Data/Ring.hs+1−1 core/src/Streamly/Internal/Data/Ring/Unboxed.hs+2−2 core/src/Streamly/Internal/Data/Stream/Chunked.hs+3−3 core/src/Streamly/Internal/Data/Array/Mut/Stream.hs → core/src/Streamly/Internal/Data/Stream/MutChunked.hs+8−8 core/src/Streamly/Internal/Data/Stream/StreamD/Container.hs+1−1 core/src/Streamly/Internal/FileSystem/Handle.hs+1−1 core/src/Streamly/Internal/Unicode/Stream.hs+1−1 core/streamly-core.cabal+4−4 docs/Developer/module-organization.md+1−1 hie.yaml+4−4 src/Streamly/Internal/FileSystem/FD.hs+2−2 src/Streamly/Internal/Network/Socket.hs+3−5 src/Streamly/Internal/System/IOVec.hs+5−5 streamly.cabal+2−2 targets/Targets.hs+1−1 test/Streamly/Test/Data/Array.hs+2−2 test/Streamly/Test/Data/Fold.hs+1−1 test/Streamly/Test/Data/Array/Mut.hs → test/Streamly/Test/Data/MutArray.hs+3−3 test/streamly-tests.cabal+3−3
.github/workflows/regression-check.yml+1−1
@@ -19,7 +19,7 @@ jobs:
1919 env:
2020 CI_BENCHMARKS_WITH_CUTOFF: >-
2121 Data.Array
22− Data.Array.Mut
22+ Data.MutArray
2323 Data.Array.Generic
2424 Data.Ring.Unboxed
2525 Data.Fold
benchmark/Streamly/Benchmark/Data/Fold.hs+1−1
@@ -28,7 +28,7 @@ import System.Random (randomRIO)
2828import Streamly.Internal.Data.Stream (Stream)
2929import Streamly.Internal.Data.Fold (Fold(..))
3030import Streamly.Internal.Data.IsMap.HashMap ()
31−import Streamly.Internal.Data.Array.Mut (MutArray)
31+import Streamly.Internal.Data.MutArray (MutArray)
3232
3333import qualified Streamly.Internal.Data.Fold as FL
3434import 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
4242 , id
4343 , undefined
4444 )
45−import Streamly.Internal.Data.Array.Mut (MutArray)
45+import Streamly.Internal.Data.MutArray (MutArray)
4646
4747import 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
4949import qualified Streamly.Internal.Data.Fold as Fold
5050import qualified Streamly.Internal.Data.Stream as Stream
5151
@@ -274,7 +274,7 @@ o_1_space_serial_marray value ~(array, indices) =
274274-------------------------------------------------------------------------------
275275
276276moduleName :: String
277−moduleName = "Data.Array.Mut"
277+moduleName = "Data.MutArray"
278278
279279main :: IO ()
280280main = do
benchmark/Streamly/Benchmark/Data/Stream/Split.hs+1−1
@@ -43,7 +43,7 @@ import Streamly.Benchmark.Common.Handle
4343#ifdef INSPECTION
4444import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))
4545
46−import qualified Streamly.Internal.Data.Array.Mut.Type as MA
46+import qualified Streamly.Internal.Data.MutArray.Type as MA
4747import qualified Streamly.Internal.Data.Unfold as IUF
4848
4949import Test.Inspection
benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs+1−1
@@ -48,7 +48,7 @@ import Streamly.Benchmark.Common.Handle
4848#ifdef INSPECTION
4949import Streamly.Internal.Data.Stream.StreamD.Type (Step(..), FoldMany)
5050
51−import qualified Streamly.Internal.Data.Array.Mut.Type as MA
51+import qualified Streamly.Internal.Data.MutArray.Type as MA
5252import qualified Streamly.Internal.Data.Stream as D
5353import qualified Streamly.Internal.Data.Unfold as IUF
5454
benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs+1−1
@@ -42,7 +42,7 @@ import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))
4242
4343import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
4444import 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
4646import qualified Streamly.Internal.Data.Array.Type as AT
4747
4848import Test.Inspection
benchmark/streamly-benchmarks.cabal+2−2
@@ -651,10 +651,10 @@ benchmark Data.Array
651651 if flag(limit-build-mem)
652652 ghc-options: +RTS -M1500M -RTS
653653
654−benchmark Data.Array.Mut
654+benchmark Data.MutArray
655655 import: bench-options
656656 type: exitcode-stdio-1.0
657− main-is: Streamly/Benchmark/Data/Array/Mut.hs
657+ main-is: Streamly/Benchmark/Data/MutArray.hs
658658 if flag(limit-build-mem)
659659 ghc-options: +RTS -M1500M -RTS
660660 if flag(use-streamly-core)
core/src/DocTestDataMutArray.hs+1−1
@@ -6,5 +6,5 @@
66
77For APIs that have not been released yet.
88
9−>>> import Streamly.Internal.Data.Array.Mut as MutArray
9+>>> import Streamly.Internal.Data.MutArray as MutArray
1010-}
core/src/DocTestDataMutArrayGeneric.hs+1−1
@@ -6,5 +6,5 @@
66
77For APIs that have not been released yet.
88
9−>>> import Streamly.Internal.Data.Array.Generic.Mut.Type as MutArray
9+>>> import Streamly.Internal.Data.MutArray.Generic as MutArray
1010-}
core/src/Streamly/Data/MutArray.hs+2−2
@@ -12,7 +12,7 @@
1212-- contents of a mutable array can be modified in-place. For general
1313-- documentation, please refer to the original module.
1414--
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
1616-- not yet been released.
1717--
1818-- For mutable arrays that work on boxed types, not requiring the 'Unbox'
@@ -92,7 +92,7 @@ module Streamly.Data.MutArray
9292where
9393
9494import Prelude hiding (length, read)
95−import Streamly.Internal.Data.Array.Mut
95+import Streamly.Internal.Data.MutArray
9696import Streamly.Internal.Data.Unbox (Unbox (..))
9797import Control.Monad.IO.Class (MonadIO)
9898
core/src/Streamly/Data/MutArray/Generic.hs+1−1
@@ -59,7 +59,7 @@ module Streamly.Data.MutArray.Generic
5959 )
6060where
6161
62−import Streamly.Internal.Data.Array.Generic.Mut.Type
62+import Streamly.Internal.Data.MutArray.Generic
6363import Prelude hiding (read, length)
6464
6565#include "DocTestDataMutArrayGeneric.hs"
core/src/Streamly/Internal/Data/Array.hs+3−3
@@ -117,7 +117,7 @@ import Foreign.Storable (Storable)
117117import Streamly.Internal.Data.Unbox (Unbox(..))
118118import Prelude hiding (length, null, last, map, (!!), read, concat)
119119
120−import Streamly.Internal.Data.Array.Mut.Type (ArrayUnsafe(..))
120+import Streamly.Internal.Data.MutArray.Type (ArrayUnsafe(..))
121121import Streamly.Internal.Data.Array.Type
122122 (Array(..), length, asPtrUnsafe)
123123import Streamly.Internal.Data.Fold.Type (Fold(..))
@@ -127,8 +127,8 @@ import Streamly.Internal.Data.Tuple.Strict (Tuple3Fused'(..))
127127import Streamly.Internal.Data.Unfold.Type (Unfold(..))
128128import Streamly.Internal.System.IO (unsafeInlineIO)
129129
130−import qualified Streamly.Internal.Data.Array.Mut.Type as MA
131−import qualified Streamly.Internal.Data.Array.Mut as MA
130+import qualified Streamly.Internal.Data.MutArray.Type as MA
131+import qualified Streamly.Internal.Data.MutArray as MA
132132import qualified Streamly.Internal.Data.Array.Type as A
133133import qualified Streamly.Internal.Data.Fold as FL
134134import 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)
6161import Streamly.Internal.Data.Unfold.Type (Unfold(..))
6262import Streamly.Internal.System.IO (unsafeInlineIO)
6363
64−import qualified Streamly.Internal.Data.Array.Generic.Mut.Type as MArray
64+import qualified Streamly.Internal.Data.MutArray.Generic as MArray
6565import qualified Streamly.Internal.Data.Fold.Type as FL
6666import qualified Streamly.Internal.Data.Producer.Type as Producer
6767import qualified Streamly.Internal.Data.Producer as Producer
core/src/Streamly/Internal/Data/Array/Type.hs+3−3
@@ -8,7 +8,7 @@
88-- Stability : experimental
99-- Portability : GHC
1010--
11−-- See notes in "Streamly.Internal.Data.Array.Mut.Type"
11+-- See notes in "Streamly.Internal.Data.MutArray.Type"
1212--
1313module Streamly.Internal.Data.Array.Type
1414 (
@@ -100,7 +100,7 @@ import GHC.Exts (IsList, IsString(..), Addr#)
100100
101101import GHC.IO (unsafePerformIO)
102102import GHC.Ptr (Ptr(..))
103−import Streamly.Internal.Data.Array.Mut.Type (MutArray(..), MutableByteArray)
103+import Streamly.Internal.Data.MutArray.Type (MutArray(..), MutableByteArray)
104104import Streamly.Internal.Data.Fold.Type (Fold(..))
105105import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
106106import Streamly.Internal.Data.Unbox (Unbox(..))
@@ -110,7 +110,7 @@ import Text.Read (readPrec)
110110import Prelude hiding (Foldable(..), read, unlines, splitAt)
111111
112112import 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
114114import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
115115import qualified Streamly.Internal.Data.Stream.StreamD.Generate as D
116116import 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)
323323import Data.Proxy (Proxy(..))
324324import Data.Word (Word32)
325325import Foreign.Storable (Storable, peek)
326−import Streamly.Internal.Data.Array.Mut.Type (MutArray(..))
326+import Streamly.Internal.Data.MutArray.Type (MutArray(..))
327327import Streamly.Internal.Data.Maybe.Strict (Maybe'(..), toMaybe)
328328import Streamly.Internal.Data.Pipe.Type (Pipe (..), PipeState(..))
329329import Streamly.Internal.Data.Unbox (Unbox, sizeOf)
@@ -332,7 +332,7 @@ import Streamly.Internal.Data.Tuple.Strict (Tuple'(..), Tuple3'(..))
332332import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
333333
334334import qualified Prelude
335−import qualified Streamly.Internal.Data.Array.Mut.Type as MA
335+import qualified Streamly.Internal.Data.MutArray.Type as MA
336336import qualified Streamly.Internal.Data.Array.Type as Array
337337import qualified Streamly.Internal.Data.Fold.Window as FoldW
338338import 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)
6565import Data.Proxy (Proxy(..))
6666import Streamly.Internal.Data.Unbox (Unbox(..))
6767import GHC.Types (SPEC(..))
68−import Streamly.Internal.Data.Array.Mut.Type (touch)
68+import Streamly.Internal.Data.MutArray.Type (touch)
6969import Streamly.Internal.Data.Array.Type (Array(..))
7070import Streamly.Internal.Data.Parser (Initial(..), Step(..))
7171import 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 @@
11-- |
2−-- Module : Streamly.Internal.Data.Array.Mut
2+-- Module : Streamly.Internal.Data.MutArray
33-- Copyright : (c) 2020 Composewell Technologies
44-- License : BSD-3-Clause
55-- Maintainer : streamly@composewell.com
66-- Stability : experimental
77-- Portability : GHC
88--
9−module Streamly.Internal.Data.Array.Mut
9+module Streamly.Internal.Data.MutArray
1010 (
11− module Streamly.Internal.Data.Array.Mut.Type
11+ module Streamly.Internal.Data.MutArray.Type
1212 , splitOn
1313 , genSlicesFromLen
1414 , getSlicesFromLen
@@ -27,7 +27,7 @@ import qualified Streamly.Internal.Data.Stream as D
2727import qualified Streamly.Internal.Data.Unfold as Unfold
2828
2929import Prelude hiding (foldr, length, read, splitAt)
30−import Streamly.Internal.Data.Array.Mut.Type
30+import Streamly.Internal.Data.MutArray.Type
3131
3232-- | Split the array into a stream of slices using a predicate. The element
3333-- 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 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE UnboxedTuples #-}
33-- |
4−-- Module : Streamly.Internal.Data.Array.Generic.Mut.Type
4+-- Module : Streamly.Internal.Data.MutArray.Generic
55-- Copyright : (c) 2020 Composewell Technologies
66-- License : BSD3-3-Clause
77-- Maintainer : streamly@composewell.com
88-- Stability : experimental
99-- Portability : GHC
1010--
11−module Streamly.Internal.Data.Array.Generic.Mut.Type
11+module Streamly.Internal.Data.MutArray.Generic
1212(
1313 -- * Type
1414 -- $arrayNotes
@@ -229,7 +229,7 @@ bottomElement =
229229
230230 where
231231
232− funcName = "Streamly.Internal.Data.Array.Generic.Mut.Type.bottomElement:"
232+ funcName = "Streamly.Internal.Data.MutArray.Generic.bottomElement:"
233233
234234-- XXX Would be nice if GHC can provide something like newUninitializedArray# so
235235-- 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 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE UnboxedTuples #-}
33-- |
4−-- Module : Streamly.Internal.Data.Array.Mut.Type
4+-- Module : Streamly.Internal.Data.MutArray.Type
55-- Copyright : (c) 2020 Composewell Technologies
66-- License : BSD3-3-Clause
77-- Maintainer : streamly@composewell.com
@@ -26,7 +26,7 @@
2626-- strive to keep the API consistent for both. Ideally, you should be able to
2727-- replace one with another with little changes to the code.
2828
29−module Streamly.Internal.Data.Array.Mut.Type
29+module Streamly.Internal.Data.MutArray.Type
3030 (
3131 -- * Type
3232 -- $arrayNotes
core/src/Streamly/Internal/Data/Ring.hs+1−1
@@ -29,7 +29,7 @@ import Control.Monad.IO.Class (liftIO, MonadIO)
2929import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
3030import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
3131import Streamly.Internal.Data.Fold.Type (Fold(..))
32−import Streamly.Internal.Data.Array.Generic.Mut.Type
32+import Streamly.Internal.Data.MutArray.Generic
3333 ( MutArray(..)
3434 , new
3535 , uninit
core/src/Streamly/Internal/Data/Ring/Unboxed.hs+2−2
@@ -82,14 +82,14 @@ import Foreign.Ptr (plusPtr, minusPtr, castPtr)
8282import Streamly.Internal.Data.Unbox as Unboxed (Unbox(peekByteIndex))
8383import GHC.ForeignPtr (mallocPlainForeignPtrAlignedBytes)
8484import GHC.Ptr (Ptr(..))
85−import Streamly.Internal.Data.Array.Mut.Type (MutArray)
85+import Streamly.Internal.Data.MutArray.Type (MutArray)
8686import Streamly.Internal.Data.Fold.Type (Fold(..), Step(..), lmap)
8787import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
8888import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))
8989import Streamly.Internal.Data.Unfold.Type (Unfold(..))
9090import Streamly.Internal.System.IO (unsafeInlineIO)
9191
92−import qualified Streamly.Internal.Data.Array.Mut.Type as MA
92+import qualified Streamly.Internal.Data.MutArray.Type as MA
9393import qualified Streamly.Internal.Data.Array.Type as A
9494
9595import 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
8888import qualified Streamly.Internal.Data.Array as A
8989import qualified Streamly.Internal.Data.Array as Array
9090import qualified Streamly.Internal.Data.Array.Type as A
91−import qualified Streamly.Internal.Data.Array.Mut.Type as MA
92−import qualified Streamly.Internal.Data.Array.Mut.Stream as AS
91+import qualified Streamly.Internal.Data.MutArray.Type as MA
92+import qualified Streamly.Internal.Data.Stream.MutChunked as AS
9393import qualified Streamly.Internal.Data.Fold.Type as FL (Fold(..), Step(..))
9494import qualified Streamly.Internal.Data.Parser as PR
9595import qualified Streamly.Internal.Data.Parser as PRD
@@ -206,7 +206,7 @@ unlines sep (D.Stream step state) = D.Stream step' (OuterLoop state)
206206-------------------------------------------------------------------------------
207207
208208-- 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
210210--
211211-- XXX Note that this thaws immutable arrays for appending, that may be
212212-- 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 @@
11-- |
2−-- Module : Streamly.Internal.Data.Array.Mut.Stream
2+-- Module : Streamly.Internal.Data.Stream.MutChunked
33-- Copyright : (c) 2019 Composewell Technologies
44-- License : BSD3-3-Clause
55-- Maintainer : streamly@composewell.com
@@ -8,7 +8,7 @@
88--
99-- Combinators to efficiently manipulate streams of mutable arrays.
1010--
11−module Streamly.Internal.Data.Array.Mut.Stream
11+module Streamly.Internal.Data.Stream.MutChunked
1212 (
1313 -- * Generation
1414 chunksOf
@@ -32,13 +32,13 @@ import Control.Monad (when)
3232import Data.Bifunctor (first)
3333import Data.Proxy (Proxy(..))
3434import Streamly.Internal.Data.Unbox (Unbox, sizeOf)
35−import Streamly.Internal.Data.Array.Mut.Type (MutArray(..))
35+import Streamly.Internal.Data.MutArray.Type (MutArray(..))
3636import Streamly.Internal.Data.Fold.Type (Fold(..))
3737import Streamly.Internal.Data.Parser (ParseError)
3838import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
3939import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
4040
41−import qualified Streamly.Internal.Data.Array.Mut.Type as MArray
41+import qualified Streamly.Internal.Data.MutArray.Type as MArray
4242import qualified Streamly.Internal.Data.Fold.Type as FL
4343import qualified Streamly.Internal.Data.Parser as ParserD
4444import qualified Streamly.Internal.Data.Stream as D
@@ -92,7 +92,7 @@ packArraysChunksOf n (D.Stream step state) =
9292 step' gst (SpliceInitial st) = do
9393 when (n <= 0) $
9494 -- 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 "
9696 ++ "arrays [" ++ show n ++ "] must be a natural number"
9797 r <- step gst st
9898 case r of
@@ -139,7 +139,7 @@ lpackArraysChunksOf n (Fold step1 initial1 extract1) =
139139 initial = do
140140 when (n <= 0) $
141141 -- 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 "
143143 ++ "arrays [" ++ show n ++ "] must be a natural number"
144144
145145 r <- initial1
@@ -243,7 +243,7 @@ compactLEParserD n = ParserD.Parser step initial extract
243243 extract (Just buf) = return $ ParserD.Done 0 buf
244244
245245 functionPath =
246− "Streamly.Internal.Data.Array.Mut.Stream.compactLEParserD"
246+ "Streamly.Internal.Data.Stream.MutChunked.compactLEParserD"
247247
248248-- | Coalesce adjacent arrays in incoming stream to form bigger arrays of a
249249-- minimum specified size. Note that if all the arrays in the stream together
@@ -292,7 +292,7 @@ compactGEFold n = Fold step initial extract
292292 extract (Just buf) = return buf
293293
294294 functionPath =
295− "Streamly.Internal.Data.Array.Mut.Stream.compactGEFold"
295+ "Streamly.Internal.Data.Stream.MutChunked.compactGEFold"
296296
297297-- | Coalesce adjacent arrays in incoming stream to form bigger arrays of a
298298-- 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
3838import qualified Data.Set as Set
3939import qualified Streamly.Data.Fold as Fold
4040import 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
4242import qualified Streamly.Internal.Data.Stream.StreamD.Type as Stream
4343import qualified Streamly.Internal.Data.Stream.StreamD.Nesting as Stream
4444import 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
133133import qualified Streamly.Data.Array as A
134134import qualified Streamly.Internal.Data.Array.Type as A
135135import 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
137137import qualified Streamly.Internal.Data.Refold.Type as Refold
138138import qualified Streamly.Internal.Data.Fold.Type as FL(refoldMany)
139139import 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)
102102import GHC.Ptr (Ptr (..), plusPtr)
103103import System.IO.Unsafe (unsafePerformIO)
104104import Streamly.Internal.Data.Array.Type (Array(..))
105−import Streamly.Internal.Data.Array.Mut.Type (MutableByteArray)
105+import Streamly.Internal.Data.MutArray.Type (MutableByteArray)
106106import Streamly.Internal.Data.Fold (Fold)
107107import Streamly.Internal.Data.Stream (Stream)
108108import Streamly.Internal.Data.Stream (Step (..))
core/streamly-core.cabal+4−4
@@ -307,10 +307,10 @@ library
307307 -- Unboxed IORef
308308 , Streamly.Internal.Data.IORef.Unboxed
309309 -- May depend on streamly-core-stream
310− , Streamly.Internal.Data.Array.Mut.Type
311− , Streamly.Internal.Data.Array.Mut
310+ , Streamly.Internal.Data.MutArray.Type
311+ , Streamly.Internal.Data.MutArray
312312 , Streamly.Internal.Data.Array.Type
313− , Streamly.Internal.Data.Array.Generic.Mut.Type
313+ , Streamly.Internal.Data.MutArray.Generic
314314
315315 -- streamly-core-streams
316316 , Streamly.Internal.Data.StreamK
@@ -352,7 +352,7 @@ library
352352 -- streamly-core-data-arrays
353353 , Streamly.Internal.Data.Array.Generic
354354 , Streamly.Internal.Data.Array
355− , Streamly.Internal.Data.Array.Mut.Stream
355+ , Streamly.Internal.Data.Stream.MutChunked
356356
357357 -- streamly-serde
358358 , Streamly.Internal.Serialize.FromBytes
docs/Developer/module-organization.md+1−1
@@ -225,7 +225,7 @@ Unboxed arrays, based on `Prim` type class:
225225
226226Mutable arrays are a generalization of immutable arrays:
227227
228−* `Streamly.Data.Array.Mut`
228+* `Streamly.Data.MutArray`
229229* `Streamly.Data.Array.Storable.Mut`
230230* `Streamly.Data.Array.Storable.Pinned.Mut`
231231* ...
hie.yaml+4−4
@@ -20,8 +20,8 @@ cradle:
2020 component: "bench:Data.Array"
2121 - path: "./benchmark/Streamly/Benchmark/Data/Array/Generic.hs"
2222 component: "bench:Data.Array.Generic"
23− - path: "./benchmark/Streamly/Benchmark/Data/Array/Mut.hs"
24− component: "bench:Data.Array.Mut"
23+ - path: "./benchmark/Streamly/Benchmark/Data/MutArray.hs"
24+ component: "bench:Data.MutArray"
2525 - path: "./benchmark/Streamly/Benchmark/Data/Array/Stream.hs"
2626 component: "bench:Data.Array.Stream"
2727 - path: "./benchmark/Streamly/Benchmark/Data/Fold.hs"
@@ -98,8 +98,8 @@ cradle:
9898 component: "test:Data.Stream"
9999 - path: "./test/Streamly/Test/Data/Array/Generic.hs"
100100 component: "test:Data.Array.Generic"
101− - path: "./test/Streamly/Test/Data/Array/Mut.hs"
102− component: "test:Data.Array.Mut"
101+ - path: "./test/Streamly/Test/Data/MutArray.hs"
102+ component: "test:Data.MutArray"
103103 - path: "./test/Streamly/Test/Data/Array/Stream.hs"
104104 component: "test:Data.Array.Stream"
105105 - 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
145145
146146import qualified Streamly.Data.Array as A
147147import qualified Streamly.Data.Fold as FL
148−import qualified Streamly.Internal.Data.Array.Mut as MArray
149− (MutArray(..), pinnedNewBytes, asPtrUnsafe)
148+import qualified Streamly.Internal.Data.MutArray as MArray
149+ (MutArray(..), asPtrUnsafe)
150150import qualified Streamly.Internal.Data.Stream.Chunked as AS
151151import qualified Streamly.Internal.Data.Stream as S
152152import 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)
9797import qualified Streamly.Data.Array as A (reader, length)
9898import qualified Streamly.Data.Fold as FL
9999import qualified Streamly.Internal.Data.Array.Type as A
100− ( unsafeFreeze, asPtrUnsafe, byteLength, pinnedWriteNUnsafe, pinnedChunksOf
101− , pinnedWriteN
102− )
103−import qualified Streamly.Internal.Data.Array.Mut as MArray
104− (MutArray(..), pinnedNewBytes, asPtrUnsafe)
100+ (unsafeFreeze, asPtrUnsafe, byteLength, pinnedChunksOf, pinnedWriteN, pinnedWriteNUnsafe)
101+import qualified Streamly.Internal.Data.MutArray as MArray
102+ (MutArray(..), asPtrUnsafe, pinnedNewBytes)
105103import qualified Streamly.Internal.Data.Stream as S
106104import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
107105 (Stream(..), Step(..))
src/Streamly/Internal/System/IOVec.hs+5−5
@@ -30,12 +30,12 @@ where
3030import Control.Monad (when)
3131import Control.Monad.IO.Class (MonadIO(..))
3232import Foreign.Ptr (castPtr)
33−import Streamly.Internal.Data.Array.Mut.Type (length)
33+import Streamly.Internal.Data.MutArray.Type (length)
3434import Streamly.Internal.Data.SVar.Type (adaptState)
35−import Streamly.Internal.Data.Array.Mut.Type (Array(..))
35+import Streamly.Internal.Data.MutArray.Type (Array(..))
3636
3737import 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
3939import qualified Streamly.Internal.Data.Stream as D
4040-}
4141#endif
@@ -69,11 +69,11 @@ groupIOVecsOfMut n maxIOVLen (D.Stream step state) =
6969 step' gst (GatherInitial st) = do
7070 when (n <= 0) $
7171 -- 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 "
7373 ++ "groups [" ++ show n ++ "] must be a natural number"
7474 when (maxIOVLen <= 0) $
7575 -- 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 "
7777 ++ "IOVec entries [" ++ show n ++ "] must be a natural number"
7878 r <- step (adaptState gst) st
7979 case r of
streamly.cabal+2−2
@@ -69,7 +69,7 @@ extra-source-files:
6969 benchmark/Streamly/Benchmark/Data/Array/SmallArray.hs
7070 benchmark/Streamly/Benchmark/Data/Array.hs
7171 benchmark/Streamly/Benchmark/Data/Ring/Unboxed.hs
72− benchmark/Streamly/Benchmark/Data/Array/Mut.hs
72+ benchmark/Streamly/Benchmark/Data/MutArray.hs
7373 benchmark/Streamly/Benchmark/Data/Array/Stream.hs
7474 benchmark/Streamly/Benchmark/Data/Fold/Window.hs
7575 benchmark/Streamly/Benchmark/Data/Stream/*.hs
@@ -104,7 +104,7 @@ extra-source-files:
104104 test/Streamly/Test/Data/Array/Common.hs
105105 test/Streamly/Test/Data/Array/Generic.hs
106106 test/Streamly/Test/Data/Array.hs
107− test/Streamly/Test/Data/Array/Mut.hs
107+ test/Streamly/Test/Data/MutArray.hs
108108 test/Streamly/Test/Data/Ring/Unboxed.hs
109109 test/Streamly/Test/Data/Array/Stream.hs
110110 test/Streamly/Test/Data/Parser/ParserD.hs
targets/Targets.hs+1−1
@@ -166,7 +166,7 @@ targets =
166166 , "pinned_array_cmp"
167167 ]
168168 )
169− , ("Data.Array.Mut",
169+ , ("Data.MutArray",
170170 [ "array_grp"
171171 , "array_cmp"
172172 ]
test/Streamly/Test/Data/Array.hs+2−2
@@ -15,12 +15,12 @@ import Data.Word(Word8)
1515import Foreign.Storable (peek)
1616import GHC.Ptr (plusPtr)
1717import Streamly.Internal.Data.Unbox (Unbox, sizeOf)
18−import Streamly.Internal.Data.Array.Mut.Type (MutArray)
18+import Streamly.Internal.Data.MutArray.Type (MutArray)
1919import Test.QuickCheck (chooseInt, listOf)
2020
2121import qualified Streamly.Internal.Data.Array as A
2222import 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
2424
2525#include "Streamly/Test/Data/Array/CommonImports.hs"
2626
test/Streamly/Test/Data/Fold.hs+1−1
@@ -23,7 +23,7 @@ import Test.QuickCheck.Monadic (monadicIO, assert, run)
2323
2424import qualified Data.Map
2525import qualified Prelude
26−import qualified Streamly.Internal.Data.Array.Mut as MArray
26+import qualified Streamly.Internal.Data.MutArray as MArray
2727import qualified Streamly.Internal.Data.Fold as Fold
2828import qualified Streamly.Internal.Data.Fold.Container as Fold
2929import 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
22
33import Test.QuickCheck (listOf)
44
@@ -23,7 +23,7 @@ import Test.QuickCheck.Monadic (monadicIO, assert)
2323import GHC.RTS.Flags (IoSubSystem(..))
2424#endif
2525
26−import qualified Streamly.Internal.Data.Array.Mut as MArray
26+import qualified Streamly.Internal.Data.MutArray as MArray
2727import qualified Streamly.Internal.Data.Stream as Stream
2828import qualified Test.Hspec as Hspec
2929
@@ -31,7 +31,7 @@ maxTestCount :: Int
3131maxTestCount = 100
3232
3333moduleName :: String
34−moduleName = "Data.Array.Mut"
34+moduleName = "Data.MutArray"
3535
3636testAppend :: Property
3737testAppend =
test/streamly-tests.cabal+3−3
@@ -248,11 +248,11 @@ test-suite Data.Stream
248248 main-is: Streamly/Test/Data/Stream.hs
249249 ghc-options: -main-is Streamly.Test.Data.Stream.main
250250
251−test-suite Data.Array.Mut
251+test-suite Data.MutArray
252252 import: test-options
253253 type: exitcode-stdio-1.0
254− main-is: Streamly/Test/Data/Array/Mut.hs
255− ghc-options: -main-is Streamly.Test.Data.Array.Mut.main
254+ main-is: Streamly/Test/Data/MutArray.hs
255+ ghc-options: -main-is Streamly.Test.Data.MutArray.main
256256
257257test-suite Data.Ring.Unboxed
258258 import: test-options