5c018c7 · streamly · git.iko.soy

git.iko.soy/streamly

Rename Data.Array.Storable.Foreign to Data.Array.Foreign.

Closes #854.

commit5c018c7e45396e0b0419b391e898471a51a78cfa authorPranay Sashank <pranaysashank@composewell.com> dateMon 1 Feb 2021, 12:03 (6 years ago) parent08dd169

62 files changed+161−162

compare with master

unifiedsplit

.hlint.ignore+1−1

@@ -30,7 +30,7 @@ test/Streamly/Test/Common/Array.hs

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

3131test/Streamly/Test/Data/Array/Prim.hs

3232test/Streamly/Test/Data/Array/Prim/Pinned.hs

33−test/Streamly/Test/Data/Array/Storable/Foreign.hs

33+test/Streamly/Test/Data/Array/Foreign.hs

3434test/Streamly/Test/Data/Parser.hs

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

3636test/Streamly/Test/Data/SmallArray.hs

Changelog.md+1−1

@@ -52,7 +52,7 @@

5252### Deprecations

5353

5454* Deprecate `Streamly.Memory.Array` in favor of

55− `Streamly.Data.Array.Storable.Foreign`

55+ `Streamly.Data.Array.Foreign`

5656* Deprecate `Streamly.Data.Unicode.Stream` in favor of

5757 `Streamly.Unicode.Stream`

5858* The `Streamly` module is now deprecated, its functionality is subsumed

README.md+3−3

@@ -362,7 +362,7 @@ documentation.

362362

363363## Arrays

364364

365−The `Streamly.Data.Array.Storable.Foreign` module provides immutable arrays. Arrays are the

365+The `Streamly.Data.Array.Foreign` module provides immutable arrays. Arrays are the

366366computing duals of streams. Streams are good at sequential access and immutable

367367transformations of in-transit data whereas arrays are good at random access and

368368in-place transformations of buffered data. Unlike streams which are potentially

@@ -373,7 +373,7 @@ computing system. The design of streamly as a general purpose computing

373373framework is centered around these two fundamental aspects of computing and

374374storage.

375375

376−`Streamly.Data.Array.Storable.Foreign` uses pinned memory outside GC and therefore avoid any

376+`Streamly.Data.Array.Foreign` uses pinned memory outside GC and therefore avoid any

377377GC overhead for the storage in arrays. Streamly allows efficient

378378transformations over arrays using streams. It uses arrays to transfer data to

379379and from the operating system and to store data in memory.

@@ -416,7 +416,7 @@ module Main where

416416

417417import qualified Streamly.Prelude as S

418418import qualified Streamly.Data.Fold as FL

419−import qualified Streamly.Data.Array.Storable.Foreign as A

419+import qualified Streamly.Data.Array.Foreign as A

420420import qualified Streamly.FileSystem.Handle as FH

421421import qualified System.IO as FH

422422

benchmark/NanoBenchmarks.hs+1−1

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

99import Streamly.Prelude (SerialT)

1010import Streamly.Internal.Data.SVar (MonadAsync)

1111

12−import qualified Streamly.Data.Array.Storable.Foreign as A

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

1313import qualified Streamly.FileSystem.Handle as FH

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

1515import qualified Streamly.Data.Fold as FL

benchmark/Streamly/Benchmark/Data/Array.hs+2−2

@@ -12,8 +12,8 @@ import Control.DeepSeq (NFData(..))

1212import System.Random (randomRIO)

1313

1414import qualified Streamly.Benchmark.Data.ArrayOps as Ops

15−import qualified Streamly.Data.Array.Storable.Foreign as A

16−import qualified Streamly.Internal.Data.Array.Storable.Foreign as IA

15+import qualified Streamly.Data.Array.Foreign as A

16+import qualified Streamly.Internal.Data.Array.Foreign as IA

1717import qualified Streamly.Prelude as S

1818

1919import Gauge

benchmark/Streamly/Benchmark/Data/ArrayOps.hs+2−2

@@ -35,8 +35,8 @@ import qualified Streamly.Internal.Data.SmallArray as A

3535type Stream = A.SmallArray

3636#elif defined(MEMORY_ARRAY)

3737import qualified GHC.Exts as GHC

38−import qualified Streamly.Data.Array.Storable.Foreign as A

39−import qualified Streamly.Internal.Data.Array.Storable.Foreign as A

38+import qualified Streamly.Data.Array.Foreign as A

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

4040type Stream = A.Array

4141#elif defined(DATA_ARRAY_PRIM)

4242import qualified Streamly.Internal.Data.Array.Prim as A

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

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

3333import System.IO (Handle)

3434

3535import qualified Streamly.FileSystem.Handle as FH

36−import qualified Streamly.Internal.Data.Array.Storable.Foreign as A

37−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Types as AT

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

37+import qualified Streamly.Internal.Data.Array.Foreign.Types as AT

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

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

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

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

5151#ifdef INSPECTION

5252import Streamly.Internal.Data.Stream.StreamD.Type (Step(..), GroupState)

5353

54−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types as MA

54+import qualified Streamly.Internal.Data.Array.Foreign.Mut.Types as MA

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

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

5757

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

@@ -24,13 +24,13 @@ where

2424

2525import System.IO (Handle)

2626import Prelude hiding (last, length)

27−import Streamly.Internal.Data.Array.Storable.Foreign.Types (defaultChunkSize)

27+import Streamly.Internal.Data.Array.Foreign.Types (defaultChunkSize)

2828

2929import qualified Streamly.FileSystem.Handle as FH

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

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

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

33−import qualified Streamly.Data.Array.Storable.Foreign as A

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

3434import qualified Streamly.Prelude as S

3535

3636import Gauge hiding (env)

@@ -43,8 +43,8 @@ import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

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

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

