X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHeaderInfo.hs;h=233ed1c35867faf20a9acb47bb7ed542d7e3339a;hb=d061166982c65f8e61b4faf942bc5737da2b272c;hp=913ac33a3326dda2c8479083bf29b65c23a00c9f;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs
index 913ac33..233ed1c 100644
--- a/compiler/main/HeaderInfo.hs
+++ b/compiler/main/HeaderInfo.hs
@@ -15,31 +15,30 @@ 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		( Module, mkModule )
-import PrelNames        ( gHC_PRIM )
+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 Bag		( unitBag, emptyBag, listToBag )
+import Maybes
+import Bag		( emptyBag, listToBag )
 
 import Distribution.Compiler
 
-import TRACE
-
-import EXCEPTION	( throwDyn )
-import IO
-import List
+import Control.Exception
+import Control.Monad
+import System.Exit
+import System.IO
+import Data.List
 
 #if __GLASGOW_HASKELL__ >= 601
 import System.IO		( openBinaryFile )
@@ -55,30 +54,32 @@ openBinaryFile fp mode = openFileEx fp (BinaryMode mode)
 -- we can end up with a large number of open handles before the garbage
 -- collector gets around to closing them.
 getImportsFromFile :: DynFlags -> FilePath
-   -> IO ([Located Module], [Located Module], Located Module)
+   -> IO ([Located ModuleName], [Located ModuleName], Located ModuleName)
 getImportsFromFile dflags filename = do
   buf <- hGetStringBuffer filename
   getImports dflags buf filename
 
 getImports :: DynFlags -> StringBuffer -> FilePath
-    -> IO ([Located Module], [Located Module], Located Module)
+    -> IO ([Located ModuleName], [Located ModuleName], Located ModuleName)
 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 (mkModule "Main")
+		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 ((/= gHC_PRIM) . unLoc) 
+		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
 
@@ -94,7 +95,8 @@ getImpMod (ImportDecl located_mod _ _ _ _) = located_mod
 getOptionsFromFile :: FilePath            -- input file
                    -> IO [Located String] -- options, if any
 getOptionsFromFile filename
-    = bracket (openBinaryFile filename ReadMode)
+    = Control.Exception.bracket
+	      (openBinaryFile filename ReadMode)
               (hClose)
               (\handle ->
                    do buf <- hGetStringBufferBlock handle blockSize