diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2011-08-02 08:18:03 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2011-08-02 08:18:03 +0100 |
| commit | 35d213abfe27502fa34b60975c4b18ed51bfeb05 (patch) | |
| tree | aab2a30ab9acbf6ab2bc51366530027eab13b8ad /compiler/main/HscMain.lhs | |
| parent | 6059755e045ed8c4a8c3d48cc0ec5733bd950c0f (diff) | |
| download | haskell-35d213abfe27502fa34b60975c4b18ed51bfeb05.tar.gz | |
Refactor the imports of InteractiveContext
Instead of two fields
ic_toplev_scope :: [Module]
ic_imports :: [ImportDecl RdrName]
we now just have one
ic_imports :: [InteractiveImport]
with the auxiliary data type
data InteractiveImport
= IIDecl (ImportDecl RdrName) -- Bring the exports of a particular module
-- (filtered by an import decl) into scope
| IIModule Module -- Bring into scope the entire top-level envt of
-- of this module, including the things imported
-- into it.
This makes lots of code less confusing. No change in behaviour.
It's preparatory to fixing Trac #5147.
While I was at I also
* Cleaned up the handling of the "implicit" Prelude import
by adding a ideclImplicit field to ImportDecl. This
significantly reduces plumbing in the handling of
the implicit Prelude import
* Used record notation consistently for ImportDecl
Diffstat (limited to 'compiler/main/HscMain.lhs')
| -rw-r--r-- | compiler/main/HscMain.lhs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs index 2603d21bc4..ff52d2de76 100644 --- a/compiler/main/HscMain.lhs +++ b/compiler/main/HscMain.lhs @@ -312,9 +312,7 @@ hscRnImportDecls hsc_env this_mod import_decls = runHsc hsc_env $ ioMsgMaybe $ initTc hsc_env HsSrcFile False this_mod $ fmap tcg_rdr_env $ - tcRnImports hsc_env this_mod loc import_decls - where - loc = mkGeneralSrcSpan (mkFastString "In a call to hscRnImportDecls") + tcRnImports hsc_env this_mod import_decls #endif -- ----------------------------------------------------------------------------- |