4545import qualified Streamly.Internal.Data.Array.Stream.Mut.Foreign as MAS

46−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Types as AT

47−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types as MA

46+import qualified Streamly.Internal.Data.Array.Foreign.Types as AT

47+import qualified Streamly.Internal.Data.Array.Foreign.Mut.Types as MA

4848

4949import Test.Inspection

5050#endif

benchmark/Streamly/Benchmark/Prelude/Serial/Split.hs+2−3

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

2525import System.IO (Handle)

2626

2727import qualified Streamly.FileSystem.Handle as FH

28−import qualified Streamly.Internal.Data.Array.Storable.Foreign as A

28+import qualified Streamly.Internal.Data.Array.Foreign as A

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

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

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

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

4141#ifdef INSPECTION

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

4343

44−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types as MA

44+import qualified Streamly.Internal.Data.Array.Foreign.Mut.Types as MA

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

4646

4747import Test.Inspection

@@ -229,4 +229,3 @@ benchmarks moduleName env =

229229 , o_1_space_reduce_toChunks_split env

230230 ]

231231 ]

232−

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

@@ -29,7 +29,7 @@ import qualified Streamly.Internal.Unicode.Stream as IUS

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

3030import qualified Streamly.Internal.Unicode.Array.Char as IUA

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

32−import qualified Streamly.Data.Array.Storable.Foreign as A

32+import qualified Streamly.Data.Array.Foreign as A

3333import qualified Streamly.Prelude as S

3434

3535import Gauge hiding (env)

@@ -40,8 +40,8 @@ import Streamly.Benchmark.Common.Handle

4040import Foreign.Storable (Storable)

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

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

43−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Types as AT

44−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types as MA

43+import qualified Streamly.Internal.Data.Array.Foreign.Types as AT

44+import qualified Streamly.Internal.Data.Array.Foreign.Mut.Types as MA

4545

4646import Test.Inspection

4747#endif

benchmark/streamly-benchmarks.cabal+3−3

@@ -162,7 +162,7 @@ common bench-options-threaded

162162benchmark Prelude.Serial

163163 import: bench-options

164164 type: exitcode-stdio-1.0

165− hs-source-dirs: Streamly/Benchmark/Prelude

165+ hs-source-dirs: Streamly/Benchmark/Prelude

166166 main-is: Serial.hs

167167 other-modules:

168168 Serial.Generation

@@ -432,7 +432,7 @@ benchmark Data.Array.Prim.Pinned

432432 other-modules: Streamly.Benchmark.Data.ArrayOps

433433 cpp-options: -DDATA_ARRAY_PRIM_PINNED

434434

435−benchmark Data.Array.Storable.Foreign

435+benchmark Data.Array.Foreign

436436 import: bench-options

437437 type: exitcode-stdio-1.0

438438 hs-source-dirs: .

@@ -461,7 +461,7 @@ benchmark Unicode.Stream

461461 type: exitcode-stdio-1.0

462462 hs-source-dirs: Streamly/Benchmark/Unicode

463463 main-is: Stream.hs

464−

464+

465465-------------------------------------------------------------------------------

466466-- benchmark comparison and presentation

467467-------------------------------------------------------------------------------

bin/targets.sh+1−1

@@ -34,7 +34,7 @@ prelude_other_grp="\

3434

3535array_grp="\

3636 Data.Array \

37− Data.Array.Storable.Foreign \

37+ Data.Array.Foreign \

3838 Data.Array.Prim \

3939 Data.SmallArray \

4040 Data.Array.Prim.Pinned"

design/module-organization.md+3−3

@@ -143,9 +143,9 @@ conflict with any other module on Hackage.

143143We have the following module hierarchy under Streamly:

144144

145145* Data: This is a generic bucket for basic data structures a la the `base`

146− package's `Data` hierarchy.

146+ package's `Data` hierarchy.

147147 * Streamly.Data.Array

148−

148+

149149 Streams can be classified under `Data` or `Control`. Though they are

150150 mostly used for processing, they can also be used to store data in

151151 memory.

@@ -216,7 +216,7 @@ Similarly, the immutable Array modules would go in:

216216* `Streamly.Data.Array` -- unpinned, native memory arrays

217217* `Streamly.Data.Array.Storable` -- unpinned, unboxed, native memory arrays

218218* `Streamly.Data.Array.Storable.Pinned` -- pinned, unboxed, native memory arrays

219−* `Streamly.Data.Array.Storable.Foreign` -- pinned, unboxed, foreign capable arrays

219+* `Streamly.Data.Array.Foreign` -- pinned, unboxed, foreign capable arrays

220220

221221Unboxed arrays, based on `Prim` type class:

222222

design/optimization-guidelines.md+1−1

@@ -317,7 +317,7 @@ consume as arguments. This means `StreamD` combinators should not be marked

317317as `INLINE` or `INLINE_EARLY`, instead they should all be marked as

318318`INLINE_NORMAL` because higher order functions like `concatMap`/`map`/`mapM`

319319etc are marked as `INLINE_NORMAL`. `StreamD` functions in other modules like

320−`Streamly.Data.Array.Storable.Foreign` should also follow the same rules.

320+`Streamly.Data.Array.Foreign` should also follow the same rules.

321321

322322## Stream Fusion

323323

hie.yaml+2−2

@@ -48,8 +48,8 @@ cradle:

4848 cabal:

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

5050 component: "test:Data.Array"

51− - path: "./test/Streamly/Test/Data/Array/Storable/Foreign.hs"

52− component: "Data.Array.Storable.Foreign"

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

52+ component: "Data.Array.Foreign"

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

5454 component: "test:Data.Fold"

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

src/Streamly.hs+2−2

@@ -244,7 +244,7 @@ import qualified Streamly.Internal.Data.Stream.Async as Async

