X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcHsType.lhs;h=8d57bcdb9fa6341294f6372f3b27a74ea2b0974c;hp=4d3224c596d1643ff60f2cf5031a01944aeb92bb;hb=17b297d97d327620ed6bfab942f8992b2446f1bf;hpb=654a1ba16e47d3ddabeb74b809ee6097c0770d35

diff --git a/compiler/typecheck/TcHsType.lhs b/compiler/typecheck/TcHsType.lhs
index 4d3224c..8d57bcd 100644
--- a/compiler/typecheck/TcHsType.lhs
+++ b/compiler/typecheck/TcHsType.lhs
@@ -5,8 +5,16 @@
 \section[TcMonoType]{Typechecking user-specified @MonoTypes@}
 
 \begin{code}
+{-# OPTIONS_GHC -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings
+-- for details
+
 module TcHsType (
-	tcHsSigType, tcHsDeriv,
+	tcHsSigType, tcHsDeriv, 
+	tcHsInstHead, tcHsQuantifiedType,
 	UserTypeCtxt(..), 
 
 		-- Kind checking
@@ -143,6 +151,24 @@ tcHsSigType ctxt hs_ty
 	; checkValidType ctxt ty	
 	; returnM ty }
 
+tcHsInstHead :: LHsType Name -> TcM ([TyVar], ThetaType, Type)
+-- Typecheck an instance head.  We can't use 
+-- tcHsSigType, because it's not a valid user type.
+tcHsInstHead hs_ty
+  = do	{ kinded_ty <- kcHsSigType hs_ty
+	; poly_ty   <- tcHsKindedType kinded_ty
+	; return (tcSplitSigmaTy poly_ty) }
+
+tcHsQuantifiedType :: [LHsTyVarBndr Name] -> LHsType Name -> TcM ([TyVar], Type)
+-- Behave very like type-checking (HsForAllTy sig_tvs hs_ty),
+-- except that we want to keep the tvs separate
+tcHsQuantifiedType tv_names hs_ty
+  = kcHsTyVars tv_names $ \ tv_names' ->
+    do	{ kc_ty <- kcHsSigType hs_ty
+    	; tcTyVarBndrs tv_names' $ \ tvs ->
+    do	{ ty <- dsHsType kc_ty
+    	; return (tvs, ty) } }
+
 -- Used for the deriving(...) items
 tcHsDeriv :: LHsType Name -> TcM ([TyVar], Class, [Type])
 tcHsDeriv = addLocM (tc_hs_deriv [])
@@ -398,10 +424,11 @@ kc_pred pred@(HsClassP cls tys)
        }
 kc_pred pred@(HsEqualP ty1 ty2)
   = do { (ty1', kind1) <- kcHsType ty1
-       ; checkExpectedKind ty1 kind1 liftedTypeKind
+--       ; checkExpectedKind ty1 kind1 liftedTypeKind
        ; (ty2', kind2) <- kcHsType ty2
-       ; checkExpectedKind ty2 kind2 liftedTypeKind
-       ; returnM (HsEqualP ty1 ty2, liftedTypeKind)
+--       ; checkExpectedKind ty2 kind2 liftedTypeKind
+       ; checkExpectedKind ty2 kind2 kind1
+       ; returnM (HsEqualP ty1' ty2', liftedTypeKind)
        }
 
 ---------------------------
@@ -506,6 +533,9 @@ ds_type full_ty@(HsForAllTy exp tv_names ctxt ty)
 
 ds_type (HsSpliceTy {}) = panic "ds_type: HsSpliceTy"
 
+ds_type (HsDocTy ty _)  -- Remove the doc comment
+  = dsHsType ty
+
 dsHsTypes arg_tys = mappM dsHsType arg_tys
 \end{code}
 
@@ -626,7 +656,7 @@ tcTyVarBndrs bndrs thing_inside
   where
     zonk (KindedTyVar name kind) = do { kind' <- zonkTcKindToKind kind
 				      ; return (mkTyVar name kind') }
-    zonk (UserTyVar name) = pprTrace "Un-kinded tyvar" (ppr name) $
+    zonk (UserTyVar name) = WARN( True, ptext SLIT("Un-kinded tyvar") <+> ppr name )
 			    return (mkTyVar name liftedTypeKind)
 
 -----------------------------------
@@ -641,9 +671,8 @@ tcDataKindSig (Just kind)
   = do	{ checkTc (isLiftedTypeKind res_kind) (badKindSig kind)
 	; span <- getSrcSpanM
 	; us   <- newUniqueSupply 
-	; let loc   = srcSpanStart span
-	      uniqs = uniqsFromSupply us
-	; return [ mk_tv loc uniq str kind 
+	; let uniqs = uniqsFromSupply us
+	; return [ mk_tv span uniq str kind 
 		 | ((kind, str), uniq) <- arg_kinds `zip` names `zip` uniqs ] }
   where
     (arg_kinds, res_kind) = splitKindFunTys kind
@@ -722,16 +751,10 @@ tcHsPatSigType ctxt hs_ty
 			| n <- nameSetToList (extractHsTyVars hs_ty),
 			  not (in_scope n) ]
 
-	-- Behave very like type-checking (HsForAllTy sig_tvs hs_ty),
-	-- except that we want to keep the tvs separate
-	; (kinded_tvs, kinded_ty) <- kcHsTyVars sig_tvs $ \ kinded_tvs -> do
-				    { kinded_ty <- kcTypeType hs_ty
-				    ; return (kinded_tvs, kinded_ty) }
-	; tcTyVarBndrs kinded_tvs $ \ tyvars -> do
-	{ sig_ty <- dsHsType kinded_ty
+	; (tyvars, sig_ty) <- tcHsQuantifiedType sig_tvs hs_ty
 	; checkValidType ctxt sig_ty 
 	; return (tyvars, sig_ty)
-      } }
+      }
 
 tcPatSig :: UserTypeCtxt
 	 -> LHsType Name