X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fiface%2FIfaceEnv.lhs;h=acdddb6b6b819ad9810d1ce8867731fcfa28dbd7;hp=3c3a34d6d84f53461145566f9d413b1cfdac8dc7;hb=940524aec90652b5ef81789c9a453c57c0e42cc9;hpb=49c98d143c382a1341e1046f5ca00819a25691ba

diff --git a/compiler/iface/IfaceEnv.lhs b/compiler/iface/IfaceEnv.lhs
index 3c3a34d..acdddb6 100644
--- a/compiler/iface/IfaceEnv.lhs
+++ b/compiler/iface/IfaceEnv.lhs
@@ -46,7 +46,7 @@ import Outputable
 %*********************************************************
 
 \begin{code}
-newGlobalBinder :: Module -> OccName -> SrcLoc -> TcRnIf a b Name
+newGlobalBinder :: Module -> OccName -> SrcSpan -> TcRnIf a b Name
 -- Used for source code and interface files, to make the
 -- Name for a thing, given its Module and OccName
 --
@@ -56,7 +56,7 @@ newGlobalBinder :: Module -> OccName -> SrcLoc -> TcRnIf a b Name
 
 newGlobalBinder mod occ loc
   = do	{ mod `seq` occ `seq` return ()	-- See notes with lookupOrig_help
-	; traceIf (text "newGlobalBinder" <+> ppr mod <+> ppr occ <+> ppr loc)
+--	; traceIf (text "newGlobalBinder" <+> ppr mod <+> ppr occ <+> ppr loc)
     	; name_supply <- getNameCache
 	; let (name_supply', name) = allocateGlobalBinder 
 					name_supply mod occ
@@ -66,7 +66,7 @@ newGlobalBinder mod occ loc
 
 allocateGlobalBinder
   :: NameCache 
-  -> Module -> OccName -> SrcLoc 
+  -> Module -> OccName -> SrcSpan
   -> (NameCache, Name)
 allocateGlobalBinder name_supply mod occ loc
   = case lookupOrigNameCache (nsNames name_supply) mod occ of
@@ -114,7 +114,7 @@ newImplicitBinder :: Name			-- Base name
 newImplicitBinder base_name mk_sys_occ
   = newGlobalBinder (nameModule base_name)
 		    (mk_sys_occ (nameOccName base_name))
-		    (nameSrcLoc base_name)    
+		    (nameSrcSpan base_name)    
 
 ifaceExportNames :: [IfaceExport] -> TcRnIf gbl lcl [AvailInfo]
 ifaceExportNames exports = do
@@ -146,7 +146,7 @@ lookupOrig mod occ
 		--	which does some stuff that modifies the name cache
 		-- This did happen, with tycon_mod in TcIface.tcIfaceAlt (DataAlt..)
 	  mod `seq` occ `seq` return ()	
-	; traceIf (text "lookup_orig" <+> ppr mod <+> ppr occ)
+--	; traceIf (text "lookup_orig" <+> ppr mod <+> ppr occ)
     
 	; name_cache <- getNameCache
     	; case lookupOrigNameCache (nsNames name_cache) mod occ of {
@@ -155,7 +155,7 @@ lookupOrig mod occ
               let
                 us        = nsUniqs name_cache
                 uniq      = uniqFromSupply us
-                name      = mkExternalName uniq mod occ noSrcLoc
+                name      = mkExternalName uniq mod occ noSrcSpan
                 new_cache = extendNameCache (nsNames name_cache) mod occ name
               in
               case splitUniqSupply us of { (us',_) -> do
@@ -292,11 +292,11 @@ lookupIfaceTop occ
 newIfaceName :: OccName -> IfL Name
 newIfaceName occ
   = do	{ uniq <- newUnique
-	; return $! mkInternalName uniq occ noSrcLoc }
+	; return $! mkInternalName uniq occ noSrcSpan }
 
 newIfaceNames :: [OccName] -> IfL [Name]
 newIfaceNames occs
   = do	{ uniqs <- newUniqueSupply
-	; return [ mkInternalName uniq occ noSrcLoc
+	; return [ mkInternalName uniq occ noSrcSpan
 		 | (occ,uniq) <- occs `zip` uniqsFromSupply uniqs] }
 \end{code}