From af3dc1ff536671f3e4d0ca8d9c072c92d8e47ca0 Mon Sep 17 00:00:00 2001 From: simonpj Date: Thu, 23 Dec 2004 13:44:10 +0000 Subject: [PATCH] [project @ 2004-12-23 13:44:06 by simonpj] minor nomenclature wibble --- ghc/compiler/typecheck/TcEnv.lhs | 6 +++--- ghc/compiler/typecheck/TcPat.lhs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ghc/compiler/typecheck/TcEnv.lhs b/ghc/compiler/typecheck/TcEnv.lhs index 967e3c3..e5ea1aa 100644 --- a/ghc/compiler/typecheck/TcEnv.lhs +++ b/ghc/compiler/typecheck/TcEnv.lhs @@ -17,7 +17,7 @@ module TcEnv( -- Local environment tcExtendKindEnv, - tcExtendTyVarEnv, tcExtendTyVarEnv3, + tcExtendTyVarEnv, tcExtendTyVarEnv2, tcExtendIdEnv, tcExtendIdEnv1, tcExtendIdEnv2, tcLookup, tcLookupLocated, tcLookupLocalIds, tcLookupId, tcLookupTyVar, @@ -250,8 +250,8 @@ tcExtendTyVarEnv :: [TyVar] -> TcM r -> TcM r tcExtendTyVarEnv tvs thing_inside = tc_extend_tv_env [ATyVar tv (mkTyVarTy tv) | tv <- tvs] thing_inside -tcExtendTyVarEnv3 :: [(TyVar,TcType)] -> TcM r -> TcM r -tcExtendTyVarEnv3 ty_pairs thing_inside +tcExtendTyVarEnv2 :: [(TyVar,TcType)] -> TcM r -> TcM r +tcExtendTyVarEnv2 ty_pairs thing_inside = tc_extend_tv_env [ATyVar tv1 ty2 | (tv1,ty2) <- ty_pairs] thing_inside tc_extend_tv_env binds thing_inside diff --git a/ghc/compiler/typecheck/TcPat.lhs b/ghc/compiler/typecheck/TcPat.lhs index 51d68bb..0ae7013 100644 --- a/ghc/compiler/typecheck/TcPat.lhs +++ b/ghc/compiler/typecheck/TcPat.lhs @@ -20,7 +20,7 @@ import Inst ( InstOrigin(..), import Id ( Id, idType, mkLocalId ) import Name ( Name ) import TcSimplify ( tcSimplifyCheck, bindInstsOfLocalFuns ) -import TcEnv ( newLocalName, tcExtendIdEnv1, tcExtendTyVarEnv3, +import TcEnv ( newLocalName, tcExtendIdEnv1, tcExtendTyVarEnv2, tcLookupClass, tcLookupDataCon, tcLookupId ) import TcMType ( newTyFlexiVarTy, arityErr, tcSkolTyVars, readMetaTyVar ) import TcType ( TcType, TcTyVar, TcSigmaType, TcTauType, zipTopTvSubst, @@ -248,7 +248,7 @@ tc_pat ctxt (SigPatIn pat sig) pat_ty thing_inside ; let tv_binds = [(tv, substTyVar subst tv) | tv <- sig_tvs] sig_ty' = substTy subst sig_ty ; (pat', tvs, res) - <- tcExtendTyVarEnv3 tv_binds $ + <- tcExtendTyVarEnv2 tv_binds $ tc_lpat ctxt pat (Check sig_ty') thing_inside ; return (SigPatOut pat' sig_ty, tvs, res) } -- 1.7.10.4