Merge branch 'master' of https://github.com/agustinmista/ghc-mod
This commit is contained in:
commit
b859ca7f40
@ -58,7 +58,7 @@ import Data.List (intersperse)
|
|||||||
import Data.Maybe (catMaybes)
|
import Data.Maybe (catMaybes)
|
||||||
import Data.Time.Clock (UTCTime)
|
import Data.Time.Clock (UTCTime)
|
||||||
import Data.Traversable hiding (mapM)
|
import Data.Traversable hiding (mapM)
|
||||||
import DataCon (dataConRepType)
|
import DataCon (dataConUserType)
|
||||||
import Desugar (deSugarExpr)
|
import Desugar (deSugarExpr)
|
||||||
import DynFlags
|
import DynFlags
|
||||||
import ErrUtils
|
import ErrUtils
|
||||||
@ -531,14 +531,14 @@ data GapThing = GtA Type
|
|||||||
fromTyThing :: TyThing -> GapThing
|
fromTyThing :: TyThing -> GapThing
|
||||||
fromTyThing (AnId i) = GtA $ varType i
|
fromTyThing (AnId i) = GtA $ varType i
|
||||||
#if __GLASGOW_HASKELL__ >= 708
|
#if __GLASGOW_HASKELL__ >= 708
|
||||||
fromTyThing (AConLike (RealDataCon d)) = GtA $ dataConRepType d
|
fromTyThing (AConLike (RealDataCon d)) = GtA $ dataConUserType d
|
||||||
#if __GLASGOW_HASKELL__ >= 800
|
#if __GLASGOW_HASKELL__ >= 800
|
||||||
fromTyThing (AConLike (PatSynCon p)) = GtPatSyn p
|
fromTyThing (AConLike (PatSynCon p)) = GtPatSyn p
|
||||||
#else
|
#else
|
||||||
fromTyThing (AConLike (PatSynCon p)) = GtA $ patSynType p
|
fromTyThing (AConLike (PatSynCon p)) = GtA $ patSynType p
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
fromTyThing (ADataCon d) = GtA $ dataConRepType d
|
fromTyThing (ADataCon d) = GtA $ dataConUserType d
|
||||||
#endif
|
#endif
|
||||||
fromTyThing (ATyCon t) = GtT t
|
fromTyThing (ATyCon t) = GtT t
|
||||||
fromTyThing _ = GtN
|
fromTyThing _ = GtN
|
||||||
|
Loading…
Reference in New Issue
Block a user