[project @ 2000-11-14 08:07:11 by simonpj]

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

diff --git a/ghc/compiler/prelude/PrelInfo.lhs b/ghc/compiler/prelude/PrelInfo.lhs
index 9bbfc67..f1a64ed 100644 (file)
--- a/ghc/compiler/prelude/PrelInfo.lhs
+++ b/ghc/compiler/prelude/PrelInfo.lhs
@@ -8,10 +8,8 @@ module PrelInfo (
        module PrelNames,
        module MkId,
 
-       wiredInNames,   -- Names of wired in things
-       wiredInThings,
-       maybeWiredInTyConName,
-       maybeWiredInIdName,
+       wiredInThings,  -- Names of wired in things
+       wiredInThingEnv,
        
        -- Primop RdrNames
        eqH_Char_RDR,   ltH_Char_RDR,   eqH_Word_RDR,  ltH_Word_RDR, 
@@ -39,19 +37,13 @@ import MkId         ( mkPrimOpId, wiredInIds )
 import MkId            -- All of it, for re-export
 import TysPrim         ( primTyCons )
 import TysWiredIn      ( wiredInTyCons )
-import HscTypes        ( TyThing(..) )
-import Id              ( Id, idName )
+import HscTypes        ( TyThing(..), TypeEnv, mkTypeEnv )
 
 -- others:
-import RdrName         ( RdrName )
-import Name            ( Name, getName )
-import TyCon           ( tyConDataConsIfAvailable, TyCon, tyConName )
+import TyCon           ( tyConDataConsIfAvailable, tyConGenIds, TyCon )
 import Class           ( Class, classKey )
 import Type            ( funTyCon )
-import Bag
-import BasicTypes      ( Boxity(..) )
 import Util            ( isIn )
-import Outputable      ( ppr, pprPanic )
 \end{code}
 
 %************************************************************************
@@ -68,7 +60,7 @@ wiredInThings :: [TyThing]
 wiredInThings
   = concat
     [          -- Wired in TyCons
-         map ATyCon ([funTyCon] ++ primTyCons ++ wiredInTyCons)
+         concat (map wiredInTyConThings ([funTyCon] ++ primTyCons ++ wiredInTyCons))
 
                -- Wired in Ids
        , map AnId wiredInIds
@@ -77,28 +69,18 @@ wiredInThings
        , map (AnId . mkPrimOpId) allThePrimOps
     ]
 
-wiredInNames :: [Name]
-wiredInNames = [n | thing <- wiredInThings, n <- tyThingNames thing]
-
-tyThingNames :: TyThing -> [Name]
-tyThingNames (AClass cl) = pprPanic "tyThingNames" (ppr cl)    -- Not used
-tyThingNames (AnId   id) = [getName id]
-tyThingNames (ATyCon tc) 
-   = getName tc : [ getName n | dc <- tyConDataConsIfAvailable tc, 
-                                n  <- [dataConId dc, dataConWrapId dc] ]
-                                               -- Synonyms return empty list of constructors
-
-maybeWiredInIdName :: Name -> Maybe Id
-maybeWiredInIdName nm
-   = case filter ((== nm).idName) wiredInIds of
-        []     -> Nothing
-        (i:is) -> Just i
-
-maybeWiredInTyConName :: Name -> Maybe TyCon
-maybeWiredInTyConName nm
-   = case filter ((== nm).tyConName) wiredInTyCons of
-        []       -> Nothing
-        (tc:tcs) -> Just tc
+wiredInTyConThings :: TyCon -> [TyThing]
+-- This is a bit of a cheat (c.f. TcTyDecls.mkImplicitDataBinds
+-- It assumes that wired in tycons have no record selectors
+wiredInTyConThings tc
+   = [ATyCon tc] 
+   ++ [ AnId i | i <- tyConGenIds tc ]
+   ++ [ AnId n | dc <- tyConDataConsIfAvailable tc, 
+                 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