Clean up Fields and Properties.

Author: kring

Reinterop~/Fields.cs

@@ -69,25 +69,16 @@ private static void GenerateFieldAccessors(CppGenerationContext context, TypeToG
         private static void GenerateSingleFieldAccessors(CppGenerationContext context, TypeToGenerate item, IFieldSymbol field, GeneratedResult result)
         {
             CppType fieldType = CppType.FromCSharp(context, field.Type);
-            CppType setType = fieldType.AsParameterType();
-            CppType getType = fieldType.AsReturnType();
 
-            CppInteropFunction getRecipe = new CppInteropFunction(context, result.CppDefinition.Type, field.Name)
-                .ReturnType(getType)
-                .Static(field.IsStatic);
-            CppInteropFunction setRecipe = new CppInteropFunction(context, result.CppDefinition.Type, field.Name)
-                .Parameters(new[] { new CppInteropParameter("value", setType) })
-                .ReturnType(CppType.Void)
-                .Static(field.IsStatic);
+            CppInteropFunction baseRecipe = new CppInteropFunction(context, result.CppDefinition.Type, field.Name).Static(field.IsStatic);
+            CppInteropFunction getRecipe = baseRecipe.Clone().ReturnType(fieldType.AsReturnType());
+            CppInteropFunction setRecipe = baseRecipe.Clone().Parameters([new CppInteropParameter("value", fieldType.AsParameterType())]);
 
             var (getCsName, getCsContent) = Interop.CreateCSharpDelegateInit(context, item.Type, field, isGet: true);
             var (setCsName, setCsContent) = Interop.CreateCSharpDelegateInit(context, item.Type, field, isGet: false);
 
             getRecipe.AddToGeneration(result, getCsName, getCsContent, getRecipe.Body());
-
-            IReadOnlyList<CppStatement> setterBody = CppInterop.CallManagedFunction(
-                new CppIdentifier(setRecipe.FunctionPointerName), setRecipe.CallArguments());
-            setRecipe.AddToGeneration(result, setCsName, setCsContent, setterBody);
+            setRecipe.AddToGeneration(result, setCsName, setCsContent, setRecipe.Body());
         }
     }
 }

Reinterop~/Properties.cs

@@ -24,15 +24,10 @@ private static void GenerateSingleProperty(CppGenerationContext context, TypeToG
 
         private static void GenerateSingleMethod(CppGenerationContext context, TypeToGenerate item, GeneratedResult result, IPropertySymbol property, IMethodSymbol method)
         {
-            CppType returnType = CppType.FromCSharp(context, method.ReturnType).AsReturnType();
-            CppInteropParameter[] parameters = method.Parameters
-                .Select(parameter => new CppInteropParameter(parameter.Name, CppType.FromCSharp(context, parameter.Type).AsParameterType()))
-                .ToArray();
-
             string propertyName = property.IsIndexer ? "operator[]" : property.Name;
             CppInteropFunction recipe = new CppInteropFunction(context, result.CppDefinition.Type, propertyName)
-                .Parameters(parameters)
-                .ReturnType(returnType)
+                .Parameters(method.Parameters.Select(parameter => new CppInteropParameter(parameter.Name, CppType.FromCSharp(context, parameter.Type).AsParameterType())))
+                .ReturnType(CppType.FromCSharp(context, method.ReturnType).AsReturnType())
                 .Static(property.IsStatic);
 
             var (csName, csContent) = Interop.CreateCSharpDelegateInit(context, item.Type, method, recipe.FunctionPointerName);