X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=b11326c2c22eeded11276fb7454485b19a67c5b7;hb=98bf57340b8945ea786dc18f2d1ecbe1baed0a4d;hp=ebafe83544666fb985046fe5803e795dda84535e;hpb=301ba995afdbaf31dfcd9f5c4cc6048e6cd2fda8;p=ghc-hetmet.git diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index ebafe83..b11326c 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.73 2001/06/18 08:56:09 simonpj Exp $ +-- $Id: Main.hs,v 1.87 2001/08/14 13:40:08 sewardj Exp $ -- -- GHC Driver program -- @@ -25,31 +26,33 @@ import Finder ( initFinder ) import CompManager ( cmInit, cmLoadModule ) import HscTypes ( GhciMode(..) ) import Config ( cBooterVersion, cGhcUnregisterised, cProjectVersion ) -import SysTools ( packageConfigPath, initSysTools, cleanTempFiles ) -import Packages ( showPackages, mungePackagePaths ) -import ParsePkgConf ( loadPackageConfig ) +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 + 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 DriverFlags ( dynFlag, buildStaticHscOpts, dynamic_flags, + processArgs, static_flags) import DriverMkDepend ( beginMkDependHS, endMkDependHS ) import DriverPhases ( Phase(Hsc, HCc), haskellish_src_file, objish_file ) -import DriverUtil ( add, handle, handleDyn, later, splitFilename, unknownFlagErr, my_prefix_match ) -import CmdLineOpts ( dynFlag, defaultDynFlags, restoreDynFlags, saveDynFlags, setDynFlags, - DynFlags(..), HscLang(..), - v_Static_hsc_opts +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 ErrUtils ( dumpIfSet ) import Util import Panic ( GhcException(..), panic ) @@ -57,20 +60,25 @@ import Panic ( GhcException(..), panic ) import IO import Directory ( doesFileExist ) import IOExts ( readIORef, writeIORef ) -import Exception ( throwDyn, Exception(DynException) ) +import Exception ( throwDyn, Exception(..) ) import System ( getArgs, exitWith, ExitCode(..) ) +import Monad +import List +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 -import Monad -import List -import Maybe - ----------------------------------------------------------------------------- -- Changes: @@ -104,8 +112,12 @@ 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 + 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 @@ -140,21 +152,13 @@ main = top_dir <- initSysTools minusB_args -- Read the package configuration - conf_file <- packageConfigPath - proto_pkg_details <- loadPackageConfig conf_file - let pkg_details = mungePackagePaths top_dir proto_pkg_details - writeIORef v_Package_details pkg_details + 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 [] @@ -175,7 +179,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 @@ -212,7 +218,7 @@ main = }) -- 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 saveDynFlags @@ -220,9 +226,15 @@ main = -- complain about any unknown flags mapM unknownFlagErr [ f | f@('-':_) <- srcs ] - -- Display details of the configuration in verbose mode 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 @@ -232,11 +244,12 @@ 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)) - showPackages pkg_details - -- initialise the finder pkg_avails <- getPackageInfo initFinder pkg_avails @@ -275,18 +288,20 @@ main = let (basename, suffix) = splitFilename src -- just preprocess (Haskell source only) + let src_and_suff = (src, getFileSuffix src) pp <- if not (haskellish_src_file src) || mode == StopBefore Hsc - then return src else do + 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 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 + 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 @@ -304,10 +319,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 () @@ -321,9 +336,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