aboutsummaryrefslogtreecommitdiff
path: root/haddock-api/src/Haddock
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2015-07-27 13:16:07 +0200
committerBen Gamari <ben@smart-cactus.org>2015-07-27 13:16:07 +0200
commitcf2c2d006bbd54c0852f82dccfcc23ec66d33894 (patch)
treee8be28e29e8d68ffaed73ba12586d8b427e34ac9 /haddock-api/src/Haddock
parent553c719236972f3a1d445146352ec94614979b63 (diff)
parent5eb0785cde60997f072c3bdfefaf8c389c96d42e (diff)
Merge pull request #422 from adamse/adamse-D1033
Merge for GHC D1033
Diffstat (limited to 'haddock-api/src/Haddock')
-rw-r--r--haddock-api/src/Haddock/Backends/LaTeX.hs7
-rw-r--r--haddock-api/src/Haddock/Backends/Xhtml/Decl.hs8
-rw-r--r--haddock-api/src/Haddock/Convert.hs8
3 files changed, 14 insertions, 9 deletions
diff --git a/haddock-api/src/Haddock/Backends/LaTeX.hs b/haddock-api/src/Haddock/Backends/LaTeX.hs
index e1090a0e..d85d75da 100644
--- a/haddock-api/src/Haddock/Backends/LaTeX.hs
+++ b/haddock-api/src/Haddock/Backends/LaTeX.hs
@@ -823,8 +823,11 @@ pp_hs_context cxt unicode = parenList (map (ppType unicode) cxt)
ppBang :: HsBang -> LaTeX
-ppBang HsNoBang = empty
-ppBang _ = char '!' -- Unpacked args is an implementation detail,
+ppBang HsStrict = char '!'
+ppBang (HsUnpack {}) = char '!'
+ppBang (HsSrcBang _ _ SrcStrict) = char '!'
+ppBang (HsSrcBang _ _ SrcLazy) = char '~'
+ppBang _ = empty
tupleParens :: HsTupleSort -> [LaTeX] -> LaTeX
diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
index c0be9735..21ef167b 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
@@ -769,9 +769,11 @@ ppDataHeader _ _ _ _ = error "ppDataHeader: illegal argument"
ppBang :: HsBang -> Html
-ppBang HsNoBang = noHtml
-ppBang _ = toHtml "!" -- Unpacked args is an implementation detail,
- -- so we just show the strictness annotation
+ppBang HsStrict = toHtml "!"
+ppBang (HsUnpack {}) = toHtml "!"
+ppBang (HsSrcBang _ _ SrcStrict) = toHtml "!"
+ppBang (HsSrcBang _ _ SrcLazy) = toHtml "~"
+ppBang _ = noHtml
tupleParens :: HsTupleSort -> [Html] -> Html
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs
index d841aecc..edf91ce5 100644
--- a/haddock-api/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
@@ -269,13 +269,13 @@ synifyDataCon use_gadt_syntax dc =
linear_tys = zipWith (\ty bang ->
let tySyn = synifyType WithinType ty
src_bang = case bang of
- HsUnpack {} -> HsSrcBang Nothing (Just True) True
- HsStrict -> HsSrcBang Nothing (Just False) True
+ HsUnpack {} -> HsSrcBang Nothing SrcUnpack SrcStrict
+ HsStrict -> HsSrcBang Nothing SrcNoUnpack SrcStrict
+ HsLazy -> HsSrcBang Nothing NoSrcUnpack NoSrcStrictness
_ -> bang
in case src_bang of
- HsNoBang -> tySyn
+ (HsSrcBang _ NoSrcUnpack NoSrcStrictness) -> tySyn
_ -> noLoc $ HsBangTy bang tySyn
- -- HsNoBang never appears, it's implied instead.
)
arg_tys (dataConSrcBangs dc)
field_tys = zipWith (\field synTy -> noLoc $ ConDeclField