GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Rename generated method parameters in bindings to prevent name collisions

Browse Source
This commit is contained in:
Wojciech Figat
2022-12-24 15:35:46 +01:00
parent d8805dc801
commit 7440cb0963
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
View File

@@ -495,7 +495,7 @@ namespace Flax.Build.Bindings
returnMarshalType = $"MarshalUsing(typeof({returnValueType}Marshaller))"; returnMarshalType = $"MarshalUsing(typeof({returnValueType}Marshaller))";
} }
else if (returnValueType == "byte[]") else if (returnValueType == "byte[]")
returnMarshalType = $"MarshalUsing(typeof(FlaxEngine.ArrayMarshaller<,>), CountElementName = \"returnCount\")"; returnMarshalType = $"MarshalUsing(typeof(FlaxEngine.ArrayMarshaller<,>), CountElementName = \"__returnCount\")";
else if (returnValueType == "bool[]") else if (returnValueType == "bool[]")
{ {
// Boolean arrays does not support custom marshalling for some unkown reason... // Boolean arrays does not support custom marshalling for some unkown reason...
@@ -538,9 +538,9 @@ namespace Flax.Build.Bindings
else if (parameterInfo.Type.Type == "MonoArray") else if (parameterInfo.Type.Type == "MonoArray")
parameterMarshalType = "MarshalUsing(typeof(FlaxEngine.SystemArrayMarshaller))"; parameterMarshalType = "MarshalUsing(typeof(FlaxEngine.SystemArrayMarshaller))";
else if (parameterInfo.Type.Type == "Array" && parameterInfo.Type.GenericArgs.Count > 0 && parameterInfo.Type.GenericArgs[0].Type == "bool") else if (parameterInfo.Type.Type == "Array" && parameterInfo.Type.GenericArgs.Count > 0 && parameterInfo.Type.GenericArgs[0].Type == "bool")
parameterMarshalType = $"MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.U1, SizeParamIndex = {(!functionInfo.IsStatic ? 1 : 0) + functionInfo.Parameters.Count + (functionInfo.Glue.CustomParameters.FindIndex(x => x.Name == parameterInfo.Name + "Count"))})"; parameterMarshalType = $"MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.U1, SizeParamIndex = {(!functionInfo.IsStatic ? 1 : 0) + functionInfo.Parameters.Count + (functionInfo.Glue.CustomParameters.FindIndex(x => x.Name == $"__{parameterInfo.Name}Count"))})";
else if (parameterInfo.Type.Type == "Array" || parameterInfo.Type.Type == "Span" || parameterInfo.Type.Type == "DataContainer" || parameterInfo.Type.Type == "BytesContainer" || nativeType == "Array") else if (parameterInfo.Type.Type == "Array" || parameterInfo.Type.Type == "Span" || parameterInfo.Type.Type == "DataContainer" || parameterInfo.Type.Type == "BytesContainer" || nativeType == "Array")
parameterMarshalType = $"MarshalUsing(typeof(FlaxEngine.ArrayMarshaller<,>), CountElementName = \"{parameterInfo.Name}Count\")"; parameterMarshalType = $"MarshalUsing(typeof(FlaxEngine.ArrayMarshaller<,>), CountElementName = \"__{parameterInfo.Name}Count\")";
else if (parameterInfo.Type.Type == "Dictionary") else if (parameterInfo.Type.Type == "Dictionary")
parameterMarshalType = $"MarshalUsing(typeof(FlaxEngine.DictionaryMarshaller<,>), ConstantElementCount = 0)"; parameterMarshalType = $"MarshalUsing(typeof(FlaxEngine.DictionaryMarshaller<,>), ConstantElementCount = 0)";
else if (nativeType == "bool") else if (nativeType == "bool")
@@ -576,7 +576,7 @@ namespace Flax.Build.Bindings
var nativeType = GenerateCSharpManagedToNativeType(buildData, parameterInfo.Type, caller); var nativeType = GenerateCSharpManagedToNativeType(buildData, parameterInfo.Type, caller);
#if USE_NETCORE #if USE_NETCORE
string parameterMarshalType = ""; string parameterMarshalType = "";
if (parameterInfo.IsOut && parameterInfo.DefaultValue == "var resultAsRef") if (parameterInfo.IsOut && parameterInfo.DefaultValue == "var __resultAsRef")
{ {
if (functionInfo.Glue.UseResultReferenceCount) if (functionInfo.Glue.UseResultReferenceCount)
parameterMarshalType = $"MarshalUsing(typeof(FlaxEngine.ArrayMarshaller<,>), CountElementName = \"{parameterInfo.Name}Count\")"; parameterMarshalType = $"MarshalUsing(typeof(FlaxEngine.ArrayMarshaller<,>), CountElementName = \"{parameterInfo.Name}Count\")";
@@ -612,7 +612,7 @@ namespace Flax.Build.Bindings
if (parameterInfo.Type.IsArray || parameterInfo.Type.Type == "Array" || parameterInfo.Type.Type == "Span" || parameterInfo.Type.Type == "BytesContainer" || parameterInfo.Type.Type == "DataContainer" || parameterInfo.Type.Type == "BitArray") if (parameterInfo.Type.IsArray || parameterInfo.Type.Type == "Array" || parameterInfo.Type.Type == "Span" || parameterInfo.Type.Type == "BytesContainer" || parameterInfo.Type.Type == "DataContainer" || parameterInfo.Type.Type == "BitArray")
{ {
if (!parameterInfo.IsOut) if (!parameterInfo.IsOut)
contents.Append($"var {parameterInfo.Name}Count = {(isSetter ? "value" : parameterInfo.Name)}?.Length ?? 0; "); contents.Append($"var __{parameterInfo.Name}Count = {(isSetter ? "value" : parameterInfo.Name)}?.Length ?? 0; ");
} }
} }
#endif #endif
@@ -693,7 +693,7 @@ namespace Flax.Build.Bindings
// Return result // Return result
if (functionInfo.Glue.UseReferenceForResult) if (functionInfo.Glue.UseReferenceForResult)
{ {
contents.Append(" return resultAsRef;"); contents.Append(" return __resultAsRef;");
} }
} }

