[project @ 2000-07-15 15:09:45 by panne]

Merged Marcin's patches for unboxed thingies

diff --git a/ghc/compiler/typecheck/TcMonoType.lhs b/ghc/compiler/typecheck/TcMonoType.lhs
index 17189bd..fbf9a71 100644 (file)
--- a/ghc/compiler/typecheck/TcMonoType.lhs
+++ b/ghc/compiler/typecheck/TcMonoType.lhs
@@ -256,8 +256,8 @@ kcHsPred pred@(HsPClass cls tys)
 %*                                                                     *
 %************************************************************************
 
-tcHsType and tcHsTypeKind
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+tcHsSigType and tcHsBoxedSigType
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 tcHsSigType and tcHsBoxedSigType are used for type signatures written by the programmer
 
@@ -283,8 +283,8 @@ tcHsBoxedSigType ty
 \end{code}
 
 
-The main work horse
-~~~~~~~~~~~~~~~~~~~
+tcHsType, the main work horse
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 \begin{code}
 tcHsType :: RenamedHsType -> TcM s Type

diff --git a/ghc/compiler/typecheck/TcTyDecls.lhs b/ghc/compiler/typecheck/TcTyDecls.lhs
index 2340aef..226918e 100644 (file)
--- a/ghc/compiler/typecheck/TcTyDecls.lhs
+++ b/ghc/compiler/typecheck/TcTyDecls.lhs
@@ -20,7 +20,7 @@ import RnHsSyn                ( RenamedTyClDecl, RenamedConDecl, RenamedContext )
 import TcHsSyn         ( TcMonoBinds, idsToMonoBinds )
 import BasicTypes      ( RecFlag(..), NewOrData(..) )
 
-import TcMonoType      ( tcHsSigType, tcHsBoxedSigType, kcTyVarScope, tcClassContext,
+import TcMonoType      ( tcHsType, tcHsSigType, tcHsBoxedSigType, kcTyVarScope, tcClassContext,
                          kcHsContext, kcHsSigType, mkImmutTyVars
                        )
 import TcEnv           ( tcExtendTyVarEnv, tcLookupTy, tcLookupValueByKey, TyThing(..), TyThingDetails(..) )
@@ -66,7 +66,7 @@ tcTyDecl1 :: RenamedTyClDecl -> TcM s (Name, TyThingDetails)
 tcTyDecl1 (TySynonym tycon_name tyvar_names rhs src_loc)
   = tcLookupTy tycon_name                      `thenNF_Tc` \ (ATyCon tycon) ->
     tcExtendTyVarEnv (tyConTyVars tycon)       $
-    tcHsSigType rhs                            `thenTc` \ rhs_ty ->
+    tcHsType rhs                               `thenTc` \ rhs_ty ->
        -- If the RHS mentions tyvars that aren't in scope, we'll 
        -- quantify over them.  With gla-exts that's right, but for H98
        -- we should complain. We can now do that here without falling into