diff options
author | Jose Pedro Magalhaes <jpm@cs.uu.nl> | 2011-11-16 21:42:22 +0100 |
---|---|---|
committer | Jose Pedro Magalhaes <jpm@cs.uu.nl> | 2011-11-16 21:42:22 +0100 |
commit | 6d88847178b540c48fd37fd5a2ba9b89898b88fa (patch) | |
tree | 8956875fc14398a23c75dd17b62d1cbfa0380e37 /src | |
parent | 96154b6154c6e7556a92695428d0fc8ddf015d2a (diff) |
Follow changes to tuple sorts in master
Diffstat (limited to 'src')
-rw-r--r-- | src/Haddock/Backends/LaTeX.hs | 4 | ||||
-rw-r--r-- | src/Haddock/Backends/Xhtml/Decl.hs | 4 | ||||
-rw-r--r-- | src/Haddock/Convert.hs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Haddock/Backends/LaTeX.hs b/src/Haddock/Backends/LaTeX.hs index c6ac2b0a..5c21f0cf 100644 --- a/src/Haddock/Backends/LaTeX.hs +++ b/src/Haddock/Backends/LaTeX.hs @@ -796,8 +796,8 @@ ppBang _ = char '!' -- Unpacked args is an implementation detail, tupleParens :: HsTupleSort -> [LaTeX] -> LaTeX -tupleParens (HsBoxyTuple _) = parenList -tupleParens HsUnboxedTuple = ubxParenList +tupleParens HsUnboxedTuple = ubxParenList +tupleParens _ = parenList ------------------------------------------------------------------------------- diff --git a/src/Haddock/Backends/Xhtml/Decl.hs b/src/Haddock/Backends/Xhtml/Decl.hs index 44429167..686e9a3e 100644 --- a/src/Haddock/Backends/Xhtml/Decl.hs +++ b/src/Haddock/Backends/Xhtml/Decl.hs @@ -641,8 +641,8 @@ ppBang _ = toHtml "!" -- Unpacked args is an implementation detail, tupleParens :: HsTupleSort -> [Html] -> Html -tupleParens (HsBoxyTuple _) = parenList -tupleParens HsUnboxedTuple = ubxParenList +tupleParens HsUnboxedTuple = ubxParenList +tupleParens _ = parenList -------------------------------------------------------------------------------- diff --git a/src/Haddock/Convert.hs b/src/Haddock/Convert.hs index ea905ed0..b9d0e76f 100644 --- a/src/Haddock/Convert.hs +++ b/src/Haddock/Convert.hs @@ -263,8 +263,8 @@ synifyType _ (TyConApp tc tys) -- Use non-prefix tuple syntax where possible, because it looks nicer. | isTupleTyCon tc, tyConArity tc == length tys = noLoc $ HsTupleTy (case tupleTyConSort tc of - BoxedTuple -> HsBoxyTuple liftedTypeKind - ConstraintTuple -> HsBoxyTuple constraintKind + BoxedTuple -> HsBoxedTuple + ConstraintTuple -> HsConstraintTuple UnboxedTuple -> HsUnboxedTuple) (map (synifyType WithinType) tys) -- ditto for lists |