Remove wc_insol from WantedConstraints
This patch is a pure refactoring, which I've wanted to do for some time. The main payload is * Remove the wc_insol field from WantedConstraints; instead put all the insolubles in wc_simple * Remove inert_insols from InertCans Instead put all the insolubles in inert_irreds * Add a cc_insol flag to CIrredCan, to record that the constraint is definitely insoluble Reasons * Quite a bit of code gets slightly simpler * Fewer concepts to keep separate * Insolubles don't happen at all in production code that is just being recompiled, so previously there was a lot of moving-about of empty sets A couple of error messages acutally improved.
Showing
- compiler/typecheck/TcCanonical.hs 21 additions, 25 deletionscompiler/typecheck/TcCanonical.hs
- compiler/typecheck/TcErrors.hs 6 additions, 7 deletionscompiler/typecheck/TcErrors.hs
- compiler/typecheck/TcInteract.hs 13 additions, 12 deletionscompiler/typecheck/TcInteract.hs
- compiler/typecheck/TcMType.hs 15 additions, 3 deletionscompiler/typecheck/TcMType.hs
- compiler/typecheck/TcRnMonad.hs 11 additions, 0 deletionscompiler/typecheck/TcRnMonad.hs
- compiler/typecheck/TcRnTypes.hs 105 additions, 81 deletionscompiler/typecheck/TcRnTypes.hs
- compiler/typecheck/TcRules.hs 13 additions, 10 deletionscompiler/typecheck/TcRules.hs
- compiler/typecheck/TcSMonad.hs 39 additions, 45 deletionscompiler/typecheck/TcSMonad.hs
- compiler/typecheck/TcSimplify.hs 23 additions, 21 deletionscompiler/typecheck/TcSimplify.hs
- compiler/typecheck/TcType.hs 1 addition, 16 deletionscompiler/typecheck/TcType.hs
- testsuite/tests/deriving/should_fail/T3621.stderr 11 additions, 5 deletionstestsuite/tests/deriving/should_fail/T3621.stderr
- testsuite/tests/indexed-types/should_fail/T8518.hs 1 addition, 1 deletiontestsuite/tests/indexed-types/should_fail/T8518.hs
- testsuite/tests/typecheck/should_compile/tc211.stderr 10 additions, 10 deletionstestsuite/tests/typecheck/should_compile/tc211.stderr
- testsuite/tests/typecheck/should_fail/T12589.stderr 2 additions, 2 deletionstestsuite/tests/typecheck/should_fail/T12589.stderr
- testsuite/tests/typecheck/should_fail/T13311.stderr 2 additions, 2 deletionstestsuite/tests/typecheck/should_fail/T13311.stderr
- testsuite/tests/typecheck/should_fail/T7851.stderr 2 additions, 2 deletionstestsuite/tests/typecheck/should_fail/T7851.stderr
- testsuite/tests/typecheck/should_fail/T8603.stderr 3 additions, 4 deletionstestsuite/tests/typecheck/should_fail/T8603.stderr
- testsuite/tests/typecheck/should_fail/tcfail122.stderr 1 addition, 1 deletiontestsuite/tests/typecheck/should_fail/tcfail122.stderr
- testsuite/tests/warnings/should_fail/CaretDiagnostics1.stderr 2 additions, 2 deletions...suite/tests/warnings/should_fail/CaretDiagnostics1.stderr
Loading
Please register or sign in to comment