From e3812b49ecd6b503916ea440630f8ca673242320 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Thu, 29 Jan 2015 09:43:31 +0100 Subject: [PATCH] GHC 7.10.0.20150123 fixes --- Language/Haskell/GhcMod/CaseSplit.hs | 2 +- Language/Haskell/GhcMod/FillSig.hs | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Language/Haskell/GhcMod/CaseSplit.hs b/Language/Haskell/GhcMod/CaseSplit.hs index 890bee0..aab4dc3 100644 --- a/Language/Haskell/GhcMod/CaseSplit.hs +++ b/Language/Haskell/GhcMod/CaseSplit.hs @@ -92,7 +92,7 @@ getSrcSpanTypeForFnSplit modSum lineNo colNo = do varT <- Gap.getType tcm varPat' -- Finally we get the type of the var case varT of Just varT' -> - let (L matchL (G.Match _ _ (G.GRHSs rhsLs _))) = match + let (L matchL (G.Match _ _ _ (G.GRHSs rhsLs _))) = match in return $ Just (SplitInfo (getPatternVarName varPat') matchL varT' (map G.getLoc rhsLs) ) _ -> return Nothing diff --git a/Language/Haskell/GhcMod/FillSig.hs b/Language/Haskell/GhcMod/FillSig.hs index 12a6e6b..f9be127 100644 --- a/Language/Haskell/GhcMod/FillSig.hs +++ b/Language/Haskell/GhcMod/FillSig.hs @@ -143,7 +143,12 @@ getSignature modSum lineNo colNo = do G.TypeFamily -> Open G.DataFamily -> Data #endif -#if __GLASGOW_HASKELL__ >= 706 + +#if __GLASGOW_HASKELL__ >= 710 + getTyFamVarName x = case x of + L _ (G.UserTyVar n) -> n + L _ (G.KindedTyVar (G.L _ n) _) -> n +#elif __GLASGOW_HASKELL__ >= 706 getTyFamVarName x = case x of L _ (G.UserTyVar n) -> n L _ (G.KindedTyVar n _) -> n @@ -476,7 +481,7 @@ getPatsForVariable tcs (lineNo, colNo) = #else :: [G.LMatch Id] #endif - (L _ (G.Match pats _ _):_) = m + (L _ (G.Match _ pats _ _):_) = m in (funId, pats) _ -> (error "This should never happen", [])