X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcoreSyn%2FCoreTidy.lhs;h=5acee51f429cd2a4102679d5fe5ecdd8703d78f8;hp=ba604667e7f22289f0e66799c48e68bcc74fe5e6;hb=8da58b7ae3d607f00d0deed1ba22761a9e8d7754;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1

diff --git a/compiler/coreSyn/CoreTidy.lhs b/compiler/coreSyn/CoreTidy.lhs
index ba60466..5acee51 100644
--- a/compiler/coreSyn/CoreTidy.lhs
+++ b/compiler/coreSyn/CoreTidy.lhs
@@ -1,38 +1,36 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The AQUA Project, Glasgow University, 1996-1998
 %
 
+This module contains "tidying" code for *nested* expressions, bindings, rules.
+The code for *top-level* bindings is in TidyPgm.
+
 \begin{code}
 module CoreTidy (
 	tidyExpr, tidyVarOcc, tidyRule, tidyRules 
     ) where
 
+-- XXX This define is a bit of a hack, and should be done more nicely
+#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import CoreSyn
-import CoreUtils	( exprArity )
-import Unify		( coreRefineTys )
-import DataCon		( DataCon, isVanillaDataCon )
-import Id		( Id, mkUserLocal, idInfo, setIdInfo, idUnique,
-			  idType, setIdType )
-import IdInfo		( setArityInfo, vanillaIdInfo,
-			  newStrictnessInfo, setAllStrictnessInfo,
-			  newDemandInfo, setNewDemandInfo )
-import Type		( Type, tidyType, tidyTyVarBndr, substTy, mkOpenTvSubst )
-import Var		( Var, TyVar, varName )
+import CoreUtils
+import Id
+import IdInfo
+import Type
+import Var
 import VarEnv
-import UniqFM		( lookupUFM )
-import Name		( Name, getOccName )
-import OccName		( tidyOccName )
-import SrcLoc		( noSrcLoc )
-import Maybes		( orElse )
-import Outputable
-import Util		( mapAccumL )
-\end{code}
+import UniqFM
+import Name hiding (tidyNameOcc)
+import OccName
+import SrcLoc
+import Maybes
 
+import Data.List
+\end{code}
 
-This module contains "tidying" code for *nested* expressions, bindings, rules.
-The code for *top-level* bindings is in TidyPgm.
 
 %************************************************************************
 %*									*
@@ -57,11 +55,12 @@ tidyBind env (Rec prs)
 
 ------------  Expressions  --------------
 tidyExpr :: TidyEnv -> CoreExpr -> CoreExpr
-tidyExpr env (Var v)   	=  Var (tidyVarOcc env v)
-tidyExpr env (Type ty) 	=  Type (tidyType env ty)
-tidyExpr env (Lit lit) 	=  Lit lit
-tidyExpr env (App f a) 	=  App (tidyExpr env f) (tidyExpr env a)
-tidyExpr env (Note n e) =  Note (tidyNote env n) (tidyExpr env e)
+tidyExpr env (Var v)   	 =  Var (tidyVarOcc env v)
+tidyExpr env (Type ty) 	 =  Type (tidyType env ty)
+tidyExpr _   (Lit lit)   =  Lit lit
+tidyExpr env (App f a) 	 =  App (tidyExpr env f) (tidyExpr env a)
+tidyExpr env (Note n e)  =  Note (tidyNote env n) (tidyExpr env e)
+tidyExpr env (Cast e co) =  Cast (tidyExpr env e) (tidyType env co)
 
 tidyExpr env (Let b e) 
   = tidyBind env b 	=: \ (env', b') ->
