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

diff --git a/compiler/basicTypes/NameEnv.lhs b/compiler/basicTypes/NameEnv.lhs
index ff63701..76e0896 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_GHC -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/WorkingConventions#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,10 @@ module NameEnv (
 
 #include "HsVersions.h"
 
-import Name	( Name )
+import Name
+import Unique(Unique)
 import UniqFM
-import Maybes	( expectJust )
+import Maybes
 \end{code}
 
 %************************************************************************
@@ -33,12 +43,14 @@ type NameEnv 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
@@ -53,12 +65,14 @@ emptyNameEnv   	    = emptyUFM
 foldNameEnv	    = foldUFM
 mkNameEnv	    = listToUFM
 nameEnvElts    	    = eltsUFM
+nameEnvUniqueElts   = ufmToList
 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