diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-03-17 01:04:05 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-03-17 01:04:05 +0000 |
| commit | 730d3e622268f59fd78d29026d164486c4e68fcb (patch) | |
| tree | f8a90fb0ed278712c97f0837c395f63d2ed64b79 /src | |
| parent | 82851383b1477d6a119b289a405363437485b099 (diff) | |
| parent | cc86b10577d0dcecd5c86102cb601caa474d3d6a (diff) | |
Merge branch 'master' of http://darcs.haskell.org//haddock
Conflicts:
src/Haddock/Convert.hs
Diffstat (limited to 'src')
| -rw-r--r-- | src/Haddock/Backends/Xhtml/Decl.hs | 2 | ||||
| -rw-r--r-- | src/Haddock/Convert.hs | 2 | ||||
| -rw-r--r-- | src/Haddock/Interface/Rename.hs | 15 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/Haddock/Backends/Xhtml/Decl.hs b/src/Haddock/Backends/Xhtml/Decl.hs index 71bcd581..28955c22 100644 --- a/src/Haddock/Backends/Xhtml/Decl.hs +++ b/src/Haddock/Backends/Xhtml/Decl.hs @@ -164,7 +164,7 @@ ppTyFamHeader summary associated decl unicode qual = ppTyClBinderWithVars summary decl <+> case tcdKindSig decl of - Just kind -> dcolon unicode <+> ppLKind unicode qual kind + Just (HsBSig kind _) -> dcolon unicode <+> ppLKind unicode qual kind Nothing -> noHtml diff --git a/src/Haddock/Convert.hs b/src/Haddock/Convert.hs index ca2aa0f0..3dad9a2c 100644 --- a/src/Haddock/Convert.hs +++ b/src/Haddock/Convert.hs @@ -239,7 +239,7 @@ synifyTyVars = map synifyTyVar kind = tyVarKind tv name = getName tv in if isLiftedTypeKind kind - then UserTyVar name placeHolderKind + then UserTyVar name else KindedTyVar name (synifyKindSig kind) diff --git a/src/Haddock/Interface/Rename.hs b/src/Haddock/Interface/Rename.hs index a295fe29..6034688e 100644 --- a/src/Haddock/Interface/Rename.hs +++ b/src/Haddock/Interface/Rename.hs @@ -206,9 +206,12 @@ renameLType = mapM renameType renameLKind :: LHsKind Name -> RnM (LHsKind DocName) renameLKind = renameLType -renameMaybeLKind :: Maybe (LHsKind Name) -> RnM (Maybe (LHsKind DocName)) +renameMaybeLKind :: Maybe (HsBndrSig (LHsKind Name)) + -> RnM (Maybe (HsBndrSig (LHsKind DocName))) renameMaybeLKind Nothing = return Nothing -renameMaybeLKind (Just ki) = renameLKind ki >>= return . Just +renameMaybeLKind (Just (HsBSig ki fvs)) + = do { ki' <- renameLKind ki + ; return (Just (HsBSig ki' fvs)) } renameType :: HsType Name -> RnM (HsType DocName) renameType t = case t of @@ -260,13 +263,13 @@ renameType t = case t of renameLTyVarBndr :: LHsTyVarBndr Name -> RnM (LHsTyVarBndr DocName) -renameLTyVarBndr (L loc (UserTyVar n tck)) +renameLTyVarBndr (L loc (UserTyVar n)) = do { n' <- rename n - ; return (L loc (UserTyVar n' tck)) } -renameLTyVarBndr (L loc (KindedTyVar n (HsBSig k fvs) tck)) + ; return (L loc (UserTyVar n')) } +renameLTyVarBndr (L loc (KindedTyVar n (HsBSig k fvs))) = do { n' <- rename n ; k' <- renameLKind k - ; return (L loc (KindedTyVar n' (HsBSig k' fvs) tck)) } + ; return (L loc (KindedTyVar n' (HsBSig k' fvs))) } renameLContext :: Located [LHsType Name] -> RnM (Located [LHsType DocName]) renameLContext (L loc context) = do |