971b668 · streamly · git.iko.soy

benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs−1

compare with master

unifiedsplit

@@ -33,7 +33,6 @@ import Prelude hiding

33import qualified Prelude as P

34import qualified Data.List as List

35

36−import qualified Streamly.Internal.Data.Stream.StreamK.Type as S

37import qualified Streamly.Internal.Data.StreamK as S

36import qualified Streamly.Internal.Data.StreamK as S

38

37

39import Gauge (bench, nfIO, bgroup, Benchmark, defaultMain)

38import Gauge (bench, nfIO, bgroup, Benchmark, defaultMain)

benchmark/Streamly/Benchmark/Data/Stream/ToStreamK.hs−1

@@ -33,7 +33,6 @@ import Prelude hiding

33import qualified Prelude as P

34-- import qualified Data.List as List

35

36−import qualified Streamly.Internal.Data.Stream.StreamK.Type as S

37import qualified Streamly.Internal.Data.StreamK as S

36import qualified Streamly.Internal.Data.StreamK as S

38import qualified Streamly.Internal.Data.Stream as D

37import qualified Streamly.Internal.Data.Stream as D

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

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

core/src/Streamly/Internal/Data/StreamK.hs+3−78

@@ -17,39 +17,14 @@ module Streamly.Internal.Data.StreamK

17 -- $setup

18

19 -- * The stream type

20− Stream

20+ module Streamly.Internal.Data.Stream.StreamK.Type

21+

21 , StreamK(..)

22 , StreamK(..)

23+ , fromList

22 , fromStream

24 , fromStream

23 , toStream

25 , toStream

24

26

25− , CrossStreamK

26− , unCross

27− , mkCross

28−

29− -- * Construction Primitives

30− , mkStream

31− , nil

32− , nilM

33− , cons

34− , (.:)

35−

36− -- * Elimination Primitives

37− , foldStream

38− , foldStreamShared

39−

40− -- * Transformation Primitives

41− , unShare

42−

43− -- * Deconstruction

44− , uncons

45−

46− -- * Generation

47− -- ** Unfolds

48− , unfoldr

49− , unfoldrM

50−

51 -- ** Specialized Generation

27 -- ** Specialized Generation

52− , repeat

53 , repeatM

28 , repeatM

54 , replicate

29 , replicate

55 , replicateM

30 , replicateM

@@ -58,28 +33,10 @@ module Streamly.Internal.Data.StreamK

58 , iterate

33 , iterate

59 , iterateM

34 , iterateM

60

35

61− -- ** Conversions

62− , fromPure

63− , fromEffect

64− , fromFoldable

65− , fromList

66−

67− -- * foldr/build

68− , foldrS

69− , foldrSM

70− , buildS

71− , augmentS

72−

73 -- * Elimination

36 -- * Elimination

74 -- ** General Folds

37 -- ** General Folds

75− , foldr

76 , foldr1

38 , foldr1

77− , foldrM

78−

79− , foldl'

80 , foldlM'

39 , foldlM'

81− , foldlS

82− , foldlx'

83 , foldlMx'

40 , foldlMx'

84 , fold

41 , fold

85 , foldBreak

42 , foldBreak

@@ -91,11 +48,7 @@ module Streamly.Internal.Data.StreamK

91 , parseChunks

48 , parseChunks

92

49

93 -- ** Specialized Folds

50 -- ** Specialized Folds

94− , drain

95− , null

96 , head

51 , head

97− , tail

98− , init

99 , elem

52 , elem

100 , notElem

53 , notElem

101 , all

54 , all

@@ -131,7 +84,6 @@ module Streamly.Internal.Data.StreamK

131 , dropWhile

84 , dropWhile

132

85

133 -- ** Mapping

86 -- ** Mapping

134− , map

135 , mapM

87 , mapM

136 , sequence

88 , sequence

137

89

@@ -144,7 +96,6 @@ module Streamly.Internal.Data.StreamK

144 , deleteBy

96 , deleteBy

145

97

146 -- ** Reordering

98 -- ** Reordering

147− , reverse

148 , sortBy

99 , sortBy

149

100

150 -- ** Map and Filter

101 -- ** Map and Filter

@@ -158,40 +109,14 @@ module Streamly.Internal.Data.StreamK

158 , mergeBy

109 , mergeBy

159 , mergeByM

110 , mergeByM

160

111

161− -- ** Nesting

162− , crossApplyWith

163− , crossApply

164− , crossApplySnd

165− , crossApplyFst

166− , crossWith

167−

168− , concatMapWith

169− , concatMap

170− , concatEffect

171− , bindWith

172− , concatIterateWith

173− , concatIterateLeftsWith

174− , concatIterateScanWith

175−

