X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FGHC.hs;h=ef9fd02c2c01aab5690b588ad32fcaf6d5034a8d;hb=8d5364c135b7d40ae62c63ff9e65c684a1712694;hp=c292cf013d2abd1ce253507642215d68486a197d;hpb=ead424357937b23f30295608b467aacbc3a8a8bc;p=ghc-hetmet.git

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index c292cf0..ef9fd02 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -59,6 +59,9 @@ module GHC (
 	modInfoInstances,
 	modInfoIsExportedName,
 	modInfoLookupName,
+#if defined(GHCI)
+        modInfoBkptSites,
+#endif
 	lookupGlobalName,
 
 	-- * Printing
@@ -849,6 +852,9 @@ checkModule session@(Session ref) mod = do
                                                      md_exports details,
 				minf_rdr_env   = Just rdr_env,
 				minf_instances = md_insts details
+#ifdef GHCI
+                               ,minf_dbg_sites = noDbgSites
+#endif
 			      }
 		   return (Just (CheckedModule {
 					parsedSource = parsed,
@@ -1757,7 +1763,10 @@ data ModuleInfo = ModuleInfo {
 	minf_type_env  :: TypeEnv,
 	minf_exports   :: NameSet, -- ToDo, [AvailInfo] like ModDetails?
 	minf_rdr_env   :: Maybe GlobalRdrEnv,	-- Nothing for a compiled/package mod
-	minf_instances :: [Instance]
+	minf_instances :: [Instance],
+#ifdef GHCI
+        minf_dbg_sites :: [(SiteNumber,Coord)] 
+#endif
 	-- ToDo: this should really contain the ModIface too
   }
 	-- We don't want HomeModInfo here, because a ModuleInfo applies
@@ -1796,7 +1805,8 @@ getPackageModuleInfo hsc_env mdl = do
 			minf_type_env  = mkTypeEnv tys,
 			minf_exports   = names,
 			minf_rdr_env   = Just $! nameSetToGlobalRdrEnv names (moduleName mdl),
-			minf_instances = error "getModuleInfo: instances for package module unimplemented"
+			minf_instances = error "getModuleInfo: instances for package module unimplemented",
+                        minf_dbg_sites = noDbgSites
 		}))
 #else
   -- bogusly different for non-GHCI (ToDo)
@@ -1813,6 +1823,9 @@ getHomeModuleInfo hsc_env mdl =
 			minf_exports   = availsToNameSet (md_exports details),
 			minf_rdr_env   = mi_globals $! hm_iface hmi,
 			minf_instances = md_insts details
+#ifdef GHCI
+                       ,minf_dbg_sites = md_dbg_sites details
+#endif
 			}))
 
 -- | The list of top-level entities defined in a module
@@ -1846,6 +1859,10 @@ modInfoLookupName s minf name = withSession s $ \hsc_env -> do
        return $! lookupType (hsc_dflags hsc_env) 
 			    (hsc_HPT hsc_env) (eps_PTE eps) name
 
+#ifdef GHCI
+modInfoBkptSites = minf_dbg_sites
+#endif
+
 isDictonaryId :: Id -> Bool
 isDictonaryId id
   = case tcSplitSigmaTy (idType id) of { (tvs, theta, tau) -> isDictTy tau }
@@ -2269,7 +2286,10 @@ mkSite (pkgName, modName, sitenum) =
   (mkModule (stringToPackageId pkgName) (mkModuleName modName), sitenum)
 
 obtainTerm :: Session -> Bool -> Id -> IO (Maybe Term)
-obtainTerm sess force id = withSession sess $ \hsc_env -> 
-              getHValue (varName id) >>= traverse (cvObtainTerm hsc_env force Nothing)
+obtainTerm sess force id = withSession sess $ \hsc_env -> do
+              mb_v <- getHValue (varName id) 
+              case mb_v of
+                Just v  -> fmap Just$ cvObtainTerm hsc_env force (Just$ idType id) v
+                Nothing -> return Nothing
 
 #endif /* GHCI */