diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ *Megaparsec follows [SemVer](https://semver.org/).* +## Megaparsec 9.8.1 + +* Fixed the regression introduced by the fix for the [issue + 572](https://github.com/mrkkrp/megaparsec/issues/572) which caused the + position marker `^` to be missing in certain cases. +* This release officially supports GHC 9.6. This is the oldest GHC version + we support at this time. + ## Megaparsec 9.8.0 * Fixed the associativity of the `(<|>)` operator. [Issue diff --git a/Text/Megaparsec/Byte/Lexer.hs b/Text/Megaparsec/Byte/Lexer.hs --- a/Text/Megaparsec/Byte/Lexer.hs +++ b/Text/Megaparsec/Byte/Lexer.hs @@ -41,6 +41,7 @@ import Control.Applicative import Data.Functor (void) +import qualified Data.List import Data.Proxy import Data.Scientific (Scientific) import qualified Data.Scientific as Sci @@ -121,7 +122,7 @@ m a decimal_ = mkNum <$> takeWhile1P (Just "digit") isDigit where - mkNum = fromInteger . foldl' step 0 . chunkToTokens (Proxy :: Proxy s) + mkNum = fromInteger . Data.List.foldl' step 0 . chunkToTokens (Proxy :: Proxy s) step a w = a * 10 + fromIntegral (w - 48) {-# INLINE decimal_ #-} @@ -144,7 +145,7 @@ <$> takeWhile1P Nothing isBinDigit "binary integer" where - mkNum = fromInteger . foldl' step 0 . chunkToTokens (Proxy :: Proxy s) + mkNum = fromInteger . Data.List.foldl' step 0 . chunkToTokens (Proxy :: Proxy s) step a w = a * 2 + fromIntegral (w - 48) isBinDigit w = w == 48 || w == 49 {-# INLINEABLE binary #-} @@ -169,7 +170,7 @@ <$> takeWhile1P Nothing isOctDigit "octal integer" where - mkNum = fromInteger . foldl' step 0 . chunkToTokens (Proxy :: Proxy s) + mkNum = fromInteger . Data.List.foldl' step 0 . chunkToTokens (Proxy :: Proxy s) step a w = a * 8 + fromIntegral (w - 48) isOctDigit w = w - 48 < 8 {-# INLINEABLE octal #-} @@ -194,7 +195,7 @@ <$> takeWhile1P Nothing isHexDigit "hexadecimal integer" where - mkNum = fromInteger . foldl' step 0 . chunkToTokens (Proxy :: Proxy s) + mkNum = fromInteger . Data.List.foldl' step 0 . chunkToTokens (Proxy :: Proxy s) step a w | w >= 48 && w <= 57 = a * 16 + fromIntegral (w - 48) | w >= 97 = a * 16 + fromIntegral (w - 87) @@ -255,7 +256,7 @@ m SP dotDecimal_ pxy c' = do void (B.char 46) - let mkNum = foldl' step (SP c' 0) . chunkToTokens pxy + let mkNum = Data.List.foldl' step (SP c' 0) . chunkToTokens pxy step (SP a e') w = SP (a * 10 + fromIntegral (w - 48)) diff --git a/Text/Megaparsec/Char/Lexer.hs b/Text/Megaparsec/Char/Lexer.hs --- a/Text/Megaparsec/Char/Lexer.hs +++ b/Text/Megaparsec/Char/Lexer.hs @@ -69,6 +69,7 @@ import Control.Applicative import Control.Monad (void) import qualified Data.Char as Char +import qualified Data.List import Data.List.NonEmpty (NonEmpty (..)) import Data.Maybe (fromMaybe, isJust, listToMaybe) import Data.Proxy @@ -371,7 +372,7 @@ m a decimal_ = mkNum <$> takeWhile1P (Just "digit") Char.isDigit where - mkNum = fromInteger . foldl' step 0 . chunkToTokens (Proxy :: Proxy s) + mkNum = fromInteger . Data.List.foldl' step 0 . chunkToTokens (Proxy :: Proxy s) step a c = a * 10 + fromIntegral (Char.digitToInt c) {-# INLINE decimal_ #-} @@ -394,7 +395,7 @@ <$> takeWhile1P Nothing isBinDigit "binary integer" where - mkNum = fromInteger . foldl' step 0 . chunkToTokens (Proxy :: Proxy s) + mkNum = fromInteger . Data.List.foldl' step 0 . chunkToTokens (Proxy :: Proxy s) step a c = a * 2 + fromIntegral (Char.digitToInt c) isBinDigit x = x == '0' || x == '1' {-# INLINEABLE binary #-} @@ -422,7 +423,7 @@ <$> takeWhile1P Nothing Char.isOctDigit "octal integer" where - mkNum = fromInteger . foldl' step 0 . chunkToTokens (Proxy :: Proxy s) + mkNum = fromInteger . Data.List.foldl' step 0 . chunkToTokens (Proxy :: Proxy s) step a c = a * 8 + fromIntegral (Char.digitToInt c) {-# INLINEABLE octal #-} @@ -449,7 +450,7 @@ <$> takeWhile1P Nothing Char.isHexDigit "hexadecimal integer" where - mkNum = fromInteger . foldl' step 0 . chunkToTokens (Proxy :: Proxy s) + mkNum = fromInteger . Data.List.foldl' step 0 . chunkToTokens (Proxy :: Proxy s) step a c = a * 16 + fromIntegral (Char.digitToInt c) {-# INLINEABLE hexadecimal #-} @@ -509,7 +510,7 @@ m SP dotDecimal_ pxy c' = do void (C.char '.') - let mkNum = foldl' step (SP c' 0) . chunkToTokens pxy + let mkNum = Data.List.foldl' step (SP c' 0) . chunkToTokens pxy step (SP a e') c = SP (a * 10 + fromIntegral (Char.digitToInt c)) diff --git a/Text/Megaparsec/Error.hs b/Text/Megaparsec/Error.hs --- a/Text/Megaparsec/Error.hs +++ b/Text/Megaparsec/Error.hs @@ -415,7 +415,7 @@ pointerLen = if rpshift + elen > slineLen then slineLen - rpshift + 1 - else elen + else max 1 elen pointer = replicate pointerLen '^' lineNumber = (show . unPos . sourceLine) epos padding = replicate (length lineNumber + 1) ' ' diff --git a/Text/Megaparsec/Stream.hs b/Text/Megaparsec/Stream.hs --- a/Text/Megaparsec/Stream.hs +++ b/Text/Megaparsec/Stream.hs @@ -42,6 +42,7 @@ import Data.Char (chr) import Data.Foldable (toList) import Data.Kind (Type) +import qualified Data.List import Data.List.NonEmpty (NonEmpty (..)) import qualified Data.List.NonEmpty as NE import Data.Maybe (fromMaybe) @@ -514,9 +515,9 @@ instance TraversableStream String where -- NOTE Do not eta-reduce these (breaks inlining) reachOffset o pst = - reachOffset' splitAt foldl' id id ('\n', '\t') charInc o pst + reachOffset' splitAt Data.List.foldl' id id ('\n', '\t') charInc o pst reachOffsetNoLine o pst = - reachOffsetNoLine' splitAt foldl' ('\n', '\t') charInc o pst + reachOffsetNoLine' splitAt Data.List.foldl' ('\n', '\t') charInc o pst instance TraversableStream B.ByteString where -- NOTE Do not eta-reduce these (breaks inlining) diff --git a/megaparsec.cabal b/megaparsec.cabal --- a/megaparsec.cabal +++ b/megaparsec.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: megaparsec -version: 9.8.0 +version: 9.8.1 license: BSD-2-Clause license-file: LICENSE.md maintainer: Mark Karpov @@ -9,7 +9,9 @@ Paolo Martini , Daan Leijen -tested-with: ghc ==9.10.3 ghc ==9.12.4 ghc ==9.14.1 +tested-with: + ghc ==9.6.7 ghc ==9.8.4 ghc ==9.10.3 ghc ==9.12.4 ghc ==9.14.1 + homepage: https://github.com/mrkkrp/megaparsec bug-reports: https://github.com/mrkkrp/megaparsec/issues synopsis: Monadic parser combinators @@ -58,7 +60,7 @@ default-language: Haskell2010 build-depends: array >=0.5.3 && <0.6, - base >=4.15 && <5, + base >=4.18 && <5, bytestring >=0.2 && <0.13, case-insensitive >=1.2 && <1.3, containers >=0.5 && <0.9, @@ -86,7 +88,7 @@ hs-source-dirs: bench/speed default-language: Haskell2010 build-depends: - base >=4.15 && <5, + base >=4.18 && <5, bytestring >=0.2 && <0.13, containers >=0.5 && <0.9, criterion >=0.6.2.1 && <1.7, @@ -108,7 +110,7 @@ hs-source-dirs: bench/memory default-language: Haskell2010 build-depends: - base >=4.15 && <5, + base >=4.18 && <5, bytestring >=0.2 && <0.13, containers >=0.5 && <0.9, deepseq >=1.3 && <1.6,