From: simonpj <unknown>
Date: Wed, 2 Feb 2005 13:27:07 +0000 (+0000)
Subject: [project @ 2005-02-02 13:27:07 by simonpj]
X-Git-Tag: Initial_conversion_from_CVS_complete~1123
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=611272043d04d3ddf9e8749b7fa99336ddbe59a5

[project @ 2005-02-02 13:27:07 by simonpj]
Import trimming
---

diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index 9277b12..a70f37a 100644
--- a/ghc/compiler/main/Main.hs
+++ b/ghc/compiler/main/Main.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-}
 
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.145 2005/02/01 08:36:07 simonpj Exp $
+-- $Id: Main.hs,v 1.146 2005/02/02 13:27:07 simonpj Exp $
 --
 -- GHC Driver program
 --
@@ -14,7 +14,8 @@ module Main (main) where
 #include "HsVersions.h"
 
 #ifdef GHCI
-import InteractiveUI( ghciWelcomeMsg, interactiveUI )
+import InteractiveUI	( ghciWelcomeMsg, interactiveUI )
+import DriverState	( isInteractiveMode )
 #endif
 
 
@@ -24,10 +25,10 @@ import Config		( cBooterVersion, cGhcUnregisterised, cProjectVersion )
 import SysTools		( initSysTools, cleanTempFiles, normalisePath )
 import Packages		( dumpPackages, initPackages, haskell98PackageId, PackageIdH(..) )
 import DriverPipeline	( staticLink, doMkDLL, compileFile )
-import DriverState	( isLinkMode, isMakeMode, isInteractiveMode,
+import DriverState	( isLinkMode, 
 			  isCompManagerMode, isInterpretiveMode, 
 			  buildStgToDo, findBuildTag, unregFlags, 
-			  v_GhcMode, v_GhcModeFlag, GhcMode(..),
+			  v_GhcMode, GhcMode(..),
 			  v_Keep_tmp_files, v_Ld_inputs, v_Ways, 
 			  v_Output_file, v_Output_hi, v_GhcLink,
 			  verifyOutputFiles, GhcLink(..)
@@ -51,7 +52,6 @@ import EXCEPTION	( throwDyn, Exception(..),
 
 -- Standard Haskell libraries
 import IO
-import Directory	( doesFileExist )
 import System		( getArgs, exitWith, ExitCode(..) )
 import Monad
 import List