Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/c9771dcbfe1a19f91d450f28fd92930cade3fb36 >--------------------------------------------------------------- commit c9771dcbfe1a19f91d450f28fd92930cade3fb36 Merge: 48aaf49... b7bd51b... Author: Julien Cretin <g...@ia0.eu> Date: Mon Sep 12 16:31:57 2011 +0200 Merge branch 'step3' into ia0_step3 Conflicts: compiler/typecheck/TcDeriv.lhs compiler/typecheck/TcHsType.lhs compiler/typecheck/TcTyClsDecls.lhs compiler/types/TypeRep.lhs compiler/TODO | 62 +++++++-- compiler/coreSyn/CoreLint.lhs | 9 +- compiler/hsSyn/HsDecls.lhs | 4 +- compiler/hsSyn/HsTypes.lhs | 5 +- compiler/iface/BuildTyCl.lhs | 6 +- compiler/iface/TcIface.lhs | 3 +- compiler/typecheck/TcDeriv.lhs | 2 +- compiler/typecheck/TcHsType.lhs | 103 ++++++++++++--- compiler/typecheck/TcInstDcls.lhs | 2 +- compiler/typecheck/TcMType.lhs | 5 +- compiler/typecheck/TcRnDriver.lhs | 9 +- compiler/typecheck/TcTyClsDecls.lhs | 176 ++++++++++++++---------- compiler/typecheck/TcUnify.lhs | 7 +- compiler/types/Kind.lhs | 7 +- compiler/types/TyCon.lhs | 30 ++++- compiler/types/Type.lhs | 16 +- compiler/types/TypeRep.lhs | 35 ++++- compiler/types/Unify.lhs | 11 +- compiler/vectorise/Vectorise/Type/PData.hs | 2 +- compiler/vectorise/Vectorise/Type/TyConDecl.hs | 1 + 20 files changed, 354 insertions(+), 141 deletions(-) Diff suppressed because of size. To see it, use: git show c9771dcbfe1a19f91d450f28fd92930cade3fb36 _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
