[commit: ghc] wip/T12105: Merge MatchFixity and HsMatchContext (306ecad)
git at git.haskell.org
git at git.haskell.org
Mon Jun 6 19:45:56 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/T12105
Link : http://ghc.haskell.org/trac/ghc/changeset/306ecad591951521ac3f5888ca8be85bf749d271/ghc
>---------------------------------------------------------------
commit 306ecad591951521ac3f5888ca8be85bf749d271
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date: Wed May 25 00:09:34 2016 +0200
Merge MatchFixity and HsMatchContext
Summary:
MatchFixity was introduced to facilitate use of API Annotations.
HsMatchContext does the same thing with more detail, but is chased
through all over the place to provide context when processing a Match.
Since we already have MatchFixity in the Match, it may as well provide
the full context.
updates submodule haddock
Test Plan: ./validate
Reviewers: austin, goldfire, bgamari
Subscribers: thomie, mpickering
Differential Revision: https://phabricator.haskell.org/D2271
GHC Trac Issues: #12105
>---------------------------------------------------------------
306ecad591951521ac3f5888ca8be85bf749d271
compiler/deSugar/Check.hs | 5 +-
compiler/deSugar/DsBinds.hs | 8 +-
compiler/deSugar/DsExpr.hs | 14 +-
compiler/deSugar/DsMeta.hs | 2 +-
compiler/hsSyn/Convert.hs | 35 ++--
compiler/hsSyn/HsBinds.hs | 39 ++--
compiler/hsSyn/HsDecls.hs | 67 +++---
compiler/hsSyn/HsExpr.hs | 232 ++++++++++++---------
compiler/hsSyn/HsExpr.hs-boot | 23 +-
compiler/hsSyn/HsLit.hs | 4 +-
compiler/hsSyn/HsPat.hs | 17 +-
compiler/hsSyn/HsPat.hs-boot | 4 +-
compiler/hsSyn/HsSyn.hs | 2 +-
compiler/hsSyn/HsTypes.hs | 43 ++--
compiler/hsSyn/HsUtils.hs | 36 ++--
compiler/hsSyn/PlaceHolder.hs | 27 ++-
compiler/main/HscStats.hs | 3 +
compiler/parser/Parser.y | 4 +-
compiler/parser/RdrHsSyn.hs | 21 +-
compiler/rename/RnBinds.hs | 27 +--
compiler/typecheck/TcAnnotations.hs | 3 +-
compiler/typecheck/TcArrows.hs | 4 +-
compiler/typecheck/TcBinds.hs | 8 +-
compiler/typecheck/TcEnv.hs | 7 +-
compiler/typecheck/TcExpr.hs | 3 +-
compiler/typecheck/TcGenDeriv.hs | 84 +++++---
compiler/typecheck/TcGenGenerics.hs | 4 +-
compiler/typecheck/TcHsSyn.hs | 2 +-
compiler/typecheck/TcInstDcls.hs | 5 +-
compiler/typecheck/TcMatches.hs | 11 +-
compiler/typecheck/TcMatches.hs-boot | 4 +-
compiler/typecheck/TcPat.hs | 3 +-
compiler/typecheck/TcPatSyn.hs | 26 ++-
compiler/typecheck/TcRnDriver.hs | 3 +-
compiler/typecheck/TcTyDecls.hs | 9 +-
testsuite/tests/ghc-api/landmines/landmines.stdout | 4 +-
testsuite/tests/patsyn/should_fail/T11667.stderr | 2 +-
testsuite/tests/th/T8761.stderr | 2 +-
utils/haddock | 2 +-
39 files changed, 460 insertions(+), 339 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 306ecad591951521ac3f5888ca8be85bf749d271
More information about the ghc-commits
mailing list