cvs commit: fptools/ghc/compiler/typecheck Inst.lhs TcRnDriver.lhs TcRnMonad.lhs TcRnTypes.lhs fptools/ghc/compiler/stgSyn StgSyn.lhs fptools/ghc/compiler/simplStg SimplStg.lhs fptools/ghc/compiler/profiling SCCfinal.lhs fptools/ghc/compiler/main Finder.lhs GHC.hs ...

[Simon Marlow]

simonmar    2005/06/21 03:44:42 PDT

  Modified files:
    ghc/compiler/typecheck Inst.lhs TcRnDriver.lhs TcRnMonad.lhs 
                           TcRnTypes.lhs 
    ghc/compiler/stgSyn  StgSyn.lhs 
    ghc/compiler/simplStg SimplStg.lhs 
    ghc/compiler/profiling SCCfinal.lhs 
    ghc/compiler/main    Finder.lhs GHC.hs HscMain.lhs 
                         HscTypes.lhs Packages.lhs TidyPgm.lhs 
    ghc/compiler/iface   MkIface.lhs 
    ghc/compiler/deSugar Desugar.lhs 
    ghc/compiler/codeGen CgBindery.lhs CgCase.lhs CgCon.lhs 
                         CgExpr.lhs CgHeapery.lhs CgMonad.lhs 
                         CgTailCall.lhs CgUtils.hs ClosureInfo.lhs 
                         CodeGen.lhs 
    ghc/compiler/cmm     CLabel.hs CmmParse.y 
  Log:
  Relax the restrictions on conflicting packages.  This should address
  many of the traps that people have been falling into with the current
  package story.
  
  Now, a local module can shadow a module in an exposed package, as long
  as the package is not otherwise required by the program.  GHC checks
  for conflicts when it knows the dependencies of the module being
  compiled.
  
  Also, we now check for module conflicts in exposed packages only when
  importing a module: if an import can be satisfied from multiple
  packages, that's an error.  It's not possible to prevent GHC from
  starting by installing packages now (unless you install another base
  package).
  
  It seems to be possible to confuse GHCi by having a local module
  shadowing a package module that goes away and comes back again.  I
  think it's nearly right, but strange happenings have been observed.
  
  I'll try to merge this into the STABLE branch.
  
  Revision  Changes    Path
  1.156     +2 -2      fptools/ghc/compiler/typecheck/Inst.lhs
  1.127     +25 -20    fptools/ghc/compiler/typecheck/TcRnDriver.lhs
  1.57      +15 -2     fptools/ghc/compiler/typecheck/TcRnMonad.lhs
  1.61      +5 -1      fptools/ghc/compiler/typecheck/TcRnTypes.lhs
  1.49      +8 -7      fptools/ghc/compiler/stgSyn/StgSyn.lhs
  1.47      +4 -2      fptools/ghc/compiler/simplStg/SimplStg.lhs
  1.40      +4 -4      fptools/ghc/compiler/profiling/SCCfinal.lhs
  1.85      +37 -55    fptools/ghc/compiler/main/Finder.lhs
  1.42      +47 -24    fptools/ghc/compiler/main/GHC.hs
  1.223     +9 -6      fptools/ghc/compiler/main/HscMain.lhs
  1.141     +19 -13    fptools/ghc/compiler/main/HscTypes.lhs
  1.38      +142 -71   fptools/ghc/compiler/main/Packages.lhs
  1.26      +2 -0      fptools/ghc/compiler/main/TidyPgm.lhs
  1.34      +11 -9     fptools/ghc/compiler/iface/MkIface.lhs
  1.88      +3 -1      fptools/ghc/compiler/deSugar/Desugar.lhs
  1.57      +2 -2      fptools/ghc/compiler/codeGen/CgBindery.lhs
  1.75      +3 -3      fptools/ghc/compiler/codeGen/CgCase.lhs
  1.51      +13 -13    fptools/ghc/compiler/codeGen/CgCon.lhs
  1.62      +11 -11    fptools/ghc/compiler/codeGen/CgExpr.lhs
  1.47      +5 -7      fptools/ghc/compiler/codeGen/CgHeapery.lhs
  1.45      +14 -8     fptools/ghc/compiler/codeGen/CgMonad.lhs
  1.43      +3 -3      fptools/ghc/compiler/codeGen/CgTailCall.lhs
  1.17      +5 -4      fptools/ghc/compiler/codeGen/CgUtils.hs
  1.70      +23 -24    fptools/ghc/compiler/codeGen/ClosureInfo.lhs
  1.73      +25 -22    fptools/ghc/compiler/codeGen/CodeGen.lhs
  1.18      +20 -20    fptools/ghc/compiler/cmm/CLabel.hs
  1.8       +4 -4      fptools/ghc/compiler/cmm/CmmParse.y