refactoring only

[ghc-hetmet.git] / compiler / ghci / Debugger.hs

diff --git a/compiler/ghci/Debugger.hs b/compiler/ghci/Debugger.hs
index 44c37fb..138992f 100644 (file)
--- a/compiler/ghci/Debugger.hs
+++ b/compiler/ghci/Debugger.hs
@@ -63,8 +63,7 @@ pprintClosureCommand session bindThings force str = 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_ <- obtainTerm cms force id 
        term      <- tidyTermTyVars cms term_
        term'     <- if not bindThings then return term 
                      else bindSuspensions cms term                         
@@ -99,7 +98,7 @@ pprintClosureCommand session bindThings force str = do
           ids'     = map (\id -> id `setIdType` substTy subst (idType id)) ids
           subst_dom= varEnvKeys$ getTvSubstEnv subst
           subst_ran= varEnvElts$ getTvSubstEnv subst
-          new_tvs  = [ tv | t <- subst_ran, let Just tv = getTyVar_maybe t]  
+          new_tvs  = [ tv | Just tv <- map getTyVar_maybe subst_ran]  
           ic_tyvars'= (`delVarSetListByKey` subst_dom) 
                     . (`extendVarSetList`   new_tvs)
                         $ ic_tyvars ictxt