From 891ddf639bd60c6335a1cfc2d9b9fdce72dbfc9e Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Thu, 6 Feb 2014 21:40:51 +0900 Subject: [PATCH] supporting GHC 7.8rc1. (#186) from @bartavelle. --- Language/Haskell/GhcMod/Gap.hs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Language/Haskell/GhcMod/Gap.hs b/Language/Haskell/GhcMod/Gap.hs index ba19a23..0649408 100644 --- a/Language/Haskell/GhcMod/Gap.hs +++ b/Language/Haskell/GhcMod/Gap.hs @@ -55,6 +55,8 @@ import qualified Pretty import qualified StringBuffer as SB #if __GLASGOW_HASKELL__ >= 707 import FamInstEnv +import ConLike (ConLike(..)) +import PatSyn (patSynType) #else import TcRnTypes #endif @@ -338,7 +340,12 @@ deSugar tcm e hs_env = snd <$> deSugarExpr hs_env modu rn_env ty_env e data GapThing = GtI Id | GtD DataCon | GtT TyCon | GtN fromTyThing :: TyThing -> GapThing -fromTyThing (AnId i) = GtI i -fromTyThing (ADataCon d) = GtD d -fromTyThing (ATyCon t) = GtT t -fromTyThing _ = GtN +fromTyThing (AnId i) = GtI i +#if __GLASGOW_HASKELL__ >= 707 +fromTyThing (AConLike (RealDataCon d)) = GtD d +fromTyThing (AConLike (PatSynCon d)) = GtD d +#else +fromTyThing (ADataCon d) = GtD d +#endif +fromTyThing (ATyCon t) = GtT t +fromTyThing _ = GtN