From d872133bb986dbd15959cbb14504bf9a863e3e4a Mon Sep 17 00:00:00 2001 From: Jose Pedro Magalhaes Date: Thu, 12 May 2011 15:48:45 +0200 Subject: [PATCH] Fix some small things broken with the last merge. --- compiler/typecheck/TcInstDcls.lhs | 2 +- compiler/types/Generics.lhs | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/typecheck/TcInstDcls.lhs b/compiler/typecheck/TcInstDcls.lhs index 3a7ecc7..9ac0a6f 100644 --- a/compiler/typecheck/TcInstDcls.lhs +++ b/compiler/typecheck/TcInstDcls.lhs @@ -696,7 +696,7 @@ tcFamInstDecl1 (decl@TyData {tcdND = new_or_data, tcdLName = L loc tc_name, NewType -> ASSERT( not (null data_cons) ) mkNewTyConRhs rep_tc_name rep_tycon (head data_cons) ; buildAlgTyCon rep_tc_name t_tvs stupid_theta tc_rhs Recursive - False h98_syntax NoParentTyCon (Just (fam_tycon, t_typats)) + h98_syntax NoParentTyCon (Just (fam_tycon, t_typats)) -- We always assume that indexed types are recursive. Why? -- (1) Due to their open nature, we can never be sure that a -- further instance might not introduce a new recursive diff --git a/compiler/types/Generics.lhs b/compiler/types/Generics.lhs index 68a41f8..d1e1f32 100644 --- a/compiler/types/Generics.lhs +++ b/compiler/types/Generics.lhs @@ -202,10 +202,12 @@ tc_mkRepTyCon tycon metaDts = (tyConKind tycon `mkArrowKind` liftedTypeKind) tyvars (SynonymTyCon rep0Ty) (FamInstTyCon rep0 appT +{- (mkCoercionTyCon coName (tyConArity tycon) - -- co : forall a b. Rep (D a b) ~ `rep0Ty` a b (CoAxiom tyvars (mkTyConApp rep0 appT) rep0Ty))) - +-} + -- co : forall a b. Rep (D a b) ~ `rep0Ty` a b + (CoAxiom uniq2 coName tyvars (mkTyConApp rep0 appT) rep0Ty)) return res -------------------------------------------------------------------------------- -- 1.7.10.4