X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FNameEnv.lhs;h=4b8085da9ccda019d60e9c3d02892e76aea6f67f;hb=432b9c9322181a3644083e3c19b7e240d90659e7;hp=6255e73874ad26ede566fe308d8b1704c06b2861;hpb=49c98d143c382a1341e1046f5ca00819a25691ba;p=ghc-hetmet.git

diff --git a/compiler/basicTypes/NameEnv.lhs b/compiler/basicTypes/NameEnv.lhs
index 6255e73..4b8085d 100644
--- a/compiler/basicTypes/NameEnv.lhs
+++ b/compiler/basicTypes/NameEnv.lhs
@@ -6,8 +6,12 @@
 
 \begin{code}
 module NameEnv (
-	NameEnv, mkNameEnv,
-	emptyNameEnv, unitNameEnv, nameEnvElts, 
+	-- * Var, Id and TyVar environments (maps) 
+	NameEnv, 
+	
+	-- ** Manipulating these environments
+	mkNameEnv,
+	emptyNameEnv, unitNameEnv, nameEnvElts, nameEnvUniqueElts,
 	extendNameEnv_C, extendNameEnv_Acc, extendNameEnv,
         extendNameEnvList, extendNameEnvList_C,
 	foldNameEnv, filterNameEnv,
@@ -19,8 +23,10 @@ module NameEnv (
 #include "HsVersions.h"
 
 import Name
-import UniqFM
+import Unique
+import LazyUniqFM
 import Maybes
+import Outputable
 \end{code}
 
 %************************************************************************
@@ -30,11 +36,12 @@ import Maybes
 %************************************************************************
 
 \begin{code}
-type NameEnv a = UniqFM a	-- Domain is Name
+newtype NameEnv a = A (UniqFM a)	-- Domain is Name
 
 emptyNameEnv   	   :: NameEnv a
 mkNameEnv	   :: [(Name,a)] -> NameEnv a
 nameEnvElts    	   :: NameEnv a -> [a]
+nameEnvUniqueElts  :: NameEnv a -> [(Unique, a)]
 extendNameEnv_C    :: (a->a->a) -> NameEnv a -> Name -> a -> NameEnv a
 extendNameEnv_Acc  :: (a->b->b) -> (a->b) -> NameEnv b -> Name -> a -> NameEnv b
 extendNameEnv  	   :: NameEnv a -> Name -> a -> NameEnv a
@@ -52,25 +59,29 @@ foldNameEnv	   :: (a -> b -> b) -> b -> NameEnv a -> b
 filterNameEnv	   :: (elt -> Bool) -> NameEnv elt -> NameEnv elt
 mapNameEnv	   :: (elt1 -> elt2) -> NameEnv elt1 -> NameEnv elt2
 
-emptyNameEnv   	    = emptyUFM
-foldNameEnv	    = foldUFM
-mkNameEnv	    = listToUFM
-nameEnvElts    	    = eltsUFM
-extendNameEnv_C     = addToUFM_C
-extendNameEnv_Acc   = addToUFM_Acc
-extendNameEnv  	    = addToUFM
-plusNameEnv    	    = plusUFM
-plusNameEnv_C  	    = plusUFM_C
-extendNameEnvList   = addListToUFM
-extendNameEnvList_C = addListToUFM_C
-delFromNameEnv 	    = delFromUFM
-delListFromNameEnv  = delListFromUFM
-elemNameEnv    	    = elemUFM
-unitNameEnv    	    = unitUFM
-filterNameEnv	    = filterUFM
-mapNameEnv	    = mapUFM
+nameEnvElts (A x) = eltsUFM x
+emptyNameEnv  	 = A emptyUFM
+unitNameEnv x y = A $ unitUFM x y 
+extendNameEnv (A x) y z = A $ addToUFM x y z
+extendNameEnvList (A x) l = A $ addListToUFM x l
+lookupNameEnv (A x) y = lookupUFM x y
+mkNameEnv     l    = A $ listToUFM l
+elemNameEnv x (A y) 	 = elemUFM x y
+foldNameEnv a b (A c)	 = foldUFM a b c 
+plusNameEnv (A x) (A y)	 = A $ plusUFM x y 
+plusNameEnv_C f (A x) (A y)	 = A $ plusUFM_C f x y 
+extendNameEnv_C f (A x) y z   = A $ addToUFM_C f x y z
+mapNameEnv f (A x)	 = A $ mapUFM f x
+nameEnvUniqueElts (A x)  = ufmToList x
+extendNameEnv_Acc x y (A z) a b  = A $ addToUFM_Acc x y z a b
+extendNameEnvList_C x (A y) z = A $ addListToUFM_C x y z
+delFromNameEnv (A x) y    = A $ delFromUFM x y
+delListFromNameEnv (A x) y  = A $ delListFromUFM x y
+filterNameEnv x (A y)       = A $ filterUFM x y
 
-lookupNameEnv  	       = lookupUFM
-lookupNameEnv_NF env n = expectJust "lookupNameEnv_NF" (lookupUFM env n)
+lookupNameEnv_NF env n = expectJust "lookupNameEnv_NF" (lookupNameEnv env n)
+
+instance Outputable a => Outputable (NameEnv a) where
+    ppr (A x) = ppr x
 \end{code}