X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghci%2FDebugger.hs;h=6d8e870883653ad5463a87de1d3b35525085b9cd;hp=4389213849c986273b4ca8f9363e616fcf880318;hb=940524aec90652b5ef81789c9a453c57c0e42cc9;hpb=38e7ac3ffa32d75c1922e7247a910e06d9957116 diff --git a/compiler/ghci/Debugger.hs b/compiler/ghci/Debugger.hs index 4389213..6d8e870 100644 --- a/compiler/ghci/Debugger.hs +++ b/compiler/ghci/Debugger.hs @@ -12,26 +12,22 @@ module Debugger (pprintClosureCommand) where -import qualified DebuggerTys 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 ) @@ -52,67 +48,76 @@ 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, clean up 'Unknowns' - cleanUp :: Session -> [Name] -> String -> IO (Maybe Id) - cleanUp cms newNames str = do - tythings <- GHC.parseName cms str >>= mapM (GHC.lookupName cms) - return$ listToMaybe (map (stripUnknowns newNames) - [ 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 + term_ <- obtainTerm cms force id + term <- tidyTermTyVars cms term_ term' <- if not bindThings then return term else bindSuspensions cms term - showterm <- pprTerm 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) -- Before leaving, we compare the type obtained to see if it's more specific - -- Note how we need the Unknown-clear type returned by obtainTerm - let Just reconstructedType = termType term - new_type <- instantiateTyVarsToUnknown cms - (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 + ids = ic_tmp_ids ictxt + ids' = map (\id -> id `setIdType` substTy subst (idType id)) ids + 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 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 @@ -121,25 +126,21 @@ 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 - concrete_tys <- mapM (instantiateTyVarsToUnknown cms) tys + let tys' = map mk_skol_ty tys let ids = [ mkGlobalId VanillaGlobal name ty vanillaIdInfo - | (name,ty) <- zip names concrete_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 } + | (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)])) @@ -160,10 +161,10 @@ bindSuspensions cms@(Session ref) t = do -- A custom Term printer to enable the use of Show instances -pprTerm cms@(Session ref) = customPrintTerm customPrint +printTerm cms@(Session ref) = cPprTerm cPpr where - customPrint = \p-> customPrintShowable : customPrintTermBase p - customPrintShowable t@Term{ty=ty, dc=dc, val=val} = do + cPpr = \p-> cPprShowable : cPprTermBase p + cPprShowable prec t@Term{ty=ty, dc=dc, val=val} = do let hasType = isEmptyVarSet (tyVarsOfType ty) -- redundant isEvaled = isFullyEvaluatedTerm t if not isEvaled -- || not hasType @@ -179,8 +180,10 @@ pprTerm cms@(Session ref) = customPrintTerm customPrint GHC.setSessionDynFlags cms dflags{log_action=noop_log} mb_txt <- withExtendedLinkEnv [(bname, val)] (GHC.compileExpr cms expr) + let myprec = 9 -- TODO Infix constructors case mb_txt of - Just txt -> return . Just . text . unsafeCoerce# $ txt + Just txt -> return . Just . text . unsafeCoerce# + $ txt Nothing -> return Nothing `finally` do writeIORef ref hsc_env @@ -189,13 +192,9 @@ pprTerm cms@(Session ref) = customPrintTerm customPrint 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 @@ -204,47 +203,13 @@ 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 --- | The inverse function. Strip the GHC.Base.Unknowns in the type of the id, they correspond to tyvars. The caller must provide an infinite list of fresh names -stripUnknowns :: [Name] -> Id -> Id -stripUnknowns names id = setIdType id . fst . go names . idType - $ id - where - go tyvarsNames@(v:vv) ty - | Just (ty1,ty2) <- splitFunTy_maybe ty = let - (ty1',vv') = go tyvarsNames ty1 - (ty2',vv'')= go vv' ty2 - in (mkFunTy ty1' ty2', vv'') - | Just (ty1,ty2) <- splitAppTy_maybe ty = let - (ty1',vv') = go tyvarsNames ty1 - (ty2',vv'')= go vv' ty2 - in (mkAppTy ty1' ty2', vv'') - | Just (tycon, args) <- splitTyConApp_maybe ty - , Just (tycon', vv') <- (fixTycon tycon tyvarsNames) - , (args',vv'') <- foldr (\arg (aa,vv) -> let (arg',vv') = go vv' arg - in (arg':aa,vv')) - ([],vv') args - = (mkAppTys tycon' args',vv'') - | Just (tycon, args) <- splitTyConApp_maybe ty - , (args',vv') <- foldr (\arg (aa,vv) -> let (arg',vv') = go vv' arg - in (arg':aa,vv')) - ([],tyvarsNames) args - = (mkTyConApp tycon args',vv') - | otherwise = (ty, tyvarsNames) - where fixTycon tycon (v:vv) = do - k <- lookup (tyConName tycon) kinds - return (mkTyVarTy$ mkTyVar v k, vv) - kinds = [ (unknownTyConName, liftedTypeKind) - , (unknown1TyConName, kind1) - , (unknown2TyConName, kind2) - , (unknown3TyConName, kind3)] - kind1 = mkArrowKind liftedTypeKind liftedTypeKind - kind2 = mkArrowKind kind1 liftedTypeKind - kind3 = mkArrowKind kind2 liftedTypeKind - -instantiateTyVarsToUnknown :: Session -> Type -> IO Type -instantiateTyVarsToUnknown (Session ref) ty - = do hsc_env <- readIORef ref - DebuggerTys.instantiateTyVarsToUnknown hsc_env ty +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)