diff options
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/GHCi/Leak.hs | 5 | ||||
| -rw-r--r-- | ghc/GHCi/UI.hs | 24 | ||||
| -rw-r--r-- | ghc/GHCi/UI/Monad.hs | 4 | ||||
| -rw-r--r-- | ghc/Main.hs | 65 |
4 files changed, 56 insertions, 42 deletions
diff --git a/ghc/GHCi/Leak.hs b/ghc/GHCi/Leak.hs index 88c64ecc15..99f49fddb9 100644 --- a/ghc/GHCi/Leak.hs +++ b/ghc/GHCi/Leak.hs @@ -11,10 +11,13 @@ import Foreign.Ptr (ptrToIntPtr, intPtrToPtr) import GHC import GHC.Ptr (Ptr (..)) import GHCi.Util -import GHC.Driver.Types +import GHC.Driver.Env import GHC.Driver.Ppr import GHC.Utils.Outputable +import GHC.Unit.Module.ModDetails +import GHC.Unit.Home.ModInfo import GHC.Platform (target32Bit) +import GHC.Runtime.Linker.Types import Prelude import System.Mem import System.Mem.Weak diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs index ac96def464..d41f46a4a2 100644 --- a/ghc/GHCi/UI.hs +++ b/ghc/GHCi/UI.hs @@ -44,34 +44,40 @@ import GHC.Runtime.Interpreter import GHC.Runtime.Interpreter.Types import GHCi.RemoteTypes import GHCi.BreakArray -import GHC.Unit.State +import GHC.ByteCode.Types +import GHC.Driver.Phases import GHC.Driver.Session as DynFlags import GHC.Driver.Ppr hiding (printForUser) import GHC.Utils.Error hiding (traceCmd) -import GHC.Driver.Finder as Finder import GHC.Driver.Monad ( modifySession ) import GHC.Driver.Config import qualified GHC -import GHC ( LoadHowMuch(..), Target(..), TargetId(..), InteractiveImport(..), - TyThing(..), Phase, BreakIndex, Resume, SingleStep, Ghc, +import GHC ( LoadHowMuch(..), Target(..), TargetId(..), + Resume, SingleStep, Ghc, GetDocsFailure(..), getModuleGraph, handleSourceError, ms_mod ) import GHC.Driver.Main (hscParseDeclsWithLocation, hscParseStmtWithLocation) import GHC.Hs.ImpExp import GHC.Hs -import GHC.Driver.Types ( tyThingParent_maybe, handleFlagWarnings, getSafeMode, hsc_IC, - setInteractivePrintName, hsc_dflags, msObjFilePath, runInteractiveHsc, - hsc_dynLinker, hsc_interp, emptyModBreaks ) -import GHC.Unit +import GHC.Driver.Env +import GHC.Runtime.Context +import GHC.Types.TyThing +import GHC.Types.TyThing.Ppr +import GHC.Types.SafeHaskell ( getSafeMode ) import GHC.Types.Name +import GHC.Types.SourceText import GHC.Iface.Syntax ( showToHeader ) -import GHC.Core.Ppr.TyThing import GHC.Builtin.Names import GHC.Builtin.Types( stringTyCon_RDR ) import GHC.Types.Name.Reader as RdrName ( getGRE_NameQualifier_maybes, getRdrName ) import GHC.Types.SrcLoc as SrcLoc import qualified GHC.Parser.Lexer as Lexer +import GHC.Unit +import GHC.Unit.State +import GHC.Unit.Finder as Finder +import GHC.Unit.Module.ModSummary + import GHC.Data.StringBuffer import GHC.Utils.Outputable diff --git a/ghc/GHCi/UI/Monad.hs b/ghc/GHCi/UI/Monad.hs index aec9149c4c..87de1a83cb 100644 --- a/ghc/GHCi/UI/Monad.hs +++ b/ghc/GHCi/UI/Monad.hs @@ -44,12 +44,14 @@ import qualified GHC.Driver.Ppr as Ppr import GHC.Types.Name.Occurrence import GHC.Driver.Session import GHC.Data.FastString -import GHC.Driver.Types +import GHC.Driver.Env import GHC.Types.SrcLoc +import GHC.Types.SafeHaskell import GHC.Unit import GHC.Types.Name.Reader as RdrName (mkOrig) import GHC.Builtin.Names (gHC_GHCI_HELPERS) import GHC.Runtime.Interpreter +import GHC.Runtime.Context import GHCi.RemoteTypes import GHC.Hs (ImportDecl, GhcPs, GhciLStmt, LHsDecl) import GHC.Hs.Utils diff --git a/ghc/Main.hs b/ghc/Main.hs index c079cb6893..41a2f9340a 100644 --- a/ghc/Main.hs +++ b/ghc/Main.hs @@ -18,58 +18,61 @@ module Main (main) where import qualified GHC import GHC (parseTargetFiles, Ghc, GhcMonad(..), Backend (..), LoadHowMuch(..) ) -import GHC.Driver.CmdLine --- Implementations of the various modes (--show-iface, mkdependHS. etc.) -import GHC.Iface.Load ( showIface ) +import GHC.Driver.CmdLine +import GHC.Driver.Env +import GHC.Driver.Phases +import GHC.Driver.Session hiding (WarnReason(..)) +import GHC.Driver.Ppr import GHC.Driver.Main ( newHscEnv ) import GHC.Driver.Pipeline ( oneShot, compileFile ) import GHC.Driver.MakeFile ( doMkDependHS ) import GHC.Driver.Backpack ( doBackpack ) +import GHC.Driver.Plugins + +import GHC.Platform import GHC.Platform.Ways -#if defined(HAVE_INTERNAL_INTERPRETER) -import GHCi.UI ( interactiveUI, ghciWelcomeMsg, defaultGhciSettings ) -#endif +import GHC.Platform.Host --- Frontend plugins -import GHC.Runtime.Loader ( loadFrontendPlugin ) -import GHC.Driver.Plugins #if defined(HAVE_INTERNAL_INTERPRETER) +import GHCi.UI ( interactiveUI, ghciWelcomeMsg, defaultGhciSettings ) import GHC.Runtime.Loader ( initializePlugins ) #endif -import GHC.Unit.Module ( ModuleName, mkModuleName ) +import GHC.Runtime.Loader ( loadFrontendPlugin ) + +import GHC.Unit.Module ( ModuleName, mkModuleName ) +import GHC.Unit.Module.ModIface +import GHC.Unit.State ( pprUnits, pprUnitsSimple ) +import GHC.Unit.Finder ( findImportedModule, cannotFindModule, FindResult(..) ) +import GHC.Unit.Types ( IsBootInterface(..) ) --- Various other random stuff that we need -import GHC.HandleEncoding -import GHC.Platform -import GHC.Platform.Host -import GHC.Settings.Config -import GHC.Settings.Constants -import GHC.Driver.Types -import GHC.Unit.State ( pprUnits, pprUnitsSimple ) -import GHC.Driver.Phases import GHC.Types.Basic ( failed ) -import GHC.Driver.Session hiding (WarnReason(..)) -import GHC.Driver.Ppr -import GHC.Utils.Error -import GHC.Data.FastString -import GHC.Utils.Outputable as Outputable -import GHC.SysTools.BaseDir -import GHC.Settings.IO import GHC.Types.SrcLoc +import GHC.Types.SourceError +import GHC.Types.Unique.Supply + +import GHC.Utils.Error import GHC.Utils.Misc import GHC.Utils.Panic -import GHC.Types.Unique.Supply +import GHC.Utils.Outputable as Outputable import GHC.Utils.Monad ( liftIO ) +import GHC.Utils.Binary ( openBinMem, put_ ) + +import GHC.Settings.Config +import GHC.Settings.Constants +import GHC.Settings.IO + +import GHC.HandleEncoding +import GHC.Data.FastString +import GHC.SysTools.BaseDir --- Imports for --abi-hash +import GHC.Iface.Load ( showIface ) import GHC.Iface.Load ( loadUserInterface ) -import GHC.Driver.Finder ( findImportedModule, cannotFindModule ) -import GHC.Tc.Utils.Monad ( initIfaceCheck ) -import GHC.Utils.Binary ( openBinMem, put_ ) import GHC.Iface.Recomp.Binary ( fingerprintBinMem ) +import GHC.Tc.Utils.Monad ( initIfaceCheck ) + -- Standard Haskell libraries import System.IO import System.Environment |