X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FcoreSyn%2FCoreTidy.lhs;h=ba604667e7f22289f0e66799c48e68bcc74fe5e6;hb=28a464a75e14cece5db40f2765a29348273ff2d2;hp=a2a56c66a61da8ce1c902b1f191cb344e12aae94;hpb=f25b9225f77ca8aa097a9acb4b5be27daea94891;p=ghc-hetmet.git

diff --git a/ghc/compiler/coreSyn/CoreTidy.lhs b/ghc/compiler/coreSyn/CoreTidy.lhs
index a2a56c6..ba60466 100644
--- a/ghc/compiler/coreSyn/CoreTidy.lhs
+++ b/ghc/compiler/coreSyn/CoreTidy.lhs
@@ -1,16 +1,10 @@
 %
 % (c) The AQUA Project, Glasgow University, 1996-1998
 %
-%************************************************************************
-%*									*
-\section[PprCore]{Printing of Core syntax, including for interfaces}
-%*									*
-%************************************************************************
 
 \begin{code}
 module CoreTidy (
-	tidyExpr, tidyVarOcc,
-	tidyIdRules, pprTidyIdRules
+	tidyExpr, tidyVarOcc, tidyRule, tidyRules 
     ) where
 
 #include "HsVersions.h"
@@ -18,17 +12,17 @@ module CoreTidy (
 import CoreSyn
 import CoreUtils	( exprArity )
 import Unify		( coreRefineTys )
-import PprCore		( pprIdRules )
 import DataCon		( DataCon, isVanillaDataCon )
 import Id		( Id, mkUserLocal, idInfo, setIdInfo, idUnique,
-			  idType, setIdType, idCoreRules )
+			  idType, setIdType )
 import IdInfo		( setArityInfo, vanillaIdInfo,
 			  newStrictnessInfo, setAllStrictnessInfo,
 			  newDemandInfo, setNewDemandInfo )
-import Type		( Type, tidyType, tidyTyVarBndr, substTy, mkTvSubst )
-import Var		( Var, TyVar )
+import Type		( Type, tidyType, tidyTyVarBndr, substTy, mkOpenTvSubst )
+import Var		( Var, TyVar, varName )
 import VarEnv
-import Name		( getOccName )
+import UniqFM		( lookupUFM )
+import Name		( Name, getOccName )
 import OccName		( tidyOccName )
 import SrcLoc		( noSrcLoc )
 import Maybes		( orElse )
@@ -102,7 +96,7 @@ tidyAlt case_bndr env (con, vs, 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 in_scope con tvs scrut_ty of
+  = case coreRefineTys con tvs scrut_ty of
 	Nothing -> tidy_env
 	Just (tv_subst, all_bound_here)
 	    | all_bound_here 	-- Local type refinement only
@@ -112,35 +106,33 @@ refineTidyEnv tidy_env@(occ_env, var_env)  con tvs scrut_ty
 				-- And that means that exprType will work right everywhere
 	    -> (occ_env, mapVarEnv (refine subst) var_env)
 	    where
-	      subst = mkTvSubst in_scope tv_subst
+	      subst = mkOpenTvSubst tv_subst
   where
     refine subst var | isId var  = setIdType var (substTy subst (idType var)) 
 		     | otherwise = var
 
-    in_scope = mkInScopeSet var_env	-- Seldom used
-
 ------------  Notes  --------------
 tidyNote env (Coerce t1 t2)  = Coerce (tidyType env t1) (tidyType env t2)
 tidyNote env note            = note
 
-
 ------------  Rules  --------------
-tidyIdRules :: TidyEnv -> [IdCoreRule] -> [IdCoreRule]
-tidyIdRules env [] = []
-tidyIdRules env (IdCoreRule fn is_orph rule : rules)
+tidyRules :: TidyEnv -> [CoreRule] -> [CoreRule]
+tidyRules env [] = []
+tidyRules env (rule : rules)
   = tidyRule env rule  		=: \ rule ->
-    tidyIdRules env rules 	=: \ rules ->
-    (IdCoreRule (tidyVarOcc env fn) is_orph rule : rules)
+    tidyRules env rules 	=: \ rules ->
+    (rule : rules)
 
 tidyRule :: TidyEnv -> CoreRule -> CoreRule
-tidyRule env rule@(BuiltinRule _ _) = rule
-tidyRule env (Rule name act vars tpl_args rhs)
-  = tidyBndrs env vars			=: \ (env', vars) ->
-    map (tidyExpr env') tpl_args  	=: \ tpl_args ->
-     (Rule name act vars tpl_args (tidyExpr env' rhs))
-
-pprTidyIdRules :: Id -> SDoc
-pprTidyIdRules id = pprIdRules (tidyIdRules emptyTidyEnv (idCoreRules id))
+tidyRule env 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) ->
+    map (tidyExpr env') args  	=: \ args ->
+    rule { ru_bndrs = bndrs, ru_args = args, 
+	   ru_rhs   = tidyExpr env' rhs,
+	   ru_fn    = tidyNameOcc env fn, 
+	   ru_rough = map (fmap (tidyNameOcc env')) mb_ns }
 \end{code}
 
 
@@ -151,6 +143,13 @@ pprTidyIdRules id = pprIdRules (tidyIdRules emptyTidyEnv (idCoreRules id))
 %************************************************************************
 
 \begin{code}
+tidyNameOcc :: TidyEnv -> Name -> Name
+-- In rules and instances, we have Names, and we must tidy them too
+-- 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
+
 tidyVarOcc :: TidyEnv -> Var -> Var
 tidyVarOcc (_, var_env) v = lookupVarEnv var_env v `orElse` v