X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FDebugger.hs;h=f662217a69f4926c8a49447835d9f590c21e70ff;hb=ece94e430901c3480e842dcdbbcbef2f1bc070f7;hp=52c60306c8d7e980b3d991285280cff3db1db254;hpb=808e6d4e915b12c29eaeada7b70318b829eafe82;p=ghc-hetmet.git diff --git a/compiler/ghci/Debugger.hs b/compiler/ghci/Debugger.hs index 52c6030..f662217 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,38 +48,46 @@ 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 + term_ <- obtainTerm cms force id + term <- tidyTermTyVars cms term_ term' <- if not bindThings then return term else bindSuspensions cms term showterm <- printTerm cms term' unqual <- GHC.getPrintUnqual cms let showSDocForUserOneLine unqual doc = showDocWith LeftMode (doc (mkErrStyle unqual)) - (putStrLn . showSDocForUserOneLine unqual) (ppr id <+> char '=' <+> showterm) + (putStrLn . showSDocForUserOneLine unqual) + (ppr id <+> char '=' <+> showterm) -- Before leaving, we compare the type obtained to see if it's more specific -- 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 () @@ -91,13 +95,31 @@ pprintClosureCommand bindThings force str = do hsc_env <- readIORef ref inScope <- GHC.getBindings cms let ictxt = hsc_IC hsc_env - type_env = ic_type_env ictxt - ids = typeEnvIds type_env + ids = ic_tmp_ids ictxt 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 + subst_ran= varEnvElts$ getTvSubstEnv subst + new_tvs = [ tv | Just tv <- map getTyVar_maybe subst_ran] + ic_tyvars'= (`delVarSetListByKey` subst_dom) + . (`extendVarSetList` new_tvs) + $ ic_tyvars ictxt + ictxt' = ictxt { ic_tmp_ids = ids' + , ic_tyvars = ic_tyvars' } writeIORef ref (hsc_env {hsc_IC = ictxt'}) + where delVarSetListByKey = foldl' delVarSetByKey + + 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,27 +127,25 @@ 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 availNames = map ((prefix++) . show) [1..] \\ alreadyUsedNames 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] - 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 } + let tys' = map mk_skol_ty tys + let ids = [ mkGlobalId VanillaGlobal name ty vanillaIdInfo + | (name,ty) <- zip names tys'] + new_tyvars = tyVarsOfTypes tys' + new_ic = extendInteractiveContext ictxt ids new_tyvars extendLinkEnv (zip names hvals) writeIORef ref (hsc_env {hsc_IC = new_ic }) return t' - where + where -- Processing suspensions. Give names and recopilate info - nameSuspensionsAndGetInfos :: IORef [String] -> TermFold (IO (Term, [(Name,Type,HValue)])) + nameSuspensionsAndGetInfos :: IORef [String] -> + TermFold (IO (Term, [(Name,Type,HValue)])) nameSuspensionsAndGetInfos freeNames = TermFold { fSuspension = doSuspension freeNames @@ -174,13 +194,9 @@ 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 + tmp_ids = ic_tmp_ids 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_tmp_ids = id : tmp_ids } return (hsc_env {hsc_IC = new_ic }, name) -- Create new uniques and give them sequentially numbered names @@ -189,7 +205,7 @@ newGrimName cms userName = do us <- mkSplitUniqSupply 'b' let unique = uniqFromSupply us occname = mkOccName varName userName - name = mkInternalName unique occname noSrcLoc + name = mkInternalName unique occname noSrcSpan return name skolemSubst subst = subst `setTvSubstEnv` @@ -198,4 +214,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)