X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcRnDriver.lhs;h=7e3aae25065f3690da869f1a2997abe2ea8ce944;hb=9d7da331989abcd1844e9d03b8d1e4163796fa85;hp=dc22e67a4f64cbd99e2290c380256d59f8d4ec78;hpb=81d9bd68cd5bc763ef7d675d5263f210e7dca9c0;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcRnDriver.lhs b/ghc/compiler/typecheck/TcRnDriver.lhs
index dc22e67..7e3aae2 100644
--- a/ghc/compiler/typecheck/TcRnDriver.lhs
+++ b/ghc/compiler/typecheck/TcRnDriver.lhs
@@ -62,8 +62,8 @@ import DataCon		( dataConWrapId )
 import ErrUtils		( Messages, mkDumpDoc, showPass )
 import Id		( Id, mkExportedLocalId, isLocalId, idName, idType )
 import Var		( Var )
-import Module           ( Module, ModuleEnv, mkModule, moduleEnvElts, elemModuleEnv )
-import OccName		( mkVarOcc, mkOccFS, varName )
+import Module           ( Module, ModuleEnv, moduleEnvElts, elemModuleEnv )
+import OccName		( mkVarOccFS )
 import Name		( Name, NamedThing(..), isExternalName, getSrcLoc, isWiredInName,
 			  mkExternalName )
 import NameSet
@@ -732,11 +732,9 @@ checkMain
   = do { ghci_mode <- getGhciMode ;
 	 tcg_env   <- getGblEnv ;
 	 dflags    <- getDOpts ;
-	 let { main_mod = case mainModIs dflags of {
-				Just mod -> mkModule mod ;
-				Nothing  -> mAIN } ;
+	 let { main_mod = mainModIs dflags ;
 	       main_fn  = case mainFunIs dflags of {
-				Just fn -> mkRdrUnqual (mkVarOcc (mkFastString fn)) ;
+				Just fn -> mkRdrUnqual (mkVarOccFS (mkFastString fn)) ;
 				Nothing -> main_RDR_Unqual } } ;
 	
 	 check_main ghci_mode tcg_env main_mod main_fn
@@ -778,7 +776,7 @@ check_main ghci_mode tcg_env main_mod main_fn
 	-- for 'main' in the interface file!
 
 	; let { root_main_name =  mkExternalName rootMainKey rOOT_MAIN 
-				   (mkOccFS varName FSLIT("main")) 
+				   (mkVarOccFS FSLIT("main")) 
 				   (Just main_name) (getSrcLoc main_name)
 	      ; root_main_id = mkExportedLocalId root_main_name ty
 	      ; main_bind    = noLoc (VarBind root_main_id main_expr) }