diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-02-22 02:18:04 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-02-22 02:26:12 +0000 |
| commit | 53a15353b9521a049cb9bbc033acd3654a52033f (patch) | |
| tree | ac737716f9bd9a7c8e9cf720abccb9ea98757847 | |
| parent | 910e35147c999128db5b05585d0f76b02ae2b028 (diff) | |
Follow changes in GHC
| -rw-r--r-- | src/Haddock/Backends/LaTeX.hs | 2 | ||||
| -rw-r--r-- | src/Haddock/Backends/Xhtml/Decl.hs | 2 | ||||
| -rw-r--r-- | src/Haddock/Convert.hs | 4 | ||||
| -rw-r--r-- | 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 d05795f1..e0a530be 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 c3e284b9..686e9a3e 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 be5752d4..dbd8390c 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 4c840807..670fa9cf 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 |