X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcTyDecls.lhs;h=9d6c08fe8df42ef502142697dea9bd39fa7eddaa;hb=0596517a9b4b2b32e5d375a986351102ac4540fc;hp=83a4c96732fdc6e93592cf0ec6617d3e272ff21e;hpb=6c381e873e222417d9a67aeec77b9555eca7b7a8;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcTyDecls.lhs b/ghc/compiler/typecheck/TcTyDecls.lhs index 83a4c96..9d6c08f 100644 --- a/ghc/compiler/typecheck/TcTyDecls.lhs +++ b/ghc/compiler/typecheck/TcTyDecls.lhs @@ -46,7 +46,7 @@ tcTyDecl (TySynonym tycon_name tyvar_names rhs src_loc) tcAddErrCtxt (tySynCtxt tycon_name) $ -- Look up the pieces - tcLookupTyCon tycon_name `thenNF_Tc` \ (tycon_kind, rec_tycon) -> + tcLookupTyCon tycon_name `thenNF_Tc` \ (tycon_kind, _, rec_tycon) -> mapAndUnzipNF_Tc tcLookupTyVar tyvar_names `thenNF_Tc` \ (tyvar_kinds, rec_tyvars) -> -- Look at the rhs @@ -88,7 +88,7 @@ tcTyDataOrNew data_or_new context tycon_name tyvar_names con_decls derivings pra tcAddErrCtxt (tyDataCtxt tycon_name) $ -- Lookup the pieces - tcLookupTyCon tycon_name `thenNF_Tc` \ (tycon_kind, rec_tycon) -> + tcLookupTyCon tycon_name `thenNF_Tc` \ (tycon_kind, _, rec_tycon) -> mapAndUnzipNF_Tc tcLookupTyVar tyvar_names `thenNF_Tc` \ (tyvar_kinds, rec_tyvars) -> tc_derivs derivings `thenNF_Tc` \ derived_classes ->