Fixed the renaming of properties with the same name as their owners.

Signed-off-by: Dimitar Dobrev <[email protected]>

Author: ddobrev

src/Generator/Passes/RenamePass.cs

@@ -170,14 +170,12 @@ private static bool AreThereConflicts(Declaration decl, string newName)
             declarations.AddRange(decl.Namespace.Classes.Where(c => !c.IsIncomplete));
             declarations.AddRange(decl.Namespace.Enums);
             declarations.AddRange(decl.Namespace.Events);
+            declarations.Add(decl.Namespace);
 
             var function = decl as Function;
             if (function != null)
-            {
-                declarations.Add(function.Namespace);
                 // account for overloads
                 declarations.AddRange(GetFunctionsWithTheSameParams(function));
-            }
             else
                 declarations.AddRange(decl.Namespace.Functions);
 

tests/Common/Common.Tests.cs

@@ -47,6 +47,10 @@ public unsafe void TestCodeGeneration()
         using (var hasProtectedEnum = new HasProtectedEnum())
         {
         }
+        using (var hasPropertyNamedAsParent = new HasPropertyNamedAsParent())
+        {
+            hasPropertyNamedAsParent.hasPropertyNamedAsParent.GetHashCode();
+        }
         EnumWithUnderscores e = EnumWithUnderscores.lOWER_BEFORE_CAPITAL;
         e = EnumWithUnderscores.UnderscoreAtEnd;
         e = EnumWithUnderscores.CAPITALS_More;

tests/Common/Common.cpp

@@ -999,6 +999,14 @@ AmbiguousParamNames::~AmbiguousParamNames()
 {
 }
 
+HasPropertyNamedAsParent::HasPropertyNamedAsParent()
+{
+}
+
+HasPropertyNamedAsParent::~HasPropertyNamedAsParent()
+{
+}
+
 void integerOverload(int i)
 {
 }

tests/Common/Common.h

@@ -1401,6 +1401,14 @@ class DLL_API AmbiguousParamNames
     ~AmbiguousParamNames();
 };
 
+class DLL_API HasPropertyNamedAsParent
+{
+public:
+    HasPropertyNamedAsParent();
+    ~HasPropertyNamedAsParent();
+    int hasPropertyNamedAsParent;
+};
+
 template<typename T> void TemplatedFunction(T type)
 {