diff options
author | Ryan Scott <ryan.gl.scott@gmail.com> | 2019-12-26 19:47:04 -0500 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-01-25 05:21:40 -0500 |
commit | c3fde723633d1788e4ded8c6f59eb7cef1ae95fd (patch) | |
tree | 60f6c00540541449b7aada6765048de49af9f371 /utils | |
parent | 86966d48954db4a8bd40046af259ed60aed535eb (diff) | |
download | haskell-c3fde723633d1788e4ded8c6f59eb7cef1ae95fd.tar.gz |
Handle local fixity declarations in DsMeta properly
`DsMeta.rep_sig` used to skip over `FixSig` entirely, which had the
effect of causing local fixity declarations to be dropped when quoted
in Template Haskell. But there is no good reason for this state of
affairs, as the code in `DsMeta.repFixD` (which handles top-level
fixity declarations) handles local fixity declarations just fine.
This patch factors out the necessary parts of `repFixD` so that they
can be used in `rep_sig` as well.
There was one minor complication: the fixity signatures for class
methods in each `HsGroup` were stored both in `FixSig`s _and_ the
list of `LFixitySig`s for top-level fixity signatures, so I needed
to take action to prevent fixity signatures for class methods being
converted to `Dec`s twice. I tweaked `RnSource.add` to avoid putting
these fixity signatures in two places and added
`Note [Top-level fixity signatures in an HsGroup]` in `GHC.Hs.Decls`
to explain the new design.
Fixes #17608. Bumps the Haddock submodule.
Diffstat (limited to 'utils')
m--------- | utils/haddock | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/utils/haddock b/utils/haddock -Subproject c67c24fc90e8217c3d2139e99e92889e1df180f +Subproject e2c0a757f5aae215d89e464a7e45f9777c27c8f |