[project @ 2002-03-20 11:24:42 by simonpj]

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

diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs
index 8e82ede..243844a 100644 (file)
--- a/ghc/compiler/main/HscMain.lhs
+++ b/ghc/compiler/main/HscMain.lhs
@@ -16,7 +16,7 @@ module HscMain ( HscResult(..), hscMain,
 #ifdef GHCI
 import Interpreter
 import ByteCodeGen     ( byteCodeGen )
-import CoreTidy                ( tidyCoreExpr )
+import TidyPgm         ( tidyCoreExpr )
 import CorePrep                ( corePrepExpr )
 import Rename          ( renameStmt, renameRdrName, slurpIface )
 import RdrName          ( rdrNameOcc, setRdrNameOcc )
@@ -26,7 +26,7 @@ import OccName          ( dataName, tcClsName,
 import Type            ( Type )
 import Id              ( Id, idName, setGlobalIdDetails )
 import IdInfo          ( GlobalIdDetails(VanillaGlobal) )
-import Name            ( isLocalName )
+import Name            ( isInternalName )
 import NameEnv         ( lookupNameEnv )
 import Module          ( lookupModuleEnv )
 import RdrName         ( rdrEnvElts )
@@ -59,7 +59,7 @@ import Desugar
 import Flattening       ( flatten, flattenExpr )
 import SimplCore
 import CoreUtils       ( coreBindsSize )
-import CoreTidy                ( tidyCorePgm )
+import TidyPgm         ( tidyCorePgm )
 import CorePrep                ( corePrepPgm )
 import StgSyn
 import CoreToStg       ( coreToStg )
@@ -425,7 +425,7 @@ myParseModule dflags src_filename
       showPass dflags "Parser"
       _scc_  "Parser" do
 
-      buf <- hGetStringBuffer True{-expand tabs-} src_filename
+      buf <- hGetStringBuffer src_filename
 
       let exts = ExtFlags {glasgowExtsEF = dopt Opt_GlasgowExts dflags,
                           parrEF        = dopt Opt_PArr        dflags}
@@ -673,7 +673,7 @@ hscThing dflags hst hit pcs0 ic str
             Nothing -> return (pcs, []);
             Just pcs ->
                let do_lookup n
-                       | isLocalName n = lookupNameEnv (ic_type_env ic) n
+                       | isInternalName n = lookupNameEnv (ic_type_env ic) n
                        | otherwise     = lookupType hst (pcs_PTE pcs) n
                
                    maybe_ty_things = map do_lookup names