Skip to content

Fix compatibility with text < 2.1 #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hasufell wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix compatibility with text < 2.1 #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/Data/Bytes/Parser/Ascii.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE BinaryLiterals #-}
{-# LANGUAGE DataKinds #-}
Expand Down Expand Up @@ -71,6 +72,10 @@ import qualified Data.Bytes.Parser as Parser
import qualified Data.Bytes.Parser.Latin as Latin
import qualified Data.Bytes.Parser.Unsafe as Unsafe
import qualified Data.Primitive as PM
#if !MIN_VERSION_text(2, 1, 0)
import qualified Data.Array.Byte as BA
import qualified Data.Text.Array as T
#endif
import qualified Data.Text.Short.Unsafe as TS

{- | Consume the next character, failing if it does not match the expected
Expand Down Expand Up @@ -110,10 +115,18 @@ skipTrailedBy e !c = do
take :: e -> Int -> Parser e s Text
{-# INLINE take #-}
take e !n = do
#if MIN_VERSION_text(2, 1, 0)
bs@(Bytes arr off len) <- Parser.take e n
if Bytes.all (\w -> w < 128) bs
then pure (Text arr off len)
else Parser.fail e
#else
bs@(Bytes (BA.ByteArray arr) off len) <- Parser.take e n
if Bytes.all (\w -> w < 128) bs
then pure (Text (T.ByteArray arr) off len)
else Parser.fail e
#endif


{- | Consume characters matching the predicate. The stops when it
encounters a non-matching character or when it encounters a byte
Expand Down