Skip to content

Commit 333deb4

Browse files
Rename "parserK" to "toParserK"
1 parent b287bfa commit 333deb4

17 files changed

Lines changed: 69 additions & 68 deletions

File tree

benchmark/Streamly/Benchmark/Data/Array/Stream.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ fold s = void $ Array.foldBreak Fold.drain $ StreamK.fromStream s
240240
parse :: Int -> Stream IO (Array.Array Int) -> IO ()
241241
parse value s =
242242
void $ Array.parseBreak
243-
(Array.parserK (drainWhile (< value)))
243+
(Array.toParserK (drainWhile (< value)))
244244
(StreamK.fromStream s)
245245

246246
{-# INLINE foldBreak #-}
@@ -252,7 +252,7 @@ foldBreak s = do
252252
{-# INLINE parseBreak #-}
253253
parseBreak :: StreamK IO (Array.Array Int) -> IO ()
254254
parseBreak s = do
255-
r <- Array.parseBreak (Array.parserK Parser.one) s
255+
r <- Array.parseBreak (Array.toParserK Parser.one) s
256256
case r of
257257
(Left _, _) -> return ()
258258
(Right _, s1) -> parseBreak s1

benchmark/Streamly/Benchmark/Data/ParserK.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ import Streamly.Benchmark.Common
6262
#ifdef BENCH_CHUNKED
6363

6464
#define PARSE_OP Array.parse
65-
#define FROM_PARSER Array.parserK
65+
#define FROM_PARSER Array.toParserK
6666
#define INPUT (Array a)
6767
#define PARSE_ELEM (Array Int)
6868
#define CONSTRAINT_IO (MonadIO m, Unbox a)
@@ -74,7 +74,7 @@ import Streamly.Benchmark.Common
7474
#ifdef BENCH_CHUNKED_GENERIC
7575

7676
#define PARSE_OP GenArr.parse
77-
#define FROM_PARSER GenArr.parserK
77+
#define FROM_PARSER GenArr.toParserK
7878
#define INPUT (Array a)
7979
#define PARSE_ELEM (Array Int)
8080
#define CONSTRAINT_IO (MonadIO m)
@@ -86,7 +86,7 @@ import Streamly.Benchmark.Common
8686
#ifdef BENCH_SINGULAR
8787

8888
#define PARSE_OP StreamK.parse
89-
#define FROM_PARSER PR.parserK
89+
#define FROM_PARSER PR.toParserK
9090
#define INPUT a
9191
#define PARSE_ELEM Int
9292
#define CONSTRAINT_IO (MonadIO m)

core/src/Streamly/Data/Array.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ module Streamly.Data.Array
7676

7777
-- * Stream of Arrays
7878
, chunksOf
79-
, parserK
79+
, toParserK
8080
, parse
8181
, parseBreak
8282
, parsePos

core/src/Streamly/Data/Array/Generic.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module Streamly.Data.Array.Generic
3535

3636
-- * Stream of Arrays
3737
, chunksOf
38-
, parserK
38+
, toParserK
3939
, parse
4040
, parseBreak
4141
, parsePos

core/src/Streamly/Data/Parser.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@
9494
-- ParserK is suitable for recursive definitions:
9595
--
9696
-- >>> import Streamly.Data.ParserK (ParserK)
97-
-- >>> import Streamly.Data.StreamK (parserK)
97+
-- >>> import Streamly.Data.StreamK (toParserK)
9898
-- >>> import qualified Streamly.Data.StreamK as StreamK
9999
--
100100
-- >>> :{
101101
-- >>> p, p1, p2 :: Monad m => ParserK Char m String
102-
-- >>> p1 = parserK (Parser.satisfy (== '(')) *> p
103-
-- >>> p2 = parserK (Parser.fromFold Fold.toList)
102+
-- >>> p1 = toParserK (Parser.satisfy (== '(')) *> p
103+
-- >>> p2 = toParserK (Parser.fromFold Fold.toList)
104104
-- >>> p = p1 <|> p2
105105
-- >>> :}
106106
--

core/src/Streamly/Data/ParserK.hs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@
3232
-- All the fused parsers from the "Streamly.Data.Parser" module can be
3333
-- converted to the CPS ParserK, for use with different types of parser
3434
-- drivers, using
35-
-- the @parserK@ combinators - Streamly.Data.Array.'Streamly.Data.Array.parserK',
36-
-- Streamly.Data.StreamK.'Streamly.Data.StreamK.parserK', and
37-
-- Streamly.Data.Array.Generic.'Streamly.Data.Array.Generic.parserK'.
35+
-- the @toParserK@ combinators -
36+
-- Streamly.Data.Array.'Streamly.Data.Array.toParserK',
37+
-- Streamly.Data.StreamK.'Streamly.Data.StreamK.toParserK', and
38+
-- Streamly.Data.Array.Generic.'Streamly.Data.Array.Generic.toParserK'
3839
--
3940
-- To parse a stream of unboxed arrays, use
4041
-- Streamly.Data.Array.'Streamly.Data.Array.parse' for running the parser, this
@@ -63,7 +64,7 @@
6364
-- >>> token p1 p2 = ((:) <$> p1 <*> ((:) <$> p2 <*> pure []))
6465
-- >>> :{
6566
-- backtracking :: Monad m => ParserK Char m String
66-
-- backtracking = StreamK.parserK $
67+
-- backtracking = StreamK.toParserK $
6768
-- token (Parser.satisfy isDigit) (Parser.satisfy isAlpha) -- e.g. "9a"
6869
-- <|>
6970
-- token (Parser.satisfy isAlpha) (Parser.satisfy isDigit) -- e.g. "a9"
@@ -86,11 +87,11 @@
8687
-- >>> :{
8788
-- lookbehind :: Monad m => ParserK Char m String
8889
-- lookbehind = do
89-
-- x1 <- StreamK.parserK $
90+
-- x1 <- StreamK.toParserK $
9091
-- Digit <$> Parser.satisfy isDigit
9192
-- <|> Alpha <$> Parser.satisfy isAlpha
9293
-- -- Note: the parse depends on what we parsed already
93-
-- x2 <- StreamK.parserK $
94+
-- x2 <- StreamK.toParserK $
9495
-- case x1 of
9596
-- Digit _ -> Parser.satisfy isAlpha
9697
-- Alpha _ -> Parser.satisfy isDigit
@@ -143,13 +144,13 @@ import Streamly.Internal.Data.ParserK
143144

144145
#include "DocTestDataParserK.hs"
145146

146-
{-# DEPRECATED fromFold "Please use \"Array.parserK . Parser.fromFold\" instead." #-}
147+
{-# DEPRECATED fromFold "Please use \"Array.toParserK . Parser.fromFold\" instead." #-}
147148
{-# INLINE fromFold #-}
148149
fromFold :: (MonadIO m, Unbox a) => Fold m a b -> ParserK (Array a) m b
149-
fromFold = Array.parserK . ParserD.fromFold
150+
fromFold = Array.toParserK . ParserD.fromFold
150151

151-
{-# DEPRECATED fromParser "Please use \"Array.parserK\" instead." #-}
152+
{-# DEPRECATED fromParser "Please use \"Array.toParserK\" instead." #-}
152153
{-# INLINE fromParser #-}
153154
fromParser ::
154155
(MonadIO m, Unbox a) => ParserD.Parser a m b -> ParserK (Array a) m b
155-
fromParser = Array.parserK
156+
fromParser = Array.toParserK

core/src/Streamly/Data/StreamK.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ module Streamly.Data.StreamK
127127
-- , foldBreak
128128

129129
-- ** Parsing
130-
, parserK
130+
, toParserK
131131
, parse
132132
, parseBreak
133133
, parsePos

core/src/Streamly/Internal/Data/Array.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ module Streamly.Internal.Data.Array
7575
, foldChunks
7676
, foldBreak
7777
-- , parseBreakChunksK -- XXX uses Parser. parseBreak is better?
78-
, parserK
78+
, toParserK
7979
, parseBreak
8080
, parseBreakPos
8181
, parse
@@ -1173,7 +1173,7 @@ adaptCWith pstep initial extract cont !offset0 !usedCount !input = do
11731173
--
11741174
-- /Pre-release/
11751175
--
1176-
{-# INLINE_LATE parserK #-}
1177-
parserK :: (Monad m, Unbox a) => ParserD.Parser a m b -> ParserK (Array a) m b
1178-
parserK (ParserD.Parser step initial extract) =
1176+
{-# INLINE_LATE toParserK #-}
1177+
toParserK :: (Monad m, Unbox a) => ParserD.Parser a m b -> ParserK (Array a) m b
1178+
toParserK (ParserD.Parser step initial extract) =
11791179
ParserK.MkParser $ adaptCWith step initial extract

core/src/Streamly/Internal/Data/Array/Generic/Type.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ module Streamly.Internal.Data.Array.Generic.Type
5050
, dropAround
5151

5252
-- * Parsing Stream of Arrays
53-
, parserK
53+
, toParserK
5454

5555
-- * Deprecated
5656
, strip
@@ -489,7 +489,7 @@ adaptCGWith pstep initial extract cont !offset0 !usedCount !input = do
489489
--
490490
-- /Pre-release/
491491
--
492-
{-# INLINE_LATE parserK #-}
493-
parserK :: Monad m => ParserD.Parser a m b -> ParserK (Array a) m b
494-
parserK (ParserD.Parser step initial extract) =
492+
{-# INLINE_LATE toParserK #-}
493+
toParserK :: Monad m => ParserD.Parser a m b -> ParserK (Array a) m b
494+
toParserK (ParserD.Parser step initial extract) =
495495
ParserK.MkParser $ adaptCGWith step initial extract

core/src/Streamly/Internal/Data/Array/Stream.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ parseBreak ::
294294
parseBreak p s =
295295
fmap fromStreamD <$> parseBreakD (PRD.fromParserK p) (toStreamD s)
296296
-}
297-
parseBreak p = Array.parseBreak (Array.parserK p)
297+
parseBreak p = Array.parseBreak (Array.toParserK p)
298298

299299
-------------------------------------------------------------------------------
300300
-- Elimination - Running Array Folds and parsers

0 commit comments

Comments
 (0)