From 9447df5bc3e1661f3e17f2ce44da7a068a0e812f Mon Sep 17 00:00:00 2001
From: simonpj <unknown>
Date: Mon, 27 Nov 2000 14:37:55 +0000
Subject: [PATCH] [project @ 2000-11-27 14:37:55 by simonpj] Dont print
 uniques in interface files; tidying should have sorted it
 out

---
 ghc/compiler/basicTypes/Name.lhs |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/ghc/compiler/basicTypes/Name.lhs b/ghc/compiler/basicTypes/Name.lhs
index 8d8f56c..7f0b19f 100644
--- a/ghc/compiler/basicTypes/Name.lhs
+++ b/ghc/compiler/basicTypes/Name.lhs
@@ -354,12 +354,6 @@ pprName name@(Name {n_sort = sort, n_uniq = uniq, n_occ = occ})
       System     -> pprSysLocal sty uniq occ
       Local      -> pprLocal sty uniq occ
 
-pprLocal sty uniq occ
-  | codeStyle sty  = pprUnique uniq
-  | debugStyle sty = pprOccName occ <> 
-		     text "{-" <> pprUnique10 uniq <> text "-}"
-  | otherwise      = pprOccName occ
-
 pprGlobal sty name uniq mod occ
   | codeStyle sty        = ppr (moduleName mod) <> char '_' <> pprOccName occ
 
@@ -369,12 +363,23 @@ pprGlobal sty name uniq mod occ
   | unqualStyle sty name = pprOccName occ
   | otherwise		 = ppr (moduleName mod) <> dot <> pprOccName occ
 
+pprLocal sty uniq occ
+  | codeStyle sty  = pprUnique uniq
+  | debugStyle sty = pprOccName occ <> 
+		     text "{-" <> pprUnique10 uniq <> text "-}"
+  | otherwise      = pprOccName occ	-- User and Iface styles
+
+-- Like Local, except that we only omit the unique in Iface style
 pprSysLocal sty uniq occ
   | codeStyle sty  = pprUnique uniq
+  | ifaceStyle sty = pprOccName occ	-- The tidy phase has ensured that OccNames
+					-- are enough
   | otherwise	   = pprOccName occ <> char '_' <> pprUnique uniq
+				-- If the tidy phase hasn't run, the OccName
+				-- is unlikely to be informative (like 's'),
+				-- so print the unique
 \end{code}
 
-
 %************************************************************************
 %*									*
 \subsection{Overloaded functions related to Names}
-- 
1.7.10.4