Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/3d0cf09c7bbdd36bfea3517f33d3aff72cbe16cd >--------------------------------------------------------------- commit 3d0cf09c7bbdd36bfea3517f33d3aff72cbe16cd Merge: 007bfeb... 09addd3... Author: Iavor S. Diatchki <[email protected]> Date: Fri May 11 15:35:32 2012 -0700 Merge remote-tracking branch 'origin/master' into type-nats Conflicts: compiler/typecheck/TcEvidence.lhs compiler/deSugar/DsMeta.hs | 43 +++--- compiler/ghci/ByteCodeGen.lhs | 3 + compiler/hsSyn/Convert.lhs | 22 ++-- compiler/hsSyn/HsDecls.lhs | 32 ++-- compiler/hsSyn/HsPat.lhs | 4 +- compiler/hsSyn/HsTypes.lhs | 124 +++++++++-------- compiler/hsSyn/HsUtils.lhs | 5 +- compiler/parser/Parser.y.pp | 8 +- compiler/parser/ParserCore.y | 10 +- compiler/parser/RdrHsSyn.lhs | 25 ++-- compiler/rename/RnBinds.lhs | 2 +- compiler/rename/RnEnv.lhs | 17 ++- compiler/rename/RnPat.lhs | 4 +- compiler/rename/RnSource.lhs | 81 +++++------ compiler/rename/RnTypes.lhs | 264 +++++++++++++++++++++-------------- compiler/typecheck/TcEvidence.lhs | 32 ++++- compiler/typecheck/TcHsType.lhs | 41 +++--- compiler/typecheck/TcRnDriver.lhs | 9 +- compiler/typecheck/TcSMonad.lhs | 61 ++++---- compiler/typecheck/TcTyClsDecls.lhs | 31 ++-- compiler/types/TyCon.lhs | 6 - compiler/types/Type.lhs | 2 +- 22 files changed, 451 insertions(+), 375 deletions(-) diff --cc compiler/typecheck/TcEvidence.lhs index 4739c43,09704fb..684220b --- a/compiler/typecheck/TcEvidence.lhs +++ b/compiler/typecheck/TcEvidence.lhs @@@ -248,8 -242,8 +248,9 @@@ coVarsOfTcCo tc_c go (TcNthCo _ co) = go co go (TcLetCo (EvBinds bs) co) = foldrBag (unionVarSet . go_bind) (go co) bs `minusVarSet` get_bndrs bs - go (TcLetCo {}) = pprPanic "coVarsOfTcCo called on non-zonked TcCoercion" (ppr tc_co) + go (TcLetCo {}) = emptyVarSet -- Harumph. This does legitimately happen in the call + -- to evVarsOfTerm in the DEBUG check of setEvBind + go (TcTypeNatCo _ _ cos) = foldr (unionVarSet . go) emptyVarSet cos -- We expect only coercion bindings go_bind :: EvBind -> VarSet _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
