From 63612a875ac9908a3e86a57f4c5b559c51d3d9bf Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Sun, 11 Sep 2016 10:37:09 +0300 Subject: [PATCH] Removed the renaming of fields because they are no longer exposed. Signed-off-by: Dimitar Dobrev --- src/Generator.Tests/Passes/TestPasses.cs | 11 +++++++---- src/Generator/Passes/RenamePass.cs | 1 - 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Generator.Tests/Passes/TestPasses.cs b/src/Generator.Tests/Passes/TestPasses.cs index 48b703fd..0f78d3ba 100644 --- a/src/Generator.Tests/Passes/TestPasses.cs +++ b/src/Generator.Tests/Passes/TestPasses.cs @@ -70,20 +70,23 @@ namespace CppSharp.Generator.Tests.Passes [Test] public void TestCaseRenamePass() { - CppSharp.AST.Type.TypePrinterDelegate += TypePrinterDelegate; + Type.TypePrinterDelegate += TypePrinterDelegate; var c = AstContext.Class("TestRename"); + passBuilder.AddPass(new FieldToPropertyPass()); + passBuilder.RunPasses(pass => pass.VisitLibrary(AstContext)); + var method = c.Method("lowerCaseMethod"); - var field = c.Field("lowerCaseField"); + var property = c.Properties.Find(p => p.Name == "lowerCaseField"); passBuilder.RenameDeclsUpperCase(RenameTargets.Any); passBuilder.RunPasses(pass => pass.VisitLibrary(AstContext)); Assert.That(method.Name, Is.EqualTo("LowerCaseMethod")); - Assert.That(field.Name, Is.EqualTo("LowerCaseField")); + Assert.That(property.Name, Is.EqualTo("LowerCaseField")); - CppSharp.AST.Type.TypePrinterDelegate -= TypePrinterDelegate; + Type.TypePrinterDelegate -= TypePrinterDelegate; } [Test] diff --git a/src/Generator/Passes/RenamePass.cs b/src/Generator/Passes/RenamePass.cs index 9ebc9b74..a5a170f2 100644 --- a/src/Generator/Passes/RenamePass.cs +++ b/src/Generator/Passes/RenamePass.cs @@ -72,7 +72,6 @@ namespace CppSharp.Passes public bool IsRenameableDecl(Declaration decl) { if (decl is Class) return true; - if (decl is Field) return true; var function = decl as Function; if (function != null) {