[Git][ghc/ghc][wip/az/locateda-epa-improve-2023-07-15] 27 commits: Remove unused files in .gitlab

Alan Zimmerman (@alanz) gitlab at gitlab.haskell.org
Thu Jul 20 17:36:42 UTC 2023



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


Commits:
ff884b77 by Matthew Pickering at 2023-07-19T11:42:02+01:00
Remove unused files in .gitlab

These were left over after 6078b429

- - - - -
29ef590c by Matthew Pickering at 2023-07-19T11:42:52+01:00
gen_ci: Add hie.yaml file

This allows you to load `gen_ci.hs` into HLS, and now it is a huge
module, that is quite useful.

- - - - -
808b55cf by Matthew Pickering at 2023-07-19T12:24:41+01:00
ci: Make "fast-ci" the default validate configuration

We are trying out a lighter weight validation pipeline where by default
we just test on 5 platforms:

* x86_64-deb10-slow-validate
* windows
* x86_64-fedora33-release
* aarch64-darwin
* aarch64-linux-deb10

In order to enable the "full" validation pipeline you can apply the
`full-ci` label which will enable all the validation pipelines.

All the validation jobs are still run on a marge batch.

The goal is to reduce the overall CI capacity so that pipelines start
faster for MRs and marge bot batches are faster.

Fixes #23694

- - - - -
0b23db03 by Alan Zimmerman at 2023-07-20T05:28:47-04:00
EPA: Simplify GHC/Parser.y sL1

This is the next patch in a series simplifying location management in
GHC/Parser.y

This one simplifies sL1, to use the HasLoc instances introduced in
!10743 (closed)

- - - - -
81a1213b by Alan Zimmerman at 2023-07-20T18:34:07+01:00
Summary: epa-improve-comb4-5
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   2023-06-27 23:08:05 +0100

EPA: Simplify GHC/Parser.y comb4/comb5

Use the HasLoc instance from Ast.hs to allow comb4/comb5 to work with
anything with a SrcSpan

Also get rid of some more now unnecessary reLoc calls.

- - - - -
23699f8f by Alan Zimmerman at 2023-07-20T18:34:07+01:00
EPA: Provide correct annotation span for ImportDecl

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

- - - - -
57d382de by Alan Zimmerman at 2023-07-20T18:34:08+01:00
Summary: EPA make getLocA a synonym for getHasLoc
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   2023-07-16 09:25:10 +0100

EPA make getLocA a synonym for getHasLoc

- - - - -
4760cf2b by Alan Zimmerman at 2023-07-20T18:34:08+01:00
EPA: Fix span for GRHS

- - - - -
b00b8591 by Alan Zimmerman at 2023-07-20T18:34:08+01:00
EPA: Capture full range for a CaseAlt Match

- - - - -
66fa8a92 by Alan Zimmerman at 2023-07-20T18:34:08+01:00
EPA Use full range for Anchor, and do not widen for [TrailingAnn]
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   2023-07-19 20:35:37 +0100

Summary: Patch:  summary-epa-use-full-range-for
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   2023-07-19 20:35:37 +0100

EPA Use full range for Anchor, and do not widen for [TrailingAnn]
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   2023-07-19 20:34:57 +0100

EPA Use full range for Anchor, and do not widen for [TrailingAnn]

info: patch template saved to `-`

- - - - -
f3f2dec1 by Alan Zimmerman at 2023-07-20T18:34:08+01:00
EPA: Move TrailingAnns from last match to FunBind

- - - - -
c5b5235e by Alan Zimmerman at 2023-07-20T18:34:08+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.

- - - - -
a8e47fb4 by Alan Zimmerman at 2023-07-20T18:34:08+01:00
[EPA] Simplify noAnnSrcSpanDP0

- - - - -
0a8b6409 by Alan Zimmerman at 2023-07-20T18:34:09+01:00
Clean up addTrailingCommaN

Remove unused parameter

- - - - -
5167de07 by Alan Zimmerman at 2023-07-20T18:34:09+01:00
Summary: Patch:  use-anchor-end-as-prior-end
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   2023-06-25 12:41:37 +0100

EPA: Use the current Anchor end as prior end

Use the original anchor location end as the source of truth for
calculating print deltas.

This allows original spacing to apply in most cases, only changed AST
items need initial delta positions.

- - - - -
35a1faa3 by Alan Zimmerman at 2023-07-20T18:34:09+01:00
[EPA] Introduce HasTrailing in ExactPrint

Just plumbed through, not being used yet

- - - - -
dd21eee6 by Alan Zimmerman at 2023-07-20T18:34:09+01:00
EPA use [TrailingAnn] in enterAnn

And remove it from ExactPrint (LocatedN RdrName)

- - - - -
7c4907c8 by Alan Zimmerman at 2023-07-20T18:34:09+01:00
EPA: In HsDo, put TrailingAnns at top of LastStmt

- - - - -
9f74f7e1 by Alan Zimmerman at 2023-07-20T18:34:09+01:00
EPA: Move TrailingAnns to the top of FieldOcc

- - - - -
700f01b6 by Alan Zimmerman at 2023-07-20T18:34:09+01:00
EPA: Fix simple tests

- - - - -
c7571a84 by Alan Zimmerman at 2023-07-20T18:34:09+01:00
EPA: do not convert comments to deltas when balancing.

It seems its not needed with the new approach

- - - - -
6f72bf74 by Alan Zimmerman at 2023-07-20T18:34:09+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.

- - - - -
43e452e4 by Alan Zimmerman at 2023-07-20T18:34:09+01:00
EPA: deal with fallout from getMonoBind

- - - - -
8bdea9d1 by Alan Zimmerman at 2023-07-20T18:34:09+01:00
EPA fix captureLineSpacing

- - - - -
776fff3d by Alan Zimmerman at 2023-07-20T18:34:10+01:00
EPA print any comments in the span before exiting it

- - - - -
53fff66c by Alan Zimmerman at 2023-07-20T18:34:10+01:00
EPA: getting rid of tweakDelta

WIP at present

- - - - -
7e6f6e4f by Alan Zimmerman at 2023-07-20T18:34:10+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.

- - - - -


27 changed files:

- .gitlab-ci.yml
- − .gitlab/gen-ci.cabal
- .gitlab/generate-ci/gen_ci.hs
- .gitlab/hie.yaml → .gitlab/generate-ci/hie.yaml
- .gitlab/jobs.yaml
- 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


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2698fa3c0210691b2b77af166c6bc5cd9959bbc8...7e6f6e4fd88f19d641af16ea71cd1d164bf0814a

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2698fa3c0210691b2b77af166c6bc5cd9959bbc8...7e6f6e4fd88f19d641af16ea71cd1d164bf0814a
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/20230720/0b682d11/attachment-0001.html>


More information about the ghc-commits mailing list