Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-holes-branch
http://hackage.haskell.org/trac/ghc/changeset/f8270f76fbbb8f5ef07ff2386bba0e187b1603c1 >--------------------------------------------------------------- commit f8270f76fbbb8f5ef07ff2386bba0e187b1603c1 Author: Thijs Alkemade <[email protected]> Date: Thu Jan 12 18:06:44 2012 +0100 Fixed some merge conflicts I missed. >--------------------------------------------------------------- compiler/typecheck/TcRnMonad.lhs | 25 ++----------------------- 1 files changed, 2 insertions(+), 23 deletions(-) diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs index c320d94..1ddfd6e 100644 --- a/compiler/typecheck/TcRnMonad.lhs +++ b/compiler/typecheck/TcRnMonad.lhs @@ -153,8 +153,8 @@ initTc hsc_env hsc_src keep_rn_syntax mod do_this tcl_tyvars = tvs_var, tcl_lie = lie_var, tcl_meta = meta_var, -<<<<<<< HEAD - tcl_untch = initTyVarUnique + tcl_untch = initTyVarUnique, + tcl_holes = holes_var } ; } ; @@ -164,19 +164,6 @@ initTc hsc_env hsc_src keep_rn_syntax mod do_this ; case r of Right res -> return (Just res) Left _ -> return Nothing } ; -======= - tcl_untch = initTyVarUnique, - tcl_holes = holes_var - } ; - } ; - - -- OK, here's the business end! - maybe_res <- initTcRnIf 'a' hsc_env gbl_env lcl_env $ - do { r <- tryM do_this - ; case r of - Right res -> return (Just res) - Left _ -> return Nothing } ; ->>>>>>> 43e18c1... Added a field to the local environment to store the TyVars of holes. -- Check for unsolved constraints lie <- readIORef lie_var ; @@ -1195,19 +1182,11 @@ initIfaceTc :: ModIface -- Used when type-checking checking an up-to-date interface file -- No type envt from the current module, but we do know the module dependencies initIfaceTc iface do_this -<<<<<<< HEAD - = do { tc_env_var <- newTcRef emptyTypeEnv - ; let { gbl_env = IfGblEnv { if_rec_types = Just (mod, readTcRef tc_env_var) } ; - ; if_lenv = mkIfLclEnv mod doc - } - ; setEnvs (gbl_env, if_lenv) (do_this tc_env_var) -======= = do { liftIO $ putStrLn "initIfaceTc" ; tc_env_var <- newTcRef emptyTypeEnv ; let { gbl_env = IfGblEnv { if_rec_types = Just (mod, readTcRef tc_env_var) } ; ; if_lenv = mkIfLclEnv mod doc } ; setEnvs (gbl_env, if_lenv) (do_this tc_env_var) ->>>>>>> 43e18c1... Added a field to the local environment to store the TyVars of holes. } where mod = mi_module iface _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
