X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=bfeed9825540284ece19eaa604ba96a0235ecffc;hb=d0bf18ef6ff50e8764231537f1052a81ac65b229;hp=984245fb6435a5b364cd3a454682c3373207c469;hpb=17629712b35948e3751a39747dcc9ee0cbfb72aa;p=ghc-hetmet.git diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index 984245f..bfeed98 100644 --- a/ghc/compiler/main/Main.hs +++ b/ghc/compiler/main/Main.hs @@ -1,10 +1,11 @@ -{-# OPTIONS -fno-warn-incomplete-patterns #-} +{-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-} + ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.81 2001/07/11 19:48:07 sof Exp $ +-- $Id: Main.hs,v 1.99 2002/03/12 16:45:59 simonmar Exp $ -- -- GHC Driver program -- --- (c) Simon Marlow 2000 +-- (c) The University of Glasgow 2002 -- ----------------------------------------------------------------------------- @@ -22,35 +23,33 @@ import InteractiveUI(ghciWelcomeMsg, interactiveUI) import Finder ( initFinder ) -import CompManager ( cmInit, cmLoadModule ) +import CompManager ( cmInit, cmLoadModules, cmDepAnal ) 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 DriverPipeline ( doLink, doMkDLL, genPipeline, pipeLoop ) import DriverState ( buildCoreToDo, buildStgToDo, defaultHscLang, findBuildTag, getPackageInfo, unregFlags, + v_GhcMode, v_GhcModeFlag, GhcMode(..), v_Cmdline_libraries, v_Keep_tmp_files, v_Ld_inputs, v_OptLevel, v_Output_file, v_Output_hi, - v_Package_details, v_Ways, getPackageExtraGhcOpts + v_Package_details, v_Ways, getPackageExtraGhcOpts, + readPackageConf ) -import DriverFlags ( dynFlag, buildStaticHscOpts, dynamic_flags, - processArgs, static_flags) +import DriverFlags ( buildStaticHscOpts, + dynamic_flags, processArgs, static_flags) import DriverMkDepend ( beginMkDependHS, endMkDependHS ) -import DriverPhases ( Phase(Hsc, HCc), haskellish_src_file, objish_file ) +import DriverPhases ( Phase(HsPp, Hsc), haskellish_src_file, objish_file ) import DriverUtil ( add, handle, handleDyn, later, splitFilename, unknownFlagErr, getFileSuffix ) -import CmdLineOpts ( dynFlag, defaultDynFlags, restoreDynFlags, - saveDynFlags, setDynFlags, +import CmdLineOpts ( dynFlag, restoreDynFlags, + saveDynFlags, setDynFlags, getDynFlags, dynFlag, DynFlags(..), HscLang(..), v_Static_hsc_opts ) - import Outputable import Util import Panic ( GhcException(..), panic ) @@ -59,7 +58,8 @@ import Panic ( GhcException(..), panic ) import IO import Directory ( doesFileExist ) import IOExts ( readIORef, writeIORef ) -import Exception ( throwDyn, Exception(..) ) +import Exception ( throwDyn, Exception(..), + AsyncException(StackOverflow) ) import System ( getArgs, exitWith, ExitCode(..) ) import Monad import List @@ -78,13 +78,6 @@ import Posix ( Handler(Catch), installHandler, sigINT, sigQUIT ) import Dynamic ( toDyn ) #endif - ------------------------------------------------------------------------------ --- Changes: - --- * -fglasgow-exts NO LONGER IMPLIES -package lang!!! (-fglasgow-exts is a --- dynamic flag whereas -package is a static flag.) - ----------------------------------------------------------------------------- -- ToDo: @@ -103,7 +96,6 @@ import Dynamic ( toDyn ) -- No more "Enter your Haskell program, end with ^D (on a line of its own):" -- consistency checking removed (may do this properly later) --- removed -noC -- no -Ofile ----------------------------------------------------------------------------- @@ -112,19 +104,25 @@ import Dynamic ( toDyn ) main = -- top-level exception handler: any unrecognised exception is a compiler bug. 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))) + AsyncException StackOverflow -> + hPutStrLn stderr "stack overflow: use +RTS -K \ + \to increase it" + _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 _ code -> exitWith code + Interrupted -> exitWith (ExitFailure 1) + _ -> do hPutStrLn stderr (show (dyn :: GhcException)) + exitWith (ExitFailure 1) ) $ do -- make sure we clean up after ourselves @@ -151,17 +149,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 - - -- find the phase to stop after (i.e. -E, -C, -c, -S flags) - (flags2, mode, stop_flag) <- getGhcMode argv' - writeIORef v_GhcMode mode + conf_file <- getPackageConfigPath + readPackageConf conf_file -- process all the other arguments, and get the source files - non_static <- processArgs static_flags flags2 [] + non_static <- processArgs static_flags argv' [] + mode <- readIORef v_GhcMode + stop_flag <- readIORef v_GhcModeFlag -- -O and --interactive are not a good combination -- ditto with any kind of way selection @@ -197,26 +191,18 @@ main = -- set the "global" HscLang. The HscLang can be further adjusted on a module -- by module basis, using only the -fvia-C and -fasm flags. If the global -- HscLang is not HscC or HscAsm, -fvia-C and -fasm have no effect. - opt_level <- readIORef v_OptLevel - - + dyn_flags <- getDynFlags let lang = case mode of - StopBefore HCc -> HscC DoInteractive -> HscInterpreted - _other | opt_level >= 1 -> HscC -- -O implies -fvia-C - | otherwise -> defaultHscLang + _other -> defaultHscLang - 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, - }) + setDynFlags (dyn_flags{ coreToDo = core_todo, + stgToDo = stg_todo, + hscLang = lang, + -- leave out hscOutName for now + hscOutName = panic "Main.main:hscOutName not set", + verbosity = 1 + }) -- the rest of the arguments are "dynamic" srcs <- processArgs dynamic_flags (extra_non_static ++ non_static) [] @@ -245,11 +231,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 @@ -260,7 +247,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 @@ -270,7 +257,7 @@ 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 @@ -289,11 +276,12 @@ main = -- just preprocess (Haskell source only) let src_and_suff = (src, getFileSuffix src) - pp <- if not (haskellish_src_file src) || mode == StopBefore Hsc + 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_and_suff + False{-not persistent-} defaultHscLang + src_and_suff pipeLoop phases src_and_suff False{-no linking-} False{-no -o flag-} basename suffix @@ -319,8 +307,10 @@ beginMake fileish_args case mods of [] -> throwDyn (UsageError "no input files") - mod -> do state <- cmInit Batch - (_, ok, _) <- cmLoadModule state mods + _ -> do dflags <- getDynFlags + state <- cmInit Batch + graph <- cmDepAnal state dflags mods + (_, ok, _) <- cmLoadModules state dflags graph when (not ok) (exitWith (ExitFailure 1)) return ()