Fix bugs in important one shot parser drivers

composewell · Oct 7, 2024 · 5d52680 · 5d52680
1 parent 1cf8c8b
commit 5d52680
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/core/src/Streamly/Internal/Data/Array.hs b/core/src/Streamly/Internal/Data/Array.hs
@@ -931,7 +931,7 @@ parseBreakChunksK (Parser pstep initial extract) stream = do
                 let n = Prelude.length backBuf
                     arr0 = fromListN n (Prelude.reverse backBuf)
                     arr1 = Array contents cur end
-                    str = StreamK.cons arr0 (StreamK.cons arr1 stream)
+                    str = StreamK.cons arr0 (StreamK.cons arr1 st)
                 return (Left (ParseError err), str)
 
     -- This is a simplified goArray
@@ -965,7 +965,7 @@ parseBreakChunksK (Parser pstep initial extract) stream = do
                 return (Right b, StreamK.fromPure arr)
             Parser.Done n b -> do
                 assert (n <= Prelude.length backBuf) (return ())
-                let src0 = Prelude.take n backBuf
+                let src0 = Prelude.take n (x:backBuf)
                     -- XXX Use fromListRevN once implemented
                     -- arr0 = A.fromListRevN n src0
                     arr0 = fromListN n (Prelude.reverse src0)

diff --git a/core/src/Streamly/Internal/Data/Stream/Eliminate.hs b/core/src/Streamly/Internal/Data/Stream/Eliminate.hs
@@ -278,7 +278,7 @@ parseBreakD (PRD.Parser pstep initial extract) stream@(Stream step state) = do
             PR.Done n b -> do
                 assert (n <= length (x:getList buf)) (return ())
                 let src0 = Prelude.take n (x:getList buf)
-                    src  = Prelude.reverse src0
+                    src  = Prelude.reverse src0 ++ xs
                 return (Right b, Nesting.append (fromList src) (Stream step s))
             PR.Error err -> do
                 let src = Prelude.reverse (getList buf) ++ x:xs
@@ -311,7 +311,7 @@ parseBreakD (PRD.Parser pstep initial extract) stream@(Stream step state) = do
             PR.Done n b -> do
                 assert (n <= length (x:getList buf)) (return ())
                 let src0 = Prelude.take n (x:getList buf)
-                    src  = Prelude.reverse src0
+                    src  = Prelude.reverse src0 ++ xs
                 return (Right b, fromList src)
             PR.Error err -> do
                 let src = Prelude.reverse (getList buf) ++ x:xs

diff --git a/core/src/Streamly/Internal/Data/StreamK.hs b/core/src/Streamly/Internal/Data/StreamK.hs
@@ -1259,7 +1259,7 @@ parseDBreak (PR.Parser pstep initial extract) stream = do
             PR.Done n b -> do
                 assert (n <= length (x:buf)) (return ())
                 let src0 = Prelude.take n (x:buf)
-                    src  = Prelude.reverse src0
+                    src  = Prelude.reverse src0 ++ xs
                 return (Right b, append (fromList src) st)
             PR.Error err -> do
                 let src = Prelude.reverse buf ++ x:xs