X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Futils%2FFiniteMap.lhs;h=e550d1e9fb6931c9fc0f9f13740a3ba61d8174ef;hb=9c26739695219d8343505a88457cb55c76b65449;hp=384a7d122a647ef028a650cf1326e28c279882e4;hpb=68afb16743cafd5b7495771d359891c6dfc5a186;p=ghc-hetmet.git

diff --git a/ghc/compiler/utils/FiniteMap.lhs b/ghc/compiler/utils/FiniteMap.lhs
index 384a7d1..e550d1e 100644
--- a/ghc/compiler/utils/FiniteMap.lhs
+++ b/ghc/compiler/utils/FiniteMap.lhs
@@ -25,6 +25,10 @@ near the end (only \tr{#ifdef COMPILING_GHC}).
 #define ASSERT(e) {--}
 #define IF_NOT_GHC(a) a
 #define COMMA ,
+#define _tagCmp compare
+#define _LT LT
+#define _GT GT
+#define _EQ EQ
 #endif
 
 #if defined(COMPILING_GHC) && defined(DEBUG_FINITEMAPS)/* NB NB NB */
@@ -42,7 +46,7 @@ module FiniteMap (
 	addToFM_C,
 	addListToFM,
 	addListToFM_C,
-	IF_NOT_GHC(delFromFM COMMA)
+	delFromFM,
 	delListFromFM,
 
 	plusFM,
@@ -50,9 +54,9 @@ module FiniteMap (
 	minusFM,
 	foldFM,
 
-	IF_NOT_GHC(intersectFM COMMA)
-	IF_NOT_GHC(intersectFM_C COMMA)
-	IF_NOT_GHC(mapFM COMMA filterFM COMMA)
+	intersectFM,
+	intersectFM_C,
+	mapFM, filterFM,
 
 	sizeFM, isEmptyFM, elemFM, lookupFM, lookupWithDefaultFM,
 
@@ -60,29 +64,35 @@ module FiniteMap (
 
 #ifdef COMPILING_GHC
 	, bagToFM
-	, FiniteSet(..), emptySet, mkSet, isEmptySet
+	, SYN_IE(FiniteSet), emptySet, mkSet, isEmptySet
 	, elementOf, setToList, union, minusSet
 #endif
+    ) where
 
-	-- To make it self-sufficient
-#if __HASKELL1__ < 3
-	, Maybe
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
+IMPORT_DELOOPER(SpecLoop)
+#else
+import {-# SOURCE #-} Name
 #endif
-    ) where
 
+#if __GLASGOW_HASKELL__ >= 202
+import GlaExts
+#endif
+#if defined(USE_FAST_STRINGS)
+import FastString
+#endif
 import Maybes
+import Bag	  ( Bag, foldrBag )
+import Outputable ( PprStyle, Outputable(..) )
+import Pretty	( Doc )
 
 #ifdef COMPILING_GHC
-import Ubiq{-uitous-}
-# ifdef DEBUG
-import Pretty
+
+# if ! OMIT_NATIVE_CODEGEN
+#  define IF_NCG(a) a
+# else
+#  define IF_NCG(a) {--}
 # endif
-import Bag	( foldBag )
-#if ! OMIT_NATIVE_CODEGEN
-#define IF_NCG(a) a
-#else
-#define IF_NCG(a) {--}
-#endif
 #endif
 
 -- SIGH: but we use unboxed "sizes"...
@@ -144,8 +154,8 @@ minusFM		:: (Ord key OUTPUTABLE_key) => FiniteMap key elt -> FiniteMap key elt -
 		   -- (minusFM a1 a2) deletes from a1 any bindings which are bound in a2
 
 intersectFM	:: (Ord key OUTPUTABLE_key) => FiniteMap key elt -> FiniteMap key elt -> FiniteMap key elt
-intersectFM_C	:: (Ord key OUTPUTABLE_key) => (elt -> elt -> elt)
-			   -> FiniteMap key elt -> FiniteMap key elt -> FiniteMap key elt
+intersectFM_C	:: (Ord key OUTPUTABLE_key) => (elt -> elt -> elt2)
+			   -> FiniteMap key elt -> FiniteMap key elt -> FiniteMap key elt2
 
 --	MAPPING, FOLDING, FILTERING
 foldFM		:: (key -> elt -> a -> a) -> a -> FiniteMap key elt -> a
@@ -215,7 +225,7 @@ unitFM key elt = Branch key elt IF_GHC(1#,1) emptyFM emptyFM
 listToFM = addListToFM emptyFM
 
 #ifdef COMPILING_GHC
-bagToFM = foldBag plusFM (\ (k,v) -> unitFM k v) emptyFM
+bagToFM = foldrBag (\(k,v) fm -> addToFM fm k v) emptyFM
 #endif
 \end{code}
 
@@ -293,6 +303,7 @@ plusFM_C combiner fm1 (Branch split_key elt2 _ left right)
 
 -- It's worth doing plusFM specially, because we don't need
 -- to do the lookup in fm1.
+-- FM2 over-rides FM1.
 
 plusFM EmptyFM fm2 = fm2
 plusFM fm1 EmptyFM = fm1
@@ -433,7 +444,7 @@ mkBranch which key elt fm_l fm_r
   = --ASSERT( left_ok && right_ok && balance_ok )
 #if defined(COMPILING_GHC) && defined(DEBUG_FINITEMAPS)
     if not ( left_ok && right_ok && balance_ok ) then
-	pprPanic ("mkBranch:"++show which) (ppAboves [ppr PprDebug [left_ok, right_ok, balance_ok],
+	pprPanic ("mkBranch:"++show which) (vcat [ppr PprDebug [left_ok, right_ok, balance_ok],
 				       ppr PprDebug key,
 				       ppr PprDebug fm_l,
 				       ppr PprDebug fm_r])
@@ -698,11 +709,11 @@ deleteMax (Branch key elt _ fm_l    fm_r) = mkBalBranch key elt fm_l (deleteMax
 instance (Outputable key) => Outputable (FiniteMap key elt) where
     ppr sty fm = pprX sty fm
 
-pprX sty EmptyFM = ppChar '!'
+pprX sty EmptyFM = char '!'
 pprX sty (Branch key elt sz fm_l fm_r)
- = ppBesides [ppLparen, pprX sty fm_l, ppSP,
-	      ppr sty key, ppSP, ppInt (IF_GHC(I# sz, sz)), ppSP,
-	      pprX sty fm_r, ppRparen]
+ = parens (hcat [pprX sty fm_l, space,
+		      ppr sty key, space, int (IF_GHC(I# sz, sz)), space,
+		      pprX sty fm_r])
 #endif
 
 #ifndef COMPILING_GHC
@@ -757,97 +768,66 @@ When the FiniteMap module is used in GHC, we specialise it for
 \tr{Uniques}, for dastardly efficiency reasons.
 
 \begin{code}
-#if 0
-#if defined(COMPILING_GHC) && __GLASGOW_HASKELL__
+#if defined(COMPILING_GHC) && __GLASGOW_HASKELL__ && !defined(REALLY_HASKELL_1_3)
 
-{-# SPECIALIZE listToFM
-		:: [(Int,elt)] -> FiniteMap Int elt,
-		   [(CLabel,elt)] -> FiniteMap CLabel elt,
-		   [(FAST_STRING,elt)] -> FiniteMap FAST_STRING elt,
-		   [((FAST_STRING,FAST_STRING),elt)] -> FiniteMap (FAST_STRING, FAST_STRING) elt
-    IF_NCG(COMMA   [(Reg COMMA elt)] -> FiniteMap Reg elt)
-    #-}
-{-# SPECIALIZE addToFM
-		:: FiniteMap Int elt -> Int -> elt  -> FiniteMap Int elt,
-		   FiniteMap FAST_STRING elt -> FAST_STRING -> elt  -> FiniteMap FAST_STRING elt,
-		   FiniteMap CLabel elt -> CLabel -> elt  -> FiniteMap CLabel elt
-    IF_NCG(COMMA   FiniteMap Reg elt -> Reg -> elt  -> FiniteMap Reg elt)
-    #-}
 {-# SPECIALIZE addListToFM
-		:: FiniteMap Int elt -> [(Int,elt)] -> FiniteMap Int elt,
-		   FiniteMap CLabel elt -> [(CLabel,elt)] -> FiniteMap CLabel elt
+		:: FiniteMap (FAST_STRING, FAST_STRING) elt -> [((FAST_STRING, FAST_STRING),elt)] -> FiniteMap (FAST_STRING, FAST_STRING) elt
+		 , FiniteMap RdrName elt -> [(RdrName,elt)] -> FiniteMap RdrName elt
     IF_NCG(COMMA   FiniteMap Reg elt -> [(Reg COMMA elt)] -> FiniteMap Reg elt)
     #-}
-{-NOT EXPORTED!! # SPECIALIZE addToFM_C
-		:: (elt -> elt -> elt) -> FiniteMap Int elt -> Int -> elt -> FiniteMap Int elt,
-		   (elt -> elt -> elt) -> FiniteMap CLabel elt -> CLabel -> elt -> FiniteMap CLabel elt
-    IF_NCG(COMMA   (elt -> elt -> elt) -> FiniteMap Reg elt -> Reg -> elt -> FiniteMap Reg elt)
-    #-}
 {-# SPECIALIZE addListToFM_C
-		:: (elt -> elt -> elt) -> FiniteMap Int elt -> [(Int,elt)] -> FiniteMap Int elt,
-		   (elt -> elt -> elt) -> FiniteMap TyCon elt -> [(TyCon,elt)] -> FiniteMap TyCon elt,
-		   (elt -> elt -> elt) -> FiniteMap CLabel elt -> [(CLabel,elt)] -> FiniteMap CLabel elt
+		:: (elt -> elt -> elt) -> FiniteMap TyCon elt -> [(TyCon,elt)] -> FiniteMap TyCon elt
+		 , (elt -> elt -> elt) -> FiniteMap FAST_STRING elt -> [(FAST_STRING,elt)] -> FiniteMap FAST_STRING elt
     IF_NCG(COMMA   (elt -> elt -> elt) -> FiniteMap Reg elt -> [(Reg COMMA elt)] -> FiniteMap Reg elt)
     #-}
-{-NOT EXPORTED!!! # SPECIALIZE delFromFM
-		:: FiniteMap Int elt -> Int   -> FiniteMap Int elt,
-		   FiniteMap CLabel elt -> CLabel   -> FiniteMap CLabel elt
-    IF_NCG(COMMA   FiniteMap Reg elt -> Reg   -> FiniteMap Reg elt)
-    #-}
-{-# SPECIALIZE delListFromFM
-		:: FiniteMap Int elt -> [Int] -> FiniteMap Int elt,
-		   FiniteMap CLabel elt -> [CLabel] -> FiniteMap CLabel elt
-    IF_NCG(COMMA   FiniteMap Reg elt -> [Reg] -> FiniteMap Reg elt)
+{-# SPECIALIZE addToFM
+		:: FiniteMap CLabel elt -> CLabel -> elt  -> FiniteMap CLabel elt
+		 , FiniteMap FAST_STRING elt -> FAST_STRING -> elt  -> FiniteMap FAST_STRING elt
+		 , FiniteMap (FAST_STRING, FAST_STRING) elt -> (FAST_STRING, FAST_STRING) -> elt  -> FiniteMap (FAST_STRING, FAST_STRING) elt
+		 , FiniteMap RdrName elt -> RdrName -> elt  -> FiniteMap RdrName elt
+    IF_NCG(COMMA   FiniteMap Reg elt -> Reg -> elt  -> FiniteMap Reg elt)
     #-}
-{-# SPECIALIZE elemFM
-		:: FAST_STRING -> FiniteMap FAST_STRING elt -> Bool
+{-# SPECIALIZE addToFM_C
+		:: (elt -> elt -> elt) -> FiniteMap (RdrName, RdrName) elt -> (RdrName, RdrName) -> elt -> FiniteMap (RdrName, RdrName) elt
+		 , (elt -> elt -> elt) -> FiniteMap FAST_STRING elt -> FAST_STRING -> elt -> FiniteMap FAST_STRING elt
+    IF_NCG(COMMA   (elt -> elt -> elt) -> FiniteMap Reg elt -> Reg -> elt -> FiniteMap Reg elt)
     #-}
-{-not EXPORTED!!! # SPECIALIZE filterFM
-		:: (Int -> elt -> Bool) -> FiniteMap Int elt -> FiniteMap Int elt,
-		   (CLabel -> elt -> Bool) -> FiniteMap CLabel elt -> FiniteMap CLabel elt
-    IF_NCG(COMMA   (Reg -> elt -> Bool) -> FiniteMap Reg elt -> FiniteMap Reg elt)
+{-# SPECIALIZE bagToFM
+		:: Bag (FAST_STRING,elt) -> FiniteMap FAST_STRING elt
     #-}
-{-NOT EXPORTED!!! # SPECIALIZE intersectFM
-		:: FiniteMap Int elt -> FiniteMap Int elt -> FiniteMap Int elt,
-		   FiniteMap CLabel elt -> FiniteMap CLabel elt -> FiniteMap CLabel elt
-    IF_NCG(COMMA   FiniteMap Reg elt -> FiniteMap Reg elt -> FiniteMap Reg elt)
+{-# SPECIALIZE delListFromFM
+		:: FiniteMap RdrName elt -> [RdrName]   -> FiniteMap RdrName elt
+		 , FiniteMap FAST_STRING elt -> [FAST_STRING]   -> FiniteMap FAST_STRING elt
+    IF_NCG(COMMA   FiniteMap Reg elt -> [Reg]   -> FiniteMap Reg elt)
     #-}
-{-not EXPORTED !!!# SPECIALIZE intersectFM_C
-		:: (elt -> elt -> elt) -> FiniteMap Int elt -> FiniteMap Int elt -> FiniteMap Int elt,
-		   (elt -> elt -> elt) -> FiniteMap CLabel elt -> FiniteMap CLabel elt -> FiniteMap CLabel elt
-    IF_NCG(COMMA   (elt -> elt -> elt) -> FiniteMap Reg elt -> FiniteMap Reg elt -> FiniteMap Reg elt)
+{-# SPECIALIZE listToFM
+		:: [([Char],elt)] -> FiniteMap [Char] elt
+		 , [(FAST_STRING,elt)] -> FiniteMap FAST_STRING elt
+		 , [((FAST_STRING,FAST_STRING),elt)] -> FiniteMap (FAST_STRING, FAST_STRING) elt
+    IF_NCG(COMMA   [(Reg COMMA elt)] -> FiniteMap Reg elt)
     #-}
 {-# SPECIALIZE lookupFM
-		:: FiniteMap Int elt -> Int -> Maybe elt,
-		   FiniteMap CLabel elt -> CLabel -> Maybe elt,
-		   FiniteMap FAST_STRING elt -> FAST_STRING -> Maybe elt,
-		   FiniteMap (FAST_STRING,FAST_STRING) elt -> (FAST_STRING,FAST_STRING) -> Maybe elt
+		:: FiniteMap CLabel elt -> CLabel -> Maybe elt
+		 , FiniteMap [Char] elt -> [Char] -> Maybe elt
+		 , FiniteMap FAST_STRING elt -> FAST_STRING -> Maybe elt
+		 , FiniteMap (FAST_STRING,FAST_STRING) elt -> (FAST_STRING,FAST_STRING) -> Maybe elt
+		 , FiniteMap RdrName elt -> RdrName -> Maybe elt
+		 , FiniteMap (RdrName,RdrName) elt -> (RdrName,RdrName) -> Maybe elt
     IF_NCG(COMMA   FiniteMap Reg elt -> Reg -> Maybe elt)
     #-}
 {-# SPECIALIZE lookupWithDefaultFM
-		:: FiniteMap Int elt -> elt -> Int -> elt,
-		   FiniteMap CLabel elt -> elt -> CLabel -> elt
+		:: FiniteMap FAST_STRING elt -> elt -> FAST_STRING -> elt
     IF_NCG(COMMA   FiniteMap Reg elt -> elt -> Reg -> elt)
     #-}
-{-# SPECIALIZE minusFM
-		:: FiniteMap Int elt -> FiniteMap Int elt -> FiniteMap Int elt,
-		   FiniteMap TyCon elt -> FiniteMap TyCon elt -> FiniteMap TyCon elt,
-		   FiniteMap FAST_STRING elt -> FiniteMap FAST_STRING elt -> FiniteMap FAST_STRING elt,
-		   FiniteMap CLabel elt -> FiniteMap CLabel elt -> FiniteMap CLabel elt
-    IF_NCG(COMMA   FiniteMap Reg elt -> FiniteMap Reg elt -> FiniteMap Reg elt)
-    #-}
 {-# SPECIALIZE plusFM
-		:: FiniteMap Int elt -> FiniteMap Int elt -> FiniteMap Int elt,
-		   FiniteMap TyCon elt -> FiniteMap TyCon elt -> FiniteMap TyCon elt,
-		   FiniteMap CLabel elt -> FiniteMap CLabel elt -> FiniteMap CLabel elt
+		:: FiniteMap RdrName elt -> FiniteMap RdrName elt -> FiniteMap RdrName elt
+		 , FiniteMap FAST_STRING elt -> FiniteMap FAST_STRING elt -> FiniteMap FAST_STRING elt
     IF_NCG(COMMA   FiniteMap Reg elt -> FiniteMap Reg elt -> FiniteMap Reg elt)
     #-}
 {-# SPECIALIZE plusFM_C
-		:: (elt -> elt -> elt) -> FiniteMap Int elt -> FiniteMap Int elt -> FiniteMap Int elt,
-		   (elt -> elt -> elt) -> FiniteMap CLabel elt -> FiniteMap CLabel elt -> FiniteMap CLabel elt
+		:: (elt -> elt -> elt) -> FiniteMap FAST_STRING elt -> FiniteMap FAST_STRING elt -> FiniteMap FAST_STRING elt
     IF_NCG(COMMA   (elt -> elt -> elt) -> FiniteMap Reg elt -> FiniteMap Reg elt -> FiniteMap Reg elt)
     #-}
 
 #endif {- compiling for GHC -}
-#endif {- 0 -}
 \end{code}