kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

csharp: Add ownership info to AccessorToIEnumerable

This commit is contained in:
Lauro Moura 2019-12-03 09:50:21 -03:00
parent 59698f0e22
commit 3cbe4d3e7c
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/eolian_mono/eolian/mono/parameter.hh
View File

@ -655,8 +655,7 @@ struct native_convert_in_variable_generator
if (!complex)
return false;
return as_generator(
"var " << string << " = Efl.Eo.Globals.AccessorTo" << type << "(" << escape_keyword(param.param_name)
<< ");\n"
"var " << string << " = Efl.Eo.Globals.AccessorTo" << type << "(" << escape_keyword(param.param_name) << ", " << (param.type.has_own ? "true" : "false") << ");\n"
).generate(sink, std::make_tuple(in_variable_name(param.param_name), param.type), context);
}
else if (param.type.c_type == "Eina_Value")
@ -1022,8 +1021,7 @@ struct convert_out_assign_generator
if (!complex)
return false;
return as_generator(
string << " = Efl.Eo.Globals.AccessorTo" << type << "(" << string
<< ");\n"
string << " = Efl.Eo.Globals.AccessorTo" << type << "(" << string << ", " << (param.type.has_own ? "true" : "false") << ");\n"
).generate(sink, std::make_tuple(escape_keyword(param.param_name), param.type, out_variable_name(param.param_name)), context);
}
else if (param_is_acceptable(param, "Eina_Iterator *", WANT_OWN, WANT_OUT)
@ -1156,7 +1154,7 @@ struct convert_return_generator
attributes::complex_type_def const* complex = efl::eina::get<attributes::complex_type_def>(&ret_type.original_type);
if (!complex)
return false;
if (!as_generator("return Efl.Eo.Globals.AccessorTo" << type << "(_ret_var);")
if (!as_generator("return Efl.Eo.Globals.AccessorTo" << type << "(_ret_var, " << (ret_type.has_own ? "true" : "false") << ");")
.generate(sink, ret_type, context))
return false;
}

9
src/bindings/mono/eo_mono/iwrapper.cs
View File

@ -759,10 +759,12 @@ public static class Globals
Monitor.Exit(Efl.All.InitLock);
}
internal static IEnumerable<T> AccessorToIEnumerable<T>(IntPtr accessor)
internal static IEnumerable<T> AccessorToIEnumerable<T>(IntPtr accessor, bool isMoved)
{
if (accessor == IntPtr.Zero)
{
throw new ArgumentException("accessor is null", nameof(accessor));
}
IntPtr data = IntPtr.Zero;
uint position = 0;
@ -772,6 +774,11 @@ public static class Globals
yield return Eina.TraitFunctions.NativeToManaged<T>(data);
position += 1;
}
if (isMoved)
{
Eina.AccessorNativeFunctions.eina_accessor_free(accessor);
}
}
internal static IntPtr IEnumerableToAccessor<T>(IEnumerable<T> enumerable, bool isMoved)