Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/3ab27e95b3d27df419112cdc64d59e85f298ffb3 >--------------------------------------------------------------- commit 3ab27e95b3d27df419112cdc64d59e85f298ffb3 Author: Julien Cretin <[email protected]> Date: Fri Sep 23 22:44:21 2011 +0200 fix data con name extraction >--------------------------------------------------------------- compiler/rename/RnHsSyn.lhs | 2 +- compiler/typecheck/TcTyClsDecls.lhs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/rename/RnHsSyn.lhs b/compiler/rename/RnHsSyn.lhs index 457f262..90773e8 100644 --- a/compiler/rename/RnHsSyn.lhs +++ b/compiler/rename/RnHsSyn.lhs @@ -135,7 +135,7 @@ hsSigFVs _ = emptyFVs conDeclFVs :: LConDecl Name -> FreeVars conDeclFVs (L _ (ConDecl { con_qvars = tyvars, con_cxt = context, con_details = details, con_res = res_ty})) - = delFVs (map hsLTyVarName tyvars) $ + = extractHsTyVarBndrNames_s tyvars $ extractHsCtxtTyNames context `plusFV` conDetailsFVs details `plusFV` conResTyFVs res_ty diff --git a/compiler/typecheck/TcTyClsDecls.lhs b/compiler/typecheck/TcTyClsDecls.lhs index bdc344e..f6adaf2 100644 --- a/compiler/typecheck/TcTyClsDecls.lhs +++ b/compiler/typecheck/TcTyClsDecls.lhs @@ -219,7 +219,7 @@ kcTyClGroup decls alg_at_decls = flattenATs alg_decls ; mod <- getModule - ; traceTc "tcTyAndCl" (ptext (sLit "module") <+> ppr mod $$ vcat (map ppr decls)) + ; traceTc "kcTyClGroup" (ptext (sLit "module") <+> ppr mod $$ vcat (map ppr decls)) -- Kind checking; see Note [Kind checking for type and class decls] ; initial_kinds <- concatMapM getInitialKind alg_at_decls _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
