X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHeaderInfo.hs;h=233ed1c35867faf20a9acb47bb7ed542d7e3339a;hb=c1681a73fa4ca4cf8758264ae387ac09a9e900d8;hp=dc1b35ca3f12f341bbd5cb1e44ffcad91097a99d;hpb=1bd2c2dc49d10becff8225f090f807f16a8ab67b;p=ghc-hetmet.git

diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs
index dc1b35c..233ed1c 100644
--- a/compiler/main/HeaderInfo.hs
+++ b/compiler/main/HeaderInfo.hs
@@ -15,27 +15,28 @@ 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 )
 import PrelNames        ( gHC_PRIM, mAIN_NAME )
 import StringBuffer	( StringBuffer(..), hGetStringBuffer, hGetStringBufferBlock
                         , appendStringBuffers )
-import SrcLoc		( Located(..), mkSrcLoc, unLoc, noSrcSpan )
-import FastString	( mkFastString )
-import DynFlags	( DynFlags )
+import SrcLoc
+import DynFlags
 import ErrUtils
 import Util
 import Outputable
 import Pretty           ()
 import Panic
+import Maybes
 import Bag		( emptyBag, listToBag )
 
 import Distribution.Compiler
 
 import Control.Exception
+import Control.Monad
+import System.Exit
 import System.IO
 import Data.List
 
@@ -64,19 +65,21 @@ 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 mod _ imps _ _ _ _ _) ->
+	    L _ (HsModule mb_mod _ imps _ _ _ _ _) ->
 	      let
-		mod_name | Just located_mod <- mod = located_mod
-			 | otherwise               = L noSrcSpan mAIN_NAME
+		mod = mb_mod `orElse` L (srcLocSpan loc) mAIN_NAME
 	        (src_idecls, ord_idecls) = partition isSourceIdecl (map unLoc imps)
 		source_imps   = map getImpMod src_idecls	
 		ordinary_imps = filter ((/= moduleName gHC_PRIM) . unLoc) 
 					(map getImpMod ord_idecls)
 		     -- GHC.Prim doesn't exist physically, so don't go looking for it.
 	      in
-	      return (source_imps, ordinary_imps, mod_name)
+	      return (source_imps, ordinary_imps, mod)
   
 parseError span err = throwDyn $ mkPlainErrMsg span err