summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/bin/eolian/eo_generator.c10
-rw-r--r--src/bin/eolian/impl_generator.c4
-rw-r--r--src/bin/eolian/legacy_generator.c8
-rw-r--r--src/bin/eolian_cxx/convert.cc6
-rw-r--r--src/bin/eolian_cxx/convert_comments.cc2
-rw-r--r--src/lib/eolian/Eolian.h12
-rw-r--r--src/lib/eolian/database_function_api.c4
-rw-r--r--src/tests/eolian/eolian_parsing.c4
8 files changed, 25 insertions, 25 deletions
diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index 5aba944087..05e9ec6986 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -102,7 +102,7 @@ eo_fundef_generate(const Eolian_Class *class, Eolian_Function *func, Eolian_Func
102 fsuffix = "_get"; 102 fsuffix = "_get";
103 if (!rettypet) 103 if (!rettypet)
104 { 104 {
105 itr = eolian_parameters_get(func); 105 itr = eolian_function_parameters_get(func);
106 /* We want to check if there is only one parameter */ 106 /* We want to check if there is only one parameter */
107 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2)) 107 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2))
108 { 108 {
@@ -172,7 +172,7 @@ eo_fundef_generate(const Eolian_Class *class, Eolian_Function *func, Eolian_Func
172 172
173 if (!var_as_ret) 173 if (!var_as_ret)
174 { 174 {
175 itr = eolian_parameters_get(func); 175 itr = eolian_function_parameters_get(func);
176 EINA_ITERATOR_FOREACH(itr, data) 176 EINA_ITERATOR_FOREACH(itr, data)
177 { 177 {
178 const Eolian_Type *ptypet; 178 const Eolian_Type *ptypet;
@@ -365,7 +365,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
365 add_star = EINA_TRUE; 365 add_star = EINA_TRUE;
366 if (!rettypet) 366 if (!rettypet)
367 { 367 {
368 itr = eolian_parameters_get(funcid); 368 itr = eolian_function_parameters_get(funcid);
369 /* We want to check if there is only one parameter */ 369 /* We want to check if there is only one parameter */
370 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2)) 370 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2))
371 { 371 {
@@ -402,7 +402,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
402 eina_iterator_free(itr); 402 eina_iterator_free(itr);
403 if (!var_as_ret) 403 if (!var_as_ret)
404 { 404 {
405 itr = eolian_parameters_get(funcid); 405 itr = eolian_function_parameters_get(funcid);
406 EINA_ITERATOR_FOREACH(itr, data) 406 EINA_ITERATOR_FOREACH(itr, data)
407 { 407 {
408 const Eolian_Type *ptypet; 408 const Eolian_Type *ptypet;
@@ -452,7 +452,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
452 452
453 if (!has_params && !var_as_ret) 453 if (!has_params && !var_as_ret)
454 { 454 {
455 itr = eolian_parameters_get(funcid); 455 itr = eolian_function_parameters_get(funcid);
456 has_params |= (eina_iterator_next(itr, &data)); 456 has_params |= (eina_iterator_next(itr, &data));
457 eina_iterator_free(itr); 457 eina_iterator_free(itr);
458 } 458 }
diff --git a/src/bin/eolian/impl_generator.c b/src/bin/eolian/impl_generator.c
index 231adf5331..1043898f71 100644
--- a/src/bin/eolian/impl_generator.c
+++ b/src/bin/eolian/impl_generator.c
@@ -40,7 +40,7 @@ _params_generate(const Eolian_Function *foo, Eolian_Function_Type ftype, Eina_Bo
40 if (!var_as_ret) 40 if (!var_as_ret)
41 { 41 {
42 Eina_Bool add_star = (ftype == EOLIAN_PROP_GET); 42 Eina_Bool add_star = (ftype == EOLIAN_PROP_GET);
43 itr = eolian_parameters_get(foo); 43 itr = eolian_function_parameters_get(foo);
44 EINA_ITERATOR_FOREACH(itr, param) 44 EINA_ITERATOR_FOREACH(itr, param)
45 { 45 {
46 const Eolian_Type *ptypet; 46 const Eolian_Type *ptypet;
@@ -149,7 +149,7 @@ _prototype_generate(const Eolian_Function *foo, Eolian_Function_Type ftype, Eina
149 const Eolian_Type *rettypet = eolian_function_return_type_get(foo, ftype); 149 const Eolian_Type *rettypet = eolian_function_return_type_get(foo, ftype);
150 if (ftype == EOLIAN_PROP_GET && !rettypet) 150 if (ftype == EOLIAN_PROP_GET && !rettypet)
151 { 151 {
152 Eina_Iterator *itr = eolian_parameters_get(foo); 152 Eina_Iterator *itr = eolian_function_parameters_get(foo);
153 void *data, *data2; 153 void *data, *data2;
154 /* We want to check if there is only one parameter */ 154 /* We want to check if there is only one parameter */
155 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2)) 155 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2))
diff --git a/src/bin/eolian/legacy_generator.c b/src/bin/eolian/legacy_generator.c
index 2ab85ebcc5..fa97578b58 100644
--- a/src/bin/eolian/legacy_generator.c
+++ b/src/bin/eolian/legacy_generator.c
@@ -68,7 +68,7 @@ _eapi_decl_func_generate(const Eolian_Class *class, const Eolian_Function *funci
68 add_star = EINA_TRUE; 68 add_star = EINA_TRUE;
69 if (!rettypet) 69 if (!rettypet)
70 { 70 {
71 itr = eolian_parameters_get(funcid); 71 itr = eolian_function_parameters_get(funcid);
72 /* We want to check if there is only one parameter */ 72 /* We want to check if there is only one parameter */
73 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2)) 73 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2))
74 { 74 {
@@ -132,7 +132,7 @@ _eapi_decl_func_generate(const Eolian_Class *class, const Eolian_Function *funci
132 eina_iterator_free(itr); 132 eina_iterator_free(itr);
133 if (!var_as_ret) 133 if (!var_as_ret)
134 { 134 {
135 itr = eolian_parameters_get(funcid); 135 itr = eolian_function_parameters_get(funcid);
136 EINA_ITERATOR_FOREACH(itr, data) 136 EINA_ITERATOR_FOREACH(itr, data)
137 { 137 {
138 const Eolian_Type *ptypet; 138 const Eolian_Type *ptypet;
@@ -230,7 +230,7 @@ _eapi_func_generate(const Eolian_Class *class, const Eolian_Function *funcid, Eo
230 add_star = EINA_TRUE; 230 add_star = EINA_TRUE;
231 if (!rettypet) 231 if (!rettypet)
232 { 232 {
233 itr = eolian_parameters_get(funcid); 233 itr = eolian_function_parameters_get(funcid);
234 /* We want to check if there is only one parameter */ 234 /* We want to check if there is only one parameter */
235 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2)) 235 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2))
236 { 236 {
@@ -274,7 +274,7 @@ _eapi_func_generate(const Eolian_Class *class, const Eolian_Function *funcid, Eo
274 eina_iterator_free(itr); 274 eina_iterator_free(itr);
275 if (!var_as_ret) 275 if (!var_as_ret)
276 { 276 {
277 itr = eolian_parameters_get(funcid); 277 itr = eolian_function_parameters_get(funcid);
278 EINA_ITERATOR_FOREACH(itr, data) 278 EINA_ITERATOR_FOREACH(itr, data)
279 { 279 {
280 const Eolian_Type *ptypet; 280 const Eolian_Type *ptypet;
diff --git a/src/bin/eolian_cxx/convert.cc b/src/bin/eolian_cxx/convert.cc
index 8323d44611..42d68c355c 100644
--- a/src/bin/eolian_cxx/convert.cc
+++ b/src/bin/eolian_cxx/convert.cc
@@ -49,7 +49,7 @@ static efl::eolian::parameters_container_type
49convert_eolian_parameters(Eolian_Function const& func, getter_t func_type) 49convert_eolian_parameters(Eolian_Function const& func, getter_t func_type)
50{ 50{
51 return convert_eolian_parameters 51 return convert_eolian_parameters
52 (::eolian_parameters_get(&func), func_type.value); 52 (::eolian_function_parameters_get(&func), func_type.value);
53} 53}
54 54
55static efl::eolian::parameters_container_type 55static efl::eolian::parameters_container_type
@@ -69,7 +69,7 @@ convert_eolian_parameters(Eolian_Function const& func)
69{ 69{
70 assert(function_type(func) != EOLIAN_PROPERTY); 70 assert(function_type(func) != EOLIAN_PROPERTY);
71 return convert_eolian_parameters 71 return convert_eolian_parameters
72 (::eolian_parameters_get(&func), function_type(func)); 72 (::eolian_function_parameters_get(&func), function_type(func));
73} 73}
74 74
75static efl::eolian::functions_container_type 75static efl::eolian::functions_container_type
@@ -144,7 +144,7 @@ convert_eolian_property_to_functions(Eolian_Class const& klass)
144 convert_eolian_parameters(::eolian_property_keys_get(prop_), 144 convert_eolian_parameters(::eolian_property_keys_get(prop_),
145 eolian_cxx::setter); 145 eolian_cxx::setter);
146 efl::eolian::parameters_container_type params = 146 efl::eolian::parameters_container_type params =
147 convert_eolian_parameters(::eolian_parameters_get(prop_), 147 convert_eolian_parameters(::eolian_function_parameters_get(prop_),
148 eolian_cxx::setter); 148 eolian_cxx::setter);
149 set_.params = params; 149 set_.params = params;
150 if (!keys.empty()) 150 if (!keys.empty())
diff --git a/src/bin/eolian_cxx/convert_comments.cc b/src/bin/eolian_cxx/convert_comments.cc
index 7094e6209e..4f13048044 100644
--- a/src/bin/eolian_cxx/convert_comments.cc
+++ b/src/bin/eolian_cxx/convert_comments.cc
@@ -50,7 +50,7 @@ _comment_brief_and_params(Eolian_Function const& function,
50 { 50 {
51 doc += "@brief " + func + "\n\n"; 51 doc += "@brief " + func + "\n\n";
52 } 52 }
53 std::string params = _comment_parameters_list(::eolian_parameters_get(&function)); 53 std::string params = _comment_parameters_list(::eolian_function_parameters_get(&function));
54 if (params != "") 54 if (params != "")
55 { 55 {
56 doc += params + "\n"; 56 doc += params + "\n";
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index 8ef4c092c6..7f290ff2b8 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -528,34 +528,34 @@ EAPI Eina_Bool eolian_function_is_virtual_pure(const Eolian_Function *function_i
528EAPI const Eolian_Function_Parameter *eolian_function_parameter_get(const Eolian_Function *function_id, const char *param_name); 528EAPI const Eolian_Function_Parameter *eolian_function_parameter_get(const Eolian_Function *function_id, const char *param_name);
529 529
530/* 530/*
531 * @brief Returns an iterator to the keys params of a given function. 531 * @brief Returns an iterator to the parameter handles for a method/ctor/dtor.
532 * 532 *
533 * @param[in] function_id Id of the function 533 * @param[in] function_id Id of the function
534 * @return the iterator 534 * @return the iterator
535 * 535 *
536 * @ingroup Eolian 536 * @ingroup Eolian
537 */ 537 */
538EAPI Eina_Iterator *eolian_property_keys_get(const Eolian_Function *foo_id); 538EAPI Eina_Iterator *eolian_function_parameters_get(const Eolian_Function *function_id);
539 539
540/* 540/*
541 * @brief Returns an iterator to the values params of a given function. 541 * @brief Returns an iterator to the keys params of a given function.
542 * 542 *
543 * @param[in] function_id Id of the function 543 * @param[in] function_id Id of the function
544 * @return the iterator 544 * @return the iterator
545 * 545 *
546 * @ingroup Eolian 546 * @ingroup Eolian
547 */ 547 */
548EAPI Eina_Iterator *eolian_property_values_get(const Eolian_Function *foo_id); 548EAPI Eina_Iterator *eolian_property_keys_get(const Eolian_Function *foo_id);
549 549
550/* 550/*
551 * @brief Returns an iterator to the parameter handles for a method/ctor/dtor. 551 * @brief Returns an iterator to the values params of a given function.
552 * 552 *
553 * @param[in] function_id Id of the function 553 * @param[in] function_id Id of the function
554 * @return the iterator 554 * @return the iterator
555 * 555 *
556 * @ingroup Eolian 556 * @ingroup Eolian
557 */ 557 */
558EAPI Eina_Iterator *eolian_parameters_get(const Eolian_Function *function_id); 558EAPI Eina_Iterator *eolian_property_values_get(const Eolian_Function *foo_id);
559 559
560/* 560/*
561 * @brief Get information about a function parameter 561 * @brief Get information about a function parameter
diff --git a/src/lib/eolian/database_function_api.c b/src/lib/eolian/database_function_api.c
index e719d08dce..75e06ad0a4 100644
--- a/src/lib/eolian/database_function_api.c
+++ b/src/lib/eolian/database_function_api.c
@@ -98,11 +98,11 @@ eolian_property_keys_get(const Eolian_Function *fid)
98EAPI Eina_Iterator * 98EAPI Eina_Iterator *
99eolian_property_values_get(const Eolian_Function *fid) 99eolian_property_values_get(const Eolian_Function *fid)
100{ 100{
101 return eolian_parameters_get(fid); 101 return eolian_function_parameters_get(fid);
102} 102}
103 103
104EAPI Eina_Iterator * 104EAPI Eina_Iterator *
105eolian_parameters_get(const Eolian_Function *fid) 105eolian_function_parameters_get(const Eolian_Function *fid)
106{ 106{
107 EINA_SAFETY_ON_NULL_RETURN_VAL(fid, NULL); 107 EINA_SAFETY_ON_NULL_RETURN_VAL(fid, NULL);
108 return (fid->params ? eina_list_iterator_new(fid->params) : NULL); 108 return (fid->params ? eina_list_iterator_new(fid->params) : NULL);
diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c
index d2b0645f9e..ed47a0f4ba 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -354,7 +354,7 @@ START_TEST(eolian_complex_type)
354 eina_stringshare_del(type_name); 354 eina_stringshare_del(type_name);
355 eina_iterator_free(iter); 355 eina_iterator_free(iter);
356 /* Properties parameter type */ 356 /* Properties parameter type */
357 fail_if(!(iter = eolian_parameters_get(fid))); 357 fail_if(!(iter = eolian_function_parameters_get(fid)));
358 fail_if(!(eina_iterator_next(iter, (void**)&param))); 358 fail_if(!(eina_iterator_next(iter, (void**)&param)));
359 fail_if(eina_iterator_next(iter, &dummy)); 359 fail_if(eina_iterator_next(iter, &dummy));
360 eina_iterator_free(iter); 360 eina_iterator_free(iter);
@@ -387,7 +387,7 @@ START_TEST(eolian_complex_type)
387 eina_stringshare_del(type_name); 387 eina_stringshare_del(type_name);
388 eina_iterator_free(iter); 388 eina_iterator_free(iter);
389 /* Methods parameter type */ 389 /* Methods parameter type */
390 fail_if(!(iter = eolian_parameters_get(fid))); 390 fail_if(!(iter = eolian_function_parameters_get(fid)));
391 fail_if(!(eina_iterator_next(iter, (void**)&param))); 391 fail_if(!(eina_iterator_next(iter, (void**)&param)));
392 fail_if(eina_iterator_next(iter, &dummy)); 392 fail_if(eina_iterator_next(iter, &dummy));
393 eina_iterator_free(iter); 393 eina_iterator_free(iter);