Store a SrcSpan instead of a SrcLoc inside a Name

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

diff --git a/compiler/ghci/Debugger.hs b/compiler/ghci/Debugger.hs
index 89d658d..6d8e870 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
@@ -127,7 +126,6 @@ bindSuspensions cms@(Session ref) t = do
       hsc_env <- readIORef ref
       inScope <- GHC.getBindings cms
       let ictxt        = hsc_IC hsc_env
-          type_env     = ic_tmp_ids ictxt
           prefix       = "_t"
           alreadyUsedNames = map (occNameString . nameOccName . getName) inScope
           availNames   = map ((prefix++) . show) [1..] \\ alreadyUsedNames 
@@ -138,13 +136,11 @@ bindSuspensions cms@(Session ref) t = do
       let ids = [ mkGlobalId VanillaGlobal name ty vanillaIdInfo
                 | (name,ty) <- zip names tys']
           new_tyvars   = tyVarsOfTypes tys'
-          old_tyvars   = ic_tyvars ictxt
-          new_ic       = ictxt { ic_tmp_ids = ids ++ ic_tmp_ids ictxt,
-                                 ic_tyvars   = old_tyvars `unionVarSet` new_tyvars }
+          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)]))
@@ -207,7 +203,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`