X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnMonad.lhs;h=12f0cf6d320b495efdc809cd4fdcf34c69592d8e;hb=a92a7502797818f8d0823b3e3b37147c14bd9cb9;hp=9da9dc9ae7bc4ae6196d7966547f0ec663de1b02;hpb=138b885a335734039daf7debb0a7dfc3dc947c00;p=ghc-hetmet.git diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs index 9da9dc9..12f0cf6 100644 --- a/compiler/typecheck/TcRnMonad.lhs +++ b/compiler/typecheck/TcRnMonad.lhs @@ -22,7 +22,7 @@ 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, @@ -32,12 +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, @@ -49,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 ) @@ -115,10 +117,13 @@ initTc hsc_env hsc_src mod do_this tcg_binds = emptyLHsBinds, tcg_deprecs = NoDeprecs, tcg_insts = [], + tcg_fam_insts= [], 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, @@ -357,8 +362,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}