X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FInst.lhs;h=efe9eed2ea31a050019bec40593839837a0c030b;hb=51a571c0f5b0201ea53bec60fcaafb78c01c017e;hp=0652f81219307849dcfa022b58249a846b64e240;hpb=d78151f68bdaf05cb1e8ab77e32529327c0dae36;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/Inst.lhs b/ghc/compiler/typecheck/Inst.lhs index 0652f81..efe9eed 100644 --- a/ghc/compiler/typecheck/Inst.lhs +++ b/ghc/compiler/typecheck/Inst.lhs @@ -48,7 +48,7 @@ import TcType ( TcThetaType, TcClassContext, ) import CoreFVs ( idFreeTyVars ) import Class ( Class ) -import Id ( Id, idType, mkUserLocal, mkSysLocal, mkVanillaId ) +import Id ( Id, idType, mkUserLocal, mkSysLocal, mkLocalId ) import PrelInfo ( isStandardClass, isCcallishClass, isNoDictClass ) import Name ( mkDictOcc, mkMethodOcc, getOccName, mkLocalName ) import NameSet ( NameSet ) @@ -314,14 +314,14 @@ newDictsAtLoc inst_loc@(_,loc,_) theta = tcGetUniques (length theta) `thenNF_Tc` \ new_uniqs -> returnNF_Tc (zipWithEqual "newDictsAtLoc" mk_dict new_uniqs theta) where - mk_dict uniq pred = Dict (mkVanillaId (mk_dict_name uniq pred) (mkPredTy pred)) pred inst_loc + mk_dict uniq pred = Dict (mkLocalId (mk_dict_name uniq pred) (mkPredTy pred)) pred inst_loc mk_dict_name uniq (Class cls tys) = mkLocalName uniq (mkDictOcc (getOccName cls)) loc mk_dict_name uniq (IParam name ty) = name newIPDict orig name ty = tcGetInstLoc orig `thenNF_Tc` \ inst_loc -> - returnNF_Tc (Dict (mkVanillaId name ty) (IParam name ty) inst_loc) + returnNF_Tc (Dict (mkLocalId name ty) (IParam name ty) inst_loc) \end{code}