[commit: ghc] master: Merge branch 'tc-untouchables' (4708d38)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/4708d3838d1d76c4a6d153b3e3a42b97c7d2f9c3 >--------------------------------------------------------------- commit 4708d3838d1d76c4a6d153b3e3a42b97c7d2f9c3 Merge: 74d6511... 815dcff... Author: Simon Peyton Jones <[email protected]> Date: Tue Oct 2 15:20:05 2012 +0100 Merge branch 'tc-untouchables' compiler/basicTypes/BasicTypes.lhs | 26 + compiler/basicTypes/IdInfo.lhs | 2 +- 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 | 22 +- compiler/deSugar/Coverage.lhs | 1 + compiler/deSugar/DsBinds.lhs | 10 +- compiler/deSugar/DsExpr.lhs | 2 + compiler/hsSyn/HsExpr.lhs | 3 + compiler/iface/BinIface.hs | 26 +- 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/main/StaticFlagParser.hs | 1 + compiler/main/StaticFlags.hs | 4 + compiler/prelude/TysPrim.lhs | 19 +- compiler/rename/RnExpr.lhs | 14 +- compiler/stgSyn/CoreToStg.lhs | 2 +- compiler/typecheck/FamInst.lhs | 5 +- compiler/typecheck/Inst.lhs | 169 ++---- compiler/typecheck/TcArrows.lhs | 40 +- compiler/typecheck/TcBinds.lhs | 95 ++-- compiler/typecheck/TcCanonical.lhs | 869 +++++++++++------------- compiler/typecheck/TcClassDcl.lhs | 27 +- compiler/typecheck/TcEnv.lhs | 21 +- compiler/typecheck/TcErrors.lhs | 915 +++++++++++++------------ compiler/typecheck/TcEvidence.lhs | 47 +- compiler/typecheck/TcExpr.lhs | 33 +- compiler/typecheck/TcHsSyn.lhs | 75 +-- compiler/typecheck/TcHsType.lhs | 138 +++-- compiler/typecheck/TcInstDcls.lhs | 74 ++- compiler/typecheck/TcInteract.lhs | 829 +++++++++++------------ compiler/typecheck/TcMType.lhs | 226 +++++-- compiler/typecheck/TcRnDriver.lhs | 15 +- compiler/typecheck/TcRnMonad.lhs | 83 ++- compiler/typecheck/TcRnTypes.lhs | 392 ++++++------ compiler/typecheck/TcRules.lhs | 42 +- compiler/typecheck/TcSMonad.lhs | 1237 +++++++++++++++++----------------- compiler/typecheck/TcSimplify.lhs | 1058 +++++++++++------------------- compiler/typecheck/TcSplice.lhs | 9 +- compiler/typecheck/TcTyClsDecls.lhs | 16 +- compiler/typecheck/TcTyDecls.lhs | 16 +- compiler/typecheck/TcType.lhs | 194 ++++-- compiler/typecheck/TcUnify.lhs | 336 ++++------ compiler/typecheck/TcUnify.lhs-boot | 3 +- compiler/types/Coercion.lhs | 46 +- compiler/types/InstEnv.lhs | 5 + compiler/types/OptCoercion.lhs | 79 ++- compiler/types/TyCon.lhs | 66 +- compiler/types/Type.lhs | 20 +- compiler/utils/UniqFM.lhs | 5 +- 60 files changed, 3733 insertions(+), 3686 deletions(-)