X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcEnv.lhs;h=c93dbe156bf98a586ac4b1040198dd1913087333;hb=36104d7a0d66df895c8275e3aa7cfe35a322ff04;hp=98db64c9760e61fb78ae2c9905e0a36be458a356;hpb=9319fbaf14f420cbbd9e670093cc86c5f04b7800;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcEnv.lhs b/compiler/typecheck/TcEnv.lhs
index 98db64c..c93dbe1 100644
--- a/compiler/typecheck/TcEnv.lhs
+++ b/compiler/typecheck/TcEnv.lhs
@@ -12,7 +12,7 @@ module TcEnv(
 	InstBindings(..),
 
 	-- Global environment
-	tcExtendGlobalEnv, 
+	tcExtendGlobalEnv, setGlobalTypeEnv,
 	tcExtendGlobalValEnv,
 	tcLookupLocatedGlobal,	tcLookupGlobal, 
 	tcLookupField, tcLookupTyCon, tcLookupClass, tcLookupDataCon,
@@ -42,7 +42,8 @@ module TcEnv(
 	topIdLvl, thTopLevelId,
 
 	-- New Ids
-	newLocalName, newDFunName, newFamInstTyConName,
+	newLocalName, newDFunName, newFamInstTyConName, 
+	mkStableIdFromString, mkStableIdFromName
   ) where
 
 #include "HsVersions.h"
@@ -55,6 +56,7 @@ import TcMType
 import TcType
 -- import TcSuspension
 import qualified Type
+import Id
 import Var
 import VarSet
 import VarEnv
@@ -73,6 +75,7 @@ import HscTypes
 import SrcLoc
 import Outputable
 import Maybes
+import Unique
 import FastString
 \end{code}
 
@@ -106,9 +109,9 @@ tcLookupGlobal name
 		Nothing	   -> do 
 	 
 		-- Try global envt
-	{ (eps,hpt) <- getEpsAndHpt
-	; dflags <- getDOpts
-	; case lookupType dflags hpt (eps_PTE eps) name of  {
+	{ hsc_env <- getTopEnv
+        ; mb_thing <- liftIO (lookupTypeHscEnv hsc_env name)
+	; case mb_thing of  {
 	    Just thing -> return thing ;
 	    Nothing    -> do
 
@@ -212,28 +215,37 @@ tcLookupFamInst tycon tys
 
 
 \begin{code}
+setGlobalTypeEnv :: TcGblEnv -> TypeEnv -> TcM TcGblEnv
+-- Use this to update the global type env 
+-- It updates both  * the normal tcg_type_env field
+-- 	   	    * the tcg_type_env_var field seen by interface files
+setGlobalTypeEnv tcg_env new_type_env
+  = do  {     -- Sync the type-envt variable seen by interface files
+    	   writeMutVar (tcg_type_env_var tcg_env) new_type_env
+	 ; return (tcg_env { tcg_type_env = new_type_env }) }
+
 tcExtendGlobalEnv :: [TyThing] -> TcM r -> TcM r
   -- Given a mixture of Ids, TyCons, Classes, all from the
   -- module being compiled, extend the global environment
 tcExtendGlobalEnv things thing_inside
-   = do	{ env <- getGblEnv
-	; let ge'  = extendTypeEnvList (tcg_type_env env) things
-	; setGblEnv (env {tcg_type_env = ge'}) thing_inside }
+   = do	{ tcg_env <- getGblEnv
+	; let ge'  = extendTypeEnvList (tcg_type_env tcg_env) things
+	; tcg_env' <- setGlobalTypeEnv tcg_env ge'
+	; setGblEnv tcg_env' thing_inside }
 
 tcExtendGlobalValEnv :: [Id] -> TcM a -> TcM a
   -- Same deal as tcExtendGlobalEnv, but for Ids
 tcExtendGlobalValEnv ids thing_inside 
   = tcExtendGlobalEnv [AnId id | id <- ids] thing_inside
-\end{code}
 
-\begin{code}
 tcExtendRecEnv :: [(Name,TyThing)] -> TcM r -> TcM r
 -- Extend the global environments for the type/class knot tying game
+-- Just like tcExtendGlobalEnv, except the argument is a list of pairs
 tcExtendRecEnv gbl_stuff thing_inside
- = updGblEnv upd thing_inside
- where
-   upd env = env { tcg_type_env = extend (tcg_type_env env) }
-   extend env = extendNameEnvList env gbl_stuff
+ = do  { tcg_env <- getGblEnv
+       ; let ge' = extendNameEnvList (tcg_type_env tcg_env) gbl_stuff 
+       ; tcg_env' <- setGlobalTypeEnv tcg_env ge'
+       ; setGblEnv tcg_env' thing_inside }
 \end{code}
 
 
@@ -673,6 +685,27 @@ newFamInstTyConName tc_name loc
 	; newGlobalBinder mod (mkInstTyTcOcc index occ) loc }
 \end{code}
 
+Stable names used for foreign exports and annotations.
+For stable names, the name must be unique (see #1533).  If the
+same thing has several stable Ids based on it, the
+top-level bindings generated must not have the same name.
+Hence we create an External name (doesn't change), and we
+append a Unique to the string right here.
+
+\begin{code}
+mkStableIdFromString :: String -> Type -> SrcSpan -> (OccName -> OccName) -> TcM TcId
+mkStableIdFromString str sig_ty loc occ_wrapper = do
+    uniq <- newUnique
+    mod <- getModule
+    let uniq_str = showSDoc (pprUnique uniq) :: String
+        occ = mkVarOcc (str ++ '_' : uniq_str) :: OccName
+        gnm = mkExternalName uniq mod (occ_wrapper occ) loc :: Name
+	id  = mkExportedLocalId gnm sig_ty :: Id
+    return id
+
+mkStableIdFromName :: Name -> Type -> SrcSpan -> (OccName -> OccName) -> TcM TcId
+mkStableIdFromName nm = mkStableIdFromString (getOccString nm)
+\end{code}
 
 %************************************************************************
 %*									*