Commit e2971311 authored by simonpj's avatar simonpj
Browse files

[project @ 2003-02-06 17:11:13 by simonpj]

Minor tidy up of known-key names
parent 0c039fb9
......@@ -44,7 +44,7 @@ import SrcLoc ( mkSrcLoc, noSrcLoc )
import TcRnDriver ( checkOldIface, tcRnModule, tcRnExtCore, tcRnIface )
import RnEnv ( extendOrigNameCache )
import Rules ( emptyRuleBase )
import PrelInfo ( wiredInThingEnv, wiredInThings, knownKeyNames )
import PrelInfo ( wiredInThingEnv, knownKeyNames )
import PrelRules ( builtinRules )
import MkIface ( mkIface )
import InstEnv ( emptyInstEnv )
......@@ -722,10 +722,5 @@ initExternalPackageState
gate_fn vis_fn = vis_fn name -- Load the rule whenever name is visible
initOrigNames :: OrigNameCache
initOrigNames
= insert knownKeyNames $
insert (map getName wiredInThings) $
emptyModuleEnv
where
insert names env = foldl extendOrigNameCache env names
initOrigNames = foldl extendOrigNameCache emptyModuleEnv knownKeyNames
\end{code}
......@@ -40,7 +40,7 @@ import DataCon ( DataCon )
import Id ( idName )
import MkId ( mkPrimOpId, wiredInIds )
import MkId -- All of it, for re-export
import Name ( Name, nameOccName )
import Name ( Name, nameOccName, NamedThing(..) )
import RdrName ( mkRdrUnqual, getRdrName )
import HsSyn ( HsTyVarBndr(..) )
import OccName ( mkVarOcc )
......@@ -87,7 +87,8 @@ wiredInThingEnv = mkTypeEnv wiredInThings
knownKeyNames :: [Name]
knownKeyNames
= basicKnownKeyNames
= map getName wiredInThings
++ basicKnownKeyNames
#ifdef GHCI
++ nameSetToList templateHaskellNames
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment