X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnMonad.lhs;h=8a0b4f4826782aa5fffe5fb9b015690864ff3376;hb=2f223e8f4a4e2fb22a8bb0638cd48256e9f2f0e2;hp=dbe822a222aa87bf0f5c5d76133d52da3cc71acc;hpb=7bb3d1fc79521d591cd9f824893963141a7997b6;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs
index dbe822a..8a0b4f4 100644
--- a/compiler/typecheck/TcRnMonad.lhs
+++ b/compiler/typecheck/TcRnMonad.lhs
@@ -31,7 +31,6 @@ import ErrUtils
 import SrcLoc
 import NameEnv
 import NameSet
-import OccName
 import Bag
 import Outputable
 import UniqSupply
@@ -75,7 +74,7 @@ initTc hsc_env hsc_src keep_rn_syntax mod do_this
 	keep_var     <- newIORef emptyNameSet ;
     used_rdrnames_var <- newIORef Set.empty ;
 	th_var	     <- newIORef False ;
-	dfun_n_var   <- newIORef 1 ;
+	dfun_n_var   <- newIORef emptyOccSet ;
 	type_env_var <- case hsc_type_env_var hsc_env of {
                            Just (_mod, te_var) -> return te_var ;
                            Nothing             -> newIORef emptyNameEnv } ;
@@ -837,12 +836,15 @@ debugTc thing
 %************************************************************************
 
 \begin{code}
-nextDFunIndex :: TcM Int	-- Get the next dfun index
-nextDFunIndex = do { env <- getGblEnv
-		   ; let dfun_n_var = tcg_dfun_n env
-		   ; n <- readMutVar dfun_n_var
-		   ; writeMutVar dfun_n_var (n+1)
-		   ; return n }
+chooseUniqueOccTc :: (OccSet -> OccName) -> TcM OccName
+chooseUniqueOccTc fn =
+  do { env <- getGblEnv
+     ; let dfun_n_var = tcg_dfun_n env
+     ; set <- readMutVar dfun_n_var
+     ; let occ = fn set
+     ; writeMutVar dfun_n_var (extendOccSet set occ)
+     ; return occ
+     }
 
 getLIEVar :: TcM (TcRef LIE)
 getLIEVar = do { env <- getLclEnv; return (tcl_lie env) }