c5d6996 · typeable/inflections-hs

git.iko.soy/typeable/inflections-hs

Merge pull request #53 from stackbuilders/megaparsec_6_4_0_compatibility

Support megaparsec >= 6.4.0

commitc5d6996370b3c66797a373334c97494392ca0001 authorSebastián Estrella <sebas007estrella@gmail.com> dateMon 15 Jan 2018, 15:21 (9 years ago) parent6cdef17 dda2f83

4 files changed+16−5

compare with master

unifiedsplit

CHANGELOG.md+3 Text/Inflections/Parse/CamelCase.hs+6−2 Text/Inflections/Parse/SnakeCase.hs+6−2 inflections.cabal+1−1

CHANGELOG.md+3

@@ -1,3 +1,6 @@

1+## Inflections 0.4.0.1

2+* Support `megaparsec` >= 6.4.0

14## Inflections 0.4.0.0

36* Update megaparsec to version 6.

Text/Inflections/Parse/CamelCase.hs+6−2

@@ -17,11 +17,15 @@ module Text.Inflections.Parse.CamelCase

1717 ( parseCamelCase )

1818where

1919

20−import Control.Applicative

20+# if MIN_VERSION_base(4,8,0)

21+import Control.Applicative (empty, many, (<|>))

22+#else

23+import Control.Applicative (empty, many, (<|>), (<$>), (<*))

24+#endif

2125import Data.Text (Text)

2226import Data.Void (Void)

2327import Text.Inflections.Types

24−import Text.Megaparsec

28+import Text.Megaparsec (Parsec, ParseError, choice, eof, parse)

2529import Text.Megaparsec.Char

2630import qualified Data.Text as T

2731

Text/Inflections/Parse/SnakeCase.hs+6−2

@@ -16,11 +16,15 @@ module Text.Inflections.Parse.SnakeCase

1616 ( parseSnakeCase )

1717where

1818

19−import Control.Applicative

19+# if MIN_VERSION_base(4,8,0)

20+import Control.Applicative (empty, some)

21+#else

22+import Control.Applicative (empty, some, (<$>), (<*))

23+#endif

2024import Data.Text (Text)

2125import Data.Void (Void)

2226import Text.Inflections.Types

23−import Text.Megaparsec

27+import Text.Megaparsec (Parsec, ParseError, eof, sepBy, parse)

2428import Text.Megaparsec.Char

2529import qualified Data.Text as T

2630

inflections.cabal+1−1

@@ -1,5 +1,5 @@

11name: inflections

2−version: 0.4.0.0

2+version: 0.4.0.1

33synopsis: Inflections library for Haskell

44description:

55 Inflections provides methods for singularization, pluralization,