From: Jose Pedro Magalhaes Date: Thu, 12 May 2011 11:26:03 +0000 (+0200) Subject: Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=1b381af863d64aaa0a4dd9c816170c58e6131a9e;hp=--cc Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics Resolved conflicts: compiler/typecheck/TcTyClsDecls.lhs --- 1b381af863d64aaa0a4dd9c816170c58e6131a9e diff --cc compiler/typecheck/TcTyClsDecls.lhs index cb16097,56bf758..43a0da7 --- a/compiler/typecheck/TcTyClsDecls.lhs +++ b/compiler/typecheck/TcTyClsDecls.lhs @@@ -665,8 -479,8 +484,7 @@@ tcTyClDecl1 _parent calc_isre { extra_tvs <- tcDataKindSig mb_ksig ; let final_tvs = tvs' ++ extra_tvs ; stupid_theta <- tcHsKindedContext ctxt - ; want_generic <- xoptM Opt_Generics ; unbox_strict <- doptM Opt_UnboxStrictFields - ; empty_data_decls <- xoptM Opt_EmptyDataDecls ; kind_signatures <- xoptM Opt_KindSignatures ; existential_ok <- xoptM Opt_ExistentialQuantification ; gadt_ok <- xoptM Opt_GADTs diff --cc compiler/types/TyCon.lhs index 5804d49,1d8d48a..9152076 --- a/compiler/types/TyCon.lhs +++ b/compiler/types/TyCon.lhs @@@ -63,11 -63,11 +63,11 @@@ module TyCon tyConParent, tyConClass_maybe, tyConFamInst_maybe, tyConFamilyCoercion_maybe,tyConFamInstSig_maybe, - synTyConDefn, synTyConRhs, synTyConType, - tyConExtName, -- External name for foreign types + synTyConDefn, synTyConRhs, synTyConType, + tyConExtName, -- External name for foreign types algTyConRhs, newTyConRhs, newTyConEtadRhs, unwrapNewTyCon_maybe, - tupleTyConBoxity, + tupleTyConBoxity, tupleTyConArity, -- ** Manipulating TyCons tcExpandTyCon_maybe, coreExpandTyCon_maybe,