5e0307a · streamly · git.iko.soy

core/src/Streamly/Data/ParserK.hs+1−1

compare with master

unifiedsplit

@@ -33,7 +33,7 @@ where

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

34import Streamly.Internal.Data.Fold (Fold)

35import Streamly.Internal.Data.Unbox (Unbox)

36−import qualified Streamly.Internal.Data.Parser.ParserD as ParserD

36+import qualified Streamly.Internal.Data.Parser as ParserD

37

38import Streamly.Internal.Data.Parser.ParserK.Type

39

core/src/Streamly/Internal/Data/Array/Mut/Stream.hs+1−1

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

41import qualified Streamly.Internal.Data.Array.Mut.Type as MArray

42import qualified Streamly.Internal.Data.Fold.Type as FL

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

44−import qualified Streamly.Internal.Data.Parser.ParserD as ParserD

44+import qualified Streamly.Internal.Data.Parser as ParserD

45

46-- | @chunksOf n stream@ groups the elements in the input stream into arrays of

47-- @n@ elements each.

core/src/Streamly/Internal/Data/Fold/Chunked.hs+2−2

@@ -67,12 +67,12 @@ import Streamly.Internal.Data.Unbox (peekWith, sizeOf, Unbox)

67import GHC.Types (SPEC(..))

68import Streamly.Internal.Data.Array.Mut.Type (touch)

69import Streamly.Internal.Data.Array.Type (Array(..))

70−import Streamly.Internal.Data.Parser.ParserD (Initial(..), Step(..))

70+import Streamly.Internal.Data.Parser (Initial(..), Step(..))

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

72

73import qualified Streamly.Internal.Data.Array as Array

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

75−import qualified Streamly.Internal.Data.Parser.ParserD as ParserD

75+import qualified Streamly.Internal.Data.Parser as ParserD

76import qualified Streamly.Internal.Data.Parser.ParserD.Type as ParserD

77import qualified Streamly.Internal.Data.Parser as Parser

78

core/src/Streamly/Internal/Data/Parser/ParserDK.hs+1−1

@@ -254,7 +254,7 @@ import Streamly.Internal.Data.Parser.ParserK.Type (Parser)

254

255import qualified Data.Foldable as Foldable

256import qualified Streamly.Internal.Data.Fold.Type as FL

257−import qualified Streamly.Internal.Data.Parser.ParserD as D

257+import qualified Streamly.Internal.Data.Parser as D

258import qualified Streamly.Internal.Data.Parser.ParserK.Type as K

259

260#ifdef USE_STREAMK

core/src/Streamly/Internal/Data/Producer/Source.hs+2−2

@@ -36,11 +36,11 @@ where

36import Control.Exception (assert)

37import GHC.Exts (SpecConstrAnnotation(..))

38import GHC.Types (SPEC(..))

39−import Streamly.Internal.Data.Parser.ParserD (ParseError(..), Step(..))

39+import Streamly.Internal.Data.Parser (ParseError(..), Step(..))

40import Streamly.Internal.Data.Producer.Type (Producer(..))

41import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))

42

43−import qualified Streamly.Internal.Data.Parser.ParserD as ParserD

43+import qualified Streamly.Internal.Data.Parser as ParserD

44-- import qualified Streamly.Internal.Data.Parser.ParserK.Type as ParserK

45

46import Prelude hiding (read)

core/src/Streamly/Internal/Data/Stream/Chunked.hs+1−1

@@ -95,7 +95,7 @@ import qualified Streamly.Internal.Data.Array.Mut.Type as MA

95import qualified Streamly.Internal.Data.Array.Mut.Stream as AS

96import qualified Streamly.Internal.Data.Fold.Type as FL (Fold(..), Step(..))

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

98−import qualified Streamly.Internal.Data.Parser.ParserD as PRD

98+import qualified Streamly.Internal.Data.Parser as PRD

99 (Parser(..), Initial(..))

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

101import qualified Streamly.Internal.Data.Stream.StreamK as K

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

@@ -85,7 +85,7 @@ import Streamly.Internal.Data.Stream.Type (Stream)

85

86import qualified Streamly.Internal.Data.Array.Type as Array

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

88−import qualified Streamly.Internal.Data.Parser.ParserD as PRD

88+import qualified Streamly.Internal.Data.Parser as PRD

89import qualified Streamly.Internal.Data.Parser.ParserK.Type as PRK

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

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

core/src/Streamly/Internal/Data/Stream/Reduce.hs+2−2

@@ -61,14 +61,14 @@ import Control.Monad.IO.Class (MonadIO(..))

61import Streamly.Internal.Data.Array.Type (Array)

62import Streamly.Internal.Data.Fold.Type (Fold (..))

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

64−import Streamly.Internal.Data.Parser.ParserD (ParseError)

64+import Streamly.Internal.Data.Parser (ParseError)

