[project @ 2001-05-31 11:32:25 by simonmar]

[ghc-hetmet.git] / ghc / compiler / main / Main.hs

diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index 0475096..e9bc928 100644 (file)
--- 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.60 2001/03/23 12:11:26 simonmar Exp $
+-- $Id: Main.hs,v 1.67 2001/05/31 11:32:25 simonmar Exp $
 --
 -- GHC Driver program
 --
@@ -33,7 +33,7 @@ import DriverFlags
 import DriverMkDepend
 import DriverUtil
 import Panic
-import DriverPhases    ( Phase(..), haskellish_file, objish_file )
+import DriverPhases    ( Phase(..), haskellish_src_file, objish_file )
 import CmdLineOpts
 import TmpFiles
 import Finder          ( initFinder )
@@ -63,7 +63,6 @@ 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
@@ -139,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 in " ++ inplace_pkgconfig))
+                   else throwDyn (InstallationError 
+                                    ("Can't find package.conf in " ++ 
+                                     inplace_pkgconfig))
 
        -- set the location of our various files
    if am_installed
@@ -147,17 +148,23 @@ 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
    r <- parsePkgConf conf_file
    case r of {
-       Left err -> throwDyn (OtherError (showSDoc err));
+       Left err -> throwDyn (InstallationError (showSDoc err));
        Right pkg_details -> do
 
    writeIORef v_Package_details pkg_details
@@ -183,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.
@@ -259,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
@@ -275,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
@@ -307,7 +323,7 @@ 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<dir> option"))
     some -> writeIORef v_TopDir (drop 2 (last some)))
   return others
 
@@ -326,7 +342,7 @@ beginMake fileish_args
 
 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