244244-- > S.length $ S.splitOnSuffix FL.drain 10 $ FH.read fh

245245--

246246-- The following example folds the lines to arrays of 'Word8' using the

247−-- 'Streamly.Data.Array.Storable.Foreign.writeF' fold and then wraps the lines in square

247+-- 'Streamly.Data.Array.Foreign.writeF' fold and then wraps the lines in square

248248-- brackets before writing them to standard output using

249249-- 'Streamly.FileSystem.Handle.write':

250250--

@@ -295,7 +295,7 @@ import qualified Streamly.Internal.Data.Stream.Async as Async

295295

296296-- $arrays

297297--

298−-- Streamly arrays (See "Streamly.Data.Array.Storable.Foreign") complement streams to provide an

298+-- Streamly arrays (See "Streamly.Data.Array.Foreign") complement streams to provide an

299299-- efficient computing paradigm. Streams are suitable for immutable

300300-- transformations of /potentially infinite/ data using /sequential access/ and

301301-- pipelined transformations whereas arrays are suitable for in-place

src/Streamly/Data/Array/Storable/Foreign.hs → src/Streamly/Data/Array/Foreign.hsrenamed+4−4

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

11#include "inline.hs"

33-- |

4−-- Module : Streamly.Data.Array.Storable.Foreign

4+-- Module : Streamly.Data.Array.Foreign

66--

77-- License : BSD3

@@ -32,9 +32,9 @@

3232--

3333-- > import qualified Streamly.Array as A

3434--

35−-- For experimental APIs see "Streamly.Internal.Data.Array.Storable.Foreign".

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

3636

37−module Streamly.Data.Array.Storable.Foreign

37+module Streamly.Data.Array.Foreign

3838 (

3939 A.Array

4040

@@ -70,4 +70,4 @@ module Streamly.Data.Array.Storable.Foreign

7070 )

7171where

7272

73−import Streamly.Internal.Data.Array.Storable.Foreign as A

73+import Streamly.Internal.Data.Array.Foreign as A

src/Streamly/Data/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.Storable.Foreign.Array' in memory can be decoded into a 'Char' stream

15+-- 'Streamly.Data.Array.Foreign.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.Storable.Foreign.read' unfold.

19+-- 'Streamly.Data.Array.Foreign.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.Storable.Foreign.write' fold.

33+-- stream as @Array Char@ using the array 'Streamly.Data.Array.Foreign.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

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

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

2525--

2626-- Reading and writing APIs are divided into two categories, sequential

2727-- streaming APIs and random or seekable access APIs. File IO APIs are quite

28−-- similar to "Streamly.Data.Array.Storable.Foreign" read write APIs. In that regard, arrays can

28+-- similar to "Streamly.Data.Array.Foreign" read write APIs. In that regard, arrays can

2929-- be considered as in-memory files or files can be considered as on-disk

3030-- arrays.

3131--

@@ -130,8 +130,8 @@ import Prelude hiding (read)

130130import qualified GHC.IO.FD as FD

131131import qualified GHC.IO.Device as RawIO

132132

133−import Streamly.Internal.Data.Array.Storable.Foreign.Types (Array(..), byteLength, defaultChunkSize, unsafeFreeze)

134−import Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types (mutableArray)

133+import Streamly.Internal.Data.Array.Foreign.Types (Array(..), byteLength, defaultChunkSize, unsafeFreeze)

134+import Streamly.Internal.Data.Array.Foreign.Mut.Types (mutableArray)

135135

136136import Streamly.Internal.Data.Stream.Serial (SerialT)

137137import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream)

@@ -145,7 +145,7 @@ import qualified Streamly.FileSystem.FDIO as RawIO hiding (write)

145145-- import Streamly.Data.Fold (Fold)

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

147147

148−import qualified Streamly.Data.Array.Storable.Foreign as A

148+import qualified Streamly.Data.Array.Foreign as A

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

150150import qualified Streamly.Prelude as S

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

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

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

1010-- Portability : GHC

1111--

1212-- Read and write streams and arrays to and from file handles. File handle IO

13−-- APIs are quite similar to "Streamly.Data.Array.Storable.Foreign" read write APIs. In that

13+-- APIs are quite similar to "Streamly.Data.Array.Foreign" read write APIs. In that

1414-- regard, arrays can be considered as in-memory files or files can be

1515-- considered as on-disk arrays.

1616--

@@ -44,12 +44,12 @@ module Streamly.FileSystem.Handle

4444 -- the stream is lazy and generated on-demand as the consumer consumes it.

4545 -- Read IO requests to the IO device are performed in chunks limited to a

4646 -- maximum size of 32KiB, this is referred to as

47− -- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize' in the

47+ -- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize' in the

4848 -- documentation. One IO request may or may not read the full

4949 -- chunk. If the whole stream is not consumed, it is possible that we may

5050 -- read slightly more from the IO device than what the consumer needed.

5151 -- Unless specified otherwise in the API, writes are collected into chunks

52− -- of 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize' before they

52+ -- of 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize' before they

5353 -- are written to the IO device.

5454

5555 -- Streaming APIs work for all kind of devices, seekable or non-seekable;

src/Streamly/Internal/Data/Array/Storable/Foreign.hs → src/Streamly/Internal/Data/Array/Foreign.hsrenamed+5−5

@@ -3,7 +3,7 @@

33#include "inline.hs"

55-- |

6−-- Module : Streamly.Internal.Data.Array.Storable.Foreign

6+-- Module : Streamly.Internal.Data.Array.Foreign

88--

99-- License : BSD3

@@ -32,7 +32,7 @@

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

3333-- pressure to GC.

3434

35−module Streamly.Internal.Data.Array.Storable.Foreign

35+module Streamly.Internal.Data.Array.Foreign

