[commit: ghc] tc-untouchables: Signatures and comments (09a0670)
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/09a0670167447be3a548481cc9a07e699c8d5c22 >--------------------------------------------------------------- commit 09a0670167447be3a548481cc9a07e699c8d5c22 Author: Simon Peyton Jones <[email protected]> Date: Tue Sep 18 17:33:05 2012 +0100 Signatures and comments >--------------------------------------------------------------- compiler/typecheck/TcInteract.lhs | 2 +- compiler/typecheck/TcSimplify.lhs | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/compiler/typecheck/TcInteract.lhs b/compiler/typecheck/TcInteract.lhs index 3c67918..8c7582e 100644 --- a/compiler/typecheck/TcInteract.lhs +++ b/compiler/typecheck/TcInteract.lhs @@ -383,7 +383,7 @@ Note [Kick out insolubles] ~~~~~~~~~~~~~~~~~~~~~~~~~~ Suppose we have an insoluble alpha ~ [alpha], which is insoluble because an occurs check. And then we unify alpha := [Int]. -Then we really want to rewrite the insouluble to [Int] ~ [[Int]. +Then we really want to rewrite the insouluble to [Int] ~ [[Int]]. Now it can be decomposed. Otherwise we end up with a "Can't match [Int] ~ [[Int]]" which is true, but a bit confusing because the outer type constructors match. diff --git a/compiler/typecheck/TcSimplify.lhs b/compiler/typecheck/TcSimplify.lhs index 7173be4..77ba906 100644 --- a/compiler/typecheck/TcSimplify.lhs +++ b/compiler/typecheck/TcSimplify.lhs @@ -72,6 +72,7 @@ simplifyTop wanteds where -- See Note [Top-level Defaulting Plan] + simpl_top :: WantedConstraints -> TcS WantedConstraints simpl_top wanteds = do { wc_first_go <- nestTcS (solve_wanteds_and_drop wanteds) ; applyTyVarDefaulting wc_first_go