diff options
| author | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2019-02-16 03:38:21 +0300 |
|---|---|---|
| committer | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2019-02-16 13:32:03 +0300 |
| commit | 60eb2fba1d31ca3bb1dea34c019c42db5340cb44 (patch) | |
| tree | eaf29330ee272a90b7f2ed9a8eb4dbf1284e9a17 /compiler/cmm | |
| parent | 5544f6082d6e15d305b83f27f4daa29576d3666e (diff) | |
| download | haskell-wip/parse-errors.tar.gz | |
Fix warnings and fatal parsing errorswip/parse-errors
Diffstat (limited to 'compiler/cmm')
| -rw-r--r-- | compiler/cmm/CmmMonad.hs | 2 | ||||
| -rw-r--r-- | compiler/cmm/CmmParse.y | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/compiler/cmm/CmmMonad.hs b/compiler/cmm/CmmMonad.hs index 821c0a6504..a04c4ad49b 100644 --- a/compiler/cmm/CmmMonad.hs +++ b/compiler/cmm/CmmMonad.hs @@ -50,7 +50,7 @@ thenPD :: PD a -> (a -> PD b) -> PD b (PD m) `thenPD` k = PD $ \d s -> case m d s of POk s1 a -> unPD (k a) d s1 - PFailed warnFn span err -> PFailed warnFn span err + PFailed s1 -> PFailed s1 failPD :: String -> PD a failPD = liftP . fail diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y index e5803682ad..bb389d17ae 100644 --- a/compiler/cmm/CmmParse.y +++ b/compiler/cmm/CmmParse.y @@ -1424,11 +1424,8 @@ parseCmmFile dflags filename = withTiming (pure dflags) (text "ParseCmm"<+>brack -- reset the lex_state: the Lexer monad leaves some stuff -- in there we don't want. case unPD cmmParse dflags init_state of - PFailed warnFn span err -> do - let msg = mkPlainErrMsg dflags span err - errMsgs = (emptyBag, unitBag msg) - warnMsgs = warnFn dflags - return (unionMessages warnMsgs errMsgs, Nothing) + PFailed pst -> + return (getMessages pst dflags, Nothing) POk pst code -> do st <- initC let fcode = getCmm $ unEC code "global" (initEnv dflags) [] >> return () |