X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FbasicTypes%2FNameEnv.lhs;h=b6a7ec8e08ea447eeb26637b06d0f402b3aa8333;hp=ff637010aa048c067ddeea458b9b77f5e63a5622;hb=6a05ec5ef5373f61b7f9f5bdc344483417fa801b;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1

diff --git a/compiler/basicTypes/NameEnv.lhs b/compiler/basicTypes/NameEnv.lhs
index ff63701..b6a7ec8 100644
--- a/compiler/basicTypes/NameEnv.lhs
+++ b/compiler/basicTypes/NameEnv.lhs
@@ -1,13 +1,22 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
 \section[NameEnv]{@NameEnv@: name environments}
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 module NameEnv (
 	NameEnv, mkNameEnv,
-	emptyNameEnv, unitNameEnv, nameEnvElts, 
-	extendNameEnv_C, extendNameEnv_Acc, extendNameEnv, extendNameEnvList, 
+	emptyNameEnv, unitNameEnv, nameEnvElts, nameEnvUniqueElts,
+	extendNameEnv_C, extendNameEnv_Acc, extendNameEnv,
+        extendNameEnvList, extendNameEnvList_C,
 	foldNameEnv, filterNameEnv,
 	plusNameEnv, plusNameEnv_C, 
 	lookupNameEnv, lookupNameEnv_NF, delFromNameEnv, delListFromNameEnv,
@@ -16,9 +25,11 @@ module NameEnv (
 
 #include "HsVersions.h"
 
-import Name	( Name )
+import Name
+import Unique(Unique)
 import UniqFM
-import Maybes	( expectJust )
+import Maybes
+import Outputable
 \end{code}
 
 %************************************************************************
@@ -28,17 +39,19 @@ import Maybes	( expectJust )
 %************************************************************************
 
 \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
 plusNameEnv    	   :: NameEnv a -> NameEnv a -> NameEnv a
 plusNameEnv_C  	   :: (a->a->a) -> NameEnv a -> NameEnv a -> NameEnv a
 extendNameEnvList  :: NameEnv a -> [(Name,a)] -> NameEnv a
+extendNameEnvList_C :: (a->a->a) -> NameEnv a -> [(Name,a)] -> NameEnv a
 delFromNameEnv 	   :: NameEnv a -> Name -> NameEnv a
 delListFromNameEnv :: NameEnv a -> [Name] -> NameEnv a
 elemNameEnv    	   :: Name -> NameEnv a -> Bool
@@ -49,24 +62,31 @@ 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
-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 
+occEnvElts (A x)	 = eltsUFM x
+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
+mkNameEnv_C comb l = A $ addListToUFM_C comb emptyUFM l
+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_NF env n = expectJust "lookupNameEnv_NF" (lookupNameEnv env n)
 
-lookupNameEnv  	       = lookupUFM
-lookupNameEnv_NF env n = expectJust "lookupNameEnv_NF" (lookupUFM env n)
+instance Outputable a => Outputable (NameEnv a) where
+    ppr (A x) = ppr x
 \end{code}