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

Commits:

• 6f2945bf
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  EPA: Replace AnnListItem with simply [TrailingAnn]
  
  Remove the unnecessary wrapper around a single field.
  

• cc76aa8e
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  EPA: Keep binds and sigs together in HsValBindsLR
  
  
  This allows us to get rid of AnnSortKey BindTag
  

• 790f5445
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  Keep decls together in ClassDecl
  Keep binds and sigs together in HsValBindsLR
  
  TBD
  

• 8618457a
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  Fix ppr for ClassDecl to include DocDs
  

• e83e4a1e
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  Some tidy ups of the decls stuff. Squash it in 
  

• 8408a4d9
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  EPA: ClsInstDecl as list in GhcPs
  

• ee24ac5d
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  EPA: Remove LocatedP from OverlapMode
  

• 69ae4f61
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  EPA: Remove LocatedP from CType
  

• daae45a0
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  EPA: Remove LocatedP, last use in WarningTxt
  

• 539148ac
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  EPA: Remove LocatedE from WarningCategory
  

• 653e945f
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  EPA: Remove LocateE from XCImport and XCExport
  

• 2347a37a
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  EPA: Remove LocatedE from HsRecFields dot
  

• 97899ea3
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  EPA: Remove LocatedE completely, last usage for pats 
  

• cad662f0
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

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

• 8dcc8633
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  EPA remove AnnList (EpToken "rec") usages
  

• ad174164
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

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

• 49315234
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

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

• 6c4b2853
  by Alan Zimmerman at 2026-07-07T19:23:48+01:00

  EPA: Remove LocatedBC / SrcSpanBF
  

89 changed files:

• compiler/GHC/Builtin/Utils.hs
• compiler/GHC/Core/Class.hs
• compiler/GHC/CoreToIface.hs
• compiler/GHC/Data/BooleanFormula.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/Gen/Head.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
• + hadrian/cfg/system.config.host
• + hadrian/cfg/system.config.target
• 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
• testsuite/tests/typecheck/should_compile/T15242.stderr
• testsuite/tests/typecheck/should_compile/all.T
• utils/check-exact/ExactPrint.hs
• utils/check-exact/Main.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.