[hoc-cvs] [hoc commit] r308 - trunk/hoc/InterfaceGenerator2

[<cod...@go...>]

Author: wol...@gm...
Date: Sun Sep 21 12:44:49 2008
New Revision: 308

Modified:
    trunk/hoc/InterfaceGenerator2/Main.hs

Log:
Revert accidental part of previous commit


Modified: trunk/hoc/InterfaceGenerator2/Main.hs
==============================================================================
--- trunk/hoc/InterfaceGenerator2/Main.hs	(original)
+++ trunk/hoc/InterfaceGenerator2/Main.hs	Sun Sep 21 12:44:49 2008
@@ -36,7 +36,6 @@
  import DependenceGraphs
  import ShuffleInstances
  import DuplicateEntities
-import RenameClashingIdentifiers
  import Output

  textInterfaces = False  -- Overall 3 times faster with binary
@@ -195,7 +194,7 @@
              (zappedEntities, zapMessages) = runMessages $  
zapAndReportFailedTypes zapProgress typedEntities
              expandedEntities = monitor expandProgress $  
expandProtocolRequirements zappedEntities
              combinedEntities = monitor combineProgress $  
combineDulicateEntities expandedEntities
-            finalEntities = renameClashingIdentifiers $  
eliminateSubclassInstances eliminateProgress combinedEntities
+            finalEntities = eliminateSubclassInstances eliminateProgress  
combinedEntities

          do
              let packageName = "HOC-" ++ frameworkName