From 63dc3b590da7c287b832abc0299e30dd6a70f1da Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Thu, 28 Feb 2019 01:16:11 +0200 Subject: [PATCH] Simplified the pass for properties. Signed-off-by: Dimitar Dobrev --- src/Generator/Passes/GetterSetterToPropertyPass.cs | 4 ++-- tests/CSharp/CSharp.Tests.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Generator/Passes/GetterSetterToPropertyPass.cs b/src/Generator/Passes/GetterSetterToPropertyPass.cs index 8bcc9d71..3ab238cf 100644 --- a/src/Generator/Passes/GetterSetterToPropertyPass.cs +++ b/src/Generator/Passes/GetterSetterToPropertyPass.cs @@ -37,8 +37,8 @@ namespace CppSharp.Passes foreach (Method getter in from getter in getters - where getter.IsGenerated && getter.SynthKind != FunctionSynthKind.ComplementOperator && - ((Class) getter.Namespace).Methods.All(m => m == getter ||!m.IsGenerated || m.Name != getter.Name) + where getter.IsGenerated && + getter.SynthKind != FunctionSynthKind.ComplementOperator select getter) { // Make it a read-only property diff --git a/tests/CSharp/CSharp.Tests.cs b/tests/CSharp/CSharp.Tests.cs index a8cc2e0b..4e45c646 100644 --- a/tests/CSharp/CSharp.Tests.cs +++ b/tests/CSharp/CSharp.Tests.cs @@ -740,13 +740,13 @@ public unsafe class CSharpTests : GeneratorTestFixture { using (var virtualTemplate = new VirtualTemplate()) { - Assert.That(virtualTemplate.Function(), Is.EqualTo(5)); + Assert.That(virtualTemplate.Function, Is.EqualTo(5)); int i = 15; Assert.That(*virtualTemplate.Function(ref i), Is.EqualTo(15)); } using (var virtualTemplate = new VirtualTemplate()) { - Assert.That(virtualTemplate.Function(), Is.EqualTo(5)); + Assert.That(virtualTemplate.Function, Is.EqualTo(5)); bool b = true; Assert.That(*virtualTemplate.Function(ref b), Is.EqualTo(true)); } @@ -1265,6 +1265,6 @@ public unsafe class CSharpTests : GeneratorTestFixture private class OverrideVirtualTemplate : VirtualTemplate { - public override int Function() => 10; + public override int Function => 10; } }