X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=51e5e47a97a6c58cd7a6bc4975d423934680fb4e;hb=348b357a272d5faefb9708380beea9187f18a6b3;hp=21b506dddb64ba014b31e7627c33a70455e7b7d5;hpb=140a581052ce3644d75c47e5c20b237cdff3ee6e;p=ghc-hetmet.git diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index 21b506d..51e5e47 100644 --- a/ghc/compiler/main/Main.hs +++ b/ghc/compiler/main/Main.hs @@ -1,6 +1,6 @@ {-# OPTIONS -fno-warn-incomplete-patterns #-} ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.40 2000/12/18 15:18:11 simonmar Exp $ +-- $Id: Main.hs,v 1.49 2001/01/21 16:37:06 sewardj Exp $ -- -- GHC Driver program -- @@ -17,7 +17,6 @@ module Main (main) where #ifdef GHCI -import Interpreter import InteractiveUI #endif @@ -33,8 +32,8 @@ import DriverFlags import DriverMkDepend import DriverUtil import Panic -import DriverPhases ( Phase(..) ) -import CmdLineOpts ( HscLang(..), DynFlags(..), v_Static_hsc_opts ) +import DriverPhases ( Phase(..), haskellish_file ) +import CmdLineOpts import TmpFiles import Finder ( initFinder ) import CmStaticInfo @@ -42,7 +41,6 @@ import Config import Util - import Concurrent import Directory import IOExts @@ -74,9 +72,7 @@ import Maybe -- Win32 support: proper signal handling -- make sure OPTIONS in .hs file propogate to .hc file if -C or -keep-hc-file-too -- reading the package configuration file is too slow --- -H, -K, -Rghc-timing --- hi-diffs --- -ddump-all doesn't do anything +-- -K ----------------------------------------------------------------------------- -- Differences vs. old driver: @@ -91,7 +87,9 @@ import Maybe main = -- top-level exception handler: any unrecognised exception is a compiler bug. - handle (\exception -> hPutStr stderr (show (Panic (show exception)))) $ do + handle (\exception -> do hPutStr stderr (show (Panic (show exception))) + exitWith (ExitFailure 1) + ) $ do -- all error messages are propagated as exceptions handleDyn (\dyn -> case dyn of @@ -99,7 +97,7 @@ main = Interrupted -> exitWith (ExitFailure 1) _ -> do hPutStrLn stderr (show (dyn :: GhcException)) exitWith (ExitFailure 1) - ) $ do + ) $ do -- make sure we clean up after ourselves later (do forget_it <- readIORef v_Keep_tmp_files @@ -168,9 +166,13 @@ main = -- process all the other arguments, and get the source files non_static <- processArgs static_flags flags2 [] - -- find the build tag, and re-process the build-specific options - more_opts <- findBuildTag - way_non_static <- processArgs static_flags more_opts [] + -- Find the build tag, and re-process the build-specific options. + -- Also add in flags for unregisterised compilation, if + -- GhcUnregisterised=YES. + way_opts <- findBuildTag + let unreg_opts | cGhcUnregisterised == "YES" = unregFlags + | otherwise = [] + way_non_static <- processArgs static_flags (unreg_opts ++ way_opts) [] -- give the static flags to hsc static_opts <- buildStaticHscOpts @@ -202,18 +204,17 @@ main = | otherwise -> defaultHscLang writeIORef v_DynFlags - DynFlags{ coreToDo = core_todo, - stgToDo = stg_todo, - hscLang = lang, - -- leave out hscOutName for now - hscOutName = panic "Main.main:hscOutName not set", - - verbosity = case mode of - DoInteractive -> 1 - DoMake -> 1 - _other -> 0, - - flags = [] } + defaultDynFlags{ coreToDo = core_todo, + stgToDo = stg_todo, + hscLang = lang, + -- leave out hscOutName for now + hscOutName = panic "Main.main:hscOutName not set", + + verbosity = case mode of + DoInteractive -> 1 + DoMake -> 1 + _other -> 0, + } -- the rest of the arguments are "dynamic" srcs <- processArgs dynamic_flags (way_non_static ++ @@ -225,12 +226,6 @@ main = -- complain about any unknown flags mapM unknownFlagErr [ f | f@('-':_) <- srcs ] - -- save the flag state, because this could be modified by OPTIONS - -- pragmas during the compilation, and we'll need to restore it - -- before starting the next compilation. - saved_driver_state <- readIORef v_Driver_state - writeIORef v_InitDriverState saved_driver_state - verb <- dynFlag verbosity when (verb >= 2) @@ -242,6 +237,9 @@ main = when (verb >= 2) (hPutStrLn stderr ("Using package config file: " ++ conf_file)) + when (verb >= 3) + (hPutStrLn stderr ("Hsc static flags: " ++ unwords static_opts)) + -- initialise the finder pkg_avails <- getPackageInfo initFinder pkg_avails @@ -253,30 +251,43 @@ main = if (mode == DoMake) then beginMake srcs else do if (mode == DoInteractive) then beginInteractive srcs else do - -- for each source file, find which phases to run - let lang = hscLang init_dyn_flags - pipelines <- mapM (genPipeline mode stop_flag True lang) srcs - let src_pipelines = zip srcs pipelines - -- sanity checking o_file <- readIORef v_Output_file ohi <- readIORef v_Output_hi - if length srcs > 1 && (isJust ohi || (isJust o_file && mode /= DoLink)) + if length srcs > 1 && (isJust ohi || (isJust o_file && mode /= DoLink && mode /= DoMkDLL)) then throwDyn (UsageError "can't apply -o or -ohi options to multiple source files") else do if null srcs then throwDyn (UsageError "no input files") else do - let compileFile (src, phases) = do - writeIORef v_Driver_state saved_driver_state + let compileFile src = do writeIORef v_DynFlags init_dyn_flags - r <- runPipeline phases src (mode==DoLink) True + + -- We compile in two stages, because the file may have an + -- OPTIONS pragma that affects the compilation pipeline (eg. -fvia-C) + + let (basename, suffix) = splitFilename src + + -- just preprocess + pp <- if not (haskellish_file src) || mode == StopBefore Hsc + then return src else do + phases <- genPipeline (StopBefore Hsc) stop_flag + False{-not persistent-} defaultHscLang src + pipeLoop phases src False{-no linking-} False{-no -o flag-} + basename suffix + + -- rest of compilation + dyn_flags <- readIORef v_DynFlags + phases <- genPipeline mode stop_flag True (hscLang dyn_flags) pp + r <- pipeLoop phases pp (mode==DoLink || mode==DoMkDLL) True{-use -o flag-} + basename suffix return r - o_files <- mapM compileFile src_pipelines + o_files <- mapM compileFile srcs when (mode == DoMkDependHS) endMkDependHS when (mode == DoLink) (doLink o_files) + when (mode == DoMkDLL) (doMkDLL o_files) -- grab the last -B option on the command line, and -- set topDir to its value. @@ -300,7 +311,7 @@ beginMake mods beginInteractive :: [String] -> IO () #ifndef GHCI -beginInteractive = throwDyn (OtherError "not build for interactive use") +beginInteractive = throwDyn (OtherError "not built for interactive use") #else beginInteractive mods = do state <- cmInit Interactive