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

eolian_cxx: support multiple function pointers

This commit is contained in:
Thiep Ha 2018-01-12 18:45:13 +09:00
parent f7d9f0dde6
commit 360ce182ef
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/eolian_cxx/grammar/converting_argument.hpp
View File

@ -35,8 +35,8 @@ struct converting_argument_generator
attributes::qualifier_def qualifier = param.type.original_type.visit(attributes::get_qualifier_visitor{});
if (param.type.original_type.visit(this->is_function_ptr))
{
// FIXME: This supports only one function pointer.
return as_generator("fw->data_to_c(), fw->func_to_c(), fw->free_to_c()")
return as_generator("fw_" << param.param_name << "->data_to_c(), fw_" << param.param_name << "->func_to_c(), fw_"
<< param.param_name << "->free_to_c()")
.generate(sink, param, ctx);
}
else

3
src/lib/eolian_cxx/grammar/klass_def.hpp
View File

@ -703,7 +703,6 @@ struct function_def
std::vector<std::string> opening_statements() const
{
// FIXME: Supports only one function pointer
std::vector<std::string> statements;
char template_typename = 'F';
for (auto const& param : this->parameters)
@ -714,7 +713,7 @@ struct function_def
{
char typenam[2] = { 0, };
typenam[0] = template_typename++;
std::string statement = "auto fw = new ::efl::eolian::function_wrapper<";
std::string statement = "auto fw_" + param.param_name + " = new ::efl::eolian::function_wrapper<";
statement += param.type.c_type + ", " + typenam + ">(" + param.param_name + ");";
statements.push_back(statement);
}