diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-05-06 20:43:06 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-05-06 20:43:06 +0000 |
| commit | 0a4f3ff459e8df7eb0ca2700c8bc5f47d08e5b78 (patch) | |
| tree | b2ab9fd5ef1652ac3334a5ddc66f9125256f0923 /src/Haddock | |
| parent | 3d46394a3f3ca22a214f253731efc72b42a57d53 (diff) | |
Fix build
Diffstat (limited to 'src/Haddock')
| -rw-r--r-- | src/Haddock/Backends/Html.hs | 3 | ||||
| -rw-r--r-- | src/Haddock/Convert.hs | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/Haddock/Backends/Html.hs b/src/Haddock/Backends/Html.hs index 68d1da42..24a9b3d2 100644 --- a/src/Haddock/Backends/Html.hs +++ b/src/Haddock/Backends/Html.hs @@ -1517,8 +1517,9 @@ ppForAll Explicit ltvs lctxt = ppBang :: HsBang -> Html ppBang HsNoBang = empty ppBang HsStrict = toHtml "!" -ppBang HsUnbox = toHtml "!" -- unboxed args is an implementation detail, +ppBang HsUnpack = toHtml "!" -- unboxed args is an implementation detail, -- so we just show the strictness annotation +ppBang HsUnpackFailed = toHtml "!" -- unboxed args is an implementation detail, tupleParens :: Boxity -> [Html] -> Html diff --git a/src/Haddock/Convert.hs b/src/Haddock/Convert.hs index 54bce1c8..d6559b7a 100644 --- a/src/Haddock/Convert.hs +++ b/src/Haddock/Convert.hs @@ -17,6 +17,7 @@ -- instance heads, which aren't TyThings, so just export everything. module Haddock.Convert where +import BasicTypes import HsSyn import TcType ( tcSplitSigmaTy ) import TypeRep @@ -30,7 +31,6 @@ import Var import Class import TyCon import DataCon -import BasicTypes import TysPrim ( alphaTyVars ) import TysWiredIn ( listTyConName ) import Bag ( emptyBag ) @@ -171,11 +171,9 @@ synifyDataCon use_gadt_syntax dc = noLoc $ linear_tys = zipWith (\ty strict -> let tySyn = synifyType WithinType ty in case strict of - MarkedStrict -> noLoc $ HsBangTy HsStrict tySyn - MarkedUnboxed -> noLoc $ HsBangTy HsUnbox tySyn - NotMarkedStrict -> - -- HsNoBang never appears, it's implied instead. - tySyn + -- HsNoBang never appears, it's implied instead. + HsNoBang -> tySyn + _ -> noLoc $ HsBangTy strict tySyn ) (dataConOrigArgTys dc) (dataConStrictMarks dc) field_tys = zipWith (\field synTy -> ConDeclField |