[project @ 1997-06-05 20:39:47 by sof]

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

diff --git a/ghc/compiler/prelude/TysWiredIn.lhs b/ghc/compiler/prelude/TysWiredIn.lhs
index 742510f..3e3a71b 100644 (file)
--- a/ghc/compiler/prelude/TysWiredIn.lhs
+++ b/ghc/compiler/prelude/TysWiredIn.lhs
@@ -83,12 +83,20 @@ module TysWiredIn (
 --import Pretty
 --import Util
 --import PprType
---import PprStyle
 --import Kind
 
 IMP_Ubiq()
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(TyLoop)        ( mkDataCon, mkTupleCon, StrictnessMark(..) )
-IMPORT_DELOOPER(IdLoop)        ( SpecEnv )
+IMPORT_DELOOPER(IdLoop)        ( SpecEnv, nullSpecEnv, 
+                         mkTupleCon, mkDataCon, 
+                         StrictnessMark(..) )
+#else
+import {-# SOURCE #-} Id ( Id, mkDataCon, mkTupleCon, StrictnessMark(..) )
+import {-# SOURCE #-} SpecEnv ( SpecEnv, nullSpecEnv )
+import {-# SOURCE #-} Type ( Type )
+import {-# SOURCE #-} TyVar ( TyVar )
+#endif
 
 -- friends:
 import PrelMods
@@ -96,10 +104,11 @@ import TysPrim
 
 -- others:
 import Kind            ( mkBoxedTypeKind, mkArrowKind )
-import Name            ( mkWiredInTyConName, mkWiredInIdName, mkTupNameStr )
+import Name            --( mkWiredInTyConName, mkWiredInIdName, mkTupNameStr )
 import TyCon           ( mkDataTyCon, mkTupleTyCon, mkSynTyCon,
-                         NewOrData(..), TyCon
+                         TyCon, SYN_IE(Arity)
                        )
+import BasicTypes      ( NewOrData(..) )
 import Type            ( mkTyConTy, applyTyCon, mkSigmaTy, mkTyVarTys, 
                          mkFunTy, mkFunTys, maybeAppTyCon,
                          GenType(..), SYN_IE(ThetaType), SYN_IE(TauType) )
@@ -108,7 +117,7 @@ import Lex          ( mkTupNameStr )
 import Unique
 import Util            ( assoc, panic )
 
-nullSpecEnv =  error "TysWiredIn:nullSpecEnv =  "
+--nullSpecEnv =  error "TysWiredIn:nullSpecEnv =  "
 addOneToSpecEnv =  error "TysWiredIn:addOneToSpecEnv =  "
 pc_gen_specs = error "TysWiredIn:pc_gen_specs  "
 mkSpecInfo = error "TysWiredIn:SpecInfo"
@@ -147,12 +156,12 @@ pcDataCon key mod str tyvars context arg_tys tycon specenv
     data_con = mkDataCon name 
                [ NotMarkedStrict | a <- arg_tys ]
                [ {- no labelled fields -} ]
-               tyvars context arg_tys tycon
+               tyvars context [] [] arg_tys tycon
     name = mkWiredInIdName key mod str data_con
 
 pcGenerateDataSpecs :: Type -> SpecEnv
 pcGenerateDataSpecs ty
-  = pc_gen_specs False err err err ty
+  = pc_gen_specs --False err err err ty
   where
     err = panic "PrelUtils:GenerateDataSpecs"
 \end{code}
@@ -222,14 +231,14 @@ intDataCon = pcDataCon intDataConKey pREL_BASE SLIT("I#") [] [] [intPrimTy] intT
 wordTy = mkTyConTy wordTyCon
 
 wordTyCon = pcDataTyCon wordTyConKey   fOREIGN SLIT("Word") [] [wordDataCon]
-wordDataCon = pcDataCon wordDataConKey gHC__ SLIT("W#") [] [] [wordPrimTy] wordTyCon nullSpecEnv
+wordDataCon = pcDataCon wordDataConKey fOREIGN SLIT("W#") [] [] [wordPrimTy] wordTyCon nullSpecEnv
 \end{code}
 
 \begin{code}
 addrTy = mkTyConTy addrTyCon
 
 addrTyCon = pcDataTyCon addrTyConKey   fOREIGN SLIT("Addr") [] [addrDataCon]
-addrDataCon = pcDataCon addrDataConKey gHC__ SLIT("A#") [] [] [addrPrimTy] addrTyCon nullSpecEnv
+addrDataCon = pcDataCon addrDataConKey fOREIGN SLIT("A#") [] [] [addrPrimTy] addrTyCon nullSpecEnv
 \end{code}
 
 \begin{code}