diff options
| author | Jose Pedro Magalhaes <jpm@cs.uu.nl> | 2011-05-12 15:48:45 +0200 |
|---|---|---|
| committer | Jose Pedro Magalhaes <jpm@cs.uu.nl> | 2011-05-12 15:48:45 +0200 |
| commit | d872133bb986dbd15959cbb14504bf9a863e3e4a (patch) | |
| tree | c72a083131fd5b4ef0d6a0d6e71ac7f5f80715cb | |
| parent | 1b381af863d64aaa0a4dd9c816170c58e6131a9e (diff) | |
| download | haskell-d872133bb986dbd15959cbb14504bf9a863e3e4a.tar.gz | |
Fix some small things broken with the last merge.
| -rw-r--r-- | compiler/typecheck/TcInstDcls.lhs | 2 | ||||
| -rw-r--r-- | 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 3a7ecc7d97..9ac0a6fc75 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 68a41f84a2..d1e1f324c9 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 -------------------------------------------------------------------------------- |