X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=d1a1636336c2cbe087bed638a074d4685ede3c76;hb=a5f9c20a13e80f10a36246f1b4dbdae0f1a93187;hp=6ad4b8bc2cce942988e05d83bb957d1ad315b195;hpb=909442c800787b2d99f755139341df7bbe153974;p=ghc-hetmet.git diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index 6ad4b8b..d1a1636 100644 --- a/ghc/compiler/main/Main.hs +++ b/ghc/compiler/main/Main.hs @@ -1,6 +1,6 @@ {-# OPTIONS -W -fno-warn-incomplete-patterns #-} ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.14 2000/10/27 14:36:36 simonmar Exp $ +-- $Id: Main.hs,v 1.24 2000/11/16 15:57:06 simonmar Exp $ -- -- GHC Driver program -- @@ -16,19 +16,24 @@ module Main (main) where #include "HsVersions.h" import CompManager +import Interpreter +#ifdef GHCI +import InteractiveUI +#endif import DriverPipeline import DriverState import DriverFlags import DriverMkDepend 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 Panic import Concurrent #ifndef mingw32_TARGET_OS @@ -55,6 +60,7 @@ 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 @@ -155,19 +161,12 @@ main = (flags2, mode, stop_flag) <- getGhcMode argv' writeIORef v_GhcMode mode - -- force lang to "C" if the -C flag was given - case mode of StopBefore HCc -> writeIORef v_Hsc_Lang HscC - _ -> return () - -- 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 - left_over <- processArgs static_flags more_opts [] - if not (null left_over) - then throwDyn (OtherError "non-static flag in way-specific options") - else do + way_non_static <- processArgs static_flags more_opts [] -- give the static flags to hsc static_opts <- buildStaticHscOpts @@ -188,30 +187,41 @@ main = core_todo <- buildCoreToDo stg_todo <- buildStgToDo - lang <- readIORef v_Hsc_Lang + -- 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 + let lang = case mode of + StopBefore HCc -> HscC + DoInteractive -> HscInterpreted + _other | opt_level >= 1 -> HscC -- -O implies -fvia-C + | 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", flags = [] } -- the rest of the arguments are "dynamic" - srcs <- processArgs dynamic_flags (non_static ++ warn_opts) [] + srcs <- processArgs dynamic_flags (way_non_static ++ + non_static ++ warn_opts) [] -- save the "initial DynFlags" away - dyn_flags <- readIORef v_DynFlags - writeIORef v_InitDynFlags dyn_flags + init_dyn_flags <- readIORef v_DynFlags + writeIORef v_InitDynFlags init_dyn_flags -- complain about any unknown flags - mapM unknownFlagErr [ f | ('-':f) <- srcs ] + mapM unknownFlagErr [ f | f@('-':_) <- srcs ] -- get the -v flag verb <- readIORef v_Verbose when verb (do hPutStr stderr "Glasgow Haskell Compiler, Version " - hPutStr stderr version_str + hPutStr stderr cProjectVersion hPutStr stderr ", for Haskell 98, compiled by GHC version " - hPutStrLn stderr booter_version) + hPutStrLn stderr cBooterVersion) when verb (hPutStrLn stderr ("Using package config file: " ++ conf_file)) @@ -222,16 +232,19 @@ main = when (mode == DoMkDependHS) beginMkDependHS -- make/interactive require invoking the compilation manager - if (mode == DoMake) then beginMake srcs else do - if (mode == DoInteractive) then beginInteractive srcs else do + if (mode == DoMake) then beginMake pkg_details srcs else do + if (mode == DoInteractive) then beginInteractive pkg_details srcs else do -- for each source file, find which phases to run - pipelines <- mapM (genPipeline mode stop_flag) srcs + let lang = hscLang init_dyn_flags + pipelines <- mapM (genPipeline mode stop_flag True lang) srcs let src_pipelines = zip srcs pipelines + -- sanity checking o_file <- readIORef v_Output_file - if isJust o_file && mode /= DoLink && length srcs > 1 - then throwDyn (UsageError "can't apply -o option to multiple source files") + ohi <- readIORef v_Output_hi + if length srcs > 1 && (isJust ohi || (isJust o_file && mode /= DoLink)) + 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 @@ -242,8 +255,9 @@ main = saved_driver_state <- readIORef v_Driver_state let compileFile (src, phases) = do - r <- runPipeline phases src (mode==DoLink) True writeIORef v_Driver_state saved_driver_state + writeIORef v_DynFlags init_dyn_flags + r <- runPipeline phases src (mode==DoLink) True return r o_files <- mapM compileFile src_pipelines @@ -261,12 +275,24 @@ setTopDir args = do some -> writeIORef v_TopDir (drop 2 (last some))) return others -beginMake [] = throwDyn (UsageError "no input files") -beginMake (_:_:_) = throwDyn (UsageError "only one module allowed with --make") -{- -beginMake [mod] = do - state <- cmInit ""{-ToDo:remove-} pkg_details - cmLoadModule state (mkModuleName mod) --} - -beginInteractive srcs = panic "`ghc --interactive' unimplemented" +beginMake :: PackageConfigInfo -> [String] -> IO () +beginMake pkg_details mods + = do case mods of + [] -> throwDyn (UsageError "no input files") + [mod] -> do state <- cmInit pkg_details Batch + cmLoadModule state (mkModuleName mod) + return () + _ -> throwDyn (UsageError "only one module allowed with --make") + +#ifndef GHCI +beginInteractive = throwDyn (OtherError "not build for interactive use") +#else +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 +#endif