176− , mergeMapWith

177− , mergeIterateWith

178−

179 -- ** Transformation comprehensions

112 -- ** Transformation comprehensions

180 , the

113 , the

181

114

182− -- * Semigroup Style Composition

183− , append

184− , interleave

185−

186 -- * Exceptions

115 -- * Exceptions

187 , handle

116 , handle

188

117

189 -- * Resource Management

118 -- * Resource Management

190 , bracketIO

119 , bracketIO

191−

192− -- * Utilities

193− , consM

194− , mfix

195 )

120 )

196where

121where

197

122

core/streamly-core.cabal+2−1

@@ -290,7 +290,6 @@ library

290

291 -- streamly-core-stream-types

292 , Streamly.Internal.Data.SVar.Type

293− , Streamly.Internal.Data.Stream.StreamK.Type

294 , Streamly.Internal.Data.Refold.Type

293 , Streamly.Internal.Data.Refold.Type

295 , Streamly.Internal.Data.Producer.Type

294 , Streamly.Internal.Data.Producer.Type

296 , Streamly.Internal.Data.Producer

295 , Streamly.Internal.Data.Producer

@@ -426,6 +425,8 @@ library

426 , Streamly.Internal.Data.Stream.StreamD.Transformer

425 , Streamly.Internal.Data.Stream.StreamD.Transformer

427 , Streamly.Internal.Data.Stream.StreamD.Type

426 , Streamly.Internal.Data.Stream.StreamD.Type

428

427

428+ , Streamly.Internal.Data.Stream.StreamK.Type

429+

429 , Streamly.Internal.Data.Unfold.Type

430 , Streamly.Internal.Data.Unfold.Type

430 , Streamly.Internal.Data.Unfold.Enumeration

431 , Streamly.Internal.Data.Unfold.Enumeration

431

432

src/Streamly/Internal/Data/Stream/Ahead.hs+2−2

@@ -54,9 +54,9 @@ import qualified Data.Heap as H

54

55import Streamly.Internal.Control.Concurrent

56 (MonadRunInIO, MonadAsync, askRunInIO, restoreM)

57−import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

57+import Streamly.Internal.Data.StreamK (Stream)

58

59−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

59+import qualified Streamly.Internal.Data.StreamK as K

60 (foldStreamShared, cons, mkStream, foldStream, fromEffect

61 , nil, concatMapWith, fromPure, bindWith)

62import qualified Streamly.Internal.Data.Stream as D

src/Streamly/Internal/Data/Stream/Async.hs+2−2

@@ -64,10 +64,10 @@ import Streamly.Internal.Control.Concurrent

64 (MonadRunInIO, MonadAsync, askRunInIO, restoreM)

65import Streamly.Internal.Data.Atomics

66 (atomicModifyIORefCAS, atomicModifyIORefCAS_)

67−import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

67+import Streamly.Internal.Data.StreamK (Stream)

68import Streamly.Internal.Data.Stream.SVar.Generate (fromSVar, fromSVarD)

69

70−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

70+import qualified Streamly.Internal.Data.StreamK as K

71 (foldStreamShared, mkStream, foldStream, fromEffect

72 , nil, concatMapWith, fromPure, bindWith)

73import qualified Streamly.Internal.Data.Stream as D

src/Streamly/Internal/Data/Stream/Channel/Types.hs+1−1

@@ -133,7 +133,7 @@ import Streamly.Internal.Data.Time.Units (AbsTime, NanoSecond64(..))

133import System.IO (hPutStrLn, stderr)

134

135import qualified Data.Set as Set

136−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

136+import qualified Streamly.Internal.Data.StreamK as K

137

138------------------------------------------------------------------------------

139-- Common types

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

@@ -110,14 +110,12 @@ import Streamly.Internal.Data.Stream.Channel.Types

110 , concatMapDivK

111 )

112import Streamly.Internal.Data.Stream.Channel.Worker (sendWithDoorBell)

113−import Streamly.Internal.Data.Stream (Stream)

113+import Streamly.Internal.Data.Stream (Stream, Step(..))

114−import Streamly.Internal.Data.Stream (Step(..))

115

114

116import qualified Streamly.Internal.Data.IORef.Unboxed as Unboxed

115import qualified Streamly.Internal.Data.IORef.Unboxed as Unboxed

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

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

118import qualified Streamly.Internal.Data.Stream as D

117import qualified Streamly.Internal.Data.Stream as D

119import qualified Streamly.Internal.Data.StreamK as K

118import qualified Streamly.Internal.Data.StreamK as K

120−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

121

119

122import Prelude hiding (mapM, sequence, concat, concatMap, zipWith)

120import Prelude hiding (mapM, sequence, concat, concatMap, zipWith)

