Repository : ssh://darcs.haskell.org//srv/darcs/haddock On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/4604487195dbeae627f3c9f9c9f590c25b6634d4 >--------------------------------------------------------------- commit 4604487195dbeae627f3c9f9c9f590c25b6634d4 Merge: fa5ffbd... cc86b10... Author: Iavor S. Diatchki <[email protected]> Date: Mon Mar 19 20:12:18 2012 -0700 Merge remote-tracking branch 'origin/master' into type-nats src/Haddock/Backends/Xhtml/Decl.hs | 2 +- src/Haddock/Convert.hs | 17 ++++++++--------- src/Haddock/Interface/Rename.hs | 15 +++++++++------ 3 files changed, 18 insertions(+), 16 deletions(-) diff --cc src/Haddock/Convert.hs index 5484578,3dad9a2..42c3bf1 --- a/src/Haddock/Convert.hs +++ b/src/Haddock/Convert.hs @@@ -308,14 -307,9 +307,14 @@@ synifyType s forallty@(ForAllTy _tv _ty sTau = synifyType WithinType tau in noLoc $ HsForAllTy forallPlicitness sTvs sCtx sTau +synifyType _ (LitTy t) = noLoc $ HsTyLit $ synifyTyLit t + +synifyTyLit :: TyLit -> HsTyLit +synifyTyLit (NumTyLit n) = HsNumTy n +synifyTyLit (StrTyLit s) = HsStrTy s - synifyKind :: Kind -> LHsKind Name - synifyKind = synifyType (error "synifyKind") + synifyKindSig :: Kind -> HsBndrSig (LHsKind Name) + synifyKindSig k = HsBSig (synifyType (error "synifyKind") k) placeHolderBndrs synifyInstHead :: ([TyVar], [PredType], Class, [Type]) -> ([HsType Name], Name, [HsType Name]) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
