[Git][ghc/ghc][wip/az/locateda-epa-improve-2023-07-15] 24 commits: Put BufSpan into RealSrcSpan

Sun Jul 16 21:20:12 UTC 2023

Alan Zimmerman pushed to branch wip/az/locateda-epa-improve-2023-07-15 at Glasgow Haskell Compiler / GHC

Commits:
d4954257 by Alan Zimmerman at 2023-07-16T21:36:21+01:00
Put BufSpan into RealSrcSpan

This has been superseded by !9473, which moved BufSpan into EpaSpan in
EpaLocation

Start on making LocatedN more direct

Using EpaLocation instead of Anchor

Via a synonym initially, to prove the concept

Variants of AnnSortKey

For future, just a list of which type comes next.
Example for ValBinds

EPA: Explicitly capture EOF Location in AnnsModule

And also get rid of EpaEofComment.

- - - - -
39c23b2c by Alan Zimmerman at 2023-07-16T21:36:25+01:00
[EPA] Simplify noAnnSrcSpanDP0

- - - - -
5366cfe9 by Alan Zimmerman at 2023-07-16T21:36:25+01:00
EPA: Provide correct annotation span for ImportDecl

Use the whole declaration, rather than just the span of the 'import'
keyword.

- - - - -
d4fc3fa6 by Alan Zimmerman at 2023-07-16T21:36:26+01:00
EPA: Fix span for GRHS

- - - - -
726c2ba4 by Alan Zimmerman at 2023-07-16T21:36:26+01:00
EPA: Widen anchor when adding a trailingAnn

- - - - -
293c9516 by Alan Zimmerman at 2023-07-16T21:36:26+01:00
EPA: widen more TrailingAnn usages

- - - - -
e2d824b6 by Alan Zimmerman at 2023-07-16T21:36:26+01:00
EPA: Capture full range for a CaseAlt Match

- - - - -
c7baaa14 by Alan Zimmerman at 2023-07-16T21:36:26+01:00
Clean up addTrailingCommaN

Remove unused parameter

- - - - -
7e1c3a67 by Alan Zimmerman at 2023-07-16T21:36:26+01:00
WIP

- - - - -
f1442332 by Alan Zimmerman at 2023-07-16T21:37:22+01:00
[EPA] Introduce HasTrailing in ExactPrint

Just plumbed through, not being used yet

- - - - -
0793694f by Alan Zimmerman at 2023-07-16T21:37:22+01:00
EPA use [TrailingAnn] in enterAnn

And remove it from ExactPrint (LocatedN RdrName)

- - - - -
f2e670cb by Alan Zimmerman at 2023-07-16T21:37:22+01:00
EPA Use full range for Anchor, and do not widen for [TrailingAnn]

- - - - -
746229e0 by Alan Zimmerman at 2023-07-16T21:37:22+01:00
EPA: Move TrailingAnns from last match to FunBind

- - - - -
5be0cc4b by Alan Zimmerman at 2023-07-16T21:37:22+01:00
EPA: In HsDo, put TrailingAnns at top of LastStmt

- - - - -
f053c89a by Alan Zimmerman at 2023-07-16T21:37:22+01:00
EPA: More extending anchors to full span in Parser.y

- - - - -
3c80fb1d by Alan Zimmerman at 2023-07-16T21:37:22+01:00
EPA: Move TrailingAnns to the top of FieldOcc

- - - - -
583cb821 by Alan Zimmerman at 2023-07-16T21:37:22+01:00
EPA: Fix simple tests

- - - - -
07fb41b4 by Alan Zimmerman at 2023-07-16T21:37:22+01:00
EPA: do not convert comments to deltas when balancing.

It seems its not needed with the new approach

- - - - -
567e8862 by Alan Zimmerman at 2023-07-16T21:37:22+01:00
EPA: Improve annotation management in getMonoBind

Ensure the LHsDecl for a FunBind has the correct leading comments and
trailing annotations.

See the added note for details.

- - - - -
0ebaf524 by Alan Zimmerman at 2023-07-16T21:37:22+01:00
EPA: deal with fallout from getMonoBind

- - - - -
fa1b3477 by Alan Zimmerman at 2023-07-16T21:37:22+01:00
EPA fix captureLineSpacing

- - - - -
bbcf4d87 by Alan Zimmerman at 2023-07-16T21:37:22+01:00
EPA print any comments in the span before exiting it

- - - - -
c022d236 by Alan Zimmerman at 2023-07-16T21:37:22+01:00
EPA: getting rid of tweakDelta

WIP at present

- - - - -
8539da8e by Alan Zimmerman at 2023-07-16T21:37:22+01:00
EPA: Add '=>' to TrailingAnn

This is used as a trailing annotation in a context.
Add its normal and unicode variants.

Note that we keep the parsed representation the same, but make use of
it when exact printing.

- - - - -

23 changed files:

- compiler/GHC/Data/BooleanFormula.hs
- compiler/GHC/Driver/Main.hs
- compiler/GHC/Hs/Binds.hs
- compiler/GHC/Hs/Decls.hs
- compiler/GHC/Hs/Dump.hs
- compiler/GHC/Hs/Expr.hs
- compiler/GHC/Hs/Extension.hs
- compiler/GHC/Hs/Pat.hs
- compiler/GHC/Hs/Type.hs
- compiler/GHC/Hs/Utils.hs
- compiler/GHC/HsToCore/Arrows.hs
- compiler/GHC/HsToCore/Docs.hs
- compiler/GHC/HsToCore/Expr.hs
- compiler/GHC/HsToCore/Match/Literal.hs
- compiler/GHC/HsToCore/Monad.hs
- compiler/GHC/HsToCore/Quote.hs
- compiler/GHC/HsToCore/Ticks.hs
- compiler/GHC/Iface/Ext/Ast.hs
- compiler/GHC/Iface/Ext/Utils.hs
- compiler/GHC/Iface/Make.hs
- compiler/GHC/Iface/Syntax.hs
- compiler/GHC/IfaceToCore.hs
- compiler/GHC/Parser.y

The diff was not included because it is too large.

View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c66c4134944acf95a3ca27fad5f3a97eca8466b8...8539da8e72c84293e9f2b1e77f74204ebd8347a5

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c66c4134944acf95a3ca27fad5f3a97eca8466b8...8539da8e72c84293e9f2b1e77f74204ebd8347a5
You're receiving this email because of your account on gitlab.haskell.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230716/ba1fc44f/attachment-0001.html>