[commit: ghc] type-nats: Merge remote-tracking branch 'origin/master' into type-nats (fa73267)

Ian Lynagh igloo at earth.li
Tue Feb 26 16:21:56 CET 2013


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

On branch  : type-nats

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

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

commit fa73267f384b2afbfc9d1f6c09dab62d07a65b0e
Merge: 0ff8816... 6387eba...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sun Jan 13 13:06:59 2013 -0800

    Merge remote-tracking branch 'origin/master' into type-nats
    
    Conflicts:
    	compiler/prelude/PrelNames.lhs

 compiler/basicTypes/Id.lhs                        |    2 +-
 compiler/basicTypes/MkId.lhs                      |    4 +-
 compiler/coreSyn/CoreLint.lhs                     |    4 +-
 compiler/coreSyn/CoreSubst.lhs                    |    7 +-
 compiler/coreSyn/CoreUnfold.lhs                   |    4 +-
 compiler/coreSyn/CoreUtils.lhs                    |  111 ++-
 compiler/coreSyn/PprExternalCore.lhs              |   53 +-
 compiler/deSugar/Coverage.lhs                     |   12 +-
 compiler/deSugar/DsArrows.lhs                     |   13 +-
 compiler/deSugar/DsBinds.lhs                      |    3 +-
 compiler/deSugar/DsExpr.lhs                       |   21 +-
 compiler/deSugar/DsGRHSs.lhs                      |   14 +-
 compiler/deSugar/DsListComp.lhs                   |    5 +-
 compiler/deSugar/DsMeta.hs                        |   10 +-
 compiler/deSugar/DsUtils.lhs                      |    2 +-
 compiler/deSugar/Match.lhs                        |   55 +-
 compiler/deSugar/MatchCon.lhs                     |    3 +-
 compiler/deSugar/MatchLit.lhs                     |    2 +-
 compiler/ghc.cabal.in                             |    4 +-
 compiler/ghci/ByteCodeAsm.lhs                     |    8 +-
 compiler/hsSyn/HsDecls.lhs                        |   86 +-
 compiler/hsSyn/HsExpr.lhs                         |   28 +-
 compiler/hsSyn/HsUtils.lhs                        |    2 +-
 compiler/iface/MkIface.lhs                        |    7 +-
 compiler/iface/TcIface.lhs                        |    7 +-
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs           |    8 +-
 compiler/main/DriverPhases.hs                     |   61 +-
 compiler/main/DriverPipeline.hs                   |  149 ++-
 compiler/main/DynFlags.hs                         |   76 ++-
 compiler/main/GhcMake.hs                          |    4 +-
 compiler/main/HscMain.hs                          |    3 +-
 compiler/main/TidyPgm.lhs                         |   12 +-
 compiler/nativeGen/AsmCodeGen.lhs                 |   10 +-
 compiler/nativeGen/PPC/Instr.hs                   |    7 +-
 compiler/nativeGen/SPARC/Base.hs                  |   51 +-
 compiler/nativeGen/X86/CodeGen.hs                 |   12 +-
 compiler/nativeGen/X86/Instr.hs                   |  124 ++-
 compiler/parser/Parser.y.pp                       |    2 +
 compiler/parser/RdrHsSyn.lhs                      |    8 +-
 compiler/prelude/PrelNames.lhs                    |   10 +-
 compiler/prelude/PrelRules.lhs                    |   24 +-
 compiler/rename/RnBinds.lhs                       |   22 +-
 compiler/rename/RnExpr.lhs                        |    2 +-
 compiler/rename/RnNames.lhs                       |   42 +-
 compiler/rename/RnTypes.lhs                       |    2 +-
 compiler/simplCore/OccurAnal.lhs                  |  255 +----
 compiler/simplCore/SimplMonad.lhs                 |   10 +-
 compiler/simplCore/SimplUtils.lhs                 |  127 ++--
 compiler/simplCore/Simplify.lhs                   |  138 ++--
 compiler/typecheck/FamInst.lhs                    |  144 ++--
 compiler/typecheck/Inst.lhs                       |  114 +--
 compiler/typecheck/TcArrows.lhs                   |    9 +-
 compiler/typecheck/TcBinds.lhs                    |   32 +-
 compiler/typecheck/TcDeriv.lhs                    |  168 +++-
 compiler/typecheck/TcEnv.lhs                      |    2 +-
 compiler/typecheck/TcErrors.lhs                   |  143 +--
 compiler/typecheck/TcEvidence.lhs                 |   33 +-
 compiler/typecheck/TcForeign.lhs                  |   18 +-
 compiler/typecheck/TcGenDeriv.lhs                 |  196 +++--
 compiler/typecheck/TcGenGenerics.lhs              |   28 +-
 compiler/typecheck/TcHsSyn.lhs                    |    7 +-
 compiler/typecheck/TcHsType.lhs                   |    1 +
 compiler/typecheck/TcInstDcls.lhs                 |  203 +++--
 compiler/typecheck/TcInteract.lhs                 |    3 +-
 compiler/typecheck/TcMType.lhs                    | 1083 +--------------------
 compiler/typecheck/TcMatches.lhs                  |   14 +-
 compiler/typecheck/TcPat.lhs                      |    4 +-
 compiler/typecheck/TcRnTypes.lhs                  |    8 +-
 compiler/typecheck/TcSMonad.lhs                   |    9 +-
 compiler/typecheck/TcSimplify.lhs                 |  155 +---
 compiler/typecheck/TcSplice.lhs                   |    5 +-
 compiler/typecheck/TcTyClsDecls.lhs               |   36 +-
 compiler/typecheck/TcType.lhs                     |   21 +-
 compiler/typecheck/TcValidity.lhs                 | 1087 +++++++++++++++++++++
 compiler/types/CoAxiom.lhs                        |   84 ++-
 compiler/types/Coercion.lhs                       |   37 +-
 compiler/types/FamInstEnv.lhs                     |  314 +++----
 compiler/types/FunDeps.lhs                        |   12 +-
 compiler/types/InstEnv.lhs                        |  136 ++--
 compiler/utils/ListSetOps.lhs                     |   18 +
 compiler/utils/MonadUtils.hs                      |   32 +-
 compiler/vectorise/Vectorise/Generic/PAMethods.hs |    4 +-
 compiler/vectorise/Vectorise/Generic/PData.hs     |    8 +-
 docs/users_guide/flags.xml                        |   14 +-
 docs/users_guide/ghci.xml                         |   17 +-
 docs/users_guide/glasgow_exts.xml                 |  218 +----
 docs/users_guide/packages.xml                     |    4 +-
 docs/users_guide/sooner.xml                       |   11 +-
 docs/users_guide/using.xml                        |   19 +
 ghc.mk                                            |   26 +-
 ghc/GhciMonad.hs                                  |   22 +-
 ghc/Main.hs                                       |   10 +-
 libraries/bytestring                              |    2 +-
 libraries/terminfo                                |    2 +-
 mk/config.mk.in                                   |    4 +
 mk/validate-settings.mk                           |    3 +
 rts/Disassembler.c                                |    4 +-
 rts/Interpreter.c                                 |    4 +-
 rts/ghc.mk                                        |    4 +
 rules/build-package-way.mk                        |    2 -
 rules/build-package.mk                            |    2 -
 rules/build-prog.mk                               |    2 -
 rules/hi-rule.mk                                  |   46 +-
 rules/hs-suffix-rules-srcdir.mk                   |    2 +
 rules/hs-suffix-rules.mk                          |    6 +
 sync-all                                          |   10 +-
 validate                                          |    9 +-
 107 files changed, 3219 insertions(+), 3018 deletions(-)

diff --cc compiler/prelude/PrelNames.lhs
index e25d2d2,1d3a7f9..7e5fe4a
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@@ -1224,8 -1221,10 +1229,9 @@@ datatypeClassKey    = mkPreludeClassUni
  constructorClassKey = mkPreludeClassUnique 40
  selectorClassKey    = mkPreludeClassUnique 41
  
+ -- SingI: see Note [SingI and EvLit] in TcEvidence
 -singIClassNameKey, typeNatLeqClassNameKey :: Unique
 +singIClassNameKey :: Unique
  singIClassNameKey       = mkPreludeClassUnique 42
 -typeNatLeqClassNameKey  = mkPreludeClassUnique 43
  
  ghciIoClassKey :: Unique
  ghciIoClassKey = mkPreludeClassUnique 44





More information about the ghc-commits mailing list