Fixed imports for GHC 9.0

j-mie6 · Jun 10, 2021 · 8e7b8e2 · 8e7b8e2
1 parent a8923ae
commit 8e7b8e2
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/src/Parsley/OverloadedQuotesPlugin/Plugin.hs b/src/Parsley/OverloadedQuotesPlugin/Plugin.hs
@@ -9,23 +9,35 @@
 {-# LANGUAGE RankNTypes #-}
 module Parsley.OverloadedQuotesPlugin.Plugin (plugin) where
 
-import Plugins       (Plugin (..), defaultPlugin, purePlugin)
-import TcRnTypes     (TcGblEnv, TcM)
 import Data.Generics (GenericT, GenericQ, mkT, mkQ, everywhere, gmapT)
 import GHC.Generics  (Generic)
 
+import Parsley.PluginUtils (lookupModuleInPackage, lookupName, lookupNames)
+
+#if __GLASGOW_HASKELL__ >= 900
+import GHC.Driver.Plugins       (Plugin (..), defaultPlugin, purePlugin)
+import GHC.Tc.Types             (TcM, TcGblEnv)
+
+
+import qualified GHC               (HsGroup, GhcRn, Name, GenLocated(L), SrcSpan)
+import qualified GHC.Plugins as GHC (CommandLineOption)
+import qualified GHC.Tc.Utils.Monad as GHC  (getTopEnv)
+#else
+import Plugins       (Plugin (..), defaultPlugin, purePlugin)
+import TcRnTypes     (TcGblEnv, TcM)
+
+
 import qualified GHC               (HsGroup, GhcRn, Name, GenLocated(L), SrcSpan)
 import qualified GhcPlugins as GHC (CommandLineOption)
 import qualified TcRnMonad as GHC  (getTopEnv)
+#endif
 
 #if __GLASGOW_HASKELL__ < 810
 import qualified HsExpr as Expr
 #else
 import qualified GHC.Hs.Expr as Expr
 #endif
 
-import Parsley.PluginUtils (lookupModuleInPackage, lookupName, lookupNames)
-
 #if __GLASGOW_HASKELL__ >= 810
 import GHC.Hs.Extension
 noExt :: NoExtField

diff --git a/src/Parsley/PluginUtils.hs b/src/Parsley/PluginUtils.hs
@@ -1,19 +1,30 @@
-{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
+{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, CPP #-}
 module Parsley.PluginUtils where
 
 import qualified GHC.TcPluginM.Extra as TCPluginExtra (lookupName)
 
--- GHC API
+-- ghc
+#if __GLASGOW_HASKELL__ >= 900
+import GHC.Tc.Types (TcM, TcPluginM)
+import GHC.Utils.Outputable
+import qualified GHC.Plugins as GHC
+import qualified GHC.Iface.Env as GHC (lookupOrig)
+import GHC.Driver.Finder (findImportedModule, FindResult(Found))
+import GHC.Data.FastString (mkFastString)
+import GHC.Unit.Module (Module)
+import GHC.Unit.Module.Name (mkModuleName)
+import GHC (Name)
+#else
 import TcRnTypes (TcM, TcPluginM)
 import Outputable
-
--- ghc
 import qualified GhcPlugins as GHC
 import qualified IfaceEnv as GHC (lookupOrig)
 import Finder (findImportedModule, FindResult(Found))
 import FastString (mkFastString)
 import Module (Module, mkModuleName)
 import Name (Name)
+#endif
+
 import Control.Monad.IO.Class ( liftIO )
 
 class Monad m => Lookup m where