[project @ 2001-04-30 13:50:59 by panne]

[ghc-hetmet.git] / ghc / compiler / typecheck / TcTyClsDecls.lhs

diff --git a/ghc/compiler/typecheck/TcTyClsDecls.lhs b/ghc/compiler/typecheck/TcTyClsDecls.lhs
index 1bd7312..de26ef9 100644 (file)
--- a/ghc/compiler/typecheck/TcTyClsDecls.lhs
+++ b/ghc/compiler/typecheck/TcTyClsDecls.lhs
@@ -25,7 +25,7 @@ import TcEnv          ( TcEnv, RecTcEnv, TcTyThing(..), TyThing(..), TyThingDetails(..),
                          tcExtendKindEnv, tcLookup, tcExtendGlobalEnv, tcExtendGlobalValEnv )
 import TcTyDecls       ( tcTyDecl1, kcConDetails, mkNewTyConRep )
 import TcClassDcl      ( tcClassDecl1 )
-import TcMonoType      ( kcHsTyVars, kcHsType, kcHsBoxedSigType, kcHsContext, mkTyClTyVars )
+import TcMonoType      ( kcHsTyVars, kcHsType, kcHsLiftedSigType, kcHsContext, mkTyClTyVars )
 import TcType          ( TcKind, newKindVar, zonkKindEnv )
 
 import TcUnify         ( unifyKind )
@@ -40,7 +40,7 @@ import Var            ( varName )
 import FiniteMap
 import Digraph         ( stronglyConnComp, SCC(..) )
 import Name            ( Name, getSrcLoc, isTyVarName )
-import Name            ( NameEnv, mkNameEnv, lookupNameEnv_NF )
+import NameEnv         ( NameEnv, mkNameEnv, lookupNameEnv_NF )
 import NameSet
 import Outputable
 import Maybes          ( mapMaybe )
@@ -110,7 +110,7 @@ Step 5:     tcTyClDecl1
 Step 6:                tcTyClDecl1 again
        For a recursive group only, check all the decls again, just
        but this time with the wimp flag off.  Now we can check things
-       like whether a function argument is an unboxed tuple, looking
+       like whether a function argument is an unlifted tuple, looking
        through type synonyms properly.  We can't do that in Step 5.
 
 Step 7:                Extend environment
@@ -252,7 +252,7 @@ kcTyClDecl decl@(ClassDecl {tcdCtxt = context,  tcdSigs = class_sigs})
     kcHsContext context                `thenTc_`
     mapTc_ kc_sig (filter isClassOpSig class_sigs)
   where
-    kc_sig (ClassOpSig _ _ op_ty loc) = kcHsBoxedSigType op_ty
+    kc_sig (ClassOpSig _ _ op_ty loc) = kcHsLiftedSigType op_ty
 
 kcTyClDeclBody :: RenamedTyClDecl -> (Kind -> TcM a) -> TcM a
 -- Extend the env with bindings for the tyvars, taken from
@@ -412,7 +412,7 @@ tyClDeclFTVs d = foldNameSet add [] (tyClDeclFVs d)
 
 mkClassEdges :: RenamedTyClDecl -> Maybe (RenamedTyClDecl, Name, [Name])
 
-mkClassEdges decl@(ClassDecl {tcdCtxt = ctxt, tcdName = name}) = Just (decl, name, [c | HsPClass c _ <- ctxt])
+mkClassEdges decl@(ClassDecl {tcdCtxt = ctxt, tcdName = name}) = Just (decl, name, [c | HsClassP c _ <- ctxt])
 mkClassEdges other_decl                                               = Nothing
 
 mkEdges :: RenamedTyClDecl -> (RenamedTyClDecl, Name, [Name])