Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/15ec88354665844635f6e16ba10902d7cc03f7ba >--------------------------------------------------------------- commit 15ec88354665844635f6e16ba10902d7cc03f7ba Author: Simon Peyton Jones <[email protected]> Date: Fri Feb 10 15:33:53 2012 +0000 Complete fix of #5820 There are two related changes in here a) Fix TcRnDriver.setInteractiveContext so that it initialises tcg_insts and tcg_fam_insts, as well as the corresponding tcg_inst_env and tcg_fam_inst_env fields. Vital! b) Fix FamInst.tcExtendLocalFamInstEnv for the GHCi case. It had a special HACK to allow family instances to be overridden in GHCi. Fair enough, but * It was only affecting the tcg_fam_inst_env, not tcg_fam_insts * It overrode home-package instances as well as ones entered at the GHCi prompt, which probably wasn't intended. I fixed both of these, and also narrowed the scope of what it does to override only *identical* instances, rather than any ones that conflict. If people yelp about this we can return to the question, but for now it narrows the range of the HACK compiler/typecheck/FamInst.lhs | 59 +++++++++++++++++++++--------------- compiler/typecheck/TcRnDriver.lhs | 4 ++- compiler/types/FamInstEnv.lhs | 56 +++++++++++++---------------------- 3 files changed, 58 insertions(+), 61 deletions(-) Diff suppressed because of size. To see it, use: git show 15ec88354665844635f6e16ba10902d7cc03f7ba _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
