summaryrefslogtreecommitdiff
path: root/src/bin/eolian/eo1_generator.c
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2014-06-02 15:40:52 +0300
committerTom Hacohen <tom@stosb.com>2014-06-03 11:26:58 +0100
commit03647b42795296dbc4612fbd85b2c31f5318b45f (patch)
treea3f1dcc81754e3347243b5296308f1dad1c6224b /src/bin/eolian/eo1_generator.c
parent10626ff5388424c9be0aff04fbbc5a5b73cd210f (diff)
Eolian: Use class name and not prefix in the class macro.
So for example a class called Eo_Base with prefix: eo, used to be generated to EO_CLASS instead of EO_BASE_CLASS.
Diffstat (limited to '')
-rw-r--r--src/bin/eolian/eo1_generator.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/eolian/eo1_generator.c b/src/bin/eolian/eo1_generator.c
index 67d5f634c6..16b32de69b 100644
--- a/src/bin/eolian/eo1_generator.c
+++ b/src/bin/eolian/eo1_generator.c
@@ -48,7 +48,7 @@ static const Eo_Class_Description _@#class_class_desc = {\n\
48 @#dtor_name\n\ 48 @#dtor_name\n\
49};\n\ 49};\n\
50\n\ 50\n\
51EO_DEFINE_CLASS(@#eoprefix_class_get, &_@#class_class_desc, @#list_inheritNULL);\ 51EO_DEFINE_CLASS(@#class_class_get, &_@#class_class_desc, @#list_inheritNULL);\
52"; 52";
53 53
54static const char 54static const char
@@ -56,9 +56,9 @@ tmpl_eo_op_desc[] = "\n EO_OP_FUNC(@#eoprefix_@#func, _@#class_@#func, \"@#d
56 56
57static const char 57static const char
58tmpl_eo_obj_header[] = "\ 58tmpl_eo_obj_header[] = "\
59#define @#EOPREFIX_CLASS @#eoprefix_class_get()\n\ 59#define @#CLASS_CLASS @#class_class_get()\n\
60\n\ 60\n\
61const Eo_Class *@#eoprefix_class_get(void) EINA_CONST;\n\ 61const Eo_Class *@#class_class_get(void) EINA_CONST;\n\
62\n\ 62\n\
63"; 63";
64 64
@@ -782,7 +782,7 @@ eo_source_end_generate(const Eolian_Class class, Eina_Strbuf *buf)
782 Eolian_Class inherit_class = eolian_class_find_by_name(inherit_name); 782 Eolian_Class inherit_class = eolian_class_find_by_name(inherit_name);
783 _eolian_class_vars inherit_env; 783 _eolian_class_vars inherit_env;
784 _class_env_create(inherit_class, NULL, &inherit_env); 784 _class_env_create(inherit_class, NULL, &inherit_env);
785 eina_strbuf_append_printf(tmpbuf, "%s_CLASS, ", inherit_env.upper_eo_prefix); 785 eina_strbuf_append_printf(tmpbuf, "%s_CLASS, ", inherit_env.upper_classname);
786 } 786 }
787 787
788 if (eina_strbuf_length_get(tmpbuf) == 0) eina_strbuf_append(tmpbuf, "NULL, "); 788 if (eina_strbuf_length_get(tmpbuf) == 0) eina_strbuf_append(tmpbuf, "NULL, ");