summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2015-05-20 17:03:14 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2015-05-20 17:03:37 +0100
commit5c199857c911c8b301b694ae9311685ae1ff121d (patch)
tree9e8dad9be8e48f80bd369d8197679d8e71bd171c /src/bin
parentc02bab4149b2f3984d0f7a0637003d2bcd62fabd (diff)
eolian: distinguish between get/set for property keys/values retrieval
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/eolian/eo_generator.c16
-rw-r--r--src/bin/eolian/impl_generator.c6
-rw-r--r--src/bin/eolian/legacy_generator.c12
3 files changed, 17 insertions, 17 deletions
diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index 508eff9a4a..90dfbc99c5 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -95,7 +95,7 @@ eo_fundef_generate(const Eolian_Class *class, const Eolian_Function *func, Eolia
95 rettypet = eolian_function_return_type_get(func, ftype); 95 rettypet = eolian_function_return_type_get(func, ftype);
96 if (ftype == EOLIAN_PROP_GET && !rettypet) 96 if (ftype == EOLIAN_PROP_GET && !rettypet)
97 { 97 {
98 itr = eolian_property_values_get(func); 98 itr = eolian_property_values_get(func, ftype);
99 /* We want to check if there is only one parameter */ 99 /* We want to check if there is only one parameter */
100 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2)) 100 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2))
101 { 101 {
@@ -146,7 +146,7 @@ eo_fundef_generate(const Eolian_Class *class, const Eolian_Function *func, Eolia
146 Eina_Strbuf *str_retdesc = eina_strbuf_new(); 146 Eina_Strbuf *str_retdesc = eina_strbuf_new();
147 Eina_Strbuf *str_typecheck = eina_strbuf_new(); 147 Eina_Strbuf *str_typecheck = eina_strbuf_new();
148 148
149 itr = eolian_property_keys_get(func); 149 itr = eolian_property_keys_get(func, ftype);
150 EINA_ITERATOR_FOREACH(itr, data) 150 EINA_ITERATOR_FOREACH(itr, data)
151 { 151 {
152 Eolian_Function_Parameter *param = data; 152 Eolian_Function_Parameter *param = data;
@@ -165,7 +165,7 @@ eo_fundef_generate(const Eolian_Class *class, const Eolian_Function *func, Eolia
165 165
166 if (!var_as_ret) 166 if (!var_as_ret)
167 { 167 {
168 itr = is_prop ? eolian_property_values_get(func) : eolian_function_parameters_get(func); 168 itr = is_prop ? eolian_property_values_get(func, ftype) : eolian_function_parameters_get(func);
169 EINA_ITERATOR_FOREACH(itr, data) 169 EINA_ITERATOR_FOREACH(itr, data)
170 { 170 {
171 Eolian_Function_Parameter *param = data; 171 Eolian_Function_Parameter *param = data;
@@ -390,7 +390,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
390 add_star = EINA_TRUE; 390 add_star = EINA_TRUE;
391 if (!rettypet) 391 if (!rettypet)
392 { 392 {
393 itr = eolian_property_values_get(funcid); 393 itr = eolian_property_values_get(funcid, ftype);
394 /* We want to check if there is only one parameter */ 394 /* We want to check if there is only one parameter */
395 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2)) 395 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2))
396 { 396 {
@@ -408,7 +408,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
408 suffix = "_set"; 408 suffix = "_set";
409 } 409 }
410 410
411 itr = eolian_property_keys_get(funcid); 411 itr = eolian_property_keys_get(funcid, ftype);
412 EINA_ITERATOR_FOREACH(itr, data) 412 EINA_ITERATOR_FOREACH(itr, data)
413 { 413 {
414 Eolian_Function_Parameter *param = data; 414 Eolian_Function_Parameter *param = data;
@@ -426,7 +426,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
426 eina_iterator_free(itr); 426 eina_iterator_free(itr);
427 if (!var_as_ret) 427 if (!var_as_ret)
428 { 428 {
429 itr = is_prop ? eolian_property_values_get(funcid) : eolian_function_parameters_get(funcid); 429 itr = is_prop ? eolian_property_values_get(funcid, ftype) : eolian_function_parameters_get(funcid);
430 EINA_ITERATOR_FOREACH(itr, data) 430 EINA_ITERATOR_FOREACH(itr, data)
431 { 431 {
432 Eolian_Function_Parameter *param = data; 432 Eolian_Function_Parameter *param = data;
@@ -559,13 +559,13 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
559 Eina_Strbuf *eo_func_decl = eina_strbuf_new(); 559 Eina_Strbuf *eo_func_decl = eina_strbuf_new();
560 Eina_Bool has_params = EINA_FALSE; 560 Eina_Bool has_params = EINA_FALSE;
561 561
562 itr = eolian_property_keys_get(funcid); 562 itr = eolian_property_keys_get(funcid, ftype);
563 has_params |= (eina_iterator_next(itr, &data)); 563 has_params |= (eina_iterator_next(itr, &data));
564 eina_iterator_free(itr); 564 eina_iterator_free(itr);
565 565
566 if (!has_params && !var_as_ret) 566 if (!has_params && !var_as_ret)
567 { 567 {
568 itr = is_prop ? eolian_property_values_get(funcid) : eolian_function_parameters_get(funcid); 568 itr = is_prop ? eolian_property_values_get(funcid, ftype) : eolian_function_parameters_get(funcid);
569 has_params |= (eina_iterator_next(itr, &data)); 569 has_params |= (eina_iterator_next(itr, &data));
570 eina_iterator_free(itr); 570 eina_iterator_free(itr);
571 } 571 }
diff --git a/src/bin/eolian/impl_generator.c b/src/bin/eolian/impl_generator.c
index 490de91aec..5891ae0161 100644
--- a/src/bin/eolian/impl_generator.c
+++ b/src/bin/eolian/impl_generator.c
@@ -19,7 +19,7 @@ _params_generate(const Eolian_Function *foo, Eolian_Function_Type ftype, Eina_Bo
19 Eina_Bool is_prop = (ftype == EOLIAN_PROP_GET || ftype == EOLIAN_PROP_SET); 19 Eina_Bool is_prop = (ftype == EOLIAN_PROP_GET || ftype == EOLIAN_PROP_SET);
20 eina_strbuf_reset(params); 20 eina_strbuf_reset(params);
21 eina_strbuf_reset(short_params); 21 eina_strbuf_reset(short_params);
22 itr = eolian_property_keys_get(foo); 22 itr = eolian_property_keys_get(foo, ftype);
23 EINA_ITERATOR_FOREACH(itr, param) 23 EINA_ITERATOR_FOREACH(itr, param)
24 { 24 {
25 const Eolian_Type *ptypet = eolian_parameter_type_get(param); 25 const Eolian_Type *ptypet = eolian_parameter_type_get(param);
@@ -43,7 +43,7 @@ _params_generate(const Eolian_Function *foo, Eolian_Function_Type ftype, Eina_Bo
43 if (!var_as_ret) 43 if (!var_as_ret)
44 { 44 {
45 Eina_Bool add_star = (ftype == EOLIAN_PROP_GET); 45 Eina_Bool add_star = (ftype == EOLIAN_PROP_GET);
46 itr = is_prop ? eolian_property_values_get(foo) : eolian_function_parameters_get(foo); 46 itr = is_prop ? eolian_property_values_get(foo, ftype) : eolian_function_parameters_get(foo);
47 EINA_ITERATOR_FOREACH(itr, param) 47 EINA_ITERATOR_FOREACH(itr, param)
48 { 48 {
49 const Eolian_Type *ptypet = eolian_parameter_type_get(param); 49 const Eolian_Type *ptypet = eolian_parameter_type_get(param);
@@ -148,7 +148,7 @@ _prototype_generate(const Eolian_Function *foo, Eolian_Function_Type ftype, Eina
148 const Eolian_Type *rettypet = eolian_function_return_type_get(foo, ftype); 148 const Eolian_Type *rettypet = eolian_function_return_type_get(foo, ftype);
149 if (ftype == EOLIAN_PROP_GET && !rettypet) 149 if (ftype == EOLIAN_PROP_GET && !rettypet)
150 { 150 {
151 Eina_Iterator *itr = eolian_property_values_get(foo); 151 Eina_Iterator *itr = eolian_property_values_get(foo, ftype);
152 void *data, *data2; 152 void *data, *data2;
153 /* We want to check if there is only one parameter */ 153 /* We want to check if there is only one parameter */
154 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2)) 154 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 20af6d5f0e..b4f31f1270 100644
--- a/src/bin/eolian/legacy_generator.c
+++ b/src/bin/eolian/legacy_generator.c
@@ -72,7 +72,7 @@ _eapi_decl_func_generate(const Eolian_Class *class, const Eolian_Function *funci
72 add_star = EINA_TRUE; 72 add_star = EINA_TRUE;
73 if (!rettypet) 73 if (!rettypet)
74 { 74 {
75 itr = eolian_property_values_get(funcid); 75 itr = eolian_property_values_get(funcid, ftype);
76 /* We want to check if there is only one parameter */ 76 /* We want to check if there is only one parameter */
77 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2)) 77 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2))
78 { 78 {
@@ -114,7 +114,7 @@ _eapi_decl_func_generate(const Eolian_Class *class, const Eolian_Function *funci
114 eina_strbuf_replace_all(fbody, "@#desc", eina_strbuf_string_get(linedesc)); 114 eina_strbuf_replace_all(fbody, "@#desc", eina_strbuf_string_get(linedesc));
115 eina_strbuf_free(linedesc); 115 eina_strbuf_free(linedesc);
116 116
117 itr = eolian_property_keys_get(funcid); 117 itr = eolian_property_keys_get(funcid, ftype);
118 EINA_ITERATOR_FOREACH(itr, data) 118 EINA_ITERATOR_FOREACH(itr, data)
119 { 119 {
120 Eolian_Function_Parameter *param = data; 120 Eolian_Function_Parameter *param = data;
@@ -143,7 +143,7 @@ _eapi_decl_func_generate(const Eolian_Class *class, const Eolian_Function *funci
143 eina_iterator_free(itr); 143 eina_iterator_free(itr);
144 if (!var_as_ret) 144 if (!var_as_ret)
145 { 145 {
146 itr = is_prop ? eolian_property_values_get(funcid) : eolian_function_parameters_get(funcid); 146 itr = is_prop ? eolian_property_values_get(funcid, ftype) : eolian_function_parameters_get(funcid);
147 EINA_ITERATOR_FOREACH(itr, data) 147 EINA_ITERATOR_FOREACH(itr, data)
148 { 148 {
149 Eolian_Function_Parameter *param = data; 149 Eolian_Function_Parameter *param = data;
@@ -242,7 +242,7 @@ _eapi_func_generate(const Eolian_Class *class, const Eolian_Function *funcid, Eo
242 add_star = EINA_TRUE; 242 add_star = EINA_TRUE;
243 if (!rettypet) 243 if (!rettypet)
244 { 244 {
245 itr = eolian_property_values_get(funcid); 245 itr = eolian_property_values_get(funcid, ftype);
246 /* We want to check if there is only one parameter */ 246 /* We want to check if there is only one parameter */
247 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2)) 247 if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2))
248 { 248 {
@@ -286,7 +286,7 @@ _eapi_func_generate(const Eolian_Class *class, const Eolian_Function *funcid, Eo
286 286
287 tmpstr[0] = '\0'; 287 tmpstr[0] = '\0';
288 288
289 itr = eolian_property_keys_get(funcid); 289 itr = eolian_property_keys_get(funcid, ftype);
290 EINA_ITERATOR_FOREACH(itr, data) 290 EINA_ITERATOR_FOREACH(itr, data)
291 { 291 {
292 Eolian_Function_Parameter *param = data; 292 Eolian_Function_Parameter *param = data;
@@ -304,7 +304,7 @@ _eapi_func_generate(const Eolian_Class *class, const Eolian_Function *funcid, Eo
304 eina_iterator_free(itr); 304 eina_iterator_free(itr);
305 if (!var_as_ret) 305 if (!var_as_ret)
306 { 306 {
307 itr = is_prop ? eolian_property_values_get(funcid) : eolian_function_parameters_get(funcid); 307 itr = is_prop ? eolian_property_values_get(funcid, ftype) : eolian_function_parameters_get(funcid);
308 EINA_ITERATOR_FOREACH(itr, data) 308 EINA_ITERATOR_FOREACH(itr, data)
309 { 309 {
310 Eolian_Function_Parameter *param = data; 310 Eolian_Function_Parameter *param = data;