X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnTypes.lhs;h=253a5c08bd4cb5b1fbf44e7c0d80a9e5ee2d74c5;hp=fce06d14f7cd0ea12c67963358dc0e5243159224;hb=5de363ca9ebdb7d85e3c353c1cffdf0a1c11128e;hpb=e8fa04cf0d656c4a2ff737278b8cea9fce3b5a2b diff --git a/compiler/typecheck/TcRnTypes.lhs b/compiler/typecheck/TcRnTypes.lhs index fce06d1..253a5c0 100644 --- a/compiler/typecheck/TcRnTypes.lhs +++ b/compiler/typecheck/TcRnTypes.lhs @@ -703,11 +703,11 @@ type GivenLoc = CtLoc SkolemInfo data Implication = Implic { - ic_env_tvs :: Untouchables, -- Untouchables: unification variables + ic_untch :: Untouchables, -- Untouchables: unification variables -- free in the environment - ic_env :: TcTypeEnv, -- The type environment + ic_env :: TcTypeEnv, -- The type environment -- Used only when generating error messages - -- Generally, ic_env_tvs = tvsof(ic_env) + -- Generally, ic_untch is a superset of tvsof(ic_env) -- However, we don't zonk ic_env when zonking the Implication -- Instead we do that when generating a skolem-escape error message @@ -813,10 +813,10 @@ pprWantedEvVarWithLoc (WantedEvVar v loc) = hang (pprEvVarWithType v) pprWantedEvVar (WantedEvVar v _) = pprEvVarWithType v instance Outputable Implication where - ppr (Implic { ic_env_tvs = env_tvs, ic_skols = skols, ic_given = given + ppr (Implic { ic_untch = untch, ic_skols = skols, ic_given = given , ic_wanted = wanted, ic_binds = binds, ic_loc = loc }) = ptext (sLit "Implic") <+> braces - (sep [ ptext (sLit "Untouchables = ") <+> ppr env_tvs + (sep [ ptext (sLit "Untouchables = ") <+> ppr untch , ptext (sLit "Skolems = ") <+> ppr skols , ptext (sLit "Given = ") <+> pprEvVars given , ptext (sLit "Wanted = ") <+> ppr wanted