Make the type-defaulting in GHCi use () as the first default type

[ghc-hetmet.git] / compiler / typecheck / TcRnMonad.lhs

diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs
index b560566..06e3d81 100644 (file)
--- 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)
@@ -72,6 +68,7 @@ ioToTcRn = ioToIOEnv
 \end{code}
 
 \begin{code}
+
 initTc :: HscEnv
        -> HscSource
        -> Module 
@@ -163,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}
 
 %************************************************************************
@@ -428,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}
 
 %************************************************************************