Skip to content

Commit 2fdd082

Browse files
committed
Generate valid C# for setters returning Booleans
Signed-off-by: Dimitar Dobrev <[email protected]>
1 parent 8803ede commit 2fdd082

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/Generator/Generators/CSharp/CSharpSources.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3270,8 +3270,8 @@ private ParamMarshal GenerateFunctionParamMarshal(Parameter param, int paramInde
32703270
var name = param.Name;
32713271
var function = (Function) param.Namespace;
32723272
param.Name = param.Kind == ParameterKind.ImplicitDestructorParameter ? "0" :
3273-
function.IsGenerated || function.OperatorKind == CXXOperatorKind.Subscript ?
3274-
name : "value";
3273+
ActiveBlock.Parent.Kind != BlockKind.Property ||
3274+
function.OperatorKind == CXXOperatorKind.Subscript ? name : "value";
32753275

32763276
var argName = Generator.GeneratedIdentifier("arg") + paramIndex.ToString(CultureInfo.InvariantCulture);
32773277
var paramMarshal = new ParamMarshal { Name = argName, Param = param };

tests/Common/Common.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -709,10 +709,10 @@ int TestProperties::setterReturnsBoolean()
709709
return _setterReturnsBoolean;
710710
}
711711

712-
bool TestProperties::setSetterReturnsBoolean(int value)
712+
bool TestProperties::setSetterReturnsBoolean(int newValue)
713713
{
714-
bool changed = _setterReturnsBoolean != value;
715-
_setterReturnsBoolean = value;
714+
bool changed = _setterReturnsBoolean != newValue;
715+
_setterReturnsBoolean = newValue;
716716
return changed;
717717
}
718718

@@ -721,10 +721,10 @@ int TestProperties::virtualSetterReturnsBoolean()
721721
return _virtualSetterReturnsBoolean;
722722
}
723723

724-
bool TestProperties::setVirtualSetterReturnsBoolean(int value)
724+
bool TestProperties::setVirtualSetterReturnsBoolean(int newValue)
725725
{
726-
bool changed = _virtualSetterReturnsBoolean != value;
727-
_virtualSetterReturnsBoolean = value;
726+
bool changed = _virtualSetterReturnsBoolean != newValue;
727+
_virtualSetterReturnsBoolean = newValue;
728728
return changed;
729729
}
730730

tests/Common/Common.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -561,10 +561,10 @@ struct DLL_API TestProperties
561561
void set(int value);
562562

563563
int setterReturnsBoolean();
564-
bool setSetterReturnsBoolean(int value);
564+
bool setSetterReturnsBoolean(int newValue);
565565

566566
virtual int virtualSetterReturnsBoolean();
567-
virtual bool setVirtualSetterReturnsBoolean(int value);
567+
virtual bool setVirtualSetterReturnsBoolean(int newValue);
568568

569569
int nestedEnum();
570570
int nestedEnum(int i);

0 commit comments

Comments
 (0)