X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FVarEnv.lhs;h=4c31b24f09218144418782fce9e2d83df30ba241;hb=d107207d57f6102f580578e7c168b7317b04b9c4;hp=67bc120430286bf2eae1225e282f83595314a5b3;hpb=7163be78dfc760f2b288c78260cb2929b6253aa1;p=ghc-hetmet.git diff --git a/compiler/basicTypes/VarEnv.lhs b/compiler/basicTypes/VarEnv.lhs index 67bc120..4c31b24 100644 --- a/compiler/basicTypes/VarEnv.lhs +++ b/compiler/basicTypes/VarEnv.lhs @@ -23,7 +23,6 @@ module VarEnv ( extendInScopeSet, extendInScopeSetList, extendInScopeSetSet, modifyInScopeSet, getInScopeVars, lookupInScope, elemInScopeSet, uniqAway, - mapInScopeSet, -- RnEnv2 and its operations RnEnv2, mkRnEnv2, rnBndr2, rnBndrs2, rnOccL, rnOccR, inRnEnvL, inRnEnvR, @@ -34,8 +33,6 @@ module VarEnv ( TidyEnv, emptyTidyEnv ) where -#include "HsVersions.h" - import OccName import Var import VarSet @@ -46,6 +43,7 @@ import Maybes import Outputable import FastTypes import StaticFlags +import FastString \end{code} @@ -62,7 +60,7 @@ data InScopeSet = InScope (VarEnv Var) FastInt -- INVARIANT: it's not zero; we use it as a multiplier in uniqAway instance Outputable InScopeSet where - ppr (InScope s _) = ptext SLIT("InScope") <+> ppr s + ppr (InScope s _) = ptext (sLit "InScope") <+> ppr s emptyInScopeSet :: InScopeSet emptyInScopeSet = InScope emptyVarSet (_ILIT(1)) @@ -93,9 +91,6 @@ modifyInScopeSet (InScope in_scope n) old_v new_v = InScope (extendVarEnv in_sco delInScopeSet :: InScopeSet -> Var -> InScopeSet delInScopeSet (InScope in_scope n) v = InScope (in_scope `delVarEnv` v) n -mapInScopeSet :: (Var -> Var) -> InScopeSet -> InScopeSet -mapInScopeSet f (InScope in_scope n) = InScope (mapVarEnv f in_scope) n - elemInScopeSet :: Var -> InScopeSet -> Bool elemInScopeSet v (InScope in_scope _) = v `elemVarEnv` in_scope