Remove redundant HpcMap and HpcSet wrappers around Data.{Map,Set}

diff --git a/utils/hpc/HpcCombine.hs b/utils/hpc/HpcCombine.hs
index 57c698a..190a727 100644 (file)
--- a/utils/hpc/HpcCombine.hs
+++ b/utils/hpc/HpcCombine.hs
@@ -11,8 +11,8 @@ import Trace.Hpc.Util
 import HpcFlags
 
 import Control.Monad
-import qualified HpcSet as Set
-import qualified HpcMap as Map
+import qualified Data.Set as Set
+import qualified Data.Map as Map
 
 ------------------------------------------------------------------------------
 sum_options :: FlagOptSeq

diff --git a/utils/hpc/HpcDraft.hs b/utils/hpc/HpcDraft.hs
index 3527fdf..7b43352 100644 (file)
--- a/utils/hpc/HpcDraft.hs
+++ b/utils/hpc/HpcDraft.hs
@@ -6,8 +6,8 @@ import Trace.Hpc.Util
 
 import HpcFlags
 
-import qualified HpcSet as Set
-import qualified HpcMap as Map
+import qualified Data.Set as Set
+import qualified Data.Map as Map
 import HpcUtils
 import Data.Tree
 

diff --git a/utils/hpc/HpcFlags.hs b/utils/hpc/HpcFlags.hs
index 30cc401..f5d699a 100644 (file)
--- a/utils/hpc/HpcFlags.hs
+++ b/utils/hpc/HpcFlags.hs
@@ -3,7 +3,7 @@
 module HpcFlags where
 
 import System.Console.GetOpt
-import qualified HpcSet as Set
+import qualified Data.Set as Set
 import Data.Char
 import Trace.Hpc.Tix
 import Trace.Hpc.Mix

diff --git a/utils/hpc/HpcMap.hs b/utils/hpc/HpcMap.hs
deleted file mode 100644 (file)
index 873fc50..0000000
--- a/utils/hpc/HpcMap.hs
+++ /dev/null
@@ -1,32 +0,0 @@
-module HpcMap ( module HpcMap ) where
-
-#if __GLASGOW_HASKELL__ < 604
-import qualified Data.FiniteMap as Map
-#else
-import qualified Data.Map as Map
-#endif
-
-
-lookup :: Ord key => key -> Map key elt -> Maybe elt
-fromList :: Ord key => [(key,elt)] -> Map key elt
-fromListWith :: Ord k => (a -> a -> a) -> [(k, a)] -> Map k a
-toList :: Ord key => Map key elt -> [(key,elt)]
-
-#if __GLASGOW_HASKELL__ < 604
-type Map key elt = Map.FiniteMap key elt
-
-lookup = flip Map.lookupFM
-fromList = Map.listToFM 
-fromListWith f xs = Map.addListToFM_C f Map.emptyFM xs
-toList = Map.fmToList
-
-#else
-
-type Map key elt = Map.Map key elt
-
-lookup = Map.lookup
-fromList = Map.fromList
-toList   = Map.toList
-fromListWith = Map.fromListWith
-
-#endif

diff --git a/utils/hpc/HpcMarkup.hs b/utils/hpc/HpcMarkup.hs
index f734f65..46e1709 100644 (file)
--- a/utils/hpc/HpcMarkup.hs
+++ b/utils/hpc/HpcMarkup.hs
@@ -18,7 +18,7 @@ import Data.Maybe(fromJust)
 import Data.Array
 import Data.Monoid
 import Control.Monad
-import qualified HpcSet as Set
+import qualified Data.Set as Set
 
 ------------------------------------------------------------------------------
 

diff --git a/utils/hpc/HpcOverlay.hs b/utils/hpc/HpcOverlay.hs
index e415578..a074d6c 100644 (file)
--- a/utils/hpc/HpcOverlay.hs
+++ b/utils/hpc/HpcOverlay.hs
@@ -6,7 +6,7 @@ import HpcUtils
 import Trace.Hpc.Tix
 import Trace.Hpc.Mix
 import Trace.Hpc.Util
