git.iko.soy/streamly
on master help sign in
Re-export entire submodules from Array (#2510)
commit8b55b1a03ec08be3e27d9ad6aaca4522187f7244 authorRanjeet Ranjan <ranjeetr@composewell.com> dateFri 11 Aug 2023, 10:15 (3 years ago) parent971b668
23 files changed+44−71
compare with master
unifiedsplit
benchmark/Streamly/Benchmark/Data/Ring/Unboxed.hs+1−2 benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs+1−1 benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs+1−1 benchmark/Streamly/Benchmark/Unicode/Stream.hs+1−1 core/src/DocTestDataArray.hs+5 core/src/DocTestFileSystemHandle.hs+1−1 core/src/Streamly/Data/Array.hs+13−14 core/src/Streamly/Internal/Data/Array.hs+3−29 core/src/Streamly/Internal/Data/Array/Type.hs−3 core/src/Streamly/Internal/Data/Fold/Chunked.hs+2−2 core/src/Streamly/Internal/Data/Stream/Chunked.hs−1 core/streamly-core.cabal+2−1 src/Streamly/Internal/Data/Stream/IsStream/Common.hs+2−2 src/Streamly/Internal/Data/Stream/IsStream/Reduce.hs+2−2 src/Streamly/Internal/FileSystem/Event/Darwin.hs+1−1 src/Streamly/Internal/FileSystem/Event/Linux.hs+1−1 src/Streamly/Internal/FileSystem/FD.hs+1−1 src/Streamly/Internal/Network/Inet/TCP.hs+2−2 src/Streamly/Internal/Network/Socket.hs+2−2 src/Streamly/Internal/System/IOVec.hs+1−1 src/Streamly/Network/Socket.hs+1−1 test/Streamly/Test/Data/Array.hs−1 test/Streamly/Test/Data/Ring/Unboxed.hs+1−1
benchmark/Streamly/Benchmark/Data/Ring/Unboxed.hs+1−2
@@ -12,8 +12,7 @@ module Main (main) where
1212
1313import Control.Monad (void)
1414import GHC.Ptr (Ptr(..))
15−
16−import qualified Streamly.Internal.Data.Array.Type as Array
15+import qualified Streamly.Internal.Data.Array as Array
1716import qualified Streamly.Internal.Data.Ring as Ring
1817import qualified Data.Foldable as P
1918
benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs+1−1
@@ -33,7 +33,7 @@ import qualified Streamly.Data.Stream as Stream
3333import qualified Streamly.Data.Fold as Fold
3434import qualified Streamly.FileSystem.Handle as FH
3535import qualified Streamly.Internal.Data.Array as A
36−import qualified Streamly.Internal.Data.Array.Type as AT
36+import qualified Streamly.Internal.Data.Array as AT
3737import qualified Streamly.Internal.Data.Fold as FL
3838import qualified Streamly.Internal.Data.Stream as IP
3939import qualified Streamly.Internal.FileSystem.Handle as IFH
benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs+1−1
@@ -43,7 +43,7 @@ import Streamly.Internal.Data.Stream (Step(..))
4343import qualified Streamly.Internal.Data.Stream as D
4444import qualified Streamly.Internal.Data.Tuple.Strict as Strict
4545import qualified Streamly.Internal.Data.Stream.MutChunked as MAS
46−import qualified Streamly.Internal.Data.Array.Type as AT
46+import qualified Streamly.Internal.Data.Array as AT
4747
4848import Test.Inspection
4949#endif
benchmark/Streamly/Benchmark/Unicode/Stream.hs+1−1
@@ -42,7 +42,7 @@ import Streamly.Internal.Data.Unbox (Unbox)
4242import Streamly.Internal.Data.Stream.StreamD (Step(..))
4343import qualified Streamly.Internal.Data.Fold as Fold
4444import qualified Streamly.Internal.Data.Tuple.Strict as Strict
45−import qualified Streamly.Internal.Data.Array.Type as Array
45+import qualified Streamly.Internal.Data.Array as Array
4646
4747import Test.Inspection
4848#endif
core/src/DocTestDataArray.hs+5
@@ -1,6 +1,7 @@
11{- $setup
22>>> :m
33>>> :set -XFlexibleContexts
4+>>> :set -XMagicHash
45>>> import Data.Function ((&))
56>>> import Data.Functor.Identity (Identity(..))
67>>> import System.IO.Unsafe (unsafePerformIO)
@@ -11,4 +12,8 @@
1112>>> import qualified Streamly.Data.Array as Array
1213>>> import qualified Streamly.Data.Fold as Fold
1314>>> import qualified Streamly.Data.Stream as Stream
15+
16+For APIs that have not been released yet.
17+
18+>>> import qualified Streamly.Internal.Data.Array as Array
1419-}
core/src/DocTestFileSystemHandle.hs+1−1
@@ -8,7 +8,7 @@
88
99For APIs that have not been released yet.
1010
11−>>> import qualified Streamly.Internal.Data.Array.Type as Array (writeNUnsafe)
11+>>> import qualified Streamly.Internal.Data.Array as Array (writeNUnsafe)
1212>>> import qualified Streamly.Internal.Data.Unfold as Unfold (first)
1313>>> import qualified Streamly.Internal.FileSystem.Handle as Handle
1414>>> import qualified Streamly.Internal.System.IO as IO (defaultChunkSize)
core/src/Streamly/Data/Array.hs+13−14
@@ -29,7 +29,7 @@ module Streamly.Data.Array
2929 -- $overview
3030
3131 -- * The Array Type
32− A.Array
32+ Array
3333
3434 -- * Construction
3535 -- | When performance matters, the fastest way to generate an array is
@@ -40,31 +40,31 @@ module Streamly.Data.Array
4040 -- 'fromList' can be used to construct an array from a string literal.
4141
4242 -- Pure List APIs
43− , A.fromListN
44− , A.fromList
43+ , fromListN
44+ , fromList
4545
4646 -- Monadic APIs
47− , A.writeN -- drop new
48− , A.write -- full buffer
47+ , writeN -- drop new
48+ , write -- full buffer
4949 , writeLastN -- drop old (ring buffer)
5050
5151 -- * Conversion
5252 -- 'GHC.Exts.toList' from "GHC.Exts" can be used to convert an array to a
5353 -- list.
54− , A.toList
54+ , toList
5555
5656 -- * Unfolds
57− , A.reader
58− , A.readerRev
57+ , reader
58+ , readerRev
5959
6060 -- * Casting
6161 , cast
6262 , asBytes
6363
6464 -- * Random Access
65− , A.length
65+ , length
6666 -- , (!!)
67− , A.getIndex
67+ , getIndex
6868
6969 -- * Unbox Type Class
7070 , Unbox (..)
@@ -82,12 +82,11 @@ where
8282
8383#include "inline.hs"
8484
85+import Streamly.Internal.Data.Array hiding (read, readRev)
86+import Streamly.Internal.Data.Unbox (Unbox (..))
8587import Streamly.Internal.Data.Unfold (Unfold)
86−import Streamly.Internal.Data.Array as A hiding (read, readRev)
87−import Streamly.Internal.Data.Array.Type (pin, unpin, isPinned)
8888
89−import Streamly.Internal.Data.Unbox (Unbox (..))
90−import Prelude hiding (read)
89+import Prelude hiding (read, length)
9190
9291#include "DocTestDataArray.hs"
9392
core/src/Streamly/Internal/Data/Array.hs+3−29
@@ -17,42 +17,27 @@ module Streamly.Internal.Data.Array
1717 -- $design
1818
1919 -- * The Array Type
20− Array
20+ module Streamly.Internal.Data.Array.Type
2121
2222 -- * Construction
23−
24− -- Pure List APIs
25− , A.fromListN
26− , A.fromList
27−
2823 -- Stream Folds
2924 , fromStreamN
3025 , fromStream
3126
3227 -- Monadic Folds
33− , A.writeN -- drop new
34− , A.pinnedWriteNAligned
35− , A.write -- full buffer
3628 , writeLastN
3729
3830 -- * Elimination
3931 -- ** Conversion
40− , A.toList
41−
42− -- ** Streams
43− , A.read
44− , A.readRev
4532
4633 -- ** Unfolds
4734 , reader
4835 , readerUnsafe
49− , A.readerRev
5036 , producer -- experimental
5137
5238 -- * Random Access
5339 -- , (!!)
5440 , getIndex
55− , A.unsafeIndex -- XXX Rename to getIndexUnsafe??
5641 , getIndexRev
5742 , last -- XXX getIndexLast?
5843 , getIndices
@@ -64,7 +49,6 @@ module Streamly.Internal.Data.Array
6449 -- , getIndicesUptoRev -- read from end to the given position in file
6550
6651 -- * Size
67− , length
6852 , null
6953
7054 -- * Search
@@ -77,10 +61,7 @@ module Streamly.Internal.Data.Array
7761 , cast
7862 , asBytes
7963 , castUnsafe
80− , asPtrUnsafe
8164 , asCStringUnsafe
82− , A.unsafeFreeze -- asImmutableUnsafe?
83− , A.unsafeThaw -- asMutableUnsafe?
8465
8566 -- * Subarrays
8667 , getSliceUnsafe
@@ -95,10 +76,6 @@ module Streamly.Internal.Data.Array
9576 -- ** Folding
9677 , streamFold
9778 , fold
98−
99− -- * Deprecated
100− , A.toStream
101− , A.toStreamRev
10279 )
10380where
10481
@@ -117,9 +94,6 @@ import Foreign.Storable (Storable)
11794import Streamly.Internal.Data.Unbox (Unbox(..))
11895import Prelude hiding (length, null, last, map, (!!), read, concat)
11996
120−import Streamly.Internal.Data.MutArray.Type (ArrayUnsafe(..))
121−import Streamly.Internal.Data.Array.Type
122− (Array(..), length, asPtrUnsafe)
12397import Streamly.Internal.Data.Fold.Type (Fold(..))
12498import Streamly.Internal.Data.Producer.Type (Producer(..))
12599import Streamly.Internal.Data.Stream (Stream)
@@ -138,6 +112,8 @@ import qualified Streamly.Internal.Data.Stream as D
138112import qualified Streamly.Internal.Data.Stream as Stream
139113import qualified Streamly.Internal.Data.Unfold as Unfold
140114
115+import Streamly.Internal.Data.Array.Type
116+
141117#include "DocTestDataArray.hs"
142118
143119-- $design
@@ -241,7 +217,6 @@ readerUnsafe = Unfold step inject
241217
242218-- |
243219--
244−-- >>> import qualified Streamly.Internal.Data.Array.Type as Array
245220-- >>> null arr = Array.byteLength arr == 0
246221--
247222-- /Pre-release/
@@ -264,7 +239,6 @@ getIndexRev i arr =
264239
265240-- |
266241--
267−-- >>> import qualified Streamly.Internal.Data.Array as Array
268242-- >>> last arr = Array.getIndexRev arr 0
269243--
270244-- /Pre-release/
core/src/Streamly/Internal/Data/Array/Type.hs−3
@@ -567,7 +567,6 @@ pinnedWrite = fmap unsafeFreeze MA.pinnedWrite
567567-- could be unsafe and dangerous. This is dangerous especially when used with
568568-- foldMany like operations.
569569--
570−-- >>> import qualified Streamly.Internal.Data.Array.Type as Array
571570-- >>> unsafePureWrite = Array.unsafeMakePure Array.write
572571--
573572{-# INLINE unsafeMakePure #-}
@@ -595,8 +594,6 @@ fromPureStream x = unsafePerformIO $ fmap (unsafeFreeze) (MA.fromPureStream x)
595594-- Note that this is completely safe when reading from Haskell string
596595-- literals because they are guaranteed to be NULL terminated:
597596--
598−-- >>> :set -XMagicHash
599−-- >>> import qualified Streamly.Internal.Data.Array.Type as Array
600597-- >>> Array.toList $ Array.fromByteStr# "\1\2\3\0"#
601598-- [1,2,3]
602599--
core/src/Streamly/Internal/Data/Fold/Chunked.hs+2−2
@@ -66,11 +66,11 @@ import Data.Proxy (Proxy(..))
6666import Streamly.Internal.Data.Unbox (Unbox(..))
6767import GHC.Types (SPEC(..))
6868import Streamly.Internal.Data.MutArray.Type (touch)
69−import Streamly.Internal.Data.Array.Type (Array(..))
69+import Streamly.Internal.Data.Array (Array(..))
7070import Streamly.Internal.Data.Parser (Initial(..), Step(..))
7171import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
7272
73−import qualified Streamly.Internal.Data.Array as Array
73+import qualified Streamly.Internal.Data.Array.Type as Array
7474import qualified Streamly.Internal.Data.Fold as Fold
7575import qualified Streamly.Internal.Data.Parser as ParserD
7676import qualified Streamly.Internal.Data.Parser.ParserD.Type as ParserD
core/src/Streamly/Internal/Data/Stream/Chunked.hs−1
@@ -87,7 +87,6 @@ import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
8787import qualified Streamly.Data.Fold as FL
8888import qualified Streamly.Internal.Data.Array as A
8989import qualified Streamly.Internal.Data.Array as Array
90−import qualified Streamly.Internal.Data.Array.Type as A
9190import qualified Streamly.Internal.Data.MutArray.Type as MA
9291import qualified Streamly.Internal.Data.Stream.MutChunked as AS
9392import qualified Streamly.Internal.Data.Fold.Type as FL (Fold(..), Step(..))
core/streamly-core.cabal+2−1
@@ -308,7 +308,6 @@ library
308308 -- May depend on streamly-core-stream
309309 , Streamly.Internal.Data.MutArray.Type
310310 , Streamly.Internal.Data.MutArray
311− , Streamly.Internal.Data.Array.Type
312311 , Streamly.Internal.Data.MutArray.Generic
313312
314313 -- streamly-core-streams
@@ -430,6 +429,8 @@ library
430429 , Streamly.Internal.Data.Unfold.Type
431430 , Streamly.Internal.Data.Unfold.Enumeration
432431
432+ , Streamly.Internal.Data.Array.Type
433+
433434 if flag(dev)
434435 other-modules:
435436 Streamly.Internal.Data.Stream.StreamK.Alt
src/Streamly/Internal/Data/Stream/IsStream/Common.hs+2−2
@@ -71,7 +71,7 @@ import Control.Concurrent (threadDelay)
7171import Control.Monad.IO.Class (MonadIO(..))
7272import Foreign.Storable (Storable)
7373import Streamly.Internal.Control.Concurrent (MonadAsync)
74−import Streamly.Internal.Data.Array.Type (Array)
74+import Streamly.Internal.Data.Array (Array)
7575import Streamly.Internal.Data.Fold (Fold (..))
7676import Streamly.Internal.Data.Stream.IsStream.Combinators (maxYields)
7777import Streamly.Internal.Data.Stream.IsStream.Type
@@ -81,7 +81,7 @@ import Streamly.Internal.Data.Time.Units (AbsTime, RelTime64, addToAbsTime64)
8181import Streamly.Internal.System.IO (defaultChunkSize)
8282import Streamly.Internal.Data.Unbox (Unbox)
8383
84−import qualified Streamly.Internal.Data.Array.Type as A
84+import qualified Streamly.Internal.Data.Array as A
8585import qualified Streamly.Internal.Data.Stream.Async as Async
8686import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
8787import qualified Streamly.Internal.Data.Stream.Parallel as Par
src/Streamly/Internal/Data/Stream/IsStream/Reduce.hs+2−2
@@ -164,7 +164,7 @@ import Streamly.Internal.Data.Fold (Fold (..))
164164import Streamly.Internal.Data.IsMap (IsMap(..))
165165import Streamly.Internal.Data.Refold.Type (Refold (..))
166166import Streamly.Internal.Data.Parser (Parser (..), ParseError)
167−import Streamly.Internal.Data.Array.Type (Array)
167+import Streamly.Internal.Data.Array (Array)
168168import Streamly.Internal.Data.Stream.IsStream.Common
169169 ( fold
170170 , interjectSuffix
@@ -184,7 +184,7 @@ import Streamly.Internal.Data.Unbox (Unbox)
184184
185185import qualified Data.Heap as H
186186import qualified Streamly.Internal.Data.Unfold as Unfold
187−import qualified Streamly.Internal.Data.Array.Type as A
187+import qualified Streamly.Internal.Data.Array as A
188188 (chunksOf, read)
189189import qualified Streamly.Internal.Data.Fold as FL
190190 (Fold, Step(..), takeEndBy_, takeEndBy, catMaybes, take)
src/Streamly/Internal/FileSystem/Event/Darwin.hs+1−1
@@ -175,7 +175,7 @@ import GHC.IO.Handle.FD (fdToHandle)
175175import Streamly.Internal.Data.Stream (Stream)
176176import Streamly.Internal.Data.Cont (contListMap)
177177import Streamly.Internal.Data.Parser (Parser)
178−import Streamly.Internal.Data.Array.Type (Array(..))
178+import Streamly.Internal.Data.Array (Array(..))
179179import System.IO (Handle, hClose)
180180
181181import qualified Data.List.NonEmpty as NonEmpty
src/Streamly/Internal/FileSystem/Event/Linux.hs+1−1
@@ -173,7 +173,7 @@ 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.Type (Array(..), byteLength)
176+import Streamly.Internal.Data.Array (Array(..), byteLength)
177177import System.Directory (doesDirectoryExist)
178178import System.IO (Handle, hClose, IOMode(ReadMode))
179179import GHC.IO.Handle.FD (handleToFd)
src/Streamly/Internal/FileSystem/FD.hs+1−1
@@ -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.Type
131+import Streamly.Internal.Data.Array
132132 (Array(..), byteLength, unsafeFreeze, asPtrUnsafe)
133133import Streamly.Internal.System.IO (defaultChunkSize)
134134import Streamly.Internal.Data.Stream (Stream)
src/Streamly/Internal/Network/Inet/TCP.hs+2−2
@@ -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.Type (Array(..), pinnedWriteNUnsafe)
109+import Streamly.Internal.Data.Array (Array(..), pinnedWriteNUnsafe)
110110import Streamly.Internal.Data.Fold (Fold(..))
111111import Streamly.Data.Stream (Stream)
112112import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
@@ -121,7 +121,7 @@ import qualified Network.Socket as Net
121121import qualified Streamly.Data.Array as A
122122import qualified Streamly.Data.Fold as FL
123123import qualified Streamly.Data.Unfold as UF
124−import qualified Streamly.Internal.Data.Array.Type as A
124+import qualified Streamly.Internal.Data.Array as A
125125import qualified Streamly.Internal.Data.Unfold as UF (first, bracketIO)
126126import qualified Streamly.Internal.Data.Fold as FL (Step(..), reduce)
127127import qualified Streamly.Internal.Data.Stream as S
src/Streamly/Internal/Network/Socket.hs+2−2
@@ -86,7 +86,7 @@ import Prelude hiding (read)
8686
8787import qualified Network.Socket as Net
8888
89−import Streamly.Internal.Data.Array.Type (Array(..))
89+import Streamly.Internal.Data.Array (Array(..))
9090import Streamly.Internal.Data.Stream.Chunked (lpackArraysChunksOf)
9191import Streamly.Internal.Data.Fold (Fold)
9292import Streamly.Internal.Data.Stream (Stream)
@@ -96,7 +96,7 @@ import Streamly.Internal.System.IO (defaultChunkSize)
9696
9797import qualified Streamly.Data.Array as A (reader, length)
9898import qualified Streamly.Data.Fold as FL
99−import qualified Streamly.Internal.Data.Array.Type as A
99+import qualified Streamly.Internal.Data.Array as A
100100 (unsafeFreeze, asPtrUnsafe, byteLength, pinnedChunksOf, pinnedWriteN, pinnedWriteNUnsafe)
101101import qualified Streamly.Internal.Data.MutArray as MArray
102102 (MutArray(..), asPtrUnsafe, pinnedNewBytes)
src/Streamly/Internal/System/IOVec.hs+1−1
@@ -34,7 +34,7 @@ import Streamly.Internal.Data.MutArray.Type (length)
3434import Streamly.Internal.Data.SVar.Type (adaptState)
3535import Streamly.Internal.Data.MutArray.Type (Array(..))
3636
37−import qualified Streamly.Internal.Data.Array.Type as Array
37+import qualified Streamly.Internal.Data.Array as Array
3838import qualified Streamly.Internal.Data.MutArray.Type as MArray
3939import qualified Streamly.Internal.Data.Stream as D
4040-}
src/Streamly/Network/Socket.hs+1−1
@@ -137,7 +137,7 @@ import Control.Monad.IO.Class (MonadIO(..))
137137import Data.Word (Word8)
138138import Network.Socket (Socket, SockAddr)
139139import Streamly.Internal.Data.Unfold (Unfold(..))
140−import Streamly.Internal.Data.Array.Type (Array(..))
140+import Streamly.Internal.Data.Array (Array(..))
141141import Streamly.Internal.Data.Unbox (Unbox)
142142
143143import Streamly.Internal.Network.Socket hiding (accept, read, readChunks)
test/Streamly/Test/Data/Array.hs−1
@@ -19,7 +19,6 @@ import Streamly.Internal.Data.MutArray.Type (MutArray)
1919import Test.QuickCheck (chooseInt, listOf)
2020
2121import qualified Streamly.Internal.Data.Array as A
22−import qualified Streamly.Internal.Data.Array.Type as A
2322import qualified Streamly.Internal.Data.MutArray.Type as MA
2423
2524#include "Streamly/Test/Data/Array/CommonImports.hs"
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.Type as Array
13+import qualified Streamly.Internal.Data.Array as Array
1414import qualified Streamly.Internal.Data.Ring as Ring
1515
1616import Prelude as P