4eda9d0 · streamly · git.iko.soy

git.iko.soy/streamly

Rename Data.Array.Unboxed

commit4eda9d0c1ff39a54c0ad45aeecfe35990f49bed9 authorRanjeet Kumar Ranjan <ranjeetr@composewell.com> dateThu 3 Nov 2022, 18:13 (4 years ago) parent64d3374

79 files changed+266−266

compare with master

unifiedsplit

benchmark/NanoBenchmarks.hs+1−1

@@ -12,7 +12,7 @@ import Data.Char (ord)

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

1313import System.IO (hSeek, SeekMode(..), openFile, IOMode(..))

1414

15−import qualified Streamly.Data.Array.Unboxed as A

15+import qualified Streamly.Data.Array as A

1616import qualified Streamly.Internal.FileSystem.Handle as IFH

1717import qualified Streamly.Data.Fold as FL

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

benchmark/Streamly/Benchmark/Data/Array/Unboxed.hs → benchmark/Streamly/Benchmark/Data/Array.hsrenamed+4−4

@@ -6,11 +6,11 @@

77import Control.DeepSeq (deepseq)

9−import qualified Streamly.Internal.Data.Array.Unboxed as IA

9+import qualified Streamly.Internal.Data.Array as IA

1010import qualified GHC.Exts as GHC

1111

12−-- import qualified Streamly.Data.Array.Unboxed as A

13−import qualified Streamly.Internal.Data.Array.Unboxed as A

12+-- import qualified Streamly.Data.Array as A

13+import qualified Streamly.Internal.Data.Array as A

1414type Stream = A.Array

1515

1616#include "Streamly/Benchmark/Data/Array/Common.hs"

@@ -116,7 +116,7 @@ o_n_heap_serial value =

116116 ]

117117

118118moduleName :: String

119−moduleName = "Data.Array.Unboxed"

119+moduleName = "Data.Array"

120120

121121defStreamSize :: Int

122122defStreamSize = defaultStreamSize

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

@@ -42,8 +42,8 @@ import Prelude

4242 , undefined

4343 )

4444

45−import qualified Streamly.Internal.Data.Array.Unboxed as Array

46−import qualified Streamly.Internal.Data.Array.Unboxed.Mut as MArray

45+import qualified Streamly.Internal.Data.Array as Array

46+import qualified Streamly.Internal.Data.Array.Mut as MArray

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

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

