X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcRnDriver.lhs;h=c0e3f5f0f1df6c538b597725d3adea638078d7f3;hb=ead9311db6e098b3affdc552269ea52bad8c12b5;hp=309f616970bd96a4a5b6f3ede8000b1fffb3da38;hpb=2e8deb2a5d96cf02161d9081c56c6d2d6a35d045;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcRnDriver.lhs b/ghc/compiler/typecheck/TcRnDriver.lhs
index 309f616..c0e3f5f 100644
--- a/ghc/compiler/typecheck/TcRnDriver.lhs
+++ b/ghc/compiler/typecheck/TcRnDriver.lhs
@@ -690,12 +690,12 @@ tcTopSrcDecls boot_details
 		-- We also typecheck any extra binds that came out 
 		-- of the "deriving" process (deriv_binds)
         traceTc (text "Tc5") ;
-	(tc_val_binds, lcl_env) <- tcTopBinds (val_binds ++ deriv_binds) ;
-	setLclTypeEnv lcl_env 	$ do {
+	(tc_val_binds, tcl_env) <- tcTopBinds (val_binds ++ deriv_binds) ;
+	setLclTypeEnv tcl_env 	$ do {
 
 	     	-- Second pass over class and instance declarations, 
         traceTc (text "Tc6") ;
-	(tcl_env, inst_binds) <- tcInstDecls2 tycl_decls inst_infos ;
+	(inst_binds, tcl_env) <- tcInstDecls2 tycl_decls inst_infos ;
 	showLIE (text "after instDecls2") ;
 
 		-- Foreign exports
@@ -718,7 +718,7 @@ tcTopSrcDecls boot_details
 	      tcg_env' = tcg_env {  tcg_binds = tcg_binds tcg_env `unionBags` all_binds,
 				    tcg_rules = tcg_rules tcg_env ++ rules,
 				    tcg_fords = tcg_fords tcg_env ++ foe_decls ++ fi_decls } } ;
-  	return (tcg_env', lcl_env)
+  	return (tcg_env', tcl_env)
     }}}}}}
 \end{code}