X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FdeSugar%2FDesugar.lhs;h=80b0dcbd8e860a703952848482dc5bc7c0232299;hp=692c0485df6d60689479a825f05cebe59c52d1aa;hb=cae75f82226638691cfa1e85fc168f4b65ddce4d;hpb=7379e82aafc7d0c1b839a13a20d52babeafed023

diff --git a/compiler/deSugar/Desugar.lhs b/compiler/deSugar/Desugar.lhs
index 692c048..80b0dcb 100644
--- a/compiler/deSugar/Desugar.lhs
+++ b/compiler/deSugar/Desugar.lhs
@@ -6,17 +6,8 @@
 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/Commentary/CodingStyle#Warnings
--- for details
-
 module Desugar ( deSugar, deSugarExpr ) where
 
-#include "HsVersions.h"
-
 import DynFlags
 import StaticFlags
 import HscTypes
@@ -35,8 +26,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,14 +33,12 @@ import Rules
 import CoreLint
 import CoreFVs
 import ErrUtils
-import ListSetOps
 import Outputable
 import SrcLoc
 import Maybes
 import FastString
-import Util
 import Coverage
-import IOEnv
+
 import Data.IORef
 \end{code}
 
@@ -72,14 +59,12 @@ deSugar hsc_env
 		    	    tcg_type_env     = type_env,
 		    	    tcg_imports      = imports,
 		    	    tcg_exports      = exports,
-		    	    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_inst_env     = inst_env,
 		    	    tcg_fam_inst_env = fam_inst_env,
-	    	    	    tcg_deprecs      = deprecs,
+	    	    	    tcg_warns      = warns,
 			    tcg_binds        = binds,
 			    tcg_fords        = fords,
 			    tcg_rules        = rules,
@@ -107,8 +92,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 <- mapM dsRule rules
 		                        ; return (all_prs, catMaybes ds_rules, ds_fords, ds_hpc_info, modBreaks)
 		                        }
 	; case mb_res of {
@@ -145,7 +129,7 @@ deSugar hsc_env
 		mg_dir_imps  	= imp_mods imports,
 	        mg_rdr_env   	= rdr_env,
 		mg_fix_env   	= fix_env,
-		mg_deprecs   	= deprecs,
+		mg_warns   	= warns,
 		mg_types     	= type_env,
 		mg_insts     	= insts,
 		mg_fam_insts 	= fam_insts,
@@ -166,13 +150,15 @@ 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 (\id -> not $ isDerivedOccName $ getOccName id)
+    -- See #1641.  This is pretty yucky, but I can't see a better way
+    -- to identify compiler-generated Ids, and at least this should
+    -- catch them all.
   | opt_AutoSccsOnExportedToplevs	-- Only on exported things
   = AddSccs mod (\id -> idName id `elemNameSet` exports)
   | otherwise
   = NoSccs
 
-
 deSugarExpr :: HscEnv
 	    -> Module -> GlobalRdrEnv -> TypeEnv 
  	    -> LHsExpr Id
@@ -212,6 +198,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
@@ -244,6 +232,7 @@ addExportFlags target exports keep_alive prs rules
     is_exported | target == HscInterpreted = isExternalName
 		| otherwise 		   = (`elemNameSet` exports)
 
+ppr_ds_rules :: [CoreRule] -> SDoc
 ppr_ds_rules [] = empty
 ppr_ds_rules rules
   = text "" $$ text "-------------- DESUGARED RULES -----------------" $$
@@ -259,8 +248,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
@@ -285,6 +274,6 @@ dsRule mod in_scope (L loc (HsRule name act vars lhs tv_lhs rhs fv_rhs))
 	; return (Just rule)
 	} } }
   where
-    msg = hang (ptext SLIT("RULE left-hand side too complicated to desugar; ignored"))
+    msg = hang (ptext (sLit "RULE left-hand side too complicated to desugar; ignored"))
 	     2 (ppr lhs)
 \end{code}