Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/f92591defcb5c4803c301558d51e3f8c9c92a985 >--------------------------------------------------------------- commit f92591defcb5c4803c301558d51e3f8c9c92a985 Author: Simon Peyton Jones <[email protected]> Date: Mon Feb 6 08:38:59 2012 +0000 Refactor HsDecls again, to put family instances in InstDecl This continues the clean up of the front end. Since they were first invented, type and data family *instance* decls have been in the TyClDecl data type, even though they always treated separately. This patch takes a step in the right direction * The InstDecl type now includes both class instances and type/data family instances * The hs_tyclds field of HsGroup now never has any family instance declarations in it However a family instance is still a TyClDecl. It should really be a separate type, but that's the next step. All this was provoked by fixing Trac #5792 in the HEAD. (I did a less invasive fix on the branch.) compiler/deSugar/DsMeta.hs | 16 ++++++--- compiler/hsSyn/Convert.lhs | 20 ++++++----- compiler/hsSyn/HsDecls.lhs | 61 +++++++++++++++++++++++------------ compiler/hsSyn/HsUtils.lhs | 24 ++++++++------ compiler/main/HscStats.lhs | 13 ++++--- compiler/parser/Parser.y.pp | 33 +++++++++++-------- compiler/rename/RnNames.lhs | 29 ++++++++-------- compiler/rename/RnSource.lhs | 23 +++++++++---- compiler/typecheck/TcDeriv.lhs | 2 +- compiler/typecheck/TcInstDcls.lhs | 35 ++++++++++---------- compiler/typecheck/TcTyClsDecls.lhs | 11 ++---- utils/ghctags/Main.hs | 2 +- 12 files changed, 156 insertions(+), 113 deletions(-) Diff suppressed because of size. To see it, use: git show f92591defcb5c4803c301558d51e3f8c9c92a985 _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
