From 2fdd0822d28dc534b85a771451c824781c27e874 Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Mon, 30 Aug 2021 13:51:15 +0300 Subject: [PATCH] Generate valid C# for setters returning Booleans Signed-off-by: Dimitar Dobrev --- src/Generator/Generators/CSharp/CSharpSources.cs | 4 ++-- tests/Common/Common.cpp | 12 ++++++------ tests/Common/Common.h | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs index 9211f90a59..6315fc6aa2 100644 --- a/src/Generator/Generators/CSharp/CSharpSources.cs +++ b/src/Generator/Generators/CSharp/CSharpSources.cs @@ -3270,8 +3270,8 @@ private ParamMarshal GenerateFunctionParamMarshal(Parameter param, int paramInde var name = param.Name; var function = (Function) param.Namespace; param.Name = param.Kind == ParameterKind.ImplicitDestructorParameter ? "0" : - function.IsGenerated || function.OperatorKind == CXXOperatorKind.Subscript ? - name : "value"; + ActiveBlock.Parent.Kind != BlockKind.Property || + function.OperatorKind == CXXOperatorKind.Subscript ? name : "value"; var argName = Generator.GeneratedIdentifier("arg") + paramIndex.ToString(CultureInfo.InvariantCulture); var paramMarshal = new ParamMarshal { Name = argName, Param = param }; diff --git a/tests/Common/Common.cpp b/tests/Common/Common.cpp index 986c523656..54110905b6 100644 --- a/tests/Common/Common.cpp +++ b/tests/Common/Common.cpp @@ -709,10 +709,10 @@ int TestProperties::setterReturnsBoolean() return _setterReturnsBoolean; } -bool TestProperties::setSetterReturnsBoolean(int value) +bool TestProperties::setSetterReturnsBoolean(int newValue) { - bool changed = _setterReturnsBoolean != value; - _setterReturnsBoolean = value; + bool changed = _setterReturnsBoolean != newValue; + _setterReturnsBoolean = newValue; return changed; } @@ -721,10 +721,10 @@ int TestProperties::virtualSetterReturnsBoolean() return _virtualSetterReturnsBoolean; } -bool TestProperties::setVirtualSetterReturnsBoolean(int value) +bool TestProperties::setVirtualSetterReturnsBoolean(int newValue) { - bool changed = _virtualSetterReturnsBoolean != value; - _virtualSetterReturnsBoolean = value; + bool changed = _virtualSetterReturnsBoolean != newValue; + _virtualSetterReturnsBoolean = newValue; return changed; } diff --git a/tests/Common/Common.h b/tests/Common/Common.h index a0848e26ad..124d067a9c 100644 --- a/tests/Common/Common.h +++ b/tests/Common/Common.h @@ -561,10 +561,10 @@ struct DLL_API TestProperties void set(int value); int setterReturnsBoolean(); - bool setSetterReturnsBoolean(int value); + bool setSetterReturnsBoolean(int newValue); virtual int virtualSetterReturnsBoolean(); - virtual bool setVirtualSetterReturnsBoolean(int value); + virtual bool setVirtualSetterReturnsBoolean(int newValue); int nestedEnum(); int nestedEnum(int i);