-import HpcMap as Map
+import qualified Data.Map as Map
 import Data.Tree
 
 overlay_options :: FlagOptSeq

diff --git a/utils/hpc/HpcReport.hs b/utils/hpc/HpcReport.hs
index 5d8c714..d3e3ef0 100644 (file)
--- a/utils/hpc/HpcReport.hs
+++ b/utils/hpc/HpcReport.hs
@@ -11,7 +11,7 @@ import HpcFlags
 import Trace.Hpc.Mix
 import Trace.Hpc.Tix
 import Control.Monad hiding (guard)
-import qualified HpcSet as Set
+import qualified Data.Set as Set
 
 notExpecting :: String -> a
 notExpecting s = error ("not expecting "++s)

diff --git a/utils/hpc/HpcSet.hs b/utils/hpc/HpcSet.hs
deleted file mode 100644 (file)
index d5dfe38..0000000
--- a/utils/hpc/HpcSet.hs
+++ /dev/null
@@ -1,39 +0,0 @@
-module HpcSet (        module HpcSet ) where 
-
-import qualified Data.Set as Set
-
-type Set a = Set.Set a
-
-empty  :: Set a
-insert :: (Ord a) => a -> Set a -> Set a
-member :: (Ord a) => a -> Set a -> Bool
-null   :: Set a -> Bool
-intersection :: Ord a => Set a -> Set a -> Set a
-fromList :: Ord a => [a] -> Set a
-toList :: Set a -> [a]
-union :: Ord a => Set a -> Set a -> Set a
-
-#if __GLASGOW_HASKELL__ < 604
-
-empty  = Set.emptySet
-insert = flip Set.addToSet
-member = Set.elementOf
-null   = Set.isEmptySet
-intersection = Set.intersect
-fromList = Set.mkSet
-toList = Set.setToList
-union = Set.union
-
-#else
-
-empty  = Set.empty
-insert = Set.insert
-member = Set.member
-null   = Set.null
-intersection = Set.intersection
-fromList = Set.fromList
-toList = Set.toList
-union = Set.union
-
-#endif
-

diff --git a/utils/hpc/HpcShowTix.hs b/utils/hpc/HpcShowTix.hs
index efeb19e..7fd6515 100644 (file)
--- a/utils/hpc/HpcShowTix.hs
+++ b/utils/hpc/HpcShowTix.hs
@@ -5,7 +5,7 @@ import Trace.Hpc.Tix
 
 import HpcFlags
 
-import qualified HpcSet as Set
+import qualified Data.Set as Set
 
 showtix_options :: FlagOptSeq
 showtix_options 

diff --git a/utils/hpc/HpcUtils.hs b/utils/hpc/HpcUtils.hs
index 0f56629..397a041 100644 (file)
--- a/utils/hpc/HpcUtils.hs
+++ b/utils/hpc/HpcUtils.hs
@@ -1,7 +1,7 @@
 module HpcUtils where
 
 import Trace.Hpc.Util
-import qualified HpcMap as Map
+import qualified Data.Map as Map
 
 -- turns \n into ' '
 -- | grab's the text behind a HpcPos; 

diff --git a/utils/hpc/ghc.mk b/utils/hpc/ghc.mk
index abc3a54..164dacf 100644 (file)
--- a/utils/hpc/ghc.mk
+++ b/utils/hpc/ghc.mk
@@ -10,8 +10,8 @@
 #
 # -----------------------------------------------------------------------------
 
-utils/hpc_dist_MODULES = Main HpcCombine HpcDraft HpcFlags HpcLexer HpcMap \
-                        HpcMarkup HpcOverlay HpcParser HpcReport HpcSet \
+utils/hpc_dist_MODULES = Main HpcCombine HpcDraft HpcFlags HpcLexer \
+                        HpcMarkup HpcOverlay HpcParser HpcReport \
                         HpcShowTix HpcUtils
 utils/hpc_dist_HC_OPTS = -cpp -package hpc
 utils/hpc_dist_INSTALL = YES