[commit: ghc] ghc-kinds: Merge branch 'master' into ghc-kinds (8431493)

[Julien Cretin]

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

On branch  : ghc-kinds

http://hackage.haskell.org/trac/ghc/changeset/84314935db63ecbc900a1e6359dae3828403c657

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

commit 84314935db63ecbc900a1e6359dae3828403c657
Merge: 01ba4e3... 488e21c...
Author: Julien Cretin <ghc at ia0.eu>
Date:   Fri Sep 23 11:54:29 2011 +0200

    Merge branch 'master' into ghc-kinds
    
    Conflicts:
    	compiler/typecheck/TcSMonad.lhs
    	compiler/typecheck/TcTyClsDecls.lhs

 compiler/basicTypes/Avail.hs             |  107 ++++++++++
 compiler/basicTypes/DataCon.lhs-boot     |    2 +
 compiler/basicTypes/Literal.lhs          |   66 +++++--
 compiler/basicTypes/MkId.lhs             |   41 ----
 compiler/basicTypes/Name.lhs             |   18 +-
 compiler/basicTypes/Name.lhs-boot        |    4 +
 compiler/basicTypes/RdrName.lhs          |    5 +-
 compiler/codeGen/CgUtils.hs              |    2 +-
 compiler/coreSyn/CoreLint.lhs            |    5 +-
 compiler/coreSyn/CorePrep.lhs            |   61 ++----
 compiler/coreSyn/CoreSubst.lhs           |    6 +-
 compiler/coreSyn/CoreSyn.lhs             |   24 ++-
 compiler/coreSyn/CoreUtils.lhs           |    2 +-
 compiler/coreSyn/MkCore.lhs              |    5 +-
 compiler/deSugar/Desugar.lhs             |   67 +++---
 compiler/deSugar/DsCCall.lhs             |   51 -----
 compiler/ghc.cabal.in                    |    1 +
 compiler/ghc.mk                          |    1 +
 compiler/ghci/ByteCodeGen.lhs            |    4 +-
 compiler/ghci/ByteCodeLink.lhs           |    2 +-
 compiler/ghci/Debugger.hs                |   31 ++--
 compiler/ghci/Linker.lhs                 |   61 +++++-
 compiler/hsSyn/HsImpExp.lhs              |   64 +++---
 compiler/iface/BinIface.hs               |    1 +
 compiler/iface/IfaceEnv.lhs              |   77 ++++---
 compiler/iface/LoadIface.lhs             |    1 +
 compiler/iface/MkIface.lhs               |    1 +
 compiler/iface/TcIface.lhs               |   20 ++-
 compiler/main/DriverPhases.hs            |    2 +-
 compiler/main/DynFlags.hs                |    3 +
 compiler/main/GHC.hs                     |   38 ++--
 compiler/main/HscMain.lhs                |  133 ++++++++++--
 compiler/main/HscTypes.lhs               |  331 +++++++++++++++++++-----------
 compiler/main/InteractiveEval.hs         |   83 +++++---
 compiler/main/TidyPgm.lhs                |  198 +++++++++---------
 compiler/prelude/PrelInfo.lhs            |   26 +--
 compiler/prelude/PrelNames.lhs           |   33 +--
 compiler/prelude/PrelRules.lhs           |   18 +-
 compiler/prelude/TysWiredIn.lhs          |   75 +------
 compiler/rename/RnBinds.lhs              |    7 +-
 compiler/rename/RnEnv.lhs                |    5 +-
 compiler/rename/RnNames.lhs              |   38 ++---
 compiler/rename/RnSource.lhs             |   12 +-
 compiler/simplCore/CSE.lhs               |    2 +-
 compiler/simplCore/CoreMonad.lhs         |   54 +++---
 compiler/simplCore/FloatIn.lhs           |    2 +-
 compiler/simplCore/FloatOut.lhs          |    2 +-
 compiler/simplCore/LiberateCase.lhs      |    2 +-
 compiler/simplCore/OccurAnal.lhs         |    2 +-
 compiler/simplCore/SAT.lhs               |    2 +-
 compiler/simplCore/SetLevels.lhs         |    2 +-
 compiler/simplCore/SimplCore.lhs         |   34 ++--
 compiler/simplCore/SimplMonad.lhs        |   53 ++++-
 compiler/simplCore/Simplify.lhs          |    4 +-
 compiler/specialise/Rules.lhs            |    2 +-
 compiler/stgSyn/CoreToStg.lhs            |    6 +-
 compiler/stranal/DmdAnal.lhs             |    4 +-
 compiler/stranal/WorkWrap.lhs            |    2 +-
 compiler/typecheck/FamInst.lhs           |  127 ++++++++++--
 compiler/typecheck/Inst.lhs              |  111 ++++++-----
 compiler/typecheck/TcDeriv.lhs           |    1 +
 compiler/typecheck/TcEnv.lhs             |  101 ++--------
 compiler/typecheck/TcExpr.lhs            |    1 +
 compiler/typecheck/TcInstDcls.lhs        |    5 +-
 compiler/typecheck/TcPat.lhs             |    2 +-
 compiler/typecheck/TcRnDriver.lhs        |  282 +++++++++++++++++---------
 compiler/typecheck/TcRnMonad.lhs         |   19 +--
 compiler/typecheck/TcRnTypes.lhs         |    4 +
 compiler/typecheck/TcSMonad.lhs          |    4 +-
 compiler/typecheck/TcTyClsDecls.lhs      |    2 +-
 compiler/typecheck/TcTyDecls.lhs         |    1 +
 compiler/types/FamInstEnv.lhs            |  130 +++++++++++--
 compiler/types/InstEnv.lhs               |  139 ++++++++-----
 compiler/types/TypeRep.lhs               |    2 +
 compiler/utils/Outputable.lhs            |   14 +-
 compiler/utils/Util.lhs                  |   16 +-
 compiler/vectorise/Vectorise.hs          |   18 +-
 compiler/vectorise/Vectorise/Env.hs      |   11 +-
 compiler/vectorise/Vectorise/Monad.hs    |    8 +-
 compiler/vectorise/Vectorise/Type/Env.hs |   24 +--
 ghc/GhciMonad.hs                         |   19 ++-
 ghc/GhciTags.hs                          |    2 +-
 ghc/InteractiveUI.hs                     |  104 ++++++----
 rts/AdjustorAsm.S                        |    4 +
 rules/build-package.mk                   |    4 +
 rules/hs-suffix-rules-srcdir.mk          |   12 +-
 utils/ghc-pkg/ghc.mk                     |    3 +
 87 files changed, 1859 insertions(+), 1216 deletions(-)


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

    git show 84314935db63ecbc900a1e6359dae3828403c657