X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHeaderInfo.hs;h=26c854b3a7f8f069a0dae2b40d23fb17f82ae098;hb=e761a777f2440ca1b8d8b40848cc5aa30d889ff6;hp=909924628866f41d299fa665b67d0214536a0bfa;hpb=17b297d97d327620ed6bfab942f8992b2446f1bf;p=ghc-hetmet.git diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs index 9099246..26c854b 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,16 +15,10 @@ -- ----------------------------------------------------------------------------- -{-# OPTIONS_GHC -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/WorkingConventions#Warnings --- for details - -module HeaderInfo ( getImportsFromFile, getImports +module HeaderInfo ( getImports , getOptionsFromFile, getOptions - , optionsErrorMsgs ) where + , optionsErrorMsgs, + checkProcessArgsResult ) where #include "HsVersions.h" @@ -27,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 @@ -46,28 +46,9 @@ 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 @@ -76,9 +57,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) @@ -87,10 +69,13 @@ getImports dflags buf filename = do in return (source_imps, ordinary_imps, mod) +parseError :: SrcSpan -> Message -> a parseError span err = throwDyn $ mkPlainErrMsg span err +isSourceIdecl :: ImportDecl name -> Bool isSourceIdecl (ImportDecl _ s _ _ _) = s +getImpMod :: ImportDecl name -> Located ModuleName getImpMod (ImportDecl located_mod _ _ _ _) = located_mod -------------------------------------------------------------- @@ -98,9 +83,10 @@ getImpMod (ImportDecl located_mod _ _ _ _) = located_mod -------------------------------------------------------------- -getOptionsFromFile :: FilePath -- input file +getOptionsFromFile :: DynFlags + -> FilePath -- input file -> IO [Located String] -- options, if any -getOptionsFromFile filename +getOptionsFromFile dflags filename = Control.Exception.bracket (openBinaryFile filename ReadMode) (hClose) @@ -111,7 +97,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 @@ -120,26 +106,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) @@ -154,6 +141,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 @@ -169,17 +165,30 @@ 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)] +----------------------------------------------------------------------------- +-- Complain about non-dynamic flags in OPTIONS pragmas + +checkProcessArgsResult :: [String] -> FilePath -> IO () +checkProcessArgsResult flags filename + = do when (notNull flags) (throwDyn (ProgramError ( + showSDoc (hang (text filename <> char ':') + 4 (text "unknown flags in {-# OPTIONS #-} pragma:" <+> + hsep (map text flags))) + ))) + +----------------------------------------------------------------------------- + checkExtension :: Located FastString -> Located String checkExtension (L l ext) -- Checks if a given extension is valid, and if so returns @@ -190,10 +199,13 @@ checkExtension (L l ext) 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: " <> @@ -201,7 +213,7 @@ unsupportedExtnError loc 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' ]