X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Data%2FVersion.hs;h=c52d21c6e649a620297eab4f86a77906e959cd3b;hb=0a41af38169035a4359c0c29bc1219af564dce64;hp=df20a4b2b357bc78704600fd21b69411d1a80ca0;hpb=1c12fc7d08d35015f32679738cf24f0924933449;p=ghc-base.git diff --git a/Data/Version.hs b/Data/Version.hs index df20a4b..c52d21c 100644 --- a/Data/Version.hs +++ b/Data/Version.hs @@ -66,7 +66,7 @@ ordering on the 'versionBranch' fields (i.e. 2.1 > 2.0, 1.2.3 > 1.2.2, etc.). This is expected to be sufficient for many uses, but note that you may need to use a more specific ordering for your versioning scheme. For example, some versioning schemes may include pre-releases -which have tags @"pre1"@, @"pre2"@, and so on, and these would need to +which have tags @\"pre1\"@, @\"pre2\"@, and so on, and these would need to be taken into account when determining ordering. In some cases, date ordering may be more appropriate, so the application would have to look for @date@ tags in the 'versionTags' field and compare those. @@ -131,7 +131,7 @@ instance Ord Version where -- | Provides one possible concrete representation for 'Version'. For -- a version with 'versionBranch' @= [1,2,3]@ and 'versionTags' --- @= ["tag1","tag2"]@, the output will be @1.2.3-tag1-tag2@. +-- @= [\"tag1\",\"tag2\"]@, the output will be @1.2.3-tag1-tag2@. -- showVersion :: Version -> String showVersion (Version branch tags) @@ -140,12 +140,12 @@ showVersion (Version branch tags) -- | A parser for versions in the format produced by 'showVersion'. -- -#if __GLASGOW_HASKELL__ <= 602 && !__HUGS__ && !__NHC__ -parseVersion :: ReadP r Version +#if __GLASGOW_HASKELL__ >= 603 || __HUGS__ +parseVersion :: ReadP Version #elif __NHC__ parseVersion :: ReadPN r Version #else -parseVersion :: ReadP Version +parseVersion :: ReadP r Version #endif parseVersion = do branch <- sepBy1 (liftM read $ munch1 isDigit) (char '.') tags <- many (char '-' >> munch1 isAlphaNum)