From 34d2aa54b95e8d261dc325393893d06f6a085130 Mon Sep 17 00:00:00 2001 From: Richard Eisenberg Date: Fri, 2 Aug 2013 15:54:55 +0100 Subject: Changes to reflect changes in GHC's type HsTyVarBndr --- src/Haddock/Convert.hs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/Haddock/Convert.hs') diff --git a/src/Haddock/Convert.hs b/src/Haddock/Convert.hs index 0f7e5b9c..04acbc9b 100644 --- a/src/Haddock/Convert.hs +++ b/src/Haddock/Convert.hs @@ -120,8 +120,9 @@ synifyTyCon tc = DataDecl { tcdLName = synifyName tc , tcdTyVars = -- tyConTyVars doesn't work on fun/prim, but we can make them up: let mk_hs_tv realKind fakeTyVar - = noLoc $ KindedTyVar (getName fakeTyVar) - (synifyKindSig realKind) + = noLoc $ HsTyVarBndr (getName fakeTyVar) + (Just $ synifyKindSig realKind) + Nothing in HsQTvs { hsq_kvs = [] -- No kind polymorphism , hsq_tvs = zipWith mk_hs_tv (fst (splitKindFunTys (tyConKind tc))) alphaTyVars --a, b, c... which are unfortunately all kind * @@ -275,8 +276,8 @@ synifyTyVars ktvs = HsQTvs { hsq_kvs = map tyVarName kvs where (kvs, tvs) = partition isKindVar ktvs synifyTyVar tv - | isLiftedTypeKind kind = noLoc (UserTyVar name) - | otherwise = noLoc (KindedTyVar name (synifyKindSig kind)) + | isLiftedTypeKind kind = noLoc (HsTyVarBndr name Nothing Nothing) + | otherwise = noLoc (HsTyVarBndr name (Just $ synifyKindSig kind) Nothing) where kind = tyVarKind tv name = getName tv -- cgit v1.2.3