@@ -77,54 +76,25 @@ tidyExpr env (Lam b e)
     Lam b (tidyExpr env' e)
 
 ------------  Case alternatives  --------------
-tidyAlt case_bndr env (DataAlt con, vs, rhs)
-  | not (isVanillaDataCon con)	-- GADT case
-  = tidyBndrs env tvs	 	=: \ (env1, tvs') ->
-    let 
-	env2 = refineTidyEnv env con tvs' scrut_ty
-    in
-    tidyBndrs env2 ids 	=: \ (env3, ids') ->
-    (DataAlt con, tvs' ++ ids', tidyExpr env3 rhs)
-  where 
-    (tvs, ids) = span isTyVar vs
-    scrut_ty = idType case_bndr
-
-tidyAlt case_bndr env (con, vs, rhs)
+tidyAlt :: CoreBndr -> TidyEnv -> CoreAlt -> CoreAlt
+tidyAlt _case_bndr env (con, vs, rhs)
   = tidyBndrs env vs 	=: \ (env', vs) ->
     (con, vs, tidyExpr env' rhs)
 
-refineTidyEnv :: TidyEnv -> DataCon -> [TyVar] -> Type -> TidyEnv
--- Refine the TidyEnv in the light of the type refinement from coreRefineTys
-refineTidyEnv tidy_env@(occ_env, var_env)  con tvs scrut_ty
-  = case coreRefineTys con tvs scrut_ty of
-	Nothing -> tidy_env
-	Just (tv_subst, all_bound_here)
-	    | all_bound_here 	-- Local type refinement only
-	    -> tidy_env
-	    | otherwise  	-- Apply the refining subst to the tidy env
-				-- This ensures that occurences have the most refined type
-				-- And that means that exprType will work right everywhere
-	    -> (occ_env, mapVarEnv (refine subst) var_env)
-	    where
-	      subst = mkOpenTvSubst tv_subst
-  where
-    refine subst var | isId var  = setIdType var (substTy subst (idType var)) 
-		     | otherwise = var
-
 ------------  Notes  --------------
-tidyNote env (Coerce t1 t2)  = Coerce (tidyType env t1) (tidyType env t2)
-tidyNote env note            = note
+tidyNote :: TidyEnv -> Note -> Note
+tidyNote _ note            = note
 
 ------------  Rules  --------------
 tidyRules :: TidyEnv -> [CoreRule] -> [CoreRule]
-tidyRules env [] = []
+tidyRules _   [] = []
 tidyRules env (rule : rules)
   = tidyRule env rule  		=: \ rule ->
     tidyRules env rules 	=: \ rules ->
     (rule : rules)
 
 tidyRule :: TidyEnv -> CoreRule -> CoreRule
-tidyRule env rule@(BuiltinRule {}) = rule
+tidyRule _   rule@(BuiltinRule {}) = rule
 tidyRule env rule@(Rule { ru_bndrs = bndrs, ru_args = args, ru_rhs = rhs,
 			  ru_fn = fn, ru_rough = mb_ns })
   = tidyBndrs env bndrs		=: \ (env', bndrs) ->
@@ -148,7 +118,7 @@ tidyNameOcc :: TidyEnv -> Name -> Name
 -- Fortunately, we can lookup in the VarEnv with a name
 tidyNameOcc (_, var_env) n = case lookupUFM var_env n of
 				Nothing -> n
-				Just v  -> varName v
+				Just v  -> idName v
 
 tidyVarOcc :: TidyEnv -> Var -> Var
 tidyVarOcc (_, var_env) v = lookupVarEnv var_env v `orElse` v
@@ -181,13 +151,16 @@ tidyLetBndr env (id,rhs)
 	-- CorePrep to turn the let into a case.
 	--
 	-- Similarly arity info for eta expansion in CorePrep
-	--
+	-- 
+	-- Set inline-prag info so that we preseve it across 
+	-- separate compilation boundaries
     final_id = new_id `setIdInfo` new_info
     idinfo   = idInfo id
     new_info = vanillaIdInfo
 		`setArityInfo`		exprArity rhs
 		`setAllStrictnessInfo`	newStrictnessInfo idinfo
 		`setNewDemandInfo`	newDemandInfo idinfo
+		`setInlinePragInfo`	inlinePragInfo idinfo
 
     -- Override the env we get back from tidyId with the new IdInfo
     -- so it gets propagated to the usage sites.
@@ -208,7 +181,7 @@ tidyIdBndr env@(tidy_env, var_env) id
 	-- which should save some space.
 	-- But note that tidyLetBndr puts some of it back.
         ty'          	  = tidyType env (idType id)
-	id'          	  = mkUserLocal occ' (idUnique id) ty' noSrcLoc
+	id'          	  = mkUserLocal occ' (idUnique id) ty' noSrcSpan
 				`setIdInfo` vanillaIdInfo
 	var_env'	  = extendVarEnv var_env id id'
     in
@@ -217,5 +190,6 @@ tidyIdBndr env@(tidy_env, var_env) id
 \end{code}
 
 \begin{code}
+(=:) :: a -> (a -> b) -> b
 m =: k = m `seq` k m
 \end{code}