Generate valid C# for setters returning Booleans

Signed-off-by: Dimitar Dobrev <[email protected]>
mono · Aug 30, 2021 · 4c1e9b8 · 4c1e9b8
1 parent 8803ede
commit 4c1e9b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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);