X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHeaderInfo.hs;h=22f645efd562e4ac60708823a579ba15675994d5;hb=fc9bbbab3fe56cf0ff5723abbdb0f496d257f34e;hp=221e51b9974a0bb7ce8cbc92a0f5f062ecd68a63;hpb=12ee8b3dcf37a2f6974167886e17ae2e03c9cd72;p=ghc-hetmet.git diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs index 221e51b..22f645e 100644 --- a/compiler/main/HeaderInfo.hs +++ b/compiler/main/HeaderInfo.hs @@ -1,3 +1,10 @@ +{-# OPTIONS -fno-warn-incomplete-patterns #-} +-- 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,9 +15,10 @@ -- ----------------------------------------------------------------------------- -module HeaderInfo ( getImportsFromFile, getImports +module HeaderInfo ( getImports , getOptionsFromFile, getOptions - , optionsErrorMsgs ) where + , optionsErrorMsgs, + checkProcessArgsResult ) where #include "HsVersions.h" @@ -20,9 +28,8 @@ import FastString import HsSyn ( ImportDecl(..), HsModule(..) ) import Module ( ModuleName, moduleName ) import PrelNames ( gHC_PRIM, mAIN_NAME ) -import StringBuffer ( StringBuffer(..), hGetStringBuffer, hGetStringBufferBlock +import StringBuffer ( StringBuffer(..), hGetStringBufferBlock , appendStringBuffers ) -import Config import SrcLoc import DynFlags import ErrUtils @@ -33,38 +40,15 @@ import Panic import Maybes import Bag ( emptyBag, listToBag ) -import Distribution.Compiler -import Distribution.Package -import Distribution.Version - -import Control.Exception +import Exception import Control.Monad import System.Exit import System.IO import Data.List -#if __GLASGOW_HASKELL__ >= 601 -import System.IO ( openBinaryFile ) -#else -import IOExts ( openFileEx, IOModeEx(..) ) -#endif - -#if __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,32 +57,43 @@ 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 - (src_idecls, ord_idecls) = partition isSourceIdecl (map unLoc imps) - source_imps = map getImpMod src_idecls + main_loc = mkSrcLoc (mkFastString source_filename) 1 0 + mod = mb_mod `orElse` L (srcLocSpan main_loc) mAIN_NAME + imps' = filter isHomeImp (map unLoc imps) + (src_idecls, ord_idecls) = partition isSourceIdecl 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) -parseError span err = throwDyn $ mkPlainErrMsg span err +parseError :: SrcSpan -> Message -> a +parseError span err = throwErrMsg $ mkPlainErrMsg span err + +-- we aren't interested in package imports here, filter them out +isHomeImp :: ImportDecl name -> Bool +isHomeImp (ImportDecl _ (Just p) _ _ _ _) = p == fsLit "this" +isHomeImp (ImportDecl _ Nothing _ _ _ _) = True -isSourceIdecl (ImportDecl _ s _ _ _) = s +isSourceIdecl :: ImportDecl name -> Bool +isSourceIdecl (ImportDecl _ _ s _ _ _) = s -getImpMod (ImportDecl located_mod _ _ _ _) = located_mod +getImpMod :: ImportDecl name -> Located ModuleName +getImpMod (ImportDecl located_mod _ _ _ _ _) = located_mod -------------------------------------------------------------- -- Get options -------------------------------------------------------------- -getOptionsFromFile :: FilePath -- input file +getOptionsFromFile :: DynFlags + -> FilePath -- input file -> IO [Located String] -- options, if any -getOptionsFromFile filename - = Control.Exception.bracket +getOptionsFromFile dflags filename + = Exception.bracket (openBinaryFile filename ReadMode) (hClose) (\handle -> @@ -108,7 +103,7 @@ getOptionsFromFile filename loop handle buf | len buf == 0 = return [] | otherwise - = case getOptions' buf filename of + = case getOptions' dflags buf filename of (Nothing, opts) -> return opts (Just buf', opts) -> do nextBlock <- hGetStringBufferBlock handle blockSize newBuf <- appendStringBuffers buf' nextBlock @@ -117,26 +112,27 @@ getOptionsFromFile filename else do opts' <- loop handle newBuf return (opts++opts') -getOptions :: StringBuffer -> FilePath -> [Located String] -getOptions buf filename - = case getOptions' buf filename of +getOptions :: DynFlags -> StringBuffer -> FilePath -> [Located String] +getOptions dflags buf filename + = case getOptions' dflags buf filename of (_,opts) -> opts -- The token parser is written manually because Happy can't -- return a partial result when it encounters a lexer error. -- We want to extract options before the buffer is passed through -- CPP, so we can't use the same trick as 'getImports'. -getOptions' :: StringBuffer -- Input buffer +getOptions' :: DynFlags + -> StringBuffer -- Input buffer -> FilePath -- Source file. Used for msgs only. -> ( Maybe StringBuffer -- Just => we can use more input , [Located String] -- Options. ) -getOptions' buf filename - = parseToks (lexAll (pragState buf loc)) +getOptions' dflags buf filename + = parseToks (lexAll (pragState dflags buf loc)) where loc = mkSrcLoc (mkFastString filename) 1 0 - getToken (buf,L _loc tok) = tok - getLoc (buf,L loc _tok) = loc + getToken (_buf,L _loc tok) = tok + getLoc (_buf,L loc _tok) = loc getBuf (buf,_tok) = buf combine opts (flag, opts') = (flag, opts++opts') add opt (flag, opts) = (flag, opt:opts) @@ -151,6 +147,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 @@ -166,55 +171,56 @@ getOptions' buf filename parseLanguage ((_buf,L loc (ITconid fs)):rest) = checkExtension (L loc fs) `add` case rest of - (_,L loc ITcomma):more -> parseLanguage more - (_,L loc ITclose_prag):more -> parseToks more + (_,L _loc ITcomma):more -> parseLanguage more + (_,L _loc ITclose_prag):more -> parseToks more (_,L loc _):_ -> languagePragParseError loc parseLanguage (tok:_) = languagePragParseError (getLoc tok) lexToken t = return t lexAll state = case unP (lexer lexToken) state of - POk state' t@(L _ ITeof) -> [(buffer state,t)] + POk _ t@(L _ ITeof) -> [(buffer state,t)] 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) +----------------------------------------------------------------------------- +-- Complain about non-dynamic flags in OPTIONS pragmas + +checkProcessArgsResult :: [Located String] -> IO () +checkProcessArgsResult flags + = when (notNull flags) $ + ghcError $ ProgramError $ showSDoc $ vcat $ map f flags + where f (L loc flag) + = hang (ppr loc <> char ':') 4 + (text "unknown flag in {-# OPTIONS #-} pragma:" <+> + text flag) + +----------------------------------------------------------------------------- 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 :: SrcSpan -> a languagePragParseError loc = - pgmError (showSDoc (mkLocMessage loc ( - text "cannot parse LANGUAGE pragma"))) + pgmError + (showSDoc (mkLocMessage loc ( + text "cannot parse LANGUAGE pragma: comma-separated list expected"))) +unsupportedExtnError :: SrcSpan -> String -> a unsupportedExtnError loc unsup = pgmError (showSDoc (mkLocMessage loc ( text "unsupported extension: " <> - (text.show) unsup))) + text unsup))) optionsErrorMsgs :: [String] -> [Located String] -> FilePath -> Messages -optionsErrorMsgs unhandled_flags flags_lines filename +optionsErrorMsgs unhandled_flags flags_lines _filename = (emptyBag, listToBag (map mkMsg unhandled_flags_lines)) where unhandled_flags_lines = [ L l f | f <- unhandled_flags, L l f' <- flags_lines, f == f' ]