X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcInstDcls.lhs;h=d35c0de5aaae2d643c984f4e972feb4e0f313da4;hb=05afb7485eea44d6410139f8a20c94b6f66c46f2;hp=d312cee87f1a7954258e8f9c7265c2ce5b814b4c;hpb=e83fa2eba7ef2302fae8a6be86a9f495b4144387;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcInstDcls.lhs b/ghc/compiler/typecheck/TcInstDcls.lhs index d312cee..d35c0de 100644 --- a/ghc/compiler/typecheck/TcInstDcls.lhs +++ b/ghc/compiler/typecheck/TcInstDcls.lhs @@ -49,7 +49,6 @@ import DataCon ( classDataCon ) import Class ( Class, classBigSig ) import Var ( idName, idType ) import NameSet -import Id ( setIdLocalExported ) import MkId ( mkDictFunId, rUNTIME_ERROR_ID ) import FunDeps ( checkInstFDs ) import Generics ( validGenericInstanceType ) @@ -490,7 +489,7 @@ tcInstDecl2 (InstInfo { iDFunId = dfun_id, iBinds = binds }) addSrcLoc (getSrcLoc dfun_id) $ addErrCtxt (instDeclCtxt (toHsType (idType dfun_id))) $ let - inst_ty = idType dfun_id + inst_ty = idType dfun_id (inst_tyvars, _) = tcSplitForAllTys inst_ty -- The tyvars of the instance decl scope over the 'where' part -- Those tyvars are inside the dfun_id's type, which is a bit @@ -593,7 +592,7 @@ tcInstDecl2 (InstInfo { iDFunId = dfun_id, iBinds = binds }) [(inst_tyvars', dfun_id, this_dict_id)] inlines all_binds in - showLIE "instance" `thenM_` + showLIE (text "instance") `thenM_` returnM (main_bind `AndMonoBinds` prag_binds `AndMonoBinds` sc_binds_outer)