diff options
author | Austin Seipp <austin@well-typed.com> | 2014-01-12 12:37:59 -0600 |
---|---|---|
committer | Austin Seipp <austin@well-typed.com> | 2014-01-12 12:37:59 -0600 |
commit | 5f2cdca8d745bd47847c3f29c8c32786ce728c8b (patch) | |
tree | c33b10fa4bad6dcd8ed75a6ec36ddabcfd801847 /compiler | |
parent | 5f54d67818ee7a74325eed130438beba96510e43 (diff) | |
download | haskell-5f2cdca8d745bd47847c3f29c8c32786ce728c8b.tar.gz |
Fix new Haddock doc parse failures.
Signed-off-by: Austin Seipp <austin@well-typed.com>
Diffstat (limited to 'compiler')
-rw-r--r-- | compiler/llvmGen/Llvm/MetaData.hs | 13 | ||||
-rw-r--r-- | compiler/typecheck/TcGenGenerics.lhs | 8 | ||||
-rw-r--r-- | compiler/types/Coercion.lhs | 5 | ||||
-rw-r--r-- | compiler/utils/UniqFM.lhs | 18 |
4 files changed, 24 insertions, 20 deletions
diff --git a/compiler/llvmGen/Llvm/MetaData.hs b/compiler/llvmGen/Llvm/MetaData.hs index dda3ca0c4c..36efcd7159 100644 --- a/compiler/llvmGen/Llvm/MetaData.hs +++ b/compiler/llvmGen/Llvm/MetaData.hs @@ -1,5 +1,9 @@ --------------------------------------------------------------------------------- --- | The LLVM Metadata System. +module Llvm.MetaData where + +import Llvm.Types +import Outputable + +-- The LLVM Metadata System. -- -- The LLVM metadata feature is poorly documented but roughly follows the -- following design: @@ -50,11 +54,6 @@ -- For example: -- !llvm.module.linkage = !{ !0, !1 } -- -module Llvm.MetaData where - -import Llvm.Types - -import Outputable -- | LLVM metadata expressions data MetaExpr = MetaStr LMString diff --git a/compiler/typecheck/TcGenGenerics.lhs b/compiler/typecheck/TcGenGenerics.lhs index 872b969919..2387625bca 100644 --- a/compiler/typecheck/TcGenGenerics.lhs +++ b/compiler/typecheck/TcGenGenerics.lhs @@ -528,11 +528,11 @@ data ArgTyAlg a = ArgTyAlg -- > arg t = case t of -- > _ | isTyVar t -> if (t == argVar) then Par1 else Par0 t -- > App f [t'] | --- representable1 f && --- t' == argVar -> Rec1 f +-- > representable1 f && +-- > t' == argVar -> Rec1 f -- > App f [t'] | --- representable1 f && --- t' has tyvars -> f :.: (arg t') +-- > representable1 f && +-- > t' has tyvars -> f :.: (arg t') -- > _ -> Rec0 t -- -- where @argVar@ is the last type variable in the data type declaration we are diff --git a/compiler/types/Coercion.lhs b/compiler/types/Coercion.lhs index 9dc0313b2e..0887bf7b99 100644 --- a/compiler/types/Coercion.lhs +++ b/compiler/types/Coercion.lhs @@ -1160,11 +1160,12 @@ mkCoCast c g %************************************************************************ \begin{code} -instNewTyCon_maybe :: TyCon -> [Type] -> Maybe (Type, Coercion) --- ^ If @co :: T ts ~ rep_ty@ then: +-- | If @co :: T ts ~ rep_ty@ then: -- -- > instNewTyCon_maybe T ts = Just (rep_ty, co) +-- -- Checks for a newtype, and for being saturated +instNewTyCon_maybe :: TyCon -> [Type] -> Maybe (Type, Coercion) instNewTyCon_maybe tc tys | Just (tvs, ty, co_tc) <- unwrapNewTyCon_maybe tc -- Check for newtype , tys `lengthIs` tyConArity tc -- Check saturated diff --git a/compiler/utils/UniqFM.lhs b/compiler/utils/UniqFM.lhs index d37041c9f2..7fde82a3c7 100644 --- a/compiler/utils/UniqFM.lhs +++ b/compiler/utils/UniqFM.lhs @@ -135,13 +135,17 @@ plusUFM :: UniqFM elt -> UniqFM elt -> UniqFM elt plusUFM_C :: (elt -> elt -> elt) -> UniqFM elt -> UniqFM elt -> UniqFM elt --- | plusUFM_CD f m1 d1 m2 d2 --- merges the maps using `f` as the combinding function and d1 resp. d2 as --- the default value if there is no entry in m1 reps. m2. The domain is the union --- of the domains of m1 m2. --- Representative example: --- > plusUFM_CD f {A: 1, B: 2} 23 {B: 3, C: 4} 42 --- > == {A: f 1 42, B: f 2 3, C: f 23 4 } +-- | `plusUFM_CD f m1 d1 m2 d2` merges the maps using `f` as the +-- combinding function and `d1` resp. `d2` as the default value if +-- there is no entry in `m1` reps. `m2`. The domain is the union of +-- the domains of `m1` and `m2`. +-- +-- Representative example: +-- +-- @ +-- plusUFM_CD f {A: 1, B: 2} 23 {B: 3, C: 4} 42 +-- == {A: f 1 42, B: f 2 3, C: f 23 4 } +-- @ plusUFM_CD :: (elt -> elt -> elt) -> UniqFM elt -> elt -> UniqFM elt -> elt -> UniqFM elt |