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

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

Author: wol...@gm...
Date: Thu Oct 23 15:16:51 2008
New Revision: 341

Modified:
    trunk/hoc/InterfaceGenerator2/DuplicateEntities.hs

Log:
Apply duplicate entity removal to all non-anonymous entities.
This way, we don't get into trouble when someone dares to define
the same thing twice.


Modified: trunk/hoc/InterfaceGenerator2/DuplicateEntities.hs
==============================================================================
--- trunk/hoc/InterfaceGenerator2/DuplicateEntities.hs	(original)
+++ trunk/hoc/InterfaceGenerator2/DuplicateEntities.hs	Thu Oct 23 15:16:51  
2008
@@ -26,11 +26,9 @@
                  [ ((eHaskellName e, eName e, eInfo e), Set.singleton ei)
                  | (ei, e) <- Map.toList $ frameworkEntities entityPile,
                    interesting e ]
-
-        interesting (Entity { eInfo = SelectorEntity _}) = True
-        interesting (Entity { eInfo = MethodEntity }) = True
-        interesting (Entity { eInfo = ProtocolAdoptionEntity }) = True
-        interesting _ = False
+
+        interesting (Entity { eName = Anonymous }) = False
+        interesting _ = True

  pickMasterEntity :: Map.Map Module Int -> EntityPile -> [EntityID] ->  
(EntityID, [EntityID])