X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FdeSugar%2FDesugar.lhs;h=4ee9d4333b30f3904e849bf3cd557e5bdd6c406a;hb=235edf36cc202bb21c00d0e5e05ebf076fb0542e;hp=7cbd576704f5091efc3f44c9cfaccfe9525e0745;hpb=ad94d40948668032189ad22a0ad741ac1f645f50;p=ghc-hetmet.git

diff --git a/compiler/deSugar/Desugar.lhs b/compiler/deSugar/Desugar.lhs
index 7cbd576..4ee9d43 100644
--- a/compiler/deSugar/Desugar.lhs
+++ b/compiler/deSugar/Desugar.lhs
@@ -6,13 +6,6 @@
 The Desugarer: turning HsSyn into Core.
 
 \begin{code}
-{-# OPTIONS -w #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and fix
--- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
--- for details
-
 module Desugar ( deSugar, deSugarExpr ) where
 
 #include "HsVersions.h"
@@ -35,8 +28,6 @@ import DsForeign
 import DsExpr		()	-- Forces DsExpr to be compiled; DsBinds only
 				-- depends on DsExpr.hi-boot.
 import Module
-import UniqFM
-import PackageConfig
 import RdrName
 import NameSet
 import VarSet
@@ -44,12 +35,11 @@ import Rules
 import CoreLint
 import CoreFVs
 import ErrUtils
-import ListSetOps
 import Outputable
 import SrcLoc
 import Maybes
 import FastString
-import Util
+import Pretty      ( Doc )
 import Coverage
 import IOEnv
 import Data.IORef
@@ -72,9 +62,6 @@ deSugar hsc_env
 		    	    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,
@@ -108,8 +95,7 @@ deSugar hsc_env
 		                        { core_prs <- dsTopLHsBinds auto_scc binds_cvr
 		                        ; (ds_fords, foreign_prs) <- dsForeigns fords
 		                        ; let all_prs = foreign_prs ++ core_prs
-		                              local_bndrs = mkVarSet (map fst all_prs)
-		                        ; ds_rules <- mappM (dsRule mod local_bndrs) rules
+		                        ; ds_rules <- mappM dsRule rules
 		                        ; return (all_prs, catMaybes ds_rules, ds_fords, ds_hpc_info, modBreaks)
 		                        }
 	; case mb_res of {
@@ -134,46 +120,16 @@ deSugar hsc_env
 	; doIfSet (dopt Opt_D_dump_ds dflags) 
 		  (printDump (ppr_ds_rules ds_rules))
 
-	; dfun_uses <- readIORef dfun_uses_var		-- What dfuns are used
-	; th_used   <- readIORef th_var			-- Whether TH is used
-	; let used_names = allUses dus `unionNameSets` dfun_uses
-	      pkgs | th_used   = insertList thPackageId (imp_dep_pkgs imports)
-	      	   | otherwise = imp_dep_pkgs imports
-
-	      dep_mods = eltsUFM (delFromUFM (imp_dep_mods imports) (moduleName mod))
-		-- M.hi-boot can be in the imp_dep_mods, but we must remove
-		-- it before recording the modules on which this one depends!
-		-- (We want to retain M.hi-boot in imp_dep_mods so that 
-		--  loadHiBootInterface can see if M's direct imports depend 
-		--  on M.hi-boot, and hence that we should do the hi-boot consistency 
-		--  check.)
-
-	      dir_imp_mods = imp_mods imports
-
-	; usages <- mkUsageInfo hsc_env dir_imp_mods dep_mods used_names
-
-	; let 
-		-- Modules don't compare lexicographically usually, 
-		-- but we want them to do so here.
-	     le_mod :: Module -> Module -> Bool	 
-	     le_mod m1 m2 = moduleNameFS (moduleName m1) 
-				<= moduleNameFS (moduleName m2)
-	     le_dep_mod :: (ModuleName, IsBootInterface) -> (ModuleName, IsBootInterface) -> Bool	 
-	     le_dep_mod (m1,_) (m2,_) = moduleNameFS m1 <= moduleNameFS m2
-
-	     deps = Deps { dep_mods   = sortLe le_dep_mod dep_mods,
-			   dep_pkgs   = sortLe (<=)   pkgs,	
-			   dep_orphs  = sortLe le_mod (imp_orphs  imports),
-			   dep_finsts = sortLe le_mod (imp_finsts imports) }
-		-- sort to get into canonical order
-
-	     mod_guts = ModGuts {	
+        ; used_names <- mkUsedNames tcg_env
+	; deps <- mkDependencies tcg_env
+
+        ; let 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_used_names   = used_names,
+		mg_dir_imps  	= imp_mods imports,
 	        mg_rdr_env   	= rdr_env,
 		mg_fix_env   	= fix_env,
 		mg_deprecs   	= deprecs,
@@ -197,7 +153,7 @@ mkAutoScc mod exports
   | not opt_SccProfilingOn 	-- No profiling
   = NoSccs		
   | opt_AutoSccsOnAllToplevs 	-- Add auto-scc on all top-level things
-  = AddSccs mod (\id -> True)
+  = AddSccs mod (\_ -> True)
   | opt_AutoSccsOnExportedToplevs	-- Only on exported things
   = AddSccs mod (\id -> idName id `elemNameSet` exports)
   | otherwise
@@ -243,6 +199,8 @@ deSugarExpr hsc_env this_mod rdr_env type_env tc_expr
 -- it's just because the type checker is rather busy already and
 -- I didn't want to pass in yet another mapping.
 
+addExportFlags :: HscTarget -> NameSet -> NameSet -> [(Id, t)] -> [CoreRule]
+               -> [(Id, t)]
 addExportFlags target exports keep_alive prs rules
   = [(add_export bndr, rhs) | (bndr,rhs) <- prs]
   where
@@ -275,6 +233,7 @@ addExportFlags target exports keep_alive prs rules
     is_exported | target == HscInterpreted = isExternalName
 		| otherwise 		   = (`elemNameSet` exports)
 
+ppr_ds_rules :: [CoreRule] -> PprStyle -> Doc
 ppr_ds_rules [] = empty
 ppr_ds_rules rules
   = text "" $$ text "-------------- DESUGARED RULES -----------------" $$
@@ -290,8 +249,8 @@ ppr_ds_rules rules
 %************************************************************************
 
 \begin{code}
-dsRule :: Module -> IdSet -> LRuleDecl Id -> DsM (Maybe CoreRule)
-dsRule mod in_scope (L loc (HsRule name act vars lhs tv_lhs rhs fv_rhs))
+dsRule :: LRuleDecl Id -> DsM (Maybe CoreRule)
+dsRule (L loc (HsRule name act vars lhs _tv_lhs rhs _fv_rhs))
   = putSrcSpanDs loc $ 
     do	{ let bndrs = [var | RuleBndr (L _ var) <- vars]
 	; lhs'  <- dsLExpr lhs