Switch more uniqFromSupply+splitUniqSupply's to takeUniqFromSupply

[ghc-hetmet.git] / compiler / typecheck / TcRnMonad.lhs

diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs
index ba694b6..646abca 100644 (file)
--- a/compiler/typecheck/TcRnMonad.lhs
+++ b/compiler/typecheck/TcRnMonad.lhs
@@ -89,11 +89,11 @@ initTc hsc_env hsc_src keep_rn_syntax mod do_this
             gbl_env = TcGblEnv {
                tcg_mod       = mod,
                tcg_src       = hsc_src,
-               tcg_rdr_env   = hsc_global_rdr_env hsc_env,
+               tcg_rdr_env   = emptyGlobalRdrEnv,
                tcg_fix_env   = emptyNameEnv,
                tcg_field_env = RecFields emptyNameEnv emptyNameSet,
                tcg_default   = Nothing,
-               tcg_type_env  = hsc_global_type_env hsc_env,
+               tcg_type_env  = emptyNameEnv,
                tcg_type_env_var = type_env_var,
                tcg_inst_env  = emptyInstEnv,
                tcg_fam_inst_env  = emptyFamInstEnv,
@@ -330,11 +330,11 @@ newMetaUnique
 newUnique :: TcRnIf gbl lcl Unique
 newUnique
  = do { env <- getEnv ;
-       let { u_var = env_us env } ;
-       us <- readMutVar u_var ;
-        case splitUniqSupply us of { (us1,_) -> do {
-       writeMutVar u_var us1 ;
-       return $! uniqFromSupply us }}}
+        let { u_var = env_us env } ;
+        us <- readMutVar u_var ;
+        case takeUniqFromSupply us of { (uniq, us') -> do {
+        writeMutVar u_var us' ;
+        return $! uniq }}}
    -- NOTE 1: we strictly split the supply, to avoid the possibility of leaving
    -- a chain of unevaluated supplies behind.
    -- NOTE 2: we use the uniq in the supply from the MutVar directly, and
@@ -345,11 +345,11 @@ newUnique
 newUniqueSupply :: TcRnIf gbl lcl UniqSupply
 newUniqueSupply
  = do { env <- getEnv ;
-       let { u_var = env_us env } ;
-       us <- readMutVar u_var ;
+        let { u_var = env_us env } ;
+        us <- readMutVar u_var ;
         case splitUniqSupply us of { (us1,us2) -> do {
-       writeMutVar u_var us1 ;
-       return us2 }}}
+        writeMutVar u_var us1 ;
+        return us2 }}}
 
 newLocalName :: Name -> TcRnIf gbl lcl Name
 newLocalName name      -- Make a clone