mrkkrp/megaparsec
1
1
Fork 0
mirror of https://github.com/mrkkrp/megaparsec.git synced 2024-11-23 01:58:49 +03:00
Code Issues Projects Releases Wiki Activity

Test with GHC 9.0.1 and 8.10.4

Browse Source
This commit is contained in:
Mark Karpov 2021-02-06 13:43:35 +01:00
parent 7dda58a2f7
commit c5d6bb362c
14 changed files with 9 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yaml vendored
View File

@ -12,14 +12,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.3.4
- uses: mrkkrp/ormolu-action@v1
- uses: mrkkrp/ormolu-action@v2
build:
runs-on: ubuntu-latest
needs: ormolu
strategy:
matrix:
cabal: ["3.2"]
ghc: ["8.6.5", "8.8.4", "8.10.3"]
ghc: ["8.8.4", "8.10.4", "9.0.1"]
env:
CONFIG: "--enable-tests --enable-benchmarks --flags=dev"
steps:

5
Text/Megaparsec/Internal.hs
View File

@ -1,4 +1,3 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE LambdaCase #-}
@ -209,10 +208,6 @@ instance Stream s => Monad (ParsecT e s m) where
return = pure
(>>=) = pBind
#if !(MIN_VERSION_base(4,13,0))
fail = Fail.fail
#endif
pBind ::
Stream s =>
ParsecT e s m a ->

5
bench/memory/Main.hs
View File

@ -1,4 +1,3 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeFamilies #-}
@ -17,10 +16,6 @@ import Text.Megaparsec.Char
import qualified Text.Megaparsec.Char.Lexer as L
import Weigh
#if !MIN_VERSION_base(4,13,0)
import Data.Semigroup ((<>))
#endif
-- | The type of parser that consumes 'String's.
type Parser = Parsec Void Text

5
bench/speed/Main.hs
View File

@ -1,4 +1,3 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeFamilies #-}
@ -16,10 +15,6 @@ import Text.Megaparsec
import Text.Megaparsec.Char
import qualified Text.Megaparsec.Char.Lexer as L
#if !MIN_VERSION_base(4,13,0)
import Data.Semigroup ((<>))
#endif
-- | The type of parser that consumes 'String's.
type Parser = Parsec Void Text

6
megaparsec-tests/megaparsec-tests.cabal
View File

@ -5,7 +5,7 @@ license: BSD2
license-file: LICENSE.md
maintainer: Mark Karpov <markkarpov92@gmail.com>
author: Megaparsec contributors
tested-with: ghc ==8.6.5 ghc ==8.8.4 ghc ==8.10.3
tested-with: ghc ==8.8.4 ghc ==8.10.4 ghc ==9.0.1
homepage: https://github.com/mrkkrp/megaparsec
bug-reports: https://github.com/mrkkrp/megaparsec/issues
synopsis: Test utilities and the test suite of Megaparsec
@ -25,7 +25,7 @@ library
default-language: Haskell2010
build-depends:
QuickCheck >=2.10 && <2.15,
base >=4.12 && <5.0,
base >=4.13 && <5.0,
bytestring >=0.2 && <0.12,
containers >=0.5 && <0.7,
hspec >=2.0 && <3.0,
@ -63,7 +63,7 @@ test-suite tests
default-language: Haskell2010
build-depends:
QuickCheck >=2.10 && <2.15,
base >=4.12 && <5.0,
base >=4.13 && <5.0,
bytestring >=0.2 && <0.12,
case-insensitive >=1.2 && <1.3,
containers >=0.5 && <0.7,

5
megaparsec-tests/tests/Text/Megaparsec/Byte/LexerSpec.hs
View File

@ -1,4 +1,3 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedStrings #-}
module Text.Megaparsec.Byte.LexerSpec (spec) where
@ -19,10 +18,6 @@ import Text.Megaparsec
import qualified Text.Megaparsec.Byte as B
import Text.Megaparsec.Byte.Lexer
#if !MIN_VERSION_base(4,13,0)
import Data.Semigroup ((<>))
#endif
type Parser = Parsec Void ByteString
spec :: Spec

5
megaparsec-tests/tests/Text/Megaparsec/ByteSpec.hs
View File

@ -1,4 +1,3 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedStrings #-}
module Text.Megaparsec.ByteSpec (spec) where
@ -17,10 +16,6 @@ import Test.QuickCheck
import Text.Megaparsec
import Text.Megaparsec.Byte
#if !MIN_VERSION_base(4,13,0)
import Data.Semigroup ((<>))
#endif
type Parser = Parsec Void ByteString
spec :: Spec

