add Data.Sequence to nhc98 build

[haskell-directory.git] / Data / Version.hs

diff --git a/Data/Version.hs b/Data/Version.hs
index df20a4b..1b02c6f 100644 (file)
--- a/Data/Version.hs
+++ b/Data/Version.hs
@@ -51,7 +51,7 @@ import Data.Dynamic   ( Typeable(..), TyCon, mkTyCon, mkAppTy )
 import Data.Typeable   ( Typeable )
 #endif
 
-import Data.List       ( intersperse )
+import Data.List       ( intersperse, sort )
 import Control.Monad   ( liftM )
 import Data.Char       ( isDigit, isAlphaNum )
 
@@ -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.
@@ -120,8 +120,8 @@ instance Typeable Version where
 
 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
@@ -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)