import OccName
import PrelNames
import Module
-import UniqFM
+import LazyUniqFM
import FastString
import UniqSupply
import FiniteMap
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
; 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
}}}
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
\begin{code}
lookupOrigNameCache :: OrigNameCache -> Module -> OccName -> Maybe Name
-lookupOrigNameCache nc mod occ
+lookupOrigNameCache _ mod occ
| mod == dATA_TUP || 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