projects
/
haskell-directory.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add extra libraries when compiling with GHC on Windows
[haskell-directory.git]
/
Data
/
Version.hs
diff --git
a/Data/Version.hs
b/Data/Version.hs
index
8ffe754
..
1b02c6f
100644
(file)
--- a/
Data/Version.hs
+++ b/
Data/Version.hs
@@
-6,7
+6,7
@@
--
-- Maintainer : libraries@haskell.org
-- Stability : experimental
--
-- Maintainer : libraries@haskell.org
-- Stability : experimental
--- Portability : portable
+-- Portability : non-portable (local universal quantification in ReadP)
--
-- A general library for representation and manipulation of versions.
--
--
-- A general library for representation and manipulation of versions.
--
@@
-37,19
+37,21
@@
import Prelude -- necessary to get dependencies right
-- of GHC. In which case, we might need to pick up ReadP from
-- Distribution.Compat.ReadP, because the version in
-- Text.ParserCombinators.ReadP doesn't have all the combinators we need.
-- of GHC. In which case, we might need to pick up ReadP from
-- Distribution.Compat.ReadP, because the version in
-- Text.ParserCombinators.ReadP doesn't have all the combinators we need.
-#if __GLASGOW_HASKELL__ <= 602
-import Distribution.Compat.ReadP
-#else
+#if __GLASGOW_HASKELL__ >= 603 || __HUGS__ || __NHC__
import Text.ParserCombinators.ReadP
import Text.ParserCombinators.ReadP
+#else
+import Distribution.Compat.ReadP
#endif
#endif
-#if __GLASGOW_HASKELL__ < 602
+#if !__GLASGOW_HASKELL__
+import Data.Typeable ( Typeable, TyCon, mkTyCon, mkTyConApp )
+#elif __GLASGOW_HASKELL__ < 602
import Data.Dynamic ( Typeable(..), TyCon, mkTyCon, mkAppTy )
#else
import Data.Typeable ( Typeable )
#endif
import Data.Dynamic ( Typeable(..), TyCon, mkTyCon, mkAppTy )
#else
import Data.Typeable ( Typeable )
#endif
-import Data.List ( intersperse )
+import Data.List ( intersperse, sort )
import Control.Monad ( liftM )
import Data.Char ( isDigit, isAlphaNum )
import Control.Monad ( liftM )
import Data.Char ( isDigit, isAlphaNum )
@@
-64,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
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.
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.
@@
-102,9
+104,15
@@
data Version =
#endif
)
#endif
)
-#if __GLASGOW_HASKELL__ < 602
+#if !__GLASGOW_HASKELL__
versionTc :: TyCon
versionTc :: TyCon
-versionTc = mkTyCon "()"
+versionTc = mkTyCon "Version"
+
+instance Typeable Version where
+ typeOf _ = mkTyConApp versionTc []
+#elif __GLASGOW_HASKELL__ < 602
+versionTc :: TyCon
+versionTc = mkTyCon "Version"
instance Typeable Version where
typeOf _ = mkAppTy versionTc []
instance Typeable Version where
typeOf _ = mkAppTy versionTc []
@@
-112,8
+120,8
@@
instance Typeable Version where
instance Eq Version where
v1 == v2 = versionBranch v1 == versionBranch v2
instance Eq Version where
v1 == v2 = versionBranch v1 == versionBranch v2
- && all (`elem` (versionTags v2)) (versionTags v1)
- -- tags may be in any order
+ && sort (versionTags v1) == sort (versionTags v2)
+ -- tags may be in any order
instance Ord Version where
v1 `compare` v2 = versionBranch v1 `compare` versionBranch v2
instance Ord Version where
v1 `compare` v2 = versionBranch v1 `compare` versionBranch v2
@@
-123,7
+131,7
@@
instance Ord Version where
-- | Provides one possible concrete representation for 'Version'. For
-- a version with 'versionBranch' @= [1,2,3]@ and 'versionTags'
-- | 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)
--
showVersion :: Version -> String
showVersion (Version branch tags)
@@
-132,10
+140,12
@@
showVersion (Version branch tags)
-- | A parser for versions in the format produced by 'showVersion'.
--
-- | A parser for versions in the format produced by 'showVersion'.
--
-#if __GLASGOW_HASKELL__ <= 602
-parseVersion :: ReadP r Version
-#else
+#if __GLASGOW_HASKELL__ >= 603 || __HUGS__
parseVersion :: ReadP Version
parseVersion :: ReadP Version
+#elif __NHC__
+parseVersion :: ReadPN r Version
+#else
+parseVersion :: ReadP r Version
#endif
parseVersion = do branch <- sepBy1 (liftM read $ munch1 isDigit) (char '.')
tags <- many (char '-' >> munch1 isAlphaNum)
#endif
parseVersion = do branch <- sepBy1 (liftM read $ munch1 isDigit) (char '.')
tags <- many (char '-' >> munch1 isAlphaNum)