From eeb635d0ed2346568e312ac06ce7f2f1ecb434be Mon Sep 17 00:00:00 2001 From: Manuel M T Chakravarty Date: Wed, 5 Sep 2007 13:02:44 +0000 Subject: [PATCH] FIX #1651: use family instances during interactive typechecking --- compiler/typecheck/TcRnDriver.lhs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs index fadd442..7c79e62 100644 --- a/compiler/typecheck/TcRnDriver.lhs +++ b/compiler/typecheck/TcRnDriver.lhs @@ -837,16 +837,16 @@ get two defns for 'main' in the interface file! #ifdef GHCI setInteractiveContext :: HscEnv -> InteractiveContext -> TcRn a -> TcRn a setInteractiveContext hsc_env icxt thing_inside - = let - -- Initialise the tcg_inst_env with instances - -- from all home modules. This mimics the more selective - -- call to hptInstances in tcRnModule - dfuns = fst (hptInstances hsc_env (\mod -> True)) + = let -- Initialise the tcg_inst_env with instances from all home modules. + -- This mimics the more selective call to hptInstances in tcRnModule. + (home_insts, home_fam_insts) = hptInstances hsc_env (\mod -> True) in updGblEnv (\env -> env { - tcg_rdr_env = ic_rn_gbl_env icxt, - tcg_inst_env = extendInstEnvList (tcg_inst_env env) dfuns }) $ - + tcg_rdr_env = ic_rn_gbl_env icxt, + tcg_inst_env = extendInstEnvList (tcg_inst_env env) home_insts, + tcg_fam_inst_env = extendFamInstEnvList (tcg_fam_inst_env env) + home_fam_insts + }) $ tcExtendGhciEnv (ic_tmp_ids icxt) $ -- tcExtendGhciEnv does lots: -- 1.7.10.4