summaryrefslogtreecommitdiff
path: root/compiler/GHC/Parser.y
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2020-10-15 17:55:34 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-10-29 03:53:52 -0400
commit0e9f6defbdc1f691ff7197b21e68ac16ffa4ab59 (patch)
tree1c9d9848db07596c19221fd195db81cdf6430385 /compiler/GHC/Parser.y
parent795908dc4eab8e8b40cb318a2adbe4a4d4126c74 (diff)
downloadhaskell-0e9f6defbdc1f691ff7197b21e68ac16ffa4ab59.tar.gz
Split GHC.Driver.Types
I was working on making DynFlags stateless (#17957), especially by storing loaded plugins into HscEnv instead of DynFlags. It turned out to be complicated because HscEnv is in GHC.Driver.Types but LoadedPlugin isn't: it is in GHC.Driver.Plugins which depends on GHC.Driver.Types. I didn't feel like introducing yet another hs-boot file to break the loop. Additionally I remember that while we introduced the module hierarchy (#13009) we talked about splitting GHC.Driver.Types because it contained various unrelated types and functions, but we never executed. I didn't feel like making GHC.Driver.Types bigger with more unrelated Plugins related types, so finally I bit the bullet and split GHC.Driver.Types. As a consequence this patch moves a lot of things. I've tried to put them into appropriate modules but nothing is set in stone. Several other things moved to avoid loops. * Removed Binary instances from GHC.Utils.Binary for random compiler things * Moved Typeable Binary instances into GHC.Utils.Binary.Typeable: they import a lot of things that users of GHC.Utils.Binary don't want to depend on. * put everything related to Units/Modules under GHC.Unit: GHC.Unit.Finder, GHC.Unit.Module.{ModGuts,ModIface,Deps,etc.} * Created several modules under GHC.Types: GHC.Types.Fixity, SourceText, etc. * Split GHC.Utils.Error (into GHC.Types.Error) * Finally removed GHC.Driver.Types Note that this patch doesn't put loaded plugins into HscEnv. It's left for another patch. Bump haddock submodule
Diffstat (limited to 'compiler/GHC/Parser.y')
-rw-r--r--compiler/GHC/Parser.y21
1 files changed, 9 insertions, 12 deletions
diff --git a/compiler/GHC/Parser.y b/compiler/GHC/Parser.y
index 1d1ae49685..90d8ed10c8 100644
--- a/compiler/GHC/Parser.y
+++ b/compiler/GHC/Parser.y
@@ -42,42 +42,39 @@ where
-- base
import Control.Monad ( unless, liftM, when, (<=<) )
import GHC.Exts
-import Data.Char
import Data.Maybe ( maybeToList )
-import Control.Monad ( mplus )
-import Control.Applicative ((<$))
import qualified Prelude -- for happy-generated code
import GHC.Prelude
import GHC.Hs
-import GHC.Hs.Doc
-import GHC.Driver.Phases ( HscSource(..) )
import GHC.Driver.Backpack.Syntax
-import GHC.Unit.Types ( IsBootInterface(..) )
import GHC.Unit.Info
import GHC.Unit.Module
+import GHC.Unit.Module.Warnings
import GHC.Data.OrdList
-import GHC.Data.BooleanFormula ( BooleanFormula(..), LBooleanFormula(..), mkTrue )
+import GHC.Data.BooleanFormula ( BooleanFormula(..), LBooleanFormula, mkTrue )
import GHC.Data.FastString
-import GHC.Data.Maybe ( isJust, orElse )
+import GHC.Data.Maybe ( orElse )
import GHC.Utils.Outputable
import GHC.Utils.Misc ( looksLikePackageName, fstOf3, sndOf3, thdOf3 )
import GHC.Types.Name.Reader
-import GHC.Types.Name.Occurrence ( varName, dataName, tcClsName, tvName,
- occNameFS, startsWithUnderscore )
+import GHC.Types.Name.Occurrence ( varName, dataName, tcClsName, tvName, occNameFS )
import GHC.Types.SrcLoc
import GHC.Types.Basic
+import GHC.Types.Fixity
import GHC.Types.ForeignCall
+import GHC.Types.SourceFile
+import GHC.Types.SourceText
-import GHC.Core.Type ( unrestrictedFunTyCon, Mult(..), Specificity(..) )
+import GHC.Core.Type ( unrestrictedFunTyCon, Specificity(..) )
import GHC.Core.Class ( FunDep )
-import GHC.Core.DataCon ( DataCon, dataConName )
+import GHC.Core.DataCon ( DataCon, dataConName )
import GHC.Parser.PostProcess
import GHC.Parser.PostProcess.Haddock