3636 (

3737 Array

3838

@@ -156,14 +156,14 @@ import GHC.Ptr (Ptr(..))

156156import GHC.Prim (touch#)

157157import GHC.IO (IO(..))

158158

159−import Streamly.Internal.Data.Array.Storable.Foreign.Types (Array(..), length)

159+import Streamly.Internal.Data.Array.Foreign.Types (Array(..), length)

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

161161import Streamly.Internal.Data.Stream.Serial (SerialT)

162162import Streamly.Internal.Data.Tuple.Strict (Tuple3'(..))

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

164164

165−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types as MA

166−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Types as A

165+import qualified Streamly.Internal.Data.Array.Foreign.Mut.Types as MA

166+import qualified Streamly.Internal.Data.Array.Foreign.Types as A

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

168168import qualified Streamly.Internal.Data.Stream.Prelude as P

169169import qualified Streamly.Internal.Data.Stream.Serial as Serial

src/Streamly/Internal/Data/Array/Storable/Foreign/Mut/Types.hs → src/Streamly/Internal/Data/Array/Foreign/Mut/Types.hsrenamed+3−3

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

11{-# LANGUAGE UnboxedTuples #-}

33-- |

4−-- Module : Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types

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

66-- License : BSD3-3-Clause

77-- Maintainer : streamly@composewell.com

@@ -22,7 +22,7 @@

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

2323-- arrays.

2424

25−module Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types

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

2626 (

2727 -- * Type

2828 -- $arrayNotes

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

459459 step' _ (GroupStart st) = do

460460 when (n <= 0) $

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

462− error $ "Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types.fromStreamDArraysOf: the size of "

462+ error $ "Streamly.Internal.Data.Array.Foreign.Mut.Types.fromStreamDArraysOf: the size of "

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

464464 Array start end bound <- liftIO $ newArray n

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

src/Streamly/Internal/Data/Array/Storable/Foreign/Types.hs → src/Streamly/Internal/Data/Array/Foreign/Types.hsrenamed+4−4

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

11#include "inline.hs"

33-- |

4−-- Module : Streamly.Internal.Data.Array.Storable.Foreign.Types

4+-- Module : Streamly.Internal.Data.Array.Foreign.Types

66--

77-- License : BSD3-3-Clause

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

99-- Stability : experimental

1010-- Portability : GHC

1111--

12−-- See notes in "Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types"

12+-- See notes in "Streamly.Internal.Data.Array.Foreign.Mut.Types"

1313--

14−module Streamly.Internal.Data.Array.Storable.Foreign.Types

14+module Streamly.Internal.Data.Array.Foreign.Types

1515 (

1616 -- $arrayNotes

1717 Array (..)

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

101101

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

103103

104−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types as MA

104+import qualified Streamly.Internal.Data.Array.Foreign.Mut.Types as MA

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

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

107107import qualified GHC.Exts as Exts

src/Streamly/Internal/Data/Array/Prim/MutTypesInclude.hs+3−3

@@ -266,7 +266,7 @@ fromStreamDArraysOf n (D.Stream step state) = D.Stream step' (GroupStart state)

266266 when (n <= 0) $

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

268268 error $

269− "Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types.fromStreamDArraysOf: the size of " ++

269+ "Streamly.Internal.Data.Array.Foreign.Mut.Types.fromStreamDArraysOf: the size of " ++

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

271271 arr <- newArray n

272272 return $ D.Skip (GroupBuffer st arr 0)

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

319319 step' gst (SpliceInitial st) = do

320320 when (n <= 0) $

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

322− error $ "Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types.packArraysChunksOf: the size of "

322+ error $ "Streamly.Internal.Data.Array.Foreign.Mut.Types.packArraysChunksOf: the size of "

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

324324 r <- step gst st

325325 case r of

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

364364 when (n <= 0)

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

366366 $ error

367− $ "Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types."

367+ $ "Streamly.Internal.Data.Array.Foreign.Mut.Types."

368368 ++ "packArraysChunksOf: the size of arrays ["

369369 ++ show n

370370 ++ "] must be a natural number"

src/Streamly/Internal/Data/Array/Prim/TypesInclude.hs+2−2

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

552552 step' gst (SpliceInitial st) = do

553553 when (n <= 0) $

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

555− error $ "Streamly.Internal.Data.Array.Storable.Foreign.Types.packArraysChunksOf: the size of "

555+ error $ "Streamly.Internal.Data.Array.Foreign.Types.packArraysChunksOf: the size of "

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

557557 r <- step gst st

558558 case r of

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

602602 initial = do

603603 when (n <= 0) $

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

605− error $ "Streamly.Internal.Data.Array.Storable.Foreign.Types.packArraysChunksOf: the size of "

605+ error $ "Streamly.Internal.Data.Array.Foreign.Types.packArraysChunksOf: the size of "

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

607607 res <- initial1

608608 return $ first (Tuple3' Nothing' 0) res

src/Streamly/Internal/Data/Array/Stream/Mut/Foreign.hs+7−7

@@ -37,16 +37,16 @@ import Foreign.Storable (Storable(..))

3737import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

3838import Foreign.Ptr (castPtr)

3939import Streamly.FileSystem.FDIO (IOVec(..))

40−import Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types (length)

40+import Streamly.Internal.Data.Array.Foreign.Mut.Types (length)

4141import Streamly.Internal.Data.SVar (adaptState)

4242#endif

43−import Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types (Array(..))

43+import Streamly.Internal.Data.Array.Foreign.Mut.Types (Array(..))

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

4545import Streamly.Internal.Data.Stream.Serial (SerialT)

4646import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

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

4848

49−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types as MArray

49+import qualified Streamly.Internal.Data.Array.Foreign.Mut.Types as MArray

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

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

5252

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

9999 step' gst (SpliceInitial st) = do

100100 when (n <= 0) $

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

102− error $ "Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types.packArraysChunksOf: the size of "

102+ error $ "Streamly.Internal.Data.Array.Foreign.Mut.Types.packArraysChunksOf: the size of "

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

104104 r <- step gst st

105105 case r of

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

143143 initial = do

144144 when (n <= 0) $

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

146− error $ "Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types.packArraysChunksOf: the size of "

146+ error $ "Streamly.Internal.Data.Array.Foreign.Mut.Types.packArraysChunksOf: the size of "

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

148148

149149 r <- initial1

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

264264 step' gst (GatherInitial st) = do

265265 when (n <= 0) $

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

267− error $ "Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types.groupIOVecsOf: the size of "

267+ error $ "Streamly.Internal.Data.Array.Foreign.Mut.Types.groupIOVecsOf: the size of "

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

269269 when (maxIOVLen <= 0) $

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

271− error $ "Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types.groupIOVecsOf: the number of "

271+ error $ "Streamly.Internal.Data.Array.Foreign.Mut.Types.groupIOVecsOf: the number of "

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

273273 r <- step (adaptState gst) st

274274 case r of

src/Streamly/Internal/Data/Binary/Decode.hs+1−1

@@ -32,7 +32,7 @@ import Streamly.Internal.Data.Parser (Parser)

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

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

3434

35−import qualified Streamly.Internal.Data.Array.Storable.Foreign as A

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

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

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

3838import qualified Streamly.Internal.Data.Parser.ParserK.Types as PRK

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

@@ -420,7 +420,7 @@ simplify (Fold2 step inject extract) c =

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

421421--

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

423−-- very inefficient, consider using "Streamly.Data.Array.Storable.Foreign"

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

424424-- instead.

425425--

426426-- @since 0.7.0

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

@@ -246,7 +246,7 @@ import Prelude

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

247247import Streamly.Internal.Data.Pipe.Types

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

249−-- import Streamly.Internal.Data.Array.Storable.Foreign.Types (Array)

249+-- import Streamly.Internal.Data.Array.Foreign.Types (Array)

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

251251-- import Streamly.Internal.Data.Stream.Serial (SerialT)

252252-- import Streamly.Internal.Data.Stream.StreamK (IsStream())

@@ -256,7 +256,7 @@ import Streamly.Internal.Data.Pipe.Types

256256

257257-- import Streamly.Internal.Data.Strict

258258

259−-- import qualified Streamly.Internal.Data.Array.Storable.Foreign.Types as A

259+-- import qualified Streamly.Internal.Data.Array.Foreign.Types as A

260260-- import qualified Streamly.Prelude as S

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

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

src/Streamly/Internal/Data/SmallArray.hs+2−2

@@ -103,7 +103,7 @@ foldr f z arr = runIdentity $ D.foldr f z $ toStreamD arr

103103-- 'SmallArray'.

104104--

105105-- Since we are folding to a 'SmallArray' @n@ should be <= 128, for larger number

106−-- of elements use an 'Array' from either "Streamly.Data.Array" or "Streamly.Data.Array.Storable.Foreign".

106+-- of elements use an 'Array' from either "Streamly.Data.Array" or "Streamly.Data.Array.Foreign".

107107{-# INLINE_NORMAL writeN #-}

108108writeN :: MonadIO m => Int -> Fold m a (SmallArray a)

109109writeN limit = Fold step initial extract

@@ -139,7 +139,7 @@ fromStreamDN limit str = do

139139--

140140-- It is recommended to use a value of @n@ <= 128. For larger sized

141141-- arrays, use an 'Array' from "Streamly.Data.Array" or

142−-- "Streamly.Data.Array.Storable.Foreign"

142+-- "Streamly.Data.Array.Foreign"

143143{-# INLINABLE fromListN #-}

144144fromListN :: Int -> [a] -> SmallArray a

145145fromListN n xs = unsafePerformIO $ fromStreamDN n $ D.fromList xs

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

@@ -48,7 +48,7 @@ where

4848import Control.Concurrent (threadDelay)

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

5050import Foreign.Storable (Storable)

51−import Streamly.Internal.Data.Array.Storable.Foreign.Types (Array)

51+import Streamly.Internal.Data.Array.Foreign.Types (Array)

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

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

5454import Streamly.Internal.Data.Stream.Prelude (fromStreamS, toStreamS)

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

@@ -162,7 +162,7 @@ import Streamly.Internal.Data.Stream.StreamD (fromStreamD, toStreamD)

162162import Streamly.Internal.Data.Stream.StreamK (IsStream)

163163import Streamly.Internal.Data.Stream.Serial (SerialT)

164164

165−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Types as A

165+import qualified Streamly.Internal.Data.Array.Foreign.Types as A

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

167167import qualified Streamly.Internal.Data.Stream.Parallel as Par

168168import qualified Streamly.Internal.Data.Stream.Prelude as P

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

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

254254import Streamly.Internal.Data.Fold.Types (Fold (..), Fold2 (..))

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

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

257−import Streamly.Internal.Data.Array.Storable.Foreign.Types (Array)

257+import Streamly.Internal.Data.Array.Foreign.Types (Array)

258258import Streamly.Internal.Data.SVar (MonadAsync)

259259import Streamly.Internal.Data.Stream.Ahead (ahead)

260260import Streamly.Internal.Data.Stream.Async (async, wAsync)

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

284284

285285import qualified Data.Heap as H

286286import qualified Data.Map.Strict as Map

287−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Types as A

287+import qualified Streamly.Internal.Data.Array.Foreign.Types as A

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

289289import qualified Streamly.Internal.Data.Parser.ParserK.Types as PRK

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

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

@@ -156,12 +156,12 @@ import Foreign.Storable (Storable(..))

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

157157import GHC.Types (SPEC(..))

158158

159−import Streamly.Internal.Data.Array.Storable.Foreign.Types (Array(..))

159+import Streamly.Internal.Data.Array.Foreign.Types (Array(..))

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

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

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

163163

164−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Types as A

164+import qualified Streamly.Internal.Data.Array.Foreign.Types as A

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

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

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

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

@@ -139,7 +139,7 @@ import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)

139139import Streamly.Internal.Data.Time.Units

140140 (TimeUnit64, toRelTime64, diffAbsTime64)

141141

142−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Types as A

142+import qualified Streamly.Internal.Data.Array.Foreign.Types as A

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

144144import qualified Streamly.Internal.Data.IORef.Prim as Prim

145145import qualified Streamly.Internal.Data.Pipe.Types as Pipe

src/Streamly/Internal/FileSystem/Dir.hs+6−6

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

6464-- import Streamly.Data.Fold (Fold)

6565import Streamly.Internal.BaseCompat (fromLeft, fromRight)

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

67−-- import Streamly.Internal.Data.Array.Storable.Foreign.Types

67+-- import Streamly.Internal.Data.Array.Foreign.Types

6868-- (Array(..), writeNUnsafe, defaultChunkSize, shrinkToFit,

6969-- lpackArraysChunksOf)

7070-- import Streamly.Internal.Data.Stream.Serial (SerialT)

@@ -76,7 +76,7 @@ import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

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

7777-- import qualified Streamly.Internal.Memory.ArrayStream as AS

7878import qualified Streamly.Internal.Data.Stream.IsStream as S

79−-- import qualified Streamly.Data.Array.Storable.Foreign as A

79+-- import qualified Streamly.Data.Array.Foreign as A

8080-- import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

8181import qualified System.Directory as Dir

8282

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

166166

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

168168-- device are performed using a buffer of size

169−-- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize'. The

169+-- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize'. The

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

171−-- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize'.

171+-- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize'.

172172--

173173-- @since 0.7.0

174174{-# INLINE readChunks #-}

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

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

344344--

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

346−-- up to 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize' before writing.

346+-- up to 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize' before writing.

347347--

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

349349-- need some extra perf boost.

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

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

394394--

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

396−-- up to 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize' before writing

396+-- up to 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize' before writing

397397-- to the IO device.

398398--

399399-- @since 0.7.0

src/Streamly/Internal/FileSystem/Event/Darwin.hs+2−2

@@ -165,7 +165,7 @@ import GHC.IO.Handle.FD (fdToHandle)

165165import Streamly.Prelude (SerialT)

166166import Streamly.Internal.Data.Cont (contListMap)

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

168−import Streamly.Internal.Data.Array.Storable.Foreign.Types (Array(..))

168+import Streamly.Internal.Data.Array.Foreign.Types (Array(..))

169169import System.IO (Handle, hClose)

170170

171171import qualified Data.List.NonEmpty as NonEmpty

@@ -173,7 +173,7 @@ import qualified Streamly.Internal.Data.Parser as PR

173173import qualified Streamly.Internal.Data.Stream.IsStream as S

174174import qualified Streamly.Internal.Unicode.Stream as U

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

176−import qualified Streamly.Internal.Data.Array.Storable.Foreign as A

176+import qualified Streamly.Internal.Data.Array.Foreign as A

177177

178178-------------------------------------------------------------------------------

179179-- Subscription to events

src/Streamly/Internal/FileSystem/Event/Linux.hs+2−2

@@ -171,7 +171,7 @@ import GHC.IO.FD (fdFD, mkFD)

171171import GHC.IO.Handle.FD (mkHandleFromFD)

172172import Streamly.Prelude (SerialT)

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

174−import Streamly.Internal.Data.Array.Storable.Foreign.Types (Array(..))

174+import Streamly.Internal.Data.Array.Foreign.Types (Array(..))

175175import System.IO (Handle, hClose, IOMode(ReadMode))

176176#if !MIN_VERSION_base(4,10,0)

177177import Control.Concurrent.MVar (readMVar)

@@ -185,7 +185,7 @@ import GHC.IO.Handle.FD (handleToFd)

185185

186186import qualified Data.IntMap.Lazy as Map

187187import qualified Data.List.NonEmpty as NonEmpty

188−import qualified Streamly.Internal.Data.Array.Storable.Foreign as A

188+import qualified Streamly.Internal.Data.Array.Foreign as A

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

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

191191import qualified Streamly.Internal.Data.Stream.IsStream as S

src/Streamly/Internal/FileSystem/Event/Windows.hs+2−2

@@ -124,8 +124,8 @@ import System.Win32.Types (BOOL, DWORD, HANDLE, LPVOID, LPDWORD, failIfFalse_)

124124import qualified Data.List.NonEmpty as NonEmpty

125125import qualified Streamly.Internal.Data.Stream.IsStream as S

126126import qualified Streamly.Internal.Unicode.Stream as U

127−import qualified Streamly.Internal.Data.Array.Storable.Foreign as A

128−import Streamly.Internal.Data.Array.Storable.Foreign (Array)

127+import qualified Streamly.Internal.Data.Array.Foreign as A

128+import Streamly.Internal.Data.Array.Foreign (Array)

129129

130130-- | Watch configuration, used to specify the events of interest and the

131131-- behavior of the watch.

src/Streamly/Internal/FileSystem/File.hs+6−6

@@ -96,7 +96,7 @@ import qualified System.IO as SIO

9696

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

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

99−import Streamly.Internal.Data.Array.Storable.Foreign.Types

99+import Streamly.Internal.Data.Array.Foreign.Types

100100 (Array(..), defaultChunkSize, writeNUnsafe)

101101import Streamly.Internal.Data.Stream.Serial (SerialT)

102102import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

@@ -108,7 +108,7 @@ import qualified Streamly.Internal.Data.Fold.Types as FL

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

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

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

111−import qualified Streamly.Data.Array.Storable.Foreign as A

111+import qualified Streamly.Data.Array.Foreign as A

112112import qualified Streamly.Prelude as S

113113

114114-------------------------------------------------------------------------------

@@ -243,9 +243,9 @@ readChunksWithBufferOf = usingFile2 FH.readChunksWithBufferOf

243243

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

245245-- device are performed using a buffer of size

246−-- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize'. The

246+-- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize'. The

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

248−-- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize'.

248+-- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize'.

249249--

250250-- /Internal/

251251{-# INLINE readChunks #-}

@@ -262,7 +262,7 @@ readWithBufferOf = usingFile2 FH.readWithBufferOf

262262

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

264264-- performed in sizes of

265−-- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize'.

265+-- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize'.

266266--

267267-- @since 0.7.0

268268{-# INLINE read #-}

@@ -382,7 +382,7 @@ writeWithBufferOf n path =

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

383383--

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

385−-- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize' before writing to

385+-- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize' before writing to

386386-- the IO device.

387387--

388388-- /Internal/

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

@@ -113,9 +113,9 @@ import Streamly.Prelude (MonadAsync)

113113import Streamly.Data.Fold (Fold)

114114import Streamly.Internal.Data.Fold.Types (Fold2(..))

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

116−import Streamly.Internal.Data.Array.Storable.Foreign.Types

116+import Streamly.Internal.Data.Array.Foreign.Types

117117 (Array(..), writeNUnsafe, defaultChunkSize , unsafeFreezeWithShrink)

118−import Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types (mutableArray)

118+import Streamly.Internal.Data.Array.Foreign.Mut.Types (mutableArray)

119119import Streamly.Internal.Data.Stream.Serial (SerialT)

120120import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream)

121121import Streamly.Internal.Memory.ArrayStream (lpackArraysChunksOf)

@@ -124,10 +124,10 @@ import Streamly.Internal.Memory.ArrayStream (lpackArraysChunksOf)

124124import qualified Streamly.Data.Fold as FL

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

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

127−import qualified Streamly.Internal.Data.Array.Storable.Foreign as IA

127+import qualified Streamly.Internal.Data.Array.Foreign as IA

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

129129import qualified Streamly.Internal.Data.Stream.IsStream as S

130−import qualified Streamly.Data.Array.Storable.Foreign as A

130+import qualified Streamly.Data.Array.Foreign as A

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

132132

133133-------------------------------------------------------------------------------

@@ -255,9 +255,9 @@ getBytes = toBytes stdin

255255

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

257257-- device are performed using a buffer of size

258−-- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize'. The

258+-- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize'. The

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

260−-- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize'.

260+-- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize'.

261261--

262262-- @since 0.7.0

263263{-# INLINE readChunks #-}

@@ -294,7 +294,7 @@ toBytesWithBufferOf chunkSize h = AS.concat $ toChunksWithBufferOf chunkSize h

294294--

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

296296-- performed in sizes of

297−-- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize'.

297+-- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize'.

298298--

299299-- @since 0.7.0

300300{-# INLINE read #-}

@@ -411,7 +411,7 @@ fromBytesWithBufferOf n h m = fromChunks h $ S.arraysOf n m

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

412412--

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

414−-- up to 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize' before writing.

414+-- up to 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize' before writing.

415415--

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

417417-- need some extra perf boost.

@@ -469,7 +469,7 @@ writeWithBufferOf2 n = FL.chunksOf2 n (writeNUnsafe n) writeChunks2

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

470470--

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

472−-- up to 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize' before writing

472+-- up to 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize' before writing

473473-- to the IO device.

474474--

475475-- @since 0.7.0

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

@@ -52,15 +52,15 @@ import Prelude hiding (length, null, last, map, (!!), read, concat, unlines)

5252#if !defined(mingw32_HOST_OS)

5353import Streamly.FileSystem.FDIO (IOVec(..))

5454#endif

55−import Streamly.Internal.Data.Array.Storable.Foreign.Types (Array(..), length)

55+import Streamly.Internal.Data.Array.Foreign.Types (Array(..), length)

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

5757import Streamly.Internal.Data.Stream.Serial (SerialT)

5858import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

5959import Streamly.Internal.Data.SVar (adaptState)

6060

61−import qualified Streamly.Internal.Data.Array.Storable.Foreign as A

62−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Types as A

63−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types as MA

61+import qualified Streamly.Internal.Data.Array.Foreign as A

62+import qualified Streamly.Internal.Data.Array.Foreign.Types as A

63+import qualified Streamly.Internal.Data.Array.Foreign.Mut.Types as MA

6464import qualified Streamly.Internal.Data.Array.Stream.Mut.Foreign as AS

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

6666import qualified Streamly.Internal.Data.Stream.IsStream as S

src/Streamly/Internal/Network/Inet/TCP.hs+2−2

@@ -103,7 +103,7 @@ import Network.Socket

103103 socket)

104104import Prelude hiding (read)

105105

106−import Streamly.Internal.Data.Array.Storable.Foreign.Types (Array(..), defaultChunkSize, writeNUnsafe)

106+import Streamly.Internal.Data.Array.Foreign.Types (Array(..), defaultChunkSize, writeNUnsafe)

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

108108import Streamly.Internal.Data.SVar (fork)

109109import Streamly.Internal.Data.Stream.Serial (SerialT)

@@ -117,7 +117,7 @@ import qualified Control.Monad.Catch as MC

117117import qualified Network.Socket as Net

118118

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

120−import qualified Streamly.Internal.Data.Array.Storable.Foreign as A

120+import qualified Streamly.Internal.Data.Array.Foreign as A

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

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

123123import qualified Streamly.Prelude as S

src/Streamly/Internal/Network/Socket.hs+8−8

@@ -90,8 +90,8 @@ import qualified Network.Socket as Net

9090import Streamly.Prelude (MonadAsync)

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

9292import Streamly.Internal.Memory.ArrayStream (lpackArraysChunksOf)

93−import Streamly.Internal.Data.Array.Storable.Foreign.Types (Array(..))

94−import Streamly.Internal.Data.Array.Storable.Foreign.Mut.Types (mutableArray)

93+import Streamly.Internal.Data.Array.Foreign.Types (Array(..))

94+import Streamly.Internal.Data.Array.Foreign.Mut.Types (mutableArray)

9595import Streamly.Internal.Data.Stream.Serial (SerialT)

9696import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream)

9797import Streamly.Data.Fold (Fold)

@@ -100,10 +100,10 @@ import Streamly.Data.Fold (Fold)

100100import qualified Streamly.Data.Fold as FL

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

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

103−import qualified Streamly.Internal.Data.Array.Storable.Foreign as IA

104−import qualified Streamly.Data.Array.Storable.Foreign as A

103+import qualified Streamly.Internal.Data.Array.Foreign as IA

104+import qualified Streamly.Data.Array.Foreign as A

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

106−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Types as A

106+import qualified Streamly.Internal.Data.Array.Foreign.Types as A

107107import qualified Streamly.Prelude as S

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

109109

@@ -381,9 +381,9 @@ readChunksWithBufferOf = Unfold step return

381381

382382-- | Unfolds a socket into a stream of 'Word8' arrays. Requests to the socket

383383-- are performed using a buffer of size

384−-- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize'. The

384+-- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize'. The

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

386−-- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize'.

386+-- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize'.

387387--

388388-- @since 0.7.0

389389{-# INLINE readChunks #-}

@@ -430,7 +430,7 @@ readWithBufferOf = UF.concat readChunksWithBufferOf A.read

430430

431431-- | Unfolds a 'Socket' into a byte stream. IO requests to the socket are

432432-- performed in sizes of

433−-- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize'.

433+-- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize'.

434434--

435435-- @since 0.7.0

436436{-# INLINE read #-}

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

@@ -20,11 +20,11 @@ where

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

2121import Streamly.Prelude (MonadAsync)

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

23−import Streamly.Data.Array.Storable.Foreign (Array)

23+import Streamly.Data.Array.Foreign (Array)

2424import Streamly.Internal.Data.Stream.IsStream (IsStream)

2525

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

27−import qualified Streamly.Data.Array.Storable.Foreign as A

27+import qualified Streamly.Data.Array.Foreign as A

2828

2929-- | Break a string up into a stream of strings at newline characters.

3030-- The resulting strings do not contain newlines.

src/Streamly/Internal/Unicode/Stream.hs+2−2

@@ -81,14 +81,14 @@ import GHC.IO.Encoding.Failure (isSurrogate)

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

8282import System.IO.Unsafe (unsafePerformIO)

8383import Streamly.Data.Fold (Fold)

84−import Streamly.Data.Array.Storable.Foreign (Array)

84+import Streamly.Data.Array.Foreign (Array)

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

8686import Streamly.Internal.Data.SVar (adaptState)

8787import Streamly.Internal.Data.Stream.IsStream (IsStream)

8888import Streamly.Internal.Data.Stream.StreamD (Stream(..), Step (..))

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

9090

91−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Types as A

91+import qualified Streamly.Internal.Data.Array.Foreign.Types as A

9292import qualified Streamly.Internal.Data.Stream.IsStream as S

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

9494

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

@@ -32,10 +32,10 @@

3232--

3333-- > import qualified Streamly.Array as A

3434--

35−-- For experimental APIs see "Streamly.Internal.Data.Array.Storable.Foreign".

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

3636

3737module Streamly.Memory.Array

38− {-# DEPRECATED "Use Streamly.Data.Array.Storable.Foreign instead" #-}

38+ {-# DEPRECATED "Use Streamly.Data.Array.Foreign instead" #-}

3939 (

4040 A.Array

4141

@@ -71,4 +71,4 @@ module Streamly.Memory.Array

7171 )

7272where

7373

74−import Streamly.Internal.Data.Array.Storable.Foreign as A

74+import Streamly.Internal.Data.Array.Foreign as A

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

@@ -41,7 +41,7 @@ import Prelude hiding (length, concat)

4141

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

4343

44−import qualified Streamly.Internal.Data.Array.Storable.Foreign.Types as A

44+import qualified Streamly.Internal.Data.Array.Foreign.Types as A

4545

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

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

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

@@ -64,9 +64,9 @@

6464-- = Programmer Notes

6565--

6666-- Read IO requests to connected stream sockets are performed in chunks of

67−-- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize'. Unless specified

67+-- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize'. Unless specified

6868-- otherwise in the API, writes are collected into chunks of

69−-- 'Streamly.Internal.Data.Array.Storable.Foreign.Types.defaultChunkSize' before they are

69+-- 'Streamly.Internal.Data.Array.Foreign.Types.defaultChunkSize' before they are

7070-- written to the socket. APIs are provided to control the chunking behavior.

7171--

7272-- > import qualified Streamly.Network.Socket as SK

@@ -89,7 +89,7 @@

8989-- APIs for unconnected sockets need to explicitly specify the remote endpoint.

9090--

9191-- By design, connected socket IO APIs are similar to

92−-- "Streamly.Data.Array.Storable.Foreign" read write APIs. They are almost identical to the

92+-- "Streamly.Data.Array.Foreign" read write APIs. They are almost identical to the

9393-- sequential streaming APIs in "Streamly.Internal.FileSystem.File".

9494--

9595module Streamly.Network.Socket

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