X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=6bbded77b829fa7c47e745436d25c2a8ad0a31a3;hb=ebf2c80221ccf11aeb7a0a2be27bfc72529855a5;hp=5f5024abb421ab094387d20ca3f0e8d3c570e034;hpb=f4a6a4134b8ba3f2fc7a193ed5b91313046b775a;p=ghc-hetmet.git diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index 5f5024a..6bbded7 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.43 2001/01/03 11:13:43 simonmar Exp $ +-- $Id: Main.hs,v 1.62 2001/03/28 11:01:19 simonmar Exp $ -- -- GHC Driver program -- @@ -17,7 +17,6 @@ module Main (main) where #ifdef GHCI -import Interpreter import InteractiveUI #endif @@ -27,22 +26,22 @@ import Posix #endif import CompManager +import ParsePkgConf import DriverPipeline import DriverState import DriverFlags import DriverMkDepend import DriverUtil import Panic -import DriverPhases ( Phase(..) ) -import CmdLineOpts ( HscLang(..), DynFlags(..), v_Static_hsc_opts ) +import DriverPhases ( Phase(..), haskellish_file, objish_file ) +import CmdLineOpts import TmpFiles import Finder ( initFinder ) import CmStaticInfo import Config +import Outputable import Util - - import Concurrent import Directory import IOExts @@ -68,15 +67,12 @@ import Maybe -- new mkdependHS doesn't support all the options that the old one did (-X et al.) -- time commands when run with -v -- split marker --- mkDLL -- java generation -- user ways -- 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: @@ -107,7 +103,7 @@ main = later (do forget_it <- readIORef v_Keep_tmp_files unless forget_it $ do verb <- dynFlag verbosity - cleanTempFiles (verb >= 2) + cleanTempFiles verb ) $ do -- exceptions will be blocked while we clean the temporary files, -- so there shouldn't be any difficulty if we receive further @@ -143,7 +139,9 @@ main = else do am_inplace <- doesFileExist inplace_pkgconfig if am_inplace then writeIORef v_Path_package_config inplace_pkgconfig - else throwDyn (OtherError "can't find package.conf") + else throwDyn (InstallationError + ("Can't find package.conf in " ++ + inplace_pkgconfig)) -- set the location of our various files if am_installed @@ -159,36 +157,51 @@ main = -- read the package configuration conf_file <- readIORef v_Path_package_config - contents <- readFile conf_file - let pkg_details = read contents -- ToDo: faster + r <- parsePkgConf conf_file + case r of { + Left err -> throwDyn (InstallationError (showSDoc err)); + Right pkg_details -> do + 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 + -- 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 [] - -- find the build tag, and re-process the build-specific options - more_opts <- findBuildTag - way_non_static <- processArgs static_flags more_opts [] + -- -O and --interactive are not a good combination + -- ditto with any kind of way selection + orig_opt_level <- readIORef v_OptLevel + when (orig_opt_level > 0 && mode == DoInteractive) $ + do putStr "warning: -O conflicts with --interactive; -O turned off.\n" + writeIORef v_OptLevel 0 + orig_ways <- readIORef v_Ways + when (not (null orig_ways) && mode == DoInteractive) $ + do throwDyn (UsageError + "--interactive can't be used with -prof, -ticky, -unreg or -smp.") + + -- 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 writeIORef v_Static_hsc_opts static_opts - -- warnings - warn_level <- readIORef v_Warning_opt - - let warn_opts = case warn_level of - W_default -> standardWarnings - W_ -> minusWOpts - W_all -> minusWallOpts - W_not -> [] - - -- build the default DynFlags (these may be adjusted on a per - -- module basis by OPTIONS pragmas and settings in the interpreter). + -- build the default DynFlags (these may be adjusted on a per + -- module basis by OPTIONS pragmas and settings in the interpreter). core_todo <- buildCoreToDo stg_todo <- buildStgToDo @@ -197,6 +210,8 @@ main = -- 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 + + let lang = case mode of StopBefore HCc -> HscC DoInteractive -> HscInterpreted @@ -204,22 +219,20 @@ 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 ++ - non_static ++ warn_opts) [] + srcs <- processArgs dynamic_flags (way_non_static ++ non_static) [] -- save the "initial DynFlags" away init_dyn_flags <- readIORef v_DynFlags writeIORef v_InitDynFlags init_dyn_flags @@ -227,12 +240,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) @@ -244,6 +251,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 @@ -258,23 +268,26 @@ main = -- 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 = do - writeIORef v_Driver_state saved_driver_state writeIORef v_DynFlags init_dyn_flags + exists <- doesFileExist src + when (not exists) $ + throwDyn (CmdLineError ("file `" ++ src ++ "' does not exist")) + -- 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 mode == StopBefore Hsc then return src else do + 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-} @@ -283,7 +296,7 @@ main = -- rest of compilation dyn_flags <- readIORef v_DynFlags phases <- genPipeline mode stop_flag True (hscLang dyn_flags) pp - r <- pipeLoop phases pp (mode==DoLink) True{-use -o flag-} + r <- pipeLoop phases pp (mode==DoLink || mode==DoMkDLL) True{-use -o flag-} basename suffix return r @@ -291,20 +304,24 @@ 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 - [] -> writeIORef v_TopDir clibdir + [] -> throwDyn (InstallationError ("missing -B option")) some -> writeIORef v_TopDir (drop 2 (last some))) return others beginMake :: [String] -> IO () -beginMake mods - = do case mods of +beginMake fileish_args + = do let (objs, mods) = partition objish_file fileish_args + mapM (add v_Ld_inputs) objs + + case mods of [] -> throwDyn (UsageError "no input files") [mod] -> do state <- cmInit Batch cmLoadModule state mod @@ -314,14 +331,18 @@ beginMake mods beginInteractive :: [String] -> IO () #ifndef GHCI -beginInteractive = throwDyn (OtherError "not build for interactive use") +beginInteractive = throwDyn (CmdLineError "not built for interactive use") #else -beginInteractive mods - = do state <- cmInit Interactive - let mod = case mods of - [] -> Nothing - [mod] -> Just mod - _ -> throwDyn (UsageError - "only one module allowed with --interactive") - interactiveUI state mod +beginInteractive fileish_args + = do minus_ls <- readIORef v_Cmdline_libraries + + let (objs, mods) = partition objish_file 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") #endif