X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHeaderInfo.hs;h=233ed1c35867faf20a9acb47bb7ed542d7e3339a;hb=9bbcd77cf9b66940058dbea1827db594e8ff6d7f;hp=090af1f1de3087c3c23a343aaa0eaab472900c14;hpb=326d5e5a5f9a52ea38917041d7b5f00cc8e21191;p=ghc-hetmet.git diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs index 090af1f..233ed1c 100644 --- a/compiler/main/HeaderInfo.hs +++ b/compiler/main/HeaderInfo.hs @@ -15,8 +15,7 @@ module HeaderInfo ( getImportsFromFile, getImports #include "HsVersions.h" import Parser ( parseHeader ) -import Lexer ( P(..), ParseResult(..), mkPState, pragState - , lexer, Token(..), PState(..) ) +import Lexer import FastString import HsSyn ( ImportDecl(..), HsModule(..) ) import Module ( ModuleName, moduleName ) @@ -24,8 +23,7 @@ import PrelNames ( gHC_PRIM, mAIN_NAME ) import StringBuffer ( StringBuffer(..), hGetStringBuffer, hGetStringBufferBlock , appendStringBuffers ) import SrcLoc -import FastString ( mkFastString ) -import DynFlags ( DynFlags ) +import DynFlags import ErrUtils import Util import Outputable @@ -37,6 +35,8 @@ import Bag ( emptyBag, listToBag ) import Distribution.Compiler import Control.Exception +import Control.Monad +import System.Exit import System.IO import Data.List @@ -65,7 +65,10 @@ getImports dflags buf filename = do let loc = mkSrcLoc (mkFastString filename) 1 0 case unP parseHeader (mkPState buf loc dflags) of PFailed span err -> parseError span err - POk _ rdr_module -> + POk pst rdr_module -> do + let ms = getMessages pst + printErrorsAndWarnings dflags ms + when (errorsFound dflags ms) $ exitWith (ExitFailure 1) case rdr_module of L _ (HsModule mb_mod _ imps _ _ _ _ _) -> let