[commit: ghc] type-nats: Merge remote-tracking branch 'origin/tc-untouchables' into type-nats (2355fdc)
Iavor Diatchki <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-nats http://hackage.haskell.org/trac/ghc/changeset/2355fdca27b17213b2f8d77a75eb83016ce32193 >--------------------------------------------------------------- commit 2355fdca27b17213b2f8d77a75eb83016ce32193 Merge: 723a2bc... 6e3e64a... Author: Iavor S. Diatchki <[email protected]> Date: Sat Sep 29 16:28:37 2012 -0700 Merge remote-tracking branch 'origin/tc-untouchables' into type-nats Conflicts: compiler/coreSyn/TrieMap.lhs compiler/iface/BinIface.hs compiler/iface/IfaceType.lhs compiler/typecheck/TcSimplify.lhs compiler/types/Coercion.lhs compiler/types/Type.lhs compiler/basicTypes/BasicTypes.lhs | 26 + compiler/basicTypes/Name.lhs | 7 +- compiler/basicTypes/VarEnv.lhs | 3 + compiler/coreSyn/CoreLint.lhs | 13 + compiler/coreSyn/ExternalCore.lhs | 3 + compiler/coreSyn/MkExternalCore.lhs | 5 + compiler/coreSyn/PprExternalCore.lhs | 4 + compiler/coreSyn/TrieMap.lhs | 33 +- compiler/deSugar/Coverage.lhs | 1 + compiler/deSugar/DsBinds.lhs | 10 +- compiler/deSugar/DsExpr.lhs | 2 + compiler/hsSyn/HsExpr.lhs | 3 + compiler/iface/BinIface.hs | 27 +- compiler/iface/BuildTyCl.lhs | 2 +- compiler/iface/IfaceSyn.lhs | 15 +- compiler/iface/IfaceType.lhs | 5 +- compiler/iface/MkIface.lhs | 18 +- compiler/iface/TcIface.lhs | 7 +- compiler/main/DynFlags.hs | 4 +- compiler/main/GHC.hs | 2 +- compiler/main/PprTyThing.hs | 14 +- compiler/prelude/TysPrim.lhs | 19 +- compiler/prelude/TysWiredIn.lhs | 11 +- compiler/rename/RnExpr.lhs | 14 +- compiler/stgSyn/CoreToStg.lhs | 2 +- compiler/typecheck/Inst.lhs | 169 ++---- compiler/typecheck/TcArrows.lhs | 40 +- compiler/typecheck/TcBinds.lhs | 95 ++-- compiler/typecheck/TcCanonical.lhs | 856 +++++++++++++-------------- compiler/typecheck/TcClassDcl.lhs | 27 +- compiler/typecheck/TcEnv.lhs | 21 +- compiler/typecheck/TcErrors.lhs | 915 +++++++++++++++-------------- compiler/typecheck/TcEvidence.lhs | 38 +- compiler/typecheck/TcExpr.lhs | 33 +- compiler/typecheck/TcHsSyn.lhs | 30 +- compiler/typecheck/TcHsType.lhs | 138 +++-- compiler/typecheck/TcInstDcls.lhs | 62 ++- compiler/typecheck/TcInteract.lhs | 745 +++++++++++------------- compiler/typecheck/TcMType.lhs | 220 ++++++-- compiler/typecheck/TcRnDriver.lhs | 15 +- compiler/typecheck/TcRnMonad.lhs | 78 ++-- compiler/typecheck/TcRnTypes.lhs | 392 +++++++------ compiler/typecheck/TcRules.lhs | 42 +- compiler/typecheck/TcSMonad.lhs | 1077 ++++++++++++++++------------------ compiler/typecheck/TcSimplify.lhs | 1073 ++++++++++++---------------------- compiler/typecheck/TcSplice.lhs | 9 +- compiler/typecheck/TcTyClsDecls.lhs | 16 +- compiler/typecheck/TcTyDecls.lhs | 16 +- compiler/typecheck/TcType.lhs | 194 +++++-- compiler/typecheck/TcTypeNats.hs | 59 +- compiler/typecheck/TcUnify.lhs | 297 ++++------ compiler/typecheck/TcUnify.lhs-boot | 3 +- compiler/types/Coercion.lhs | 39 +- compiler/types/OptCoercion.lhs | 79 +++- compiler/types/TyCon.lhs | 66 ++- compiler/types/Type.lhs | 24 +- compiler/utils/UniqFM.lhs | 5 +- 57 files changed, 3546 insertions(+), 3577 deletions(-) Diff suppressed because of size. To see it, use: git show 2355fdca27b17213b2f8d77a75eb83016ce32193