[commit: ghc] type-holes-branch: Merge branch 'tc-untouchables' of ../HEAD into type-holes-branch (07c1041)
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 : type-holes-branch http://hackage.haskell.org/trac/ghc/changeset/07c1041bfe07f913ea6b43ca0bc384f1b0e03951 >--------------------------------------------------------------- commit 07c1041bfe07f913ea6b43ca0bc384f1b0e03951 Merge: 59e6bd9... 7560dd6... Author: Simon Peyton Jones <[email protected]> Date: Thu Sep 6 21:46:36 2012 +0100 Merge branch 'tc-untouchables' of ../HEAD into type-holes-branch Plus lots more refactoring Conflicts: compiler/typecheck/TcSMonad.lhs compiler/typecheck/TcSimplify.lhs compiler/basicTypes/Name.lhs | 7 +- compiler/deSugar/DsBinds.lhs | 5 +- compiler/rename/RnExpr.lhs | 5 + compiler/typecheck/Inst.lhs | 24 ++-- compiler/typecheck/TcArrows.lhs | 40 ++++-- compiler/typecheck/TcBinds.lhs | 90 ++++++------ compiler/typecheck/TcClassDcl.lhs | 27 ++-- compiler/typecheck/TcEnv.lhs | 21 ++- compiler/typecheck/TcErrors.lhs | 287 +++++++++++++++++-------------------- compiler/typecheck/TcExpr.lhs | 4 +- compiler/typecheck/TcHsType.lhs | 2 +- compiler/typecheck/TcInstDcls.lhs | 49 ++++--- compiler/typecheck/TcInteract.lhs | 28 +++- compiler/typecheck/TcMType.lhs | 4 +- compiler/typecheck/TcRnMonad.lhs | 30 ++-- compiler/typecheck/TcRnTypes.lhs | 61 ++++---- compiler/typecheck/TcRules.lhs | 28 ++-- compiler/typecheck/TcSMonad.lhs | 44 +++---- compiler/typecheck/TcSimplify.lhs | 106 ++++++++------ compiler/typecheck/TcSplice.lhs | 2 +- compiler/typecheck/TcType.lhs | 32 +---- compiler/typecheck/TcUnify.lhs | 2 - 22 files changed, 458 insertions(+), 440 deletions(-) Diff suppressed because of size. To see it, use: git show 07c1041bfe07f913ea6b43ca0bc384f1b0e03951