[commit: ghc] master: Refactor the imports of InteractiveContext (35d213a)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/35d213abfe27502fa34b60975c4b18ed51bfeb05

>---------------------------------------------------------------

commit 35d213abfe27502fa34b60975c4b18ed51bfeb05
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Aug 2 08:18:03 2011 +0100

    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

 compiler/basicTypes/RdrName.lhs   |    5 +-
 compiler/hsSyn/HsImpExp.lhs       |   12 ++-
 compiler/iface/MkIface.lhs        |    2 +-
 compiler/main/GHC.hs              |    2 +-
 compiler/main/HeaderInfo.hs       |   22 ++--
 compiler/main/HscMain.lhs         |    4 +-
 compiler/main/HscStats.lhs        |    3 +-
 compiler/main/HscTypes.lhs        |   29 ++++--
 compiler/main/InteractiveEval.hs  |   53 +++++-----
 compiler/parser/Parser.y.pp       |    6 +-
 compiler/rename/RnNames.lhs       |   60 ++++-------
 compiler/typecheck/TcRnDriver.lhs |   22 +++-
 ghc/InteractiveUI.hs              |  202 ++++++++++++++++++++-----------------
 13 files changed, 231 insertions(+), 191 deletions(-)


Diff suppressed because of size. To see it, use:

    git show 35d213abfe27502fa34b60975c4b18ed51bfeb05