Alan Zimmerman pushed to branch wip/az/exactprint-annotation-rationalisation at Glasgow Haskell Compiler / GHC

Commits:

• cd00cfa6
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPA: Keep binds and sigs together in HsValBindsLR
  
  We combine them into a single list for GhcPs, wrapped in the
  ValBind data type, which is the bind equivalent of ValD, having
  constructors for binds and sigs.
  
  This simplifies exact print processing, especially when using it to
  update the contents of local binds, as we no longer need AnnSortKey
  BindTag
  

• bdcf06e8
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  Keep decls together in ClassDecl
  

• 7edc40af
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPA: ClsInstDecl as list in GhcPs
  

• 5332f9e9
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPA: Remove LocatedP from OverlapMode
  

• 8d2cce09
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPA: Remove LocatedP from CType
  

• 7fc7704e
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPA: Remove LocatedP, last use in WarningTxt
  

• 95f4865f
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPA: Remove LocatedE from WarningCategory
  

• dc64cf1b
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPA: Remove LocateE from XCImport and XCExport
  

• ec93f36a
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPA: Remove LocatedE from HsRecFields dot
  

• 2ab825e0
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPA: Remove LocatedE completely, last usage for pats 
  

• 396c0dc9
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPA: Remove AnnList (EpToken "where") usages
  
  This is moving toward removing the parameter from AnnList completely
  

• 81b0dca9
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPA remove AnnList (EpToken "rec") usages
  

• 42dd18b8
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPA: Remove last parameterised AnnList usage (EpaLocation)
  
  Also remove the parameter
  

• a8d9e812
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  TTG: Add extension points to BooleanFormula
  
  They are currently unused, but will be used for exact print annotations next
  

• cd1074e6
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPA: Remove LocatedBC / SrcSpanBF
  

• 3e34e3f9
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPA: remove unused addTrailingAnnToL. Squash appropriately
  

• 9d7f690d
  by Alan Zimmerman at 2026-07-12T10:19:15+01:00

  EPS: Remove NoEpTok/NoEpUniTok, using an unhelpful SrcSpan instead
  
  Also introduce helper functions noEpTok and noEpUniTok to serve
  as simple replacements in code inserting an token annotation without
  location information.
  

86 changed files:

• compiler/GHC/Builtin/Utils.hs
• compiler/GHC/Core/Class.hs
• compiler/GHC/CoreToIface.hs
• compiler/GHC/Data/BooleanFormula.hs
• compiler/GHC/Hs.hs
• compiler/GHC/Hs/Binds.hs
• compiler/GHC/Hs/Decls.hs
• compiler/GHC/Hs/Decls/Overlap.hs
• compiler/GHC/Hs/Dump.hs
• compiler/GHC/Hs/Expr.hs
• compiler/GHC/Hs/Instances.hs
• compiler/GHC/Hs/Pat.hs
• compiler/GHC/Hs/Stats.hs
• compiler/GHC/Hs/Utils.hs
• compiler/GHC/HsToCore/Docs.hs
• compiler/GHC/HsToCore/Quote.hs
• compiler/GHC/HsToCore/Ticks.hs
• compiler/GHC/Iface/Ext/Ast.hs
• compiler/GHC/Iface/Syntax.hs
• compiler/GHC/Iface/Warnings.hs
• compiler/GHC/IfaceToCore.hs
• compiler/GHC/Parser.y
• compiler/GHC/Parser/Annotation.hs
• compiler/GHC/Parser/PostProcess.hs
• compiler/GHC/Parser/PostProcess/Haddock.hs
• compiler/GHC/Rename/Bind.hs
• compiler/GHC/Rename/Expr.hs
• compiler/GHC/Rename/Module.hs
• compiler/GHC/Rename/Names.hs
• compiler/GHC/Rename/Pat.hs
• compiler/GHC/Rename/Utils.hs
• compiler/GHC/Runtime/Eval.hs
• compiler/GHC/Tc/Deriv.hs
• compiler/GHC/Tc/TyCl.hs
• compiler/GHC/Tc/TyCl/Class.hs
• compiler/GHC/Tc/TyCl/Instance.hs
• compiler/GHC/Tc/Utils/Env.hs
• compiler/GHC/Tc/Utils/Instantiate.hs
• compiler/GHC/ThToHs.hs
• compiler/GHC/Types/ForeignCall.hs
• compiler/GHC/Unit/Module/Warnings.hs
• compiler/Language/Haskell/Syntax/Binds.hs
• compiler/Language/Haskell/Syntax/BooleanFormula.hs
• compiler/Language/Haskell/Syntax/Decls.hs
• compiler/Language/Haskell/Syntax/Extension.hs
• ghc/GHCi/UI.hs
• testsuite/tests/ghc-api/T25121_status.stdout
• testsuite/tests/ghc-api/exactprint/T22919.stderr
• testsuite/tests/ghc-api/exactprint/Test20239.stderr
• testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr
• testsuite/tests/haddock/haddock_examples/haddock.Test.stderr
• testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
• testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
• testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr
• testsuite/tests/module/mod185.stderr
• testsuite/tests/parser/should_compile/DumpParsedAst.stderr
• testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr
• testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
• testsuite/tests/parser/should_compile/DumpSemis.stderr
• testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
• testsuite/tests/parser/should_compile/KindSigs.stderr
• testsuite/tests/parser/should_compile/T14189.stderr
• testsuite/tests/parser/should_compile/T15279.stderr
• testsuite/tests/parser/should_compile/T15323.stderr
• testsuite/tests/parser/should_compile/T20452.stderr
• testsuite/tests/parser/should_compile/T20718.stderr
• testsuite/tests/parser/should_compile/T20718b.stderr
• testsuite/tests/parser/should_compile/T20846.stderr
• testsuite/tests/parser/should_compile/T23315/T23315.stderr
• testsuite/tests/printer/AnnotationNoListTuplePuns.stdout
• testsuite/tests/printer/T18791.stderr
• testsuite/tests/printer/Test20297.stdout
• testsuite/tests/printer/Test24533.stdout
• utils/check-exact/ExactPrint.hs
• utils/check-exact/Main.hs
• utils/check-exact/Parsers.hs
• utils/check-exact/Transform.hs
• utils/check-exact/Utils.hs
• utils/haddock/haddock-api/src/Haddock/Backends/Hoogle.hs
• utils/haddock/haddock-api/src/Haddock/Backends/LaTeX.hs
• utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
• utils/haddock/haddock-api/src/Haddock/Convert.hs
• utils/haddock/haddock-api/src/Haddock/GhcUtils.hs
• utils/haddock/haddock-api/src/Haddock/Interface/Create.hs
• utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs
• utils/haddock/haddock-api/src/Haddock/Types.hs

The diff was not included because it is too large.