X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FGHC.hs;h=e8ea87c6b395bb60c561331ef64206e60d8f139e;hp=82fbf5b362c27d59f5e29b018c822e9e912036c3;hb=9bcd95bad83ee937c178970e8b729732e680fe1e;hpb=613c5f6d88a3dd7df56af1d0f3780b885a0d17cd

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index 82fbf5b..e8ea87c 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -74,6 +74,7 @@ module GHC (
 	modInfoIsExportedName,
 	modInfoLookupName,
 	lookupGlobalName,
+	findGlobalAnns,
         mkPrintUnqualifiedForModule,
 
 	-- * Printing
@@ -196,6 +197,20 @@ module GHC (
         srcSpanStartLine, srcSpanEndLine, 
         srcSpanStartCol, srcSpanEndCol,
 
+        -- ** Located
+	Located(..),
+
+	-- *** Constructing Located
+	noLoc, mkGeneralLocated,
+
+	-- *** Deconstructing Located
+	getLoc, unLoc,
+
+	-- *** Combining and comparing Located values
+	eqLocated, cmpLocated, combineLocs, addCLoc,
+        leftmost_smallest, leftmost_largest, rightmost,
+        spans, isSubspanOf,
+
 	-- * Exceptions
 	GhcException(..), showGhcException,
 
@@ -264,6 +279,7 @@ import StaticFlagParser
 import qualified StaticFlags
 import SysTools     ( initSysTools, cleanTempFiles, cleanTempFilesExcept,
                       cleanTempDirs )
+import Annotations
 import Module
 import LazyUniqFM
 import UniqSet
@@ -290,6 +306,8 @@ import System.Directory ( getModificationTime, doesFileExist,
 import Data.Maybe
 import Data.List
 import qualified Data.List as List
+import Data.Typeable    ( Typeable )
+import Data.Word        ( Word8 )
 import Control.Monad
 import System.Exit	( exitWith, ExitCode(..) )
 import System.Time	( ClockTime, getClockTime )
@@ -1159,6 +1177,7 @@ mkModGuts coreModule = ModGuts {
   mg_binds = cm_binds coreModule,
   mg_foreign = NoStubs,
   mg_warns = NoWarnings,
+  mg_anns = [],
   mg_hpc_info = emptyHpcInfo False,
   mg_modBreaks = emptyModBreaks,
   mg_vect_info = noVectInfo,
@@ -1689,11 +1708,12 @@ reachableBackwards mod summaries
 type SummaryNode = (ModSummary, Int, [Int])
 
 topSortModuleGraph
-	  :: Bool 		-- Drop hi-boot nodes? (see below)
+	  :: Bool
+          -- ^ Drop hi-boot nodes? (see below)
 	  -> [ModSummary]
 	  -> Maybe ModuleName
 	  -> [SCC ModSummary]
--- Calculate SCCs of the module graph, possibly dropping the hi-boot nodes
+-- ^ Calculate SCCs of the module graph, possibly dropping the hi-boot nodes
 -- The resulting list of strongly-connected-components is in topologically
 -- sorted order, starting with the module(s) at the bottom of the
 -- dependency graph (ie compile them first) and ending with the ones at
@@ -1701,10 +1721,10 @@ topSortModuleGraph
 --
 -- Drop hi-boot nodes (first boolean arg)? 
 --
---   False:	treat the hi-boot summaries as nodes of the graph,
+-- - @False@:	treat the hi-boot summaries as nodes of the graph,
 --		so the graph must be acyclic
 --
---   True:	eliminate the hi-boot nodes, and instead pretend
+-- - @True@:	eliminate the hi-boot nodes, and instead pretend
 --		the a source-import of Foo is an import of Foo
 --		The resulting graph has no hi-boot nodes, but can be cyclic
 
@@ -2397,6 +2417,11 @@ lookupGlobalName name = withSession $ \hsc_env -> do
    return $! lookupType (hsc_dflags hsc_env) 
 			(hsc_HPT hsc_env) (eps_PTE eps) name
 
+findGlobalAnns :: (GhcMonad m, Typeable a) => ([Word8] -> a) -> AnnTarget Name -> m [a]
+findGlobalAnns deserialize target = withSession $ \hsc_env -> do
+    ann_env <- liftIO $ prepareAnnotations hsc_env Nothing
+    return (findAnns deserialize ann_env target)
+
 #ifdef GHCI
 -- | get the GlobalRdrEnv for a session
 getGRE :: GhcMonad m => m GlobalRdrEnv