123import Streamly.Internal.Data.Stream.Concurrent.Channel

121import Streamly.Internal.Data.Stream.Concurrent.Channel

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

@@ -36,7 +36,7 @@ import Streamly.Internal.Data.Stream.Channel.Dispatcher (modifyThread)

36

37import qualified Data.Heap as H

38import qualified Data.Set as Set

39−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

39+import qualified Streamly.Internal.Data.StreamK as K

40

41import Streamly.Internal.Data.Stream.Concurrent.Channel.Consumer

42import Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher

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

@@ -24,7 +24,7 @@ import Streamly.Internal.Control.Concurrent

24import Streamly.Internal.Data.Stream.Channel.Dispatcher (delThread)

25

26import qualified Data.Set as Set

27−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

27+import qualified Streamly.Internal.Data.StreamK as K

28

29import Streamly.Internal.Data.Stream.Concurrent.Channel.Consumer

30import Streamly.Internal.Data.Stream.Concurrent.Channel.Type

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

@@ -40,7 +40,7 @@ import System.Mem (performMajorGC)

40

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

42import qualified Streamly.Internal.Data.Stream as D

43−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

43+import qualified Streamly.Internal.Data.StreamK as K

44

45import Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher

46import Streamly.Internal.Data.Stream.Concurrent.Channel.Type

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

@@ -28,7 +28,7 @@ import Streamly.Internal.Data.Atomics (atomicModifyIORefCAS_)

28import Streamly.Internal.Data.Stream.Channel.Dispatcher (dumpSVarStats)

29import Streamly.Internal.Data.Stream.Channel.Worker

30 (sendYield, sendStop, sendWithDoorBell)

31−import Streamly.Internal.Data.Stream.StreamK.Type (StreamK)

31+import Streamly.Internal.Data.StreamK (StreamK)

32

33import Streamly.Internal.Data.Stream.Channel.Types

34

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

@@ -31,7 +31,7 @@ import Data.Int (Int64)

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

32 (IsStream, mkStream, foldStreamShared)

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

34−import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

34+import Streamly.Internal.Data.StreamK (Stream)

35

36import Streamly.Internal.Data.SVar

37

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

@@ -85,7 +85,7 @@ import qualified Streamly.Internal.Data.Array.Type as A

85import qualified Streamly.Internal.Data.Stream.Async as Async

86import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream

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

88−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

88+import qualified Streamly.Internal.Data.StreamK as K

89 (fromPure, fromEffect, repeatMWith, reverse)

90import qualified Streamly.Internal.Data.Stream as D

91 (repeatM, timesWith, foldAddLazy, map, scanlMAfter', postscanlMAfter'

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

@@ -177,7 +177,7 @@ import qualified Streamly.Internal.Data.Stream as D

177 , notElem, all, any, minimum, minimumBy, maximum, maximumBy, the, lookup

178 , find, findM, toListRev, isPrefixOf, isSubsequenceOf, stripPrefix, (!!)

179 , fromStreamK, foldrM, parseD)

180−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

180+import qualified Streamly.Internal.Data.StreamK as K

181 (uncons, foldlS, tail, init)

182import qualified System.IO as IO

183

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

@@ -183,9 +183,8 @@ import qualified Streamly.Internal.Data.Stream as D

183 , roundRobin, mergeByM, unfoldMany, unfoldInterleave, intersperse

184 , unfoldRoundRobin, interpose, interposeSuffix, gintercalate

185 , gintercalateSuffix, intersperseMSuffix)

186−import qualified Streamly.Internal.Data.StreamK as K (mergeBy, mergeByM)

186+import qualified Streamly.Internal.Data.StreamK as K

187−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

188− (interleave, append, mergeMapWith)

187+ (interleave, append, mergeMapWith, mergeBy, mergeByM)

189import qualified Streamly.Internal.Data.Stream.ZipAsync as ZipAsync

188import qualified Streamly.Internal.Data.Stream.ZipAsync as ZipAsync

190

189

191import Prelude hiding (concat, concatMap, zipWith)

190import Prelude hiding (concat, concatMap, zipWith)

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

@@ -114,7 +114,7 @@ import qualified Streamly.Internal.Data.Stream as D

114 (unfold, unfoldr, toStreamK, unfoldr, repeat, replicate, replicateM

115 , fromIndices, fromIndicesM, iterate, iterateM, toStreamK, fromListM

116 , fromListM)

117−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

117+import qualified Streamly.Internal.Data.StreamK as K

118 (unfoldr, unfoldrMWith, replicateMWith, fromIndicesMWith, iterateMWith

119 , mfix, fromFoldable, fromFoldableM)

120import qualified Streamly.Internal.Data.Stream.Serial as Stream (fromStreamK)

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

