diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-01-17 15:13:04 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-02-12 01:57:27 -0500 |
| commit | da7f74797e8c322006eba385c9cbdce346dd1d43 (patch) | |
| tree | 79a69eed3aa18414caf76b02a5c8dc7c7e6d5f54 /ghc | |
| parent | f82a2f90ceda5c2bc74088fa7f6a7c8cb9c9756f (diff) | |
| download | haskell-da7f74797e8c322006eba385c9cbdce346dd1d43.tar.gz | |
Module hierarchy: ByteCode and Runtime (cf #13009)
Update haddock submodule
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/GHCi/UI.hs | 10 | ||||
| -rw-r--r-- | ghc/GHCi/UI/Monad.hs | 2 | ||||
| -rw-r--r-- | ghc/Main.hs | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs index f49c1834d3..6bca4e8dba 100644 --- a/ghc/GHCi/UI.hs +++ b/ghc/GHCi/UI.hs @@ -33,10 +33,10 @@ import qualified GHCi.UI.Monad as GhciMonad ( args, runStmt, runDecls' ) import GHCi.UI.Monad hiding ( args, runStmt ) import GHCi.UI.Tags import GHCi.UI.Info -import Debugger +import GHC.Runtime.Debugger -- The GHC interface -import GHCi +import GHC.Runtime.Interpreter import GHCi.RemoteTypes import GHCi.BreakArray import DynFlags @@ -68,7 +68,7 @@ import qualified Lexer import StringBuffer import Outputable hiding ( printForUser, printForUserPartWay ) -import DynamicLoading ( initializePlugins ) +import GHC.Runtime.Loader ( initializePlugins ) -- Other random utilities import BasicTypes hiding ( isTopLevel ) @@ -76,7 +76,7 @@ import Config import Digraph import Encoding import FastString -import Linker +import GHC.Runtime.Linker import Maybes ( orElse, expectJust ) import NameSet import Panic hiding ( showException ) @@ -3153,7 +3153,7 @@ ticket contains an analysis of the situation and suggests the solution implemented above. The same filter was also implemented to fix #11051 [3]. See the -Note [What to show to users] in compiler/main/InteractiveEval.hs +Note [What to show to users] in GHC.Runtime.Eval [1] https://gitlab.haskell.org/ghc/ghc/issues/12525 [2] https://gitlab.haskell.org/ghc/ghc/issues/12525#note_123489 diff --git a/ghc/GHCi/UI/Monad.hs b/ghc/GHCi/UI/Monad.hs index 63356d6418..6bd584bbe6 100644 --- a/ghc/GHCi/UI/Monad.hs +++ b/ghc/GHCi/UI/Monad.hs @@ -48,7 +48,7 @@ import SrcLoc import Module import RdrName (mkOrig) import PrelNames (gHC_GHCI_HELPERS) -import GHCi +import GHC.Runtime.Interpreter 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 6514a00345..c30109d5aa 100644 --- a/ghc/Main.hs +++ b/ghc/Main.hs @@ -33,10 +33,10 @@ import GHCi.UI ( interactiveUI, ghciWelcomeMsg, defaultGhciSettings ) #endif -- Frontend plugins -import DynamicLoading ( loadFrontendPlugin ) +import GHC.Runtime.Loader ( loadFrontendPlugin ) import Plugins #if defined(HAVE_INTERNAL_INTERPRETER) -import DynamicLoading ( initializePlugins ) +import GHC.Runtime.Loader ( initializePlugins ) #endif import Module ( ModuleName ) |