Browse Source

Improved the property generation by matching with an "is" prefix for read-write properties.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
pull/116/head
Dimitar Dobrev 12 years ago
parent
commit
ae1351d2b5
  1. 8
      src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs
  2. 2
      tests/CSharpTemp/CSharpTemp.Tests.cs
  3. 10
      tests/CSharpTemp/CSharpTemp.cpp
  4. 3
      tests/CSharpTemp/CSharpTemp.h

8
src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs

@ -94,11 +94,16 @@ namespace CppSharp.Passes
foreach (var getter in nonSetters.Where(m => m.Namespace == type)) foreach (var getter in nonSetters.Where(m => m.Namespace == type))
{ {
string name = GetPropertyName(getter.Name); string name = GetPropertyName(getter.Name);
if (name.StartsWith("is"))
{
name = char.ToLowerInvariant(name[2]) + name.Substring(3);
}
if (name == afterSet && if (name == afterSet &&
GetUnderlyingType(getter.OriginalReturnType).Equals( GetUnderlyingType(getter.OriginalReturnType).Equals(
GetUnderlyingType(setter.Parameters[0].QualifiedType)) && GetUnderlyingType(setter.Parameters[0].QualifiedType)) &&
!type.Methods.Any(m => m != getter && name == m.Name)) !type.Methods.Any(m => m != getter && name == m.Name))
{ {
getter.Name = name;
GenerateProperty(getter.Namespace, getter, readOnly ? null : setter); GenerateProperty(getter.Namespace, getter, readOnly ? null : setter);
goto next; goto next;
} }
@ -158,9 +163,6 @@ namespace CppSharp.Passes
Property baseVirtualProperty = type.GetRootBaseProperty(property); Property baseVirtualProperty = type.GetRootBaseProperty(property);
if (baseVirtualProperty.SetMethod == null) if (baseVirtualProperty.SetMethod == null)
setter = null; setter = null;
foreach (Method method in type.Methods.Where(m => m.Name == property.Name &&
m.Parameters.Any(p => p.Kind != ParameterKind.IndirectReturnType)))
method.Name = "get" + method.Name;
} }
property.GetMethod = getter; property.GetMethod = getter;
property.SetMethod = setter; property.SetMethod = setter;

2
tests/CSharpTemp/CSharpTemp.Tests.cs

@ -77,5 +77,7 @@ public class CSharpTempTests
ComplexType complexType = new ComplexType(); ComplexType complexType = new ComplexType();
p.ComplexType = complexType; p.ComplexType = complexType;
Assert.That(p.ComplexType.Check(), Is.EqualTo(5)); Assert.That(p.ComplexType.Check(), Is.EqualTo(5));
Assert.That(p.Test, Is.True);
} }
} }

10
tests/CSharpTemp/CSharpTemp.cpp

@ -154,3 +154,13 @@ void P::parent(int i)
{ {
} }
bool P::isTest()
{
return true;
}
void P::setTest(bool value)
{
}

3
tests/CSharpTemp/CSharpTemp.h

@ -112,6 +112,9 @@ public:
virtual void parent(int i); virtual void parent(int i);
bool isTest();
void setTest(bool value);
private: private:
ComplexType m_complexType; ComplexType m_complexType;
}; };

Loading…
Cancel
Save