X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnMonad.lhs;h=d9fe12aa2f55538e59eddfa91d48a887fac473d9;hp=af75fe6e4996e9e9abb1decd37ef6ed3c8a88253;hb=190f24892156953d73b55401d0467a6f1a88ce5d;hpb=3e83dfb21b2f2220dce97427fff5c19459ae68d1

diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs
index af75fe6..d9fe12a 100644
--- a/compiler/typecheck/TcRnMonad.lhs
+++ b/compiler/typecheck/TcRnMonad.lhs
@@ -19,9 +19,10 @@ import SrcLoc           ( noSrcLoc  )
 import TysWiredIn       ( intTy, stringTy, mkListTy, unitTy, boolTy )
 import PrelNames        ( breakpointJumpName, breakpointCondJumpName )
 import NameEnv          ( mkNameEnv )
+import TcEnv            ( tcExtendIdEnv )
 #endif
 
-import HsSyn		( emptyLHsBinds )
+import HsSyn		( emptyLHsBinds, HaddockModInfo(..) )
 import HscTypes		( HscEnv(..), ModGuts(..), ModIface(..),
 			  TypeEnv, emptyTypeEnv, HscSource(..), isHsBoot,
 			  ExternalPackageState(..), HomePackageTable,
@@ -31,11 +32,13 @@ import Module		( Module, moduleName )
 import RdrName		( GlobalRdrEnv, LocalRdrEnv, emptyLocalRdrEnv )
 import Name		( Name, mkInternalName, tidyNameOcc, nameOccName, getSrcLoc )
 import Type		( Type )
-import TcType		( tcIsTyVarTy, tcGetTyVar )
+import TcType		( TcType, tcIsTyVarTy, tcGetTyVar )
 import NameEnv		( extendNameEnvList, nameEnvElts )
 import InstEnv		( emptyInstEnv )
+import FamInstEnv	( emptyFamInstEnv )
 
 import Var		( setTyVarName )
+import Id		( mkSysLocal )
 import VarSet		( emptyVarSet )
 import VarEnv		( TidyEnv, emptyTidyEnv, extendVarEnv )
 import ErrUtils		( Message, Messages, emptyMessages, errorsFound, 
@@ -47,12 +50,13 @@ import NameSet		( NameSet, emptyDUs, emptyNameSet, unionNameSets, addOneToNameSe
 import OccName		( emptyOccEnv, tidyOccName )
 import Bag		( emptyBag )
 import Outputable
-import UniqSupply	( UniqSupply, mkSplitUniqSupply, uniqFromSupply, splitUniqSupply )
+import UniqSupply	( UniqSupply, mkSplitUniqSupply, uniqFromSupply, uniqsFromSupply, splitUniqSupply )
 import UniqFM		( unitUFM )
 import Unique		( Unique )
 import DynFlags		( DynFlags(..), DynFlag(..), dopt, dopt_set,
 			  dopt_unset, GhcMode ) 
 import StaticFlags	( opt_PprStyle_Debug )
+import FastString	( FastString )
 import Bag		( snocBag, unionBags )
 import Panic		( showException )
  
@@ -101,6 +105,7 @@ initTc hsc_env hsc_src mod do_this
 		tcg_type_env = hsc_global_type_env hsc_env,
 		tcg_type_env_var = type_env_var,
 		tcg_inst_env  = emptyInstEnv,
+		tcg_fam_inst_env  = emptyFamInstEnv,
 		tcg_inst_uses = dfuns_var,
 		tcg_th_used   = th_var,
 		tcg_exports  = emptyNameSet,
@@ -115,7 +120,9 @@ initTc hsc_env hsc_src mod do_this
 		tcg_rules    = [],
 		tcg_fords    = [],
 		tcg_dfun_n   = dfun_n_var,
-		tcg_keep     = keep_var
+		tcg_keep     = keep_var,
+		tcg_doc      = Nothing,
+		tcg_hmi      = HaddockModInfo Nothing Nothing Nothing Nothing
 	     } ;
 	     lcl_env = TcLclEnv {
 		tcl_errs       = errs_var,
@@ -187,7 +194,7 @@ addBreakpointBindings thing_inside
                     = mkGlobalId VanillaGlobal breakpointCondJumpName
                                  (basicType (FunTy boolTy)) vanillaIdInfo
 	  }
-	; extendIdEnv [breakpoingJumpId, breakpointCondJumpId] thing_inside}
+	; tcExtendIdEnv [breakpointJumpId, breakpointCondJumpId] thing_inside}
 #else
    = thing_inside
 #endif
@@ -354,8 +361,13 @@ newUniqueSupply
 
 newLocalName :: Name -> TcRnIf gbl lcl Name
 newLocalName name	-- Make a clone
-  = newUnique		`thenM` \ uniq ->
-    returnM (mkInternalName uniq (nameOccName name) (getSrcLoc name))
+  = do	{ uniq <- newUnique
+	; return (mkInternalName uniq (nameOccName name) (getSrcLoc name)) }
+
+newSysLocalIds :: FastString -> [TcType] -> TcRnIf gbl lcl [TcId]
+newSysLocalIds fs tys
+  = do	{ us <- newUniqueSupply
+	; return (zipWith (mkSysLocal fs) (uniqsFromSupply us) tys) }
 \end{code}