newIfaceName, newIfaceNames,
extendIfaceIdEnv, extendIfaceTyVarEnv,
tcIfaceLclId, tcIfaceTyVar,
+ tcIfaceTick,
ifaceExportNames,
import OccName
import PrelNames
import Module
-import UniqFM
+import LazyUniqFM
import FastString
import UniqSupply
import FiniteMap
import BasicTypes
import SrcLoc
+import MkId
import Outputable
\end{code}
%*********************************************************
\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
--
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
allocateGlobalBinder
:: NameCache
- -> Module -> OccName -> SrcLoc
+ -> Module -> OccName -> SrcSpan
-> (NameCache, Name)
allocateGlobalBinder name_supply mod occ loc
= case lookupOrigNameCache (nsNames name_supply) mod occ of
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
p_name <- lookupOrig mod p_occ
let lookup_sub occ | occ == p_occ = return p_name
| otherwise = lookupOrig mod occ
- subs <- mappM lookup_sub occs
+ subs <- mapM lookup_sub occs
return (AvailTC p_name subs)
-- Remember that 'occs' is all the exported things, including
-- the parent. It's possible to export just class ops without
-- 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 {
- Just name -> returnM name;
+ Just name -> return name;
Nothing ->
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
}}}
newIPName :: IPName OccName -> TcRnIf m n (IPName Name)
-newIPName occ_name_ip
- = getNameCache `thenM` \ name_supply ->
+newIPName occ_name_ip = do
+ name_supply <- getNameCache
let
ipcache = nsIPs name_supply
- in
case lookupFM ipcache key of
- Just name_ip -> returnM name_ip
- Nothing -> setNameCache new_ns `thenM_`
- returnM name_ip
+ Just name_ip -> return name_ip
+ Nothing -> do setNameCache new_ns
+ return name_ip
where
(us', us1) = splitUniqSupply (nsUniqs name_supply)
uniq = uniqFromSupply us1
key = occ_name_ip -- Ensures that ?x and %x get distinct Names
\end{code}
- Local helper functions (not exported)
+%************************************************************************
+%* *
+ Name cache access
+%* *
+%************************************************************************
\begin{code}
lookupOrigNameCache :: OrigNameCache -> Module -> OccName -> Maybe Name
-lookupOrigNameCache nc mod occ
- | mod == dATA_TUP || mod == gHC_PRIM, -- Boxed tuples from one,
+lookupOrigNameCache _ mod occ
+ -- XXX Why is gHC_UNIT not mentioned here?
+ | mod == gHC_TUPLE || mod == gHC_PRIM, -- Boxed tuples from one,
Just tup_info <- isTupleOcc_maybe occ -- unboxed from the other
= -- Special case for tuples; there are too many
-- of them to pre-populate the original-name cache
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}
+
+%************************************************************************
+%* *
+ (Re)creating tick boxes
+%* *
+%************************************************************************
+
+\begin{code}
+tcIfaceTick :: Module -> Int -> IfL Id
+tcIfaceTick modName tickNo
+ = do { uniq <- newUnique
+ ; return $ mkTickBoxOpId uniq modName tickNo
+ }
+\end{code}
+
+