Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 25 Jan 2013 13:26:18 +0000 (13:26 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 25 Jan 2013 13:26:18 +0000 (13:26 +0000)
Conflicts:
compiler/basicTypes/DataCon.lhs

1  2 
compiler/basicTypes/DataCon.lhs
compiler/simplCore/Simplify.lhs
compiler/types/TyCon.lhs
compiler/types/Type.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"
Simple merge
@@@ -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,
Simple merge