summaryrefslogtreecommitdiff
path: root/src/bin/eolian/eo_generator.c
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2014-07-23 14:13:21 +0100
committerDaniel Kolesa <d.kolesa@samsung.com>2014-07-23 14:13:21 +0100
commitfd0210f30ebf7f0900ae77bc324aae7bf222c623 (patch)
tree1fe385b0c54b7e7d08092cc8aca68320d6fb5dd5 /src/bin/eolian/eo_generator.c
parente26be1aca68f9e04e1ceffcbe9b0d9fed777dfad (diff)
eolian: list_get -> get, find_by -> get_by
Diffstat (limited to '')
-rw-r--r--src/bin/eolian/eo_generator.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index e0e0b6fb47..5aba944087 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_list_get(func); 105 itr = eolian_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 {
@@ -151,7 +151,7 @@ eo_fundef_generate(const Eolian_Class *class, Eolian_Function *func, Eolian_Func
151 Eina_Strbuf *str_retdesc = eina_strbuf_new(); 151 Eina_Strbuf *str_retdesc = eina_strbuf_new();
152 Eina_Strbuf *str_typecheck = eina_strbuf_new(); 152 Eina_Strbuf *str_typecheck = eina_strbuf_new();
153 153
154 itr = eolian_property_keys_list_get(func); 154 itr = eolian_property_keys_get(func);
155 EINA_ITERATOR_FOREACH(itr, data) 155 EINA_ITERATOR_FOREACH(itr, data)
156 { 156 {
157 const Eolian_Type *ptypet; 157 const Eolian_Type *ptypet;
@@ -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_list_get(func); 175 itr = eolian_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;
@@ -272,7 +272,7 @@ eo_header_generate(const Eolian_Class *class, Eina_Strbuf *buf)
272 Eina_Strbuf *str_extrn_ev = eina_strbuf_new(); 272 Eina_Strbuf *str_extrn_ev = eina_strbuf_new();
273 Eina_Strbuf *tmpbuf = eina_strbuf_new(); 273 Eina_Strbuf *tmpbuf = eina_strbuf_new();
274 274
275 itr = eolian_class_events_list_get(class); 275 itr = eolian_class_events_get(class);
276 EINA_ITERATOR_FOREACH(itr, event) 276 EINA_ITERATOR_FOREACH(itr, event)
277 { 277 {
278 const char *evname = NULL; 278 const char *evname = NULL;
@@ -298,7 +298,7 @@ eo_header_generate(const Eolian_Class *class, Eina_Strbuf *buf)
298 int i; 298 int i;
299 for (i = 0; i < 3; i++) 299 for (i = 0; i < 3; i++)
300 { 300 {
301 itr = eolian_class_functions_list_get(class, ftype_order[i]); 301 itr = eolian_class_functions_get(class, ftype_order[i]);
302 EINA_ITERATOR_FOREACH(itr, fid) 302 EINA_ITERATOR_FOREACH(itr, fid)
303 { 303 {
304 const Eolian_Function_Type ftype = eolian_function_type_get(fid); 304 const Eolian_Function_Type ftype = eolian_function_type_get(fid);
@@ -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_list_get(funcid); 368 itr = eolian_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 {
@@ -381,7 +381,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
381 suffix = "_set"; 381 suffix = "_set";
382 } 382 }
383 383
384 itr = eolian_property_keys_list_get(funcid); 384 itr = eolian_property_keys_get(funcid);
385 EINA_ITERATOR_FOREACH(itr, data) 385 EINA_ITERATOR_FOREACH(itr, data)
386 { 386 {
387 const Eolian_Type *ptypet; 387 const Eolian_Type *ptypet;
@@ -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_list_get(funcid); 405 itr = eolian_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;
@@ -446,13 +446,13 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
446 Eina_Strbuf *eo_func_decl = eina_strbuf_new(); 446 Eina_Strbuf *eo_func_decl = eina_strbuf_new();
447 Eina_Bool has_params = EINA_FALSE; 447 Eina_Bool has_params = EINA_FALSE;
448 448
449 itr = eolian_property_keys_list_get(funcid); 449 itr = eolian_property_keys_get(funcid);
450 has_params |= (eina_iterator_next(itr, &data)); 450 has_params |= (eina_iterator_next(itr, &data));
451 eina_iterator_free(itr); 451 eina_iterator_free(itr);
452 452
453 if (!has_params && !var_as_ret) 453 if (!has_params && !var_as_ret)
454 { 454 {
455 itr = eolian_parameters_list_get(funcid); 455 itr = eolian_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 }
@@ -541,7 +541,7 @@ eo_source_beginning_generate(const Eolian_Class *class, Eina_Strbuf *buf)
541 Eina_Strbuf *str_ev = eina_strbuf_new(); 541 Eina_Strbuf *str_ev = eina_strbuf_new();
542 542
543 Eolian_Event *event; 543 Eolian_Event *event;
544 itr = eolian_class_events_list_get(class); 544 itr = eolian_class_events_get(class);
545 EINA_ITERATOR_FOREACH(itr, event) 545 EINA_ITERATOR_FOREACH(itr, event)
546 { 546 {
547 const char *evname; 547 const char *evname;
@@ -645,7 +645,7 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
645 eina_strbuf_reset(tmpbuf); 645 eina_strbuf_reset(tmpbuf);
646 646
647 //Implements - TODO one generate func def for all 647 //Implements - TODO one generate func def for all
648 itr = eolian_class_implements_list_get(class); 648 itr = eolian_class_implements_get(class);
649 EINA_ITERATOR_FOREACH(itr, impl_desc) 649 EINA_ITERATOR_FOREACH(itr, impl_desc)
650 { 650 {
651 _eolian_class_vars impl_env; 651 _eolian_class_vars impl_env;
@@ -702,7 +702,7 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
702 eina_iterator_free(itr); 702 eina_iterator_free(itr);
703 703
704 //Constructors 704 //Constructors
705 itr = eolian_class_functions_list_get(class, EOLIAN_CTOR); 705 itr = eolian_class_functions_get(class, EOLIAN_CTOR);
706 EINA_ITERATOR_FOREACH(itr, fn) 706 EINA_ITERATOR_FOREACH(itr, fn)
707 { 707 {
708 char *desc = _source_desc_get(eolian_function_description_get(fn, "comment")); 708 char *desc = _source_desc_get(eolian_function_description_get(fn, "comment"));
@@ -715,7 +715,7 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
715 eina_iterator_free(itr); 715 eina_iterator_free(itr);
716 716
717 //Properties 717 //Properties
718 itr = eolian_class_functions_list_get(class, EOLIAN_PROPERTY); 718 itr = eolian_class_functions_get(class, EOLIAN_PROPERTY);
719 EINA_ITERATOR_FOREACH(itr, fn) 719 EINA_ITERATOR_FOREACH(itr, fn)
720 { 720 {
721 const char *funcname = eolian_function_name_get(fn); 721 const char *funcname = eolian_function_name_get(fn);
@@ -747,7 +747,7 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
747 eina_iterator_free(itr); 747 eina_iterator_free(itr);
748 748
749 //Methods 749 //Methods
750 itr = eolian_class_functions_list_get(class, EOLIAN_METHOD); 750 itr = eolian_class_functions_get(class, EOLIAN_METHOD);
751 EINA_ITERATOR_FOREACH(itr, fn) 751 EINA_ITERATOR_FOREACH(itr, fn)
752 { 752 {
753 char *desc = _source_desc_get(eolian_function_description_get(fn, "comment")); 753 char *desc = _source_desc_get(eolian_function_description_get(fn, "comment"));
@@ -757,7 +757,7 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
757 } 757 }
758 eina_iterator_free(itr); 758 eina_iterator_free(itr);
759 759
760 itr = eolian_class_events_list_get(class); 760 itr = eolian_class_events_get(class);
761 EINA_ITERATOR_FOREACH(itr, event) 761 EINA_ITERATOR_FOREACH(itr, event)
762 { 762 {
763 const char *evname; 763 const char *evname;
@@ -791,10 +791,10 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
791 eina_strbuf_replace_all(str_end, "@#Events_Desc", eina_strbuf_string_get(tmpbuf)); 791 eina_strbuf_replace_all(str_end, "@#Events_Desc", eina_strbuf_string_get(tmpbuf));
792 792
793 eina_strbuf_reset(tmpbuf); 793 eina_strbuf_reset(tmpbuf);
794 itr = eolian_class_inherits_list_get(class); 794 itr = eolian_class_inherits_get(class);
795 EINA_ITERATOR_FOREACH(itr, inherit_name) 795 EINA_ITERATOR_FOREACH(itr, inherit_name)
796 { 796 {
797 const Eolian_Class *inherit_class = eolian_class_find_by_name(inherit_name); 797 const Eolian_Class *inherit_class = eolian_class_get_by_name(inherit_name);
798 _eolian_class_vars inherit_env; 798 _eolian_class_vars inherit_env;
799 _class_env_create(inherit_class, NULL, &inherit_env); 799 _class_env_create(inherit_class, NULL, &inherit_env);
800 eina_strbuf_append_printf(tmpbuf, "%s_%s, ", inherit_env.upper_classname, 800 eina_strbuf_append_printf(tmpbuf, "%s_%s, ", inherit_env.upper_classname,
@@ -865,7 +865,7 @@ eo_source_generate(const Eolian_Class *class, Eina_Strbuf *buf)
865 if (!eo_source_beginning_generate(class, buf)) goto end; 865 if (!eo_source_beginning_generate(class, buf)) goto end;
866 866
867 //Properties 867 //Properties
868 itr = eolian_class_functions_list_get(class, EOLIAN_PROPERTY); 868 itr = eolian_class_functions_get(class, EOLIAN_PROPERTY);
869 EINA_ITERATOR_FOREACH(itr, fn) 869 EINA_ITERATOR_FOREACH(itr, fn)
870 { 870 {
871 const Eolian_Function_Type ftype = eolian_function_type_get(fn); 871 const Eolian_Function_Type ftype = eolian_function_type_get(fn);
@@ -885,7 +885,7 @@ eo_source_generate(const Eolian_Class *class, Eina_Strbuf *buf)
885 eina_iterator_free(itr); 885 eina_iterator_free(itr);
886 886
887 //Methods 887 //Methods
888 itr = eolian_class_functions_list_get(class, EOLIAN_METHOD); 888 itr = eolian_class_functions_get(class, EOLIAN_METHOD);
889 EINA_ITERATOR_FOREACH(itr, fn) 889 EINA_ITERATOR_FOREACH(itr, fn)
890 { 890 {
891 if (!eo_bind_func_generate(class, fn, EOLIAN_UNRESOLVED, str_bodyf, NULL)) goto end; 891 if (!eo_bind_func_generate(class, fn, EOLIAN_UNRESOLVED, str_bodyf, NULL)) goto end;