Commit 240f5bf6 authored by Sylvain Henry's avatar Sylvain Henry Committed by Marge Bot
Browse files

Modules: Driver (#13009)

submodule updates: nofib, haddock
parent be7068a6
Pipeline #16084 canceled with stages
......@@ -288,7 +288,7 @@ module GHC (
{-
ToDo:
* inline bits of HscMain here to simplify layering: hscTcExpr, hscStmt.
* inline bits of GHC.Driver.Main here to simplify layering: hscTcExpr, hscStmt.
-}
#include "HsVersions.h"
......@@ -302,15 +302,15 @@ import GHC.Runtime.Interpreter
import GHCi.RemoteTypes
import PprTyThing ( pprFamInst )
import HscMain
import GhcMake
import DriverPipeline ( compileOne' )
import GhcMonad
import GHC.Driver.Main
import GHC.Driver.Make
import GHC.Driver.Pipeline ( compileOne' )
import GHC.Driver.Monad
import TcRnMonad ( finalSafeMode, fixSafeInstances, initIfaceTcRn )
import GHC.Iface.Load ( loadSysInterface )
import TcRnTypes
import Predicate
import Packages
import GHC.Driver.Packages
import NameSet
import RdrName
import GHC.Hs
......@@ -329,11 +329,11 @@ import FamInstEnv ( FamInst )
import SrcLoc
import CoreSyn
import GHC.Iface.Tidy
import DriverPhases ( Phase(..), isHaskellSrcFilename )
import Finder
import HscTypes
import CmdLineParser
import DynFlags hiding (WarnReason(..))
import GHC.Driver.Phases ( Phase(..), isHaskellSrcFilename )
import GHC.Driver.Finder
import GHC.Driver.Types
import GHC.Driver.CmdLine
import GHC.Driver.Session hiding (WarnReason(..))
import SysTools
import SysTools.BaseDir
import Annotations
......@@ -1364,7 +1364,7 @@ getModuleSourceAndFlags mod = do
-- | Return module source as token stream, including comments.
--
-- The module must be in the module graph and its source must be available.
-- Throws a 'HscTypes.SourceError' on parse error.
-- Throws a 'GHC.Driver.Types.SourceError' on parse error.
getTokenStream :: GhcMonad m => Module -> m [Located Token]
getTokenStream mod = do
(sourceFile, source, flags) <- getModuleSourceAndFlags mod
......
......@@ -23,7 +23,7 @@ import GHC.ByteCode.Types
import GHCi.RemoteTypes
import GHC.Runtime.Interpreter
import HscTypes
import GHC.Driver.Types
import Name
import NameSet
import Literal
......@@ -31,7 +31,7 @@ import TyCon
import FastString
import GHC.StgToCmm.Layout ( ArgRep(..) )
import GHC.Runtime.Heap.Layout
import DynFlags
import GHC.Driver.Session
import Outputable
import GHC.Platform
import Util
......
......@@ -13,8 +13,8 @@ import GhcPrelude
import GHC.ByteCode.Types
import GHC.Runtime.Interpreter
import DynFlags
import HscTypes
import GHC.Driver.Session
import GHC.Driver.Types
import Name ( Name, getName )
import NameEnv
import DataCon ( DataCon, dataConRepArgTys, dataConIdentity )
......
......@@ -27,7 +27,7 @@ import SizedSeq
import GHC.Runtime.Interpreter
import GHC.ByteCode.Types
import HscTypes
import GHC.Driver.Types
import Name
import NameEnv
import PrimOp
......
......@@ -118,7 +118,7 @@ import GhcPrelude
import IdInfo
import BasicTypes
import {-# SOURCE #-} GHC.Cmm.BlockId (BlockId, mkBlockId)
import Packages
import GHC.Driver.Packages
import Module
import Name
import Unique
......@@ -126,7 +126,7 @@ import PrimOp
import CostCentre
import Outputable
import FastString
import DynFlags
import GHC.Driver.Session
import GHC.Platform
import UniqSet
import Util
......
......@@ -12,7 +12,7 @@ import GHC.Runtime.Heap.Layout
import GHC.Cmm (Convention(..))
import GHC.Cmm.Ppr () -- For Outputable instances
import DynFlags
import GHC.Driver.Session
import GHC.Platform
import Outputable
......
......@@ -36,7 +36,7 @@ import GHC.Cmm.BlockId
import GHC.Cmm.CLabel
import GHC.Cmm.MachOp
import GHC.Cmm.Type
import DynFlags
import GHC.Driver.Session
import Outputable (panic)
import Unique
......
......@@ -31,7 +31,7 @@ import GHC.Cmm.Switch (SwitchTargets)
import GHC.Cmm.Dataflow.Block
import GHC.Cmm.Dataflow.Graph
import GHC.Cmm.Dataflow.Label
import DynFlags
import GHC.Driver.Session
import FastString
import ForeignCall
import OrdList
......
......@@ -46,7 +46,7 @@ import GHC.Cmm.Dataflow.Collections
import GHC.Platform
import Maybes
import DynFlags
import GHC.Driver.Session
import ErrUtils (withTimingSilent)
import Panic
import UniqSupply
......
......@@ -24,7 +24,7 @@ import Digraph
import GHC.Cmm.CLabel
import GHC.Cmm
import GHC.Cmm.Utils
import DynFlags
import GHC.Driver.Session
import Maybes
import Outputable
import GHC.Runtime.Heap.Layout
......
......@@ -29,7 +29,7 @@ import Maybes
import UniqFM
import Util
import DynFlags
import GHC.Driver.Session
import FastString
import Outputable hiding ( isEmpty )
import qualified Data.Set as Set
......
......@@ -23,7 +23,7 @@ import GHC.Cmm.Liveness
import GHC.Cmm.Switch (switchTargetsToList)
import GHC.Cmm.Ppr () -- For Outputable instances
import Outputable
import DynFlags
import GHC.Driver.Session
import Control.Monad (ap)
......
......@@ -14,7 +14,7 @@ where
import GhcPrelude
import DynFlags
import GHC.Driver.Session
import GHC.Cmm.BlockId
import GHC.Cmm
import GHC.Cmm.Ppr.Expr () -- For Outputable instances
......
......@@ -32,7 +32,7 @@ import GhcPrelude
import GHC.Cmm.Type
import Outputable
import DynFlags
import GHC.Driver.Session
-----------------------------------------------------------------------------
-- MachOp
......
......@@ -17,7 +17,7 @@ import GhcPrelude
import Control.Monad
import DynFlags
import GHC.Driver.Session
import Lexer
newtype PD a = PD { unPD :: DynFlags -> PState -> ParseResult a }
......
......@@ -31,7 +31,7 @@ import GhcPrelude hiding (succ)
import GHC.Platform.Regs
import GHC.Cmm.Expr
import GHC.Cmm.Switch
import DynFlags
import GHC.Driver.Session
import FastString
import ForeignCall
import Outputable
......
......@@ -17,7 +17,7 @@ import GhcPrelude
import GHC.Cmm.Utils
import GHC.Cmm
import DynFlags
import GHC.Driver.Session
import Util
import Outputable
......
......@@ -242,7 +242,7 @@ import Literal
import Unique
import UniqFM
import SrcLoc
import DynFlags
import GHC.Driver.Session
import ErrUtils
import StringBuffer
import FastString
......
......@@ -23,9 +23,9 @@ import GHC.Cmm.Sink
import GHC.Cmm.Dataflow.Collections
import UniqSupply
import DynFlags
import GHC.Driver.Session
import ErrUtils
import HscTypes
import GHC.Driver.Types
import Control.Monad
import Outputable
import GHC.Platform
......
......@@ -43,7 +43,7 @@ import GhcPrelude
import GHC.Cmm.Ppr.Expr
import GHC.Cmm
import DynFlags
import GHC.Driver.Session
import Outputable
import FastString
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment