fix

Author: adithyaov

benchmark/Streamly/Benchmark/Data/Parser.hs

@@ -32,7 +32,7 @@ import System.IO (Handle)
 import System.Random (randomRIO)
 import Streamly.Internal.Data.Fold (Fold(..))
 import Streamly.Internal.Data.Parser
-    (ParseError(..), Parser(..), Initial(..), Step(..))
+    (ParseError(..), Parser(..), Initial(..), Step(..), Final(..))
 import Streamly.Internal.Data.Stream (Stream)
 import Prelude hiding
     (any, all, take, sequence, sequence_, sequenceA, takeWhile, dropWhile, span)
@@ -368,7 +368,7 @@ takeWhileFail predicate (Fold fstep finitial _ ffinal) =
                       Fold.Done b -> SDone 1 b
         else return $ Error "fail"
 
-    extract s = fmap (SDone 0) (ffinal s)
+    extract s = fmap (FDone 0) (ffinal s)
 
 {-# INLINE alt2 #-}
 alt2 :: Monad m

benchmark/Streamly/Benchmark/Data/ParserK.hs

@@ -31,7 +31,7 @@ import Streamly.Data.Array.Generic (Array)
 import Streamly.Internal.Data.Fold (Fold(..))
 import Streamly.Data.StreamK (StreamK)
 import Streamly.Internal.Data.Parser
-    (ParseError(..), Parser(..), Initial(..), Step(..))
+    (ParseError(..), Parser(..), Initial(..), Step(..), Final(..))
 import Streamly.Internal.Data.Stream (Stream)
 import System.Random (randomRIO)
 import Prelude hiding
@@ -238,7 +238,7 @@ takeWhileFailD predicate (Fold fstep finitial _ ffinal) =
                       Fold.Done b -> SDone 1 b
         else return $ Error "fail"
 
-    extract s = fmap (SDone 0) (ffinal s)
+    extract s = fmap (FDone 0) (ffinal s)
 
 {-# INLINE takeWhileFail #-}
 takeWhileFail :: CONSTRAINT =>

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

@@ -1205,6 +1205,7 @@ takeEndByDone pextract res =
         SPartial _ _ -> return res
         SContinue _ _ -> return res
         SDone n b -> return $ SDone n b
+        Error n -> return $ Error n
 
 -- | @takeEndBy cond parser@ parses a token that ends by a separator chosen by
 -- the supplied predicate. The separator is also taken with the token.
@@ -1298,7 +1299,7 @@ takeEndBy_ cond (Parser pstep pinitial pextract) =
             res <- pextract s
             pure $ case res of
                 FDone n b -> SDone (n + 1) b
-                FContinue n s -> SPartial (n + 1) s
+                FContinue n s1 -> SPartial (n + 1) s1
                 FError err -> Error err
         else pstep s a
 

test/Streamly/Test/Data/Parser.hs

@@ -13,7 +13,7 @@ import Data.Foldable (for_)
 import Data.Word (Word8, Word32, Word64)
 import Streamly.Internal.Data.Fold (Fold(..))
 import Streamly.Internal.Data.MutByteArray (Unbox)
-import Streamly.Internal.Data.Parser (Parser(..), Step(..), Initial(..))
+import Streamly.Internal.Data.Parser (Parser(..), Step(..), Initial(..), Final(..))
 import Streamly.Test.Common (listEquals, checkListEqual, chooseInt)
 import Streamly.Internal.Data.Parser (ParseError(..))
 import Test.QuickCheck
@@ -797,7 +797,7 @@ takeWhileFailD predicate (Fold fstep finitial _ ffinal) =
                       FL.Done b -> SDone 1 b
         else return $ Error "fail"
 
-    extract s = fmap (SDone 0) (ffinal s)
+    extract s = fmap (FDone 0) (ffinal s)
 
 {-# INLINE takeWhileFail #-}
 takeWhileFail :: MonadIO m =>

test/lib/Streamly/Test/Parser/Common.hs

@@ -44,14 +44,14 @@ jumpParser jumps = P.Parser step initial done
             Custom (P.SDone i ()) -> pure $ P.SDone i (reverse buf)
             Custom (P.Error err) -> pure $ P.Error err
 
-    done ([], buf) = pure $ P.SDone 0 (reverse buf)
+    done ([], buf) = pure $ P.FDone 0 (reverse buf)
     done (action:xs, buf) =
         case action of
-            Consume _ -> pure $ P.Error "INCOMPLETE"
-            Custom (P.SPartial i ()) -> pure $ P.SPartial i (xs, buf)
-            Custom (P.SContinue i ()) -> pure $ P.SContinue i (xs, buf)
-            Custom (P.SDone i ()) -> pure $ P.SDone i (reverse buf)
-            Custom (P.Error err) -> pure $ P.Error err
+            Consume _ -> pure $ P.FError "INCOMPLETE"
+            Custom (P.SPartial i ()) -> pure $ P.FContinue i (xs, buf)
+            Custom (P.SContinue i ()) -> pure $ P.FContinue i (xs, buf)
+            Custom (P.SDone i ()) -> pure $ P.FDone i (reverse buf)
+            Custom (P.Error err) -> pure $ P.FError err
 
 chunkedTape :: [[Int]]
 chunkedTape = Prelude.map (\x -> [x..(x+9)]) [1, 11 .. 91]