Repository : ssh://darcs.haskell.org//srv/darcs/haddock

On branch : master

http://hackage.haskell.org/trac/ghc/changeset/53a15353b9521a049cb9bbc033acd3654a52033f

>---------------------------------------------------------------

commit 53a15353b9521a049cb9bbc033acd3654a52033f
Author: Ian Lynagh <igloo@xxxxxxxx>
Date: Wed Feb 22 02:18:04 2012 +0000

Follow changes in GHC

>---------------------------------------------------------------

src/Haddock/Backends/LaTeX.hs | 2 +-
src/Haddock/Backends/Xhtml/Decl.hs | 2 +-
src/Haddock/Convert.hs | 4 ++--
src/Haddock/Interface/Rename.hs | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Haddock/Backends/LaTeX.hs b/src/Haddock/Backends/LaTeX.hs
index d05795f..e0a530b 100644
--- a/src/Haddock/Backends/LaTeX.hs
+++ b/src/Haddock/Backends/LaTeX.hs
@@ -323,7 +323,7 @@ ppFor _ _ _ _ =
-- we skip type patterns for now
ppTySyn :: SrcSpan -> DocForDecl DocName -> TyClDecl DocName -> Bool -> LaTeX

-ppTySyn loc doc (TySynonym (L _ name) _ ltyvars _ ltype) unicode
+ppTySyn loc doc (TySynonym (L _ name) ltyvars _ ltype) unicode
= ppTypeOrFunSig loc [name] (unLoc ltype) doc (full, hdr, char '=') unicode
where
hdr = hsep (keyword "type" : ppDocBinder name : ppTyVars ltyvars)
diff --git a/src/Haddock/Backends/Xhtml/Decl.hs
b/src/Haddock/Backends/Xhtml/Decl.hs
index c3e284b..686e9a3 100644
--- a/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/src/Haddock/Backends/Xhtml/Decl.hs
@@ -121,7 +121,7 @@ ppFor _ _ _ _ _ _ _ = error "ppFor"
-- we skip type patterns for now
ppTySyn :: Bool -> LinksInfo -> SrcSpan -> DocForDecl DocName -> TyClDecl
DocName -> Bool
-> Qualification -> Html
-ppTySyn summary links loc doc (TySynonym (L _ name) _ ltyvars _ ltype) unicode
qual
+ppTySyn summary links loc doc (TySynonym (L _ name) ltyvars _ ltype) unicode
qual
= ppTypeOrFunSig summary links loc [name] (unLoc ltype) doc
(full, hdr, spaceHtml +++ equals) unicode qual
where
diff --git a/src/Haddock/Convert.hs b/src/Haddock/Convert.hs
index be5752d..dbd8390 100644
--- a/src/Haddock/Convert.hs
+++ b/src/Haddock/Convert.hs
@@ -86,7 +86,7 @@ synifyAxiom (CoAxiom { co_ax_tvs = tvs, co_ax_lhs = lhs,
co_ax_rhs = rhs })
tyvars = synifyTyVars tvs
typats = map (synifyType WithinType) args
hs_rhs_ty = synifyType WithinType rhs
- in TySynonym name Nothing tyvars (Just typats) hs_rhs_ty
+ in TySynonym name tyvars (Just typats) hs_rhs_ty
| otherwise
= error "synifyAxiom"

@@ -164,7 +164,7 @@ synifyTyCon tc
alg_deriv = Nothing
syn_type = synifyType WithinType (synTyConType tc)
in if isSynTyCon tc
- then TySynonym name Nothing tyvars typats syn_type
+ then TySynonym name tyvars typats syn_type
else TyData alg_nd alg_ctx name Nothing tyvars typats (fmap synifyKind
alg_kindSig) alg_cons alg_deriv


diff --git a/src/Haddock/Interface/Rename.hs b/src/Haddock/Interface/Rename.hs
index 4c84080..670fa9c 100644
--- a/src/Haddock/Interface/Rename.hs
+++ b/src/Haddock/Interface/Rename.hs
@@ -330,12 +330,12 @@ renameTyClD d = case d of
-- I don't think we need the derivings, so we return Nothing
return (TyData x lcontext' lname' cType ltyvars' typats' k' cons' Nothing)

- TySynonym lname cType ltyvars typats ltype -> do
+ TySynonym lname ltyvars typats ltype -> do
lname' <- renameL lname
ltyvars' <- mapM renameLTyVarBndr ltyvars
ltype' <- renameLType ltype
typats' <- mapM (mapM renameLType) typats
- return (TySynonym lname' cType ltyvars' typats' ltype')
+ return (TySynonym lname' ltyvars' typats' ltype')

ClassDecl lcontext lname ltyvars lfundeps lsigs _ ats at_defs _ -> do
lcontext' <- renameLContext lcontext



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@xxxxxxxxxxx
http://www.haskell.org/mailman/listinfo/cvs-ghc