[commit: ghc] tc-untouchables: A bunch more simplification and refactoring to the constraint solver (fe6ddf0)
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 : tc-untouchables http://hackage.haskell.org/trac/ghc/changeset/fe6ddf00920627037b599f22d05bc8143f88f4f3 >--------------------------------------------------------------- commit fe6ddf00920627037b599f22d05bc8143f88f4f3 Author: Simon Peyton Jones <[email protected]> Date: Sat Sep 1 11:25:47 2012 +0100 A bunch more simplification and refactoring to the constraint solver * Instead of Untouchables being a [Unique], it is simply an Int indicating the depth of nesting. This works fine now that floatEqualities is promoting the floated unification variables to the outer level * Remove the inert_tv_eqs (InScopeSet) from InertCans. It wasn't being used. See Note [Shadowing in a constraint] in TcRnTypes * Rename inert_frozen to inert_insols * Some simple refactoring in TcErrors.reportFlatsAndInsols TcInteract.kickOutRewritable TsSimplify.floatEqualities compiler/typecheck/TcCanonical.lhs | 4 +- compiler/typecheck/TcErrors.lhs | 20 +++---- compiler/typecheck/TcInteract.lhs | 107 +++++++++++++++++------------------- compiler/typecheck/TcRnTypes.lhs | 27 +++++++-- compiler/typecheck/TcSMonad.lhs | 71 ++++++++++-------------- compiler/typecheck/TcSimplify.lhs | 77 ++++++++++++------------- compiler/typecheck/TcType.lhs | 32 ++++++++++- 7 files changed, 178 insertions(+), 160 deletions(-) Diff suppressed because of size. To see it, use: git show fe6ddf00920627037b599f22d05bc8143f88f4f3