X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FTidyPgm.lhs;h=b9dfa03fc22cdf23ea27378459101af3b5d9427f;hp=6b89b33fb3ed1478eef2934106779cd01b4616e4;hb=1a7d1b77334529ca96ed4cbc03fcb5f55dc2de4a;hpb=e5f78a4a5309b598d5195aa49a0bf7a206942cea

diff --git a/compiler/main/TidyPgm.lhs b/compiler/main/TidyPgm.lhs
index 6b89b33..b9dfa03 100644
--- a/compiler/main/TidyPgm.lhs
+++ b/compiler/main/TidyPgm.lhs
@@ -4,6 +4,13 @@
 \section{Tidying up 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 TidyPgm( mkBootModDetails, tidyProgram ) where
 
 #include "HsVersions.h"
@@ -28,11 +35,8 @@ import IdInfo		{- loads of stuff -}
 import InstEnv		( Instance, DFunId, instanceDFunId, setInstanceDFunId )
 import NewDemand	( isBottomingSig, topSig )
 import BasicTypes	( Arity, isNeverActive, isNonRuleLoopBreaker )
-import Name		( Name, getOccName, nameOccName, mkInternalName,
-		  	  localiseName, isExternalName, nameSrcLoc,
-			  isWiredInName, getName
-			)
-import NameSet		( NameSet, elemNameSet, filterNameSet )
+import Name
+import NameSet		( NameSet, elemNameSet )
 import IfaceEnv		( allocateGlobalBinder )
 import NameEnv		( filterNameEnv, mapNameEnv )
 import OccName		( TidyOccEnv, initTidyOccEnv, tidyOccName )
@@ -43,11 +47,10 @@ import TyCon		( TyCon, makeTyConAbstract, tyConDataCons, isNewTyCon,
 			  newTyConRep, tyConSelIds, isAlgTyCon,
 			  isEnumerationTyCon, isOpenTyCon )
 import Class		( classSelIds )
-import Module		( Module )
+import Module
 import HscTypes
 import Maybes		( orElse, mapCatMaybes )
 import ErrUtils		( showPass, dumpIfSet_core )
-import PackageConfig	( PackageId )
 import UniqSupply	( splitUniqSupply, uniqFromSupply )
 import Outputable
 import FastTypes  hiding ( fastOr )
@@ -141,7 +144,6 @@ mkBootModDetails hsc_env (ModGuts { mg_module    = mod
 			     , md_fam_insts = fam_insts
 			     , md_rules     = []
 			     , md_exports   = exports
-                             , md_modBreaks = modBreaks 
                              , md_vect_info = noVectInfo
                              })
 	}
@@ -287,12 +289,6 @@ tidyProgram hsc_env
 	      ; implicit_binds = getImplicitBinds type_env
 	      ; all_tidy_binds = implicit_binds ++ tidy_binds
 	      ; alg_tycons = filter isAlgTyCon (typeEnvTyCons type_env)
-
-              ; tidy_vect_info = VectInfo 
-                                   (filterNameSet (isElemId type_env) 
-                                                  (vectInfoCCVar vect_info))
-                -- filter against `type_env', not `tidy_type_env', as we must
-                -- keep all implicit names
 	      }
 
    	; endPass dflags "Tidy Core" Opt_D_dump_simpl all_tidy_binds
@@ -306,15 +302,15 @@ tidyProgram hsc_env
 			   cg_dir_imps = dir_imps,
 			   cg_foreign  = foreign_stubs,
 			   cg_dep_pkgs = dep_pkgs deps,
-			   cg_hpc_info = hpc_info }, 
+			   cg_hpc_info = hpc_info,
+                           cg_modBreaks = modBreaks }, 
 
 		   ModDetails { md_types     = tidy_type_env,
 				md_rules     = tidy_rules,
 				md_insts     = tidy_insts,
 				md_fam_insts = fam_insts,
 				md_exports   = exports,
-                                md_modBreaks = modBreaks,
-                                md_vect_info = tidy_vect_info
+                                md_vect_info = vect_info    -- is already tidy
                               })
 	}
 
@@ -323,11 +319,6 @@ lookup_dfun type_env dfun_id
 	Just (AnId dfun_id') -> dfun_id'
 	other -> pprPanic "lookup_dfun" (ppr dfun_id)
 
-isElemId type_env name
-  = case lookupTypeEnv type_env name of
-	Just (AnId _) -> True
-	_             -> False
-
 tidyTypeEnv :: Bool -> NameSet -> TypeEnv -> [CoreBind] -> TypeEnv
 
 -- The competed type environment is gotten from
@@ -685,7 +676,7 @@ tidyTopName mod nc_var ext_ids occ_env id
     global	= isExternalName name
     local	= not global
     internal	= not external
-    loc		= nameSrcLoc name
+    loc		= nameSrcSpan name
 
     (occ_env', occ') = tidyOccName occ_env (nameOccName name)