a03e287 · streamly · git.iko.soy

git.iko.soy/streamly

rename Parser module to ParserD

The top level module "Parser" will be using both ParserK and ParserD.

commita03e2872a61223e37faa72aa35a391c6fd95cb51 authorHarendra Kumar <harendra@composewell.com> dateTue 14 Apr 2020, 19:22 (7 years ago) parent12fef43

14 files changed+57−42

compare with master

unifiedsplit

benchmark/Chart.hs+7−7

@@ -28,7 +28,7 @@ data BenchType

2828 | LinearAsync

2929 | LinearRate

3030 | NestedConcurrent

31− | Parser

31+ | ParserD

3232 | ParserK

3333 | Base

3434 | FileIO

@@ -82,7 +82,7 @@ parseBench = do

8282 Just "linear-async" -> setBenchType LinearAsync

8383 Just "linear-rate" -> setBenchType LinearRate

8484 Just "nested-concurrent" -> setBenchType NestedConcurrent

85− Just "parser" -> setBenchType Parser

85+ Just "parserD" -> setBenchType ParserD

8686 Just "parserK" -> setBenchType ParserK

8787 Just "base" -> setBenchType Base

8888 Just "fileio" -> setBenchType FileIO

@@ -364,11 +364,11 @@ main = do

364364 (makeStreamComparisonGraphs "nested-concurrent" nestedBenchPrefixes)

365365 "charts/nested-concurrent/results.csv"

366366 "charts/nested-concurrent"

367− Parser -> benchShow opts cfg

368− { title = Just "Parsers" }

369− (makeGraphs "parser")

370− "charts/parser/results.csv"

371− "charts/parser"

367+ ParserD -> benchShow opts cfg

368+ { title = Just "ParserD" }

369+ (makeGraphs "parserD")

370+ "charts/parserD/results.csv"

371+ "charts/parserD"

372372 ParserK -> benchShow opts cfg

373373 { title = Just "ParserK" }

374374 (makeGraphs "parserK")

benchmark/Streamly/Benchmark/Data/Parser.hs → benchmark/Streamly/Benchmark/Data/ParserD.hsrenamed+2−2

@@ -1,5 +1,5 @@

11-- |

2−-- Module : Streamly.Benchmark.Data.Parser

2+-- Module : Streamly.Benchmark.Data.ParserD

44--

55-- License : MIT

@@ -24,7 +24,7 @@ import qualified Control.Applicative as AP

2424import qualified Streamly as S hiding (runStream)

2525import qualified Streamly.Prelude as S

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

27−import qualified Streamly.Internal.Data.Parser as PR

27+import qualified Streamly.Internal.Data.Parser.ParserD as PR

2828import qualified Streamly.Internal.Prelude as IP

2929

3030import Gauge

benchmark/Streamly/Benchmark/Data/ParserK.hs+2−2

@@ -22,8 +22,8 @@ import qualified Data.Traversable as TR

2222import qualified Control.Applicative as AP

2323import qualified Streamly as S hiding (runStream)

2424import qualified Streamly.Prelude as S

25−import qualified Streamly.Internal.Data.ParserK.Types as PR

26−import qualified Streamly.Internal.Data.Parser as PRD

25+import qualified Streamly.Internal.Data.Parser.ParserK.Types as PR

26+import qualified Streamly.Internal.Data.Parser.ParserD as PRD

2727import qualified Streamly.Internal.Prelude as IP

2828

2929import Gauge

benchmark/Streamly/Benchmark/FileIO/Stream.hs+1−1

@@ -88,7 +88,7 @@ import qualified Streamly.Data.Unicode.Stream as SS

8888import qualified Streamly.Internal.Data.Unicode.Stream as IUS

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

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

91−import qualified Streamly.Internal.Data.Parser as PR

91+import qualified Streamly.Internal.Data.Parser.ParserD as PR

9292import qualified Streamly.Internal.Prelude as IP

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

9494

benchmark/streamly-benchmarks.cabal+2−2

@@ -247,12 +247,12 @@ benchmark unfold

247247 else

248248 buildable: True

249249

250−benchmark parser

250+benchmark parserD

251251 import: bench-options

252252 type: exitcode-stdio-1.0

253253 ghc-options: -with-rtsopts "-T -K36K -M16M"

254254 hs-source-dirs: ., Streamly/Benchmark/Data

255− main-is: Parser.hs

255+ main-is: ParserD.hs

256256 if impl(ghcjs)

257257 buildable: False

258258 else

src/Streamly/Internal/Data/Parser.hs → src/Streamly/Internal/Data/Parser/ParserD.hsrenamed+5−5

@@ -3,7 +3,7 @@

