diff options
| author | Alfredo Di Napoli <alfredo@well-typed.com> | 2021-06-30 15:17:46 +0200 |
|---|---|---|
| committer | Alfredo Di Napoli <alfredo@well-typed.com> | 2021-07-08 08:13:23 +0200 |
| commit | 56eb57a6b348d44370fc84f6a35caabd1c548b5e (patch) | |
| tree | be873cadaa3f9ec47c41546d2577d61810038313 /utils/check-exact/Parsers.hs | |
| parent | 5a31abe3544c21d0b45d264ea68f89bbb108251d (diff) | |
| download | haskell-wip/adinapoli-issue-19920.tar.gz | |
Rename getErrorMessages and getMessages function in parser codewip/adinapoli-issue-19920
This commit renames the `getErrorMessages` and
`getMessages` function in the parser code to `getPsErrorMessages` and
`getPsMessages`, to avoid import conflicts, as we have already
`getErrorMessages` and `getMessages` defined in `GHC.Types.Error`.
Fixes #19920.
Update haddock submodule
Diffstat (limited to 'utils/check-exact/Parsers.hs')
| -rw-r--r-- | utils/check-exact/Parsers.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/utils/check-exact/Parsers.hs b/utils/check-exact/Parsers.hs index a42bba42cd..cff37bf309 100644 --- a/utils/check-exact/Parsers.hs +++ b/utils/check-exact/Parsers.hs @@ -76,7 +76,7 @@ parseWith :: GHC.DynFlags parseWith dflags fileName parser s = case runParser parser dflags fileName s of GHC.PFailed pst - -> Left (GHC.GhcPsMessage <$> GHC.getErrorMessages pst) + -> Left (GHC.GhcPsMessage <$> GHC.getPsErrorMessages pst) GHC.POk _ pmod -> Right pmod @@ -90,7 +90,7 @@ parseWithECP :: (GHC.DisambECP w) parseWithECP dflags fileName parser s = case runParser (parser >>= \p -> GHC.runPV $ GHC.unECP p) dflags fileName s of GHC.PFailed pst - -> Left (GHC.GhcPsMessage <$> GHC.getErrorMessages pst) + -> Left (GHC.GhcPsMessage <$> GHC.getPsErrorMessages pst) GHC.POk _ pmod -> Right pmod @@ -185,7 +185,7 @@ parseModuleFromStringInternal dflags fileName str = let (str1, lp) = stripLinePragmas str res = case runParser GHC.parseModule dflags fileName str1 of GHC.PFailed pst - -> Left (GHC.GhcPsMessage <$> GHC.getErrorMessages pst) + -> Left (GHC.GhcPsMessage <$> GHC.getPsErrorMessages pst) GHC.POk _ pmod -> Right (lp, dflags, pmod) in postParseTransform res @@ -258,7 +258,7 @@ parseModuleEpAnnsWithCppInternal cppOptions dflags file = do return $ case parseFile dflags' file fileContents of GHC.PFailed pst - -> Left (GHC.GhcPsMessage <$> GHC.getErrorMessages pst) + -> Left (GHC.GhcPsMessage <$> GHC.getPsErrorMessages pst) GHC.POk _ pmod -> Right $ (injectedComments, dflags', fixModuleTrailingComments pmod) |