X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypes%2FType.lhs;fp=ghc%2Fcompiler%2Ftypes%2FType.lhs;h=b9114935c0d3e009eedd992bee2ef122e99f071a;hb=36436bc62a98f53e126ec02fe946337c4c766c3f;hp=b31bec962b544d42fbdfe4ff14593c1315a23518;hpb=8761b73561019d5514194fc8b0eee2b13f0e0ec9;p=ghc-hetmet.git diff --git a/ghc/compiler/types/Type.lhs b/ghc/compiler/types/Type.lhs index b31bec9..b911493 100644 --- a/ghc/compiler/types/Type.lhs +++ b/ghc/compiler/types/Type.lhs @@ -71,8 +71,8 @@ module Type ( extendTvSubst, extendTvSubstList, isInScope, composeTvSubst, -- Performing substitution on types - substTy, substTys, substTyWith, substTheta, substTyVar, substTyVarBndr, - deShadowTy, + substTy, substTys, substTyWith, substTheta, + substPred, substTyVar, substTyVarBndr, deShadowTy, -- Pretty-printing pprType, pprParendType, pprTyThingCategory, @@ -1168,6 +1168,8 @@ zip_ty_env (tv:tvs) (ty:tys) env = zip_ty_env tvs tys (extendVarEnv env tv ty) -- and so generated a rep type mentioning t not t2. -- -- Simplest fix is to nuke the "optimisation" +zip_ty_env tvs tys env = pprTrace "Var/Type length mismatch: " (ppr tvs $$ ppr tys) env +-- zip_ty_env _ _ env = env instance Outputable TvSubst where ppr (TvSubst ins env)