[commit: ghc] master: Fix inconsistent pretty-printing of type families (c61759d)
git at git.haskell.org
git at git.haskell.org
Wed Nov 18 16:31:09 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/c61759d5917996a10b06a286eb5b776e4069e35c/ghc
>---------------------------------------------------------------
commit c61759d5917996a10b06a286eb5b776e4069e35c
Author: Michał Sośnicki <sosnicki.michal at gmail.com>
Date: Wed Nov 18 16:02:53 2015 +0100
Fix inconsistent pretty-printing of type families
After the changes, the three functions used to print type families
were identical, so they are refactored into one.
Original RHSs of data instance declarations are recreated and
printed in user error messages.
RHSs containing representation TyCons are printed in the
Coercion Axioms section in a typechecker dump.
Add vbar to the list of SDocs exported by Outputable.
Replace all text "|" docs with it.
Fixes #10839
Reviewers: goldfire, jstolarek, austin, bgamari
Reviewed By: jstolarek
Subscribers: jstolarek, thomie
Differential Revision: https://phabricator.haskell.org/D1441
GHC Trac Issues: #10839
>---------------------------------------------------------------
c61759d5917996a10b06a286eb5b776e4069e35c
compiler/basicTypes/DataCon.hs-boot | 2 +
compiler/coreSyn/CoreLint.hs | 12 ++--
compiler/deSugar/DsUtils.hs | 2 +-
compiler/hsSyn/HsDecls.hs | 2 +-
compiler/hsSyn/HsExpr.hs | 10 +--
compiler/iface/IfaceSyn.hs | 4 +-
compiler/iface/LoadIface.hs | 7 +-
compiler/nativeGen/Reg.hs | 5 +-
compiler/nativeGen/SPARC/Ppr.hs | 2 +-
compiler/typecheck/FamInst.hs | 12 ++--
compiler/typecheck/TcInstDcls.hs | 3 +-
compiler/typecheck/TcValidity.hs | 16 ++---
compiler/types/Class.hs | 2 +-
compiler/types/Coercion.hs | 42 +++++++-----
compiler/types/TypeRep.hs | 18 ++++-
compiler/utils/BooleanFormula.hs | 2 +-
compiler/utils/Outputable.hs | 13 +++-
compiler/utils/Pretty.hs | 8 ++-
testsuite/tests/ghci/scripts/T6018ghcifail.stderr | 56 ++++++++--------
.../indexed-types/should_compile/T3017.stderr | 3 +-
.../indexed-types/should_compile/T9085.stderr | 2 +-
.../tests/indexed-types/should_fail/NoGood.stderr | 4 +-
.../tests/indexed-types/should_fail/Over.stderr | 8 +--
.../indexed-types/should_fail/SimpleFail11a.stderr | 8 +--
.../indexed-types/should_fail/SimpleFail11b.stderr | 8 +--
.../indexed-types/should_fail/SimpleFail11c.stderr | 8 +--
.../indexed-types/should_fail/SimpleFail11d.stderr | 4 +-
.../indexed-types/should_fail/SimpleFail2b.stderr | 4 +-
.../tests/indexed-types/should_fail/T2334A.stderr | 4 +-
.../tests/indexed-types/should_fail/T2677.stderr | 4 +-
.../tests/indexed-types/should_fail/T3330b.stderr | 4 +-
.../tests/indexed-types/should_fail/T4246.stderr | 8 +--
.../tests/indexed-types/should_fail/T9371.stderr | 4 +-
.../should_compile/DataFamilyInstanceLHS.stderr | 3 +-
.../should_compile/TypeFamilyInstanceLHS.stderr | 6 +-
testsuite/tests/polykinds/T7524.stderr | 5 +-
.../tests/roles/should_compile/Roles14.stderr | 2 +-
testsuite/tests/roles/should_compile/Roles3.stderr | 11 ++--
testsuite/tests/roles/should_compile/Roles4.stderr | 5 +-
testsuite/tests/roles/should_compile/T8958.stderr | 3 +-
testsuite/tests/th/T6018th.stderr | 4 +-
.../tests/typecheck/should_compile/T6018.stderr | 4 +-
.../tests/typecheck/should_compile/tc231.stderr | 3 +-
.../tests/typecheck/should_compile/tc265.stderr | 2 +-
.../tests/typecheck/should_fail/T10836.stderr | 8 +--
.../tests/typecheck/should_fail/T6018fail.stderr | 77 +++++++++++-----------
.../typecheck/should_fail/T6018failclosed.stderr | 33 +++++-----
47 files changed, 261 insertions(+), 196 deletions(-)
Diff suppressed because of size. To see it, use:
git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc c61759d5917996a10b06a286eb5b776e4069e35c
More information about the ghc-commits
mailing list