git.iko.soy/streamly
on master help sign in
Stop exposing internal Prelude functions via Internal

They are now exposed via Internal.Prelude

commitee6be006b27b5ee666242d369c1b8197cf87f50e authorHarendra Kumar <harendra.kumar@gmail.com> dateSat 21 Sep 2019, 21:37 (7 years ago) parent6b98e07
6 files changed+21−21
compare with master
unifiedsplit
benchmark/Linear.hs+3−2 src/Streamly/Benchmark/FileIO/Array.hs+1−1 src/Streamly/Benchmark/FileIO/Stream.hs+7−6 src/Streamly/Benchmark/Prelude.hs+1−1 src/Streamly/Internal.hs+1−11 src/Streamly/Internal/Prelude.hs+8
benchmark/Linear.hs+3−2
@@ -21,6 +21,7 @@ import qualified Streamly.Benchmark.Prelude as Ops
2121import Streamly
2222import qualified Streamly.Fold as FL
2323import qualified Streamly.Internal as Internal
24+import qualified Streamly.Internal.Prelude as IP
2425--import qualified Streamly.Pipe as Pipe
2526import qualified Streamly.Memory.Array as A
2627import qualified Streamly.Prelude as S
@@ -235,8 +236,8 @@ main =
235236
236237 , benchIOSink "toList" (S.runFold FL.toList)
237238 , benchIOSink "toListRevF" (S.runFold Internal.toListRevF)
238− , benchIOSink "toStream" (S.runFold Internal.toStream)
239− , benchIOSink "toStreamRev" (S.runFold Internal.toStreamRev)
239+ , benchIOSink "toStream" (S.runFold IP.toStream)
240+ , benchIOSink "toStreamRev" (S.runFold IP.toStreamRev)
240241 , benchIOSink "writeN" (S.runFold (A.writeN Ops.value))
241242
242243 , benchIOSink "index" (S.runFold (FL.index Ops.maxValue))
src/Streamly/Benchmark/FileIO/Array.hs+1−1
@@ -43,7 +43,7 @@ import qualified Streamly.FileSystem.Handle as FH
4343import qualified Streamly.Memory.Array as A
4444import qualified Streamly.Prelude as S
4545import qualified Streamly.Data.String as SS
46−import qualified Streamly.Internal as Internal
46+import qualified Streamly.Internal.Prelude as Internal
4747
4848#ifdef INSPECTION
4949import Foreign.Storable (Storable)
src/Streamly/Benchmark/FileIO/Stream.hs+7−6
@@ -63,6 +63,7 @@ import qualified Streamly.Internal.Prelude as S
6363import qualified Streamly.Fold as FL
6464import qualified Streamly.Data.String as SS
6565import qualified Streamly.Internal as Internal
66+import qualified Streamly.Internal.Prelude as IP
6667import qualified Streamly.Streams.StreamD as D
6768
6869#ifdef INSPECTION
@@ -134,7 +135,7 @@ countLinesU inh =
134135 S.length
135136 $ SS.foldLines FL.drain
136137 $ SS.decodeChar8
137− $ Internal.concatMapU Internal.readU (FH.readArrays inh)
138+ $ IP.concatMapU Internal.readU (FH.readArrays inh)
138139
139140#ifdef INSPECTION
140141inspect $ hasNoTypeClasses 'countLinesU
@@ -343,7 +344,7 @@ isSp = isSpace . chr . fromIntegral
343344wordsUnwordsCopyWord8 :: Handle -> Handle -> IO ()
344345wordsUnwordsCopyWord8 inh outh =
345346 S.runFold (FH.write outh)
346− $ Internal.concatMapU Internal.fromList
347+ $ IP.concatMapU Internal.fromList
347348 $ S.intersperse [32]
348349 $ S.wordsBy isSp FL.toList
349350 $ FH.read inh
@@ -360,7 +361,7 @@ wordsUnwordsCopy :: Handle -> Handle -> IO ()
360361wordsUnwordsCopy inh outh =
361362 S.runFold (FH.write outh)
362363 $ SS.encodeChar8
363− $ Internal.concatMapU Internal.fromList
364+ $ IP.concatMapU Internal.fromList
364365 $ S.intersperse " "
365366 -- Array allocation is too expensive for such small strings. So just use
366367 -- lists instead.
@@ -439,7 +440,7 @@ inspect $ 'wordsBy `hasNoType` ''D.ConcatMapUState
439440{-# INLINE splitOnSeq #-}
440441splitOnSeq :: String -> Handle -> IO Int
441442splitOnSeq str inh =
442− (S.length $ Internal.splitOnSeq (toarr str) FL.drain
443+ (S.length $ IP.splitOnSeq (toarr str) FL.drain
443444 $ FH.read inh) -- >>= print
444445
445446#ifdef INSPECTION
@@ -453,7 +454,7 @@ inspect $ hasNoTypeClasses 'splitOnSeq
453454{-# INLINE splitOnSeqUtf8 #-}
454455splitOnSeqUtf8 :: String -> Handle -> IO Int
455456splitOnSeqUtf8 str inh =
456− (S.length $ Internal.splitOnSeq (A.fromList str) FL.drain
457+ (S.length $ IP.splitOnSeq (A.fromList str) FL.drain
457458 $ SS.decodeUtf8ArraysLenient
458459 $ FH.readArrays inh) -- >>= print
459460
@@ -461,7 +462,7 @@ splitOnSeqUtf8 str inh =
461462{-# INLINE splitOnSuffixSeq #-}
462463splitOnSuffixSeq :: String -> Handle -> IO Int
463464splitOnSuffixSeq str inh =
464− (S.length $ Internal.splitOnSuffixSeq (toarr str) FL.drain
465+ (S.length $ IP.splitOnSuffixSeq (toarr str) FL.drain
465466 $ FH.read inh) -- >>= print
466467
467468#ifdef INSPECTION
src/Streamly/Benchmark/Prelude.hs+1−1
@@ -45,7 +45,7 @@ import qualified Streamly.Streams.StreamD as D
4545
4646import qualified Streamly as S hiding (foldMapWith, runStream)
4747import qualified Streamly.Prelude as S
48−import qualified Streamly.Internal as Internal
48+import qualified Streamly.Internal.Prelude as Internal
4949import qualified Streamly.Unfold as UF
5050-- import qualified Streamly.Pipe as Pipe
5151
src/Streamly/Internal.hs+1−11
@@ -21,17 +21,9 @@ module Streamly.Internal
2121 -- * Diagnostics
2222 inspectMode
2323
24− -- * Streamly.Prelude Experimental Exports
25− , toListRevF
26− , tapAsync
27−
28− , wSerialFst
29− , wSerialMin
30− , parallelFst
31− , parallelMin
32−
3324 -- * Streamly.Fold Experimental Exports
3425 , Fold (..)
26+ , toListRevF
3527 , rollingHash
3628 , rollingHashWithSalt
3729 , lmap
@@ -60,8 +52,6 @@ import Prelude hiding (break, span, splitAt)
6052
6153import Streamly.Memory.Array.Types (readU)
6254import Streamly.Streams.Combinators (inspectMode)
63−import Streamly.Streams.Parallel (tapAsync, parallelFst, parallelMin)
64−import Streamly.Streams.Serial (wSerialFst, wSerialMin)
6555import Streamly.Unfold.Types (Unfold(..))
6656import Streamly.Unfold (fromList)
6757
src/Streamly/Internal/Prelude.hs+8
@@ -221,9 +221,16 @@ module Streamly.Internal.Prelude
221221 , interleaveFst
222222 , interleaveMin
223223
224+ , Serial.wSerialFst
225+ , Serial.wSerialMin
226+
224227 -- ** Scheduling
225228 , roundrobin
226229
230+ -- ** Parallel
231+ , Par.parallelFst
232+ , Par.parallelMin
233+
227234 -- ** Merging
228235
229236 -- , merge
@@ -312,6 +319,7 @@ module Streamly.Internal.Prelude
312319 -- ** Distributing
313320 , trace
314321 , tap
322+ , Par.tapAsync
315323
316324 -- * Windowed Classification
317325