From 6ea0dae44407bf1d275c421b26e08604c448fe74 Mon Sep 17 00:00:00 2001 From: triton Date: Thu, 19 Dec 2013 19:27:46 +0000 Subject: [PATCH] Improved the rename pass with fixes for visits and minor formatting nits. --- src/Generator/Passes/RenamePass.cs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Generator/Passes/RenamePass.cs b/src/Generator/Passes/RenamePass.cs index 1b436b44..0008cdee 100644 --- a/src/Generator/Passes/RenamePass.cs +++ b/src/Generator/Passes/RenamePass.cs @@ -62,13 +62,11 @@ namespace CppSharp.Passes public override bool VisitDeclaration(Declaration decl) { - if (!IsRenameableDecl(decl)) - return true; - if (AlreadyVisited(decl)) - return true; + return false; - Visited.Add(decl); + if (!IsRenameableDecl(decl)) + return true; if (decl.Name == null) return true; @@ -86,18 +84,21 @@ namespace CppSharp.Passes private static bool AreThereConflicts(Declaration decl, string newName) { - List declarations = new List(); + var declarations = new List(); declarations.AddRange(decl.Namespace.Classes); declarations.AddRange(decl.Namespace.Enums); declarations.AddRange(decl.Namespace.Events); declarations.AddRange(decl.Namespace.Functions); declarations.AddRange(decl.Namespace.Variables); - bool result = declarations.Any(d => d != decl && d.Name == newName); + + var result = declarations.Any(d => d != decl && d.Name == newName); if (result) return true; - Method method = decl as Method; + + var method = decl as Method; if (method == null || !method.IsGenerated) return false; + return ((Class) method.Namespace).GetPropertyByName(newName) != null; }