X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnMonad.lhs;h=9da9dc9ae7bc4ae6196d7966547f0ec663de1b02;hp=f515334830c14985ea90c328563d64bc82c4d01f;hb=138b885a335734039daf7debb0a7dfc3dc947c00;hpb=61d2625ae2e6a4cdae2ffc92df828905e81c24cc

diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs
index f515334..9da9dc9 100644
--- a/compiler/typecheck/TcRnMonad.lhs
+++ b/compiler/typecheck/TcRnMonad.lhs
@@ -19,6 +19,7 @@ import SrcLoc           ( noSrcLoc  )
 import TysWiredIn       ( intTy, stringTy, mkListTy, unitTy, boolTy )
 import PrelNames        ( breakpointJumpName, breakpointCondJumpName )
 import NameEnv          ( mkNameEnv )
+import TcEnv            ( tcExtendIdEnv )
 #endif
 
 import HsSyn		( emptyLHsBinds )
@@ -34,6 +35,7 @@ import Type		( Type )
 import TcType		( tcIsTyVarTy, tcGetTyVar )
 import NameEnv		( extendNameEnvList, nameEnvElts )
 import InstEnv		( emptyInstEnv )
+import FamInstEnv	( emptyFamInstEnv )
 
 import Var		( setTyVarName )
 import VarSet		( emptyVarSet )
@@ -50,7 +52,8 @@ import Outputable
 import UniqSupply	( UniqSupply, mkSplitUniqSupply, uniqFromSupply, splitUniqSupply )
 import UniqFM		( unitUFM )
 import Unique		( Unique )
-import DynFlags		( DynFlags(..), DynFlag(..), dopt, dopt_set, GhcMode )
+import DynFlags		( DynFlags(..), DynFlag(..), dopt, dopt_set,
+			  dopt_unset, GhcMode ) 
 import StaticFlags	( opt_PprStyle_Debug )
 import Bag		( snocBag, unionBags )
 import Panic		( showException )
@@ -100,6 +103,7 @@ initTc hsc_env hsc_src mod do_this
 		tcg_type_env = hsc_global_type_env hsc_env,
 		tcg_type_env_var = type_env_var,
 		tcg_inst_env  = emptyInstEnv,
+		tcg_fam_inst_env  = emptyFamInstEnv,
 		tcg_inst_uses = dfuns_var,
 		tcg_th_used   = th_var,
 		tcg_exports  = emptyNameSet,
@@ -131,33 +135,8 @@ initTc hsc_env hsc_src mod do_this
    
 	-- OK, here's the business end!
 	maybe_res <- initTcRnIf 'a' hsc_env gbl_env lcl_env $
-		     do {
-#if defined(GHCI) && defined(BREAKPOINT)
-                          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)))))));
-                                breakpointJumpType
-                                    = mkGlobalId VanillaGlobal breakpointJumpName
-                                                 (basicType id) vanillaIdInfo;
-                                breakpointCondJumpType
-                                    = mkGlobalId VanillaGlobal breakpointCondJumpName
-                                                 (basicType (FunTy boolTy)) vanillaIdInfo;
-                                new_env = mkNameEnv [(breakpointJumpName
-                                                     , ATcId breakpointJumpType topLevel False)
-                                                     ,(breakpointCondJumpName
-                                                     , ATcId breakpointCondJumpType topLevel False)];
-                              };
-                          r <- tryM (updLclEnv (\gbl -> gbl{tcl_env=new_env}) do_this)
-#else
-                          r <- tryM do_this
-#endif
+		     addBreakpointBindings $
+		     do { r <- tryM do_this
 			; case r of
 			  Right res -> return (Just res)
 			  Left _    -> return Nothing } ;
@@ -190,6 +169,32 @@ initTcPrintErrors env mod todo = do
   return res
 \end{code}
 
+\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}
 
 %************************************************************************
 %*									*
@@ -268,6 +273,10 @@ setOptM :: DynFlag -> TcRnIf gbl lcl a -> TcRnIf gbl lcl a
 setOptM flag = updEnv (\ env@(Env { env_top = top }) ->
 			 env { env_top = top { hsc_dflags = dopt_set (hsc_dflags top) flag}} )
 
+unsetOptM :: DynFlag -> TcRnIf gbl lcl a -> TcRnIf gbl lcl a
+unsetOptM flag = updEnv (\ env@(Env { env_top = top }) ->
+			 env { env_top = top { hsc_dflags = dopt_unset (hsc_dflags top) flag}} )
+
 ifOptM :: DynFlag -> TcRnIf gbl lcl () -> TcRnIf gbl lcl ()	-- Do it flag is true
 ifOptM flag thing_inside = do { b <- doptM flag; 
 				if b then thing_inside else return () }
@@ -323,17 +332,28 @@ getEpsAndHpt = do { env <- getTopEnv; eps <- readMutVar (hsc_EPS env)
 
 \begin{code}
 newUnique :: TcRnIf gbl lcl Unique
-newUnique = do { us <- newUniqueSupply ; 
-		 return (uniqFromSupply us) }
+newUnique
+ = do { env <- getEnv ;
+	let { u_var = env_us env } ;
+	us <- readMutVar u_var ;
+        case splitUniqSupply us of { (us1,_) -> do {
+	writeMutVar u_var us1 ;
+	return $! uniqFromSupply us }}}
+   -- NOTE 1: we strictly split the supply, to avoid the possibility of leaving
+   -- a chain of unevaluated supplies behind.
+   -- NOTE 2: we use the uniq in the supply from the MutVar directly, and
+   -- throw away one half of the new split supply.  This is safe because this
+   -- is the only place we use that unique.  Using the other half of the split
+   -- supply is safer, but slower.
 
 newUniqueSupply :: TcRnIf gbl lcl UniqSupply
 newUniqueSupply
  = do { env <- getEnv ;
 	let { u_var = env_us env } ;
 	us <- readMutVar u_var ;
-    	let { (us1, us2) = splitUniqSupply us } ;
+        case splitUniqSupply us of { (us1,us2) -> do {
 	writeMutVar u_var us1 ;
-	return us2 }
+	return us2 }}}
 
 newLocalName :: Name -> TcRnIf gbl lcl Name
 newLocalName name	-- Make a clone