remove gratuitous usage of Double in favor of Rational

[ghc-hetmet.git] / compiler / main / HeaderInfo.hs

diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs
index dc97e20..221e51b 100644 (file)
--- a/compiler/main/HeaderInfo.hs
+++ b/compiler/main/HeaderInfo.hs
@@ -15,27 +15,31 @@ 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 Config
+import SrcLoc
+import DynFlags
 import ErrUtils
 import Util
 import Outputable
 import Pretty           ()
 import Panic
+import Maybes
 import Bag             ( emptyBag, listToBag )
 
 import Distribution.Compiler
+import Distribution.Package
+import Distribution.Version
 
 import Control.Exception
+import Control.Monad
+import System.Exit
 import System.IO
 import Data.List
 
@@ -64,19 +68,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
 
@@ -92,7 +98,7 @@ getImpMod (ImportDecl located_mod _ _ _ _) = located_mod
 getOptionsFromFile :: FilePath            -- input file
                    -> IO [Located String] -- options, if any
 getOptionsFromFile filename
-    = System.IO.bracket
+    = Control.Exception.bracket
              (openBinaryFile filename ReadMode)
               (hClose)
               (\handle ->
@@ -171,13 +177,31 @@ getOptions' buf filename
                            POk state' t -> (buffer state,t):lexAll state'
                            _ -> [(buffer state,L (last_loc state) ITeof)]
 
+thisCompiler :: Compiler
+thisCompiler = Compiler {
+                   compilerFlavor = GHC,
+                   compilerId = PackageIdentifier {
+                                    pkgName = "ghc",
+                                    pkgVersion = v
+                                },
+                   compilerProg = panic "No compiler program yet",
+                   compilerPkgTool = panic "No package program yet",
+                   compilerLanguagesKnown = True,
+                   compilerLanguages = supportedLanguages
+               }
+    where v = case readVersion cProjectVersion of
+                  Just version -> version
+                  Nothing ->
+                      panic ("Can't parse version: " ++ show cProjectVersion)
+
 checkExtension :: Located FastString -> Located String
 checkExtension (L l ext)
-    = case reads (unpackFS ext) of
-        [] -> languagePragParseError l
-        (okExt,""):_ -> case extensionsToGHCFlag [okExt] of
-                          ([],[opt]) -> L l opt
-                          _ -> unsupportedExtnError l okExt
+ = case reads (unpackFS ext) of
+       [] -> languagePragParseError l
+       (okExt,""):_ ->
+           case extensionsToFlags thisCompiler [okExt] of
+               ([],[opt]) -> L l opt
+               _ -> unsupportedExtnError l okExt
 
 languagePragParseError loc =
   pgmError (showSDoc (mkLocMessage loc (