X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2FdeSugar%2FDesugar.lhs;h=b4ff2733fdba1ad0b2281d8cc8a246970f75d4c6;hb=8ab093423360990fc108d86098fc6bfb3b555269;hp=d16672c4bd1880414076d1dab92bb9bb1bdd3030;hpb=376101055fb111ebd52b5ef1fb76e00334b44304;p=ghc-hetmet.git

diff --git a/compiler/deSugar/Desugar.lhs b/compiler/deSugar/Desugar.lhs
index d16672c..b4ff273 100644
--- a/compiler/deSugar/Desugar.lhs
+++ b/compiler/deSugar/Desugar.lhs
@@ -10,7 +10,6 @@ module Desugar ( deSugar, deSugarExpr ) where
 
 #include "HsVersions.h"
 
-import Breakpoints
 import DynFlags
 import StaticFlags
 import HscTypes
@@ -61,23 +60,24 @@ deSugar :: HscEnv -> ModLocation -> TcGblEnv -> IO (Maybe ModGuts)
 
 deSugar hsc_env 
         mod_loc
-        tcg_env@(TcGblEnv { tcg_mod       = mod,
-			    tcg_src	  = hsc_src,
-		    	    tcg_type_env  = type_env,
-		    	    tcg_imports   = imports,
-		    	    tcg_exports   = exports,
-		    	    tcg_dus	  = dus, 
-		    	    tcg_inst_uses = dfun_uses_var,
-			    tcg_th_used   = th_var,
-			    tcg_keep	  = keep_var,
-		    	    tcg_rdr_env   = rdr_env,
-		    	    tcg_fix_env   = fix_env,
-	    	    	    tcg_deprecs   = deprecs,
-			    tcg_binds     = binds,
-			    tcg_fords     = fords,
-			    tcg_rules     = rules,
-		    	    tcg_insts     = insts,
-		    	    tcg_fam_insts = fam_insts })
+        tcg_env@(TcGblEnv { tcg_mod          = mod,
+			    tcg_src	     = hsc_src,
+		    	    tcg_type_env     = type_env,
+		    	    tcg_imports      = imports,
+		    	    tcg_exports      = exports,
+		    	    tcg_dus	     = dus, 
+		    	    tcg_inst_uses    = dfun_uses_var,
+			    tcg_th_used      = th_var,
+			    tcg_keep	     = keep_var,
+		    	    tcg_rdr_env      = rdr_env,
+		    	    tcg_fix_env      = fix_env,
+		    	    tcg_fam_inst_env = fam_inst_env,
+	    	    	    tcg_deprecs      = deprecs,
+			    tcg_binds        = binds,
+			    tcg_fords        = fords,
+			    tcg_rules        = rules,
+		    	    tcg_insts        = insts,
+		    	    tcg_fam_insts    = fam_insts })
   = do	{ showPass dflags "Desugar"
 
 	-- Desugar the program
@@ -157,23 +157,24 @@ deSugar hsc_env
 		-- sort to get into canonical order
 
 	     mod_guts = ModGuts {	
-		mg_module    = mod,
-		mg_boot	     = isHsBoot hsc_src,
-		mg_exports   = exports,
-		mg_deps	     = deps,
-		mg_usages    = usages,
-		mg_dir_imps  = [m | (m,_,_) <- moduleEnvElts dir_imp_mods],
-	        mg_rdr_env   = rdr_env,
-		mg_fix_env   = fix_env,
-		mg_deprecs   = deprecs,
-		mg_types     = type_env,
-		mg_insts     = insts,
-		mg_fam_insts = fam_insts,
-	        mg_rules     = ds_rules,
-		mg_binds     = ds_binds,
-		mg_foreign   = ds_fords,
-		mg_hpc_info  = ds_hpc_info,
-                mg_dbg_sites = dbgSites }
+		mg_module    	= mod,
+		mg_boot	     	= isHsBoot hsc_src,
+		mg_exports   	= exports,
+		mg_deps	     	= deps,
+		mg_usages    	= usages,
+		mg_dir_imps  	= [m | (m,_,_) <- moduleEnvElts dir_imp_mods],
+	        mg_rdr_env   	= rdr_env,
+		mg_fix_env   	= fix_env,
+		mg_deprecs   	= deprecs,
+		mg_types     	= type_env,
+		mg_insts     	= insts,
+		mg_fam_insts 	= fam_insts,
+		mg_fam_inst_env = fam_inst_env,
+	        mg_rules     	= ds_rules,
+		mg_binds     	= ds_binds,
+		mg_foreign   	= ds_fords,
+		mg_hpc_info  	= ds_hpc_info,
+                mg_dbg_sites 	= dbgSites }
         ; return (Just mod_guts)
 	}}}