@@ -264,7 +264,7 @@ import qualified Streamly.Internal.Data.Stream as D

264 , intersperseM_, intersperseMSuffix, intersperseMSuffix_

265 , intersperseMSuffixWith, indexed, indexedR, rollingMap, rollingMapM

266 , rollingMap2, mapMaybe, mapMaybeM)

267−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

267+import qualified Streamly.Internal.Data.StreamK as K

268 (foldrS, foldrSShared, mapMWith)

269import qualified Prelude

270

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

@@ -123,7 +123,7 @@ import qualified Streamly.Internal.Data.Stream as D

123 (Stream(..), toStreamK, fromStreamK

124 , drain, eqBy, cmpBy, fromList, toList, foldrMx, foldlMx'

125 , foldlx', foldl', fold)

126−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

126+import qualified Streamly.Internal.Data.StreamK as K

127 (StreamK(..), cons, fromEffect

128 , nil, fromPure, bindWith, drain

129 , fromFoldable, nilM, repeat)

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

@@ -69,7 +69,7 @@ import Streamly.Internal.Control.Concurrent (MonadAsync)

69import Streamly.Internal.Data.Stream (Step(..))

70

71import qualified Data.Set as Set

72−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

72+import qualified Streamly.Internal.Data.StreamK as K

73 (StreamK, foldStreamShared, mkStream, foldStream, fromEffect

74 , nil, concatMapWith, fromPure, bindWith)

75import qualified Streamly.Internal.Data.Stream as D

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

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

42

43import qualified Streamly.Internal.Data.Stream as D

44 (Stream(..), Step(..), fold)

45−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

45+import qualified Streamly.Internal.Data.StreamK as K

46 (Stream, mkStream, foldStream, foldStreamShared, nilM)

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

48 (fromStreamK, toStreamK)

src/Streamly/Internal/Data/Stream/SVar/Generate.hs+1−1

@@ -45,7 +45,7 @@ import System.Mem (performMajorGC)

45

46import qualified Streamly.Internal.Data.Stream as D

47 (Stream(..), Step(..))

48−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

48+import qualified Streamly.Internal.Data.StreamK as K

49 (Stream, foldStreamShared, mkStream, foldStream)

50import qualified Streamly.Internal.Data.Stream.Serial as Stream (fromStreamK)

51

src/Streamly/Internal/Data/Stream/Serial.hs+2−2

@@ -70,11 +70,11 @@ import Text.Read

70 , readListPrecDefault)

71import Streamly.Internal.BaseCompat ((#.))

72import Streamly.Internal.Data.Maybe.Strict (Maybe'(..), toMaybe)

73−import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

73+import Streamly.Internal.Data.StreamK (Stream)

74

75import qualified Streamly.Internal.Data.Stream.Common as P

76import qualified Streamly.Internal.Data.Stream as D

77−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

77+import qualified Streamly.Internal.Data.StreamK as K

78

79import Prelude hiding (map, mapM, repeat, filter)

80

src/Streamly/Internal/Data/Stream/Zip.hs+2−2

@@ -46,10 +46,10 @@ import Text.Read

46import Streamly.Internal.BaseCompat ((#.))

47import Streamly.Internal.Data.Maybe.Strict (Maybe'(..), toMaybe)

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

49−import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

49+import Streamly.Internal.Data.StreamK (Stream)

50

51import qualified Streamly.Internal.Data.Stream.Common as P

52−import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

52+import qualified Streamly.Internal.Data.StreamK as K

53import qualified Streamly.Internal.Data.Stream as D

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

55

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

@@ -23,7 +23,7 @@ module Streamly.Internal.Data.Stream.ZipAsync {-# DEPRECATED "Please use \"Strea

23where

24

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

26−import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

26+import Streamly.Internal.Data.StreamK (Stream)

27

28import qualified Streamly.Internal.Data.StreamK as K

29 (mkStream, foldStream, zipWithM, consM)

src/Streamly/Internal/FileSystem/FD.hs+1−1

@@ -151,7 +151,7 @@ import qualified Streamly.Internal.Data.Stream.Chunked as AS

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

152import qualified Streamly.Internal.Data.Stream as D

153 (Stream(..), Step(..))

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

154+import qualified Streamly.Internal.Data.StreamK as K (mkStream)

155

156

157-------------------------------------------------------------------------------

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

@@ -105,7 +105,7 @@ import qualified Streamly.Internal.Data.Stream as D

105 (Stream(..), Step(..))

106import qualified Streamly.Data.Unfold as UF

107import qualified Streamly.Internal.Data.Unfold as UF (first, map)

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

108+import qualified Streamly.Internal.Data.StreamK as K (mkStream)

109

110-- $setup

111-- >>> :m