X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=e9bc928fe5fe9a26a110a39c42d70d92d9e01f0e;hb=e0a941b95506cef196e7a8ad1e002920d181f302;hp=df50f1c8a9b2ebde2d4b461737b29a2823b9d54a;hpb=89e1f4af2244dc4dbf5b3de99610d4ae8e667de2;p=ghc-hetmet.git diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index df50f1c..e9bc928 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.54 2001/02/20 11:04:42 simonmar Exp $ +-- $Id: Main.hs,v 1.67 2001/05/31 11:32:25 simonmar Exp $ -- -- GHC Driver program -- @@ -26,21 +26,22 @@ import Posix #endif import CompManager +import ParsePkgConf import DriverPipeline import DriverState import DriverFlags import DriverMkDepend import DriverUtil import Panic -import DriverPhases ( Phase(..), haskellish_file ) +import DriverPhases ( Phase(..), haskellish_src_file, objish_file ) import CmdLineOpts import TmpFiles import Finder ( initFinder ) import CmStaticInfo import Config +import Outputable import Util - import Concurrent import Directory import IOExts @@ -49,7 +50,6 @@ import Exception import IO import Monad import List -import Char ( toLower ) import System import Maybe @@ -63,11 +63,9 @@ 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 --- mkDLL -- java generation -- user ways -- Win32 support: proper signal handling @@ -140,7 +138,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 @@ -148,16 +148,25 @@ main = writeIORef v_Pgm_L (installed "unlit") writeIORef v_Pgm_m (installed "ghc-asm") writeIORef v_Pgm_s (installed "ghc-split") +#if defined(mingw32_TARGET_OS) && defined(MINIMAL_UNIX_DEPS) + writeIORef v_Pgm_T (installed cTOUCH) +#endif else do writeIORef v_Path_usage (inplace (cGHC_DRIVER_DIR ++ "/ghc-usage.txt")) writeIORef v_Pgm_L (inplace cGHC_UNLIT) writeIORef v_Pgm_m (inplace cGHC_MANGLER) writeIORef v_Pgm_s (inplace cGHC_SPLIT) +#if defined(mingw32_TARGET_OS) && defined(MINIMAL_UNIX_DEPS) + writeIORef v_Pgm_T (inplace cTOUCH) +#endif -- 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) @@ -181,7 +190,7 @@ main = writeIORef v_OptLevel 0 orig_ways <- readIORef v_Ways when (not (null orig_ways) && mode == DoInteractive) $ - do throwDyn (OtherError + 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. @@ -257,15 +266,21 @@ main = -- mkdependHS is special when (mode == DoMkDependHS) beginMkDependHS + -- -ohi sanity checking + ohi <- readIORef v_Output_hi + if (isJust ohi && + (mode == DoMake || mode == DoInteractive || length srcs > 1)) + then throwDyn (UsageError "-ohi can only be used when compiling a single source file") + else do + -- make/interactive require invoking the compilation manager if (mode == DoMake) then beginMake srcs else do if (mode == DoInteractive) then beginInteractive srcs else do - -- sanity checking + -- -o sanity checking o_file <- readIORef v_Output_file - ohi <- readIORef v_Output_hi - 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") + if (length srcs > 1 && isJust o_file && mode /= DoLink && mode /= DoMkDLL) + then throwDyn (UsageError "can't apply -o to multiple source files") else do if null srcs then throwDyn (UsageError "no input files") else do @@ -273,13 +288,16 @@ main = let compileFile src = do 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 not (haskellish_file src) || mode == StopBefore Hsc + -- just preprocess (Haskell source only) + pp <- if not (haskellish_src_file src) || mode == StopBefore Hsc then return src else do phases <- genPipeline (StopBefore Hsc) stop_flag False{-not persistent-} defaultHscLang src @@ -298,20 +316,23 @@ 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 @@ -321,21 +342,18 @@ beginMake mods beginInteractive :: [String] -> IO () #ifndef GHCI -beginInteractive = throwDyn (OtherError "not built for interactive use") +beginInteractive = throwDyn (CmdLineError "not built for interactive use") #else beginInteractive fileish_args = do minus_ls <- readIORef v_Cmdline_libraries - let is_libraryish nm - = let nmr = map toLower (reverse nm) - in take 2 nmr == "o." - libs = map Left (filter is_libraryish fileish_args) - ++ map Right minus_ls - mods = filter (not.is_libraryish) fileish_args - mod = case mods of - [] -> Nothing - [mod] -> Just mod - _ -> throwDyn (UsageError - "only one module allowed with --interactive") + + let (objs, mods) = partition objish_file fileish_args + libs = map Left objs ++ map Right minus_ls + state <- cmInit Interactive - interactiveUI state mod libs + case mods of + [] -> interactiveUI state Nothing libs + [mod] -> interactiveUI state (Just mod) libs + _ -> throwDyn (UsageError + "only one module allowed with --interactive") #endif