X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FbasicTypes%2FId.lhs;h=1a2cb50b7de6b1e4ba876bb8bd081670fead4860;hb=f714e6b642fd614a9971717045ae47c3d871275e;hp=3d2b4f6a9e0d3f3a1dc62f96e1b130d2d08277eb;hpb=9e90a28e134b8e5af3f6ec9b7300bc41324fea9c;p=ghc-hetmet.git

diff --git a/ghc/compiler/basicTypes/Id.lhs b/ghc/compiler/basicTypes/Id.lhs
index 3d2b4f6..1a2cb50 100644
--- a/ghc/compiler/basicTypes/Id.lhs
+++ b/ghc/compiler/basicTypes/Id.lhs
@@ -8,10 +8,10 @@ module Id (
 	Id, DictId,
 
 	-- Simple construction
-	mkGlobalId, mkLocalId, mkSpecPragmaId, mkLocalIdWithInfo,
+	mkGlobalId, mkLocalId, mkSpecPragmaId, mkLocalIdWithInfo, 
 	mkSysLocal, mkSysLocalUnencoded, mkUserLocal, mkVanillaGlobal,
 	mkTemplateLocals, mkTemplateLocalsNum, mkWildId, mkTemplateLocal,
-	mkWorkerId,
+	mkWorkerId, mkExportedLocalId,
 
 	-- Taking an Id apart
 	idName, idType, idUnique, idInfo,
@@ -19,7 +19,7 @@ module Id (
 	recordSelectorFieldLabel,
 
 	-- Modifying an Id
-	setIdName, setIdUnique, setIdType, setIdLocalExported, setGlobalIdDetails,
+	setIdName, setIdUnique, Id.setIdType, setIdLocalExported, setGlobalIdDetails,
 	setIdInfo, lazySetIdInfo, modifyIdInfo, maybeModifyIdInfo,
 	zapLamIdInfo, zapDemandIdInfo, 
 
@@ -83,12 +83,12 @@ import BasicTypes	( Arity )
 import Var		( Id, DictId,
 			  isId, isExportedId, isSpecPragmaId, isLocalId,
 			  idName, idType, idUnique, idInfo, isGlobalId,
-			  setIdName, setVarType, setIdUnique, setIdLocalExported,
+			  setIdName, setIdType, setIdUnique, setIdLocalExported,
 			  setIdInfo, lazySetIdInfo, modifyIdInfo, 
 			  maybeModifyIdInfo,
 			  globalIdDetails, setGlobalIdDetails
 			)
-import qualified Var	( mkLocalId, mkGlobalId, mkSpecPragmaId )
+import qualified Var	( mkLocalId, mkGlobalId, mkSpecPragmaId, mkExportedLocalId )
 import Type		( Type, typePrimRep, addFreeTyVars, seqType)
 
 import IdInfo 
@@ -146,6 +146,9 @@ mkLocalIdWithInfo name ty info = Var.mkLocalId name (addFreeTyVars ty) info
 mkSpecPragmaId :: Name -> Type -> Id
 mkSpecPragmaId name ty = Var.mkSpecPragmaId name (addFreeTyVars ty) vanillaIdInfo
 
+mkExportedLocalId :: Name -> Type -> Id
+mkExportedLocalId name ty = Var.mkExportedLocalId name (addFreeTyVars ty) vanillaIdInfo
+
 mkGlobalId :: GlobalIdDetails -> Name -> Type -> IdInfo -> Id
 mkGlobalId details name ty info = Var.mkGlobalId details name (addFreeTyVars ty) info
 \end{code}
@@ -209,7 +212,7 @@ mkTemplateLocal i ty = mkSysLocal FSLIT("tpl") (mkBuiltinUnique i) ty
 \begin{code}
 setIdType :: Id -> Type -> Id
 	-- Add free tyvar info to the type
-setIdType id ty = seqType ty `seq` setVarType id (addFreeTyVars ty)
+setIdType id ty = seqType ty `seq` Var.setIdType id (addFreeTyVars ty)
 
 idPrimRep :: Id -> PrimRep
 idPrimRep id = typePrimRep (idType id)