add GHC.HetMet.{hetmet_kappa,hetmet_kappa_app}

[ghc-base.git] / Data / Version.hs

diff --git a/Data/Version.hs b/Data/Version.hs
index 18701f7..7d7d329 100644 (file)
--- a/Data/Version.hs
+++ b/Data/Version.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE CPP, DeriveDataTypeable #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Version
@@ -37,7 +39,7 @@ 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.
-#if __GLASGOW_HASKELL__ >= 603 || __HUGS__ || __NHC__
+#if __GLASGOW_HASKELL__ || __HUGS__ || __NHC__
 import Text.ParserCombinators.ReadP
 #else
 import Distribution.Compat.ReadP
@@ -45,8 +47,6 @@ import Distribution.Compat.ReadP
 
 #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
@@ -99,7 +99,7 @@ data Version =
                 -- on the entity that this version applies to.
         }
   deriving (Read,Show
-#if __GLASGOW_HASKELL__ >= 602
+#if __GLASGOW_HASKELL__
         ,Typeable
 #endif
         )
@@ -110,12 +110,6 @@ 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 []
 #endif
 
 instance Eq Version where
@@ -140,7 +134,7 @@ showVersion (Version branch tags)
 
 -- | A parser for versions in the format produced by 'showVersion'.
 --
-#if __GLASGOW_HASKELL__ >= 603 || __HUGS__
+#if __GLASGOW_HASKELL__ || __HUGS__
 parseVersion :: ReadP Version
 #elif __NHC__
 parseVersion :: ReadPN r Version