[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (dd86634)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/dd86634af16956f555b228948acc578d678219b4

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

commit dd86634af16956f555b228948acc578d678219b4
Merge: 677144b... 9c6dd15...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Jan 30 14:29:20 2013 +0000

    Merge branch 'master' of http://darcs.haskell.org/ghc
    
    Conflicts:
    	compiler/types/Coercion.lhs

 aclocal.m4                                        |   20 ++-
 compiler/cmm/PprC.hs                              |    7 +-
 compiler/coreSyn/CoreSyn.lhs                      |    5 +-
 compiler/coreSyn/CoreTidy.lhs                     |    3 +-
 compiler/ghc.cabal.in                             |    1 -
 compiler/ghci/Debugger.hs                         |    5 +-
 compiler/hsSyn/HsTypes.lhs                        |    7 +-
 compiler/iface/BinIface.hs                        |    7 -
 compiler/iface/IfaceSyn.lhs                       |   31 +--
 compiler/iface/MkIface.lhs                        |   22 +-
 compiler/iface/TcIface.lhs                        |   29 +--
 compiler/main/DriverPipeline.hs                   |    9 +-
 compiler/main/DynFlags.hs                         |   22 ++-
 compiler/main/DynFlags.hs-boot                    |    8 +-
 compiler/main/GHC.hs                              |    5 +-
 compiler/main/InteractiveEval.hs                  |   13 +-
 compiler/main/Packages.lhs                        |   13 +-
 compiler/main/PprTyThing.hs                       |    1 +
 compiler/main/StaticFlagParser.hs                 |  151 -----------
 compiler/main/StaticFlags.hs                      |  241 +++++++++++++-----
 compiler/main/StaticFlags.hs-boot                 |    4 +
 compiler/main/TidyPgm.lhs                         |    2 +-
 compiler/rename/RnSource.lhs                      |   16 +-
 compiler/rename/RnTypes.lhs                       |    3 +-
 compiler/simplCore/OccurAnal.lhs                  |    4 +-
 compiler/typecheck/FamInst.lhs                    |  101 ++++----
 compiler/typecheck/TcBinds.lhs                    |    1 +
 compiler/typecheck/TcGenGenerics.lhs              |   10 +-
 compiler/typecheck/TcHsType.lhs                   |    8 +-
 compiler/typecheck/TcInstDcls.lhs                 |  278 +++++++++++++--------
 compiler/typecheck/TcMType.lhs                    |   13 +-
 compiler/typecheck/TcRnDriver.lhs                 |    5 +-
 compiler/typecheck/TcTyClsDecls.lhs               |  126 +++-------
 compiler/typecheck/TcType.lhs                     |  155 ------------
 compiler/types/Class.lhs                          |   20 +--
 compiler/types/CoAxiom.lhs                        |   31 ++-
 compiler/types/Coercion.lhs                       |  120 +++++++++-
 compiler/types/FamInstEnv.lhs                     |  126 +---------
 compiler/types/Type.lhs                           |   10 +
 compiler/types/TypeRep.lhs                        |  119 +++++++++
 compiler/utils/Outputable.lhs                     |    5 +-
 compiler/utils/Panic.lhs                          |    7 +-
 compiler/vectorise/Vectorise/Generic/PAMethods.hs |    4 +-
 compiler/vectorise/Vectorise/Generic/PData.hs     |   11 +-
 configure.ac                                      |    6 +-
 distrib/compare/FilenameDescr.hs                  |   17 +-
 distrib/compare/Utils.hs                          |    2 +-
 distrib/compare/compare.hs                        |   65 +++++-
 distrib/mkDocs/mkDocs                             |   27 ++-
 ghc.mk                                            |    4 +-
 ghc/Main.hs                                       |    1 -
 includes/Cmm.h                                    |    1 +
 includes/rts/storage/TSO.h                        |    3 +-
 includes/stg/MiscClosures.h                       |    2 +
 libraries/gen_contents_index                      |   24 +-
 rts/Linker.c                                      |   12 +-
 rts/STM.c                                         |   17 +-
 rts/Schedule.h                                    |    2 +-
 rts/StgMiscClosures.cmm                           |   12 +
 rts/ghc.mk                                        |   10 +-
 rts/sm/Scav.c                                     |    2 +-
 sync-all                                          |    2 +-
 62 files changed, 1029 insertions(+), 959 deletions(-)

diff --cc compiler/types/Coercion.lhs
index 3129df3,a3bca74..3de9c21
--- a/compiler/types/Coercion.lhs
+++ b/compiler/types/Coercion.lhs
@@@ -88,8 -94,7 +95,8 @@@ import Va
  import VarEnv
  import VarSet
  import Maybes   ( orElse )
- import Name	( Name, NamedThing(..), nameUnique, getSrcSpan )
+ import Name	( Name, NamedThing(..), nameUnique, nameModule, getSrcSpan )
 +import NameSet
  import OccName 	( parenSymOcc )
  import Util
  import BasicTypes