X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRules.lhs;h=0a2babe3f81f448b5053be15a0b7cf247975495b;hp=ef8e388f8706eb1b4ff0e8988a50532d6bdc4afc;hb=f4510d27c5883fe7e8570f4dd49d45a8b0122f2c;hpb=d29f86b1fe7daf919e9b47a9003daed74b812790 diff --git a/compiler/typecheck/TcRules.lhs b/compiler/typecheck/TcRules.lhs index ef8e388..0a2babe 100644 --- a/compiler/typecheck/TcRules.lhs +++ b/compiler/typecheck/TcRules.lhs @@ -78,7 +78,8 @@ tcRule (HsRule name act vars lhs fv_lhs rhs fv_rhs) -- -- NB: tcSimplifyInferCheck zonks the forall_tvs, and -- knocks out any that are constrained by the environment - tcSimplifyInferCheck (text "tcRule") + getInstLoc (SigOrigin (RuleSkol name)) `thenM` \ loc -> + tcSimplifyInferCheck loc forall_tvs lhs_dicts rhs_lie `thenM` \ (forall_tvs1, rhs_binds) -> mappM zonkQuantifiedTyVar forall_tvs1 `thenM` \ forall_tvs2 -> @@ -100,7 +101,7 @@ tcRuleBndrs (RuleBndrSig var rn_ty : vars) thing_inside -- e.g x :: a->a -- The tyvar 'a' is brought into scope first, just as if you'd written -- a::*, x :: a->a - = do { let ctxt = RuleSigCtxt (unLoc var) + = do { let ctxt = FunSigCtxt (unLoc var) ; (tyvars, ty) <- tcHsPatSigType ctxt rn_ty ; let skol_tvs = tcSkolSigTyVars (SigSkol ctxt) tyvars id_ty = substTyWith tyvars (mkTyVarTys skol_tvs) ty