59796f1 · streamly · git.iko.soy

benchmark/StreamDOps.hs+1−1

compare with master

unifiedsplit

@@ -18,7 +18,7 @@ import Prelude

18 maxBound, fmap, odd, (==), flip, (<$>), (<*>), round, (/), (**), (<))

19import qualified Prelude as P

20

21−import qualified Streamly.Streams.StreamD as S

21+import qualified Streamly.Internal.Data.Stream.StreamD as S

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

23

24-- We try to keep the total number of iterations same irrespective of nesting

design/inlining.md+1−1

@@ -13,7 +13,7 @@ i.e. phase 0, 1 and 2. We have defined them as follows in `inline.h`:

13## Low Level `fromStreamD/toStreamD` Fusion

14

15The combinators in `Streamly.Prelude` are defined in terms of combinators in

16−`Streamly.Streams.StreamD` (Direct style streams) or `Streamly.Streams.StreamK`

16+`Streamly.Internal.Data.Stream.StreamD` (Direct style streams) or `Streamly.Streams.StreamK`

17(CPS style streams). We convert the stream from `StreamD` to `StreamK`

18representation or vice versa in some cases.

19

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

@@ -142,7 +142,7 @@ import Streamly.Streams.StreamK.Type (IsStream, mkStream)

142

143#if !defined(mingw32_HOST_OS)

144import Streamly.Internal.Memory.Array.Types (groupIOVecsOf)

145−import Streamly.Streams.StreamD (toStreamD)

145+import Streamly.Internal.Data.Stream.StreamD (toStreamD)

146import Streamly.Internal.Data.Stream.StreamD.Type (fromStreamD)

147import qualified Streamly.FileSystem.FDIO as RawIO hiding (write)

148#endif

src/Streamly/Internal/Benchmark/FileIO/Stream.hs+1−1

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

82import qualified Streamly.Internal.Memory.Unicode.Array as IUA

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

84import qualified Streamly.Internal.Prelude as IP

85−import qualified Streamly.Streams.StreamD as D

85+import qualified Streamly.Internal.Data.Stream.StreamD as D

86

87#ifdef INSPECTION

88import Foreign.Storable (Storable)

src/Streamly/Internal/Benchmark/Prelude.hs+1−1

@@ -41,7 +41,7 @@ import qualified GHC.Exts as GHC

41#ifdef INSPECTION

42import Test.Inspection

43

44−import qualified Streamly.Streams.StreamD as D

44+import qualified Streamly.Internal.Data.Stream.StreamD as D

45#endif

46

47import qualified Streamly as S hiding (runStream)

src/Streamly/Internal/Data/Array.hs+1−1

@@ -61,7 +61,7 @@ import Streamly.Internal.Data.Fold.Types (Fold(..))

61import Streamly.Streams.StreamK.Type (IsStream)

62import Streamly.Streams.Serial (SerialT)

63

64−import qualified Streamly.Streams.StreamD as D

64+import qualified Streamly.Internal.Data.Stream.StreamD as D

65

