[project @ 2001-08-03 20:40:43 by sof]

[ghc-hetmet.git] / ghc / compiler / prelude / PrelInfo.lhs

diff --git a/ghc/compiler/prelude/PrelInfo.lhs b/ghc/compiler/prelude/PrelInfo.lhs
index 0a532a1..34e049f 100644 (file)
--- a/ghc/compiler/prelude/PrelInfo.lhs
+++ b/ghc/compiler/prelude/PrelInfo.lhs
@@ -8,9 +8,8 @@ module PrelInfo (
        module PrelNames,
        module MkId,
 
-       wiredInNames,   -- Names of wired in things
-       wiredInThings,
-
+       wiredInThings,  -- Names of wired in things
+       wiredInThingEnv,
        
        -- Primop RdrNames
        eqH_Char_RDR,   ltH_Char_RDR,   eqH_Word_RDR,  ltH_Word_RDR, 
@@ -33,21 +32,16 @@ module PrelInfo (
 import PrelNames       -- Prelude module names
 
 import PrimOp          ( PrimOp(..), allThePrimOps, primOpRdrName )
-import DataCon         ( DataCon, dataConId, dataConWrapId )
+import DataCon         ( DataCon )
 import MkId            ( mkPrimOpId, wiredInIds )
 import MkId            -- All of it, for re-export
 import TysPrim         ( primTyCons )
 import TysWiredIn      ( wiredInTyCons )
-import HscTypes                ( TyThing(..) )
+import HscTypes        ( TyThing(..), implicitTyThingIds, TypeEnv, mkTypeEnv )
 
 -- others:
-import RdrName         ( RdrName )
-import Name            ( Name, getName )
-import TyCon           ( tyConDataConsIfAvailable, TyCon )
 import Class           ( Class, classKey )
 import Type            ( funTyCon )
-import Bag
-import BasicTypes      ( Boxity(..) )
 import Util            ( isIn )
 \end{code}
 
@@ -64,8 +58,9 @@ We have two ``builtin name funs,'' one to look up @TyCons@ and
 wiredInThings :: [TyThing]
 wiredInThings
   = concat
-    [          -- Wired in TyCons
-         map ATyCon ([funTyCon] ++ primTyCons ++ wiredInTyCons)
+    [          -- Wired in TyCons and their implicit Ids
+         tycon_things
+       , map AnId (implicitTyThingIds tycon_things)
 
                -- Wired in Ids
        , map AnId wiredInIds
@@ -73,16 +68,11 @@ wiredInThings
                -- PrimOps
        , map (AnId . mkPrimOpId) allThePrimOps
     ]
+  where
+    tycon_things = map ATyCon ([funTyCon] ++ primTyCons ++ wiredInTyCons)
 
-wiredInNames :: [Name]
-wiredInNames = [n | thing <- wiredInThings, n <- tyThingNames]
-
-tyThingNames :: TyCon -> [Name]
-tyThingNames (AnClass cl) = pprPanic "tyThingNames" (ppr cl)   -- Not used
-tyThingNames (AnId    id) = [getName id]
-tyThingNames (ATyCon  tc) = getName tycon : [ getName n | dc <- tyConDataConsIfAvailable tycon, 
-                                                         n  <- [dataConId dc, dataConWrapId dc] ]
-                                               -- Synonyms return empty list of constructors
+wiredInThingEnv :: TypeEnv
+wiredInThingEnv = mkTypeEnv wiredInThings
 \end{code}
 
 We let a lot of "non-standard" values be visible, so that we can make