X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=fb1556c49926efeca7ba20add36bcb79954ffcdc;hb=d6afbe3ebd127ece764bc943c015e74290318b6a;hp=99b96292205f18bac4a6411a1cf7631477aef980;hpb=9fd23f53af8c45b75b8a4b01d0e6fa1ad6f34aa9;p=ghc-hetmet.git diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index 99b9629..fb1556c 100644 --- a/ghc/compiler/main/Main.hs +++ b/ghc/compiler/main/Main.hs @@ -1,6 +1,7 @@ -{-# OPTIONS -fno-warn-incomplete-patterns #-} +{-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-} + ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.63 2001/04/26 13:52:57 simonmar Exp $ +-- $Id: Main.hs,v 1.91 2001/11/03 01:30:42 sof Exp $ -- -- GHC Driver program -- @@ -17,42 +18,67 @@ module Main (main) where #ifdef GHCI -import InteractiveUI +import InteractiveUI(ghciWelcomeMsg, interactiveUI) #endif -#ifndef mingw32_TARGET_OS -import Dynamic -import Posix -#endif -import CompManager -import ParsePkgConf -import DriverPipeline -import DriverState -import DriverFlags -import DriverMkDepend -import DriverUtil -import Panic -import DriverPhases ( Phase(..), haskellish_file, objish_file ) -import CmdLineOpts -import TmpFiles import Finder ( initFinder ) -import CmStaticInfo -import Config +import CompManager ( cmInit, cmLoadModule ) +import HscTypes ( GhciMode(..) ) +import Config ( cBooterVersion, cGhcUnregisterised, cProjectVersion ) +import SysTools ( getPackageConfigPath, initSysTools, cleanTempFiles ) +import Packages ( showPackages ) + +import DriverPipeline ( GhcMode(..), doLink, doMkDLL, genPipeline, + getGhcMode, pipeLoop, v_GhcMode + ) +import DriverState ( buildCoreToDo, buildStgToDo, defaultHscLang, + findBuildTag, getPackageInfo, unregFlags, + v_Cmdline_libraries, v_Keep_tmp_files, v_Ld_inputs, + v_OptLevel, v_Output_file, v_Output_hi, + v_Package_details, v_Ways, getPackageExtraGhcOpts, + readPackageConf + ) +import DriverFlags ( dynFlag, buildStaticHscOpts, dynamic_flags, + processArgs, static_flags) + +import DriverMkDepend ( beginMkDependHS, endMkDependHS ) +import DriverPhases ( Phase(HsPp, Hsc, HCc), haskellish_src_file, objish_file ) + +import DriverUtil ( add, handle, handleDyn, later, splitFilename, + unknownFlagErr, getFileSuffix ) +import CmdLineOpts ( dynFlag, defaultDynFlags, restoreDynFlags, + saveDynFlags, setDynFlags, + DynFlags(..), HscLang(..), v_Static_hsc_opts + ) + import Outputable import Util +import Panic ( GhcException(..), panic ) -import Concurrent -import Directory -import IOExts -import Exception - +-- Standard Haskell libraries import IO +import Directory ( doesFileExist ) +import IOExts ( readIORef, writeIORef ) +import Exception ( throwDyn, Exception(..) ) +import System ( getArgs, exitWith, ExitCode(..) ) import Monad import List -import System import Maybe +#ifndef mingw32_TARGET_OS +import Concurrent ( myThreadId ) +#if __GLASGOW_HASKELL__ < 500 +import Exception ( raiseInThread ) +#define throwTo raiseInThread +#else +import Exception ( throwTo ) +#endif + +import Posix ( Handler(Catch), installHandler, sigINT, sigQUIT ) +import Dynamic ( toDyn ) +#endif + ----------------------------------------------------------------------------- -- Changes: @@ -63,7 +89,6 @@ import Maybe ----------------------------------------------------------------------------- -- ToDo: --- -nohi doesn't work -- new mkdependHS doesn't support all the options that the old one did (-X et al.) -- time commands when run with -v -- split marker @@ -87,16 +112,23 @@ import Maybe main = -- top-level exception handler: any unrecognised exception is a compiler bug. - handle (\exception -> do hPutStr stderr (show (Panic (show exception))) - exitWith (ExitFailure 1) + handle (\exception -> do + hFlush stdout + case exception of + -- an IO exception probably isn't our fault, so don't panic + IOException _ -> hPutStr stderr (show exception) + _other -> hPutStr stderr (show (Panic (show exception))) + exitWith (ExitFailure 1) ) $ do -- all error messages are propagated as exceptions - handleDyn (\dyn -> case dyn of - PhaseFailed _phase code -> exitWith code - Interrupted -> exitWith (ExitFailure 1) - _ -> do hPutStrLn stderr (show (dyn :: GhcException)) - exitWith (ExitFailure 1) + handleDyn (\dyn -> do + hFlush stdout + case dyn of + PhaseFailed _phase code -> exitWith code + Interrupted -> exitWith (ExitFailure 1) + _ -> do hPutStrLn stderr (show (dyn :: GhcException)) + exitWith (ExitFailure 1) ) $ do -- make sure we clean up after ourselves @@ -110,70 +142,26 @@ main = -- signals. -- install signal handlers - main_thread <- myThreadId #ifndef mingw32_TARGET_OS + main_thread <- myThreadId let sig_handler = Catch (throwTo main_thread (DynException (toDyn Interrupted))) installHandler sigQUIT sig_handler Nothing installHandler sigINT sig_handler Nothing #endif - argv <- getArgs - - -- grab any -B options from the command line first - argv' <- setTopDir argv - top_dir <- readIORef v_TopDir - - let installed s = top_dir ++ '/':s - inplace s = top_dir ++ '/':cCURRENT_DIR ++ '/':s - - installed_pkgconfig = installed ("package.conf") - inplace_pkgconfig = inplace (cGHC_DRIVER_DIR ++ "/package.conf.inplace") - - -- discover whether we're running in a build tree or in an installation, - -- by looking for the package configuration file. - am_installed <- doesFileExist installed_pkgconfig - - if am_installed - then writeIORef v_Path_package_config installed_pkgconfig - else do am_inplace <- doesFileExist inplace_pkgconfig - if am_inplace - then writeIORef v_Path_package_config inplace_pkgconfig - else throwDyn (InstallationError - ("Can't find package.conf in " ++ - inplace_pkgconfig)) + argv <- getArgs + let (minusB_args, argv') = partition (prefixMatch "-B") argv + top_dir <- initSysTools minusB_args - -- set the location of our various files - if am_installed - then do writeIORef v_Path_usage (installed "ghc-usage.txt") - writeIORef v_Pgm_L (installed "unlit") - writeIORef v_Pgm_m (installed "ghc-asm") - writeIORef v_Pgm_s (installed "ghc-split") - - else do writeIORef v_Path_usage (inplace (cGHC_DRIVER_DIR ++ "/ghc-usage.txt")) - writeIORef v_Pgm_L (inplace cGHC_UNLIT) - writeIORef v_Pgm_m (inplace cGHC_MANGLER) - writeIORef v_Pgm_s (inplace cGHC_SPLIT) - - -- read the package configuration - conf_file <- readIORef v_Path_package_config - r <- parsePkgConf conf_file - case r of { - Left err -> throwDyn (InstallationError (showSDoc err)); - Right pkg_details -> do - - writeIORef v_Package_details pkg_details + -- Read the package configuration + conf_file <- getPackageConfigPath + readPackageConf conf_file -- find the phase to stop after (i.e. -E, -C, -c, -S flags) (flags2, mode, stop_flag) <- getGhcMode argv' writeIORef v_GhcMode mode - -- Show the GHCi banner? -# ifdef GHCI - when (mode == DoInteractive) $ - hPutStrLn stdout ghciWelcomeMsg -# endif - -- process all the other arguments, and get the source files non_static <- processArgs static_flags flags2 [] @@ -194,7 +182,9 @@ main = way_opts <- findBuildTag let unreg_opts | cGhcUnregisterised == "YES" = unregFlags | otherwise = [] - way_non_static <- processArgs static_flags (unreg_opts ++ way_opts) [] + pkg_extra_opts <- getPackageExtraGhcOpts + extra_non_static <- processArgs static_flags + (unreg_opts ++ way_opts ++ pkg_extra_opts) [] -- give the static flags to hsc static_opts <- buildStaticHscOpts @@ -218,30 +208,33 @@ main = _other | opt_level >= 1 -> HscC -- -O implies -fvia-C | otherwise -> defaultHscLang - writeIORef v_DynFlags - defaultDynFlags{ coreToDo = core_todo, - stgToDo = stg_todo, - hscLang = lang, - -- leave out hscOutName for now - hscOutName = panic "Main.main:hscOutName not set", + setDynFlags (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, - } + verbosity = 1 + }) -- the rest of the arguments are "dynamic" - srcs <- processArgs dynamic_flags (way_non_static ++ non_static) [] + srcs <- processArgs dynamic_flags (extra_non_static ++ non_static) [] + -- save the "initial DynFlags" away - init_dyn_flags <- readIORef v_DynFlags - writeIORef v_InitDynFlags init_dyn_flags + saveDynFlags -- complain about any unknown flags mapM unknownFlagErr [ f | f@('-':_) <- srcs ] verb <- dynFlag verbosity + -- Show the GHCi banner +# ifdef GHCI + when (mode == DoInteractive && verb >= 1) $ + hPutStrLn stdout ghciWelcomeMsg +# endif + + -- Display details of the configuration in verbose mode when (verb >= 2) (do hPutStr stderr "Glasgow Haskell Compiler, Version " hPutStr stderr cProjectVersion @@ -251,6 +244,9 @@ main = when (verb >= 2) (hPutStrLn stderr ("Using package config file: " ++ conf_file)) + pkg_details <- readIORef v_Package_details + showPackages pkg_details + when (verb >= 3) (hPutStrLn stderr ("Hsc static flags: " ++ unwords static_opts)) @@ -264,7 +260,7 @@ main = -- -ohi sanity checking ohi <- readIORef v_Output_hi if (isJust ohi && - (mode == DoMake || mode == DoInteractive || length srcs > 1)) + (mode == DoMake || mode == DoInteractive || srcs `lengthExceeds` 1)) then throwDyn (UsageError "-ohi can only be used when compiling a single source file") else do @@ -274,14 +270,14 @@ main = -- -o sanity checking o_file <- readIORef v_Output_file - if (length srcs > 1 && isJust o_file && mode /= DoLink && mode /= DoMkDLL) + if (srcs `lengthExceeds` 1 && isJust o_file && mode /= DoLink && mode /= DoMkDLL) then throwDyn (UsageError "can't apply -o to multiple source files") else do if null srcs then throwDyn (UsageError "no input files") else do let compileFile src = do - writeIORef v_DynFlags init_dyn_flags + restoreDynFlags exists <- doesFileExist src when (not exists) $ @@ -291,19 +287,22 @@ main = -- 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 + -- just preprocess (Haskell source only) + let src_and_suff = (src, getFileSuffix src) + let not_hs_file = not (haskellish_src_file src) + pp <- if not_hs_file || mode == StopBefore Hsc || mode == StopBefore HsPp + then return src_and_suff else do phases <- genPipeline (StopBefore Hsc) stop_flag - False{-not persistent-} defaultHscLang src - pipeLoop phases src False{-no linking-} False{-no -o flag-} + False{-not persistent-} defaultHscLang + src_and_suff + pipeLoop phases src_and_suff 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 + hsc_lang <- dynFlag hscLang + phases <- genPipeline mode stop_flag True hsc_lang pp + (r,_) <- pipeLoop phases pp (mode==DoLink || mode==DoMkDLL) + True{-use -o flag-} basename suffix return r o_files <- mapM compileFile srcs @@ -311,16 +310,8 @@ main = 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. -setTopDir :: [String] -> IO [String] -setTopDir args = do - let (minusbs, others) = partition (prefixMatch "-B") args - (case minusbs of - [] -> throwDyn (InstallationError ("missing -B option")) - some -> writeIORef v_TopDir (drop 2 (last some))) - return others + + beginMake :: [String] -> IO () beginMake fileish_args @@ -329,10 +320,10 @@ beginMake fileish_args case mods of [] -> throwDyn (UsageError "no input files") - [mod] -> do state <- cmInit Batch - cmLoadModule state mod + mod -> do state <- cmInit Batch + (_, ok, _) <- cmLoadModule state mods + when (not ok) (exitWith (ExitFailure 1)) return () - _ -> throwDyn (UsageError "only one module allowed with --make") beginInteractive :: [String] -> IO () @@ -346,9 +337,5 @@ beginInteractive fileish_args libs = map Left objs ++ map Right minus_ls state <- cmInit Interactive - case mods of - [] -> interactiveUI state Nothing libs - [mod] -> interactiveUI state (Just mod) libs - _ -> throwDyn (UsageError - "only one module allowed with --interactive") + interactiveUI state mods libs #endif