X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FDebugger.hs;h=4e610685ebd2e070c8bf50027d3752f1039646e5;hb=182edd420fe8d5ec0d12fcabaec7d13416a77cd6;hp=52c60306c8d7e980b3d991285280cff3db1db254;hpb=808e6d4e915b12c29eaeada7b70318b829eafe82;p=ghc-hetmet.git diff --git a/compiler/ghci/Debugger.hs b/compiler/ghci/Debugger.hs index 52c6030..4e61068 100644 --- a/compiler/ghci/Debugger.hs +++ b/compiler/ghci/Debugger.hs @@ -15,23 +15,19 @@ module Debugger (pprintClosureCommand) where import Linker import RtClosureInspect -import PrelNames import HscTypes import IdInfo --import Id +import Name import Var hiding ( varName ) import VarSet import VarEnv import Name -import NameEnv -import RdrName import UniqSupply import Type import TcType -import TyCon import TcGadt import GHC -import GhciMonad import Outputable import Pretty ( Mode(..), showDocWith ) @@ -52,25 +48,24 @@ import GHC.Exts ------------------------------------- -- | The :print & friends commands ------------------------------------- -pprintClosureCommand :: Bool -> Bool -> String -> GHCi () -pprintClosureCommand bindThings force str = do - cms <- getSession +pprintClosureCommand :: Session -> Bool -> Bool -> String -> IO () +pprintClosureCommand session bindThings force str = do tythings <- (catMaybes . concat) `liftM` - mapM (\w -> io(GHC.parseName cms w >>= - mapM (GHC.lookupName cms))) + mapM (\w -> GHC.parseName session w >>= + mapM (GHC.lookupName session)) (words str) - substs <- catMaybes `liftM` mapM (io . go cms) + substs <- catMaybes `liftM` mapM (go session) [id | AnId id <- tythings] - mapM (io . applySubstToEnv cms . skolemSubst) substs + mapM (applySubstToEnv session . skolemSubst) substs return () where - -- Do the obtainTerm--bindSuspensions-refineIdType dance - -- Warning! This function got a good deal of side-effects + -- Do the obtainTerm--bindSuspensions-computeSubstitution dance go :: Session -> Id -> IO (Maybe TvSubst) - go cms id = do - mb_term <- obtainTerm cms force id - maybe (return Nothing) `flip` mb_term $ \term -> do + go cms id = do + mb_term <- obtainTerm cms force id + maybe (return Nothing) `flip` mb_term $ \term_ -> do + term <- tidyTermTyVars cms term_ term' <- if not bindThings then return term else bindSuspensions cms term showterm <- printTerm cms term' @@ -82,8 +77,17 @@ pprintClosureCommand bindThings force str = do -- Then, we extract a substitution, -- mapping the old tyvars to the reconstructed types. let Just reconstructed_type = termType term - mb_subst = tcUnifyTys (const BindMe) [idType id] [reconstructed_type] - ASSERT (isJust mb_subst) return mb_subst + + -- tcUnifyTys doesn't look through forall's, so we drop them from + -- the original type, instead of sigma-typing the reconstructed type + -- In addition, we strip newtypes too, since the reconstructed type might + -- not have recovered them all + mb_subst = tcUnifyTys (const BindMe) + [repType' $ dropForAlls$ idType id] + [repType' $ reconstructed_type] + + ASSERT2 (isJust mb_subst, ppr reconstructed_type $$ (ppr$ idType id)) + return mb_subst applySubstToEnv :: Session -> TvSubst -> IO () applySubstToEnv cms subst | isEmptyTvSubst subst = return () @@ -95,9 +99,24 @@ pprintClosureCommand bindThings force str = do ids = typeEnvIds type_env ids' = map (\id -> id `setIdType` substTy subst (idType id)) ids type_env'= extendTypeEnvWithIds type_env ids' - ictxt' = ictxt { ic_type_env = type_env' } + subst_dom= varEnvKeys$ getTvSubstEnv subst + ictxt' = ictxt { ic_type_env = type_env' + , ic_tyvars = foldl' delVarSetByKey + (ic_tyvars ictxt) + subst_dom } writeIORef ref (hsc_env {hsc_IC = ictxt'}) + tidyTermTyVars :: Session -> Term -> IO Term + tidyTermTyVars (Session ref) t = do + hsc_env <- readIORef ref + let env_tvs = ic_tyvars (hsc_IC hsc_env) + my_tvs = termTyVars t + tvs = env_tvs `minusVarSet` my_tvs + tyvarOccName = nameOccName . tyVarName + tidyEnv = (initTidyOccEnv (map tyvarOccName (varSetElems tvs)) + , env_tvs `intersectVarSet` my_tvs) + return$ mapTermType (snd . tidyOpenType tidyEnv) t + -- | Give names, and bind in the interactive environment, to all the suspensions -- included (inductively) in a term bindSuspensions :: Session -> Term -> IO Term @@ -105,7 +124,6 @@ bindSuspensions cms@(Session ref) t = do hsc_env <- readIORef ref inScope <- GHC.getBindings cms let ictxt = hsc_IC hsc_env - rn_env = ic_rn_local_env ictxt type_env = ic_type_env ictxt prefix = "_t" alreadyUsedNames = map (occNameString . nameOccName . getName) inScope @@ -113,12 +131,14 @@ bindSuspensions cms@(Session ref) t = do availNames_var <- newIORef availNames (t', stuff) <- foldTerm (nameSuspensionsAndGetInfos availNames_var) t let (names, tys, hvals) = unzip3 stuff - let ids = [ mkGlobalId VanillaGlobal name (mk_skol_ty ty) vanillaIdInfo - | (name,ty) <- zip names tys] + let tys' = map mk_skol_ty tys + let ids = [ mkGlobalId VanillaGlobal name ty vanillaIdInfo + | (name,ty) <- zip names tys'] + new_tyvars = tyVarsOfTypes tys' new_type_env = extendTypeEnvWithIds type_env ids - new_rn_env = extendLocalRdrEnv rn_env names - new_ic = ictxt { ic_rn_local_env = new_rn_env, - ic_type_env = new_type_env } + old_tyvars = ic_tyvars ictxt + new_ic = ictxt { ic_type_env = new_type_env, + ic_tyvars = old_tyvars `unionVarSet` new_tyvars } extendLinkEnv (zip names hvals) writeIORef ref (hsc_env {hsc_IC = new_ic }) return t' @@ -174,13 +194,10 @@ printTerm cms@(Session ref) = cPprTerm cPpr bindToFreshName hsc_env ty userName = do name <- newGrimName cms userName let ictxt = hsc_IC hsc_env - rn_env = ic_rn_local_env ictxt type_env = ic_type_env ictxt id = mkGlobalId VanillaGlobal name ty vanillaIdInfo new_type_env = extendTypeEnv type_env (AnId id) - new_rn_env = extendLocalRdrEnv rn_env [name] - new_ic = ictxt { ic_rn_local_env = new_rn_env, - ic_type_env = new_type_env } + new_ic = ictxt { ic_type_env = new_type_env } return (hsc_env {hsc_IC = new_ic }, name) -- Create new uniques and give them sequentially numbered names @@ -198,4 +215,4 @@ mk_skol_ty ty | tyvars <- varSetElems (tyVarsOfType ty) , tyvars' <- map (mkTyVarTy . mk_skol_tv) tyvars = substTyWith tyvars tyvars' ty mk_skol_tv tv = mkTcTyVar (tyVarName tv) (tyVarKind tv) - (SkolemTv UnkSkol) + (SkolemTv RuntimeUnkSkol)