X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FHeaderInfo.hs;h=e124e3755b387ab4b9f6d5cbdf624ecc5eea76ab;hp=090af1f1de3087c3c23a343aaa0eaab472900c14;hb=6e2021202c3eec0c95a9d0b7c355559f2630d380;hpb=cc318c842a9d6bbc90a7ef3f24450b4cbac0e2c8 diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs index 090af1f..e124e37 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 ) @@ -25,7 +24,7 @@ import StringBuffer ( StringBuffer(..), hGetStringBuffer, hGetStringBufferBlock , appendStringBuffers ) import SrcLoc import FastString ( mkFastString ) -import DynFlags ( DynFlags ) +import DynFlags import ErrUtils import Util import Outputable @@ -37,6 +36,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 +66,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