[project @ 2003-11-17 14:41:03 by simonmar]

[ghc-hetmet.git] / ghc / compiler / main / HscMain.lhs

diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs
index 4de831c..c1fa0c4 100644 (file)
--- a/ghc/compiler/main/HscMain.lhs
+++ b/ghc/compiler/main/HscMain.lhs
@@ -42,7 +42,8 @@ import StringBuffer   ( hGetStringBuffer )
 import Parser
 import Lexer           ( P(..), ParseResult(..), mkPState, showPFailed )
 import SrcLoc          ( mkSrcLoc )
-import TcRnDriver      ( tcRnModule, tcRnExtCore, tcRnIface )
+import TcRnDriver      ( tcRnModule, tcRnExtCore )
+import TcIface         ( typecheckIface )
 import IfaceEnv                ( initNameCache )
 import LoadIface       ( ifaceStats, initExternalPackageState )
 import PrelInfo                ( wiredInThings, basicKnownKeyNames )
@@ -60,7 +61,7 @@ import CodeGen                ( codeGen )
 import CodeOutput      ( codeOutput )
 
 import CmdLineOpts
-import DriverPhases     ( isExtCore_file )
+import DriverPhases     ( isExtCoreFilename )
 import ErrUtils                ( dumpIfSet, dumpIfSet_dyn, showPass )
 import UniqSupply      ( mkSplitUniqSupply )
 
@@ -182,7 +183,7 @@ hscNoRecomp hsc_env have_object
                        showModMsg have_object mod location);
 
       new_details <- _scc_ "tcRnIface"
-                    tcRnIface hsc_env old_iface ;
+                    typecheckIface hsc_env old_iface ;
       dumpIfaceStats hsc_env ;
 
       return (HscNoRecomp new_details old_iface)
@@ -196,7 +197,7 @@ hscRecomp hsc_env have_object
        ; let dflags    = hsc_dflags hsc_env
        ; let toInterp  = dopt_HscLang dflags == HscInterpreted
        ; let toCore    = isJust (ml_hs_file location) &&
-                         isExtCore_file (fromJust (ml_hs_file location))
+                         isExtCoreFilename (fromJust (ml_hs_file location))
 
        ; when (not one_shot && verbosity dflags >= 1) $
                hPutStrLn stderr ("Compiling " ++