X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FIfaceEnv.lhs;h=cea950873f89f0248daa80147bd4a3801020ed58;hb=17434e5beb213f1e8971d1ce8ffbf40a0848bb3a;hp=3eceaa0f04bf248165d25a16c9adf2ea1154658a;hpb=61d2625ae2e6a4cdae2ffc92df828905e81c24cc;p=ghc-hetmet.git diff --git a/compiler/iface/IfaceEnv.lhs b/compiler/iface/IfaceEnv.lhs index 3eceaa0..cea9508 100644 --- a/compiler/iface/IfaceEnv.lhs +++ b/compiler/iface/IfaceEnv.lhs @@ -6,7 +6,7 @@ module IfaceEnv ( lookupIfaceTop, lookupIfaceExt, lookupOrig, lookupIfaceTc, newIfaceName, newIfaceNames, - extendIfaceIdEnv, extendIfaceTyVarEnv, refineIfaceIdEnv, + extendIfaceIdEnv, extendIfaceTyVarEnv, tcIfaceLclId, tcIfaceTyVar, lookupAvail, ifaceExportNames, @@ -24,7 +24,6 @@ import HscTypes ( NameCache(..), HscEnv(..), GenAvailInfo(..), IfaceExport, OrigNameCache ) import Type ( mkOpenTvSubst, substTy ) import TyCon ( TyCon, tyConName ) -import Unify ( TypeRefinement ) import DataCon ( dataConWorkId, dataConName ) import Var ( TyVar, Id, varName, setIdType, idType ) import Name ( Name, nameUnique, nameModule, @@ -294,14 +293,6 @@ tcIfaceLclId occ Nothing -> failIfM (text "Iface id out of scope: " <+> ppr occ) } -refineIfaceIdEnv :: TypeRefinement -> IfL a -> IfL a -refineIfaceIdEnv (tv_subst, _) thing_inside - = do { env <- getLclEnv - ; let { id_env' = mapOccEnv refine_id (if_id_env env) - ; refine_id id = setIdType id (substTy subst (idType id)) - ; subst = mkOpenTvSubst tv_subst } - ; setLclEnv (env { if_id_env = id_env' }) thing_inside } - extendIfaceIdEnv :: [Id] -> IfL a -> IfL a extendIfaceIdEnv ids thing_inside = do { env <- getLclEnv @@ -358,7 +349,7 @@ lookupHomePackage mod_name occ newIfaceName :: OccName -> IfL Name newIfaceName occ = do { uniq <- newUnique - ; return (mkInternalName uniq occ noSrcLoc) } + ; return $! mkInternalName uniq occ noSrcLoc } newIfaceNames :: [OccName] -> IfL [Name] newIfaceNames occs