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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0ab8cc19bc73f19cc91daea2b649faa7960bcf73

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

commit 0ab8cc19bc73f19cc91daea2b649faa7960bcf73
Merge: e342666... a47ee23...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Jan 25 13:26:18 2013 +0000

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

 aclocal.m4                                     |    6 +
 compiler/basicTypes/DataCon.lhs                |  126 ++++++++++++++++++------
 compiler/coreSyn/CoreUtils.lhs                 |   24 ++++-
 compiler/iface/BinIface.hs                     |    6 +-
 compiler/iface/BuildTyCl.lhs                   |   16 ---
 compiler/iface/IfaceSyn.lhs                    |   12 ++-
 compiler/iface/MkIface.lhs                     |    1 +
 compiler/iface/TcIface.lhs                     |   10 +-
 compiler/llvmGen/LlvmCodeGen/Ppr.hs            |    3 +
 compiler/main/DriverPipeline.hs                |   11 ++-
 compiler/main/DynFlags.hs                      |    2 +-
 compiler/prelude/PrelNames.lhs                 |    4 +-
 compiler/prelude/TysWiredIn.lhs                |   48 +++++----
 compiler/prelude/TysWiredIn.lhs-boot           |    2 +-
 compiler/simplCore/SimplUtils.lhs              |    2 +-
 compiler/simplCore/Simplify.lhs                |   32 +++++-
 compiler/typecheck/TcGenGenerics.lhs           |    5 +-
 compiler/typecheck/TcHsType.lhs                |   15 ++--
 compiler/typecheck/TcInstDcls.lhs              |    4 +-
 compiler/typecheck/TcTyClsDecls.lhs            |   36 ++++---
 compiler/typecheck/TcTyDecls.lhs               |  111 +++++++++++++++++++---
 compiler/types/TyCon.lhs                       |   38 ++++++--
 compiler/types/Type.lhs                        |    4 +-
 compiler/utils/Platform.hs                     |    2 +
 compiler/vectorise/Vectorise/Generic/PData.hs  |    1 +
 compiler/vectorise/Vectorise/Type/TyConDecl.hs |    1 +
 ghc.mk                                         |   17 ++--
 27 files changed, 390 insertions(+), 149 deletions(-)

diff --cc compiler/basicTypes/DataCon.lhs
index f1a18f7,a0cc4bd..07fd8ca
--- a/compiler/basicTypes/DataCon.lhs
+++ b/compiler/basicTypes/DataCon.lhs
@@@ -41,9 -42,11 +42,8 @@@ module DataCon 
  	isVanillaDataCon, classDataCon, dataConCannotMatch,
          isBanged, isMarkedStrict, eqHsBang,
  
 -        -- * Splitting product types
 -	splitProductType_maybe, splitProductType, 
 -
          -- ** Promotion related functions
-         isPromotableTyCon, promoteTyCon, 
-         promoteDataCon, promoteDataCon_maybe
+         promoteKind, promoteDataCon, promoteDataCon_maybe
      ) where
  
  #include "HsVersions.h"
diff --cc compiler/types/TyCon.lhs
index ce14944,86202a3..c9061e0
--- a/compiler/types/TyCon.lhs
+++ b/compiler/types/TyCon.lhs
@@@ -39,10 -39,10 +39,11 @@@ module TyCon
          isForeignTyCon, 
          isPromotedDataCon, isPromotedTyCon,
          isPromotedDataCon_maybe, isPromotedTyCon_maybe,
+         promotableTyCon_maybe, promoteTyCon,
  
          isInjectiveTyCon,
 -        isDataTyCon, isProductTyCon, isEnumerationTyCon,
 +        isDataTyCon, isProductTyCon, isDataProductTyCon_maybe,
 +        isEnumerationTyCon,
          isNewTyCon, isAbstractTyCon,
          isFamilyTyCon, isSynFamilyTyCon, isDataFamilyTyCon,
          isUnLiftedTyCon,