X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FCoreTidy.lhs;h=c4e7ed987e90f7dc48a65510d3f08e08b0fcedc0;hb=49c98d143c382a1341e1046f5ca00819a25691ba;hp=bacf64fc27f207b07c512aba9e854e4cc7885353;hpb=b00b5bc04ff36a551552470060064f0b7d84ca30;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/CoreTidy.lhs b/compiler/coreSyn/CoreTidy.lhs
index bacf64f..c4e7ed9 100644
--- a/compiler/coreSyn/CoreTidy.lhs
+++ b/compiler/coreSyn/CoreTidy.lhs
@@ -1,7 +1,11 @@
 %
+% (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 
@@ -10,27 +14,21 @@ module CoreTidy (
 #include "HsVersions.h"
 
 import CoreSyn
-import CoreUtils	( exprArity )
-import Id		( Id, mkUserLocal, idInfo, setIdInfo, idUnique, idType )
-import IdInfo		( setArityInfo, vanillaIdInfo,
-			  newStrictnessInfo, setAllStrictnessInfo,
-			  newDemandInfo, setNewDemandInfo )
-import Type		( tidyType, tidyTyVarBndr )
-import Var		( Var, 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 )
+import UniqFM
+import Name hiding (tidyNameOcc)
+import OccName
+import SrcLoc
+import Maybes
+import Util
 \end{code}
 
 
-This module contains "tidying" code for *nested* expressions, bindings, rules.
-The code for *top-level* bindings is in TidyPgm.
-
 %************************************************************************
 %*									*
 \subsection{Tidying expressions, rules}
@@ -115,7 +113,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