Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/bf3b78b38b47715a8b030049045b4b140485a4b4 >--------------------------------------------------------------- commit bf3b78b38b47715a8b030049045b4b140485a4b4 Author: Jose Pedro Magalhaes <[email protected]> Date: Wed Nov 2 12:49:43 2011 +0000 Add warning, restore build >--------------------------------------------------------------- compiler/typecheck/TcMType.lhs | 7 ++++--- compiler/typecheck/TcType.lhs | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/compiler/typecheck/TcMType.lhs b/compiler/typecheck/TcMType.lhs old mode 100644 new mode 100755 index 492a686..8911977 --- a/compiler/typecheck/TcMType.lhs +++ b/compiler/typecheck/TcMType.lhs @@ -591,7 +591,8 @@ zonkQuantifiedTyVars tyvars -- may make zonkQuantifiedTyVars return a shorter list -- than it was passed, but that's ok do { let (meta_kvs, skolem_kvs) = partition isMetaTyVar kvs - ; mapM_ defaultKindVarToStar meta_kvs + ; WARN ( not (null skolem_kvs), ppr skolem_kvs ) + mapM_ defaultKindVarToStar meta_kvs ; mapM zonkQuantifiedTyVar (skolem_kvs ++ tvs) } } zonkQuantifiedTyVar :: TcTyVar -> TcM TcTyVar @@ -922,8 +923,8 @@ checkValidType ctxt ty = do SpecInstCtxt -> gen_rank 1 ThBrackCtxt -> gen_rank 1 GhciCtxt -> ArbitraryRank - GenSigCtxt -> panic "checkValidType" - -- Can't happen; GenSigCtxt not used for *user* sigs + _ -> panic "checkValidType" + -- Can't happen; not used for *user* sigs actual_kind = typeKind ty diff --git a/compiler/typecheck/TcType.lhs b/compiler/typecheck/TcType.lhs index b9f8caf..76c7fb7 100755 --- a/compiler/typecheck/TcType.lhs +++ b/compiler/typecheck/TcType.lhs @@ -436,9 +436,9 @@ pprUserTypeCtxt InstDeclCtxt = ptext (sLit "an instance declaration") pprUserTypeCtxt SpecInstCtxt = ptext (sLit "a SPECIALISE instance pragma") pprUserTypeCtxt GenSigCtxt = ptext (sLit "a type expected by the context") pprUserTypeCtxt GhciCtxt = ptext (sLit "a type in a GHCi command") -pprUserTyCtxt (ClassSCCtxt c) = ptext (sLit "the super-classes of class") <+> quotes (ppr c) -pprUserTyCtxt SigmaCtxt = ptext (sLit "the context of a polymorphic type") -pprUserTyCtxt (DataTyCtxt tc) = ptext (sLit "the context of the data type declaration for") <+> quotes (ppr tc) +pprUserTypeCtxt (ClassSCCtxt c) = ptext (sLit "the super-classes of class") <+> quotes (ppr c) +pprUserTypeCtxt SigmaCtxt = ptext (sLit "the context of a polymorphic type") +pprUserTypeCtxt (DataTyCtxt tc) = ptext (sLit "the context of the data type declaration for") <+> quotes (ppr tc) \end{code} _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
