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 /compiler/GHC/Cmm | |
| parent | 5a31abe3544c21d0b45d264ea68f89bbb108251d (diff) | |
| download | haskell-56eb57a6b348d44370fc84f6a35caabd1c548b5e.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 'compiler/GHC/Cmm')
| -rw-r--r-- | compiler/GHC/Cmm/Parser.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/GHC/Cmm/Parser.y b/compiler/GHC/Cmm/Parser.y index a26fb4edba..712a7a5e8a 100644 --- a/compiler/GHC/Cmm/Parser.y +++ b/compiler/GHC/Cmm/Parser.y @@ -1509,7 +1509,7 @@ parseCmmFile dflags this_mod home_unit filename = do -- in there we don't want. case unPD cmmParse dflags home_unit init_state of PFailed pst -> do - let (warnings,errors) = getMessages pst + let (warnings,errors) = getPsMessages pst return (warnings, errors, Nothing) POk pst code -> do st <- initC @@ -1520,7 +1520,7 @@ parseCmmFile dflags this_mod home_unit filename = do ((), cmm2) <- getCmm $ mapM_ emitInfoTableProv used_info return (cmm ++ cmm2, used_info) (cmm, _) = runC dflags no_module st fcode - (warnings,errors) = getMessages pst + (warnings,errors) = getPsMessages pst if not (isEmptyMessages errors) then return (warnings, errors, Nothing) else return (warnings, errors, Just cmm) |