66{-# NOINLINE bottomElement #-}

67bottomElement :: a

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

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

267

268-- import qualified Streamly.Internal.Memory.Array.Types as A

269-- import qualified Streamly.Prelude as S

270−-- import qualified Streamly.Streams.StreamD as D

270+-- import qualified Streamly.Internal.Data.Stream.StreamD as D

271-- import qualified Streamly.Streams.StreamK as K

272-- import qualified Streamly.Streams.Prelude as P

273

src/Streamly/Streams/StreamD.hs → src/Streamly/Internal/Data/Stream/StreamD.hsrenamed+10−10

@@ -19,7 +19,7 @@

19#include "inline.hs"

20

21-- |

22−-- Module : Streamly.Streams.StreamD

22+-- Module : Streamly.Internal.Data.Stream.StreamD

24-- Copyright : (c) Roman Leshchinskiy 2008-2010

25-- Copyright : (c) The University of Glasgow, 2009

@@ -36,13 +36,13 @@

36-- CPS implementation.

37--

38-- @

39−-- import qualified Streamly.Streams.StreamD as D

39+-- import qualified Streamly.Internal.Data.Stream.StreamD as D

40-- @

41

42-- Some of the functions in this file have been adapted from the vector

43-- library, https://hackage.haskell.org/package/vector.

44

45−module Streamly.Streams.StreamD

45+module Streamly.Internal.Data.Stream.StreamD

46 (

47 -- * The stream type

48 Step (..)

@@ -3826,7 +3826,7 @@ decodeUtf8With cfm (Stream step state) =

3826 inputUnderflow =

3827 case cfm of

3828 ErrorOnCodingFailure ->

3829− error "Streamly.Streams.StreamD.decodeUtf8With: Input Underflow"

3829+ error "Streamly.Internal.Data.Stream.StreamD.decodeUtf8With: Input Underflow"

3830 TransliterateCodingFailure -> YieldAndContinue replacementChar Done

3831 {-# INLINE_LATE step' #-}

3832 step' _ gst (FreshPointDecodeInit st) = do

@@ -3860,7 +3860,7 @@ decodeUtf8With cfm (Stream step state) =

3860 12 ->

3861 Skip $

3862 transliterateOrError

3863− "Streamly.Streams.StreamD.decodeUtf8With: Invalid UTF8 codepoint encountered"

3863+ "Streamly.Internal.Data.Stream.StreamD.decodeUtf8With: Invalid UTF8 codepoint encountered"

3864 (FreshPointDecodeInit st)

3865 0 -> error "unreachable state"

3866 _ -> Skip (FreshPointDecoding st sv cp)

@@ -3879,7 +3879,7 @@ decodeUtf8With cfm (Stream step state) =

3879 12 ->

3880 Skip $

3881 transliterateOrError

3882− "Streamly.Streams.StreamD.decodeUtf8With: Invalid UTF8 codepoint encountered"

3882+ "Streamly.Internal.Data.Stream.StreamD.decodeUtf8With: Invalid UTF8 codepoint encountered"

3883 (FreshPointDecodeInit1 s x)

3884 _ -> Skip (FreshPointDecoding s sv cp)

3885 Skip s -> return $ Skip (FreshPointDecoding s statePtr codepointPtr)

@@ -4012,7 +4012,7 @@ decodeUtf8ArraysWith cfm (Stream step state) =

4012 case cfm of

4013 ErrorOnCodingFailure ->

4014 error

4015− "Streamly.Streams.StreamD.decodeUtf8ArraysWith: Input Underflow"

4015+ "Streamly.Internal.Data.Stream.StreamD.decodeUtf8ArraysWith: Input Underflow"

4016 TransliterateCodingFailure -> YAndC replacementChar D

4017 {-# INLINE_LATE step' #-}

4018 step' _ gst (OuterLoop st Nothing) = do

@@ -4061,7 +4061,7 @@ decodeUtf8ArraysWith cfm (Stream step state) =

4061 12 ->

4062 Skip $

4063 transliterateOrError

4064− "Streamly.Streams.StreamD.decodeUtf8ArraysWith: Invalid UTF8 codepoint encountered"

4064+ "Streamly.Internal.Data.Stream.StreamD.decodeUtf8ArraysWith: Invalid UTF8 codepoint encountered"

4065 (InnerLoopDecodeInit st startf (p `plusPtr` 1) end)

4066 0 -> error "unreachable state"

4067 _ -> Skip (InnerLoopDecoding st startf (p `plusPtr` 1) end sv cp)

@@ -4082,7 +4082,7 @@ decodeUtf8ArraysWith cfm (Stream step state) =

4082 12 ->

4083 Skip $

4084 transliterateOrError

4085− "Streamly.Streams.StreamD.decodeUtf8ArraysWith: Invalid UTF8 codepoint encountered"

4085+ "Streamly.Internal.Data.Stream.StreamD.decodeUtf8ArraysWith: Invalid UTF8 codepoint encountered"

4086 (InnerLoopDecodeInit st startf (p `plusPtr` 1) end)

4087 _ -> Skip (InnerLoopDecoding st startf (p `plusPtr` 1) end sv cp)

4088 step' _ _ (YAndC c s) = return $ Yield c s

@@ -4128,7 +4128,7 @@ encodeUtf8 (Stream step state) = Stream step' (EncodeState state WNil)

4128 | x <= 0xFFFF ->

4129 if isSurrogate c

4130 then error

4131− "Streamly.Streams.StreamD.encodeUtf8: Encountered a surrogate"

4131+ "Streamly.Internal.Data.Stream.StreamD.encodeUtf8: Encountered a surrogate"

4132 else Skip (EncodeState s (ord3 c))

4133 | otherwise -> Skip (EncodeState s (ord4 c))

4134 Skip s -> Skip (EncodeState s WNil)

src/Streamly/Internal/Data/Unfold.hs+1−1

@@ -140,7 +140,7 @@ import qualified Prelude

140import qualified Control.Monad.Catch as MC

141import qualified Data.Tuple as Tuple

142import qualified Streamly.Streams.StreamK as K

143−import qualified Streamly.Streams.StreamD as D

143+import qualified Streamly.Internal.Data.Stream.StreamD as D

144

145-------------------------------------------------------------------------------

146-- Input operations

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

@@ -53,7 +53,7 @@ import Streamly.Memory.Array (Array)

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

54

55import qualified Streamly.Internal.Prelude as S

56−import qualified Streamly.Streams.StreamD as D

56+import qualified Streamly.Internal.Data.Stream.StreamD as D

57

58-------------------------------------------------------------------------------

59-- Encoding/Decoding Unicode Characters

src/Streamly/Internal/Memory/Array.hs+1−1

@@ -148,7 +148,7 @@ import Streamly.Streams.StreamK.Type (IsStream)

148import qualified Streamly.Internal.Memory.Array.Types as A

149import qualified Streamly.Streams.Prelude as P

150import qualified Streamly.Streams.Serial as Serial

151−import qualified Streamly.Streams.StreamD as D

151+import qualified Streamly.Internal.Data.Stream.StreamD as D

152import qualified Streamly.Streams.StreamK as K

153

154-------------------------------------------------------------------------------

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

@@ -56,7 +56,7 @@ import Streamly.Streams.StreamK.Type (IsStream)

56import qualified Streamly.Internal.Memory.Array as A

57import qualified Streamly.Internal.Memory.Array.Types as A

58import qualified Streamly.Internal.Prelude as S

59−import qualified Streamly.Streams.StreamD as D

59+import qualified Streamly.Internal.Data.Stream.StreamD as D

60import qualified Streamly.Streams.Prelude as P

61

62-- XXX efficiently compare two streams of arrays. Two streams can have chunks

src/Streamly/Internal/Prelude.hs+3−3

@@ -451,7 +451,7 @@ import Streamly.Streams.Async (mkAsync')

451import Streamly.Streams.Combinators (inspectMode, maxYields)

452import Streamly.Streams.Prelude

453 (fromStreamS, toStreamS, foldWith, foldMapWith, forEachWith)

454−import Streamly.Streams.StreamD (fromStreamD, toStreamD)

454+import Streamly.Internal.Data.Stream.StreamD (fromStreamD, toStreamD)

455import Streamly.Streams.StreamK (IsStream((|:), consM))

456import Streamly.Streams.Serial (SerialT)

457import Streamly.Internal.Data.Pipe.Types (Pipe (..))

@@ -466,12 +466,12 @@ import qualified Streamly.Data.Fold as FL

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

467import qualified Streamly.Streams.Prelude as P

468import qualified Streamly.Streams.StreamK as K

469−import qualified Streamly.Streams.StreamD as D

469+import qualified Streamly.Internal.Data.Stream.StreamD as D

470

471#ifdef USE_STREAMK_ONLY

472import qualified Streamly.Streams.StreamK as S

473#else

474−import qualified Streamly.Streams.StreamD as S

474+import qualified Streamly.Internal.Data.Stream.StreamD as S

475#endif

476

477import qualified Streamly.Streams.Serial as Serial

src/Streamly/Streams/Enumeration.hs+2−2

@@ -62,10 +62,10 @@ import Data.Word

62import Numeric.Natural

63import Data.Functor.Identity (Identity(..))

64

65−import Streamly.Streams.StreamD (fromStreamD)

65+import Streamly.Internal.Data.Stream.StreamD (fromStreamD)

66import Streamly.Streams.StreamK (IsStream(..))

67

68−import qualified Streamly.Streams.StreamD as D

68+import qualified Streamly.Internal.Data.Stream.StreamD as D

69import qualified Streamly.Streams.Serial as Serial

70

71-------------------------------------------------------------------------------

src/Streamly/Streams/Parallel.hs+1−1

@@ -62,7 +62,7 @@ import Streamly.Streams.StreamK (IsStream(..), Stream, mkStream, foldStream,

62import Streamly.Internal.Data.SVar hiding (handleChildException)

63

64import qualified Streamly.Streams.StreamK as K

65−import qualified Streamly.Streams.StreamD as D

65+import qualified Streamly.Internal.Data.Stream.StreamD as D

66

67#include "Instances.hs"

68

src/Streamly/Streams/Prelude.hs+2−2

@@ -72,12 +72,12 @@ import Streamly.Internal.Data.Fold.Types (Fold (..))

72#ifdef USE_STREAMK_ONLY

73import qualified Streamly.Streams.StreamK as S

74#else

75−import qualified Streamly.Streams.StreamD as S

75+import qualified Streamly.Internal.Data.Stream.StreamD as S

76#endif

77

78import Streamly.Streams.StreamK (IsStream(..))

79import qualified Streamly.Streams.StreamK as K

80−import qualified Streamly.Streams.StreamD as D

80+import qualified Streamly.Internal.Data.Stream.StreamD as D

81

82------------------------------------------------------------------------------

83-- Conversion to and from direct style stream

src/Streamly/Streams/Serial.hs+1−1

@@ -71,7 +71,7 @@ import Streamly.Streams.StreamK (IsStream(..), adapt, Stream, mkStream,

71 foldStream)

72import qualified Streamly.Streams.Prelude as P

73import qualified Streamly.Streams.StreamK as K

74−import qualified Streamly.Streams.StreamD as D

74+import qualified Streamly.Internal.Data.Stream.StreamD as D

75

76#include "Instances.hs"

77#include "inline.hs"

streamly.cabal+3−3

@@ -282,7 +282,7 @@ library

282 , Streamly.Streams.StreamK

283 , Streamly.Streams.StreamDK.Type

284 , Streamly.Streams.StreamDK

285− , Streamly.Streams.StreamD

285+ , Streamly.Internal.Data.Stream.StreamD

286 , Streamly.Streams.Enumeration

287 , Streamly.Streams.Prelude

288

@@ -728,7 +728,7 @@ benchmark base

728 , Streamly.Streams.StreamDK

729 , Streamly.Streams.StreamK.Type

730 , Streamly.Streams.StreamK

731− , Streamly.Streams.StreamD

731+ , Streamly.Internal.Data.Stream.StreamD

732 , Streamly.Streams.Prelude

733 , Streamly.FileSystem.IOVec

734

@@ -782,7 +782,7 @@ executable nano-bench

782 , Streamly.Streams.StreamK.Type

783 , Streamly.Streams.StreamK

784 , Streamly.FileSystem.IOVec

785− , Streamly.Streams.StreamD

785+ , Streamly.Internal.Data.Stream.StreamD

786 if flag(dev)

787 buildable: True

788 build-depends: