X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FbasicTypes%2FOccName.lhs;h=f02ae8d0da3f01042561c17f230021f28228ec7f;hp=9ff53f13400af5a2b0cc9b81fe2e7e510d1a1a9b;hb=27310213397bb89555bb03585e057ba1b017e895;hpb=f278f0676579f67075033a4f9857715909c4b71e

diff --git a/compiler/basicTypes/OccName.lhs b/compiler/basicTypes/OccName.lhs
index 9ff53f1..f02ae8d 100644
--- a/compiler/basicTypes/OccName.lhs
+++ b/compiler/basicTypes/OccName.lhs
@@ -42,7 +42,7 @@ module OccName (
 	mkTyVarOcc, mkTyVarOccFS,
 	mkTcOcc, mkTcOccFS,
 	mkClsOcc, mkClsOccFS,
-	mkDFunOcc,
+        mkDFunOcc,
 	mkTupleOcc, 
 	setOccNameSpace,
 
@@ -107,16 +107,6 @@ import Data.Char
 import Data.Data
 \end{code}
 
-\begin{code}
--- Unicode TODO: put isSymbol in libcompat
-#if !defined(__GLASGOW_HASKELL__) || __GLASGOW_HASKELL__ > 604
-#else
-isSymbol :: a -> Bool
-isSymbol = const False
-#endif
-
-\end{code}
-
 %************************************************************************
 %*									*
 \subsection{Name space}
@@ -730,7 +720,9 @@ tidyOccName in_scope occ@(OccName occ_sp fs)
 	Just n  -> 	-- Already used: make a new guess, 
 			-- change the guess base, and try again
 		   tidyOccName  (extendOccEnv in_scope occ (n+1))
-				(mkOccName occ_sp (unpackFS fs ++ show n))
+                                (mkOccName occ_sp (base_occ ++ show n))
+  where
+    base_occ = reverse (dropWhile isDigit (reverse (unpackFS fs)))
 \end{code}
 
 %************************************************************************