65import Streamly.Internal.Data.Refold.Type (Refold (..))

66import Streamly.Internal.Data.Stream.Bottom (foldManyPost)

67import Streamly.Internal.Data.Stream.Type (Stream, fromStreamD, toStreamD)

68import Streamly.Internal.Data.Unbox (Unbox)

69

70import qualified Streamly.Internal.Data.Array.Type as Array

71−import qualified Streamly.Internal.Data.Parser.ParserD as ParserD

71+import qualified Streamly.Internal.Data.Parser as ParserD

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

73

74import Prelude hiding (concatMap, map)

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

@@ -98,7 +98,7 @@ import Streamly.Internal.Data.Maybe.Strict (Maybe'(..))

98import qualified Streamly.Internal.Data.Array.Type as Array

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

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

101−import qualified Streamly.Internal.Data.Parser.ParserD as PRD

101+import qualified Streamly.Internal.Data.Parser as PRD

102import qualified Streamly.Internal.Data.Stream.StreamD.Generate as StreamD

103import qualified Streamly.Internal.Data.Stream.StreamD.Nesting as Nesting

104import qualified Streamly.Internal.Data.Stream.StreamD.Transform as StreamD

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

@@ -194,7 +194,7 @@ import Streamly.Internal.Data.Unfold.Type (Unfold(..))

194import qualified Streamly.Internal.Data.Array.Type as A

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

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

197−import qualified Streamly.Internal.Data.Parser.ParserD as PRD

197+import qualified Streamly.Internal.Data.Parser as PRD

198import qualified Streamly.Internal.Data.Ring.Unboxed as RB

199

200import Streamly.Internal.Data.Stream.StreamD.Transform

core/src/Streamly/Internal/Data/Stream/StreamK.hs+1−1

@@ -218,7 +218,7 @@ import Prelude

218 (!!), replicate, reverse, concatMap, iterate, splitAt)

219import Data.Foldable (sum, length)

220import Streamly.Internal.Data.Stream.StreamK.Type

221−import Streamly.Internal.Data.Parser.ParserD (ParseError(..))

221+import Streamly.Internal.Data.Parser (ParseError(..))

222

223#include "DocTestDataStreamK.hs"

224

core/src/Streamly/Internal/Serialize/FromBytes.hs+1−1

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

54 (unsafeIndex, castUnsafe)

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

56 (fromPure, either, satisfy, takeEQ)

57−import qualified Streamly.Internal.Data.Parser.ParserD as PRD

57+import qualified Streamly.Internal.Data.Parser as PRD

58 (Parser(..), Initial(..), Step(..))

59

60-- Note: The () type does not need to have an on-disk representation in theory.

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

@@ -116,7 +116,7 @@ import qualified Streamly.Data.Fold as Fold

116import qualified Streamly.Data.Unfold as Unfold

117import qualified Streamly.Internal.Data.Array.Type as Array

118import qualified Streamly.Internal.Data.Parser as Parser (Parser)

119−import qualified Streamly.Internal.Data.Parser.ParserD as ParserD

119+import qualified Streamly.Internal.Data.Parser as ParserD

120import qualified Streamly.Internal.Data.Stream.StreamD as Stream

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

122

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

@@ -169,7 +169,7 @@ import Streamly.Internal.Data.Unbox (Unbox)

169import qualified Streamly.Internal.Data.Array as A

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

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

172−import qualified Streamly.Internal.Data.Parser.ParserD as PRD

172+import qualified Streamly.Internal.Data.Parser as PRD

173-- import qualified Streamly.Internal.Data.Parser.ParserK.Type as PRK

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

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

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

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

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

190 (Fold, Step(..), takeEndBy_, takeEndBy, catMaybes, take)

191import qualified Streamly.Internal.Data.IsMap as IsMap

192−import qualified Streamly.Internal.Data.Parser.ParserD as PRD (Parser(..))

192+import qualified Streamly.Internal.Data.Parser as PRD (Parser(..))

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

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

195 ( foldMany

test/Streamly/Test/Data/Parser.hs+1−1

@@ -26,7 +26,7 @@ import qualified Test.Hspec as H

26

27import Test.QuickCheck (chooseAny)

28import Control.Monad.Identity (Identity(runIdentity, Identity))

29−import Streamly.Internal.Data.Parser.ParserD (ParseError(..))

29+import Streamly.Internal.Data.Parser (ParseError(..))

30

31#else

32

test/Streamly/Test/Data/Parser/ParserD.hs+1−1

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

16import qualified Streamly.Data.Stream as S

17import qualified Streamly.Internal.Data.Array as A

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

19−import qualified Streamly.Internal.Data.Parser.ParserD as P

19+import qualified Streamly.Internal.Data.Parser as P

20import qualified Streamly.Internal.Data.Producer.Source as Source

21import qualified Streamly.Internal.Data.Producer as Producer

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