diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-05-11 22:45:15 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-05-11 22:45:15 +0100 |
| commit | fef07ac22cc89888e78233807e55c7dbf6f405f5 (patch) | |
| tree | 2dc0e91b2fe3f313a06da5e98f860d9c7e56241c /src/Haddock/Convert.hs | |
| parent | 1c308b7c0dc44a431c7e2a894162f346d4f9ff85 (diff) | |
Follow changes to LHsTyVarBndrs
Diffstat (limited to 'src/Haddock/Convert.hs')
| -rw-r--r-- | src/Haddock/Convert.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Haddock/Convert.hs b/src/Haddock/Convert.hs index 58f6a872..e2eb990b 100644 --- a/src/Haddock/Convert.hs +++ b/src/Haddock/Convert.hs @@ -87,7 +87,7 @@ synifyAxiom (CoAxiom { co_ax_tvs = tvs, co_ax_lhs = lhs, co_ax_rhs = rhs }) typats = map (synifyType WithinType) args hs_rhs_ty = synifyType WithinType rhs in FamInstDecl { fid_tycon = name - , fid_pats = HsBSig typats ([], map tyVarName tvs) + , fid_pats = HsWB { hswb_cts = typats, hswb_kvs = [], hswb_tvs = map tyVarName tvs } , fid_defn = TySynonym hs_rhs_ty, fid_fvs = placeHolderNames } | otherwise = error "synifyAxiom" @@ -97,7 +97,7 @@ synifyTyCon tc | isFunTyCon tc || isPrimTyCon tc = TyDecl { tcdLName = synifyName tc , tcdTyVars = -- tyConTyVars doesn't work on fun/prim, but we can make them up: - zipWith + mkHsQTvs $ zipWith (\fakeTyVar realKind -> noLoc $ KindedTyVar (getName fakeTyVar) (synifyKindSig realKind)) @@ -230,8 +230,8 @@ synifyCtx :: [PredType] -> LHsContext Name synifyCtx = noLoc . map (synifyType WithinType) -synifyTyVars :: [TyVar] -> [LHsTyVarBndr Name] -synifyTyVars = map synifyTyVar +synifyTyVars :: [TyVar] -> LHsTyVarBndrs Name +synifyTyVars tvs = mkHsQTvs (map synifyTyVar tvs) where synifyTyVar tv = noLoc $ let kind = tyVarKind tv @@ -311,8 +311,8 @@ synifyTyLit :: TyLit -> HsTyLit synifyTyLit (NumTyLit n) = HsNumTy n synifyTyLit (StrTyLit s) = HsStrTy s -synifyKindSig :: Kind -> HsBndrSig (LHsKind Name) -synifyKindSig k = mkHsBSig (synifyType (error "synifyKind") k) +synifyKindSig :: Kind -> LHsKind Name +synifyKindSig k = synifyType (error "synifyKind") k synifyInstHead :: ([TyVar], [PredType], Class, [Type]) -> ([HsType Name], Name, [HsType Name]) |