From ebf0eeb4dc364859016fb6984091ae585c8d3053 Mon Sep 17 00:00:00 2001
From: Adam Sandberg Eriksson <adam@sandbergericsson.se>
Date: Tue, 14 Jul 2015 21:01:01 +0200
Subject: HsBang is split into HsSrcBang and HsImplBang
With recent changes in GHC handling of strictness annotations in Haddock
is simplified.
---
haddock-api/src/Haddock/Backends/LaTeX.hs | 4 +---
haddock-api/src/Haddock/Backends/Xhtml/Decl.hs | 4 +---
haddock-api/src/Haddock/Convert.hs | 20 ++++++++------------
3 files changed, 10 insertions(+), 18 deletions(-)
(limited to 'haddock-api')
diff --git a/haddock-api/src/Haddock/Backends/LaTeX.hs b/haddock-api/src/Haddock/Backends/LaTeX.hs
index df2e6b61..75ad51ab 100644
--- a/haddock-api/src/Haddock/Backends/LaTeX.hs
+++ b/haddock-api/src/Haddock/Backends/LaTeX.hs
@@ -824,9 +824,7 @@ pp_hs_context cxt unicode = parenList (map (ppType unicode) cxt)
-------------------------------------------------------------------------------
-ppBang :: HsBang -> LaTeX
-ppBang HsStrict = char '!'
-ppBang (HsUnpack {}) = char '!'
+ppBang :: HsSrcBang -> LaTeX
ppBang (HsSrcBang _ _ SrcStrict) = char '!'
ppBang (HsSrcBang _ _ SrcLazy) = char '~'
ppBang _ = empty
diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
index d0e7f890..69393a37 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
@@ -864,9 +864,7 @@ ppDataHeader _ _ _ _ = error "ppDataHeader: illegal argument"
--------------------------------------------------------------------------------
-ppBang :: HsBang -> Html
-ppBang HsStrict = toHtml "!"
-ppBang (HsUnpack {}) = toHtml "!"
+ppBang :: HsSrcBang -> Html
ppBang (HsSrcBang _ _ SrcStrict) = toHtml "!"
ppBang (HsSrcBang _ _ SrcLazy) = toHtml "~"
ppBang _ = noHtml
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs
index e6361ed1..7a8b1acb 100644
--- a/haddock-api/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
@@ -267,18 +267,14 @@ synifyDataCon use_gadt_syntax dc =
-- skip any EqTheta, use 'orig'inal syntax
ctx = synifyCtx theta
- linear_tys = zipWith (\ty bang ->
- let tySyn = synifyType WithinType ty
- src_bang = case bang of
- HsUnpack {} -> HsSrcBang Nothing SrcUnpack SrcStrict
- HsStrict -> HsSrcBang Nothing SrcNoUnpack SrcStrict
- HsLazy -> HsSrcBang Nothing NoSrcUnpack NoSrcStrictness
- _ -> bang
- in case src_bang of
- (HsSrcBang _ NoSrcUnpack NoSrcStrictness) -> tySyn
- _ -> noLoc $ HsBangTy bang tySyn
- )
- arg_tys (dataConSrcBangs dc)
+ linear_tys =
+ zipWith (\ty bang ->
+ let tySyn = synifyType WithinType ty
+ in case bang of
+ (HsSrcBang _ NoSrcUnpack NoSrcStrict) -> tySyn
+ bang' -> noLoc $ HsBangTy bang' tySyn)
+ arg_tys (dataConSrcBangs dc)
+
field_tys = zipWith (\field synTy -> noLoc $ ConDeclField
[synifyName field] synTy Nothing)
(dataConFieldLabels dc) linear_tys
--
cgit v1.2.3