X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FMain.hs;h=8297323ac43f4523e100106a6bd1027807ee016d;hb=a7f88c2f7900257d6791286f653cf141ebcb81c4;hp=f6e000216dddf96d600cc01b53876ebccd464905;hpb=7fc749a43b4b6b85d234fa95d4928648259584f4;p=ghc-hetmet.git diff --git a/compiler/main/Main.hs b/compiler/main/Main.hs index f6e0002..8297323 100644 --- a/compiler/main/Main.hs +++ b/compiler/main/Main.hs @@ -1,4 +1,5 @@ {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-} + ----------------------------------------------------------------------------- -- -- GHC Driver program @@ -7,13 +8,6 @@ -- ----------------------------------------------------------------------------- -{-# 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 - module Main (main) where #include "HsVersions.h" @@ -36,14 +30,15 @@ import InteractiveUI ( interactiveUI, ghciWelcomeMsg ) -- Various other random stuff that we need import Config +import HscTypes import Packages ( dumpPackages ) import DriverPhases ( Phase(..), isSourceFilename, anyHsc, startPhase, isHaskellSrcFilename ) import StaticFlags import DynFlags import BasicTypes ( failed ) -import ErrUtils ( putMsg ) -import FastString ( getFastStringTable, isZEncoded, hasZEncoding ) +import ErrUtils +import FastString import Outputable import Util import Panic @@ -54,6 +49,7 @@ import System.IO import System.Directory ( doesDirectoryExist ) import System.Environment import System.Exit +import System.FilePath import Control.Monad import Data.List import Data.Maybe @@ -70,6 +66,7 @@ import Data.Maybe ----------------------------------------------------------------------------- -- GHC's command-line interface +main :: IO () main = GHC.defaultErrorHandler defaultDynFlags $ do @@ -81,10 +78,10 @@ main = mbMinusB | null minusB_args = Nothing | otherwise = Just (drop 2 (last minusB_args)) - argv2 <- parseStaticFlags argv1 + (argv2, staticFlagWarnings) <- parseStaticFlags argv1 -- 2. Parse the "mode" flags (--make, --interactive etc.) - (cli_mode, argv3) <- parseModeFlags argv2 + (cli_mode, argv3, modeFlagWarnings) <- parseModeFlags argv2 -- If all we want to do is to show the version number then do it -- now, before we start a GHC session etc. @@ -96,8 +93,6 @@ main = exitWith ExitSuccess ShowSupportedLanguages -> do showSupportedLanguages exitWith ExitSuccess - ShowDocDir -> do showDocDir - exitWith ExitSuccess ShowVersion -> do showVersion exitWith ExitSuccess ShowNumVersion -> do putStrLn cProjectVersion @@ -134,7 +129,12 @@ main = -- The rest of the arguments are "dynamic" -- Leftover ones are presumably files - (dflags, fileish_args) <- GHC.parseDynamicFlags dflags1 argv3 + (dflags, fileish_args, dynamicFlagWarnings) <- GHC.parseDynamicFlags dflags1 argv3 + + let flagWarnings = staticFlagWarnings + ++ modeFlagWarnings + ++ dynamicFlagWarnings + handleFlagWarnings dflags flagWarnings -- make sure we clean up after ourselves GHC.defaultCleanupHandler dflags $ do @@ -143,13 +143,14 @@ main = -- we've finished manipulating the DynFlags, update the session GHC.setSessionDynFlags session dflags - dflags <- GHC.getSessionDynFlags session + dflags <- GHC.getSessionDynFlags session + hsc_env <- GHC.sessionHscEnv session let -- To simplify the handling of filepaths, we normalise all filepaths right -- away - e.g., for win32 platforms, backslashes are converted -- into forward slashes. - normal_fileish_paths = map normalisePath fileish_args + normal_fileish_paths = map normalise fileish_args (srcs, objs) = partition_args normal_fileish_paths [] [] -- Note: have v_Ld_inputs maintain the order in which 'objs' occurred on @@ -173,20 +174,20 @@ main = ShowUsage -> showGhcUsage dflags cli_mode PrintLibdir -> putStrLn (topDir dflags) ShowSupportedLanguages -> alreadyHandled - ShowDocDir -> alreadyHandled ShowVersion -> alreadyHandled ShowNumVersion -> alreadyHandled ShowInterface f -> doShowIface dflags f DoMake -> doMake session srcs DoMkDependHS -> doMkDependHS session (map fst srcs) - StopBefore p -> oneShot dflags p srcs + StopBefore p -> oneShot hsc_env p srcs DoInteractive -> interactiveUI session srcs Nothing - DoEval expr -> interactiveUI session srcs (Just expr) + DoEval exprs -> interactiveUI session srcs $ Just $ reverse exprs dumpFinalStats dflags exitWith ExitSuccess #ifndef GHCI +interactiveUI :: a -> b -> c -> IO () interactiveUI _ _ _ = throwDyn (CmdLineError "not built for interactive use") #endif @@ -196,6 +197,8 @@ interactiveUI _ _ _ = -- interpret the -x option, and attach a (Maybe Phase) to each source -- file indicating the phase specified by the -x option in force, if any. +partition_args :: [String] -> [(String, Maybe Phase)] -> [String] + -> ([(String, Maybe Phase)], [String]) partition_args [] srcs objs = (reverse srcs, reverse objs) partition_args ("-x":suff:args) srcs objs | "none" <- suff = partition_args args srcs objs @@ -225,6 +228,7 @@ partition_args (arg:args) srcs objs Everything else is considered to be a linker object, and passed straight through to the linker. -} +looks_like_an_input :: String -> Bool looks_like_an_input m = isSourceFilename m || looksLikeModuleName m || '.' `notElem` m @@ -308,7 +312,6 @@ verifyOutputFiles dflags = do data CmdLineMode = ShowUsage -- ghc -? | PrintLibdir -- ghc --print-libdir - | ShowDocDir -- ghc --print-docdir | ShowInfo -- ghc --info | ShowSupportedLanguages -- ghc --supported-languages | ShowVersion -- ghc -V/--version @@ -319,20 +322,22 @@ data CmdLineMode -- StopBefore StopLn is the default | DoMake -- ghc --make | DoInteractive -- ghc --interactive - | DoEval String -- ghc -e + | DoEval [String] -- ghc -e foo -e bar => DoEval ["bar", "foo"] deriving (Show) -isInteractiveMode, isInterpretiveMode :: CmdLineMode -> Bool -isLinkMode, isCompManagerMode :: CmdLineMode -> Bool - +#ifdef GHCI +isInteractiveMode :: CmdLineMode -> Bool isInteractiveMode DoInteractive = True isInteractiveMode _ = False +#endif -- isInterpretiveMode: byte-code compiler involved +isInterpretiveMode :: CmdLineMode -> Bool isInterpretiveMode DoInteractive = True isInterpretiveMode (DoEval _) = True isInterpretiveMode _ = False +needsInputsMode :: CmdLineMode -> Bool needsInputsMode DoMkDependHS = True needsInputsMode (StopBefore _) = True needsInputsMode DoMake = True @@ -340,10 +345,12 @@ needsInputsMode _ = False -- True if we are going to attempt to link in this mode. -- (we might not actually link, depending on the GhcLink flag) +isLinkMode :: CmdLineMode -> Bool isLinkMode (StopBefore StopLn) = True isLinkMode DoMake = True isLinkMode _ = False +isCompManagerMode :: CmdLineMode -> Bool isCompManagerMode DoMake = True isCompManagerMode DoInteractive = True isCompManagerMode (DoEval _) = True @@ -353,58 +360,81 @@ isCompManagerMode _ = False -- ----------------------------------------------------------------------------- -- Parsing the mode flag -parseModeFlags :: [String] -> IO (CmdLineMode, [String]) +parseModeFlags :: [String] -> IO (CmdLineMode, [String], [String]) parseModeFlags args = do - let ((leftover, errs), (mode, _, flags)) = + let ((leftover, errs, warns), (mode, _, flags)) = runCmdLine (processArgs mode_flags args) (StopBefore StopLn, "", []) when (not (null errs)) $ do throwDyn (UsageError (unlines errs)) - return (mode, flags ++ leftover) + return (mode, flags ++ leftover, warns) -type ModeM a = CmdLineP (CmdLineMode, String, [String]) a +type ModeM = CmdLineP (CmdLineMode, String, [String]) -- mode flags sometimes give rise to new DynFlags (eg. -C, see below) -- so we collect the new ones and return them. -mode_flags :: [(String, OptKind (CmdLineP (CmdLineMode, String, [String])))] +mode_flags :: [Flag ModeM] mode_flags = [ ------- help / version ---------------------------------------------- - ( "?" , PassFlag (setMode ShowUsage)) - , ( "-help" , PassFlag (setMode ShowUsage)) - , ( "-print-libdir" , PassFlag (setMode PrintLibdir)) - , ( "-print-docdir" , PassFlag (setMode ShowDocDir)) - , ( "V" , PassFlag (setMode ShowVersion)) - , ( "-version" , PassFlag (setMode ShowVersion)) - , ( "-numeric-version" , PassFlag (setMode ShowNumVersion)) - , ( "-info" , PassFlag (setMode ShowInfo)) - , ( "-supported-languages", PassFlag (setMode ShowSupportedLanguages)) + Flag "?" (PassFlag (setMode ShowUsage)) + Supported + , Flag "-help" (PassFlag (setMode ShowUsage)) + Supported + , Flag "-print-libdir" (PassFlag (setMode PrintLibdir)) + Supported + , Flag "V" (PassFlag (setMode ShowVersion)) + Supported + , Flag "-version" (PassFlag (setMode ShowVersion)) + Supported + , Flag "-numeric-version" (PassFlag (setMode ShowNumVersion)) + Supported + , Flag "-info" (PassFlag (setMode ShowInfo)) + Supported + , Flag "-supported-languages" (PassFlag (setMode ShowSupportedLanguages)) + Supported ------- interfaces ---------------------------------------------------- - , ( "-show-iface" , HasArg (\f -> setMode (ShowInterface f) - "--show-iface")) + , Flag "-show-iface" (HasArg (\f -> setMode (ShowInterface f) + "--show-iface")) + Supported ------- primary modes ------------------------------------------------ - , ( "M" , PassFlag (setMode DoMkDependHS)) - , ( "E" , PassFlag (setMode (StopBefore anyHsc))) - , ( "C" , PassFlag (\f -> do setMode (StopBefore HCc) f - addFlag "-fvia-C")) - , ( "S" , PassFlag (setMode (StopBefore As))) - , ( "-make" , PassFlag (setMode DoMake)) - , ( "-interactive" , PassFlag (setMode DoInteractive)) - , ( "e" , HasArg (\s -> setMode (DoEval s) "-e")) - - -- -fno-code says to stop after Hsc but don't generate any code. - , ( "fno-code" , PassFlag (\f -> do setMode (StopBefore HCc) f - addFlag "-fno-code" - addFlag "-no-recomp")) + , Flag "M" (PassFlag (setMode DoMkDependHS)) + Supported + , Flag "E" (PassFlag (setMode (StopBefore anyHsc))) + Supported + , Flag "C" (PassFlag (\f -> do setMode (StopBefore HCc) f + addFlag "-fvia-C")) + Supported + , Flag "S" (PassFlag (setMode (StopBefore As))) + Supported + , Flag "-make" (PassFlag (setMode DoMake)) + Supported + , Flag "-interactive" (PassFlag (setMode DoInteractive)) + Supported + , Flag "e" (HasArg (\s -> updateMode (updateDoEval s) "-e")) + Supported + + -- -fno-code says to stop after Hsc but don't generate any code. + , Flag "fno-code" (PassFlag (\f -> do setMode (StopBefore HCc) f + addFlag "-fno-code" + addFlag "-no-recomp")) + Supported ] setMode :: CmdLineMode -> String -> ModeM () -setMode m flag = do +setMode m flag = updateMode (\_ -> m) flag + +updateDoEval :: String -> CmdLineMode -> CmdLineMode +updateDoEval expr (DoEval exprs) = DoEval (expr : exprs) +updateDoEval expr _ = DoEval [expr] + +updateMode :: (CmdLineMode -> CmdLineMode) -> String -> ModeM () +updateMode f flag = do (old_mode, old_flag, flags) <- getCmdLineState - when (notNull old_flag && flag /= old_flag) $ - throwDyn (UsageError - ("cannot use `" ++ old_flag ++ "' with `" ++ flag ++ "'")) - putCmdLineState (m, flag, flags) + if notNull old_flag && flag /= old_flag + then throwDyn (UsageError + ("cannot use `" ++ old_flag ++ "' with `" ++ flag ++ "'")) + else putCmdLineState (f old_mode, flag, flags) addFlag :: String -> ModeM () addFlag s = do @@ -416,17 +446,17 @@ addFlag s = do -- Run --make mode doMake :: Session -> [(String,Maybe Phase)] -> IO () -doMake sess [] = throwDyn (UsageError "no input files") +doMake _ [] = throwDyn (UsageError "no input files") doMake sess srcs = do let (hs_srcs, non_hs_srcs) = partition haskellish srcs haskellish (f,Nothing) = looksLikeModuleName f || isHaskellSrcFilename f || '.' `notElem` f - haskellish (f,Just phase) = + haskellish (_,Just phase) = phase `notElem` [As, Cc, CmmCpp, Cmm, StopLn] - dflags <- GHC.getSessionDynFlags sess - o_files <- mapM (compileFile dflags StopLn) non_hs_srcs + hsc_env <- GHC.sessionHscEnv sess + o_files <- mapM (compileFile hsc_env StopLn) non_hs_srcs mapM_ (consIORef v_Ld_inputs) (reverse o_files) targets <- mapM (uncurry GHC.guessTarget) hs_srcs @@ -448,12 +478,12 @@ doShowIface dflags file = do -- Various banners and verbosity output. showBanner :: CmdLineMode -> DynFlags -> IO () -showBanner cli_mode dflags = do +showBanner _cli_mode dflags = do let verb = verbosity dflags #ifdef GHCI -- Show the GHCi banner - when (isInteractiveMode cli_mode && verb >= 1) $ putStrLn ghciWelcomeMsg + when (isInteractiveMode _cli_mode && verb >= 1) $ putStrLn ghciWelcomeMsg #endif -- Display details of the configuration in verbose mode @@ -477,16 +507,12 @@ showSupportedLanguages :: IO () showSupportedLanguages = do mapM_ putStrLn supportedLanguages exitWith ExitSuccess -showDocDir :: IO () -showDocDir = do - putStrLn cDocDir - exitWith ExitSuccess - showVersion :: IO () showVersion = do putStrLn (cProjectName ++ ", version " ++ cProjectVersion) exitWith ExitSuccess +showGhcUsage :: DynFlags -> CmdLineMode -> IO () showGhcUsage dflags cli_mode = do let usage_path | DoInteractive <- cli_mode = ghciUsagePath dflags @@ -522,7 +548,8 @@ dumpFastStringStats dflags = do putMsg dflags msg where x `pcntOf` y = int ((x * 100) `quot` y) <> char '%' - + +countFS :: Int -> Int -> Int -> Int -> [[FastString]] -> (Int, Int, Int, Int) countFS entries longest is_z has_z [] = (entries, longest, is_z, has_z) countFS entries longest is_z has_z (b:bs) = let