X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FGHC.hs;h=7e0ec2ffeda59fe20a848b2579c6ad29f7d850e5;hb=9d7da331989abcd1844e9d03b8d1e4163796fa85;hp=fec3dfc4a72b707033c76b076415fcd44b4f8f01;hpb=57d26da8cd35d248916a037c6934d4ef526e7e13;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/GHC.hs b/ghc/compiler/main/GHC.hs
index fec3dfc..7e0ec2f 100644
--- a/ghc/compiler/main/GHC.hs
+++ b/ghc/compiler/main/GHC.hs
@@ -37,7 +37,7 @@ module GHC (
 	TypecheckedSource, ParsedSource, RenamedSource,
 
 	-- * Inspecting the module structure of the program
-	ModuleGraph, ModSummary(..),
+	ModuleGraph, ModSummary(..), ModLocation(..),
 	getModuleGraph,
 	isLoaded,
 	topSortModuleGraph,
@@ -97,7 +97,7 @@ module GHC (
 	-- ** Type constructors
 	TyCon, 
 	tyConTyVars, tyConDataCons, tyConArity,
-	isClassTyCon, isSynTyCon, isNewTyCon, isPrimTyCon,
+	isClassTyCon, isSynTyCon, isNewTyCon, isPrimTyCon, isFunTyCon,
 	getSynTyConDefn,
 
 	-- ** Type variables
@@ -191,7 +191,7 @@ import Id		( Id, idType, isImplicitId, isDeadBinder,
 import Var		( TyVar )
 import TysPrim		( alphaTyVars )
 import TyCon		( TyCon, isClassTyCon, isSynTyCon, isNewTyCon,
-			  isPrimTyCon, tyConArity,
+			  isPrimTyCon, isFunTyCon, tyConArity,
 			  tyConTyVars, tyConDataCons, getSynTyConDefn )
 import Class		( Class, classSCTheta, classTvsFds, classMethods )
 import FunDeps		( pprFundeps )
@@ -219,21 +219,19 @@ import FiniteMap
 import Panic
 import Digraph
 import Bag		( unitBag )
-import ErrUtils		( Severity(..), showPass, Messages, fatalErrorMsg, debugTraceMsg,
+import ErrUtils		( Severity(..), showPass, fatalErrorMsg, debugTraceMsg,
 			  mkPlainErrMsg, printBagOfErrors, printErrorsAndWarnings )
 import qualified ErrUtils
-import PrelNames	( mAIN )
 import Util
 import StringBuffer	( StringBuffer, hGetStringBuffer )
 import Outputable
 import SysTools		( cleanTempFilesExcept )
 import BasicTypes
 import TcType           ( tcSplitSigmaTy, isDictTy )
-import FastString	( mkFastString )
 
 import Directory        ( getModificationTime, doesFileExist )
 import Maybe		( isJust, isNothing, fromJust )
-import Maybes		( orElse, expectJust, mapCatMaybes )
+import Maybes		( expectJust, mapCatMaybes )
 import List		( partition, nub )
 import qualified List
 import Monad		( unless, when )
@@ -365,11 +363,7 @@ guessOutputFile s = modifySession s $ \env ->
             let isMain = (== mainModIs dflags) . ms_mod
             [ms] <- return (filter isMain mod_graph)
             ml_hs_file (ms_location ms)
-#if defined(mingw32_HOST_OS)
-        guessedName = fmap (\fname -> basenameOf fname `joinFileExt` "exe") mainModuleSrcPath
-#else
         guessedName = fmap basenameOf mainModuleSrcPath
-#endif
     in
     case outputFile dflags of
         Just _ -> env
@@ -634,7 +628,7 @@ load2 s@(Session ref) how_much mod_graph = do
 	      when (ghci_mode == BatchCompile && isJust ofile && not do_linking) $
 	        debugTraceMsg dflags 1 (text ("Warning: output was redirected with -o, " ++
 				              "but no output will be generated\n" ++
-				              "because there is no " ++ moduleUserString main_mod ++ " module."))
+				              "because there is no " ++ moduleString main_mod ++ " module."))
 
 	      -- link everything together
               linkresult <- link ghci_mode dflags do_linking (hsc_HPT hsc_env1)