X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FGHC.hs;h=6f6b7c8e38681988634e3dbc1bac2c049b6667b3;hb=315a1f6c671b9800909752c702bda347198dd60a;hp=b5707c7886adc9b5681f068ef8f8e5cdfc2ed571;hpb=ac10f8408520a30e8437496d320b8b86afda2e8f;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/GHC.hs b/ghc/compiler/main/GHC.hs
index b5707c7..6f6b7c8 100644
--- a/ghc/compiler/main/GHC.hs
+++ b/ghc/compiler/main/GHC.hs
@@ -62,6 +62,7 @@ module GHC (
 #ifdef GHCI
 	setContext, getContext,	
 	getNamesInScope,
+	getRdrNamesInScope,
 	moduleIsInterpreted,
 	getInfo,
 	exprType,
@@ -83,6 +84,7 @@ module GHC (
 	Name, 
 	nameModule, nameParent_maybe, pprParenSymName, nameSrcLoc,
 	NamedThing(..),
+	RdrName(Qual,Unqual),
 	
 	-- ** Identifiers
 	Id, idType,
@@ -176,7 +178,7 @@ import GHC.Exts		( unsafeCoerce# )
 
 import Packages		( initPackages )
 import NameSet		( NameSet, nameSetToList, elemNameSet )
-import RdrName		( GlobalRdrEnv, GlobalRdrElt(..), RdrName, 
+import RdrName		( GlobalRdrEnv, GlobalRdrElt(..), RdrName(..), 
 			  globalRdrEnvElts )
 import HsSyn
 import Type		( Kind, Type, dropForAlls, PredType, ThetaType,
@@ -199,7 +201,7 @@ import DataCon		( DataCon, dataConWrapId, dataConSig, dataConTyCon,
 			  dataConFieldLabels, dataConStrictMarks, 
 			  dataConIsInfix, isVanillaDataCon )
 import Name		( Name, nameModule, NamedThing(..), nameParent_maybe,
-			  nameSrcLoc )
+			  nameSrcLoc, nameOccName )
 import OccName		( parenSymOcc )
 import NameEnv		( nameEnvElts )
 import InstEnv		( Instance, instanceDFunId, pprInstance, pprInstanceHdr )
@@ -1887,6 +1889,25 @@ getNamesInScope :: Session -> IO [Name]
 getNamesInScope s = withSession s $ \hsc_env -> do
   return (map gre_name (globalRdrEnvElts (ic_rn_gbl_env (hsc_IC hsc_env))))
 
+getRdrNamesInScope :: Session -> IO [RdrName]
+getRdrNamesInScope  s = withSession s $ \hsc_env -> do
+  let env = ic_rn_gbl_env (hsc_IC hsc_env)
+  return (concat (map greToRdrNames (globalRdrEnvElts env)))
+
+-- ToDo: move to RdrName
+greToRdrNames :: GlobalRdrElt -> [RdrName]
+greToRdrNames GRE{ gre_name = name, gre_prov = prov }
+  = case prov of
+     LocalDef -> [unqual]
+     Imported specs -> concat (map do_spec (map is_decl specs))
+  where
+    occ = nameOccName name
+    unqual = Unqual occ
+    do_spec decl_spec
+	| is_qual decl_spec = [qual]
+	| otherwise         = [unqual,qual]
+	where qual = Qual (is_as decl_spec) occ
+
 -- | Parses a string as an identifier, and returns the list of 'Name's that
 -- the identifier can refer to in the current interactive context.
 parseName :: Session -> String -> IO [Name]