c5d6996 · typeable/inflections-hs

git.iko.soy/typeable/inflections-hs

on master help sign in

Merge pull request #53 from stackbuilders/megaparsec_6_4_0_compatibility

c5d6996Sebastián Estrella9 years ago

CHANGELOG.md+3

compare with master

unifiedsplit

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

1+## Inflections 0.4.0.1

2+* Support `megaparsec` >= 6.4.0

1## Inflections 0.4.0.0

4## Inflections 0.4.0.0

3* Update megaparsec to version 6.

6* Update megaparsec to version 6.

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

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

17 ( parseCamelCase )

18where

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

20−import Control.Applicative

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

22+#else

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

24+#endif

21import Data.Text (Text)

25import Data.Text (Text)

22import Data.Void (Void)

26import Data.Void (Void)

23import Text.Inflections.Types

27import Text.Inflections.Types

24−import Text.Megaparsec

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

25import Text.Megaparsec.Char

29import Text.Megaparsec.Char

26import qualified Data.Text as T

30import qualified Data.Text as T

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

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

16 ( parseSnakeCase )

17where

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

19−import Control.Applicative

20+import Control.Applicative (empty, some)

21+#else

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

23+#endif

20import Data.Text (Text)

24import Data.Text (Text)

21import Data.Void (Void)

25import Data.Void (Void)

22import Text.Inflections.Types

26import Text.Inflections.Types

23−import Text.Megaparsec

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

24import Text.Megaparsec.Char

28import Text.Megaparsec.Char

25import qualified Data.Text as T

29import qualified Data.Text as T

inflections.cabal+1−1

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

1name: inflections

2−version: 0.4.0.0

2+version: 0.4.0.1

3synopsis: Inflections library for Haskell

4description:

5 Inflections provides methods for singularization, pluralization,