Add BufSpan to EpaLocation (#22319, #22558)
The key part of this patch is the change to mkTokenLocation: - mkTokenLocation (RealSrcSpan r _) = TokenLoc (EpaSpan r) + mkTokenLocation (RealSrcSpan r mb) = TokenLoc (EpaSpan r mb) mkTokenLocation used to discard the BufSpan, but now it is saved and can be retrieved from LHsToken or LHsUniToken. This is made possible by the following change to EpaLocation: - data EpaLocation = EpaSpan !RealSrcSpan + data EpaLocation = EpaSpan !RealSrcSpan !(Strict.Maybe BufSpan) | ... The end goal is to make use of the BufSpan in Parser/PostProcess/Haddock.
Showing
- compiler/GHC/Hs/Dump.hs 1 addition, 1 deletioncompiler/GHC/Hs/Dump.hs
- compiler/GHC/Parser.y 25 additions, 25 deletionscompiler/GHC/Parser.y
- compiler/GHC/Parser/Annotation.hs 14 additions, 10 deletionscompiler/GHC/Parser/Annotation.hs
- compiler/GHC/Parser/Lexer.x 1 addition, 1 deletioncompiler/GHC/Parser/Lexer.x
- compiler/GHC/Parser/PostProcess.hs 9 additions, 9 deletionscompiler/GHC/Parser/PostProcess.hs
- compiler/GHC/Rename/Names.hs 4 additions, 4 deletionscompiler/GHC/Rename/Names.hs
- compiler/GHC/Types/SrcLoc.hs 1 addition, 0 deletionscompiler/GHC/Types/SrcLoc.hs
- utils/check-exact/ExactPrint.hs 2 additions, 2 deletionsutils/check-exact/ExactPrint.hs
- utils/check-exact/Parsers.hs 1 addition, 1 deletionutils/check-exact/Parsers.hs
- utils/check-exact/Transform.hs 6 additions, 6 deletionsutils/check-exact/Transform.hs
- utils/check-exact/Utils.hs 3 additions, 3 deletionsutils/check-exact/Utils.hs
Loading
Please register or sign in to comment