X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=5786dec2885e1178e3ba4138a7be7a2f403f4365;hb=4d1b970fe7ae5e25a54a7bce03c2501f07f27211;hp=8283eb5a8635ad1244b966b53990dac6bf4523d9;hpb=292c077de7dbe98eb44911648f16e243b40db2ac;p=ghc-hetmet.git diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index 8283eb5..5786dec 100644 --- a/ghc/compiler/main/Main.hs +++ b/ghc/compiler/main/Main.hs @@ -1,6 +1,6 @@ -{-# OPTIONS -W -fno-warn-incomplete-patterns #-} +{-# OPTIONS -fno-warn-incomplete-patterns #-} ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.23 2000/11/16 11:39:37 simonmar Exp $ +-- $Id: Main.hs,v 1.36 2000/12/11 16:42:26 sewardj Exp $ -- -- GHC Driver program -- @@ -15,8 +15,18 @@ module Main (main) where #include "HsVersions.h" -import CompManager + +#ifdef GHCI +import Interpreter import InteractiveUI +#endif + +#ifndef mingw32_TARGET_OS +import Dynamic +import Posix +#endif + +import CompManager import DriverPipeline import DriverState import DriverFlags @@ -25,21 +35,18 @@ import DriverUtil import Panic import DriverPhases ( Phase(..) ) import CmdLineOpts ( HscLang(..), DynFlags(..), v_Static_hsc_opts ) -import Module ( mkModuleName ) import TmpFiles import Finder ( initFinder ) import CmStaticInfo import Config import Util + + import Concurrent -#ifndef mingw32_TARGET_OS -import Posix -#endif import Directory import IOExts import Exception -import Dynamic import IO import Monad @@ -69,6 +76,7 @@ import Maybe -- reading the package configuration file is too slow -- -H, -K, -Rghc-timing -- hi-diffs +-- -ddump-all doesn't do anything ----------------------------------------------------------------------------- -- Differences vs. old driver: @@ -94,8 +102,8 @@ main = -- make sure we clean up after ourselves later (do forget_it <- readIORef v_Keep_tmp_files unless forget_it $ do - verb <- readIORef v_Verbose - cleanTempFiles verb + verb <- dynFlag verbosity + cleanTempFiles (verb >= 2) ) $ do -- exceptions will be blocked while we clean the temporary files, -- so there shouldn't be any difficulty if we receive further @@ -110,9 +118,6 @@ main = installHandler sigINT sig_handler Nothing #endif - pgm <- getProgName - writeIORef v_Prog_name pgm - argv <- getArgs -- grab any -B options from the command line first @@ -200,6 +205,12 @@ main = 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 = [] } -- the rest of the arguments are "dynamic" @@ -212,25 +223,33 @@ main = -- complain about any unknown flags mapM unknownFlagErr [ f | f@('-':_) <- srcs ] - -- get the -v flag - verb <- readIORef v_Verbose + -- 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 (do hPutStr stderr "Glasgow Haskell Compiler, Version " - hPutStr stderr cProjectVersion - hPutStr stderr ", for Haskell 98, compiled by GHC version " - hPutStrLn stderr cBooterVersion) + when (verb >= 2) + (do hPutStr stderr "Glasgow Haskell Compiler, Version " + hPutStr stderr cProjectVersion + hPutStr stderr ", for Haskell 98, compiled by GHC version " + hPutStrLn stderr cBooterVersion) - when verb (hPutStrLn stderr ("Using package config file: " ++ conf_file)) + when (verb >= 2) + (hPutStrLn stderr ("Using package config file: " ++ conf_file)) -- initialise the finder - initFinder pkg_details + pkg_avails <- getPackageInfo + initFinder pkg_avails -- mkdependHS is special when (mode == DoMkDependHS) beginMkDependHS -- make/interactive require invoking the compilation manager - if (mode == DoMake) then beginMake pkg_details srcs else do - if (mode == DoInteractive) then beginInteractive pkg_details srcs else do + 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 @@ -246,11 +265,6 @@ main = if null srcs then throwDyn (UsageError "no input files") else do - -- 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 - let compileFile (src, phases) = do writeIORef v_Driver_state saved_driver_state writeIORef v_DynFlags init_dyn_flags @@ -272,22 +286,26 @@ setTopDir args = do some -> writeIORef v_TopDir (drop 2 (last some))) return others -beginMake :: PackageConfigInfo -> [String] -> IO () -beginMake pkg_details mods +beginMake :: [String] -> IO () +beginMake mods = do case mods of [] -> throwDyn (UsageError "no input files") - [mod] -> do state <- cmInit pkg_details Batch - cmLoadModule state (mkModuleName mod) + [mod] -> do state <- cmInit Batch + cmLoadModule state mod return () _ -> throwDyn (UsageError "only one module allowed with --make") -beginInteractive pkg_details mods - = do state <- cmInit pkg_details Interactive - case mods of - [] -> return () - [mod] -> do cmLoadModule state (mkModuleName mod); return () - _ -> throwDyn (UsageError - "only one module allowed with --interactive") - interactiveUI state - +beginInteractive :: [String] -> IO () +#ifndef GHCI +beginInteractive = throwDyn (OtherError "not build 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 +#endif