5
megaparsec-tests/tests/Text/Megaparsec/Char/LexerSpec.hs
View File

@ -1,4 +1,3 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE MultiWayIf #-}
{-# LANGUAGE TupleSections #-}
@ -22,10 +21,6 @@ import Text.Megaparsec
import qualified Text.Megaparsec.Char as C
import Text.Megaparsec.Char.Lexer
#if !MIN_VERSION_base(4,13,0)
import Data.Semigroup ((<>))
#endif
spec :: Spec
spec = do
describe "space" $

5
megaparsec-tests/tests/Text/Megaparsec/CharSpec.hs
View File

@ -1,4 +1,3 @@
{-# LANGUAGE CPP #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
module Text.Megaparsec.CharSpec (spec) where
@ -14,10 +13,6 @@ import Test.QuickCheck
import Text.Megaparsec
import Text.Megaparsec.Char
#if !MIN_VERSION_base(4,13,0)
import Data.Semigroup ((<>))
#endif
instance Arbitrary GeneralCategory where
arbitrary = elements [minBound .. maxBound]

5
megaparsec-tests/tests/Text/Megaparsec/DebugSpec.hs
View File

@ -1,4 +1,3 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedStrings #-}
module Text.Megaparsec.DebugSpec (spec) where
@ -11,10 +10,6 @@ import Text.Megaparsec
import Text.Megaparsec.Char
import Text.Megaparsec.Debug
#if !MIN_VERSION_base(4,13,0)
import Data.Semigroup ((<>))
#endif
spec :: Spec
spec = do
describe "dbg" $ do

5
megaparsec-tests/tests/Text/Megaparsec/ErrorSpec.hs
View File

@ -1,4 +1,3 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedStrings #-}
module Text.Megaparsec.ErrorSpec (spec) where
@ -15,10 +14,6 @@ import Test.Hspec.Megaparsec.AdHoc ()
import Test.QuickCheck
import Text.Megaparsec
#if !MIN_VERSION_base(4,13,0)
import Data.Semigroup ((<>))
#endif
spec :: Spec
spec = do
describe "Semigroup instance of ParseError" $

6
megaparsec-tests/tests/Text/Megaparsec/PosSpec.hs
View File

@ -1,5 +1,3 @@
{-# LANGUAGE CPP #-}
module Text.Megaparsec.PosSpec (spec) where
import Control.Exception (evaluate)
@ -10,10 +8,6 @@ import Test.Hspec.Megaparsec.AdHoc ()
import Test.QuickCheck
import Text.Megaparsec.Pos
#if !MIN_VERSION_base(4,13,0)
import Data.Semigroup ((<>))
#endif
spec :: Spec
spec = do
describe "mkPos" $ do

5
megaparsec-tests/tests/Text/Megaparsec/StreamSpec.hs
View File

@ -1,4 +1,3 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE ScopedTypeVariables #-}
@ -22,10 +21,6 @@ import Test.Hspec.Megaparsec.AdHoc
import Test.QuickCheck
import Text.Megaparsec
#if !MIN_VERSION_base(4,13,0)
import Data.Semigroup ((<>))
#endif
spec :: Spec
spec = do
describe "String instance of Stream" $ do

8
megaparsec.cabal
View File

@ -9,7 +9,7 @@ author:
Paolo Martini <paolo@nemail.it>,
Daan Leijen <daan@microsoft.com>
tested-with: ghc ==8.6.5 ghc ==8.8.4 ghc ==8.10.3
tested-with: ghc ==8.8.4 ghc ==8.10.4 ghc ==9.0.1
homepage: https://github.com/mrkkrp/megaparsec
bug-reports: https://github.com/mrkkrp/megaparsec/issues
synopsis: Monadic parser combinators
@ -55,7 +55,7 @@ library
default-language: Haskell2010
build-depends:
base >=4.12 && <5.0,
base >=4.13 && <5.0,
bytestring >=0.2 && <0.12,
case-insensitive >=1.2 && <1.3,
containers >=0.5 && <0.7,
@ -83,7 +83,7 @@ benchmark bench-speed
hs-source-dirs: bench/speed
default-language: Haskell2010
build-depends:
base >=4.12 && <5.0,
base >=4.13 && <5.0,
containers >=0.5 && <0.7,
criterion >=0.6.2.1 && <1.6,
deepseq >=1.3 && <1.5,
@ -102,7 +102,7 @@ benchmark bench-memory
hs-source-dirs: bench/memory
default-language: Haskell2010
build-depends:
base >=4.12 && <5.0,
base >=4.13 && <5.0,
containers >=0.5 && <0.7,
deepseq >=1.3 && <1.5,
megaparsec -any,