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

diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs
index 221e51b..51e491e 100644
--- a/compiler/main/HeaderInfo.hs
+++ b/compiler/main/HeaderInfo.hs
@@ -33,10 +33,6 @@ 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
@@ -177,31 +173,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 +190,7 @@ languagePragParseError loc =
 unsupportedExtnError loc unsup =
   pgmError (showSDoc (mkLocMessage loc (
                 text "unsupported extension: " <>
-                (text.show) unsup)))
+                text unsup)))
 
 
 optionsErrorMsgs :: [String] -> [Located String] -> FilePath -> Messages