31
Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
View File

@@ -885,8 +885,8 @@ namespace Flax.Build.Bindings
returnValueType = "void"; returnValueType = "void";
functionInfo.Glue.CustomParameters.Add(new FunctionInfo.ParameterInfo functionInfo.Glue.CustomParameters.Add(new FunctionInfo.ParameterInfo
{ {
Name = "resultAsRef", Name = "__resultAsRef",
DefaultValue = "var resultAsRef", DefaultValue = "var __resultAsRef",
Type = new TypeInfo Type = new TypeInfo
{ {
Type = functionInfo.ReturnType.Type, Type = functionInfo.ReturnType.Type,
@@ -900,8 +900,8 @@ namespace Flax.Build.Bindings
functionInfo.Glue.UseResultReferenceCount = true; functionInfo.Glue.UseResultReferenceCount = true;
functionInfo.Glue.CustomParameters.Add(new FunctionInfo.ParameterInfo functionInfo.Glue.CustomParameters.Add(new FunctionInfo.ParameterInfo
{ {
Name = "resultAsRefCount", Name = "__resultAsRefCount",
DefaultValue = "var resultAsRefCount", DefaultValue = "var __resultAsRefCount",
Type = new TypeInfo Type = new TypeInfo
{ {
Type = "int" Type = "int"
@@ -916,8 +916,8 @@ namespace Flax.Build.Bindings
{ {
functionInfo.Glue.CustomParameters.Add(new FunctionInfo.ParameterInfo functionInfo.Glue.CustomParameters.Add(new FunctionInfo.ParameterInfo
{ {
Name = "returnCount", Name = "__returnCount",
DefaultValue = "var returnCount", DefaultValue = "var __returnCount",
Type = new TypeInfo Type = new TypeInfo
{ {
Type = "int" Type = "int"
@@ -994,10 +994,11 @@ namespace Flax.Build.Bindings
if (parameterInfo.Type.IsArray || parameterInfo.Type.Type == "Array" || parameterInfo.Type.Type == "Span" || parameterInfo.Type.Type == "BytesContainer" || parameterInfo.Type.Type == "DataContainer" || parameterInfo.Type.Type == "BitArray") if (parameterInfo.Type.IsArray || parameterInfo.Type.Type == "Array" || parameterInfo.Type.Type == "Span" || parameterInfo.Type.Type == "BytesContainer" || parameterInfo.Type.Type == "DataContainer" || parameterInfo.Type.Type == "BitArray")
{ {
// We need additional output parameters for array sizes // We need additional output parameters for array sizes
var name = $"__{parameterInfo.Name}Count";
functionInfo.Glue.CustomParameters.Add(new FunctionInfo.ParameterInfo functionInfo.Glue.CustomParameters.Add(new FunctionInfo.ParameterInfo
{ {
Name = parameterInfo.Name + "Count", Name = name,
DefaultValue = parameterInfo.IsOut ? "int _" : parameterInfo.Name + "Count", DefaultValue = parameterInfo.IsOut ? "int _" : name,
Type = new TypeInfo Type = new TypeInfo
{ {
Type = "int" Type = "int"
@@ -1036,7 +1037,7 @@ namespace Flax.Build.Bindings
string callBegin = " "; string callBegin = " ";
if (functionInfo.Glue.UseReferenceForResult) if (functionInfo.Glue.UseReferenceForResult)
{ {
callBegin += "*resultAsRef = "; callBegin += "*__resultAsRef = ";
} }
else if (!functionInfo.ReturnType.IsVoid) else if (!functionInfo.ReturnType.IsVoid)
{ {
@@ -1052,17 +1053,17 @@ namespace Flax.Build.Bindings
{ {
callBegin2 = " "; callBegin2 = " ";
if (functionInfo.ReturnType.Type == "Span" || functionInfo.ReturnType.Type == "BytesContainer") if (functionInfo.ReturnType.Type == "Span" || functionInfo.ReturnType.Type == "BytesContainer")
callBegin2 += "*resultAsRefCount = {0}.Length();"; callBegin2 += "*__resultAsRefCount = {0}.Length();";
else else
callBegin2 += "*resultAsRefCount = {0}.Count();"; callBegin2 += "*__resultAsRefCount = {0}.Count();";
} }
else if (functionInfo.ReturnType.Type == "BitArray" || functionInfo.ReturnType.Type == "BytesContainer") else if (functionInfo.ReturnType.Type == "BitArray" || functionInfo.ReturnType.Type == "BytesContainer")
{ {
callBegin2 = " "; callBegin2 = " ";
if (functionInfo.ReturnType.Type == "Span" || functionInfo.ReturnType.Type == "BytesContainer") if (functionInfo.ReturnType.Type == "Span" || functionInfo.ReturnType.Type == "BytesContainer")
callBegin2 += "*returnCount = {0}.Length();"; callBegin2 += "*__returnCount = {0}.Length();";
else else
callBegin2 += "*returnCount = {0}.Count();"; callBegin2 += "*__returnCount = {0}.Count();";
} }
#endif #endif
string call; string call;
@@ -1204,7 +1205,7 @@ namespace Flax.Build.Bindings
#if USE_NETCORE #if USE_NETCORE
if (parameterInfo.Type.Type == "Array") if (parameterInfo.Type.Type == "Array")
{ {
contents.AppendFormat(" *{0}Count = {1}.Count();", parameterInfo.Name, parameterInfo.Name + "Temp").AppendLine(); contents.AppendFormat(" *__{0}Count = {1}.Count();", parameterInfo.Name, parameterInfo.Name + "Temp").AppendLine();
} }
#endif #endif
continue; continue;
@@ -1222,7 +1223,7 @@ namespace Flax.Build.Bindings
if (parameterInfo.Type.Type == "BytesContainer" && parameterInfo.Type.GenericArgs == null) if (parameterInfo.Type.Type == "BytesContainer" && parameterInfo.Type.GenericArgs == null)
{ {
contents.AppendFormat(" mono_gc_wbarrier_generic_store({0}, (MonoObject*){1});", parameterInfo.Name, value).AppendLine(); contents.AppendFormat(" mono_gc_wbarrier_generic_store({0}, (MonoObject*){1});", parameterInfo.Name, value).AppendLine();
contents.AppendFormat(" *{0}Count = {1}.Length();", parameterInfo.Name, parameterInfo.Name + "Temp").AppendLine(); contents.AppendFormat(" *__{0}Count = {1}.Length();", parameterInfo.Name, parameterInfo.Name + "Temp").AppendLine();
continue; continue;
} }