summaryrefslogtreecommitdiff
path: root/compiler/main/HeaderInfo.hs
diff options
context:
space:
mode:
authorVladislav Zavialov <vlad.z.4096@gmail.com>2019-02-16 03:38:21 +0300
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-02-17 20:04:33 -0500
commit1ffee940a011fc75f40514696a747dd1f3d4f342 (patch)
tree967a656c0aa5aeadc584bb457e7e5cb7c9b4e007 /compiler/main/HeaderInfo.hs
parent1f1b9e356a873ec7da84cdac2a7850ecb2b32ea9 (diff)
downloadhaskell-1ffee940a011fc75f40514696a747dd1f3d4f342.tar.gz
Fix warnings and fatal parsing errors
Diffstat (limited to 'compiler/main/HeaderInfo.hs')
-rw-r--r--compiler/main/HeaderInfo.hs7
1 files changed, 2 insertions, 5 deletions
diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs
index 3fd510bb86..450ac95f96 100644
--- a/compiler/main/HeaderInfo.hs
+++ b/compiler/main/HeaderInfo.hs
@@ -66,9 +66,9 @@ getImports :: DynFlags
getImports dflags buf filename source_filename = do
let loc = mkRealSrcLoc (mkFastString filename) 1 1
case unP parseHeader (mkPState dflags buf loc) of
- PFailed _ span err -> do
+ PFailed pst -> do
-- assuming we're not logging warnings here as per below
- parseError dflags span err
+ throwErrors (getErrorMessages pst dflags)
POk pst rdr_module -> do
let _ms@(_warns, errs) = getMessages pst dflags
-- don't log warnings: they'll be reported when we parse the file
@@ -136,9 +136,6 @@ mkPrelImports this_mod loc implicit_prelude import_decls
ideclAs = Nothing,
ideclHiding = Nothing }
-parseError :: DynFlags -> SrcSpan -> MsgDoc -> IO a
-parseError dflags span err = throwOneError $ mkPlainErrMsg dflags span err
-
--------------------------------------------------------------
-- Get options
--------------------------------------------------------------