diff options
| author | simonpj <simonpj@microsoft.com> | 2010-09-13 09:53:00 +0000 |
|---|---|---|
| committer | simonpj <simonpj@microsoft.com> | 2010-09-13 09:53:00 +0000 |
| commit | 46972e7feceeef4daadd2beea5c6ab082ec05e38 (patch) | |
| tree | 8538a53801c4a0791b1b65969d4159589c537b63 | |
| parent | d7491830802505bcfe4b518b190750e5ab021394 (diff) | |
Adapt to minor changes in internal GHC functions
| -rw-r--r-- | src/Haddock/Backends/LaTeX.hs | 1 | ||||
| -rw-r--r-- | src/Haddock/Backends/Xhtml/Decl.hs | 2 | ||||
| -rw-r--r-- | src/Haddock/Convert.hs | 12 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/Haddock/Backends/LaTeX.hs b/src/Haddock/Backends/LaTeX.hs index 9b73415a..dce04cc4 100644 --- a/src/Haddock/Backends/LaTeX.hs +++ b/src/Haddock/Backends/LaTeX.hs @@ -890,6 +890,7 @@ ppr_mono_ty _ (HsSpliceTyOut {}) _ = error "ppr_mono_ty HsQuasiQuoteTy" ppr_mono_ty _ (HsQuasiQuoteTy {}) _ = error "ppr_mono_ty HsQuasiQuoteTy" #endif ppr_mono_ty _ (HsRecTy {}) _ = error "ppr_mono_ty HsRecTy" +ppr_mono_ty _ (HsCoreTy {}) _ = error "ppr_mono_ty HsCoreTy" ppr_mono_ty ctxt_prec (HsAppTy fun_ty arg_ty) unicode = maybeParen ctxt_prec pREC_CON $ diff --git a/src/Haddock/Backends/Xhtml/Decl.hs b/src/Haddock/Backends/Xhtml/Decl.hs index e45783bf..3fd5a3f6 100644 --- a/src/Haddock/Backends/Xhtml/Decl.hs +++ b/src/Haddock/Backends/Xhtml/Decl.hs @@ -727,7 +727,7 @@ ppr_mono_ty _ (HsSpliceTyOut {}) _ _ = error "ppr_mono_ty HsQuasiQuoteT #else ppr_mono_ty _ (HsQuasiQuoteTy {}) _ _ = error "ppr_mono_ty HsQuasiQuoteTy" #endif -ppr_mono_ty _ (HsRecTy {}) _ _ = error "ppr_mono_ty HsRecTy" +ppr_mono_ty _ (HsRecTy {}) _ = error "ppr_mono_ty HsRecTy" ppr_mono_ty ctxt_prec (HsAppTy fun_ty arg_ty) unicode qual = maybeParen ctxt_prec pREC_CON $ diff --git a/src/Haddock/Convert.hs b/src/Haddock/Convert.hs index 8dac4a08..96133186 100644 --- a/src/Haddock/Convert.hs +++ b/src/Haddock/Convert.hs @@ -24,7 +24,7 @@ import TypeRep import Type ( splitKindFunTys ) import BasicTypes #else -import Coercion ( splitKindFunTys ) +import Coercion ( splitKindFunTys, synTyConResKind ) #endif import Name import Var @@ -101,15 +101,15 @@ synifyTyCon tc [] -- "deriving" needn't be specified: Nothing - | isOpenSynTyCon tc = + | isSynFamilyTyCon tc = case synTyConRhs tc of - OpenSynTyCon rhs_kind _ -> + SynFamilyTyCon -> TyFamily TypeFamily (synifyName tc) (synifyTyVars (tyConTyVars tc)) - (Just rhs_kind) + (Just (synTyConResKind tc)) _ -> error "synifyTyCon: impossible open type synonym?" - | isOpenTyCon tc = --(why no "isOpenAlgTyCon"?) + | isDataFamilyTyCon tc = --(why no "isOpenAlgTyCon"?) case algTyConRhs tc of - OpenTyCon _ -> + DataFamilyTyCon -> TyFamily DataFamily (synifyName tc) (synifyTyVars (tyConTyVars tc)) Nothing --always kind '*' _ -> error "synifyTyCon: impossible open data type?" |