X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHeaderInfo.hs;h=9b92308eaf925d9b128223a7837e672ab487a525;hb=59e7d08db602d243d3768ce6907e7bfe67a55e1a;hp=a68069536d1a74f8001d935088ba6b5ce32e00f1;hpb=982c1f494de8a691294a95aee108e765c3f592a0;p=ghc-hetmet.git diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs index a680695..9b92308 100644 --- a/compiler/main/HeaderInfo.hs +++ b/compiler/main/HeaderInfo.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -w #-} +{-# 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 @@ -27,9 +27,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,13 +45,14 @@ import System.Exit import System.IO import Data.List -#if __GLASGOW_HASKELL__ >= 601 -import System.IO ( openBinaryFile ) +#if !defined(__GLASGOW_HASKELL__) || __GLASGOW_HASKELL__ >= 601 + -- already imported above +--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 @@ -67,7 +67,7 @@ getImports dflags buf filename source_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 main_loc = mkSrcLoc (mkFastString source_filename) 1 0 mod = mb_mod `orElse` L (srcLocSpan main_loc) mAIN_NAME @@ -79,10 +79,13 @@ getImports dflags buf filename source_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 -------------------------------------------------------------- @@ -90,9 +93,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) @@ -103,7 +107,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 @@ -112,26 +116,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) @@ -146,6 +151,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 @@ -161,14 +175,14 @@ 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)] @@ -182,10 +196,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: " <> @@ -193,7 +210,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' ]