X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fspecialise%2FRules.lhs;h=4d743140ea66e63bc1242acdc80c9cb58fac3e23;hb=28a464a75e14cece5db40f2765a29348273ff2d2;hp=6bb2eb1424d9ca595739208664193b8e47ae0ca9;hpb=36436bc62a98f53e126ec02fe946337c4c766c3f;p=ghc-hetmet.git diff --git a/ghc/compiler/specialise/Rules.lhs b/ghc/compiler/specialise/Rules.lhs index 6bb2eb1..4d74314 100644 --- a/ghc/compiler/specialise/Rules.lhs +++ b/ghc/compiler/specialise/Rules.lhs @@ -22,14 +22,14 @@ import CoreFVs ( exprFreeVars, exprsFreeVars, rulesRhsFreeVars ) import CoreUnfold ( isCheapUnfolding, unfoldingTemplate ) import CoreUtils ( tcEqExprX ) import PprCore ( pprRules ) -import Type ( Type ) +import Type ( TvSubstEnv ) import TcType ( tcSplitTyConApp_maybe ) import CoreTidy ( tidyRules ) import Id ( Id, idUnfolding, isLocalId, isGlobalId, idName, idSpecialisation, idCoreRules, setIdSpecialisation ) import IdInfo ( SpecInfo( SpecInfo ) ) import Var ( Var ) -import VarEnv ( IdEnv, TyVarEnv, InScopeSet, emptyTidyEnv, +import VarEnv ( IdEnv, InScopeSet, emptyTidyEnv, emptyInScopeSet, mkInScopeSet, extendInScopeSetList, emptyVarEnv, lookupVarEnv, extendVarEnv, nukeRnEnvL, mkRnEnv2, rnOccR, rnOccL, inRnEnvR, @@ -352,7 +352,6 @@ matchN in_scope tmpl_vars tmpl_es target_es -- for uniformity with IdSubstEnv type SubstEnv = (TvSubstEnv, IdSubstEnv) type IdSubstEnv = IdEnv CoreExpr -type TvSubstEnv = TyVarEnv Type emptySubstEnv :: SubstEnv emptySubstEnv = (emptyVarEnv, emptyVarEnv)