X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FHeaderInfo.hs;h=5d6e41ca8d848b8377d5b618660c58e526c1d9d7;hp=221e51b9974a0bb7ce8cbc92a0f5f062ecd68a63;hb=206b4dec78250efef3cd927d64dc6cbc54a16c3d;hpb=12ee8b3dcf37a2f6974167886e17ae2e03c9cd72

diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs
index 221e51b..5d6e41c 100644
--- a/compiler/main/HeaderInfo.hs
+++ b/compiler/main/HeaderInfo.hs
@@ -1,3 +1,10 @@
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 -----------------------------------------------------------------------------
 --
 -- Parsing the top of a Haskell source file to get its module name,
@@ -8,7 +15,7 @@
 --
 -----------------------------------------------------------------------------
 
-module HeaderInfo ( getImportsFromFile, getImports
+module HeaderInfo ( getImports
                   , getOptionsFromFile, getOptions
                   , optionsErrorMsgs ) where
 
@@ -33,38 +40,25 @@ 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
 
-#if __GLASGOW_HASKELL__ >= 601
+#if !defined(__GLASGOW_HASKELL__) || __GLASGOW_HASKELL__ >= 601
 import System.IO		( openBinaryFile )
 #else
 import IOExts                   ( openFileEx, IOModeEx(..) )
 #endif
 
-#if __GLASGOW_HASKELL__ < 601
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 601
 openBinaryFile fp mode = openFileEx fp (BinaryMode mode)
 #endif
 
--- getImportsFromFile is careful to close the file afterwards, otherwise
--- 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 ModuleName], [Located ModuleName], Located ModuleName)
-getImportsFromFile dflags filename = do
-  buf <- hGetStringBuffer filename
-  getImports dflags buf filename
-
-getImports :: DynFlags -> StringBuffer -> FilePath
+getImports :: DynFlags -> StringBuffer -> FilePath -> FilePath
     -> IO ([Located ModuleName], [Located ModuleName], Located ModuleName)
-getImports dflags buf filename = do
+getImports dflags buf filename source_filename = do
   let loc  = mkSrcLoc (mkFastString filename) 1 0
   case unP parseHeader (mkPState buf loc dflags) of
 	PFailed span err -> parseError span err
@@ -73,9 +67,10 @@ getImports dflags buf filename = do
           printErrorsAndWarnings dflags ms
           when (errorsFound dflags ms) $ exitWith (ExitFailure 1)
 	  case rdr_module of
-	    L _ (HsModule mb_mod _ imps _ _ _ _ _) ->
+	    L _ (HsModule mb_mod _ imps _ _ _ _) ->
 	      let
-		mod = mb_mod `orElse` L (srcLocSpan loc) mAIN_NAME
+                main_loc = mkSrcLoc (mkFastString source_filename) 1 0
+		mod = mb_mod `orElse` L (srcLocSpan main_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) 
@@ -151,6 +146,15 @@ getOptions' buf filename
               , ITclose_prag       <- getToken close
               = map (L (getLoc open)) ["-#include",removeSpaces str] `combine`
                 parseToks xs
+          parseToks (open:close:xs)
+              | ITdocOptions str <- getToken open
+              , ITclose_prag     <- getToken close
+              = map (L (getLoc open)) ["-haddock-opts", removeSpaces str]
+                `combine` parseToks xs
+          parseToks (open:xs)
+              | ITdocOptionsOld str <- getToken open
+              = map (L (getLoc open)) ["-haddock-opts", removeSpaces str]
+                `combine` parseToks xs
           parseToks (open:xs)
               | ITlanguage_prag <- getToken open
               = parseLanguage xs
@@ -177,31 +181,15 @@ 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 extensionsToFlags thisCompiler [okExt] of
-               ([],[opt]) -> L l opt
-               _ -> unsupportedExtnError l okExt
+-- Checks if a given extension is valid, and if so returns
+-- its corresponding flag. Otherwise it throws an exception.
+ =  let ext' = unpackFS ext in
+    if ext' `elem` supportedLanguages
+       || ext' `elem` (map ("No"++) supportedLanguages)
+    then L l ("-X"++ext')
+    else unsupportedExtnError l ext'
 
 languagePragParseError loc =
   pgmError (showSDoc (mkLocMessage loc (
@@ -210,7 +198,7 @@ languagePragParseError loc =
 unsupportedExtnError loc unsup =
   pgmError (showSDoc (mkLocMessage loc (
                 text "unsupported extension: " <>
-                (text.show) unsup)))
+                text unsup)))
 
 
 optionsErrorMsgs :: [String] -> [Located String] -> FilePath -> Messages