X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FDebugger.hs;h=4e610685ebd2e070c8bf50027d3752f1039646e5;hb=182edd420fe8d5ec0d12fcabaec7d13416a77cd6;hp=31f21a7da1296a2c96348976b563b2c10e8fdecd;hpb=fd9c8b7edda8512c147b2ff982129659ef39979d;p=ghc-hetmet.git diff --git a/compiler/ghci/Debugger.hs b/compiler/ghci/Debugger.hs index 31f21a7..4e61068 100644 --- a/compiler/ghci/Debugger.hs +++ b/compiler/ghci/Debugger.hs @@ -15,22 +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 TyCon +import TcType import TcGadt import GHC -import GhciMonad import Outputable import Pretty ( Mode(..), showDocWith ) @@ -51,28 +48,24 @@ import GHC.Exts ------------------------------------- -- | The :print & friends commands ------------------------------------- -pprintClosureCommand :: Bool -> Bool -> String -> GHCi () -pprintClosureCommand bindThings force str = do - cms <- getSession - newvarsNames <- io$ do - uniques <- liftM uniqsFromSupply (mkSplitUniqSupply 'q') - return$ map (\u-> (mkSysTvName u (mkFastString "a"))) uniques - mb_ids <- io$ mapM (cleanUp cms newvarsNames) (words str) - mb_new_ids <- mapM (io . go cms) (catMaybes mb_ids) - io$ updateIds cms (catMaybes mb_new_ids) +pprintClosureCommand :: Session -> Bool -> Bool -> String -> IO () +pprintClosureCommand session bindThings force str = do + tythings <- (catMaybes . concat) `liftM` + mapM (\w -> GHC.parseName session w >>= + mapM (GHC.lookupName session)) + (words str) + substs <- catMaybes `liftM` mapM (go session) + [id | AnId id <- tythings] + mapM (applySubstToEnv session . skolemSubst) substs + return () where - -- Find the Id - cleanUp :: Session -> [Name] -> String -> IO (Maybe Id) - cleanUp cms newNames str = do - tythings <- GHC.parseName cms str >>= mapM (GHC.lookupName cms) - return$ listToMaybe [ i | Just (AnId i) <- tythings] - - -- Do the obtainTerm--bindSuspensions-refineIdType dance - -- Warning! This function got a good deal of side-effects - go :: Session -> Id -> IO (Maybe Id) - go cms id = do - mb_term <- obtainTerm cms force id - maybe (return Nothing) `flip` mb_term $ \term -> do + + -- 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 + term <- tidyTermTyVars cms term_ term' <- if not bindThings then return term else bindSuspensions cms term showterm <- printTerm cms term' @@ -81,34 +74,48 @@ pprintClosureCommand bindThings force str = do showDocWith LeftMode (doc (mkErrStyle unqual)) (putStrLn . showSDocForUserOneLine unqual) (ppr id <+> char '=' <+> showterm) -- Before leaving, we compare the type obtained to see if it's more specific - let Just reconstructedType = termType term - new_type = mostSpecificType (idType id) reconstructedType - return . Just $ setIdType id new_type - - updateIds :: Session -> [Id] -> IO () - updateIds (Session ref) new_ids = do + -- Then, we extract a substitution, + -- mapping the old tyvars to the reconstructed types. + let Just reconstructed_type = termType term + + -- 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 () + applySubstToEnv cms@(Session ref) subst = 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' = map (\id -> id `setIdType` substTy subst (idType id)) ids + type_env'= extendTypeEnvWithIds type_env ids' + 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 ictxt = hsc_IC hsc_env - type_env = ic_type_env ictxt - filtered_type_env = delListFromNameEnv type_env (map idName new_ids) - new_type_env = extendTypeEnvWithIds filtered_type_env new_ids - new_ic = ictxt {ic_type_env = new_type_env } - writeIORef ref (hsc_env {hsc_IC = new_ic }) - -isMoreSpecificThan :: Type -> Type -> Bool -ty `isMoreSpecificThan` ty1 - | Just subst <- tcUnifyTys bindOnlyTy1 [repType' ty] [repType' ty1] - , substFiltered <- filter (not.isTyVarTy) . varEnvElts . getTvSubstEnv $ subst - , not . null $ substFiltered - , all (flip notElemTvSubst subst) ty_vars - = True - | otherwise = False - where bindOnlyTy1 tyv | tyv `elem` ty_vars = AvoidMe - | otherwise = BindMe - ty_vars = varSetElems$ tyVarsOfType ty - -mostSpecificType ty1 ty2 | ty1 `isMoreSpecificThan` ty2 = ty1 - | otherwise = ty2 + 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 @@ -117,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 @@ -125,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 tys' = map mk_skol_ty tys let ids = [ mkGlobalId VanillaGlobal name ty vanillaIdInfo - | (name,ty) <- zip names tys] + | (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' @@ -186,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 @@ -203,3 +208,11 @@ newGrimName cms userName = do occname = mkOccName varName userName name = mkInternalName unique occname noSrcLoc return name + +skolemSubst subst = subst `setTvSubstEnv` + mapVarEnv mk_skol_ty (getTvSubstEnv subst) +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 RuntimeUnkSkol)