X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnMonad.lhs;h=9da9dc9ae7bc4ae6196d7966547f0ec663de1b02;hb=d78d04173296841b5949ebce640f444dcfb026f2;hp=af75fe6e4996e9e9abb1decd37ef6ed3c8a88253;hpb=3e83dfb21b2f2220dce97427fff5c19459ae68d1;p=ghc-hetmet.git diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs index af75fe6..9da9dc9 100644 --- a/compiler/typecheck/TcRnMonad.lhs +++ b/compiler/typecheck/TcRnMonad.lhs @@ -19,6 +19,7 @@ import SrcLoc ( noSrcLoc ) import TysWiredIn ( intTy, stringTy, mkListTy, unitTy, boolTy ) import PrelNames ( breakpointJumpName, breakpointCondJumpName ) import NameEnv ( mkNameEnv ) +import TcEnv ( tcExtendIdEnv ) #endif import HsSyn ( emptyLHsBinds ) @@ -34,6 +35,7 @@ import Type ( Type ) import TcType ( tcIsTyVarTy, tcGetTyVar ) import NameEnv ( extendNameEnvList, nameEnvElts ) import InstEnv ( emptyInstEnv ) +import FamInstEnv ( emptyFamInstEnv ) import Var ( setTyVarName ) import VarSet ( emptyVarSet ) @@ -101,6 +103,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, @@ -187,7 +190,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