33{-# LANGUAGE ScopedTypeVariables #-}

55-- |

6−-- Module : Streamly.Internal.Data.Parser

6+-- Module : Streamly.Internal.Data.Parser.ParserD

88-- License : BSD3

99-- Maintainer : streamly@composewell.com

@@ -36,7 +36,7 @@

3636-- "Text.ParserCombinators.ReadP/parser-combinators/parsec/megaparsec/attoparsec"

3737-- have consistent names. takeP/takeWhileP/munch?

3838

39−module Streamly.Internal.Data.Parser

39+module Streamly.Internal.Data.Parser.ParserD

4040 (

4141 Parser (..)

4242

@@ -183,11 +183,11 @@ import Prelude

183183

184184import Streamly.Internal.Data.Fold.Types (Fold(..))

185185

186−import qualified Streamly.Internal.Data.ParserK.Types as K

186+import qualified Streamly.Internal.Data.Parser.ParserK.Types as K

187187import qualified Streamly.Internal.Data.Zipper as Z

188188

189−import Streamly.Internal.Data.Parser.Tee

190−import Streamly.Internal.Data.Parser.Types

189+import Streamly.Internal.Data.Parser.ParserD.Tee

190+import Streamly.Internal.Data.Parser.ParserD.Types

191191import Streamly.Internal.Data.Strict

192192

193193-------------------------------------------------------------------------------

src/Streamly/Internal/Data/Parser/Tee.hs → src/Streamly/Internal/Data/Parser/ParserD/Tee.hsrenamed+4−3

@@ -8,7 +8,7 @@

88#include "inline.hs"

1010-- |

11−-- Module : Streamly.Internal.Data.Parser.Tee

11+-- Module : Streamly.Internal.Data.Parser.ParserD.Tee

1313-- License : BSD3

1414-- Maintainer : streamly@composewell.com

@@ -29,7 +29,7 @@

2929-- some legit warnings, therefore, we have segregated only the code that uses

3030-- uni-pattern matches in this module.

3131

32−module Streamly.Internal.Data.Parser.Tee

32+module Streamly.Internal.Data.Parser.ParserD.Tee

3333 (

3434 -- Parallel zipped

3535 teeWith

@@ -48,7 +48,8 @@ import Prelude

4848 hiding (any, all, takeWhile)

4949

5050import Fusion.Plugin.Types (Fuse(..))

51−import Streamly.Internal.Data.Parser.Types (Parser(..), Step(..), ParseError)

51+import Streamly.Internal.Data.Parser.ParserD.Types

52+ (Parser(..), Step(..), ParseError)

5253

5354-------------------------------------------------------------------------------

5455-- Distribute input to two parsers and collect both results

src/Streamly/Internal/Data/Parser/Types.hs → src/Streamly/Internal/Data/Parser/ParserD/Types.hsrenamed+2−2

@@ -2,7 +2,7 @@

22{-# LANGUAGE ScopedTypeVariables #-}

44-- |

5−-- Module : Streamly.Parser.Types

5+-- Module : Streamly.Internal.Data.Parser.ParserD.Types

77-- License : BSD3

88-- Maintainer : streamly@composewell.com

@@ -107,7 +107,7 @@

107107-- merge the resulting streams using different merge strategies (e.g.

108108-- interleaving or serial).

109109

110−module Streamly.Internal.Data.Parser.Types

110+module Streamly.Internal.Data.Parser.ParserD.Types

111111 (

112112 Step (..)

113113 , Parser (..)

src/Streamly/Internal/Data/ParserK/Types.hs → src/Streamly/Internal/Data/Parser/ParserK/Types.hsrenamed+2−2

@@ -6,7 +6,7 @@

66#include "inline.hs"

88-- |

9−-- Module : Streamly.ParserK.Types

9+-- Module : Streamly.Internal.Data.Parser.ParserK.Types

1111-- License : BSD3

1212-- Maintainer : streamly@composewell.com

@@ -15,7 +15,7 @@

1515--

1616-- CPS style implementation of parsers.

1717

18−module Streamly.Internal.Data.ParserK.Types

18+module Streamly.Internal.Data.Parser.ParserK.Types

1919 (

2020 Parser (..)

2121 )

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

@@ -74,7 +74,7 @@ import Prelude hiding (foldr, minimum, maximum)

7474import qualified Prelude

7575

7676import Streamly.Internal.Data.Fold.Types (Fold (..))

77−import Streamly.Internal.Data.Parser.Types (Step)

77+import Streamly.Internal.Data.Parser.ParserD.Types (Step)

7878

7979#ifdef USE_STREAMK_ONLY

8080import qualified Streamly.Internal.Data.Stream.StreamK as S

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

@@ -362,7 +362,7 @@ import Streamly.Internal.Data.Time.Units

362362import Streamly.Internal.Data.Atomics (atomicModifyIORefCAS_)

363363import Streamly.Internal.Memory.Array.Types (Array(..))

364364import Streamly.Internal.Data.Fold.Types (Fold(..))

365−import Streamly.Internal.Data.Parser.Types (Parser(..), ParseError(..))

365+import Streamly.Internal.Data.Parser.ParserD.Types (Parser(..), ParseError(..))

366366import Streamly.Internal.Data.Pipe.Types (Pipe(..), PipeState(..))

367367import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)

368368import Streamly.Internal.Data.Time.Units

@@ -379,7 +379,7 @@ import qualified Streamly.Internal.Memory.Array.Types as A

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

380380import qualified Streamly.Memory.Ring as RB

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

382−import qualified Streamly.Internal.Data.Parser.Types as PR

382+import qualified Streamly.Internal.Data.Parser.ParserD.Types as PR

383383

384384------------------------------------------------------------------------------

385385-- Construction

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

@@ -76,7 +76,7 @@ import Prelude hiding (splitAt)

7676import Streamly.Internal.Data.Stream.StreamK.Type (Stream(..))

7777import Streamly.Internal.Data.SVar (defState)

7878

79−import qualified Streamly.Internal.Data.Parser.Types as PR

79+import qualified Streamly.Internal.Data.Parser.ParserD.Types as PR

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

8181

8282-------------------------------------------------------------------------------

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

@@ -540,7 +540,7 @@ import qualified System.IO as IO

540540

541541import Streamly.Internal.Data.Stream.Enumeration (Enumerable(..), enumerate, enumerateTo)

542542import Streamly.Internal.Data.Fold.Types (Fold (..), Fold2 (..))

543−import Streamly.Internal.Data.Parser.Types (Parser (..))

543+import Streamly.Internal.Data.Parser.ParserD.Types (Parser (..))

544544import Streamly.Internal.Data.Unfold.Types (Unfold)

545545import Streamly.Internal.Memory.Array.Types (Array, writeNUnsafe)

546546-- import Streamly.Memory.Ring (Ring)

@@ -577,7 +577,7 @@ import qualified Streamly.Internal.Data.Stream.StreamD as S

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

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

579579import qualified Streamly.Internal.Data.Stream.Zip as Z

580−import qualified Streamly.Internal.Data.ParserK.Types as PRK

580+import qualified Streamly.Internal.Data.Parser.ParserK.Types as PRK

581581import qualified Streamly.Internal.Data.Zipper as ZR

582582

583583------------------------------------------------------------------------------

streamly.cabal+24−10

@@ -315,6 +315,11 @@ library

315315 , Streamly.Internal.Data.Time.Units

316316 , Streamly.Internal.Data.Time.Clock

317317 , Streamly.Internal.Data.SVar

318+

319+ -- Mutable data

320+ , Streamly.Internal.Mutable.Prim.Var

321+

322+ -- Arrays

318323 , Streamly.Internal.Data.Array

319324 , Streamly.Internal.Data.Prim.Array.Types

320325 , Streamly.Internal.Data.Prim.Array

@@ -323,16 +328,20 @@ library

323328 , Streamly.Internal.Memory.Array.Types

324329 , Streamly.Internal.Memory.Array

325330 , Streamly.Internal.Memory.ArrayStream

331+

332+ -- Folds

326333 , Streamly.Internal.Data.Fold.Types

327334 , Streamly.Internal.Data.Fold

328− , Streamly.Internal.Data.Zipper

329− , Streamly.Internal.Data.ParserK.Types

330− , Streamly.Internal.Data.Parser

331− , Streamly.Internal.Data.Parser.Types

332− , Streamly.Internal.Data.Parser.Tee

333335 , Streamly.Internal.Data.Sink.Types

334336 , Streamly.Internal.Data.Sink

335337

338+ -- Parsers

339+ , Streamly.Internal.Data.Zipper

340+ , Streamly.Internal.Data.Parser.ParserK.Types

341+ , Streamly.Internal.Data.Parser.ParserD.Types

342+ , Streamly.Internal.Data.Parser.ParserD.Tee

343+ , Streamly.Internal.Data.Parser.ParserD

344+

336345 -- Base streams

337346 , Streamly.Internal.Data.Stream.StreamK.Type

338347 , Streamly.Internal.Data.Stream.StreamK

@@ -351,21 +360,26 @@ library

351360 , Streamly.Internal.Data.Stream.Ahead

352361 , Streamly.Internal.Data.Stream.Zip

353362 , Streamly.Internal.Data.Stream.Combinators

363+ , Streamly.Internal.Data.List

364+ , Streamly.Internal.Prelude

365+

366+ -- Unfolds

354367 , Streamly.Internal.Data.Unfold.Types

355368 , Streamly.Internal.Data.Unfold

369+

370+ -- Pipes

356371 , Streamly.Internal.Data.Pipe.Types

357372 , Streamly.Internal.Data.Pipe

358− , Streamly.Internal.Data.List

373+

374+ -- Filesystem

359375 , Streamly.Internal.FileSystem.Handle

360376 , Streamly.Internal.FileSystem.Dir

361377 , Streamly.Internal.FileSystem.File

378+

379+ -- Text Processing

362380 , Streamly.Internal.Data.Unicode.Stream

363381 , Streamly.Internal.Data.Unicode.Char

364382 , Streamly.Internal.Memory.Unicode.Array

365− , Streamly.Internal.Prelude

366−

367− -- Mutable data

368− , Streamly.Internal.Mutable.Prim.Var

369383

370384 if !impl(ghcjs)

371385 exposed-modules: