X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnMonad.lhs;h=06e3d811f4d4dbfafe56d19e08639261a4702429;hb=d4b95ea994e850f2c85e418b5625874fd25b0ebf;hp=e6d75e3a6509740f84e327d0e4926cbaac9a4818;hpb=49c98d143c382a1341e1046f5ca00819a25691ba;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs
index e6d75e3..06e3d81 100644
--- a/compiler/typecheck/TcRnMonad.lhs
+++ b/compiler/typecheck/TcRnMonad.lhs
@@ -14,16 +14,12 @@ module TcRnMonad(
 import TcRnTypes	-- Re-export all
 import IOEnv		-- Re-export all
 
-#if defined(GHCI) && defined(BREAKPOINT)
+#if defined(GHCI)
 import TypeRep
-import Var
 import IdInfo
-import OccName
-import SrcLoc
 import TysWiredIn
 import PrelNames
-import NameEnv
-import TcEnv
+import {-#SOURCE#-} TcEnv
 #endif
 
 import HsSyn hiding (LIE)
@@ -47,7 +43,6 @@ import OccName
 import Bag
 import Outputable
 import UniqSupply
-import UniqFM
 import Unique
 import DynFlags
 import StaticFlags
@@ -73,6 +68,7 @@ ioToTcRn = ioToIOEnv
 \end{code}
 
 \begin{code}
+
 initTc :: HscEnv
        -> HscSource
        -> Module 
@@ -103,7 +99,7 @@ initTc hsc_env hsc_src mod do_this
 		tcg_inst_uses = dfuns_var,
 		tcg_th_used   = th_var,
 		tcg_exports  = [],
-		tcg_imports  = init_imports,
+		tcg_imports  = emptyImportAvails,
 		tcg_dus      = emptyDUs,
                 tcg_rn_imports = Nothing,
                 tcg_rn_exports = Nothing,
@@ -149,12 +145,6 @@ initTc hsc_env hsc_src mod do_this
 
 	return (msgs, final_res)
     }
-  where
-    init_imports = emptyImportAvails {imp_env = unitUFM (moduleName mod) []}
-	-- Initialise tcg_imports with an empty set of bindings for
-	-- this module, so that if we see 'module M' in the export
-	-- list, and there are no bindings in M, we don't bleat 
-	-- "unknown module M".
 
 initTcPrintErrors	-- Used from the interactive loop only
        :: HscEnv
@@ -170,28 +160,8 @@ initTcPrintErrors env mod todo = do
 \begin{code}
 addBreakpointBindings :: TcM a -> TcM a
 addBreakpointBindings thing_inside
-#if defined(GHCI) && defined(BREAKPOINT)
-  = do	{ unique <- newUnique
-        ; let { var = mkInternalName unique (mkOccName tvName "a") noSrcLoc;
-                tyvar = mkTyVar var liftedTypeKind;
-                basicType extra = (FunTy intTy
-                                   (FunTy (mkListTy unitTy)
-                                    (FunTy stringTy
-                                     (ForAllTy tyvar
-                                      (extra
-                                       (FunTy (TyVarTy tyvar)
-                                        (TyVarTy tyvar)))))));
-                breakpointJumpId
-                    = mkGlobalId VanillaGlobal breakpointJumpName
-                                 (basicType id) vanillaIdInfo;
-                breakpointCondJumpId
-                    = mkGlobalId VanillaGlobal breakpointCondJumpName
-                                 (basicType (FunTy boolTy)) vanillaIdInfo
-	  }
-	; tcExtendIdEnv [breakpointJumpId, breakpointCondJumpId] thing_inside}
-#else
    = thing_inside
-#endif
+
 \end{code}
 
 %************************************************************************
@@ -435,8 +405,8 @@ extendFixityEnv new_bit
   = updGblEnv (\env@(TcGblEnv { tcg_fix_env = old_fix_env }) -> 
 		env {tcg_fix_env = extendNameEnvList old_fix_env new_bit})	     
 
-getDefaultTys :: TcRn (Maybe [Type])
-getDefaultTys = do { env <- getGblEnv; return (tcg_default env) }
+getDeclaredDefaultTys :: TcRn (Maybe [Type])
+getDeclaredDefaultTys = do { env <- getGblEnv; return (tcg_default env) }
 \end{code}
 
 %************************************************************************