Skip to content

Commit 4e975dd

Browse files
rename adapt to parserK
1 parent 45446f1 commit 4e975dd

5 files changed

Lines changed: 20 additions & 20 deletions

File tree

core/src/Streamly/Data/ParserK.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ import Streamly.Internal.Data.ParserK
134134

135135
#include "DocTestDataParserK.hs"
136136

137-
{-# DEPRECATED fromFold "Please use \"Array.adapt . Parser.fromFold\" instead." #-}
137+
{-# DEPRECATED fromFold "Please use \"Array.parserK . Parser.fromFold\" instead." #-}
138138
{-# INLINE fromFold #-}
139139
fromFold :: (MonadIO m, Unbox a) => Fold m a b -> ParserK (Array a) m b
140-
fromFold = Array.adapt . ParserD.fromFold
140+
fromFold = Array.parserK . ParserD.fromFold
141141

142-
{-# DEPRECATED fromParser "Please use \"Array.adapt\" instead." #-}
142+
{-# DEPRECATED fromParser "Please use \"Array.parserK\" instead." #-}
143143
{-# INLINE fromParser #-}
144144
fromParser ::
145145
(MonadIO m, Unbox a) => ParserD.Parser a m b -> ParserK (Array a) m b
146-
fromParser = Array.adapt
146+
fromParser = Array.parserK

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ module Streamly.Internal.Data.Array
7474
, foldBreakChunks -- Uses Stream, bad perf on break
7575
, foldChunks
7676
, foldBreakChunksK -- XXX rename to foldBreak
77-
, parseBreakChunksK -- XXX uses Parser, should use parseBreak instead
77+
, parseBreakChunksK -- XXX uses Parser. parseBreak is better?
78+
, parserK
7879
, parseBreak
7980
, parse
80-
, adapt
8181

8282
-- * Serialization
8383
, encodeAs
@@ -1260,7 +1260,7 @@ adaptCWith pstep initial extract cont !offset0 !usedCount !input = do
12601260
--
12611261
-- /Pre-release/
12621262
--
1263-
{-# INLINE_LATE adapt #-}
1264-
adapt :: (Monad m, Unbox a) => ParserD.Parser a m b -> ParserK (Array a) m b
1265-
adapt (ParserD.Parser step initial extract) =
1263+
{-# INLINE_LATE parserK #-}
1264+
parserK :: (Monad m, Unbox a) => ParserD.Parser a m b -> ParserK (Array a) m b
1265+
parserK (ParserD.Parser step initial extract) =
12661266
ParserK.MkParser $ adaptCWith step initial extract

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module Streamly.Internal.Data.Array.Generic
4646
, dropAround
4747

4848
-- * Parsing Stream of Arrays
49-
, adapt
49+
, parserK
5050
, parse
5151
, parseBreak
5252

@@ -651,7 +651,7 @@ adaptCGWith pstep initial extract cont !offset0 !usedCount !input = do
651651
--
652652
-- /Pre-release/
653653
--
654-
{-# INLINE_LATE adapt #-}
655-
adapt :: Monad m => ParserD.Parser a m b -> ParserK (Array a) m b
656-
adapt (ParserD.Parser step initial extract) =
654+
{-# INLINE_LATE parserK #-}
655+
parserK :: Monad m => ParserD.Parser a m b -> ParserK (Array a) m b
656+
parserK (ParserD.Parser step initial extract) =
657657
ParserK.MkParser $ adaptCGWith step initial extract

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ import qualified Streamly.Internal.Data.Array.Generic as GenArray
2727

2828
#include "inline.hs"
2929

30-
{-# DEPRECATED adaptC "Use Streamly.Data.Array.adapt" #-}
30+
{-# DEPRECATED adaptC "Use Streamly.Data.Array.parserK" #-}
3131
{-# INLINE_LATE adaptC #-}
3232
adaptC :: (Monad m, Unbox a) => Parser a m b -> ParserK (Array a) m b
33-
adaptC = Array.adapt
33+
adaptC = Array.parserK
3434

35-
{-# DEPRECATED adaptCG "Use Streamly.Data.Array.Generic.adaptCG" #-}
35+
{-# DEPRECATED adaptCG "Use Streamly.Data.Array.Generic.parserK" #-}
3636
{-# INLINE_LATE adaptCG #-}
3737
adaptCG ::
3838
Monad m => Parser a m b -> ParserK (GenArray.Array a) m b
39-
adaptCG = GenArray.adapt
39+
adaptCG = GenArray.parserK

core/src/Streamly/Internal/Data/ParserK/Type.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module Streamly.Internal.Data.ParserK.Type
2727
, Input (..)
2828
, ParseResult (..)
2929
, ParserK (..)
30-
, adapt
30+
, adapt -- XXX rename to parserK, like in Arrays?
3131
, toParser -- XXX unParserK, unK, unPK
3232
, fromPure
3333
, fromEffect
@@ -476,8 +476,8 @@ adapt (ParserD.Parser step initial extract) =
476476
{-# INLINE parserDone #-}
477477
parserDone :: Applicative m =>
478478
ParseResult b -> Int -> Input a -> m (Step a m b)
479-
parserDone (Success n b) _ _ = pure $ assert(n <= 1) (Done n b)
480-
parserDone (Failure n e) _ _ = pure $ assert(n <= 1) (Error n e)
479+
parserDone (Success n b) _ _ = assert(n <= 1) `seq` pure (Done n b)
480+
parserDone (Failure n e) _ _ = assert(n <= 1) `seq` pure (Error n e)
481481

482482
-- XXX Note that this works only for single element parsers and not for Array
483483
-- input parsers. The asserts will fail for array parsers.

0 commit comments

Comments
 (0)