4949import qualified Streamly.Prelude as IsStream (scanl1')

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

270270-------------------------------------------------------------------------------

271271

272272moduleName :: String

273−moduleName = "Data.Array.Unboxed.Mut"

273+moduleName = "Data.Array.Mut"

274274

275275main :: IO ()

276276main = do

benchmark/Streamly/Benchmark/Data/Array/Stream/Unboxed.hs → benchmark/Streamly/Benchmark/Data/Array/Stream.hsrenamed+3−3

@@ -36,8 +36,8 @@ import System.IO (Handle)

3636import System.Random (randomRIO)

3737import Prelude hiding ()

3838

39−import qualified Streamly.Internal.Data.Array.Unboxed as Array

40−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as ArrayStream

39+import qualified Streamly.Internal.Data.Array as Array

40+import qualified Streamly.Internal.Data.Array.Stream as ArrayStream

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

4242import qualified Streamly.Internal.Data.Parser as Parser

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

@@ -275,7 +275,7 @@ o_1_space_serial_array bound arraysSmall arraysBig =

275275-------------------------------------------------------------------------------

276276

277277moduleName :: String

278−moduleName = "Data.Array.Unboxed.Stream"

278+moduleName = "Data.Array.Stream"

279279

280280main :: IO ()

281281main = do

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

@@ -33,7 +33,7 @@ import qualified Data.Traversable as TR

3333import qualified Data.Foldable as F

3434import qualified Control.Applicative as AP

3535import qualified Streamly.FileSystem.Handle as Handle

36−import qualified Streamly.Internal.Data.Array.Unboxed as Array

36+import qualified Streamly.Internal.Data.Array as Array

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

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

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

benchmark/Streamly/Benchmark/Data/Parser/ParserD.hs+1−1

@@ -29,7 +29,7 @@ import Prelude hiding (any, all, take, sequence, sequenceA, sequence_, takeWhile

2929import qualified Data.Traversable as TR

3030import qualified Data.Foldable as F

3131import qualified Control.Applicative as AP

32−import qualified Streamly.Internal.Data.Array.Unboxed as Array

32+import qualified Streamly.Internal.Data.Array as Array

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

3434import qualified Streamly.Internal.Data.Parser.ParserD as PR

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

benchmark/Streamly/Benchmark/Data/Ring/Unboxed.hs+1−1

@@ -13,7 +13,7 @@ module Main (main) where

1313import Control.Monad (void)

1414import GHC.Ptr (Ptr(..))

1515

16−import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

16+import qualified Streamly.Internal.Data.Array.Type as Array

1717import qualified Streamly.Internal.Data.Ring.Unboxed as Ring

1818import qualified Data.Foldable as P

1919

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

@@ -27,7 +27,7 @@ import Data.Word (Word8)

2727import System.IO (Handle)

2828

2929import qualified Streamly.FileSystem.Handle as FH

30−import qualified Streamly.Internal.Data.Array.Unboxed as A

30+import qualified Streamly.Internal.Data.Array as A

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

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

3333import qualified Streamly.Internal.Data.Stream.IsStream as IP

@@ -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.Unboxed.Mut.Type as MA

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

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

4848

4949import Test.Inspection

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

@@ -30,8 +30,8 @@ import GHC.Magic (noinline)

3030import System.IO (Handle)

3131

3232import qualified Streamly.FileSystem.Handle as FH

33−import qualified Streamly.Internal.Data.Array.Unboxed as A

34−import qualified Streamly.Internal.Data.Array.Unboxed.Type as AT

33+import qualified Streamly.Internal.Data.Array as A

34+import qualified Streamly.Internal.Data.Array.Type as AT

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

3636import qualified Streamly.Internal.Data.Stream.IsStream as IP

3737import qualified Streamly.Internal.FileSystem.Handle as IFH

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

4646#ifdef INSPECTION

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

4848

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

49+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

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

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

5252

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

@@ -31,7 +31,7 @@ import Streamly.Internal.System.IO (defaultChunkSize)

3131import qualified Streamly.FileSystem.Handle as FH

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

3333import qualified Streamly.Internal.FileSystem.Handle as IFH

34−import qualified Streamly.Data.Array.Unboxed as A

34+import qualified Streamly.Data.Array as A

3535import qualified Streamly.Prelude as S

3636

3737import Gauge hiding (env)

@@ -42,8 +42,8 @@ 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.Unboxed.Mut.Stream as MAS

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

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

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

4747

4848import Test.Inspection

4949#endif

benchmark/Streamly/Benchmark/Unicode/Char.hs+2−2

@@ -13,7 +13,7 @@

1313--------------------------------------------------------------------------------

1414

1515import Control.DeepSeq (NFData)

16−import Streamly.Internal.Data.Array.Unboxed (Array)

16+import Streamly.Internal.Data.Array (Array)

1717import System.FilePath (dropExtensions, takeFileName)

1818import System.FilePath.Posix ((</>))

1919import Gauge.Main (Benchmark, bench, bgroup, defaultMain, env, nfIO)

@@ -23,7 +23,7 @@ import Streamly.Internal.Unicode.Char

2323 )

2424import Streamly.Benchmark.Common (o_1_space_prefix)

2525

26−import qualified Streamly.Internal.Data.Array.Unboxed as Array

26+import qualified Streamly.Internal.Data.Array as Array

2727import qualified Streamly.Internal.Data.Stream.IsStream as IsStream

2828import qualified System.Directory as Dir

2929

benchmark/Streamly/Benchmark/Unicode/Stream.hs+2−2

@@ -23,7 +23,7 @@

2323import Prelude hiding (last, length)

2424import System.IO (Handle)

2525

26−import qualified Streamly.Data.Array.Unboxed as Array

26+import qualified Streamly.Data.Array as Array

2727import qualified Streamly.Data.Fold as Fold

2828import qualified Streamly.Internal.Data.Stream.IsStream as Stream

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

@@ -40,7 +40,7 @@ import Streamly.Internal.Data.Unboxed (Unbox)

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

4141import qualified Streamly.Internal.Data.Fold.Type as Fold

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

43−import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

43+import qualified Streamly.Internal.Data.Array.Type as Array

4444

4545import Test.Inspection

4646#endif

benchmark/streamly-benchmarks.cabal+7−7

@@ -572,10 +572,10 @@ benchmark Data.SmallArray

572572 else

573573 buildable: False

574574

575−benchmark Data.Array.Unboxed

575+benchmark Data.Array

576576 import: bench-options

577577 type: exitcode-stdio-1.0

578− main-is: Streamly/Benchmark/Data/Array/Unboxed.hs

578+ main-is: Streamly/Benchmark/Data/Array.hs

579579 if flag(use-streamly-core)

580580 buildable: False

581581 else

@@ -583,10 +583,10 @@ benchmark Data.Array.Unboxed

583583 if flag(limit-build-mem)

584584 ghc-options: +RTS -M1500M -RTS

585585

586−benchmark Data.Array.Unboxed.Mut

586+benchmark Data.Array.Mut

587587 import: bench-options

588588 type: exitcode-stdio-1.0

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

589+ main-is: Streamly/Benchmark/Data/Array/Mut.hs

590590 if flag(limit-build-mem)

591591 ghc-options: +RTS -M1500M -RTS

592592 if flag(use-streamly-core)

@@ -609,11 +609,11 @@ benchmark Data.Ring.Unboxed

609609-- Array Stream Benchmarks

610610-------------------------------------------------------------------------------

611611

612−benchmark Data.Array.Unboxed.Stream

612+benchmark Data.Array.Stream

613613 import: bench-options

614614 type: exitcode-stdio-1.0

615− hs-source-dirs: Streamly/Benchmark/Data/Array/Stream

616− main-is: Unboxed.hs

615+ hs-source-dirs: Streamly/Benchmark/Data/Array

616+ main-is: Stream.hs

617617 if flag(use-streamly-core) || impl(ghcjs)

618618 buildable: False

619619 else

core/src/Streamly/Console/Stdio.hs+1−1

@@ -33,7 +33,7 @@ where

3333

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

3535import Data.Word (Word8)

36−import Streamly.Internal.Data.Array.Unboxed.Type (Array)

36+import Streamly.Internal.Data.Array.Type (Array)

3737import Streamly.Internal.Data.Unfold (Unfold)

3838

3939import Streamly.Internal.Console.Stdio hiding (read, readChunks)

core/src/Streamly/Data/Array/Unboxed.hs → core/src/Streamly/Data/Array.hsrenamed+7−7

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

11-- |

2−-- Module : Streamly.Data.Array.Unboxed

2+-- Module : Streamly.Data.Array

44--

55-- License : BSD3

@@ -45,11 +45,11 @@

4545--

4646-- This module is designed to be imported qualified:

4747--

48−-- > import qualified Streamly.Data.Array.Unboxed as Array

48+-- > import qualified Streamly.Data.Array as Array

4949--

50−-- For experimental APIs see "Streamly.Internal.Data.Array.Unboxed".

50+-- For experimental APIs see "Streamly.Internal.Data.Array".

5151

52−module Streamly.Data.Array.Unboxed

52+module Streamly.Data.Array

5353 (

5454 -- * Types

5555 Unbox (..)

@@ -99,7 +99,7 @@ where

9999#include "inline.hs"

100100

101101import Streamly.Internal.Data.Unfold (Unfold)

102−import Streamly.Internal.Data.Array.Unboxed as A hiding (read, readRev)

102+import Streamly.Internal.Data.Array as A hiding (read, readRev)

103103

104104import Streamly.Internal.Data.Unboxed (Unbox (..))

105105import Prelude hiding (read)

@@ -108,9 +108,9 @@ import Prelude hiding (read)

108108-- >>> :m

109109-- >>> :set -XFlexibleContexts

110110-- >>> import Streamly.Internal.Data.Stream (Stream)

111−-- >>> import Streamly.Data.Array.Unboxed (Array)

111+-- >>> import Streamly.Data.Array (Array)

112112-- >>> import qualified Streamly.Internal.Data.Stream as Stream

113−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

113+-- >>> import qualified Streamly.Data.Array as Array

114114

115115-- | Same as 'reader'

116116--

core/src/Streamly/Data/Array/Unboxed/Mut.hs → core/src/Streamly/Data/Array/Mut.hsrenamed+3−3

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

11-- |

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

2+-- Module : Streamly.Data.Array.Mut

44--

55-- License : BSD3

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

1111-- random access, and mutation.

1212--

1313

14−module Streamly.Data.Array.Unboxed.Mut

14+module Streamly.Data.Array.Mut

1515 (

1616 -- * Types

1717 Unbox (..)

@@ -60,5 +60,5 @@ module Streamly.Data.Array.Unboxed.Mut

6060where

6161

6262import Prelude hiding (length, read)

63−import Streamly.Internal.Data.Array.Unboxed.Mut

63+import Streamly.Internal.Data.Array.Mut

6464import Streamly.Internal.Data.Unboxed (Unbox (..))

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

@@ -35,7 +35,7 @@

3535-- Design notes:

3636--

3737-- By design, file handle IO APIs are quite similar to

38−-- "Streamly.Data.Array.Unboxed" read write APIs. In that regard, arrays can be

38+-- "Streamly.Data.Array" read write APIs. In that regard, arrays can be

3939-- considered as in-memory files or files can be considered as on-disk arrays.

4040--

4141module Streamly.FileSystem.Handle

@@ -109,7 +109,7 @@ where

109109

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

111111import Data.Word (Word8)

112−import Streamly.Internal.Data.Array.Unboxed.Type (Array)

112+import Streamly.Internal.Data.Array.Type (Array)

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

114114import System.IO (Handle)

115115

core/src/Streamly/Internal/Console/Stdio.hs+2−2

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

4646import System.IO (stdin, stdout, stderr)

4747import Prelude hiding (read)

4848

49−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

49+import Streamly.Internal.Data.Array.Type (Array(..))

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

5151import Streamly.Internal.Data.Unfold (Unfold)

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

5353

54−import qualified Streamly.Internal.Data.Array.Unboxed as Array

54+import qualified Streamly.Internal.Data.Array as Array

5555import qualified Streamly.Internal.Data.Stream as Stream (intersperseSuffix)

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

5757import qualified Streamly.Internal.FileSystem.Handle as Handle

core/src/Streamly/Internal/Data/Array/Unboxed.hs → core/src/Streamly/Internal/Data/Array.hsrenamed+10−10

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

11-- |

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

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

44--

55-- License : BSD3

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

1818-- less efficient compared to folding via streams. 'Semigroup' and 'Monoid'

1919-- instances should be used with care; concatenating arrays using binary

2020-- operations can be highly inefficient. Instead, use

21−-- 'Streamly.Internal.Data.Array.Unboxed.Stream.toArray' to concatenate N

21+-- 'Streamly.Internal.Data.Array.Stream.toArray' to concatenate N

2222-- arrays at once.

2323--

2424-- Each array is one pointer visible to the GC. Too many small arrays (e.g.

@@ -28,7 +28,7 @@

2828-- if we use one array for each chunk. This is still significant to add

2929-- pressure to GC.

3030

31−module Streamly.Internal.Data.Array.Unboxed

31+module Streamly.Internal.Data.Array

3232 (

3333 Array

3434

@@ -133,8 +133,8 @@ import Streamly.Internal.Data.Unboxed

133133 )

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

135135

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

137−import Streamly.Internal.Data.Array.Unboxed.Type

136+import Streamly.Internal.Data.Array.Mut.Type (ArrayUnsafe(..))

137+import Streamly.Internal.Data.Array.Type

138138 (Array(..), length, asPtrUnsafe)

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

140140import Streamly.Internal.Data.Producer.Type (Producer(..))

@@ -143,9 +143,9 @@ import Streamly.Internal.Data.Tuple.Strict (Tuple3Fused'(..))

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

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

145145

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

147−import qualified Streamly.Internal.Data.Array.Unboxed.Mut as MA

148−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

146+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

147+import qualified Streamly.Internal.Data.Array.Mut as MA

148+import qualified Streamly.Internal.Data.Array.Type as A

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

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

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

@@ -233,7 +233,7 @@ readerUnsafe = Unfold step inject

233233

234234-- |

235235--

236−-- >>> import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

236+-- >>> import qualified Streamly.Internal.Data.Array.Type as Array

237237-- >>> null arr = Array.byteLength arr == 0

238238--

239239-- /Pre-release/

@@ -256,7 +256,7 @@ getIndexRev i arr =

256256

257257-- |

258258--

259−-- >>> import qualified Streamly.Internal.Data.Array.Unboxed as Array

259+-- >>> import qualified Streamly.Internal.Data.Array as Array

260260-- >>> last arr = Array.getIndexRev arr 0

261261--

262262-- /Pre-release/

core/src/Streamly/Internal/Data/Array/Unboxed/Fold.hs → core/src/Streamly/Internal/Data/Array/Fold.hsrenamed+7−7

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

11-- |

2−-- Module : Streamly.Internal.Data.Array.Unboxed.Fold

2+-- Module : Streamly.Internal.Data.Array.Fold

44-- License : BSD-3-Clause

55-- Maintainer : streamly@composewell.com

@@ -18,8 +18,8 @@

1818-- element stream. For example:

1919--

2020-- >>> import qualified Streamly.Data.Fold as Fold

21−-- >>> import qualified Streamly.Internal.Data.Array.Unboxed.Stream as ArrayStream

22−-- >>> import qualified Streamly.Internal.Data.Array.Unboxed.Fold as ArrayFold

21+-- >>> import qualified Streamly.Internal.Data.Array.Stream as ArrayStream

22+-- >>> import qualified Streamly.Internal.Data.Array.Fold as ArrayFold

2323-- >>> import qualified Streamly.Internal.Data.Stream as Stream (arraysOf)

2424-- >>> import qualified Streamly.Data.Stream as Stream

2525--

@@ -28,7 +28,7 @@

2828-- >>> ArrayStream.runArrayFold f s

2929-- "hello w"

3030--

31−module Streamly.Internal.Data.Array.Unboxed.Fold

31+module Streamly.Internal.Data.Array.Fold

3232 (

3333 ArrayFold (..)

3434

@@ -63,12 +63,12 @@ import Control.Monad.IO.Class (MonadIO(..))

6363import Data.Bifunctor (first)

6464import Streamly.Internal.Data.Unboxed (peekWith, sizeOf, Unbox)

6565import GHC.Types (SPEC(..))

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

67−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

66+import Streamly.Internal.Data.Array.Mut.Type (touch)

67+import Streamly.Internal.Data.Array.Type (Array(..))

6868import Streamly.Internal.Data.Parser.ParserD (Initial(..), Step(..))

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

7070

71−import qualified Streamly.Internal.Data.Array.Unboxed as Array

71+import qualified Streamly.Internal.Data.Array as Array

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

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

7474import qualified Streamly.Internal.Data.Parser.ParserD.Type as ParserD

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

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

11#include "inline.hs"

33-- |

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

4+-- Module : Streamly.Internal.Data.Array.Mut

66-- License : BSD-3-Clause

77-- Maintainer : streamly@composewell.com

@@ -22,9 +22,9 @@

2222-- Stream and Fold APIs allow easy, efficient and convenient operations on

2323-- arrays.

2424

25−module Streamly.Internal.Data.Array.Unboxed.Mut

25+module Streamly.Internal.Data.Array.Mut

2626 (

27− module Streamly.Internal.Data.Array.Unboxed.Mut.Type

27+ module Streamly.Internal.Data.Array.Mut.Type

2828 , splitOn

2929 , genSlicesFromLen

3030 , getSlicesFromLen

@@ -43,7 +43,7 @@ import qualified Streamly.Internal.Data.Unfold as Unfold

4343-- import qualified Streamly.Internal.Data.Stream.Common as P

4444

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

46−import Streamly.Internal.Data.Array.Unboxed.Mut.Type

46+import Streamly.Internal.Data.Array.Mut.Type

4747

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

4949-- matching the predicate is dropped.

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

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

11-- |

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

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

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.Unboxed.Mut.Stream

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

1212 (

1313 -- * Generation

1414 arraysOf

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

3232import Control.Monad.Catch (MonadThrow)

3333import Data.Bifunctor (first)

3434import Streamly.Internal.Data.Unboxed (Unbox, sizeOf)

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

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

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

3737import Streamly.Internal.Data.Stream.Type (Stream)

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

3939

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

40+import qualified Streamly.Internal.Data.Array.Mut.Type as MArray

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

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

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

@@ -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.Unboxed.Mut.Type.packArraysChunksOf: the size of "

95+ error $ "Streamly.Internal.Data.Array.Mut.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.Unboxed.Mut.Type.packArraysChunksOf: the size of "

142+ error $ "Streamly.Internal.Data.Array.Mut.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.Unboxed.Mut.Stream.compactLEParserD"

246+ "Streamly.Internal.Data.Array.Mut.Stream.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.Unboxed.Mut.Stream.compactGEFold"

295+ "Streamly.Internal.Data.Array.Mut.Stream.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/Array/Unboxed/Mut/Type.hs → core/src/Streamly/Internal/Data/Array/Mut/Type.hsrenamed+4−4

@@ -1,6 +1,6 @@

11{-# LANGUAGE UnboxedTuples #-}

22-- |

3−-- Module : Streamly.Internal.Data.Array.Unboxed.Mut.Type

3+-- Module : Streamly.Internal.Data.Array.Mut.Type

55-- License : BSD3-3-Clause

66-- Maintainer : streamly@composewell.com

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

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

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

1414

15−module Streamly.Internal.Data.Array.Unboxed.Mut.Type

15+module Streamly.Internal.Data.Array.Mut.Type

1616 (

1717 -- * Type

1818 -- $arrayNotes

@@ -263,7 +263,7 @@ import Prelude hiding

263263

264264-- $setup

265265-- >>> :m

266−-- >>> import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as Array

266+-- >>> import qualified Streamly.Internal.Data.Array.Mut.Type as Array

267267-- >>> import qualified Streamly.Internal.Data.Stream as Stream

268268-- >>> import qualified Streamly.Internal.Data.Stream.StreamD as StreamD

269269-- >>> import qualified Streamly.Internal.Data.Fold as Fold

@@ -1297,7 +1297,7 @@ arraysOf n (D.Stream step state) =

12971297 step' _ (GroupStart st) = do

12981298 when (n <= 0) $

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

1300− error $ "Streamly.Internal.Data.Array.Unboxed.Mut.Type.arraysOf: "

1300+ error $ "Streamly.Internal.Data.Array.Mut.Type.arraysOf: "

13011301 ++ "the size of arrays [" ++ show n

13021302 ++ "] must be a natural number"

13031303 Array contents start end bound <- liftIO $ newPinned n

core/src/Streamly/Internal/Data/Array/Unboxed/Stream.hs → core/src/Streamly/Internal/Data/Array/Stream.hsrenamed+11−11

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

11-- |

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

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

44-- License : BSD3-3-Clause

55-- Maintainer : streamly@composewell.com

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

88--

99-- Combinators to efficiently manipulate streams of immutable arrays.

1010--

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

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

1212 (

1313 -- * Creation

1414 arraysOf

@@ -63,22 +63,22 @@ import Prelude hiding (null, last, (!!), read, concat, unlines)

6363

6464import Streamly.Data.Fold (Fold)

6565import Streamly.Data.Stream (Stream)

66−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

67−import Streamly.Internal.Data.Array.Unboxed.Fold (ArrayFold(..))

66+import Streamly.Internal.Data.Array.Type (Array(..))

67+import Streamly.Internal.Data.Array.Fold (ArrayFold(..))

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

6969import Streamly.Internal.Data.Stream

7070 (fromStreamD, fromStreamK, toStreamD, toStreamK)

7171import Streamly.Internal.Data.SVar.Type (adaptState, defState)

72−import Streamly.Internal.Data.Array.Unboxed.Mut.Type

72+import Streamly.Internal.Data.Array.Mut.Type

7373 (allocBytesToElemCount)

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

7575

7676import qualified Streamly.Data.Fold as FL

77−import qualified Streamly.Internal.Data.Array.Unboxed as A

78−import qualified Streamly.Internal.Data.Array.Unboxed as Array

79−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

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

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

77+import qualified Streamly.Internal.Data.Array as A

78+import qualified Streamly.Internal.Data.Array as Array

79+import qualified Streamly.Internal.Data.Array.Type as A

80+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

81+import qualified Streamly.Internal.Data.Array.Mut.Stream as AS

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

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

8484import qualified Streamly.Internal.Data.Parser.ParserD as PRD

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

201201-------------------------------------------------------------------------------

202202

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

204−-- module Streamly.Internal.Data.Array.Unboxed.Mut.Stream

204+-- module Streamly.Internal.Data.Array.Mut.Stream

205205--

206206{-# INLINE_NORMAL packArraysChunksOf #-}

207207packArraysChunksOf :: (MonadIO m, Unbox a)

core/src/Streamly/Internal/Data/Array/Unboxed/Type.hs → core/src/Streamly/Internal/Data/Array/Type.hsrenamed+6−6

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

11-- |

2−-- Module : Streamly.Internal.Data.Array.Unboxed.Type

2+-- Module : Streamly.Internal.Data.Array.Type

44--

55-- License : BSD3-3-Clause

@@ -7,9 +7,9 @@

77-- Stability : experimental

88-- Portability : GHC

99--

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

10+-- See notes in "Streamly.Internal.Data.Array.Mut.Type"

1111--

12−module Streamly.Internal.Data.Array.Unboxed.Type

12+module Streamly.Internal.Data.Array.Type

1313 (

1414 -- $arrayNotes

1515 Array (..)

@@ -87,7 +87,7 @@ import GHC.Exts (IsList, IsString(..))

8787

8888import GHC.IO (unsafePerformIO)

8989import GHC.Ptr (Ptr(..))

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

90+import Streamly.Internal.Data.Array.Mut.Type (MutableByteArray)

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

9292import Streamly.Internal.Data.Stream.Type (Stream)

9393import Streamly.Internal.Data.Unboxed (Unbox, peekWith, sizeOf)

@@ -97,7 +97,7 @@ import Text.Read (readPrec, readListPrec, readListPrecDefault)

9797import Prelude hiding (length, foldr, read, unlines, splitAt)

9898

9999import qualified GHC.Exts as Exts

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

100+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

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

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

103103import qualified Streamly.Internal.Data.Stream.Type as Stream

@@ -111,7 +111,7 @@ import Streamly.Internal.System.IO (unsafeInlineIO, defaultChunkSize)

111111-- >>> :m

112112-- >>> :set -XMagicHash

113113-- >>> import Prelude hiding (length, foldr, read, unlines, splitAt)

114−-- >>> import Streamly.Internal.Data.Array.Unboxed as Array

114+-- >>> import Streamly.Internal.Data.Array as Array

115115

116116-------------------------------------------------------------------------------

117117-- Array Data Type

core/src/Streamly/Internal/Data/Binary/Decode.hs+2−2

@@ -31,8 +31,8 @@ import Streamly.Internal.Data.Parser (Parser)

3131import Streamly.Internal.Data.Maybe.Strict (Maybe'(..))

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

3333

34−import qualified Streamly.Data.Array.Unboxed as A

35−import qualified Streamly.Internal.Data.Array.Unboxed as A

34+import qualified Streamly.Data.Array as A

35+import qualified Streamly.Internal.Data.Array as A

3636 (unsafeIndex, castUnsafe)

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

3838 (fromPure, either, satisfy, takeEQ)

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

@@ -315,8 +315,8 @@ import Streamly.Internal.Data.Tuple.Strict (Tuple'(..), Tuple3'(..))

315315import Streamly.Internal.Data.Stream.Type (Stream)

316316

317317import qualified Prelude

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

319−import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

318+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

319+import qualified Streamly.Internal.Data.Array.Type as Array

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

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

322322import qualified Streamly.Internal.Data.Ring.Unboxed as Ring

@@ -342,10 +342,10 @@ import Streamly.Internal.Data.Fold.Type

342342-- >>> import Data.Monoid (Last(..), Sum(..))

343343-- >>> import Streamly.Data.Stream (Stream)

344344-- >>> import Data.IORef (newIORef, readIORef, writeIORef)

345−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

345+-- >>> import qualified Streamly.Data.Array as Array

346346-- >>> import qualified Streamly.Data.Fold as Fold

347347-- >>> import qualified Streamly.Data.Stream as Stream

348−-- >>> import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as MA

348+-- >>> import qualified Streamly.Internal.Data.Array.Mut.Type as MA

349349-- >>> import qualified Streamly.Internal.Data.Fold as Fold

350350-- >>> import qualified Streamly.Internal.Data.Fold.Type as Fold

351351-- >>> import qualified Streamly.Internal.Data.Fold.Window as FoldW

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

@@ -658,7 +658,7 @@ drain = foldl' (\_ _ -> ()) ()

658658-- | Folds the input stream to a list.

659659--

660660-- /Warning!/ working on large lists accumulated as buffers in memory could be

661−-- very inefficient, consider using "Streamly.Data.Array.Unboxed"

661+-- very inefficient, consider using "Streamly.Data.Array"

662662-- instead.

663663--

664664-- >>> toList = Fold.foldr' (:) []

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

@@ -245,7 +245,7 @@ import Prelude

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

246246import Streamly.Internal.Data.Pipe.Type

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

248−-- import Streamly.Internal.Data.Array.Unboxed.Type (Array)

248+-- import Streamly.Internal.Data.Array.Type (Array)

249249-- import Streamly.Internal.Data.Ring.Unboxed (Ring)

250250-- import Streamly.Internal.Data.Stream (Stream)

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

@@ -254,7 +254,7 @@ import Streamly.Internal.Data.Pipe.Type

254254

255255-- import Streamly.Internal.Data.Strict

256256

257−-- import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

257+-- import qualified Streamly.Internal.Data.Array.Type as A

258258-- import qualified Streamly.Prelude as S

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

260260-- import qualified Streamly.Internal.Data.Stream.StreamK as K

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

@@ -87,15 +87,15 @@ import Streamly.Internal.Data.Unboxed as Unboxed

8787 )

8888import GHC.ForeignPtr (mallocPlainForeignPtrAlignedBytes)

8989import GHC.Ptr (Ptr(..))

90−import Streamly.Internal.Data.Array.Unboxed.Mut.Type (Array)

90+import Streamly.Internal.Data.Array.Mut.Type (Array)

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

9292import Streamly.Internal.Data.Stream.Type (Stream)

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

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

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

9696

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

98−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

97+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

98+import qualified Streamly.Internal.Data.Array.Type as A

9999

100100import Prelude hiding (length, concat, read)

101101

core/src/Streamly/Internal/Data/Stream/Bottom.hs+2−2

@@ -76,7 +76,7 @@ import Streamly.Internal.Data.Producer.Type (Producer(..))

7676import Streamly.Internal.System.IO (defaultChunkSize)

7777import Streamly.Internal.Data.SVar.Type (defState)

7878

79−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

79+import qualified Streamly.Internal.Data.Array.Type as A

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

8181import qualified Streamly.Internal.Data.Stream.StreamK as K

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

@@ -96,7 +96,7 @@ import Streamly.Internal.Data.Stream.Type

9696-- >>> import Prelude hiding (take, takeWhile, drop, reverse)

9797-- >>> import System.IO.Unsafe (unsafePerformIO)

9898-- >>> import Streamly.Internal.Data.Stream as Stream

99−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

99+-- >>> import qualified Streamly.Data.Array as Array

100100-- >>> import qualified Streamly.Internal.Data.Fold as Fold

101101-- >>> import qualified Streamly.Internal.Data.Parser as Parser

102102-- >>> import qualified Streamly.Internal.Data.Unfold as Unfold

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

@@ -84,7 +84,7 @@ import Control.Monad.Trans.Class (MonadTrans(..))

8484import Streamly.Internal.Data.Parser (Parser (..))

8585import Streamly.Internal.Data.Unboxed (Unbox)

8686

87−import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

87+import qualified Streamly.Internal.Data.Array.Type as Array

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

8989import qualified Streamly.Internal.Data.Parser.ParserD as PRD

9090import qualified Streamly.Internal.Data.Parser.ParserK.Type as PRK

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

@@ -147,7 +147,7 @@ import Prelude hiding (concat, concatMap, zipWith)

147147-- >>> import Data.IORef

148148-- >>> import Streamly.Internal.Data.Stream (Stream)

149149-- >>> import Prelude hiding (zipWith, concatMap, concat)

150−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

150+-- >>> import qualified Streamly.Data.Array as Array

151151-- >>> import qualified Streamly.Internal.Data.Fold as Fold

152152-- >>> import qualified Streamly.Internal.Data.Stream as Stream

153153-- >>> import qualified Streamly.Internal.Data.Unfold as Unfold

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

@@ -58,7 +58,7 @@ where

5858

5959import Control.Monad.Catch (MonadThrow)

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

61−import Streamly.Internal.Data.Array.Unboxed.Type (Array)

61+import Streamly.Internal.Data.Array.Type (Array)

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

6363import Streamly.Internal.Data.Parser (Parser (..))

6464import Streamly.Internal.Data.Refold.Type (Refold (..))

@@ -66,7 +66,7 @@ import Streamly.Internal.Data.Stream.Bottom (foldManyPost)

6666import Streamly.Internal.Data.Stream.Type (Stream, fromStreamD, toStreamD)

6767import Streamly.Internal.Data.Unboxed (Unbox)

6868

69−import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

69+import qualified Streamly.Internal.Data.Array.Type as Array

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

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

7272

@@ -80,7 +80,7 @@ import Prelude hiding (concatMap, map)

8080-- >>> import qualified Streamly.Internal.Data.Fold as Fold

8181-- >>> import qualified Streamly.Internal.Data.Unfold as Unfold

8282-- >>> import qualified Streamly.Internal.Data.Parser as Parser

83−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

83+-- >>> import qualified Streamly.Data.Array as Array

8484

8585------------------------------------------------------------------------------

8686-- Trimming

core/src/Streamly/Internal/Data/Stream/StreamD/Nesting.hs+2−2

@@ -159,7 +159,7 @@ import Foreign.Storable (peek, sizeOf)

159159import Fusion.Plugin.Types (Fuse(..))

160160import GHC.Types (SPEC(..))

161161

162−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

162+import Streamly.Internal.Data.Array.Type (Array(..))

163163import Streamly.Internal.Data.Fold.Step (Step(..))

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

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

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

169169import Streamly.Internal.Data.Unboxed (Unbox)

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

171171

172−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

172+import qualified Streamly.Internal.Data.Array.Type as A

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

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

175175import qualified Streamly.Internal.Data.Parser.ParserD as PRD

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

@@ -963,7 +963,7 @@ reverse' :: forall m a. (MonadIO m, Storable a) => Stream m a -> Stream m a

963963import Foreign.ForeignPtr (touchForeignPtr)

964964import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

965965import Foreign.Ptr (Ptr, plusPtr)

966−import Streamly.Internal.Data.Array.Unboxed.Mut.Type (sizeOfElem)

966+import Streamly.Internal.Data.Array.Mut.Type (sizeOfElem)

967967reverse' m = Stream step Nothing

968968 where

969969 {-# INLINE_LATE step #-}

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

@@ -54,7 +54,7 @@ import Streamly.Internal.Data.Stream.Type (Stream, fromStreamD, toStreamD)

5454

5555import qualified Data.List as List

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

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

57+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

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

5959import qualified Streamly.Internal.Data.Parser as Parser

6060import qualified Streamly.Internal.Data.Stream.Lift as Stream

core/src/Streamly/Internal/FileSystem/Dir.hs+4−4

@@ -155,9 +155,9 @@ toChunks = toChunksWithBufferOf defaultChunkSize

155155

156156-- | Unfolds a handle into a stream of 'Word8' arrays. Requests to the IO

157157-- device are performed using a buffer of size

158−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'. The

158+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'. The

159159-- size of arrays in the resulting stream are therefore less than or equal to

160−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'.

160+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'.

161161--

162162-- @since 0.7.0

163163{-# INLINE readChunks #-}

@@ -351,7 +351,7 @@ fromStreamWithBufferOf n h m = fromChunks h $ S.arraysOf n m

351351-- > write = 'writeWithBufferOf' A.defaultChunkSize

352352--

353353-- | Write a byte stream to a file handle. Accumulates the input in chunks of

354−-- up to 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize' before writing.

354+-- up to 'Streamly.Internal.Data.Array.Type.defaultChunkSize' before writing.

355355--

356356-- NOTE: This may perform better than the 'write' fold, you can try this if you

357357-- need some extra perf boost.

@@ -401,7 +401,7 @@ writeWithBufferOf n h = FL.chunksOf n (writeNUnsafe n) (writeChunks h)

401401-- > write = 'writeWithBufferOf' A.defaultChunkSize

402402--

403403-- | Write a byte stream to a file handle. Accumulates the input in chunks of

404−-- up to 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize' before writing

404+-- up to 'Streamly.Internal.Data.Array.Type.defaultChunkSize' before writing

405405-- to the IO device.

406406--

407407-- @since 0.7.0

core/src/Streamly/Internal/FileSystem/File.hs+7−7

@@ -104,20 +104,20 @@ import qualified Control.Monad.Catch as MC

104104import qualified System.IO as SIO

105105

106106import Streamly.Data.Fold (chunksOf, drain)

107−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..), writeNUnsafe)

107+import Streamly.Internal.Data.Array.Type (Array(..), writeNUnsafe)

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

109109import Streamly.Data.Stream (Stream)

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

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

112112import Streamly.Internal.System.IO (defaultChunkSize)

113113

114−import qualified Streamly.Data.Array.Unboxed as A

114+import qualified Streamly.Data.Array as A

115115import qualified Streamly.Data.Unfold as UF

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

117117 (Step(..), snoc, reduce)

118118import qualified Streamly.Internal.Data.Unfold as UF (bracketIO)

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

120−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as AS

120+import qualified Streamly.Internal.Data.Array.Stream as AS

121121import qualified Streamly.Data.Stream as S (fold, bracketIO, mapM)

122122

123123-------------------------------------------------------------------------------

@@ -303,9 +303,9 @@ readChunksFromToWith = chunkReaderFromToWith

303303

304304-- | Unfolds a 'FilePath' into a stream of 'Word8' arrays. Requests to the IO

305305-- device are performed using a buffer of size

306−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'. The

306+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'. The

307307-- size of arrays in the resulting stream are therefore less than or equal to

308−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'.

308+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'.

309309--

310310-- /Pre-release/

311311{-# INLINE chunkReader #-}

@@ -328,7 +328,7 @@ readWithBufferOf = readerWith

328328

329329-- | Unfolds a file path into a byte stream. IO requests to the device are

330330-- performed in sizes of

331−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'.

331+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'.

332332--

333333-- /Pre-release/

334334{-# INLINE reader #-}

@@ -465,7 +465,7 @@ writeWithBufferOf = writeWith

465465-- > write = 'writeWith' A.defaultChunkSize

466466--

467467-- | Write a byte stream to a file. Accumulates the input in chunks of up to

468−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize' before writing to

468+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize' before writing to

469469-- the IO device.

470470--

471471-- /Pre-release/

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

@@ -122,18 +122,18 @@ import Prelude hiding (read)

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

123123import Streamly.Internal.Data.Refold.Type (Refold(..))

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

125−import Streamly.Internal.Data.Array.Unboxed.Type

125+import Streamly.Internal.Data.Array.Type

126126 (Array(..), writeNUnsafe, unsafeFreezeWithShrink, byteLength)

127127import Streamly.Internal.Data.Stream.Type (Stream)

128−import Streamly.Internal.Data.Array.Unboxed.Stream (lpackArraysChunksOf)

128+import Streamly.Internal.Data.Array.Stream (lpackArraysChunksOf)

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

130130import Streamly.Internal.System.IO (defaultChunkSize)

131131

132132import qualified Streamly.Data.Fold as FL

133−import qualified Streamly.Data.Array.Unboxed as A

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

135−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as AS

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

133+import qualified Streamly.Data.Array as A

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

135+import qualified Streamly.Internal.Data.Array.Stream as AS

136+import qualified Streamly.Internal.Data.Array.Mut.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

@@ -143,12 +143,12 @@ import qualified Streamly.Internal.Data.Unfold as UF

143143import qualified Streamly.Internal.Data.Stream.StreamK.Type as K (mkStream)

144144

145145-- $setup

146−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

146+-- >>> import qualified Streamly.Data.Array as Array

147147-- >>> import qualified Streamly.Data.Fold as Fold

148148-- >>> import qualified Streamly.Data.Unfold as Unfold

149149-- >>> import qualified Streamly.Data.Stream as Stream

150150--

151−-- >>> import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array (writeNUnsafe)

151+-- >>> import qualified Streamly.Internal.Data.Array.Type as Array (writeNUnsafe)

152152-- >>> import qualified Streamly.Internal.Data.Stream as Stream

153153-- >>> import qualified Streamly.Internal.Data.Unfold as Unfold (first)

154154-- >>> import qualified Streamly.Internal.FileSystem.Handle as Handle

@@ -306,9 +306,9 @@ readChunks = readChunksWith defaultChunkSize

306306

307307-- | Unfolds a handle into a stream of 'Word8' arrays. Requests to the IO

308308-- device are performed using a buffer of size

309−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'. The

309+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'. The

310310-- size of arrays in the resulting stream are therefore less than or equal to

311−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'.

311+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'.

312312--

313313-- >>> chunkReader = Unfold.first IO.defaultChunkSize Handle.chunkReaderWith

314314--

@@ -352,7 +352,7 @@ readWith size h = AS.concat $ readChunksWith size h

352352

353353-- | Unfolds a file handle into a byte stream. IO requests to the device are

354354-- performed in sizes of

355−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'.

355+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'.

356356--

357357-- >>> reader = Unfold.many Array.reader chunkReader

358358--

@@ -434,7 +434,7 @@ putBytesWith n h m = putChunks h $ S.arraysOf n m

434434-- putBytesWith n h m = putChunks h $ AS.arraysOf n m

435435

436436-- | Write a byte stream to a file handle. Accumulates the input in chunks of

437−-- up to 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize' before writing.

437+-- up to 'Streamly.Internal.Data.Array.Type.defaultChunkSize' before writing.

438438--

439439-- NOTE: This may perform better than the 'write' fold, you can try this if you

440440-- need some extra perf boost.

@@ -531,7 +531,7 @@ writerWith n =

531531 FL.refoldMany (FL.take n $ writeNUnsafe n) chunkWriter

532532

533533-- | Write a byte stream to a file handle. Accumulates the input in chunks of

534−-- up to 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize' before writing

534+-- up to 'Streamly.Internal.Data.Array.Type.defaultChunkSize' before writing

535535-- to the IO device.

536536--

537537-- >>> write = Handle.writeWith IO.defaultChunkSize

core/src/Streamly/Internal/Unicode/Array/Char.hs+2−2

@@ -24,9 +24,9 @@ where

2424

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

2626import Streamly.Data.Stream (Stream)

27−import Streamly.Internal.Data.Array.Unboxed (Array)

27+import Streamly.Internal.Data.Array (Array)

2828

29−import qualified Streamly.Data.Array.Unboxed as A

29+import qualified Streamly.Data.Array as A

3030import qualified Streamly.Internal.Unicode.Stream as S

3131

3232import Prelude hiding (String, lines, words, unlines, unwords)

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

@@ -103,8 +103,8 @@ import GHC.Exts (Addr#)

103103import GHC.IO.Encoding.Failure (isSurrogate)

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

105105import System.IO.Unsafe (unsafePerformIO)

106−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

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

106+import Streamly.Internal.Data.Array.Type (Array(..))

107+import Streamly.Internal.Data.Array.Mut.Type (MutableByteArray)

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

109109import Streamly.Internal.Data.Stream (Stream, fromStreamD, toStreamD)

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

@@ -116,7 +116,7 @@ import Streamly.Internal.System.IO (unsafeInlineIO)

116116

117117import qualified Streamly.Data.Fold as Fold

118118import qualified Streamly.Data.Unfold as Unfold

119−import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

119+import qualified Streamly.Internal.Data.Array.Type as Array

120120import qualified Streamly.Internal.Data.Parser as Parser (Parser)

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

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

core/src/Streamly/Unicode/Stream.hs+3−3

@@ -12,11 +12,11 @@

1212-- A 'Char' stream is the canonical representation to process Unicode strings.

1313-- It can be processed efficiently using regular stream processing operations.

1414-- A byte stream of Unicode text read from an IO device or from an

15−-- 'Streamly.Data.Array.Unboxed.Array' in memory can be decoded into a 'Char' stream

15+-- 'Streamly.Data.Array.Array' in memory can be decoded into a 'Char' stream

1616-- using the decoding routines in this module. A 'String' (@[Char]@) can be

1717-- converted into a 'Char' stream using 'Streamly.Prelude.fromList'. An @Array

1818-- Char@ can be 'Streamly.Prelude.unfold'ed into a stream using the array

19−-- 'Streamly.Data.Array.Unboxed.read' unfold.

19+-- 'Streamly.Data.Array.read' unfold.

2020--

2121-- = Storing Unicode Strings

2222--

@@ -30,7 +30,7 @@

3030-- than pinned arrays for short and short lived strings.

3131--

3232-- For longer or long lived streams you can 'Streamly.Prelude.fold' the 'Char'

33−-- stream as @Array Char@ using the array 'Streamly.Data.Array.Unboxed.write' fold.

33+-- stream as @Array Char@ using the array 'Streamly.Data.Array.write' fold.

3434-- The 'Array' type provides a more compact representation and pinned memory

3535-- reducing GC overhead. If space efficiency is a concern you can use

3636-- 'encodeUtf8'' on the 'Char' stream before writing it to an 'Array' providing

core/streamly-core.cabal+12−12

@@ -274,9 +274,9 @@ library

274274 -- Unboxed IORef

275275 , Streamly.Internal.Data.IORef.Unboxed

276276 -- May depend on streamly-core-stream

277− , Streamly.Internal.Data.Array.Unboxed.Mut.Type

278− , Streamly.Internal.Data.Array.Unboxed.Mut

279− , Streamly.Internal.Data.Array.Unboxed.Type

277+ , Streamly.Internal.Data.Array.Mut.Type

278+ , Streamly.Internal.Data.Array.Mut

279+ , Streamly.Internal.Data.Array.Type

280280 , Streamly.Internal.Data.Array.Generic.Mut.Type

281281

282282 -- streamly-core-streams

@@ -319,10 +319,10 @@ library

319319

320320 -- streamly-core-data-arrays

321321 , Streamly.Internal.Data.Array.Generic

322− , Streamly.Internal.Data.Array.Unboxed

323− , Streamly.Internal.Data.Array.Unboxed.Mut.Stream

324− , Streamly.Internal.Data.Array.Unboxed.Fold

325− , Streamly.Internal.Data.Array.Unboxed.Stream

322+ , Streamly.Internal.Data.Array

323+ , Streamly.Internal.Data.Array.Mut.Stream

324+ , Streamly.Internal.Data.Array.Fold

325+ , Streamly.Internal.Data.Array.Stream

326326

327327 -- streamly-serde

328328 , Streamly.Internal.Data.Binary.Decode

@@ -356,9 +356,9 @@ library

356356 -- Pre-release modules

357357 -- , Streamly.Data.Fold.Window

358358 -- , Streamly.Data.Pipe

359− -- , Streamly.Data.Array.Unboxed.Stream

360− -- , Streamly.Data.Array.Unboxed.Fold

361− -- , Streamly.Data.Array.Unboxed.Mut.Stream

359+ -- , Streamly.Data.Array.Stream

360+ -- , Streamly.Data.Array.Fold

361+ -- , Streamly.Data.Array.Mut.Stream

362362 -- , Streamly.Data.Ring

363363 -- , Streamly.Data.Ring.Unboxed

364364 -- , Streamly.Data.IORef.Unboxed

@@ -376,8 +376,8 @@ library

376376 -- NOTE: these must be added to streamly.cabal as well

377377 , Streamly.Console.Stdio

378378 , Streamly.Data.Array.Generic

379− , Streamly.Data.Array.Unboxed

380− , Streamly.Data.Array.Unboxed.Mut

379+ , Streamly.Data.Array

380+ , Streamly.Data.Array.Mut

381381 , Streamly.Data.Fold

382382 , Streamly.Data.Fold.Tee

383383 , Streamly.Data.Parser

docs/User/ProjectRelated/Changelog.md+2−2

@@ -6,7 +6,7 @@

66* Remove support for GHC 8.4.*

77* New modules for unboxed mutable & unboxed immutable arrays are added.

88* The unboxed arrays now require `Unbox` instead of `Storable` for the stored

9− type. The `Unbox` typeclass can be found in `Streamly.Data.Array.Unboxed`.

9+ type. The `Unbox` typeclass can be found in `Streamly.Data.Array`.

1010

1111* Following APIs have been renamed in Streamly.Network.Socket module:

1212 readWithBufferOf -> readWith

@@ -25,7 +25,7 @@

2525* In `Streamly.Data.Fold`:

2626 * `variance`, and `stdDev` have been deprecated. Please use the

2727 `streamly-statistics` package instead.

28−* `Streamly.Data.Array.Foreign` is deprecated. Use `Streamly.Data.Array.Unboxed`

28+* `Streamly.Data.Array.Foreign` is deprecated. Use `Streamly.Data.Array`

2929 instead.

3030* The type of `replicateM` in `Streamly.Data.Unfold` is changed.

3131

hie.yaml+8−8

@@ -16,8 +16,8 @@ cradle:

1616 config:

1717 cradle:

1818 cabal:

19− - path: "./benchmark/Streamly/Benchmark/Data/Array/Stream/Unboxed.hs"

20− component: "bench:Data.Array.Unboxed.Stream"

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

20+ component: "bench:Data.Array.Stream"

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

2222 component: "bench:Data.Fold"

2323 - path: "./benchmark/Streamly/Benchmark/Data/Parser.hs"

@@ -80,12 +80,12 @@ cradle:

8080 cabal:

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

8282 component: "test:Data.Array"

83− - path: "./test/Streamly/Test/Data/Array/Unboxed.hs"

84− component: "test:Data.Array.Unboxed"

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

86− component: "test:Data.Array.Unboxed.Mut"

87− - path: "./test/Streamly/Test/Data/Array/Stream/Unboxed.hs"

88− component: "test:Data.Array.Unboxed.Stream"

83+ - path: "./test/Streamly/Test/Data/Array.hs"

84+ component: "test:Data.Array"

85+ - path: "./test/Streamly/Test/Data/Array/Mut.hs"

86+ component: "test:Data.Array.Mut"

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

88+ component: "test:Data.Array.Stream"

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

9090 component: "test:Data.Fold"

9191 - path: "./test/Streamly/Test/Data/List.hs"

src/Streamly/Data/Array/Foreign.hs+6−6

@@ -47,12 +47,12 @@

4747--

4848-- This module is designed to be imported qualified:

4949--

50−-- > import qualified Streamly.Data.Array.Unboxed as Array

50+-- > import qualified Streamly.Data.Array as Array

5151--

52−-- For experimental APIs see "Streamly.Internal.Data.Array.Unboxed".

52+-- For experimental APIs see "Streamly.Internal.Data.Array".

5353

5454module Streamly.Data.Array.Foreign

55− {-# DEPRECATED "Please use \"Streamly.Data.Array.Unboxed\" instead." #-}

55+ {-# DEPRECATED "Please use \"Streamly.Data.Array\" instead." #-}

5656 (

5757 A.Array

5858

@@ -93,7 +93,7 @@ module Streamly.Data.Array.Foreign

9393 )

9494where

9595

96−import Streamly.Internal.Data.Array.Unboxed as A

96+import Streamly.Internal.Data.Array as A

9797

9898-- $setup

9999-- >>> :m

@@ -101,6 +101,6 @@ import Streamly.Internal.Data.Array.Unboxed as A

101101-- >>> :set -XFlexibleContexts

102102-- >>> :set -package streamly

103103-- >>> import Streamly.Internal.Data.Stream (Stream)

104−-- >>> import Streamly.Data.Array.Unboxed (Array)

104+-- >>> import Streamly.Data.Array (Array)

105105-- >>> import qualified Streamly.Internal.Data.Stream.IsStream as Stream

106−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

106+-- >>> import qualified Streamly.Data.Array as Array

src/Streamly/Internal/Data/Fold/Concurrent.hs+1−1

@@ -45,7 +45,7 @@ import Streamly.Internal.Data.Fold.Concurrent.Channel

4545--

4646-- >>> :m

4747-- >>> import Control.Concurrent (threadDelay)

48−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

48+-- >>> import qualified Streamly.Data.Array as Array

4949-- >>> import qualified Streamly.Data.Fold as Fold

5050-- >>> import qualified Streamly.Data.Parser as Parser

5151-- >>> import qualified Streamly.Data.Stream as Stream

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

@@ -135,7 +135,7 @@ import Streamly.Internal.Data.Stream.Concurrent.Channel

135135-- >>> :m

136136-- >>> {-# LANGUAGE FlexibleContexts #-}

137137-- >>> import Control.Concurrent (threadDelay)

138−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

138+-- >>> import qualified Streamly.Data.Array as Array

139139-- >>> import qualified Streamly.Data.Fold as Fold

140140-- >>> import qualified Streamly.Data.Parser as Parser

141141-- >>> import qualified Streamly.Data.Stream as Stream

src/Streamly/Internal/Data/Stream/IsStream/Common.hs+3−3

@@ -71,7 +71,7 @@ where

7171import Control.Concurrent (threadDelay)

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

7373import Streamly.Internal.Control.Concurrent (MonadAsync)

74−import Streamly.Internal.Data.Array.Unboxed.Type (Array)

74+import Streamly.Internal.Data.Array.Type (Array)

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

7676import Streamly.Internal.Data.Stream.IsStream.Combinators (maxYields)

7777import Streamly.Internal.Data.Stream.IsStream.Type

@@ -82,7 +82,7 @@ import Streamly.Internal.System.IO (defaultChunkSize)

8282import Streamly.Internal.Data.Unboxed (Unbox)

8383

8484import qualified Streamly.Data.Stream as Stream (fold, foldBreak)

85−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

85+import qualified Streamly.Internal.Data.Array.Type as A

8686import qualified Streamly.Internal.Data.Stream.Async as Async

8787import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream

8888import qualified Streamly.Internal.Data.Stream.Parallel as Par

@@ -109,7 +109,7 @@ import Prelude hiding (take, takeWhile, drop, reverse, concatMap, map, zipWith)

109109-- >>> import System.IO.Unsafe (unsafePerformIO)

110110-- >>> import qualified Streamly.Prelude as Stream

111111-- >>> import Streamly.Internal.Data.Stream.IsStream as Stream

112−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

112+-- >>> import qualified Streamly.Data.Array as Array

113113-- >>> import qualified Streamly.Data.Fold as Fold

114114-- >>> import qualified Streamly.Internal.Data.Fold as Fold

115115-- >>> import qualified Streamly.Data.Unfold as Unfold

src/Streamly/Internal/Data/Stream/IsStream/Eliminate.hs+1−1

@@ -168,7 +168,7 @@ import Streamly.Internal.Data.Stream.IsStream.Type

168168import Streamly.Internal.Data.Stream.Serial (SerialT)

169169import Streamly.Internal.Data.Unboxed (Unbox)

170170

171−import qualified Streamly.Data.Array.Unboxed as A

171+import qualified Streamly.Data.Array as A

172172import qualified Streamly.Data.Stream as Stream

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

174174import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream

src/Streamly/Internal/Data/Stream/IsStream/Expand.hs+1−1

@@ -202,7 +202,7 @@ import Prelude hiding (concat, concatMap, zipWith)

202202-- >>> import qualified Streamly.Internal.Data.Fold as Fold

203203-- >>> import qualified Streamly.Internal.Data.Unfold as Unfold

204204-- >>> import qualified Streamly.Internal.Data.Parser as Parser

205−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

205+-- >>> import qualified Streamly.Data.Array as Array

206206-- >>> :{

207207-- delay n = do

208208-- threadDelay (n * 1000000) -- sleep for n seconds

src/Streamly/Internal/Data/Stream/IsStream/Reduce.hs+3−3

@@ -164,7 +164,7 @@ import Streamly.Internal.Data.Fold.Type (Fold (..))

164164import Streamly.Internal.Data.IsMap (IsMap(..))

165165import Streamly.Internal.Data.Refold.Type (Refold (..))

166166import Streamly.Internal.Data.Parser (Parser (..))

167−import Streamly.Internal.Data.Array.Unboxed.Type (Array)

167+import Streamly.Internal.Data.Array.Type (Array)

168168import Streamly.Internal.Data.Stream.IsStream.Common

169169 ( fold

170170 , interjectSuffix

@@ -183,7 +183,7 @@ import Streamly.Internal.Data.Unboxed (Unbox)

183183

184184import qualified Data.Heap as H

185185import qualified Streamly.Data.Unfold as Unfold

186−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

186+import qualified Streamly.Internal.Data.Array.Type as A

187187 (arraysOf, read)

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

189189 (Fold, Step(..), takeEndBy_, takeEndBy, catMaybes, take)

@@ -221,7 +221,7 @@ import Prelude hiding (concatMap, map)

221221-- >>> import qualified Streamly.Internal.Data.Fold as Fold

222222-- >>> import qualified Streamly.Internal.Data.Unfold as Unfold

223223-- >>> import qualified Streamly.Internal.Data.Parser as Parser

224−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

224+-- >>> import qualified Streamly.Data.Array as Array

225225

226226------------------------------------------------------------------------------

227227-- Trimming

src/Streamly/Internal/Data/Stream/IsStream/Top.hs+1−1

@@ -71,7 +71,7 @@ import qualified Data.List as List

7171import qualified Data.Map.Strict as Map

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

7373 (fromStream, length, read)

74−import qualified Streamly.Data.Array.Unboxed.Mut as MA

74+import qualified Streamly.Data.Array.Mut as MA

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

7676 (one, last, toStream, toStreamRev)

7777import qualified Streamly.Internal.Data.Parser as Parser

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

@@ -85,7 +85,7 @@ import Streamly.Internal.Data.Stream.Concurrent

8585--

8686-- >>> :m

8787-- >>> import Control.Concurrent (threadDelay)

88−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

88+-- >>> import qualified Streamly.Data.Array as Array

8989-- >>> import qualified Streamly.Data.Fold as Fold

9090-- >>> import qualified Streamly.Data.Parser as Parser

9191-- >>> import qualified Streamly.Data.Stream as Stream

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

@@ -47,7 +47,7 @@ where

4747

4848import Data.List.NonEmpty (NonEmpty)

4949import Data.Word (Word8)

50−import Streamly.Internal.Data.Array.Unboxed (Array)

50+import Streamly.Internal.Data.Array (Array)

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

5252

5353#if defined(CABAL_OS_DARWIN)

src/Streamly/Internal/FileSystem/Event/Darwin.hs+2−2

@@ -176,7 +176,7 @@ import GHC.IO.Handle.FD (fdToHandle)

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

177177import Streamly.Internal.Data.Cont (contListMap)

178178import Streamly.Internal.Data.Parser (Parser)

179−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

179+import Streamly.Internal.Data.Array.Type (Array(..))

180180import System.IO (Handle, hClose)

181181

182182import qualified Data.List.NonEmpty as NonEmpty

@@ -184,7 +184,7 @@ import qualified Streamly.Internal.Data.Parser as PR

184184import qualified Streamly.Internal.Data.Stream.IsStream as S

185185import qualified Streamly.Internal.Unicode.Stream as U

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

187−import qualified Streamly.Internal.Data.Array.Unboxed as A

187+import qualified Streamly.Internal.Data.Array as A

188188

189189-------------------------------------------------------------------------------

190190-- Subscription to events

src/Streamly/Internal/FileSystem/Event/Linux.hs+2−2

@@ -173,14 +173,14 @@ import GHC.IO.FD (fdFD, mkFD)

173173import GHC.IO.Handle.FD (mkHandleFromFD)

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

175175import Streamly.Internal.Data.Parser (Parser)

176−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..), byteLength)

176+import Streamly.Internal.Data.Array.Type (Array(..), byteLength)

177177import System.Directory (doesDirectoryExist)

178178import System.IO (Handle, hClose, IOMode(ReadMode))

179179import GHC.IO.Handle.FD (handleToFd)

180180

181181import qualified Data.IntMap.Lazy as Map

182182import qualified Data.List.NonEmpty as NonEmpty

183−import qualified Streamly.Internal.Data.Array.Unboxed as A

183+import qualified Streamly.Internal.Data.Array as A

184184import qualified Streamly.Data.Fold as FL

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

186186 (takeEQ, fromEffect, fromFold)

src/Streamly/Internal/FileSystem/Event/Windows.hs+2−2

@@ -123,9 +123,9 @@ import qualified Streamly.Data.Fold as Fold

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

124124import qualified Streamly.Internal.Unicode.Stream as U

125125import qualified Streamly.Internal.Unicode.Utf8 as UTF8

126−import qualified Streamly.Internal.Data.Array.Unboxed as A

126+import qualified Streamly.Internal.Data.Array as A

127127import qualified Streamly.Internal.Data.Stream.Concurrent as Concur

128−import Streamly.Internal.Data.Array.Unboxed (Array)

128+import Streamly.Internal.Data.Array (Array)

129129

130130-- | Watch configuration, used to specify the events of interest and the

131131-- behavior of the watch.

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

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

128128import qualified GHC.IO.FD as FD

129129import qualified GHC.IO.Device as RawIO

130130

131−import Streamly.Internal.Data.Array.Unboxed.Type

131+import Streamly.Internal.Data.Array.Type

132132 (Array(..), byteLength, unsafeFreeze, asPtrUnsafe)

133133import Streamly.Internal.System.IO (defaultChunkSize)

134134import Streamly.Internal.Data.Stream.Type (Stream)

@@ -143,11 +143,11 @@ import qualified Streamly.Internal.System.IOVec.Type as RawIO

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

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

145145

146−import qualified Streamly.Data.Array.Unboxed as A

146+import qualified Streamly.Data.Array as A

147147import qualified Streamly.Data.Fold as FL

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

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

149149 (Array(..), newPinnedBytes, asPtrUnsafe)

150−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as AS

150+import qualified Streamly.Internal.Data.Array.Stream as AS

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

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

153153 (Stream(..), Step(..))

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

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

106106

107107import Streamly.Internal.Control.Concurrent (MonadAsync)

108108import Streamly.Internal.Control.ForkLifted (fork)

109−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..), writeNUnsafe)

109+import Streamly.Internal.Data.Array.Type (Array(..), writeNUnsafe)

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

111111import Streamly.Data.Stream (Stream)

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

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

117117import qualified Control.Monad.Catch as MC

118118import qualified Network.Socket as Net

119119

120−import qualified Streamly.Data.Array.Unboxed as A

120+import qualified Streamly.Data.Array as A

121121import qualified Streamly.Data.Fold as FL

122122import qualified Streamly.Data.Unfold as UF

123123import qualified Streamly.Internal.Data.Unfold as UF (bracketIO, first)

124−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as AS

124+import qualified Streamly.Internal.Data.Array.Stream as AS

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

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

127127import qualified Streamly.Internal.Data.Stream.Exception.Lifted as S

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

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

8686

8787import qualified Network.Socket as Net

8888

89−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

90−import Streamly.Internal.Data.Array.Unboxed.Stream (lpackArraysChunksOf)

89+import Streamly.Internal.Data.Array.Type (Array(..))

90+import Streamly.Internal.Data.Array.Stream (lpackArraysChunksOf)

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

9292import Streamly.Internal.Data.Stream.Type (Stream)

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

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

9595import Streamly.Internal.System.IO (defaultChunkSize)

9696

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

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

9898import qualified Streamly.Data.Fold as FL

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

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

100100 (unsafeFreeze, asPtrUnsafe, byteLength, writeNUnsafe)

101−import qualified Streamly.Internal.Data.Array.Unboxed.Mut as MArray

101+import qualified Streamly.Internal.Data.Array.Mut as MArray

102102 (Array(..), newPinnedBytes, asPtrUnsafe)

103−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as AS

103+import qualified Streamly.Internal.Data.Array.Stream as AS

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

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

106106 (Stream(..), Step(..))

@@ -391,9 +391,9 @@ readChunksWithBufferOf = chunkReaderWith

391391

392392-- | Unfolds a socket into a stream of 'Word8' arrays. Requests to the socket

393393-- are performed using a buffer of size

394−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'. The

394+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'. The

395395-- size of arrays in the resulting stream are therefore less than or equal to

396−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'.

396+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'.

397397--

398398{-# INLINE chunkReader #-}

399399chunkReader :: MonadIO m => Unfold m Socket (Array Word8)

@@ -435,7 +435,7 @@ readWithBufferOf = readerWith

435435

436436-- | Unfolds a 'Socket' into a byte stream. IO requests to the socket are

437437-- performed in sizes of

438−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'.

438+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'.

439439--

440440{-# INLINE reader #-}

441441reader :: MonadIO m => Unfold m Socket Word8

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

@@ -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.Unboxed.Mut.Type (length)

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

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

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

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

3636

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

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

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

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

3939import qualified Streamly.Internal.Data.Stream.StreamD 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.Unboxed.Mut.Type.groupIOVecsOf: the size of "

72+ error $ "Streamly.Internal.Data.Array.Mut.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.Unboxed.Mut.Type.groupIOVecsOf: the number of "

76+ error $ "Streamly.Internal.Data.Array.Mut.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

src/Streamly/Internal/Unicode/Utf8.hs+2−2

@@ -29,12 +29,12 @@ where

2929

3030import Control.DeepSeq (NFData)

3131import Data.Word (Word8)

32−import Streamly.Data.Array.Unboxed (Array)

32+import Streamly.Data.Array (Array)

3333import System.IO.Unsafe (unsafePerformIO)

3434

3535import qualified Streamly.Data.Fold as Fold

3636import qualified Streamly.Data.Stream as Stream

37−import qualified Streamly.Internal.Data.Array.Unboxed as Array

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

3838 ( fromStreamN

3939 , read

4040 )

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

@@ -32,7 +32,7 @@

3232--

3333-- > import qualified Streamly.Array as A

3434--

35−-- For experimental APIs see "Streamly.Internal.Data.Array.Unboxed".

35+-- For experimental APIs see "Streamly.Internal.Data.Array".

3636

3737module Streamly.Memory.Array

3838 {-# DEPRECATED "Use Streamly.Data.Array.Foreign instead" #-}

@@ -71,4 +71,4 @@ module Streamly.Memory.Array

7171 )

7272where

7373

74−import Streamly.Internal.Data.Array.Unboxed as A

74+import Streamly.Internal.Data.Array as A

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

@@ -61,7 +61,7 @@

6161-- = Programmer Notes

6262--

6363-- Read IO requests to connected stream sockets are performed in chunks of

64−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'. Unless

64+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'. Unless

6565-- specified otherwise in the API, writes are collected into chunks of

6666-- 'Streamly.Internal.System.IO.defaultChunkSize' before they are written to

6767-- the socket.

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

137137import Data.Word (Word8)

138138import Network.Socket (Socket, SockAddr)

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

140−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

140+import Streamly.Internal.Data.Array.Type (Array(..))

141141import Streamly.Internal.Data.Unboxed (Unbox)

142142

143143import Streamly.Internal.Network.Socket hiding (accept, read, readChunks)

streamly.cabal+8−8

@@ -56,10 +56,10 @@ extra-source-files:

5656 benchmark/Streamly/Benchmark/Data/Array/CommonImports.hs

5757 benchmark/Streamly/Benchmark/Data/Array/Generic.hs

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

59− benchmark/Streamly/Benchmark/Data/Array/Unboxed.hs

59+ benchmark/Streamly/Benchmark/Data/Array.hs

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

61− benchmark/Streamly/Benchmark/Data/Array/Unboxed/Mut.hs

62− benchmark/Streamly/Benchmark/Data/Array/Stream/Unboxed.hs

61+ benchmark/Streamly/Benchmark/Data/Array/Mut.hs

62+ benchmark/Streamly/Benchmark/Data/Array/Stream.hs

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

6464 benchmark/Streamly/Benchmark/Data/Parser/*.hs

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

@@ -93,10 +93,10 @@ extra-source-files:

9393 test/Streamly/Test/Data/Array/CommonImports.hs

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

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

96− test/Streamly/Test/Data/Array/Unboxed.hs

97− test/Streamly/Test/Data/Array/Unboxed/Mut.hs

96+ test/Streamly/Test/Data/Array.hs

97+ test/Streamly/Test/Data/Array/Mut.hs

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

99− test/Streamly/Test/Data/Array/Stream/Unboxed.hs

99+ test/Streamly/Test/Data/Array/Stream.hs

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

101101 test/Streamly/Test/Data/Stream/Concurrent.hs

102102 test/Streamly/Test/FileSystem/Event.hs

@@ -436,8 +436,8 @@ library

436436 -- streamly-core exposed modules

437437 , Streamly.Console.Stdio

438438 , Streamly.Data.Array.Generic

439− , Streamly.Data.Array.Unboxed

440− , Streamly.Data.Array.Unboxed.Mut

439+ , Streamly.Data.Array

440+ , Streamly.Data.Array.Mut

441441 , Streamly.Data.Fold

442442 , Streamly.Data.Fold.Tee

443443 , Streamly.Data.Parser

test/Streamly/Test/Data/Array/Unboxed.hs → test/Streamly/Test/Data/Array.hsrenamed+6−6

@@ -1,12 +1,12 @@

11-- |

2−-- Module : Streamly.Test.Data.Array.Unboxed

2+-- Module : Streamly.Test.Data.Array

44-- License : BSD-3-Clause

55-- Maintainer : streamly@composewell.com

66-- Stability : experimental

77-- Portability : GHC

9−module Streamly.Test.Data.Array.Unboxed (main) where

9+module Streamly.Test.Data.Array (main) where

1010

1111import Data.Char (isLower)

1212import Data.List (sort)

@@ -19,9 +19,9 @@ import Streamly.Internal.Data.Unboxed (Unbox, sizeOf)

1919import Streamly.Test.Common (listEquals)

2020

2121import qualified Streamly.Data.Fold as Fold

22−import qualified Streamly.Internal.Data.Array.Unboxed as A

23−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

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

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

23+import qualified Streamly.Internal.Data.Array.Type as A

24+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

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

2626

2727import Test.Hspec as H

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

3333type Array = A.Array

3434

3535moduleName :: String

36−moduleName = "Data.Array.Unboxed"

36+moduleName = "Data.Array"

3737

3838#include "Streamly/Test/Data/Array/Common.hs"

3939

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

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

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

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

33import Test.QuickCheck (listOf)

@@ -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.Unboxed.Mut as MArray

26+import qualified Streamly.Internal.Data.Array.Mut 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.Unboxed.Mut"

34+moduleName = "Data.Array.Mut"

3535

3636testAppend :: Property

3737testAppend =

test/Streamly/Test/Data/Array/Stream/Unboxed.hs → test/Streamly/Test/Data/Array/Stream.hsrenamed+3−3

@@ -9,8 +9,8 @@ import Test.Hspec.QuickCheck

99import Test.QuickCheck (forAll, Property, vectorOf, Gen, Arbitrary (arbitrary))

1010import Test.QuickCheck.Monadic (monadicIO, run)

1111

12−import qualified Streamly.Internal.Data.Array.Unboxed as Array

13−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as ArrayStream

12+import qualified Streamly.Internal.Data.Array as Array

13+import qualified Streamly.Internal.Data.Array.Stream as ArrayStream

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

1515import qualified Streamly.Internal.Data.Parser as Parser

1616import qualified Streamly.Internal.Data.Stream.IsStream as Stream

@@ -71,7 +71,7 @@ splitOnSuffix sep inp out = do

7171-------------------------------------------------------------------------------

7272

7373moduleName :: String

74−moduleName = "Data.Array.Unboxed.Stream"

74+moduleName = "Data.Array.Stream"

7575

7676-- Instead of hard coding 10000 here we can have maxStreamLength for operations

7777-- that use stream of arrays.

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.Unboxed.Mut as MArray

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

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

2828import qualified Streamly.Internal.Data.Fold.Extra as Fold

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

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

@@ -15,7 +15,7 @@ import Prelude hiding (sequence)

1515

1616import qualified Data.List as List

1717import qualified Prelude

18−import qualified Streamly.Internal.Data.Array.Unboxed as A

18+import qualified Streamly.Internal.Data.Array as A

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

2020import qualified Streamly.Internal.Data.Parser as P

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

test/Streamly/Test/Data/Parser/ParserD.hs+1−1

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

1313

1414import qualified Data.List as List

1515import qualified Prelude

16−import qualified Streamly.Internal.Data.Array.Unboxed as A

16+import qualified Streamly.Internal.Data.Array as A

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

1818import qualified Streamly.Internal.Data.Parser.ParserD as P

1919import qualified Streamly.Internal.Data.Producer.Source as Source

test/Streamly/Test/Data/Ring/Unboxed.hs+1−1

@@ -10,7 +10,7 @@ module Streamly.Test.Data.Ring.Unboxed (main) where

1010

1111import Control.Monad (void)

1212

13−import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

13+import qualified Streamly.Internal.Data.Array.Type as Array

1414import qualified Streamly.Internal.Data.Ring.Unboxed as Ring

1515

1616import Prelude as P

test/Streamly/Test/FileSystem/Event/Common.hs+2−2

@@ -48,7 +48,7 @@ import Data.Function ((&))

4848import Data.Functor.Identity (runIdentity)

4949import Data.List.NonEmpty (NonEmpty)

5050import Data.Word (Word8)

51−import Streamly.Data.Array.Unboxed (Array)

51+import Streamly.Data.Array (Array)

5252import System.Directory

5353 ( createDirectory

5454 , createDirectoryIfMissing

@@ -65,7 +65,7 @@ import System.IO

6565import System.IO.Temp (withSystemTempDirectory)

6666

6767import qualified Data.List.NonEmpty as NonEmpty

68−import qualified Streamly.Internal.Data.Array.Unboxed as Array

68+import qualified Streamly.Internal.Data.Array as Array

6969import qualified Streamly.Internal.Data.Stream.IsStream as Stream

7070import qualified Streamly.Unicode.Stream as Unicode

7171

test/Streamly/Test/FileSystem/Handle.hs+1−1

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

2929import qualified Streamly.Data.Fold as Fold

3030import qualified Streamly.Internal.FileSystem.Handle as Handle

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

32−import qualified Streamly.Internal.Data.Array.Unboxed as Array

32+import qualified Streamly.Internal.Data.Array as Array

3333import qualified Streamly.Internal.Unicode.Stream as Unicode

3434

3535import Test.Hspec as H

test/Streamly/Test/Prelude/Serial.hs+1−1

@@ -47,7 +47,7 @@ import qualified Streamly.Prelude as S

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

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

4949import qualified Streamly.Internal.Data.Stream.IsStream as IS

50−import qualified Streamly.Data.Array.Unboxed as A

50+import qualified Streamly.Data.Array as A

5151

5252import Streamly.Internal.Data.Time.Units

5353 (AbsTime, NanoSecond64(..), toRelTime64, diffAbsTime64)

test/Streamly/Test/Unicode/Stream.hs+2−2

@@ -18,8 +18,8 @@ import Test.QuickCheck

1818 )

1919import Test.QuickCheck.Monadic (run, monadicIO, assert)

2020

21−import qualified Streamly.Data.Array.Unboxed as A

22−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as AS

21+import qualified Streamly.Data.Array as A

22+import qualified Streamly.Internal.Data.Array.Stream as AS

2323import qualified Streamly.Prelude as S

2424import qualified Streamly.Unicode.Stream as SS

2525import qualified Streamly.Internal.Unicode.Stream as IUS

test/streamly-tests.cabal+8−8

@@ -233,17 +233,17 @@ test-suite Data.Array.Generic

233233 if flag(use-streamly-core)

234234 buildable: False

235235

236−test-suite Data.Array.Unboxed

236+test-suite Data.Array

237237 import: test-options

238238 type: exitcode-stdio-1.0

239− main-is: Streamly/Test/Data/Array/Unboxed.hs

240− ghc-options: -main-is Streamly.Test.Data.Array.Unboxed.main

239+ main-is: Streamly/Test/Data/Array.hs

240+ ghc-options: -main-is Streamly.Test.Data.Array.main

241241

242−test-suite Data.Array.Unboxed.Mut

242+test-suite Data.Array.Mut

243243 import: test-options

244244 type: exitcode-stdio-1.0

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

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

245+ main-is: Streamly/Test/Data/Array/Mut.hs

246+ ghc-options: -main-is Streamly.Test.Data.Array.Mut.main

247247

248248test-suite Data.Ring.Unboxed

249249 import: test-options

@@ -253,10 +253,10 @@ test-suite Data.Ring.Unboxed

253253 if flag(use-streamly-core)

254254 buildable: False

255255

256−test-suite Data.Array.Unboxed.Stream

256+test-suite Data.Array.Stream

257257 import: test-options

258258 type: exitcode-stdio-1.0

259− main-is: Streamly/Test/Data/Array/Stream/Unboxed.hs

259+ main-is: Streamly/Test/Data/Array/Stream.hs

260260 if flag(use-streamly-core)

261261 buildable: False

262262